From f0c4369ff1e104a9314f1908d519925521066bfa Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 28 Aug 2024 06:42:51 +0000 Subject: [PATCH 1/2] Update dependency hashicorp/terraform to v1.9.5 --- .terraform-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.terraform-version b/.terraform-version index 661e7ae..158c747 100644 --- a/.terraform-version +++ b/.terraform-version @@ -1 +1 @@ -1.7.3 +1.9.5 From 8b46d84e6e85a30bdf0cae651f1ab84f190ff9c4 Mon Sep 17 00:00:00 2001 From: 58046 <62422075+hmcts-jenkins-a-to-c[bot]@users.noreply.github.com> Date: Wed, 28 Aug 2024 06:43:44 +0000 Subject: [PATCH 2/2] Updating Terraform Formatting --- aat.tfvars | 2 +- appinsights.tf | 12 ++++++------ demo.tfvars | 2 +- ithc.tfvars | 2 +- key-vault.tf | 8 ++++---- main.tf | 20 ++++++++++---------- perftest.tfvars | 2 +- storage-account.tf | 4 ++-- 8 files changed, 26 insertions(+), 26 deletions(-) diff --git a/aat.tfvars b/aat.tfvars index d6a9f21..73a7650 100644 --- a/aat.tfvars +++ b/aat.tfvars @@ -1,4 +1,4 @@ ccd_storage_account_enable_data_protection = true dmstore_storage_account_enable_data_protection = true additional_managed_identities_access = ["plum", "et", "sptribs", "civil", "ia", "sscs"] -sku = "Standard" +sku = "Standard" diff --git a/appinsights.tf b/appinsights.tf index 54d3cea..1939003 100644 --- a/appinsights.tf +++ b/appinsights.tf @@ -1,13 +1,13 @@ module "application_insights" { source = "git@github.com:hmcts/terraform-module-application-insights?ref=main" - env = var.env - product = var.product - location = var.location - application_type = var.application_type - resource_group_name = azurerm_resource_group.rg.name + env = var.env + product = var.product + location = var.location + application_type = var.application_type + resource_group_name = azurerm_resource_group.rg.name daily_data_cap_in_gb = var.app_insights_data_cap - common_tags = var.common_tags + common_tags = var.common_tags } moved { diff --git a/demo.tfvars b/demo.tfvars index 29cee47..c09c6f7 100644 --- a/demo.tfvars +++ b/demo.tfvars @@ -1,3 +1,3 @@ ccd_storage_account_enable_data_protection = true dmstore_storage_account_enable_data_protection = true -sku = "Standard" +sku = "Standard" diff --git a/ithc.tfvars b/ithc.tfvars index 29cee47..c09c6f7 100644 --- a/ithc.tfvars +++ b/ithc.tfvars @@ -1,3 +1,3 @@ ccd_storage_account_enable_data_protection = true dmstore_storage_account_enable_data_protection = true -sku = "Standard" +sku = "Standard" diff --git a/key-vault.tf b/key-vault.tf index 07a23dd..faef145 100644 --- a/key-vault.tf +++ b/key-vault.tf @@ -11,7 +11,7 @@ module "vault" { common_tags = local.tags additional_managed_identities_access = var.additional_managed_identities_access - create_managed_identity = true + create_managed_identity = true } data "azurerm_key_vault" "s2s_vault" { @@ -23,17 +23,17 @@ data "azurerm_key_vault_secret" "ccd_gw_s2s_key" { name = "microservicekey-ccd-gw" key_vault_id = data.azurerm_key_vault.s2s_vault.id } - + data "azurerm_key_vault_secret" "ccd_case_disposer_s2s_key" { name = "microservicekey-ccd-case-disposer" key_vault_id = data.azurerm_key_vault.s2s_vault.id -} +} resource "azurerm_key_vault_secret" "ccd-case-disposer-s2s-secret" { name = "ccd-case-disposer-s2s-secret" value = data.azurerm_key_vault_secret.ccd_case_disposer_s2s_key.value key_vault_id = module.vault.key_vault_id -} +} resource "azurerm_key_vault_secret" "ccd_gw_s2s_secret" { name = "ccd-gw-s2s-secret" diff --git a/main.tf b/main.tf index afc0db4..64c65cc 100644 --- a/main.tf +++ b/main.tf @@ -3,19 +3,19 @@ locals { var.common_tags, tomap({ "Team Contact" = var.team_contact - "Destroy Me" = var.destroy_me + "Destroy Me" = var.destroy_me }) ) em_tags = merge( - var.common_tags, - tomap({ - "Team Contact" = var.em_team_contact - "Destroy Me" = var.em_destroy_me - "application" = "evidence-management" - "managedBy" = "Evidence Management" - "businessArea" = "CFT" - "contactSlackChannel" = var.em_team_contact - }) + var.common_tags, + tomap({ + "Team Contact" = var.em_team_contact + "Destroy Me" = var.em_destroy_me + "application" = "evidence-management" + "managedBy" = "Evidence Management" + "businessArea" = "CFT" + "contactSlackChannel" = var.em_team_contact + }) ) } diff --git a/perftest.tfvars b/perftest.tfvars index 29cee47..c09c6f7 100644 --- a/perftest.tfvars +++ b/perftest.tfvars @@ -1,3 +1,3 @@ ccd_storage_account_enable_data_protection = true dmstore_storage_account_enable_data_protection = true -sku = "Standard" +sku = "Standard" diff --git a/storage-account.tf b/storage-account.tf index 046f578..a94809e 100644 --- a/storage-account.tf +++ b/storage-account.tf @@ -20,8 +20,8 @@ locals { ] preview_subnets = var.env == "aat" ? [data.azurerm_subnet.preview_aks_00_subnet.id, data.azurerm_subnet.preview_aks_01_subnet.id] : [] - valid_subnets = concat(local.standard_subnets, local.preview_subnets) - + valid_subnets = concat(local.standard_subnets, local.preview_subnets) + dmstoredoc_storage_replication_type = var.env == "aat" ? "LRS" : "ZRS" }