Comments sorted

Author: robertnovac1

terraform/endpoints.tf

@@ -24,7 +24,7 @@ locals {
   imms_lambda_env_vars = {
     "DYNAMODB_TABLE_NAME"    = local.imms_table_name,
     "IMMUNIZATION_ENV"       = var.sub_environment,
-    "IMMUNIZATION_BASE_PATH" = strcontains(terraform.workspace, "pr-") ? "immunisation-fhir-api-${terraform.workspace}" : "immunisation-fhir-api"
+    "IMMUNIZATION_BASE_PATH" = strcontains(var.sub_environment, "pr-") ? "immunisation-fhir-api-${var.sub_environment}" : "immunisation-fhir-api"
     # except for prod and ref, any other env uses PDS int environment
     "PDS_ENV"              = var.pds_environment
     "PDS_CHECK_ENABLED"    = tostring(var.pds_check_enabled)

terraform/environments/prod/blue/variables.tfvars

@@ -1,6 +1,6 @@
 environment             = "prod"
 immunisation_account_id = "664418956997"
-dspp_core_account_id    = "603871901111"
+dspp_core_account_id    = "232116723729"
 pds_environment         = "prod"
 pds_check_enabled       = true
 create_mesh_processor   = true

terraform/environments/prod/green/variables.tfvars

@@ -1,6 +1,6 @@
 environment             = "prod"
 immunisation_account_id = "664418956997"
-dspp_core_account_id    = "603871901111"
+dspp_core_account_id    = "232116723729"
 pds_environment         = "prod"
 pds_check_enabled       = true
 create_mesh_processor   = true

terraform/lambda.tf

@@ -15,7 +15,7 @@ resource "aws_ecr_repository" "operation_lambda_repository" {
     scan_on_push = true
   }
   name         = "${local.prefix}-operation-lambda-repo"
-  force_delete = true #local.is_temp
+  force_delete = local.is_temp
 }
 
 #resource "docker_image" "lambda_function_docker" {

terraform/mesh_processor.tf

@@ -4,19 +4,19 @@ locals {
   mesh_processor_lambda_files   = fileset(local.mesh_processor_lambda_dir, "**")
   mesh_processor_lambda_dir_sha = sha1(join("", [for f in local.mesh_processor_lambda_files : filesha1("${local.mesh_processor_lambda_dir}/${f}")]))
   # This should match the prefix used in the infra Terraform
-  mesh_s3_bucket_name = "imms-${var.environment}-mesh"
+  mesh_module_prefix = "imms-${var.environment}-mesh"
 }
 
 data "aws_s3_bucket" "mesh" {
   count = var.create_mesh_processor ? 1 : 0
 
-  bucket = local.mesh_s3_bucket_name
+  bucket = local.mesh_module_prefix
 }
 
 data "aws_kms_key" "mesh" {
   count = var.create_mesh_processor ? 1 : 0
 
-  key_id = "alias/${local.mesh_s3_bucket_name}"
+  key_id = "alias/${local.mesh_module_prefix}"
 }
 
 resource "aws_ecr_repository" "mesh_file_converter_lambda_repository" {