Merge pull request #1549 from aztfmod/AL-2303-tags

Update 5.6.6
aztfmod · Mar 21, 2023 · feb4f6d · feb4f6d
2 parents f55d9cc + ed78753
commit feb4f6d
Show file tree

Hide file tree

Showing 357 changed files with 2,182 additions and 1,375 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -17,11 +17,7 @@
 
     // Use 'settings' to set *default* container specific settings.json values on container create.
     // You can edit these settings after create using File > Preferences > Settings > Remote.
-    "settings": {
-        "files.eol": "\n",
-        "editor.tabSize": 2,
-        "terminal.integrated.scrollback": 32000,
-    },
+
 
     // Uncomment the next line if you want start specific services in your Docker Compose config.
     // "runServices": [],
@@ -33,10 +29,13 @@
     "postCreateCommand": "sudo cp -R /tmp/.ssh-localhost/* ~/.ssh && sudo chown -R $(whoami):$(whoami) /tf/caf ~/.ssh && sudo chmod 400 ~/.ssh/* && git config --global core.editor vi && pre-commit install && pre-commit autoupdate",
 
     // Add the IDs of extensions you want installed when the container is created in the array below.
-    "extensions": [
-        "hashicorp.terraform",
-        "mutantdino.resourcemonitor",
-        "ms-azure-devops.azure-pipelines",
-        "omartawfik.github-actions-vscode"
-    ]
+    "customizations": {
+        "vscode": {
+            "extensions": [
+				"hashicorp.terraform",
+				"mutantdino.resourcemonitor",
+				"eamodio.gitlens"
+			]
+        }
+    }
 }
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
@@ -6,7 +6,7 @@
   version: '3.7'
   services:
     rover:
-      image: aztfmod/rover:1.3.4-2301.1603
+      image: aztfmod/rover-preview:1.3.9-2303.090804
       user: vscode
 
       labels:

diff --git a/.github/workflows/standalone-regressor-tf100.yaml b/.github/workflows/standalone-regressor-tf100.yaml
@@ -55,7 +55,7 @@ jobs:
       matrix: ${{fromJSON(needs.load_scenarios.outputs.matrix)}}
 
     container:
-      image: aztfmod/rover:1.3.4-2301.1603
+      image: aztfmod/rover-preview:1.3.9-2303.090804
       options: --user 0
 
     steps:
@@ -111,6 +111,16 @@ jobs:
           terraform -chdir=${GITHUB_WORKSPACE}/examples \
           init -upgrade=true | grep -P '^- (?=Downloading|Using|Finding|Installing)|^[^-]'
 
+      - name: Terraform Refresh example with selected branch
+        run: |
+          terraform -chdir=${GITHUB_WORKSPACE}/examples \
+            refresh \
+            ${{ env.PARAMETER_FILES }} \
+            -var tags='{testing_job_id='"${{ github.run_id }}"'}' \
+            -var var_folder_path=${{ env.CURRENT_FOLDER }} \
+            -input=false \
+            -state=${{ env.STATE_FILE }}
+
       - name: Terraform Plan example with selected branch
         run: |
           terraform -chdir=${GITHUB_WORKSPACE}/examples \
@@ -165,7 +175,7 @@ jobs:
     needs: [testcases]
 
     container:
-      image: aztfmod/rover:1.3.4-2301.1603
+      image: aztfmod/rover-preview:1.3.9-2303.090804
       options: --user 0
 
     steps:

diff --git a/.github/workflows/standalone-scenarios.json b/.github/workflows/standalone-scenarios.json
@@ -195,7 +195,6 @@
     "networking/virtual_network/100-subnet-delegation",
     "networking/virtual_network/101-vnet-peering-nsg",
     "networking/virtual_network/103-vnet-peering-v1",
-    "networking/virtual_network/200-nsg-flow-logs",
     "networking/virtual_network/201-nsg-flow-logs-v1",
     "networking/virtual_subnets/100-simple-subnet-rbac",
     "networking/virtual_wan/100-vwan-multi-hubs",

diff --git a/.github/workflows/standalone-tf100.yaml b/.github/workflows/standalone-tf100.yaml
@@ -51,7 +51,7 @@ jobs:
       matrix: ${{fromJSON(needs.load_scenarios.outputs.matrix)}}
 
     container:
-      image: aztfmod/rover:1.3.4-2301.1603
+      image: aztfmod/rover-preview:1.3.9-2303.090804
       options: --user 0
 
     steps:
@@ -136,7 +136,7 @@ jobs:
     needs: [testcases]
 
     container:
-      image: aztfmod/rover:1.3.4-2301.1603
+      image: aztfmod/rover-preview:1.3.9-2303.090804
       options: --user 0
 
     steps:

diff --git a/active_directory_domain_service.tf b/active_directory_domain_service.tf
@@ -8,14 +8,12 @@ module "active_directory_domain_service" {
   global_settings = local.global_settings
   client_config   = local.client_config
   settings        = each.value
+  base_tags       = local.global_settings.inherit_tags
 
-  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(each.value.resource_group.lz_key, local.client_config.landingzone_key)][try(each.value.resource_group_key, each.value.resource_group.key)].name
-
-  remote_objects = {
-    vnets          = try(local.combined_objects_networking, null)
-    resource_group = local.combined_objects_resource_groups
-    location       = can(local.global_settings.regions[each.value.region]) ? local.global_settings.regions[each.value.region] : local.combined_objects_resource_groups[try(each.value.resource_group.lz_key, local.client_config.landingzone_key)][try(each.value.resource_group.key, each.value.resource_group_key)].location
-  }
+  resource_group      = local.combined_objects_resource_groups[try(each.value.resource_group.lz_key, local.client_config.landingzone_key)][try(each.value.resource_group_key, each.value.resource_group.key)]
+  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) : null
+  location            = try(local.global_settings.regions[each.value.region], null)
+  vnets               = try(local.combined_objects_networking, null)
 }
 output "active_directory_domain_service" {
   value = module.active_directory_domain_service
@@ -30,7 +28,7 @@ module "active_directory_domain_service_replica_set" {
 
   settings      = each.value
   client_config = local.client_config
-  location      = can(local.global_settings.regions[each.value.region]) ? local.global_settings.regions[each.value.region] : local.combined_objects_resource_groups[try(each.value.resource_group.lz_key, local.client_config.landingzone_key)][try(each.value.resource_group.key, each.value.resource_group_key)].location
+  location      = try(local.global_settings.regions[each.value.region], null)
 
 
   remote_objects = {

diff --git a/aks_clusters.tf b/aks_clusters.tf
@@ -7,8 +7,6 @@ module "aks_clusters" {
   depends_on = [module.networking, module.routes, module.azurerm_firewall_policies, module.application_gateways, module.application_gateway_platforms, module.application_gateway_applications]
   for_each   = local.compute.aks_clusters
 
-  base_tags = try(local.global_settings.inherit_tags, false) ? try(local.combined_objects_resource_groups[try(each.value.resource_group.lz_key, local.client_config.landingzone_key)][try(each.value.resource_group.key, each.value.resource_group_key)].tags, {}) : {}
-
   client_config       = local.client_config
   diagnostic_profiles = try(each.value.diagnostic_profiles, {})
   diagnostics         = local.combined_diagnostics
@@ -26,7 +24,10 @@ module "aks_clusters" {
 
   application_gateway = can(each.value.addon_profile.ingress_application_gateway.key) ? local.combined_objects_application_gateway_platforms[try(each.value.addon_profile.ingress_application_gateway.lz_key, local.client_config.landingzone_key)][each.value.addon_profile.ingress_application_gateway.key] : null
   private_dns_zone_id = can(each.value.private_dns_zone.id) || can(each.value.private_dns_zone.key) == false ? try(each.value.private_dns_zone.id, null) : local.combined_objects_private_dns[try(each.value.private_dns_zone.lz_key, local.client_config.landingzone_key)][each.value.private_dns_zone.key].id
-  location            = can(local.global_settings.regions[each.value.region]) ? local.global_settings.regions[each.value.region] : local.combined_objects_resource_groups[try(each.value.resource_group.lz_key, local.client_config.landingzone_key)][try(each.value.resource_group.key, each.value.resource_group_key)].location
-  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(each.value.resource_group.lz_key, local.client_config.landingzone_key)][try(each.value.resource_group_key, each.value.resource_group.key)].name
+
+  base_tags           = local.global_settings.inherit_tags
+  resource_group      = local.combined_objects_resource_groups[try(each.value.resource_group.lz_key, local.client_config.landingzone_key)][try(each.value.resource_group_key, each.value.resource_group.key)]
+  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) : null
+  location            = try(local.global_settings.regions[each.value.region], null)
 
 }
diff --git a/api_management.tf b/api_management.tf
@@ -6,9 +6,11 @@ module "api_management" {
   client_config   = local.client_config
   settings        = each.value
 
-  location            = can(local.global_settings.regions[each.value.region]) ? local.global_settings.regions[each.value.region] : local.combined_objects_resource_groups[try(each.value.resource_group.lz_key, local.client_config.landingzone_key)][try(each.value.resource_group.key, each.value.resource_group_key)].location
   vnets               = local.combined_objects_networking
-  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(each.value.resource_group.lz_key, local.client_config.landingzone_key)][try(each.value.resource_group_key, each.value.resource_group.key)].name
+  base_tags           = local.global_settings.inherit_tags
+  resource_group      = local.combined_objects_resource_groups[try(each.value.resource_group.lz_key, local.client_config.landingzone_key)][try(each.value.resource_group_key, each.value.resource_group.key)]
+  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) : null
+  location            = try(local.global_settings.regions[each.value.region], null)
 
   remote_objects = {
     resource_group     = local.combined_objects_resource_groups

diff --git a/app_config.tf b/app_config.tf
@@ -4,13 +4,13 @@ module "app_config" {
   name     = each.value.name
 
   client_config       = local.client_config
-  location            = can(local.global_settings.regions[each.value.region]) ? local.global_settings.regions[each.value.region] : local.combined_objects_resource_groups[try(each.value.resource_group.lz_key, local.client_config.landingzone_key)][try(each.value.resource_group.key, each.value.resource_group_key)].location
-  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(each.value.resource_group.lz_key, local.client_config.landingzone_key)][try(each.value.resource_group_key, each.value.resource_group.key)].name
   combined_objects    = local.dynamic_app_config_combined_objects
   global_settings     = local.global_settings
-  base_tags           = try(local.global_settings.inherit_tags, false) ? try(local.combined_objects_resource_groups[try(each.value.resource_group.lz_key, local.client_config.landingzone_key)][try(each.value.resource_group.key, each.value.resource_group_key)].tags, {}) : {}
   settings            = each.value
-  tags                = try(each.value.tags, {})
+  base_tags           = local.global_settings.inherit_tags
+  resource_group      = local.combined_objects_resource_groups[try(each.value.resource_group.lz_key, local.client_config.landingzone_key)][try(each.value.resource_group_key, each.value.resource_group.key)]
+  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) : null
+  location            = try(local.global_settings.regions[each.value.region], null)
 }
 
 output "app_config" {

diff --git a/app_service_environments.tf b/app_service_environments.tf
@@ -35,13 +35,15 @@ module "app_service_environments_v3" {
 
   global_settings     = local.global_settings
   settings            = each.value
-  location            = can(local.global_settings.regions[each.value.region]) ? local.global_settings.regions[each.value.region] : local.combined_objects_resource_groups[try(each.value.resource_group.lz_key, local.client_config.landingzone_key)][try(each.value.resource_group.key, each.value.resource_group_key)].location
-  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(each.value.resource_group.lz_key, local.client_config.landingzone_key)][try(each.value.resource_group_key, each.value.resource_group.key)].name
-  base_tags           = try(local.global_settings.inherit_tags, false) ? try(local.combined_objects_resource_groups[try(each.value.resource_group.lz_key, local.client_config.landingzone_key)][try(each.value.resource_group.key, each.value.resource_group_key)].tags, {}) : {}
   subnet_id           = can(each.value.subnet_id) ? each.value.subnet_id : local.combined_objects_networking[try(each.value.lz_key, local.client_config.landingzone_key)][each.value.vnet_key].subnets[each.value.subnet_key].id
   diagnostic_profiles = try(each.value.diagnostic_profiles, {})
   diagnostics         = local.combined_diagnostics
   private_dns         = lookup(each.value, "private_dns_records", null) == null ? {} : local.combined_objects_private_dns
+
+  base_tags           = local.global_settings.inherit_tags
+  resource_group      = local.combined_objects_resource_groups[try(each.value.resource_group.lz_key, local.client_config.landingzone_key)][try(each.value.resource_group_key, each.value.resource_group.key)]
+  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) : null
+  location            = try(local.global_settings.regions[each.value.region], null)
 }
 
 output "app_service_environments_v3" {

diff --git a/app_service_plans.tf b/app_service_plans.tf
@@ -4,12 +4,13 @@ module "app_service_plans" {
 
   for_each = local.webapp.app_service_plans
 
-  location                   = can(local.global_settings.regions[each.value.region]) ? local.global_settings.regions[each.value.region] : local.combined_objects_resource_groups[try(each.value.resource_group.lz_key, local.client_config.landingzone_key)][try(each.value.resource_group.key, each.value.resource_group_key)].location
-  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(each.value.resource_group.lz_key, local.client_config.landingzone_key)][try(each.value.resource_group_key, each.value.resource_group.key)].name
-  base_tags                  = try(local.global_settings.inherit_tags, false) ? try(local.combined_objects_resource_groups[try(each.value.resource_group.lz_key, local.client_config.landingzone_key)][try(each.value.resource_group.key, each.value.resource_group_key)].tags, {}) : {}
   app_service_environment_id = can(each.value.app_service_environment_id) ? each.value.app_service_environment_id : try(local.combined_objects_app_service_environments_all[try(each.value.app_service_environment.lz_key, local.client_config.landingzone_key)][try(each.value.app_service_environment.key, each.value.app_service_environment_key)].id, null)
 
-  tags            = try(each.value.tags, null)
+  base_tags           = local.global_settings.inherit_tags
+  resource_group      = local.combined_objects_resource_groups[try(each.value.resource_group.lz_key, local.client_config.landingzone_key)][try(each.value.resource_group_key, each.value.resource_group.key)]
+  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) : null
+  location            = try(local.global_settings.regions[each.value.region], null)
+
   kind            = try(each.value.kind, null)
   settings        = each.value
   global_settings = local.global_settings

diff --git a/app_services.tf b/app_services.tf
@@ -8,8 +8,6 @@ module "app_services" {
 
   name                 = each.value.name
   client_config        = local.client_config
-  location             = can(local.global_settings.regions[each.value.region]) ? local.global_settings.regions[each.value.region] : local.combined_objects_resource_groups[try(each.value.resource_group.lz_key, local.client_config.landingzone_key)][try(each.value.resource_group.key, each.value.resource_group_key)].location
-  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(each.value.resource_group.lz_key, local.client_config.landingzone_key)][try(each.value.resource_group_key, each.value.resource_group.key)].name
   app_service_plan_id  = can(each.value.app_service_plan_id) ? each.value.app_service_plan_id : local.combined_objects_app_service_plans[try(each.value.lz_key, local.client_config.landingzone_key)][each.value.app_service_plan_key].id
   settings             = each.value.settings
   identity             = try(each.value.identity, null)
@@ -19,16 +17,19 @@ module "app_services" {
   global_settings      = local.global_settings
   dynamic_app_settings = try(each.value.dynamic_app_settings, {})
   combined_objects     = local.dynamic_app_settings_combined_objects
-  base_tags            = try(local.global_settings.inherit_tags, false) ? try(local.combined_objects_resource_groups[try(each.value.resource_group.lz_key, local.client_config.landingzone_key)][try(each.value.resource_group.key, each.value.resource_group_key)].tags, {}) : {}
   application_insight  = try(each.value.application_insight_key, null) == null ? null : module.azurerm_application_insights[each.value.application_insight_key]
   diagnostic_profiles  = try(each.value.diagnostic_profiles, null)
   diagnostics          = local.combined_diagnostics
   storage_accounts     = local.combined_objects_storage_accounts
-  tags                 = try(each.value.tags, null)
   private_endpoints    = try(each.value.private_endpoints, {})
   vnets                = local.combined_objects_networking
   subnet_id            = can(each.value.subnet_id) || can(each.value.vnet_key) == false ? try(each.value.subnet_id, null) : local.combined_objects_networking[try(each.value.lz_key, local.client_config.landingzone_key)][each.value.vnet_key].subnets[each.value.subnet_key].id
   private_dns          = local.combined_objects_private_dns
+
+  base_tags           = local.global_settings.inherit_tags
+  resource_group      = local.combined_objects_resource_groups[try(each.value.resource_group.lz_key, local.client_config.landingzone_key)][try(each.value.resource_group_key, each.value.resource_group.key)]
+  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) : null
+  location            = try(local.global_settings.regions[each.value.region], null)
 }
 
 output "app_services" {