diff --git a/infrastructure/.terraform-version b/infrastructure/.terraform-version index 4ea8ad87e6..4e00d0ac07 100644 --- a/infrastructure/.terraform-version +++ b/infrastructure/.terraform-version @@ -1 +1 @@ -1.14.3 +1.14.4 diff --git a/infrastructure/aat.tfvars b/infrastructure/aat.tfvars index a0844436ab..028a92c11a 100644 --- a/infrastructure/aat.tfvars +++ b/infrastructure/aat.tfvars @@ -5,4 +5,4 @@ database_storage_mb = "356352" pgsql_sku = "MO_Standard_E8ds_v4" pgsql_storage_mb = 1048576 -subnet_suffix = "expanded" +subnet_suffix = "expanded" diff --git a/infrastructure/demo.tfvars b/infrastructure/demo.tfvars index b5f07dbc64..aebc959acb 100644 --- a/infrastructure/demo.tfvars +++ b/infrastructure/demo.tfvars @@ -2,7 +2,7 @@ database_sku_name = "GP_Gen5_8" database_sku_capacity = "8" pgsql_sku = "GP_Standard_D8s_v3" -pgsql_storage_mb = 131072 +pgsql_storage_mb = 131072 diff --git a/infrastructure/ithc.tfvars b/infrastructure/ithc.tfvars index 477547e464..8f43bb652a 100644 --- a/infrastructure/ithc.tfvars +++ b/infrastructure/ithc.tfvars @@ -4,4 +4,4 @@ database_storage_mb = "52224" pgsql_sku = "GP_Standard_D8s_v3" pgsql_storage_mb = 65536 -subnet_suffix = "expanded" \ No newline at end of file +subnet_suffix = "expanded" \ No newline at end of file diff --git a/infrastructure/main.tf b/infrastructure/main.tf index 67abd52ead..14f36bca1a 100644 --- a/infrastructure/main.tf +++ b/infrastructure/main.tf @@ -22,8 +22,8 @@ locals { } data "azurerm_key_vault" "ccd_shared_key_vault" { - name = "${local.vaultName}" - resource_group_name = "${local.sharedResourceGroup}" + name = local.vaultName + resource_group_name = local.sharedResourceGroup } data "azurerm_key_vault" "s2s_vault" { @@ -33,7 +33,7 @@ data "azurerm_key_vault" "s2s_vault" { data "azurerm_key_vault_secret" "ccd_data_s2s_key" { name = "microservicekey-ccd-data" - key_vault_id = "${data.azurerm_key_vault.s2s_vault.id}" + key_vault_id = data.azurerm_key_vault.s2s_vault.id } resource "azurerm_key_vault_secret" "ccd_data_s2s_secret" { @@ -75,7 +75,7 @@ module "postgresql_v15" { providers = { azurerm.postgres_network = azurerm.postgres_network } - + admin_user_object_id = var.jenkins_AAD_objectId business_area = "cft" common_tags = var.common_tags @@ -113,7 +113,7 @@ module "postgresql_v15" { value = "7" }, { - name = "pg_qs.query_capture_mode" + name = "pg_qs.query_capture_mode" value = "ALL" }, { @@ -126,15 +126,15 @@ module "postgresql_v15" { } ] - pgsql_version = "15" - product = var.product - name = local.db_name - pgsql_sku = var.pgsql_sku - pgsql_storage_mb = var.pgsql_storage_mb - auto_grow_enabled = var.auto_grow_enabled - action_group_name = join("-", [var.action_group_name, local.db_name, var.env]) - email_address_key = var.email_address_key - email_address_key_vault_id = data.azurerm_key_vault.ccd_shared_key_vault.id + pgsql_version = "15" + product = var.product + name = local.db_name + pgsql_sku = var.pgsql_sku + pgsql_storage_mb = var.pgsql_storage_mb + auto_grow_enabled = var.auto_grow_enabled + action_group_name = join("-", [var.action_group_name, local.db_name, var.env]) + email_address_key = var.email_address_key + email_address_key_vault_id = data.azurerm_key_vault.ccd_shared_key_vault.id } //////////////////////////////////// diff --git a/infrastructure/outputs.tf b/infrastructure/outputs.tf index 3cd6bb567a..ded554cd13 100644 --- a/infrastructure/outputs.tf +++ b/infrastructure/outputs.tf @@ -1,3 +1,3 @@ output "env" { - value = "${var.env}" + value = var.env } diff --git a/infrastructure/perftest.tfvars b/infrastructure/perftest.tfvars index b575e393ba..1b392ef0e7 100644 --- a/infrastructure/perftest.tfvars +++ b/infrastructure/perftest.tfvars @@ -4,4 +4,4 @@ database_storage_mb = "819200" pgsql_sku = "MO_Standard_E16ds_v4" pgsql_storage_mb = 1048576 -subnet_suffix = "expanded" \ No newline at end of file +subnet_suffix = "expanded" \ No newline at end of file diff --git a/infrastructure/prod.tfvars b/infrastructure/prod.tfvars index 04023fdc9c..483f795f16 100644 --- a/infrastructure/prod.tfvars +++ b/infrastructure/prod.tfvars @@ -1,12 +1,12 @@ database_sku_name = "GP_Gen5_32" database_sku_capacity = "32" # Note: AutoGrow is enabled in prod, and not supported by cnp-module-postgres module, so database_storage_mb > than current General Purpose Storage for TF. -database_storage_mb = "2048000" +database_storage_mb = "2048000" -pgsql_sku = "MO_Standard_E16s_v3" -pgsql_storage_mb = 4193280 +pgsql_sku = "MO_Standard_E16s_v3" +pgsql_storage_mb = 4193280 auto_grow_enabled = true -subnet_suffix = "expanded" +subnet_suffix = "expanded" enable_schema_ownership = true -kv_subscription = "DCD-CNP-Prod" +kv_subscription = "DCD-CNP-Prod" diff --git a/infrastructure/state.tf b/infrastructure/state.tf index fbedf93e16..1d533fc1d9 100644 --- a/infrastructure/state.tf +++ b/infrastructure/state.tf @@ -1,4 +1,4 @@ - provider "azurerm" { +provider "azurerm" { features { resource_group { prevent_deletion_if_contains_resources = false @@ -9,7 +9,7 @@ subscription_id = var.aks_subscription_id } - terraform { +terraform { backend "azurerm" {} required_providers {