Look up VPC by name. Disable MESH in preprod. Use correct cert in preprod. Remove unused vars.

Author: mfjarvis

terraform/.terraform.lock.hcl

@@ -3,5 +3,5 @@ immunisation_account_id   = "084828561157"
 dspp_core_account_id      = "603871901111"
 pds_environment           = "int"
 pds_check_enabled         = false
-create_mesh_processor     = true
+create_mesh_processor     = false
 has_sub_environment_scope = false

terraform/environments/preprod/int-blue/variables.tfvars

@@ -3,5 +3,5 @@ immunisation_account_id   = "084828561157"
 dspp_core_account_id      = "603871901111"
 pds_environment           = "int"
 pds_check_enabled         = false
-create_mesh_processor     = true
+create_mesh_processor     = false
 has_sub_environment_scope = false

terraform/environments/preprod/int-green/variables.tfvars

@@ -47,7 +47,9 @@ check "private_subnets" {
 }
 
 data "aws_vpc" "default" {
-  default = true
+  tags = {
+    Name = "imms-${var.environment}-fhir-api-vpc"
+  }
 }
 
 data "aws_subnets" "all" {

terraform/main.tf

@@ -1,6 +1,6 @@
 locals {
   # NHSD cert file
-  truststore_file_name = "server-renewed-cert.pem"
+  truststore_file_name = var.environment == "preprod" ? "imms-int-cert.pem" : "server-renewed-cert.pem"
 }
 
 data "aws_s3_bucket" "cert_storage" {

terraform/modules/api_gateway/mtls_cert.tf

@@ -19,9 +19,6 @@ variable "project_short_name" {
   default = "imms"
 }
 
-variable "use_new_aws_preprod_account" {
-  default = true
-}
 variable "service" {
   default = "fhir-api"
 }
@@ -46,7 +43,6 @@ locals {
   prefix              = "${var.project_name}-${var.service}-${var.sub_environment}"
   short_prefix        = "${var.project_short_name}-${var.sub_environment}"
   batch_prefix        = "immunisation-batch-${var.sub_environment}"
-  vpc_name            = "imms-${var.environment}-fhir-api-vpc"
   root_domain_name    = "${var.environment}.vds.platform.nhs.uk"
   project_domain_name = "imms.${local.root_domain_name}"
   service_domain_name = "${var.sub_environment}.${local.project_domain_name}"