Fix minor issues, tag + azuread_group_membership

mdanylyuk · Aug 13, 2023 · 5e8a05a · 5e8a05a
1 parent cb07391
commit 5e8a05a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -11,5 +11,5 @@ locals {
   tags = var.inherit_tags ? merge(
     var.global_settings.tags,
     var.tags
-  ) : null
+  ) : {}
 }