diff --git a/terraform/environments/corporate-staff-rostering/main.tf b/terraform/environments/corporate-staff-rostering/main.tf index 54d8c1747bf..444be6ff1c5 100644 --- a/terraform/environments/corporate-staff-rostering/main.tf +++ b/terraform/environments/corporate-staff-rostering/main.tf @@ -122,6 +122,7 @@ module "baseline" { ) secretsmanager_secrets = merge( + module.baseline_presets.secretsmanager_secrets, local.baseline_secretsmanager_secrets, lookup(local.baseline_environment_config, "baseline_secretsmanager_secrets", {}) ) diff --git a/terraform/environments/hmpps-domain-services/main.tf b/terraform/environments/hmpps-domain-services/main.tf index dd9f98ff579..571227a5ab3 100644 --- a/terraform/environments/hmpps-domain-services/main.tf +++ b/terraform/environments/hmpps-domain-services/main.tf @@ -146,6 +146,7 @@ module "baseline" { ) secretsmanager_secrets = merge( + module.baseline_presets.secretsmanager_secrets, local.baseline_secretsmanager_secrets, lookup(local.baseline_environment_config, "baseline_secretsmanager_secrets", {}) ) diff --git a/terraform/environments/hmpps-oem/main.tf b/terraform/environments/hmpps-oem/main.tf index 831b1027cef..2da1353e4fd 100644 --- a/terraform/environments/hmpps-oem/main.tf +++ b/terraform/environments/hmpps-oem/main.tf @@ -141,6 +141,7 @@ module "baseline" { ) secretsmanager_secrets = merge( + module.baseline_presets.secretsmanager_secrets, local.baseline_secretsmanager_secrets, lookup(local.baseline_environment_config, "baseline_secretsmanager_secrets", {}) ) diff --git a/terraform/environments/nomis-combined-reporting/main.tf b/terraform/environments/nomis-combined-reporting/main.tf index 50c7e56b20f..3982b3b02b8 100644 --- a/terraform/environments/nomis-combined-reporting/main.tf +++ b/terraform/environments/nomis-combined-reporting/main.tf @@ -65,6 +65,7 @@ module "baseline" { lookup(local.environment_config, "baseline_s3_buckets", {}), ) secretsmanager_secrets = merge( + module.baseline_presets.secretsmanager_secrets, local.baseline_secretsmanager_secrets, lookup(local.environment_config, "baseline_secretsmanager_secrets", {}) ) diff --git a/terraform/environments/nomis-data-hub/main.tf b/terraform/environments/nomis-data-hub/main.tf index a8d60fe8206..dbd5cf124ba 100644 --- a/terraform/environments/nomis-data-hub/main.tf +++ b/terraform/environments/nomis-data-hub/main.tf @@ -147,6 +147,7 @@ module "baseline" { ) secretsmanager_secrets = merge( + module.baseline_presets.secretsmanager_secrets, local.baseline_secretsmanager_secrets, lookup(local.baseline_environment_config, "baseline_secretsmanager_secrets", {}) ) diff --git a/terraform/environments/oasys-national-reporting/main.tf b/terraform/environments/oasys-national-reporting/main.tf index 33d066afcd5..1f45ce4395c 100644 --- a/terraform/environments/oasys-national-reporting/main.tf +++ b/terraform/environments/oasys-national-reporting/main.tf @@ -117,6 +117,7 @@ module "baseline" { ) secretsmanager_secrets = merge( + module.baseline_presets.secretsmanager_secrets, local.baseline_secretsmanager_secrets, lookup(local.baseline_environment_config, "baseline_secretsmanager_secrets", {}) ) diff --git a/terraform/environments/oasys/main.tf b/terraform/environments/oasys/main.tf index 3b814cb359f..0e29b9729f1 100644 --- a/terraform/environments/oasys/main.tf +++ b/terraform/environments/oasys/main.tf @@ -125,6 +125,7 @@ module "baseline" { lookup(local.environment_config, "baseline_s3_buckets", {}) ) secretsmanager_secrets = merge( + module.baseline_presets.secretsmanager_secrets, local.baseline_secretsmanager_secrets, lookup(local.environment_config, "baseline_secretsmanager_secrets", {}) ) diff --git a/terraform/environments/planetfm/locals.tf b/terraform/environments/planetfm/locals.tf index abbcc3abb6c..c3e02f09b31 100644 --- a/terraform/environments/planetfm/locals.tf +++ b/terraform/environments/planetfm/locals.tf @@ -69,6 +69,8 @@ locals { } } + baseline_secretsmanager_secrets = {} + baseline_security_groups = { loadbalancer = local.security_groups.loadbalancer web = local.security_groups.web diff --git a/terraform/environments/planetfm/main.tf b/terraform/environments/planetfm/main.tf index ab37210b89b..6b1086b3e8a 100644 --- a/terraform/environments/planetfm/main.tf +++ b/terraform/environments/planetfm/main.tf @@ -116,6 +116,12 @@ module "baseline" { lookup(local.baseline_environment_config, "baseline_s3_buckets", {}) ) + secretsmanager_secrets = merge( + module.baseline_presets.secretsmanager_secrets, + local.baseline_secretsmanager_secrets, + lookup(local.baseline_environment_config, "baseline_secretsmanager_secrets", {}) + ) + security_groups = merge( local.baseline_security_groups, lookup(local.baseline_environment_config, "baseline_security_groups", {})