Removed moved blocks, keep existing queue but starve it

Author: stevebux

infrastructure/terraform/components/api/README.md

@@ -53,6 +53,7 @@ No requirements.
 | <a name="module_get_letters"></a> [get\_letters](#module\_get\_letters) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip | n/a |
 | <a name="module_get_status"></a> [get\_status](#module\_get\_status) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip | n/a |
 | <a name="module_kms"></a> [kms](#module\_kms) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.26/terraform-kms.zip | n/a |
+| <a name="module_letter_status_updates_queue"></a> [letter\_status\_updates\_queue](#module\_letter\_status\_updates\_queue) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.24/terraform-sqs.zip | n/a |
 | <a name="module_letter_updates_transformer"></a> [letter\_updates\_transformer](#module\_letter\_updates\_transformer) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip | n/a |
 | <a name="module_logging_bucket"></a> [logging\_bucket](#module\_logging\_bucket) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.26/terraform-s3bucket.zip | n/a |
 | <a name="module_mi_updates_transformer"></a> [mi\_updates\_transformer](#module\_mi\_updates\_transformer) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.26/terraform-lambda.zip | n/a |

infrastructure/terraform/components/api/lambda_event_source_mapping_amendments.tf

@@ -0,0 +1,9 @@
+resource "aws_lambda_event_source_mapping" "amendment_event_transformer" {
+  event_source_arn                   = module.amendments_queue.sqs_queue_arn
+  function_name                      = module.amendment_event_transformer.function_name
+  batch_size                         = 10
+  maximum_batching_window_in_seconds = 5
+  function_response_types = [
+    "ReportBatchItemFailures"
+  ]
+}

infrastructure/terraform/components/api/lambda_event_source_mapping_letter_status_update.tf

@@ -1,5 +1,5 @@
-resource "aws_lambda_event_source_mapping" "amendment_event_transformer" {
-  event_source_arn                   = module.amendments_queue.sqs_queue_arn
+resource "aws_lambda_event_source_mapping" "letter_status_update" {
+  event_source_arn                   = module.letter_status_updates_queue.sqs_queue_arn
   function_name                      = module.amendment_event_transformer.function_name
   batch_size                         = 10
   maximum_batching_window_in_seconds = 5

infrastructure/terraform/components/api/module_lambda_amendment_event_transformer.tf

@@ -78,7 +78,8 @@ data "aws_iam_policy_document" "amendment_event_transformer" {
     ]
 
     resources = [
-      module.amendments_queue.sqs_queue_arn
+      module.letter_status_updates_queue.sqs_queue_arn,
+      module.amendments_queue.sqs_queue_arn,
     ]
   }
 

infrastructure/terraform/components/api/module_sqs_letter_status_updates.tf

@@ -0,0 +1,17 @@
+# Queue to transport update letter status messages. Now replaced by module.amendments_queue.
+# This queue will not be removed just yet, to allow it to be drained following the release in which module.amendments_queue replaces it.
+module "letter_status_updates_queue" {
+  source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.24/terraform-sqs.zip"
+
+  name = "letter_status_updates_queue"
+
+  aws_account_id = var.aws_account_id
+  component      = var.component
+  environment    = var.environment
+  project        = var.project
+  region         = var.region
+
+  sqs_kms_key_arn = module.kms.key_arn
+
+  create_dlq = true
+}