From 65a74b6fe3f3c352162a1faac3141177b85471de Mon Sep 17 00:00:00 2001 From: Andrea Grillo Date: Wed, 15 Jan 2025 12:28:55 +0100 Subject: [PATCH] [IOPLT-807] Update Azure Tags of Common module resources (#1376) Co-authored-by: Krusty93 --- .../_modules/global/modules/dns/private_dns_zones.tf | 4 ++++ src/common/prod/global.tf | 2 +- src/common/prod/locals.tf | 11 ++++++----- src/common/prod/westeurope.tf | 2 +- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/common/_modules/global/modules/dns/private_dns_zones.tf b/src/common/_modules/global/modules/dns/private_dns_zones.tf index 879d892b3..53cdf683e 100644 --- a/src/common/_modules/global/modules/dns/private_dns_zones.tf +++ b/src/common/_modules/global/modules/dns/private_dns_zones.tf @@ -104,11 +104,15 @@ resource "azurerm_private_dns_zone" "privatelink_azurewebsites" { resource "azurerm_private_dns_zone" "privatelink_srch" { name = "privatelink.search.windows.net" resource_group_name = var.resource_groups.common + + tags = var.tags } resource "azurerm_private_dns_zone" "privatelink_vault" { name = "privatelink.vaultcore.azure.net" resource_group_name = var.resource_groups.common + + tags = var.tags } resource "azurerm_private_dns_zone" "azure_api_net" { diff --git a/src/common/prod/global.tf b/src/common/prod/global.tf index 19b4f93c6..614568e89 100644 --- a/src/common/prod/global.tf +++ b/src/common/prod/global.tf @@ -44,5 +44,5 @@ module "global" { apim_v2_private_ip = module.apim_weu.private_ips[0] } - tags = merge(local.tags, { Source = "https://github.com/pagopa/io-infra" }) + tags = local.tags } diff --git a/src/common/prod/locals.tf b/src/common/prod/locals.tf index 6e684c032..fd913e5c8 100644 --- a/src/common/prod/locals.tf +++ b/src/common/prod/locals.tf @@ -8,11 +8,12 @@ locals { secondary_project = "${local.prefix}-${local.env_short}-${local.location_short.germanywestcentral}" tags = { - CostCenter = "TS310 - PAGAMENTI & SERVIZI" - CreatedBy = "Terraform" - Environment = "Prod" - Owner = "IO" - Source = "https://github.com/pagopa/io-infra/blob/main/src/common/prod" + CostCenter = "TS000 - Tecnologia e Servizi" + CreatedBy = "Terraform" + Environment = "Prod" + BusinessUnit = "App IO" + Source = "https://github.com/pagopa/io-infra/blob/main/src/common/prod" + ManagementTeam = "IO Platform" } core = data.terraform_remote_state.core.outputs diff --git a/src/common/prod/westeurope.tf b/src/common/prod/westeurope.tf index b149ae962..8cf47f726 100644 --- a/src/common/prod/westeurope.tf +++ b/src/common/prod/westeurope.tf @@ -340,7 +340,7 @@ module "application_gateway_weu" { deny_paths = ["\\/admin\\/(.*)"] error_action_group_id = module.monitoring_weu.action_groups.error - tags = merge(local.tags, { Source = "https://github.com/pagopa/io-infra" }) + tags = local.tags } module "apim_weu" {