Merge pull request #2 from schubergphilis/cmk-fix

bug: CMK Fix
schubergphilis · Jan 7, 2025 · c6c3980 · c6c3980
2 parents 59ecbf3 + 70bbc9b
commit c6c3980
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 21 deletions.
diff --git a/locals.tf b/locals.tf
@@ -1,22 +1,22 @@
 locals {
-  acr_managed_identities = {
-    system_assigned_user_assigned = (var.acr.managed_identities.system_assigned || length(var.acr.managed_identities.user_assigned_resource_ids) > 0) ? {
-      this = {
-        type                       = var.acr.managed_identities.system_assigned && length(var.acr.managed_identities.user_assigned_resource_ids) > 0 ? "SystemAssigned, UserAssigned" : length(var.acr.managed_identities.user_assigned_resource_ids) > 0 ? "UserAssigned" : "SystemAssigned"
-        user_assigned_resource_ids = var.acr.managed_identities.user_assigned_resource_ids
-      }
-    } : {}
-    system_assigned = var.acr.managed_identities.system_assigned ? {
-      this = {
-        type = "SystemAssigned"
-      }
-    } : {}
-    user_assigned = length(var.acr.managed_identities.user_assigned_resource_ids) > 0 ? {
-      this = {
-        type                       = "UserAssigned"
-        user_assigned_resource_ids = var.acr.managed_identities.user_assigned_resource_ids
-      }
-    } : {}
-  }
+  identity_system_assigned_user_assigned = (var.acr.managed_identities.system_assigned && (length(var.acr.managed_identities.user_assigned_resource_ids) > 0 || var.customer_managed_key != null)) ? {
+    this = {
+      type                       = "SystemAssigned, UserAssigned"
+      user_assigned_resource_ids = setunion(var.acr.managed_identities.user_assigned_resource_ids, try([data.azurerm_user_assigned_identity.this[0].id], []))
+    }
+  } : null
+  identity_system_assigned = var.acr.managed_identities.system_assigned ? {
+    this = {
+      type                       = "SystemAssigned"
+      user_assigned_resource_ids = null
+    }
+  } : null
+  identity_user_assigned = (length(var.acr.managed_identities.user_assigned_resource_ids) > 0 || var.customer_managed_key != null) ? {
+    this = {
+      type                       = "UserAssigned"
+      user_assigned_resource_ids = setunion(var.acr.managed_identities.user_assigned_resource_ids, try([data.azurerm_user_assigned_identity.this[0].id], []))
+    }
+  } : null
+
   ordered_geo_replications = { for geo in var.acr.georeplications : geo.location => geo }
 }
diff --git a/main.tf b/main.tf
@@ -25,7 +25,7 @@ resource "azurerm_container_registry" "this" {
 
     content {
       identity_client_id = data.azurerm_user_assigned_identity.this[0].client_id
-      key_vault_key_id   = data.azurerm_key_vault_key.this[0].id
+      key_vault_key_id   = data.azurerm_key_vault_key.this[0].versionless_id
     }
   }
 
@@ -41,7 +41,7 @@ resource "azurerm_container_registry" "this" {
   }
 
   dynamic "identity" {
-    for_each = local.acr_managed_identities.system_assigned_user_assigned
+    for_each = coalesce(local.identity_system_assigned_user_assigned, local.identity_system_assigned, local.identity_user_assigned, {})
 
     content {
       type         = identity.value.type