Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion infrastructure/.terraform-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.14.3
1.14.4
2 changes: 1 addition & 1 deletion infrastructure/aat.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ database_storage_mb = "356352"

pgsql_sku = "MO_Standard_E8ds_v4"
pgsql_storage_mb = 1048576
subnet_suffix = "expanded"
subnet_suffix = "expanded"
2 changes: 1 addition & 1 deletion infrastructure/demo.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -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



Expand Down
2 changes: 1 addition & 1 deletion infrastructure/ithc.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ database_storage_mb = "52224"

pgsql_sku = "GP_Standard_D8s_v3"
pgsql_storage_mb = 65536
subnet_suffix = "expanded"
subnet_suffix = "expanded"
28 changes: 14 additions & 14 deletions infrastructure/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand All @@ -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" {
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -113,7 +113,7 @@ module "postgresql_v15" {
value = "7"
},
{
name = "pg_qs.query_capture_mode"
name = "pg_qs.query_capture_mode"
value = "ALL"
},
{
Expand 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
}

////////////////////////////////////
Expand Down
2 changes: 1 addition & 1 deletion infrastructure/outputs.tf
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
output "env" {
value = "${var.env}"
value = var.env
}
2 changes: 1 addition & 1 deletion infrastructure/perftest.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ database_storage_mb = "819200"

pgsql_sku = "MO_Standard_E16ds_v4"
pgsql_storage_mb = 1048576
subnet_suffix = "expanded"
subnet_suffix = "expanded"
10 changes: 5 additions & 5 deletions infrastructure/prod.tfvars
Original file line number Diff line number Diff line change
@@ -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"
4 changes: 2 additions & 2 deletions infrastructure/state.tf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
provider "azurerm" {
provider "azurerm" {
features {
resource_group {
prevent_deletion_if_contains_resources = false
Expand All @@ -9,7 +9,7 @@
subscription_id = var.aks_subscription_id
}

terraform {
terraform {
backend "azurerm" {}

required_providers {
Expand Down