fix: Add missing toset in acr_attach and better handle empty api server ip ranges

dploeger · Dennis Ploeger · commit 2c3c05051baf · 2023-08-03T14:21:39.000+02:00
diff --git a/acr_attach.tf b/acr_attach.tf
@@ -1,5 +1,5 @@
 resource "azurerm_role_assignment" "aksacr" {
-  for_each                         = var.azure_container_registry_ids
+  for_each                         = toset(var.azure_container_registry_ids)
   principal_id                     = azurerm_kubernetes_cluster.k8s.kubelet_identity[0].object_id
   role_definition_name             = "AcrPull"
   scope                            = each.value
diff --git a/main.tf b/main.tf
@@ -39,8 +39,11 @@ resource "azurerm_kubernetes_cluster" "k8s" {
     zones                = var.availability_zones
   }
 
-  api_server_access_profile {
-    authorized_ip_ranges = var.api_server_ip_ranges
+  dynamic "api_server_access_profile" {
+    for_each = length(var.api_server_ip_ranges) > 0 ? [var.api_server_ip_ranges] : []
+    content {
+      authorized_ip_ranges = api_server_access_profile.value
+    }
   }
 
   identity {

Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,11 @@ resource "azurerm_kubernetes_cluster" "k8s" {`
`39`	`39`	`zones = var.availability_zones`
`40`	`40`	`}`
`41`	`41`
`42`		`- api_server_access_profile {`
`43`		`- authorized_ip_ranges = var.api_server_ip_ranges`
	`42`	`+ dynamic "api_server_access_profile" {`
	`43`	`+ for_each = length(var.api_server_ip_ranges) > 0 ? [var.api_server_ip_ranges] : []`
	`44`	`+ content {`
	`45`	`+ authorized_ip_ranges = api_server_access_profile.value`
	`46`	`+ }`
`44`	`47`	`}`
`45`	`48`
`46`	`49`	`identity {`