FIxed batch

Author: robertnovac1

infra/s3_source_bucket.tf

@@ -1,5 +1,5 @@
 locals {
-  bucket_name = local.immunisation_account_id == "084828561157" ? "immunisation-batch-${local.account}-preprod-data-sources" : "immunisation-batch-${local.account}-data-sources"
+  bucket_name = local.immunisation_account_id == "084828561157" ? "immunisation-batch-preprod-${local.account}-data-sources" : "immunisation-batch-${local.account}-data-sources"
 }
 
 # Overall entry point into batch in prod. Files are forwarded into the appropriate blue / green bucket.

terraform/Makefile

@@ -60,3 +60,7 @@ catch-all-zip:
 
 tf-%:
 	$(tf_cmd) $*
+
+import: 
+	$(tf_cmd) import $(tf_vars) $(to) $(id)
+

terraform/file_name_processor.tf

@@ -291,7 +291,7 @@ resource "aws_lambda_function" "file_processor_lambda" {
       SPLUNK_FIREHOSE_NAME       = module.splunk.firehose_stream_name
       AUDIT_TABLE_NAME           = aws_dynamodb_table.audit-table.name
       FILE_NAME_GSI              = "filename_index"
-      FILE_NAME_PROC_LAMBDA_NAME = "imms-${local.env}-filenameproc_lambda"
+      FILE_NAME_PROC_LAMBDA_NAME = "${local.short_prefix}-filenameproc_lambda"
 
     }
   }

terraform/s3_config.tf

@@ -92,12 +92,14 @@ resource "aws_s3_bucket_lifecycle_configuration" "datasources_lifecycle" {
   }
 }
 
+# REQUIRES IMPORTING: Once deployed to green this needs to be imported to blue because resource exists after first run
 resource "aws_s3_bucket" "batch_data_destination_bucket" {
   # Deliberately not using `local.batch_prefix` as we don't want separate blue / green destinations in prod.
   bucket        = "immunisation-batch-${local.unique_name}-data-destinations"
   force_destroy = local.is_temp
 }
 
+# REQUIRES IMPORTING: Once deployed to green this needs to be imported to blue because resource exists after first run
 resource "aws_s3_bucket_public_access_block" "batch_data_destination_bucket_public_access_block" {
   bucket = aws_s3_bucket.batch_data_destination_bucket.id
 
@@ -107,6 +109,7 @@ resource "aws_s3_bucket_public_access_block" "batch_data_destination_bucket_publ
   restrict_public_buckets = true
 }
 
+# REQUIRES IMPORTING: Once deployed to green this needs to be imported to blue because resource exists after first run
 resource "aws_s3_bucket_policy" "batch_data_destination_bucket_policy" {
   bucket = aws_s3_bucket.batch_data_destination_bucket.id
   policy = jsonencode({
@@ -151,6 +154,7 @@ resource "aws_s3_bucket_policy" "batch_data_destination_bucket_policy" {
   })
 }
 
+# REQUIRES IMPORTING: Once deployed to green this needs to be imported to blue because resource exists after first run
 resource "aws_s3_bucket_server_side_encryption_configuration" "s3_batch_destination_encryption" {
   bucket = aws_s3_bucket.batch_data_destination_bucket.id
 
@@ -162,6 +166,7 @@ resource "aws_s3_bucket_server_side_encryption_configuration" "s3_batch_destinat
   }
 }
 
+# REQUIRES IMPORTING: Once deployed to green this needs to be imported to blue because resource exists after first run
 resource "aws_s3_bucket_lifecycle_configuration" "data_destinations" {
   bucket = aws_s3_bucket.batch_data_destination_bucket.id
 
@@ -192,13 +197,15 @@ resource "aws_s3_bucket_lifecycle_configuration" "data_destinations" {
   }
 }
 
+# REQUIRES IMPORTING: Once deployed to green this needs to be imported to blue because resource exists after first run
 resource "aws_s3_bucket" "batch_config_bucket" {
   # For now, only create in internal-dev and prod as we only have one shared Redis instance per account.
   count = local.create_config_bucket ? 1 : 0
 
   bucket = "imms-${local.unique_name}-supplier-config"
 }
 
+# REQUIRES IMPORTING: Once deployed to green this needs to be imported to blue because resource exists after first run
 resource "aws_s3_bucket_public_access_block" "batch_config_bucket_public_access_block" {
   count = local.create_config_bucket ? 1 : 0
 
@@ -210,6 +217,7 @@ resource "aws_s3_bucket_public_access_block" "batch_config_bucket_public_access_
   restrict_public_buckets = true
 }
 
+# REQUIRES IMPORTING: Once deployed to green this needs to be imported to blue because resource exists after first run
 resource "aws_s3_bucket_policy" "batch_config_bucket_policy" {
   count = local.create_config_bucket ? 1 : 0