Merge pull request #491 from blinqas/blinq-eslz-updates

Update eslz to 4.2.0 and fix minor issues
Azure · Sep 21, 2023 · 56d6bad · 56d6bad
2 parents 9100bad + 130b2ec
commit 56d6bad
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/caf_solution/add-ons/caf_eslz/custom_landing_zones.tf b/caf_solution/add-ons/caf_eslz/custom_landing_zones.tf
@@ -30,10 +30,8 @@ locals {
             for key, value in mg_value.subscriptions : local.caf.subscriptions[value.lz_key][value.key].subscription_id
           ],
           try(split(",", data.external.reconcile_susbscription_ids_from_management_groups[mg_id].result.subscription_ids), []),
-          try(mg_value.subscription_ids, [])
-        )
+          mg_value.subscription_ids != null ? mg_value.subscription_ids : [""])
       )
-
     }
   }
 

diff --git a/caf_solution/add-ons/caf_eslz/enterprise_scale.tf b/caf_solution/add-ons/caf_eslz/enterprise_scale.tf
@@ -2,7 +2,7 @@
 
 module "enterprise_scale" {
   source  = "Azure/caf-enterprise-scale/azurerm"
-  version = "3.3.0"
+  version = "4.2.0"
 
   # source = "/tf/caf/alz"
 

diff --git a/caf_solution/add-ons/caf_eslz/main.tf b/caf_solution/add-ons/caf_eslz/main.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.35.0"
+      version = "~> 3.54.0"
     }
   }
   required_version = ">= 1.3.5"

diff --git a/caf_solution/add-ons/caf_eslz/variables.tf b/caf_solution/add-ons/caf_eslz/variables.tf
@@ -163,7 +163,7 @@ variable "custom_landing_zones" {
     object({
       display_name               = string
       parent_management_group_id = string
-      subscription_ids           = list(string)
+      subscription_ids           = optional(list(string))
       subscriptions = map(
         object({
           lz_key = string