diff --git a/src/main/terraform/container_app.tf b/src/main/terraform/container_app.tf index 42ebf4b..9f56890 100644 --- a/src/main/terraform/container_app.tf +++ b/src/main/terraform/container_app.tf @@ -181,5 +181,5 @@ resource "azurerm_container_app" "auth" { } } - tags = var.tags + tags = local.tags } \ No newline at end of file diff --git a/src/main/terraform/env/cstar-d-tier-0/backend.ini b/src/main/terraform/env/cstar-d-mcshared/backend.ini similarity index 100% rename from src/main/terraform/env/cstar-d-tier-0/backend.ini rename to src/main/terraform/env/cstar-d-mcshared/backend.ini diff --git a/src/main/terraform/env/cstar-d-tier-0/backend.tfvars b/src/main/terraform/env/cstar-d-mcshared/backend.tfvars similarity index 100% rename from src/main/terraform/env/cstar-d-tier-0/backend.tfvars rename to src/main/terraform/env/cstar-d-mcshared/backend.tfvars diff --git a/src/main/terraform/env/cstar-d-tier-0/terraform.tfvars b/src/main/terraform/env/cstar-d-mcshared/terraform.tfvars similarity index 71% rename from src/main/terraform/env/cstar-d-tier-0/terraform.tfvars rename to src/main/terraform/env/cstar-d-mcshared/terraform.tfvars index 70bf7c2..7ca31f5 100644 --- a/src/main/terraform/env/cstar-d-tier-0/terraform.tfvars +++ b/src/main/terraform/env/cstar-d-mcshared/terraform.tfvars @@ -6,36 +6,27 @@ env_short = "d" env = "dev" location = "westeurope" # this will be "italynorth" location_short = "weu" # this will be "itn" -domain = "tier-0" - -tags = { - CreatedBy = "Terraform" - Environment = "dev" - Owner = "cstar" - Source = "https://github.com/pagopa/mil-auth/tree/main/src/main/terraform" - CostCenter = "TS310 - PAGAMENTI & SERVIZI" - Domain = "tier-0" -} +domain = "mcshared" # ------------------------------------------------------------------------------ # External resources. # ------------------------------------------------------------------------------ -cae_name = "cstar-d-tier-0-cae" -cae_resource_group_name = "cstar-d-tier-0-app-rg" -id_name = "cstar-d-tier-0-auth-id" -id_resource_group_name = "cstar-d-tier-0-identity-rg" -general_kv_name = "cstar-d-tier-0-gen-kv" -general_kv_resource_group_name = "cstar-d-tier-0-sec-rg" -auth_kv_name = "cstar-d-tier-0-auth-kv" -auth_kv_resource_group_name = "cstar-d-tier-0-sec-rg" -auth_st_name = "cstardtier0authst" -auth_st_resource_group_name = "cstar-d-tier-0-data-rg" +cae_name = "cstar-d-mcshared-cae" +cae_resource_group_name = "cstar-d-mcshared-app-rg" +id_name = "cstar-d-mcshared-auth-id" +id_resource_group_name = "cstar-d-mcshared-identity-rg" +general_kv_name = "cstar-d-mcshared-gen-kv" +general_kv_resource_group_name = "cstar-d-mcshared-sec-rg" +auth_kv_name = "cstar-d-mcshared-auth-kv" +auth_kv_resource_group_name = "cstar-d-mcshared-sec-rg" +auth_st_name = "cstardmcsharedauthst" +auth_st_resource_group_name = "cstar-d-mcshared-data-rg" # ------------------------------------------------------------------------------ # Names of key vault secrets. # ------------------------------------------------------------------------------ -cosmosdb_account_primary_mongodb_connection_string_kv_secret = "cosmosdb-account-tier-0-primary-mongodb-connection-string" -cosmosdb_account_secondary_mongodb_connection_string_kv_secret = "cosmosdb-account-tier-0-secondary-mongodb-connection-string" +cosmosdb_account_primary_mongodb_connection_string_kv_secret = "cosmosdb-account-mcshared-primary-mongodb-connection-string" +cosmosdb_account_secondary_mongodb_connection_string_kv_secret = "cosmosdb-account-mcshared-secondary-mongodb-connection-string" storage_account_primary_blob_endpoint_kv_secret = "storage-account-auth-primary-blob-endpoint" key_vault_auth_vault_uri_kv_secret = "key-vault-auth-vault-uri" application_insigths_connection_string_kv_secret = "core-application-insigths-connection-string" diff --git a/src/main/terraform/env/cstar-p-tier-0/backend.ini b/src/main/terraform/env/cstar-p-mcshared/backend.ini similarity index 100% rename from src/main/terraform/env/cstar-p-tier-0/backend.ini rename to src/main/terraform/env/cstar-p-mcshared/backend.ini diff --git a/src/main/terraform/env/cstar-p-tier-0/backend.tfvars b/src/main/terraform/env/cstar-p-mcshared/backend.tfvars similarity index 100% rename from src/main/terraform/env/cstar-p-tier-0/backend.tfvars rename to src/main/terraform/env/cstar-p-mcshared/backend.tfvars diff --git a/src/main/terraform/env/cstar-p-tier-0/terraform.tfvars b/src/main/terraform/env/cstar-p-mcshared/terraform.tfvars similarity index 71% rename from src/main/terraform/env/cstar-p-tier-0/terraform.tfvars rename to src/main/terraform/env/cstar-p-mcshared/terraform.tfvars index ad05bea..a3b596a 100644 --- a/src/main/terraform/env/cstar-p-tier-0/terraform.tfvars +++ b/src/main/terraform/env/cstar-p-mcshared/terraform.tfvars @@ -6,36 +6,27 @@ env_short = "p" env = "prod" location = "westeurope" # this will be "italynorth" location_short = "weu" # this will be "itn" -domain = "tier-0" - -tags = { - CreatedBy = "Terraform" - Environment = "prod" - Owner = "cstar" - Source = "https://github.com/pagopa/mil-auth/tree/main/src/main/terraform" - CostCenter = "TS310 - PAGAMENTI & SERVIZI" - Domain = "tier-0" -} +domain = "mcshared" # ------------------------------------------------------------------------------ # External resources. # ------------------------------------------------------------------------------ -cae_name = "cstar-p-tier-0-cae" -cae_resource_group_name = "cstar-p-tier-0-app-rg" -id_name = "cstar-p-tier-0-auth-id" -id_resource_group_name = "cstar-p-tier-0-identity-rg" -general_kv_name = "cstar-p-tier-0-gen-kv" -general_kv_resource_group_name = "cstar-p-tier-0-sec-rg" -auth_kv_name = "cstar-p-tier-0-auth-kv" -auth_kv_resource_group_name = "cstar-p-tier-0-sec-rg" -auth_st_name = "cstarptier0authst" -auth_st_resource_group_name = "cstar-p-tier-0-data-rg" +cae_name = "cstar-p-mcshared-cae" +cae_resource_group_name = "cstar-p-mcshared-app-rg" +id_name = "cstar-p-mcshared-auth-id" +id_resource_group_name = "cstar-p-mcshared-identity-rg" +general_kv_name = "cstar-p-mcshared-gen-kv" +general_kv_resource_group_name = "cstar-p-mcshared-sec-rg" +auth_kv_name = "cstar-p-mcshared-auth-kv" +auth_kv_resource_group_name = "cstar-p-mcshared-sec-rg" +auth_st_name = "cstarpmcsharedauthst" +auth_st_resource_group_name = "cstar-p-mcshared-data-rg" # ------------------------------------------------------------------------------ # Names of key vault secrets. # ------------------------------------------------------------------------------ -cosmosdb_account_primary_mongodb_connection_string_kv_secret = "cosmosdb-account-tier-0-primary-mongodb-connection-string" -cosmosdb_account_secondary_mongodb_connection_string_kv_secret = "cosmosdb-account-tier-0-secondary-mongodb-connection-string" +cosmosdb_account_primary_mongodb_connection_string_kv_secret = "cosmosdb-account-mcshared-primary-mongodb-connection-string" +cosmosdb_account_secondary_mongodb_connection_string_kv_secret = "cosmosdb-account-mcshared-secondary-mongodb-connection-string" storage_account_primary_blob_endpoint_kv_secret = "storage-account-auth-primary-blob-endpoint" key_vault_auth_vault_uri_kv_secret = "key-vault-auth-vault-uri" application_insigths_connection_string_kv_secret = "core-application-insigths-connection-string" diff --git a/src/main/terraform/env/cstar-u-tier-0/backend.ini b/src/main/terraform/env/cstar-u-mcshared/backend.ini similarity index 100% rename from src/main/terraform/env/cstar-u-tier-0/backend.ini rename to src/main/terraform/env/cstar-u-mcshared/backend.ini diff --git a/src/main/terraform/env/cstar-u-tier-0/backend.tfvars b/src/main/terraform/env/cstar-u-mcshared/backend.tfvars similarity index 100% rename from src/main/terraform/env/cstar-u-tier-0/backend.tfvars rename to src/main/terraform/env/cstar-u-mcshared/backend.tfvars diff --git a/src/main/terraform/env/cstar-u-tier-0/terraform.tfvars b/src/main/terraform/env/cstar-u-mcshared/terraform.tfvars similarity index 71% rename from src/main/terraform/env/cstar-u-tier-0/terraform.tfvars rename to src/main/terraform/env/cstar-u-mcshared/terraform.tfvars index 3c1ad36..0924b10 100644 --- a/src/main/terraform/env/cstar-u-tier-0/terraform.tfvars +++ b/src/main/terraform/env/cstar-u-mcshared/terraform.tfvars @@ -6,36 +6,27 @@ env_short = "u" env = "uat" location = "westeurope" # this will be "italynorth" location_short = "weu" # this will be "itn" -domain = "tier-0" - -tags = { - CreatedBy = "Terraform" - Environment = "uat" - Owner = "cstar" - Source = "https://github.com/pagopa/mil-auth/tree/main/src/main/terraform" - CostCenter = "TS310 - PAGAMENTI & SERVIZI" - Domain = "tier-0" -} +domain = "mcshared" # ------------------------------------------------------------------------------ # External resources. # ------------------------------------------------------------------------------ -cae_name = "cstar-u-tier-0-cae" -cae_resource_group_name = "cstar-u-tier-0-app-rg" -id_name = "cstar-u-tier-0-auth-id" -id_resource_group_name = "cstar-u-tier-0-identity-rg" -general_kv_name = "cstar-u-tier-0-gen-kv" -general_kv_resource_group_name = "cstar-u-tier-0-sec-rg" -auth_kv_name = "cstar-u-tier-0-auth-kv" -auth_kv_resource_group_name = "cstar-u-tier-0-sec-rg" -auth_st_name = "cstarutier0authst" -auth_st_resource_group_name = "cstar-u-tier-0-data-rg" +cae_name = "cstar-u-mcshared-cae" +cae_resource_group_name = "cstar-u-mcshared-app-rg" +id_name = "cstar-u-mcshared-auth-id" +id_resource_group_name = "cstar-u-mcshared-identity-rg" +general_kv_name = "cstar-u-mcshared-gen-kv" +general_kv_resource_group_name = "cstar-u-mcshared-sec-rg" +auth_kv_name = "cstar-u-mcshared-auth-kv" +auth_kv_resource_group_name = "cstar-u-mcshared-sec-rg" +auth_st_name = "cstarumcsharedauthst" +auth_st_resource_group_name = "cstar-u-mcshared-data-rg" # ------------------------------------------------------------------------------ # Names of key vault secrets. # ------------------------------------------------------------------------------ -cosmosdb_account_primary_mongodb_connection_string_kv_secret = "cosmosdb-account-tier-0-primary-mongodb-connection-string" -cosmosdb_account_secondary_mongodb_connection_string_kv_secret = "cosmosdb-account-tier-0-secondary-mongodb-connection-string" +cosmosdb_account_primary_mongodb_connection_string_kv_secret = "cosmosdb-account-mcshared-primary-mongodb-connection-string" +cosmosdb_account_secondary_mongodb_connection_string_kv_secret = "cosmosdb-account-mcshared-secondary-mongodb-connection-string" storage_account_primary_blob_endpoint_kv_secret = "storage-account-auth-primary-blob-endpoint" key_vault_auth_vault_uri_kv_secret = "key-vault-auth-vault-uri" application_insigths_connection_string_kv_secret = "core-application-insigths-connection-string" diff --git a/src/main/terraform/locals.tf b/src/main/terraform/locals.tf index dea9445..a794a1e 100644 --- a/src/main/terraform/locals.tf +++ b/src/main/terraform/locals.tf @@ -3,4 +3,16 @@ locals { # Project label. # project = var.domain == "" ? "${var.prefix}-${var.env_short}" : "${var.prefix}-${var.env_short}-${var.domain}" + + # + # Resources tags. + # + tags = { + CreatedBy = "Terraform" + Environment = var.env_short + Owner = var.prefix + Source = "https://github.com/pagopa/mil-auth/tree/main/src/main/terraform" + CostCenter = "TS310 - PAGAMENTI & SERVIZI" + Application = var.domain == "" ? var.prefix : var.domain + } } \ No newline at end of file diff --git a/src/main/terraform/variables.tf b/src/main/terraform/variables.tf index f846e74..32baac5 100644 --- a/src/main/terraform/variables.tf +++ b/src/main/terraform/variables.tf @@ -41,10 +41,6 @@ variable "location_short" { description = "Location short like eg: neu, weu." } -variable "tags" { - type = map(any) -} - variable "domain" { type = string default = ""