Merge pull request #729 from aztfmod/patch.5.4.5

Patch 5.4.5

.github/workflows/master-standalone-tf14-longrunners.yaml

@@ -35,6 +35,7 @@ jobs:
   examples:
     name: examples
     runs-on: ubuntu-latest
+    needs: load_scenarios
 
     strategy:
       fail-fast: false

.github/workflows/master-standalone-tf15-longrunners.yaml

@@ -35,6 +35,7 @@ jobs:
   examples:
     name: examples
     runs-on: ubuntu-latest
+    needs: load_scenarios
 
     strategy:
       fail-fast: false

.github/workflows/standalone-scenarios.json

@@ -45,6 +45,17 @@
     "cosmos_db/100-simple-cosmos-db-mongo",
     "cosmos_db/100-simple-cosmos-db-sql",
     "cosmos_db/100-simple-cosmos-db-table",
+    "data_factory/101-data_factory",
+    "data_factory/102-data_factory_pipeline",
+    "data_factory/103-data_factory_trigger_schedule",
+    "data_factory/104-data_factory_dataset_azure_blob",
+    "data_factory/105-data_factory_dataset_cosmosdb_sqlapi",
+    "data_factory/106-data_factory_dataset_delimited_text",
+    "data_factory/107-data_factory_dataset_http",
+    "data_factory/108-data_factory_dataset_json",
+    "data_factory/109-data_factory_dataset_mysql",
+    "data_factory/110-data_factory_dataset_postgresql",
+    "data_factory/111-data_factory_dataset_sql_server_table",
     "databricks/100-standard-databricks-no-vnet",
     "databricks/101-standard-databricks-vnet",
     "databricks/102-premium-aml",
@@ -138,6 +149,7 @@
     "storage_accounts/105-nfsv3",
     "storage_accounts/106-storage-account-queue",
     "storage_accounts/107-storage-account-management-policy",
+    "storage_container/101-storage_container",
     "synapse_analytics/100-synapse",
     "synapse_analytics/101-synapse-sparkpool",
     "webapps/appservice/101-appservice-simple",

UPGRADE.md

@@ -2,6 +2,12 @@
 
 When upgrading to a newer version of the CAF module, some configuration structures must be updated before applying the modifications.
 
+## 5.4.5
+
+Upgrade to 5.4.5 includes support azurerm 2.81.0 provider and implements the following changes:
+
+- Deprecation of client_affinity_enabled attribute for the azurerm_function_app object. This option is nolonger configurable and the property is commented in the code.
+
 ## 5.4.4
 
 Due to a regression in the Terraform provider >2.78, this update is not capable of cross-tenant, cross-subscriptions peering between vhub and vwans. This is available in 5.4.3 and will be fixed in 5.5.0.

cosmos_db.tf

@@ -5,8 +5,13 @@ module "cosmos_dbs" {
   location            = lookup(each.value, "region", null) == null ? local.resource_groups[each.value.resource_group_key].location : local.global_settings.regions[each.value.region]
   resource_group_name = local.resource_groups[each.value.resource_group_key].name
   global_settings     = local.global_settings
+  client_config       = local.client_config
+  private_endpoints   = try(each.value.private_endpoints, {})
+  resource_groups     = try(each.value.private_endpoints, {}) == {} ? null : local.resource_groups
+  vnets               = local.combined_objects_networking
   settings            = each.value
   base_tags           = try(local.global_settings.inherit_tags, false) ? local.resource_groups[each.value.resource_group_key].tags : {}
+  private_dns         = local.combined_objects_private_dns
 }
 
 output "cosmos_dbs" {

data_factory.tf

@@ -1,18 +1,28 @@
 ##### azurerm_data_factory
 module "data_factory" {
-  source = "./modules/data_factory/data_factory"
-
+  source   = "./modules/data_factory/data_factory"
   for_each = local.data_factory.data_factory
 
-  name                 = each.value.name
-  resource_group_name  = local.resource_groups[each.value.resource_group_key].name
-  location             = lookup(each.value, "region", null) == null ? local.resource_groups[each.value.resource_group_key].location : local.global_settings.regions[each.value.region]
-  github_configuration = try(each.value.github_configuration, null)
-  identity             = try(each.value.identity, null)
-  vsts_configuration   = try(each.value.vsts_configuration, null)
-  global_settings      = local.global_settings
-  base_tags            = try(local.global_settings.inherit_tags, false) ? local.resource_groups[each.value.resource_group_key].tags : {}
-  tags                 = try(each.value.tags, null)
+  global_settings = local.global_settings
+  client_config   = local.client_config
+  settings        = each.value
+
+  base_tags = try(local.global_settings.inherit_tags, false) ? local.resource_groups[each.value.resource_group.key].tags : {}
+  location  = lookup(each.value, "region", null) == null ? local.resource_groups[each.value.resource_group.key].location : local.global_settings.regions[each.value.region]
+
+  resource_group_name = coalesce(
+    try(local.combined_objects_resource_groups[try(each.value.resource_group.lz_key, local.client_config.landingzone_key)][each.value.resource_group.key].name, null),
+    try(each.value.resource_group.name, null)
+  )
+  remote_objects = {
+    managed_identities = local.combined_objects_managed_identities
+    private_dns                     = local.combined_objects_private_dns
+    vnets                           = local.combined_objects_networking
+    private_endpoints               = try(each.value.private_endpoints, {})
+    resource_groups                 = try(each.value.private_endpoints, {}) == {} ? null : local.resource_groups    
+  }
+
+
 }
 
 output "data_factory" {
@@ -21,18 +31,21 @@ output "data_factory" {
 
 ##### azurerm_data_factory_pipeline
 module "data_factory_pipeline" {
-  source = "./modules/data_factory/data_factory_pipeline"
-
+  source   = "./modules/data_factory/data_factory_pipeline"
   for_each = local.data_factory.data_factory_pipeline
 
-  name                = each.value.name
-  resource_group_name = local.resource_groups[each.value.resource_group_key].name
-  data_factory_name   = module.data_factory[each.value.data_factory_key].name
-  description         = try(each.value.description, null)
-  annotations         = try(each.value.annotations, null)
-  parameters          = try(each.value.parameters, null)
-  variables           = try(each.value.variables, null)
-  activities_json     = try(each.value.activities_json, null)
+  global_settings = local.global_settings
+  client_config   = local.client_config
+  settings        = each.value
+
+  resource_group_name = coalesce(
+    try(local.combined_objects_resource_groups[try(each.value.resource_group.lz_key, local.client_config.landingzone_key)][each.value.resource_group.key].name, null),
+    try(each.value.resource_group.name, null)
+  )
+  data_factory_name = coalesce(
+    try(local.combined_objects_data_factory[try(each.value.data_factory.lz_key, local.client_config.landingzone_key)][each.value.data_factory.key].name, null),
+    try(each.value.data_factory.name, null)
+  )
 }
 
 output "data_factory_pipeline" {
@@ -41,22 +54,26 @@ output "data_factory_pipeline" {
 
 ##### azurerm_data_factory_trigger_schedule
 module "data_factory_trigger_schedule" {
-  source = "./modules/data_factory/data_factory_trigger_schedule"
-
+  source   = "./modules/data_factory/data_factory_trigger_schedule"
   for_each = local.data_factory.data_factory_trigger_schedule
 
-  name                = each.value.name
-  resource_group_name = local.resource_groups[each.value.resource_group_key].name
-  data_factory_name   = module.data_factory[each.value.data_factory_key].name
-  pipeline_name       = module.data_factory_pipeline[each.value.data_factory_pipeline_key].name
-  start_time          = try(each.value.start_time, null)
-  end_time            = try(each.value.end_time, null)
-  interval            = try(each.value.interval, null)
-  frequency           = try(each.value.frequency, null)
-  pipeline_parameters = try(each.value.pipeline_parameters, null)
-  annotations         = try(each.value.annotations, null)
-}
+  global_settings = local.global_settings
+  client_config   = local.client_config
+  settings        = each.value
 
+  resource_group_name = coalesce(
+    try(local.combined_objects_resource_groups[try(each.value.resource_group.lz_key, local.client_config.landingzone_key)][each.value.resource_group.key].name, null),
+    try(each.value.resource_group.name, null)
+  )
+  data_factory_name = coalesce(
+    try(local.combined_objects_data_factory[try(each.value.data_factory.lz_key, local.client_config.landingzone_key)][each.value.data_factory.key].name, null),
+    try(each.value.data_factory.name, null)
+  )
+  pipeline_name = coalesce(
+    try(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, null),
+    try(each.value.data_factory_pipeline.name, null)
+  )
+}
 output "data_factory_trigger_schedule" {
   value = module.data_factory_trigger_schedule
 }