Merge pull request #341 from aztfmod/AK-tags-overriden

Override base tags with local definitions

modules/compute/virtual_machine/vm_windows_winrm_self.tf

@@ -7,7 +7,7 @@ resource "azurerm_key_vault_certificate" "self_signed_winrm" {
 
   name         = format("%s-winrm-cert", azurecaf_name.windows[each.key].result)
   key_vault_id = local.keyvault.id
-  tags         = try(merge(try(each.value.tags, null), var.base_tags), null)
+  tags         = try(merge(var.base_tags, try(each.value.tags, null)), null)
 
   certificate_policy {
     issuer_parameters {

modules/databases/cosmos_dbs/cassandra_keyspace/main.tf

@@ -2,7 +2,6 @@ locals {
   module_tag = {
     "module" = basename(abspath(path.module))
   }
-  #tags = merge(local.module_tag, try(var.settings.tags, null), var.base_tags)
 }
 
 terraform {

modules/databases/cosmos_dbs/gremlin_database/gremlin_graph/main.tf

@@ -2,7 +2,6 @@ locals {
   module_tag = {
     "module" = basename(abspath(path.module))
   }
-  #tags = merge(local.module_tag, try(var.settings.tags, null), var.base_tags)
 }
 
 terraform {

modules/databases/cosmos_dbs/gremlin_database/main.tf

@@ -2,7 +2,6 @@ locals {
   module_tag = {
     "module" = basename(abspath(path.module))
   }
-  #tags = merge(local.module_tag, try(var.settings.tags, null), var.base_tags)
 }
 
 terraform {

modules/databases/cosmos_dbs/mongo_database/main.tf

@@ -2,7 +2,6 @@ locals {
   module_tag = {
     "module" = basename(abspath(path.module))
   }
-  #tags = merge(local.module_tag, try(var.settings.tags, null), var.base_tags)
 }
 
 terraform {

modules/databases/cosmos_dbs/mongo_database/mongo_collection/main.tf

@@ -2,7 +2,6 @@ locals {
   module_tag = {
     "module" = basename(abspath(path.module))
   }
-  #tags = merge(local.module_tag, try(var.settings.tags, null), var.base_tags)
 }
 
 terraform {

modules/databases/cosmos_dbs/sql_database/main.tf

@@ -2,7 +2,6 @@ locals {
   module_tag = {
     "module" = basename(abspath(path.module))
   }
-  #tags = merge(local.module_tag, try(var.settings.tags, null), var.base_tags)
 }
 
 terraform {

modules/databases/cosmos_dbs/table/main.tf

@@ -2,7 +2,6 @@ locals {
   module_tag = {
     "module" = basename(abspath(path.module))
   }
-  #tags = merge(local.module_tag, try(var.settings.tags, null), var.base_tags)
 }
 
 terraform {

modules/databases/mssql_managed_database/main.tf

@@ -11,7 +11,7 @@ locals {
   module_tag = {
     "module" = basename(abspath(path.module))
   }
-  tags         = merge(local.module_tag, try(var.settings.tags, null), var.base_tags)
+  tags         = merge(var.base_tags, local.module_tag, try(var.settings.tags, null))
   arm_filename = "${path.module}/arm_managed_db.json"
 
   # this is the format required by ARM templates

modules/databases/mssql_managed_instance/main.tf

@@ -11,7 +11,7 @@ locals {
   module_tag = {
     "module" = basename(abspath(path.module))
   }
-  tags         = merge(local.module_tag, try(var.settings.tags, null), var.base_tags)
+  tags         = merge(var.base_tags, local.module_tag, try(var.settings.tags, null))
   arm_filename = "${path.module}/arm_sql_mi.json"
 
   # this is the format required by ARM templates

modules/event_hubs/consumer_groups/main.tf

@@ -12,5 +12,4 @@ locals {
   module_tag = {
     "module" = basename(abspath(path.module))
   }
-  #tags = merge(local.module_tag, lookup(var.settings, "tags", {}), var.base_tags)
 }

modules/event_hubs/hubs/auth_rules/main.tf

@@ -12,5 +12,4 @@ locals {
   module_tag = {
     "module" = basename(abspath(path.module))
   }
-  #tags = merge(local.module_tag, lookup(var.settings, "tags", {}), var.base_tags)
 }

modules/event_hubs/namespaces/auth_rules/main.tf

@@ -12,5 +12,4 @@ locals {
   module_tag = {
     "module" = basename(abspath(path.module))
   }
-  #tags = merge(local.module_tag, lookup(var.settings, "tags", {}), var.base_tags)
 }

modules/event_hubs/namespaces/main.tf

@@ -12,5 +12,5 @@ locals {
   module_tag = {
     "module" = basename(abspath(path.module))
   }
-  tags = merge(local.module_tag, lookup(var.settings, "tags", {}), var.base_tags)
+  tags = merge(var.base_tags, local.module_tag, lookup(var.settings, "tags", {}))
 }

modules/networking/dns_zone/main.tf

@@ -12,5 +12,5 @@ locals {
     "module" = basename(abspath(path.module))
   }
   arm_filename = "${path.module}/arm_domain.json"
-  tags         = merge(local.module_tag, try(var.settings.tags, null), var.base_tags)
+  tags         = merge(var.base_tags, local.module_tag, try(var.settings.tags, null))
 }

modules/networking/dns_zone/records/record_a.tf

@@ -9,7 +9,7 @@ resource "azurerm_dns_a_record" "a" {
   resource_group_name = var.resource_group_name
   ttl                 = try(each.value.ttl, 300)
   records             = try(each.value.records, null)
-  tags                = merge(try(each.value.tags, {}), var.base_tags)
+  tags                = merge(var.base_tags, try(each.value.tags, {}))
 }
 
 resource "azurerm_dns_a_record" "a_dns_zone_record" {
@@ -22,7 +22,7 @@ resource "azurerm_dns_a_record" "a_dns_zone_record" {
   zone_name           = var.zone_name
   resource_group_name = var.resource_group_name
   ttl                 = 300 # Looks like cannot set another value than 300 when using target_resource_id
-  tags                = merge(try(each.value.tags, {}), var.base_tags)
+  tags                = merge(var.base_tags, try(each.value.tags, {}))
   target_resource_id  = azurerm_dns_a_record.a[each.value.resource_id.dns_zone_record.key].id
 }
 
@@ -36,6 +36,6 @@ resource "azurerm_dns_a_record" "a_public_ip_address" {
   zone_name           = var.zone_name
   resource_group_name = var.resource_group_name
   ttl                 = 300 # Looks like cannot set another value than 300 when using target_resource_id
-  tags                = merge(try(each.value.tags, {}), var.base_tags)
+  tags                = merge(var.base_tags, try(each.value.tags, {}))
   target_resource_id  = var.resource_ids.public_ip_addresses[try(each.value.resource_id.public_ip_address.lz_key, var.client_config.landingzone_key)][each.value.resource_id.public_ip_address.key].id
 }

modules/networking/dns_zone/records/record_aaaa.tf

@@ -9,7 +9,7 @@ resource "azurerm_dns_aaaa_record" "aaaa" {
   resource_group_name = var.resource_group_name
   ttl                 = try(each.value.ttl, 300)
   records             = try(each.value.records, null)
-  tags                = merge(try(each.value.tags, {}), var.base_tags)
+  tags                = merge(var.base_tags, try(each.value.tags, {}))
 }
 
 resource "azurerm_dns_aaaa_record" "aaaa_dns_zone_record" {
@@ -22,6 +22,6 @@ resource "azurerm_dns_aaaa_record" "aaaa_dns_zone_record" {
   zone_name           = var.zone_name
   resource_group_name = var.resource_group_name
   ttl                 = 300 # Looks like cannot set another value than 300 when using target_resource_id
-  tags                = merge(try(each.value.tags, {}), var.base_tags)
+  tags                = merge(var.base_tags, try(each.value.tags, {}))
   target_resource_id  = azurerm_dns_aaaa_record.aaaa[each.value.resource_id.dns_zone_record.key].id
 }

modules/networking/dns_zone/records/record_caa.tf

@@ -5,7 +5,7 @@ resource "azurerm_dns_caa_record" "caa" {
   zone_name           = var.zone_name
   resource_group_name = var.resource_group_name
   ttl                 = try(each.value.ttl, 300)
-  tags                = merge(try(each.value.tags, {}), var.base_tags)
+  tags                = merge(var.base_tags, try(each.value.tags, {}))
 
   dynamic "record" {
     for_each = each.value.records

modules/networking/dns_zone/records/record_cname.tf

@@ -9,7 +9,7 @@ resource "azurerm_dns_cname_record" "cname" {
   resource_group_name = var.resource_group_name
   ttl                 = try(each.value.ttl, 300)
   record              = try(each.value.record, null)
-  tags                = merge(try(each.value.tags, {}), var.base_tags)
+  tags                = merge(var.base_tags, try(each.value.tags, {}))
 }
 
 resource "azurerm_dns_cname_record" "cname_dns_zone_record" {
@@ -22,6 +22,6 @@ resource "azurerm_dns_cname_record" "cname_dns_zone_record" {
   zone_name           = var.zone_name
   resource_group_name = var.resource_group_name
   ttl                 = 300 # Looks like cannot set another value than 300 when using target_resource_id
-  tags                = merge(try(each.value.tags, {}), var.base_tags)
+  tags                = merge(var.base_tags, try(each.value.tags, {}))
   target_resource_id  = azurerm_dns_cname_record.cname[each.value.resource_id.dns_zone_record.key].id
 }

modules/networking/dns_zone/records/record_mx.tf

@@ -5,7 +5,7 @@ resource "azurerm_dns_mx_record" "mx" {
   zone_name           = var.zone_name
   resource_group_name = var.resource_group_name
   ttl                 = try(each.value.ttl, 300)
-  tags                = merge(try(each.value.tags, {}), var.base_tags)
+  tags                = merge(var.base_tags, try(each.value.tags, {}))
 
   dynamic "record" {
     for_each = each.value.records

modules/networking/dns_zone/records/record_ns.tf

@@ -6,5 +6,5 @@ resource "azurerm_dns_ns_record" "ns" {
   resource_group_name = var.resource_group_name
   ttl                 = try(each.value.ttl, 300)
   records             = each.value.records
-  tags                = merge(try(each.value.tags, {}), var.base_tags)
+  tags                = merge(var.base_tags, try(each.value.tags, {}))
 }

modules/networking/dns_zone/records/record_ptr.tf

@@ -6,5 +6,5 @@ resource "azurerm_dns_ptr_record" "ptr" {
   resource_group_name = var.resource_group_name
   ttl                 = try(each.value.ttl, 300)
   records             = each.value.records
-  tags                = merge(try(each.value.tags, {}), var.base_tags)
+  tags                = merge(var.base_tags, try(each.value.tags, {}))
 }

modules/networking/dns_zone/records/record_srv.tf

@@ -5,7 +5,7 @@ resource "azurerm_dns_srv_record" "srv" {
   zone_name           = var.zone_name
   resource_group_name = var.resource_group_name
   ttl                 = try(each.value.ttl, 300)
-  tags                = merge(try(each.value.tags, {}), var.base_tags)
+  tags                = merge(var.base_tags, try(each.value.tags, {}))
 
   dynamic "record" {
     for_each = each.value.records

modules/networking/dns_zone/records/record_txt.tf

@@ -5,7 +5,7 @@ resource "azurerm_dns_txt_record" "txt" {
   zone_name           = var.zone_name
   resource_group_name = var.resource_group_name
   ttl                 = try(each.value.ttl, 300)
-  tags                = merge(try(each.value.tags, {}), var.base_tags)
+  tags                = merge(var.base_tags, try(each.value.tags, {}))
 
   dynamic "record" {
     for_each = each.value.records

modules/networking/domain_name_registrations/main.tf

@@ -12,5 +12,5 @@ locals {
     "module" = basename(abspath(path.module))
   }
   arm_filename = "${path.module}/arm_domain.json"
-  tags         = merge(local.module_tag, try(var.settings.tags, null), var.base_tags)
+  tags         = merge(var.base_tags, local.module_tag, try(var.settings.tags, null))
 }

modules/networking/load_balancers/main.tf

@@ -2,7 +2,7 @@ locals {
   module_tag = {
     "module" = basename(abspath(path.module))
   }
-  tags = merge(local.module_tag, try(var.settings.tags, null), var.base_tags)
+  tags = merge(var.base_tags, local.module_tag, try(var.settings.tags, null))
 }
 
 terraform {

modules/security/keyvault/keyvault.tf

@@ -21,7 +21,7 @@ resource "azurerm_key_vault" "keyvault" {
   resource_group_name             = var.resource_groups[var.settings.resource_group_key].name
   tenant_id                       = var.client_config.tenant_id
   sku_name                        = try(var.settings.sku_name, "standard")
-  tags                            = try(merge(local.tags, var.base_tags), {})
+  tags                            = try(merge(var.base_tags, local.tags), {})
   enabled_for_deployment          = try(var.settings.enabled_for_deployment, false)
   enabled_for_disk_encryption     = try(var.settings.enabled_for_disk_encryption, false)
   enabled_for_template_deployment = try(var.settings.enabled_for_template_deployment, false)

modules/security/keyvault/private_endpoints.tf

@@ -15,7 +15,7 @@ module private_endpoint {
   subnet_id           = try(var.vnets[var.client_config.landingzone_key][each.value.vnet_key].subnets[each.value.subnet_key].id, var.vnets[each.value.lz_key][each.value.vnet_key].subnets[each.value.subnet_key].id)
   settings            = each.value
   global_settings     = var.global_settings
-  base_tags           = try(merge(each.value.tags, var.base_tags), {})
+  base_tags           = try(merge(var.base_tags, each.value.tags), {})
   private_dns         = var.private_dns
   client_config       = var.client_config
 }

modules/shared_image_gallery/image_definitions/main.tf

@@ -2,7 +2,7 @@ locals {
   module_tag = {
     "module" = basename(abspath(path.module))
   }
-  tags = merge(local.module_tag, try(var.settings.tags, null), var.base_tags)
+  tags = merge(var.base_tags, local.module_tag, try(var.settings.tags, null))
 }
 
 terraform {

modules/shared_image_gallery/image_galleries/main.tf

@@ -2,7 +2,7 @@ locals {
   module_tag = {
     "module" = basename(abspath(path.module))
   }
-  tags = merge(local.module_tag, try(var.settings.tags, null), var.base_tags)
+  tags = merge(var.base_tags, local.module_tag, try(var.settings.tags, null))
 }
 
 terraform {

modules/shared_image_gallery/packer_service_principal/main.tf

@@ -2,7 +2,7 @@ locals {
   module_tag = {
     "module" = basename(abspath(path.module))
   }
-  tags = merge(local.module_tag, try(var.settings.tags, null), var.base_tags)
+  tags = merge(var.base_tags, local.module_tag, try(var.settings.tags, null))
 }
 
 terraform {

modules/storage_account/storage_account.tf

@@ -26,7 +26,7 @@ resource "azurerm_storage_account" "stg" {
   min_tls_version           = lookup(var.storage_account, "min_tls_version", "TLS1_2")
   allow_blob_public_access  = lookup(var.storage_account, "allow_blob_public_access", false)
   is_hns_enabled            = lookup(var.storage_account, "is_hns_enabled", false)
-  tags                      = merge(local.tags, var.base_tags)
+  tags                      = merge(var.base_tags, local.tags)
 
 
   dynamic "custom_domain" {

modules/webapps/ase/main.tf

@@ -11,7 +11,7 @@ locals {
   module_tag = {
     "module" = basename(abspath(path.module))
   }
-  tags         = merge(var.tags, local.module_tag, var.base_tags)
+  tags         = merge(var.base_tags, local.module_tag, var.tags)
   arm_filename = "${path.module}/arm_ase_isolated.json"
 
   # this is the format required by ARM templates