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

This commit is contained in:
Ludovico Magnocavallo
2025-10-20 06:33:53 +00:00
2 changed files with 3 additions and 1 deletions

View File

@@ -73,7 +73,7 @@ module "projects" {
})
default_service_account = try(each.value.default_service_account, "keep")
descriptive_name = try(each.value.descriptive_name, null)
factories_config = each.value.factories_config
factories_config = { for k, v in each.value.factories_config : k => v if k != "observability" }
labels = merge(
each.value.labels, var.data_merges.labels
)
@@ -118,6 +118,7 @@ module "projects-iam" {
kms_keys = local.ctx.kms_keys
iam_principals = local.ctx_iam_principals
})
factories_config = { for k, v in each.value.factories_config : k => v if k == "observability" }
iam = lookup(each.value, "iam", {})
iam_bindings = lookup(each.value, "iam_bindings", {})
iam_bindings_additive = lookup(each.value, "iam_bindings_additive", {})