diff --git a/infrastructure/main.tf b/infrastructure/main.tf index 9332291a18..c5e3e81867 100644 --- a/infrastructure/main.tf +++ b/infrastructure/main.tf @@ -69,29 +69,6 @@ resource "azurerm_key_vault_secret" "POSTGRES_DATABASE" { key_vault_id = data.azurerm_key_vault.am_key_vault.id } -resource "azurerm_key_vault_secret" "POSTGRES-PASS-V11" { - name = join("-", [var.component, "POSTGRES-PASS-V11"]) - value = module.org-role-mapping-database-v11.postgresql_password - key_vault_id = data.azurerm_key_vault.am_key_vault.id -} - -module "org-role-mapping-database-v11" { - source = "git@github.com:hmcts/cnp-module-postgres?ref=master" - name = join("-", [local.app_full_name, "postgres-db", "v11"]) - product = var.product - location = var.location - env = var.env - component = var.component - subscription = var.subscription - postgresql_user = var.postgresql_user - database_name = var.database_name - storage_mb = var.database_storage_mb - sku_name = var.database_sku_name - sku_capacity = var.database_sku_capacity - common_tags = var.common_tags - postgresql_version = "11" -} - resource "azurerm_key_vault_secret" "POSTGRES-PASS-V15" { name = "${var.component}-POSTGRES-PASS-V15" value = module.org-role-mapping-database-v15.password diff --git a/infrastructure/terraform.tf b/infrastructure/terraform.tf index 1c39b71a2d..37077727df 100644 --- a/infrastructure/terraform.tf +++ b/infrastructure/terraform.tf @@ -1,5 +1,9 @@ provider "azurerm" { - features {} + features { + resource_group { + prevent_deletion_if_contains_resources = false + } + } } provider "azurerm" { @@ -15,7 +19,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 3.102.0" + version = "~> 3.103.1" } azuread = { source = "hashicorp/azuread"