From 5e8a05af61346364bbc6c8f516b6db9e5cb398e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hein=20Tonny=20K=C3=B8ien?= Date: Sun, 13 Aug 2023 22:07:27 +0000 Subject: [PATCH] Fix minor issues, tag + azuread_group_membership --- azuread_groups.tf | 2 +- .../networking/private_dns_resolvers_inbound_endpoints/main.tf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/azuread_groups.tf b/azuread_groups.tf index ffa01cdd86..acadabbd69 100644 --- a/azuread_groups.tf +++ b/azuread_groups.tf @@ -39,7 +39,7 @@ module "azuread_groups_membership" { for_each = local.azuread.azuread_groups_membership client_config = local.client_config - group_key = each.key + group_key = try(each.value.key, each.key) # Make it possible to have orphen name of top level keys, useful when you have group keys with same name in different LZs settings = each.value group_id = local.combined_objects_azuread_groups[try(each.value.group_lz_key, local.client_config.landingzone_key)][each.key].id azuread_groups = local.combined_objects_azuread_groups diff --git a/modules/networking/private_dns_resolvers_inbound_endpoints/main.tf b/modules/networking/private_dns_resolvers_inbound_endpoints/main.tf index 7c38177f63..1050b1cada 100644 --- a/modules/networking/private_dns_resolvers_inbound_endpoints/main.tf +++ b/modules/networking/private_dns_resolvers_inbound_endpoints/main.tf @@ -11,5 +11,5 @@ locals { tags = var.inherit_tags ? merge( var.global_settings.tags, var.tags - ) : null + ) : {} } \ No newline at end of file