Merge pull request #254 from Azure/patch/combined_parameters

Add support to ESLZ 0.3.3 to multiple type of parameters

caf_solution/add-ons/caf_eslz/archetype_config_overrides.tf

@@ -21,7 +21,7 @@ locals {
                     ]
                   ],
                   [
-                    try(roles.principal_ids, [])
+                    roles.principal_ids != null ? try(roles.principal_ids, []) : []
                   ]
                 ]
               ) //flatten (ids)
@@ -30,15 +30,77 @@ locals {
         ) : mapping.role => mapping.ids
       }
 
-      parameters = {
-        for param_key, param_value in try(mg_value.parameters, {}) : param_key => {
-          for key, value in param_value : key => jsonencode(try(local.caf[value.output_key][value.lz_key][value.resource_type][value.resource_key][value.attribute_key], value.value))
-        }
+      parameters = local.aco_parameters_combined[mg_id]
+    }
+  }
 
+  aco_parameters_combined = {
+    for mg_id, mg_value in try(var.archetype_config_overrides, {}) : mg_id => {
+      for param_key, param_value in try(mg_value.parameters, {}) : param_key => merge(
+        local.aco_parameters_value[mg_id][param_key],
+        local.aco_parameters_values[mg_id][param_key],
+        local.aco_parameters_integer[mg_id][param_key],
+        local.aco_parameters_boolean[mg_id][param_key],
+        local.aco_parameters_hcl_jsonencoded[mg_id][param_key],
+        local.aco_parameters_remote_lz[mg_id][param_key]
+      )
+    } 
+  }
+
+  aco_parameters_value = {
+    for mg_id, mg_value in try(var.archetype_config_overrides, {}) : mg_id => {
+      for param_key, param_value in try(mg_value.parameters, {}) : param_key => {
+        for key, value in param_value : key => value.value
+         if value.value != null
+      } 
+    }
+  }
+
+  aco_parameters_values = {
+    for mg_id, mg_value in try(var.archetype_config_overrides, {}) : mg_id => {
+      for param_key, param_value in try(mg_value.parameters, {}) : param_key => {
+        for key, value in param_value : key => value.values
+         if value.values != null
       }
+    } 
+  }
+
+  aco_parameters_integer = {
+    for mg_id, mg_value in try(var.archetype_config_overrides, {}) : mg_id => {
+      for param_key, param_value in try(mg_value.parameters, {}) : param_key => {
+        for key, value in param_value : key => value.integer
+         if value.integer != null
+      } 
     }
   }
 
+  aco_parameters_boolean = {
+    for mg_id, mg_value in try(var.archetype_config_overrides, {}) : mg_id => {
+      for param_key, param_value in try(mg_value.parameters, {}) : param_key => {
+        for key, value in param_value : key => value.boolean
+         if value.boolean != null
+      } 
+    }
+  }
+
+  aco_parameters_hcl_jsonencoded = {
+    for mg_id, mg_value in try(var.archetype_config_overrides, {}) : mg_id => {
+      for param_key, param_value in try(mg_value.parameters, {}) : param_key => {
+        for key, value in param_value : key => jsondecode(value.hcl_jsonencoded)
+         if value.hcl_jsonencoded != null
+      }
+    } 
+  }
+
+  aco_parameters_remote_lz = {
+    for mg_id, mg_value in try(var.archetype_config_overrides, {}) : mg_id => {
+      for param_key, param_value in try(mg_value.parameters, {}) : param_key => {
+        for key, value in param_value : key => local.caf[value.output_key][value.lz_key][value.resource_type][value.resource_key][value.attribute_key]
+         if value.output_key != null
+      }
+    } 
+  }
+
 }
 
 # output caf {

caf_solution/add-ons/caf_eslz/custom_landing_zones.tf

@@ -52,7 +52,7 @@ locals {
                     ]
                   ],
                   [
-                    try(roles.principal_ids, [])
+                    roles.principal_ids != null ? try(roles.principal_ids, []) : []
                   ]
                 ]
               ) //flatten (ids)
@@ -61,12 +61,76 @@ locals {
         ) : mapping.role => mapping.ids
       }
 
-      parameters = {
-        for param_key, param_value in try(mg_value.archetype_config.parameters, {}) : param_key => {
-          for key, value in param_value : key => jsonencode(try(local.caf[value.output_key][value.lz_key][value.resource_type][value.resource_key][value.attribute_key], value.value))
-        }
-      }
+      parameters = local.clz_parameters_combined[mg_id]
 
     }
   }
+
+  clz_parameters_combined = {
+    for mg_id, mg_value in try(var.custom_landing_zones, {}) : mg_id => {
+      for param_key, param_value in try(mg_value.archetype_config.parameters, {}) : param_key => merge(
+        local.clz_parameters_value[mg_id][param_key],
+        local.clz_parameters_values[mg_id][param_key],
+        local.clz_parameters_integer[mg_id][param_key],
+        local.clz_parameters_boolean[mg_id][param_key],
+        local.clz_parameters_hcl_jsonencoded[mg_id][param_key],
+        local.clz_parameters_remote_lz[mg_id][param_key]
+      )
+    } 
+  }
+
+  clz_parameters_value = {
+    for mg_id, mg_value in try(var.custom_landing_zones, {}) : mg_id => {
+      for param_key, param_value in try(mg_value.archetype_config.parameters, {}) : param_key => {
+        for key, value in param_value : key => value.value
+         if value.value != null
+      } 
+    }
+  }
+
+  clz_parameters_values = {
+    for mg_id, mg_value in try(var.custom_landing_zones, {}) : mg_id => {
+      for param_key, param_value in try(mg_value.archetype_config.parameters, {}) : param_key => {
+        for key, value in param_value : key => value.values
+         if value.values != null
+      }
+    } 
+  }
+
+  clz_parameters_integer = {
+    for mg_id, mg_value in try(var.custom_landing_zones, {}) : mg_id => {
+      for param_key, param_value in try(mg_value.archetype_config.parameters, {}) : param_key => {
+        for key, value in param_value : key => value.integer
+         if value.integer != null
+      }
+    } 
+  }
+
+  clz_parameters_boolean = {
+    for mg_id, mg_value in try(var.custom_landing_zones, {}) : mg_id => {
+      for param_key, param_value in try(mg_value.archetype_config.parameters, {}) : param_key => {
+        for key, value in param_value : key => value.boolean
+         if value.boolean != null
+      }
+    } 
+  }
+
+  clz_parameters_hcl_jsonencoded = {
+    for mg_id, mg_value in try(var.custom_landing_zones, {}) : mg_id => {
+      for param_key, param_value in try(mg_value.archetype_config.parameters, {}) : param_key => {
+        for key, value in param_value : key => jsondecode(value.hcl_jsonencoded)
+         if value.hcl_jsonencoded != null
+      }
+    } 
+  }
+
+  clz_parameters_remote_lz = {
+    for mg_id, mg_value in try(var.custom_landing_zones, {}) : mg_id => {
+      for param_key, param_value in try(mg_value.archetype_config.parameters, {}) : param_key => {
+        for key, value in param_value : key => local.caf[value.output_key][value.lz_key][value.resource_type][value.resource_key][value.attribute_key]
+         if value.output_key != null
+      }
+    } 
+  }
+
 }

caf_solution/add-ons/caf_eslz/enterprise_scale.tf

@@ -2,7 +2,9 @@
 
 module "enterprise_scale" {
   source  = "Azure/caf-enterprise-scale/azurerm"
-  version = "~> 0.1.0"
+  version = "~> 0.3.0"
+
+  # source = "../../../../eslz"
 
   root_parent_id   = data.azurerm_client_config.current.tenant_id
   default_location = local.global_settings.regions[local.global_settings.default_region]

caf_solution/add-ons/caf_eslz/main.tf

@@ -3,10 +3,11 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 2.55.0"
+      version = "~> 2.65.0"
     }
   }
-  required_version = ">= 0.13"
+  required_version = ">= 0.14"
+  experiments = [module_variable_optional_attrs]
 }
 
 
@@ -15,4 +16,3 @@ provider "azurerm" {
 }
 
 data "azurerm_client_config" "current" {}
-