Fix a few import errors in FAST (#620)

* fix import errors in stage 0

* fix import errors in stage 1
This commit is contained in:
Ludovico Magnocavallo 2022-04-12 07:35:31 +02:00 committed by GitHub
parent 6f5807c261
commit 9bb2f91458
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 12 additions and 12 deletions

View File

@ -17,7 +17,7 @@
locals { locals {
custom_roles = { custom_roles = {
for k, v in var.custom_role_names : for k, v in var.custom_role_names :
k => module.organization.custom_role_id[v] k => try(module.organization.custom_role_id[v], null)
} }
providers = { providers = {
"00-bootstrap" = templatefile("${path.module}/../../assets/templates/providers.tpl", { "00-bootstrap" = templatefile("${path.module}/../../assets/templates/providers.tpl", {

View File

@ -23,7 +23,7 @@ module "branch-dp-folder" {
parent = "organizations/${var.organization.id}" parent = "organizations/${var.organization.id}"
name = "Data Platform" name = "Data Platform"
tag_bindings = { tag_bindings = {
context = module.organization.tag_values["context/data"].id context = try(module.organization.tag_values["context/data"].id, null)
} }
} }
@ -43,7 +43,7 @@ module "branch-dp-dev-folder" {
"roles/resourcemanager.projectCreator" = [module.branch-dp-dev-sa.iam_email] "roles/resourcemanager.projectCreator" = [module.branch-dp-dev-sa.iam_email]
} }
tag_bindings = { tag_bindings = {
context = module.organization.tag_values["environment/development"].id context = try(module.organization.tag_values["environment/development"].id, null)
} }
} }
@ -82,7 +82,7 @@ module "branch-dp-prod-folder" {
"roles/resourcemanager.projectCreator" = [module.branch-dp-prod-sa.iam_email] "roles/resourcemanager.projectCreator" = [module.branch-dp-prod-sa.iam_email]
} }
tag_bindings = { tag_bindings = {
context = module.organization.tag_values["environment/production"].id context = try(module.organization.tag_values["environment/production"].id, null)
} }
} }

View File

@ -39,7 +39,7 @@ module "branch-network-folder" {
"roles/compute.xpnAdmin" = [module.branch-network-sa.iam_email] "roles/compute.xpnAdmin" = [module.branch-network-sa.iam_email]
} }
tag_bindings = { tag_bindings = {
context = module.organization.tag_values["context/networking"].id context = try(module.organization.tag_values["context/networking"].id, null)
} }
} }
@ -73,7 +73,7 @@ module "branch-network-prod-folder" {
] ]
} }
tag_bindings = { tag_bindings = {
environment = module.organization.tag_values["environment/production"].id environment = try(module.organization.tag_values["environment/production"].id, null)
} }
} }
@ -88,6 +88,6 @@ module "branch-network-dev-folder" {
] ]
} }
tag_bindings = { tag_bindings = {
environment = module.organization.tag_values["environment/development"].id environment = try(module.organization.tag_values["environment/development"].id, null)
} }
} }

View File

@ -38,7 +38,7 @@ module "branch-sandbox-folder" {
} }
} }
tag_bindings = { tag_bindings = {
context = module.organization.tag_values["context/sandbox"].id context = try(module.organization.tag_values["context/sandbox"].id, null)
} }
} }

View File

@ -40,7 +40,7 @@ module "branch-security-folder" {
"roles/resourcemanager.projectCreator" = [module.branch-security-sa.iam_email] "roles/resourcemanager.projectCreator" = [module.branch-security-sa.iam_email]
} }
tag_bindings = { tag_bindings = {
context = module.organization.tag_values["context/security"].id context = try(module.organization.tag_values["context/security"].id, null)
} }
} }

View File

@ -23,7 +23,7 @@ module "branch-teams-folder" {
parent = "organizations/${var.organization.id}" parent = "organizations/${var.organization.id}"
name = "Teams" name = "Teams"
tag_bindings = { tag_bindings = {
context = module.organization.tag_values["context/teams"].id context = try(module.organization.tag_values["context/teams"].id, null)
} }
} }
@ -92,7 +92,7 @@ module "branch-teams-team-dev-folder" {
"roles/resourcemanager.projectCreator" = [module.branch-teams-dev-pf-sa.iam_email] "roles/resourcemanager.projectCreator" = [module.branch-teams-dev-pf-sa.iam_email]
} }
tag_bindings = { tag_bindings = {
environment = module.organization.tag_values["environment/development"].id environment = try(module.organization.tag_values["environment/development"].id, null)
} }
} }
@ -135,7 +135,7 @@ module "branch-teams-team-prod-folder" {
"roles/resourcemanager.projectCreator" = [module.branch-teams-prod-pf-sa.iam_email] "roles/resourcemanager.projectCreator" = [module.branch-teams-prod-pf-sa.iam_email]
} }
tag_bindings = { tag_bindings = {
environment = module.organization.tag_values["environment/production"].id environment = try(module.organization.tag_values["environment/production"].id, null)
} }
} }