diff --git a/terraform/environments/cdpt-chaps/locals.tf b/terraform/environments/cdpt-chaps/locals.tf index 1cf2cbe7024..2558ce8ccd5 100644 --- a/terraform/environments/cdpt-chaps/locals.tf +++ b/terraform/environments/cdpt-chaps/locals.tf @@ -13,5 +13,5 @@ locals { domain_type_main = [for k, v in local.domain_types : v.type if k == "modernisation-platform.service.justice.gov.uk"] domain_type_sub = [for k, v in local.domain_types : v.type if k != "modernisation-platform.service.justice.gov.uk"] - ecr_url = "${local.environment_management.account_ids["core-shared-services-production"]}.dkr.ecr.eu-west-2.amazonaws.com/cdpt-chaps-ecr-repo" + ecr_url = "${local.environment_management.account_ids["core-shared-services-production"]}.dkr.ecr.eu-west-2.amazonaws.com/cdpt-chaps-ecr-repo" } diff --git a/terraform/environments/delius-core/modules/components/oracle_db_shared/ssm.tf b/terraform/environments/delius-core/modules/components/oracle_db_shared/ssm.tf index db3b628ee71..6a39ab7e06d 100644 --- a/terraform/environments/delius-core/modules/components/oracle_db_shared/ssm.tf +++ b/terraform/environments/delius-core/modules/components/oracle_db_shared/ssm.tf @@ -1,6 +1,6 @@ resource "aws_ssm_parameter" "rman_password" { - name = "/delius-core-${var.env_name}/delius/oracle-db-operation/rman/rman_password" - type = "SecureString" + name = "/delius-core-${var.env_name}/delius/oracle-db-operation/rman/rman_password" + type = "SecureString" value = "REPLACE" lifecycle { ignore_changes = [ diff --git a/terraform/environments/oasys/locals_preproduction.tf b/terraform/environments/oasys/locals_preproduction.tf index 852c4f324e8..ae5200e12d2 100644 --- a/terraform/environments/oasys/locals_preproduction.tf +++ b/terraform/environments/oasys/locals_preproduction.tf @@ -6,7 +6,7 @@ locals { patch_day = "TUE" } - baseline_s3_buckets = {} + baseline_s3_buckets = {} baseline_ssm_parameters = {} baseline_secretsmanager_secrets = { @@ -94,7 +94,7 @@ locals { }) }) tags = merge(local.database_a.tags, { - instance-scheduling = "skip-scheduling" + instance-scheduling = "skip-scheduling" }) }) diff --git a/terraform/environments/oasys/locals_test.tf b/terraform/environments/oasys/locals_test.tf index 5b2750f41e7..c41907b95c3 100644 --- a/terraform/environments/oasys/locals_test.tf +++ b/terraform/environments/oasys/locals_test.tf @@ -7,9 +7,9 @@ locals { patch_day = "TUE" } - baseline_s3_buckets = {} + baseline_s3_buckets = {} baseline_ssm_parameters = {} - + baseline_secretsmanager_secrets = { "/oracle/database/T1OASYS" = local.secretsmanager_secrets_oasys_db "/oracle/database/T1OASREP" = local.secretsmanager_secrets_db @@ -153,11 +153,11 @@ locals { # }) # }) tags = merge(local.bip_a.tags, { - oasys-environment = "t2" - bip-db-name = "T2BIPINF" - bip-db-hostname = "t2-oasys-db-a" - oasys-db-name = "T2OASYS" - oasys-db-hostname = "t2-oasys-db-a" + oasys-environment = "t2" + bip-db-name = "T2BIPINF" + bip-db-hostname = "t2-oasys-db-a" + oasys-db-name = "T2OASYS" + oasys-db-hostname = "t2-oasys-db-a" }) }) @@ -195,11 +195,11 @@ locals { # }) # }) tags = merge(local.bip_b.tags, { - oasys-environment = "t1" - bip-db-name = "T1BIPINF" - bip-db-hostname = "t1-oasys-db-a" - oasys-db-name = "T1OASYS" - oasys-db-hostname = "t1-oasys-db-a" + oasys-environment = "t1" + bip-db-name = "T1BIPINF" + bip-db-hostname = "t1-oasys-db-a" + oasys-db-name = "T1OASYS" + oasys-db-hostname = "t1-oasys-db-a" }) }) diff --git a/terraform/environments/performance-hub/data.tf b/terraform/environments/performance-hub/data.tf index 528f57fc3fe..ed7dc93a6c2 100644 --- a/terraform/environments/performance-hub/data.tf +++ b/terraform/environments/performance-hub/data.tf @@ -9,26 +9,26 @@ data "template_file" "launch-template" { data "template_file" "task_definition" { template = file("templates/task_definition.json") vars = { - app_name = local.application_name - env_name = local.environment - system_account_id = local.app_data.accounts[local.environment].system_account_id - ecr_url = format("%s%s%s%s", local.environment_management.account_ids["core-shared-services-production"], ".dkr.ecr.", local.app_data.accounts[local.environment].region, ".amazonaws.com/performance-hub-ecr-repo") - server_port = local.app_data.accounts[local.environment].server_port - aws_region = local.app_data.accounts[local.environment].region - container_version = local.app_data.accounts[local.environment].container_version - db_host = local.app_data.accounts[local.environment].db_enabled ? aws_db_instance.database[0].address : "none" - db_user = local.app_data.accounts[local.environment].db_user - db_password = aws_secretsmanager_secret_version.db_password.arn - mojhub_cnnstr = aws_secretsmanager_secret_version.mojhub_cnnstr.arn - mojhub_membership = aws_secretsmanager_secret_version.mojhub_membership.arn - govuk_notify_api_key = aws_secretsmanager_secret_version.govuk_notify_api_key.arn - os_vts_api_key = aws_secretsmanager_secret_version.os_vts_api_key.arn - storage_bucket = "${aws_s3_bucket.upload_files.id}" - friendly_name = local.app_data.accounts[local.environment].friendly_name - hub_wwwroot = local.app_data.accounts[local.environment].hub_wwwroot - ap_import_access_key_id = aws_secretsmanager_secret_version.ap_import_access_key_id.arn - ap_import_secret_access_key = aws_secretsmanager_secret_version.ap_import_secret_access_key.arn - ap_export_access_key_id = aws_secretsmanager_secret_version.ap_export_access_key_id.arn - ap_export_secret_access_key = aws_secretsmanager_secret_version.ap_export_secret_access_key.arn + app_name = local.application_name + env_name = local.environment + system_account_id = local.app_data.accounts[local.environment].system_account_id + ecr_url = format("%s%s%s%s", local.environment_management.account_ids["core-shared-services-production"], ".dkr.ecr.", local.app_data.accounts[local.environment].region, ".amazonaws.com/performance-hub-ecr-repo") + server_port = local.app_data.accounts[local.environment].server_port + aws_region = local.app_data.accounts[local.environment].region + container_version = local.app_data.accounts[local.environment].container_version + db_host = local.app_data.accounts[local.environment].db_enabled ? aws_db_instance.database[0].address : "none" + db_user = local.app_data.accounts[local.environment].db_user + db_password = aws_secretsmanager_secret_version.db_password.arn + mojhub_cnnstr = aws_secretsmanager_secret_version.mojhub_cnnstr.arn + mojhub_membership = aws_secretsmanager_secret_version.mojhub_membership.arn + govuk_notify_api_key = aws_secretsmanager_secret_version.govuk_notify_api_key.arn + os_vts_api_key = aws_secretsmanager_secret_version.os_vts_api_key.arn + storage_bucket = "${aws_s3_bucket.upload_files.id}" + friendly_name = local.app_data.accounts[local.environment].friendly_name + hub_wwwroot = local.app_data.accounts[local.environment].hub_wwwroot + ap_import_access_key_id = aws_secretsmanager_secret_version.ap_import_access_key_id.arn + ap_import_secret_access_key = aws_secretsmanager_secret_version.ap_import_secret_access_key.arn + ap_export_access_key_id = aws_secretsmanager_secret_version.ap_export_access_key_id.arn + ap_export_secret_access_key = aws_secretsmanager_secret_version.ap_export_secret_access_key.arn } } diff --git a/terraform/environments/performance-hub/secrets.tf b/terraform/environments/performance-hub/secrets.tf index e507672f145..c30ce8f5de4 100644 --- a/terraform/environments/performance-hub/secrets.tf +++ b/terraform/environments/performance-hub/secrets.tf @@ -75,7 +75,7 @@ resource "aws_secretsmanager_secret_version" "os_vts_api_key" { #tfsec:ignore:AWS095 resource "aws_secretsmanager_secret" "ap_import_access_key_id" { #checkov:skip=CKV_AWS_149 - name = "ap_import_access_key_id" + name = "ap_import_access_key_id" recovery_window_in_days = 0 tags = merge( local.tags, @@ -92,7 +92,7 @@ resource "aws_secretsmanager_secret_version" "ap_import_access_key_id" { #tfsec:ignore:AWS095 resource "aws_secretsmanager_secret" "ap_import_secret_access_key" { #checkov:skip=CKV_AWS_149 - name = "ap_import_secret_access_key" + name = "ap_import_secret_access_key" recovery_window_in_days = 0 tags = merge( local.tags, @@ -109,7 +109,7 @@ resource "aws_secretsmanager_secret_version" "ap_import_secret_access_key" { #tfsec:ignore:AWS095 resource "aws_secretsmanager_secret" "ap_export_access_key_id" { #checkov:skip=CKV_AWS_149 - name = "ap_export_access_key_id" + name = "ap_export_access_key_id" recovery_window_in_days = 0 tags = merge( local.tags, @@ -126,7 +126,7 @@ resource "aws_secretsmanager_secret_version" "ap_export_access_key_id" { #tfsec:ignore:AWS095 resource "aws_secretsmanager_secret" "ap_export_secret_access_key" { #checkov:skip=CKV_AWS_149 - name = "ap_export_secret_access_key" + name = "ap_export_secret_access_key" recovery_window_in_days = 0 tags = merge( local.tags,