Int azrm 3.7.0

.github/workflows/standalone-scenarios.json

@@ -51,8 +51,8 @@
     "compute/virtual_machine_scale_set/101-linux-win-vmss-agw",
     "compute/virtual_machine_scale_set/102-linux-win-vmss-custom-script-extension",
     "compute/virtual_machine_scale_set/104-linux-win-vmss-as-lb",
-    "compute/virtual_machine_scale_set/106-linux-win-vmss-lb",
     "compute/virtual_machine_scale_set/106-vmss_monitoring",
+    "compute/virtual_machine_scale_set/106-linux-win-vmss-lb",
     "compute/virtual_machine_scale_set/107-linux-win-vmss-application-health-extension",
     "compute/virtual_machine_scale_set/108-linux-win-vmss-keyvault-extension",
     "compute/virtual_machine/101-single-windows-vm",
@@ -100,12 +100,12 @@
     "databricks/101-standard-databricks-vnet",
     "databricks/102-premium-aml",
     "datalake/101-datalake-storage",
-    "diagnostics_profiles/100-multiple-destinations",
-    "diagnostics_profiles/200-diagnostics-eventhub-namespaces",
-    "diagnostics_profiles/201-multi-eventhub-diagnostics",
     "digital_twins/100-basic",
     "digital_twins/101-adt-servicebus",
     "digital_twins/102-digital_twins_instance_eventhub",
+    "diagnostics_profiles/100-multiple-destinations",
+    "diagnostics_profiles/200-diagnostics-eventhub-namespaces",
+    "diagnostics_profiles/201-multi-eventhub-diagnostics",
     "eventhub/100-simple-eventhub-namespace",
     "eventhub/101-evh-namespace-with-private-endpoint",
     "eventhub/102-namespace-and-evh-with-auth-rules",

UPGRADE.md

@@ -2,15 +2,24 @@
 
 When upgrading to a newer version of the CAF module, some configuration structures must be updated before applying the modifications.
 
+## 5.7.0
+
+Minimum rover version of 1.1.x. Lower versions not supported anymore.
+
+Version 5.6.0 includes support for azurerm 3.7.0 which requires your attention if you are deploying the following components:
+
+- vpn_gateway_connections:
+  - The deprecated field ```propagated_route_tables``` will be removed in favour of the ```propagated_route_table``` property. If you've been using ```propagated_route_tables```, rename with the new name ```propagated_route_table```.
+
 ## 5.6.0
 
-Version 5.6.0 includes support for azurerm 2.99 which requires your attention if you are deploying the following components:
+Version 5.6.0 includes support for azurerm 2.98 which requires your attention if you are deploying the following components:
 
 - signal_r:
   - The ```features``` block is deprecated, favor of use ```connectivity_logs_enabled```, ```messaging_logs_enabled```, ```live_trace_enabled``` and ```service_mode``` instead. Module has been updated to reflect that. You must update the settings in your configuration file accordingly.
 
 - data factory:
-  - The `data_factory_name` reference method is deprecated in favour of `data_factory_id` and will be removed in version 3.0 of the AzureRM provider.
+  - The `data_factory_name` reference method is deprecated in favour of `data_factory_id` and has been removed.
   - If you are referencing literals for data factory name inside ```data_factory.datasets``` (azure_blob, cosmosdb_sqlapi, delimited_text, http, json, mysql, postgresql, sql_server_table) or ```data_factory.linked_services``` (azure_blob_storage, cosmosdb, web, mysql, postgresql, key_vault) you will need to update to use the ```id``` attribute instead of ```name```.
   - **If you are referencing objects with ```key``` and ```lz_key``` inside your model, you dont need to update anything.**
 
@@ -21,8 +30,46 @@ Version 5.6.0 includes support for azurerm 2.99 which requires your attention if
   - **If you are referencing objects with ```key``` and ```lz_key``` inside your model, you dont need to update anything.**
 
 - apim:
-  - The ```proxy``` block is deprecated in favour of `gateway` and will be removed in version 3.0 of the AzureRM provider.
-  - Azurerm 2.98 does not have ```gateway``` implemented yet, even with ```ARM_THREEPOINTZERO_BETA_RESOURCES=true```
+  - The ```proxy``` block is deprecated in favour of `gateways` to support multiple gateways. See example apim/109 
+
+from
+```hcl
+api_management_custom_domain = {
+  apimcd1 = {
+    api_management = {
+      key = "apim1"
+    }
+    proxy = {
+      host_name = "api.example.com"
+      key_vault_certificate = {
+        certificate_request_key = "example"
+      }
+    }
+  }
+}
+```
+
+to 
+
+```hcl
+api_management_custom_domain = {
+  apimcd1 = {
+    api_management = {
+      key = "apim1"
+    }
+    gateways = {
+      gw1 = {
+        {
+          host_name = "api.example.com"
+          key_vault_certificate = {
+            certificate_request_key = "example"
+          }
+        }
+      }
+    }
+  }
+}
+```
 
 - azure virtual desktop:
   - azurerm 2.97 addedd support for new token method - azurerm_virtual_desktop_host_pool_registration_info - updated and should be transparent.

data_factory.tf

@@ -34,9 +34,7 @@ module "data_factory_pipeline" {
   global_settings = local.global_settings
   client_config   = local.client_config
   settings        = each.value
-
-  resource_group_name = can(each.value.resource_group.name) || can(each.value.resource_group_name) ? try(each.value.resource_group.name, each.value.resource_group_name) : local.combined_objects_resource_groups[try(local.client_config.landingzone_key, each.value.resource_group.lz_key)][try(each.value.resource_group_key, each.value.resource_group.key)].name
-  data_factory_id     = can(each.value.data_factory.id) ? each.value.data_factory.id : local.combined_objects_data_factory[try(local.client_config.landingzone_key, each.value.data_factory.lz_key)][try(each.value.data_factory.key, each.value.data_factory_key)].id
+  data_factory_id = can(each.value.data_factory.id) ? each.value.data_factory.id : local.combined_objects_data_factory[try(local.client_config.landingzone_key, each.value.data_factory.lz_key)][try(each.value.data_factory.key, each.value.data_factory_key)].id
 }
 
 output "data_factory_pipeline" {
@@ -52,9 +50,8 @@ module "data_factory_trigger_schedule" {
   client_config   = local.client_config
   settings        = each.value
 
-  resource_group_name = can(each.value.resource_group.name) || can(each.value.resource_group_name) ? try(each.value.resource_group.name, each.value.resource_group_name) : local.combined_objects_resource_groups[try(local.client_config.landingzone_key, each.value.resource_group.lz_key)][try(each.value.resource_group_key, each.value.resource_group.key)].name
-  data_factory_id     = can(each.value.data_factory.id) ? each.value.data_factory.id : local.combined_objects_data_factory[try(local.client_config.landingzone_key, each.value.data_factory.lz_key)][try(each.value.data_factory.key, each.value.data_factory_key)].id
-  pipeline_name       = can(each.value.data_factory_pipeline.name) ? each.value.data_factory_pipeline.name : local.combined_objects_data_factory_pipeline[try(each.value.data_factory_pipeline.lz_key, local.client_config.landingzone_key)][each.value.data_factory_pipeline.key].name
+  data_factory_id = can(each.value.data_factory.id) ? each.value.data_factory.id : local.combined_objects_data_factory[try(local.client_config.landingzone_key, each.value.data_factory.lz_key)][try(each.value.data_factory.key, each.value.data_factory_key)].id
+  pipeline_name   = can(each.value.data_factory_pipeline.name) ? each.value.data_factory_pipeline.name : local.combined_objects_data_factory_pipeline[try(each.value.data_factory_pipeline.lz_key, local.client_config.landingzone_key)][each.value.data_factory_pipeline.key].name
 
 }
 
@@ -66,11 +63,10 @@ module "data_factory_integration_runtime_self_hosted" {
   source   = "./modules/data_factory/data_factory_integration_runtime_self_hosted"
   for_each = local.data_factory.data_factory_integration_runtime_self_hosted
 
-  global_settings     = local.global_settings
-  client_config       = local.client_config
-  settings            = each.value
-  data_factory_id     = can(each.value.data_factory.id) ? each.value.data_factory.id : local.combined_objects_data_factory[try(local.client_config.landingzone_key, each.value.data_factory.lz_key)][try(each.value.data_factory.key, each.value.data_factory_key)].id
-  resource_group_name = can(each.value.resource_group.name) || can(each.value.resource_group_name) ? try(each.value.resource_group.name, each.value.resource_group_name) : local.combined_objects_resource_groups[try(local.client_config.landingzone_key, each.value.resource_group.lz_key)][try(each.value.resource_group_key, each.value.resource_group.key)].name
+  global_settings = local.global_settings
+  client_config   = local.client_config
+  settings        = each.value
+  data_factory_id = can(each.value.data_factory.id) ? each.value.data_factory.id : local.combined_objects_data_factory[try(local.client_config.landingzone_key, each.value.data_factory.lz_key)][try(each.value.data_factory.key, each.value.data_factory_key)].id
 
   remote_objects = {
     data_factory   = local.combined_objects_data_factory
@@ -89,9 +85,8 @@ module "data_factory_integration_runtime_azure_ssis" {
   client_config   = local.client_config
   settings        = each.value
 
-  data_factory_id     = can(each.value.data_factory.id) ? each.value.data_factory.id : local.combined_objects_data_factory[try(local.client_config.landingzone_key, each.value.data_factory.lz_key)][try(each.value.data_factory.key, each.value.data_factory_key)].id
-  resource_group_name = can(each.value.resource_group.name) || can(each.value.resource_group_name) ? try(each.value.resource_group.name, each.value.resource_group_name) : local.combined_objects_resource_groups[try(local.client_config.landingzone_key, each.value.resource_group.lz_key)][try(each.value.resource_group_key, each.value.resource_group.key)].name
-  location            = can(local.global_settings.regions[each.value.region]) ? local.global_settings.regions[each.value.region] : local.combined_objects_resource_groups[try(local.client_config.landingzone_key, each.value.resource_group.lz_key)][try(each.value.resource_group.key, each.value.resource_group_key)].location
+  data_factory_id = can(each.value.data_factory.id) ? each.value.data_factory.id : local.combined_objects_data_factory[try(local.client_config.landingzone_key, each.value.data_factory.lz_key)][try(each.value.data_factory.key, each.value.data_factory_key)].id
+  location        = can(local.global_settings.regions[each.value.region]) ? local.global_settings.regions[each.value.region] : local.combined_objects_resource_groups[try(local.client_config.landingzone_key, each.value.resource_group.lz_key)][try(each.value.resource_group.key, each.value.resource_group_key)].location
 
 
   remote_objects = {

data_factory_datasets.tf

@@ -6,7 +6,6 @@ module "data_factory_dataset_azure_blob" {
   global_settings     = local.global_settings
   client_config       = local.client_config
   settings            = each.value
-  resource_group_name = can(each.value.resource_group.name) || can(each.value.resource_group_name) ? try(each.value.resource_group.name, each.value.resource_group_name) : local.combined_objects_resource_groups[try(local.client_config.landingzone_key, each.value.resource_group.lz_key)][try(each.value.resource_group_key, each.value.resource_group.key)].name
   data_factory_id     = can(each.value.data_factory.id) ? each.value.data_factory.id : local.combined_objects_data_factory[try(each.value.data_factory.lz_key, local.client_config.landingzone_key)][each.value.data_factory.key].id
   linked_service_name = can(each.value.linked_service.name) ? each.value.linked_service.name : local.combined_objects_data_factory_linked_service_azure_blob_storage[try(each.value.linked_service.lz_key, local.client_config.landingzone_key)][each.value.linked_service.key].name
 }
@@ -24,7 +23,6 @@ module "data_factory_dataset_cosmosdb_sqlapi" {
   global_settings     = local.global_settings
   client_config       = local.client_config
   settings            = each.value
-  resource_group_name = can(each.value.resource_group.name) || can(each.value.resource_group_name) ? try(each.value.resource_group.name, each.value.resource_group_name) : local.combined_objects_resource_groups[try(local.client_config.landingzone_key, each.value.resource_group.lz_key)][try(each.value.resource_group_key, each.value.resource_group.key)].name
   data_factory_id     = can(each.value.data_factory.id) ? each.value.data_factory.id : local.combined_objects_data_factory[try(each.value.data_factory.lz_key, local.client_config.landingzone_key)][each.value.data_factory.key].id
   linked_service_name = can(each.value.linked_service.name) ? each.value.linked_service.name : local.combined_objects_data_factory_linked_service_cosmosdb[try(each.value.linked_service.lz_key, local.client_config.landingzone_key)][each.value.linked_service.key].name
 }
@@ -42,7 +40,6 @@ module "data_factory_dataset_delimited_text" {
   global_settings     = local.global_settings
   client_config       = local.client_config
   settings            = each.value
-  resource_group_name = can(each.value.resource_group.name) || can(each.value.resource_group_name) ? try(each.value.resource_group.name, each.value.resource_group_name) : local.combined_objects_resource_groups[try(local.client_config.landingzone_key, each.value.resource_group.lz_key)][try(each.value.resource_group_key, each.value.resource_group.key)].name
   data_factory_id     = can(each.value.data_factory.id) ? each.value.data_factory.id : local.combined_objects_data_factory[try(each.value.data_factory.lz_key, local.client_config.landingzone_key)][each.value.data_factory.key].id
   linked_service_name = can(each.value.linked_service.name) ? each.value.linked_service.name : local.combined_objects_data_factory_linked_service_web[try(each.value.linked_service.lz_key, local.client_config.landingzone_key)][each.value.linked_service.key].name
 
@@ -60,7 +57,6 @@ module "data_factory_dataset_http" {
   global_settings     = local.global_settings
   client_config       = local.client_config
   settings            = each.value
-  resource_group_name = can(each.value.resource_group.name) || can(each.value.resource_group_name) ? try(each.value.resource_group.name, each.value.resource_group_name) : local.combined_objects_resource_groups[try(local.client_config.landingzone_key, each.value.resource_group.lz_key)][try(each.value.resource_group_key, each.value.resource_group.key)].name
   data_factory_id     = can(each.value.data_factory.id) ? each.value.data_factory.id : local.combined_objects_data_factory[try(each.value.data_factory.lz_key, local.client_config.landingzone_key)][each.value.data_factory.key].id
   linked_service_name = can(each.value.linked_service.name) ? each.value.linked_service.name : local.combined_objects_data_factory_linked_service_web[try(each.value.linked_service.lz_key, local.client_config.landingzone_key)][each.value.linked_service.key].name
 
@@ -78,7 +74,6 @@ module "data_factory_dataset_json" {
   global_settings     = local.global_settings
   client_config       = local.client_config
   settings            = each.value
-  resource_group_name = can(each.value.resource_group.name) || can(each.value.resource_group_name) ? try(each.value.resource_group.name, each.value.resource_group_name) : local.combined_objects_resource_groups[try(local.client_config.landingzone_key, each.value.resource_group.lz_key)][try(each.value.resource_group_key, each.value.resource_group.key)].name
   data_factory_id     = can(each.value.data_factory.id) ? each.value.data_factory.id : local.combined_objects_data_factory[try(each.value.data_factory.lz_key, local.client_config.landingzone_key)][each.value.data_factory.key].id
   linked_service_name = can(each.value.linked_service.name) ? each.value.linked_service.name : local.combined_objects_data_factory_linked_service_web[try(each.value.linked_service.lz_key, local.client_config.landingzone_key)][each.value.linked_service.key].name
 
@@ -96,7 +91,6 @@ module "data_factory_dataset_mysql" {
   global_settings     = local.global_settings
   client_config       = local.client_config
   settings            = each.value
-  resource_group_name = can(each.value.resource_group.name) || can(each.value.resource_group_name) ? try(each.value.resource_group.name, each.value.resource_group_name) : local.combined_objects_resource_groups[try(local.client_config.landingzone_key, each.value.resource_group.lz_key)][try(each.value.resource_group_key, each.value.resource_group.key)].name
   data_factory_id     = can(each.value.data_factory.id) ? each.value.data_factory.id : local.combined_objects_data_factory[try(each.value.data_factory.lz_key, local.client_config.landingzone_key)][each.value.data_factory.key].id
   linked_service_name = can(each.value.linked_service.name) ? each.value.linked_service.name : local.combined_objects_data_factory_linked_service_mysql[try(each.value.linked_service.lz_key, local.client_config.landingzone_key)][each.value.linked_service.key].name
 
@@ -114,7 +108,6 @@ module "data_factory_dataset_postgresql" {
   global_settings     = local.global_settings
   client_config       = local.client_config
   settings            = each.value
-  resource_group_name = can(each.value.resource_group.name) || can(each.value.resource_group_name) ? try(each.value.resource_group.name, each.value.resource_group_name) : local.combined_objects_resource_groups[try(local.client_config.landingzone_key, each.value.resource_group.lz_key)][try(each.value.resource_group_key, each.value.resource_group.key)].name
   data_factory_id     = can(each.value.data_factory.id) ? each.value.data_factory.id : local.combined_objects_data_factory[try(each.value.data_factory.lz_key, local.client_config.landingzone_key)][each.value.data_factory.key].id
   linked_service_name = can(each.value.linked_service.name) ? each.value.linked_service.name : local.combined_objects_data_factory_linked_service_postgresql[try(each.value.linked_service.lz_key, local.client_config.landingzone_key)][each.value.linked_service.key].name
 
@@ -133,7 +126,6 @@ module "data_factory_dataset_sql_server_table" {
   global_settings     = local.global_settings
   client_config       = local.client_config
   settings            = each.value
-  resource_group_name = can(each.value.resource_group.name) || can(each.value.resource_group_name) ? try(each.value.resource_group.name, each.value.resource_group_name) : local.combined_objects_resource_groups[try(local.client_config.landingzone_key, each.value.resource_group.lz_key)][try(each.value.resource_group_key, each.value.resource_group.key)].name
   data_factory_id     = can(each.value.data_factory.id) ? each.value.data_factory.id : local.combined_objects_data_factory[try(each.value.data_factory.lz_key, local.client_config.landingzone_key)][each.value.data_factory.key].id
   linked_service_name = can(each.value.linked_service.name) ? each.value.linked_service.name : local.combined_objects_data_factory_linked_service_sql_server[try(each.value.linked_service.lz_key, local.client_config.landingzone_key)][each.value.linked_service.key].name