VED-693: Allow customising the source bucket name in ack backend.

mfjarvis · mfjarvis · commit 4345979eab77 · 2025-08-15T15:36:58.000+01:00
diff --git a/ack_backend/src/constants.py b/ack_backend/src/constants.py
@@ -2,7 +2,7 @@
 
 import os
 
-SOURCE_BUCKET_NAME = f"immunisation-batch-{os.getenv('ENVIRONMENT')}-data-sources"
+SOURCE_BUCKET_NAME = os.getenv("SOURCE_BUCKET_NAME")
 ACK_BUCKET_NAME = os.getenv("ACK_BUCKET_NAME")
 AUDIT_TABLE_NAME = os.getenv("AUDIT_TABLE_NAME")
 AUDIT_TABLE_FILENAME_GSI = "filename_index"
diff --git a/ack_backend/tests/utils/mock_environment_variables.py b/ack_backend/tests/utils/mock_environment_variables.py
@@ -21,5 +21,5 @@ class Firehose:
     "ACK_BUCKET_NAME": BucketNames.DESTINATION,
     "FIREHOSE_STREAM_NAME": Firehose.STREAM_NAME,
     "AUDIT_TABLE_NAME": "immunisation-batch-internal-dev-audit-table",
-    "ENVIRONMENT": "internal-dev",
+    "SOURCE_BUCKET_NAME": BucketNames.SOURCE
 }
diff --git a/terraform/ack_lambda.tf b/terraform/ack_lambda.tf
@@ -216,7 +216,7 @@ resource "aws_lambda_function" "ack_processor_lambda" {
     variables = {
       ACK_BUCKET_NAME            = aws_s3_bucket.batch_data_destination_bucket.bucket
       SPLUNK_FIREHOSE_NAME       = module.splunk.firehose_stream_name
-      ENVIRONMENT                = var.sub_environment
+      SOURCE_BUCKET_NAME         = aws_s3_bucket.batch_data_source_bucket.bucket
       AUDIT_TABLE_NAME           = aws_dynamodb_table.audit-table.name
       FILE_NAME_PROC_LAMBDA_NAME = aws_lambda_function.file_processor_lambda.function_name
     }

Original file line number	Diff line number	Diff line change
`@@ -21,5 +21,5 @@ class Firehose:`
`21`	`21`	`"ACK_BUCKET_NAME": BucketNames.DESTINATION,`
`22`	`22`	`"FIREHOSE_STREAM_NAME": Firehose.STREAM_NAME,`
`23`	`23`	`"AUDIT_TABLE_NAME": "immunisation-batch-internal-dev-audit-table",`
`24`		`- "ENVIRONMENT": "internal-dev",`
	`24`	`+ "SOURCE_BUCKET_NAME": BucketNames.SOURCE`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,7 @@ resource "aws_lambda_function" "ack_processor_lambda" {`
`216`	`216`	`variables = {`
`217`	`217`	`ACK_BUCKET_NAME = aws_s3_bucket.batch_data_destination_bucket.bucket`
`218`	`218`	`SPLUNK_FIREHOSE_NAME = module.splunk.firehose_stream_name`
`219`		`- ENVIRONMENT = var.sub_environment`
	`219`	`+ SOURCE_BUCKET_NAME = aws_s3_bucket.batch_data_source_bucket.bucket`
`220`	`220`	`AUDIT_TABLE_NAME = aws_dynamodb_table.audit-table.name`
`221`	`221`	`FILE_NAME_PROC_LAMBDA_NAME = aws_lambda_function.file_processor_lambda.function_name`
`222`	`222`	`}`