kovagoadi/hunfabric
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into fast-dev

Browse Source
This commit is contained in:
Ludovico Magnocavallo
2025-10-05 14:03:51 +00:00
parent 7f291e140f 2815b90759
commit 3cc206bb5b
16 changed files with 233 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
fast/stages/0-org-setup/assets/providers.tf.tpl
View File

@@ -17,13 +17,26 @@
terraform {
backend "gcs" {
bucket = "${bucket}"
%{~ if try(universe_domain, null) == null ~}
impersonate_service_account = "${service_account}"
%{ if try(prefix, null) != null }prefix = "${prefix}"%{ endif }
%{~ endif ~}
%{~ if try(prefix, null) != null ~}
prefix = "${prefix}"
%{~ endif ~}
%{~ if try(universe_domain, null) != null ~}
storage_custom_endpoint = "https://storage.${universe_domain}/storage/v1/b"
%{~ endif ~}
}
}
provider "google" {
impersonate_service_account = "${service_account}"
%{~ if try(universe_domain, null) != null ~}
universe_domain = "${universe_domain}"
%{~ endif ~}
}
provider "google-beta" {
impersonate_service_account = "${service_account}"
%{~ if try(universe_domain, null) != null ~}
universe_domain = "${universe_domain}"
%{~ endif ~}
}

12
fast/stages/0-org-setup/output-files.tf
View File

@@ -51,6 +51,11 @@ locals {
id = local.organization_id
}
prefix = local.defaults.prefix
universe = try(
local.project_defaults.overrides.universe,
local.project_defaults.defaults.universe,
null
)
}
org-setup = {
automation = {
@@ -79,6 +84,11 @@ locals {
)
}
}
of_universe_domain = try(
local.project_defaults.overrides.universe.domain,
local.project_defaults.defaults.universe.domain,
null
)
}
resource "local_file" "providers" {
@@ -93,6 +103,7 @@ resource "local_file" "providers" {
service_account = lookup(
local.of_service_accounts, each.value.service_account, each.value.service_account
)
universe_domain = local.of_universe_domain
})
}
@@ -108,6 +119,7 @@ resource "google_storage_bucket_object" "providers" {
service_account = lookup(
local.of_service_accounts, each.value.service_account, each.value.service_account
)
universe_domain = local.of_universe_domain
})
}

22
fast/stages/0-org-setup/schemas/defaults.schema.json
View File

@@ -314,9 +314,19 @@
"type": "object",
"additionalProperties": false,
"required": [
"domain",
"prefix"
],
"properties": {
"domain": {
"type": "string"
},
"forced_jit_service_identities": {
"type": "array",
"items": {
"type": "string"
}
},
"prefix": {
"type": "string"
},
@@ -479,9 +489,19 @@
"type": "object",
"additionalProperties": false,
"required": [
"domain",
"prefix"
],
"properties": {
"domain": {
"type": "string"
},
"forced_jit_service_identities": {
"type": "array",
"items": {
"type": "string"
}
},
"prefix": {
"type": "string"
},
@@ -674,4 +694,4 @@
}
}
}
}
}

33
fast/stages/0-org-setup/schemas/project.schema.json
View File

@@ -490,18 +490,24 @@
"additionalProperties": false,
"properties": {
"prefix": {
"type": "string",
"unavailable_services": {
"type": "array",
"items": {
"type": "string"
}
},
"unavailable_service_identities": {
"type": "array",
"items": {
"type": "string"
}
"type": "string"
},
"forced_jit_service_identities": {
"type": "array",
"items": {
"type": "string"
}
},
"unavailable_services": {
"type": "array",
"items": {
"type": "string"
}
},
"unavailable_service_identities": {
"type": "array",
"items": {
"type": "string"
}
}
}
@@ -535,7 +541,6 @@
"location": {
"type": "string"
}
}
}
}
@@ -838,4 +843,4 @@
}
}
}
}
}