Merge pull request #303 from DFE-Digital/tf-fix-tags

Fix tags in Terraform so plan is consistent
DFE-Digital · Oct 13, 2023 · e2ae6d8 · e2ae6d8
2 parents 3e750fc + 976fbe0
commit e2ae6d8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/Terraform/application.tf b/Terraform/application.tf
@@ -152,4 +152,6 @@ resource "azurerm_monitor_autoscale_setting" "autoscale" {
       }
     }
   }
+
+  tags = data.azurerm_resource_group.rg.tags
 }
diff --git a/Terraform/private-endpoint.tf b/Terraform/private-endpoint.tf
@@ -2,6 +2,13 @@
 resource "azurerm_private_dns_zone" "dnsprivatezone" {
   name                = "privatelink.azurewebsites.net"
   resource_group_name = data.azurerm_resource_group.rg.name
+
+  tags = {
+    Environment = lookup(data.azurerm_resource_group.rg.tags, "Environment", "")
+    Portfolio   = lookup(data.azurerm_resource_group.rg.tags, "Portfolio", "")
+    Product     = lookup(data.azurerm_resource_group.rg.tags, "Product", "")
+    Service     = lookup(data.azurerm_resource_group.rg.tags, "Service", "")
+  }
 }
 
 # Definition of the dns zone link
@@ -10,6 +17,13 @@ resource "azurerm_private_dns_zone_virtual_network_link" "dnszonelink" {
   resource_group_name   = data.azurerm_resource_group.rg.name
   private_dns_zone_name = azurerm_private_dns_zone.dnsprivatezone.name
   virtual_network_id    = data.azurerm_virtual_network.vnet1.id
+
+  tags = {
+    Environment = lookup(data.azurerm_resource_group.rg.tags, "Environment", "")
+    Portfolio   = lookup(data.azurerm_resource_group.rg.tags, "Portfolio", "")
+    Product     = lookup(data.azurerm_resource_group.rg.tags, "Product", "")
+    Service     = lookup(data.azurerm_resource_group.rg.tags, "Service", "")
+  }
 }
 
 # Definition of the private end point for the web app
-Original file line number
+Diff line change
@@ Expand Up / @@ -152,4 +152,6 @@ resource "azurerm_monitor_autoscale_setting" "autoscale" { @@
           }
         }
       }
+      tags = data.azurerm_resource_group.rg.tags
     }