Renamed queue and lambda

stevebux · stevebux · commit 5bf0071ac85a · 2026-02-09T16:09:52.000Z
diff --git a/infrastructure/terraform/components/api/README.md b/infrastructure/terraform/components/api/README.md
@@ -42,6 +42,8 @@ No requirements.
 
 | Name | Source | Version |
 |------|--------|---------|
+| <a name="module_amendment_event_transformer"></a> [amendment\_event\_transformer](#module\_amendment\_event\_transformer) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip | n/a |
+| <a name="module_amendments_queue"></a> [amendments\_queue](#module\_amendments\_queue) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.24/terraform-sqs.zip | n/a |
 | <a name="module_authorizer_lambda"></a> [authorizer\_lambda](#module\_authorizer\_lambda) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip | n/a |
 | <a name="module_domain_truststore"></a> [domain\_truststore](#module\_domain\_truststore) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.26/terraform-s3bucket.zip | n/a |
 | <a name="module_eventpub"></a> [eventpub](#module\_eventpub) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.26/terraform-eventpub.zip | n/a |
@@ -51,8 +53,6 @@ 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_update"></a> [letter\_status\_update](#module\_letter\_status\_update) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.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 |
diff --git a/infrastructure/terraform/components/api/event_source_mapping_status_updates_to_handler.tf b/infrastructure/terraform/components/api/event_source_mapping_status_updates_to_handler.tf
@@ -1,12 +1,12 @@
 resource "aws_lambda_event_source_mapping" "status_updates_sqs_to_status_update_handler" {
-  event_source_arn                   = module.letter_status_updates_queue.sqs_queue_arn
-  function_name                      = module.letter_status_update.function_arn
+  event_source_arn                   = module.amendments_queue.sqs_queue_arn
+  function_name                      = module.amendment_event_transformer.function_arn
   batch_size                         = 10
   maximum_batching_window_in_seconds = 1
   scaling_config { maximum_concurrency = 10 }
 
   depends_on = [
-    module.letter_status_updates_queue, # ensures queue exists
-    module.letter_status_update         # ensures update handler exists
+    module.amendments_queue, # ensures queue exists
+    module.amendment_event_transformer         # ensures update handler exists
   ]
 }
diff --git a/infrastructure/terraform/components/api/lambda_event_source_mapping_letter_status_update.tf b/infrastructure/terraform/components/api/lambda_event_source_mapping_letter_status_update.tf
@@ -1,6 +1,6 @@
-resource "aws_lambda_event_source_mapping" "letter_status_update" {
-  event_source_arn                   = module.letter_status_updates_queue.sqs_queue_arn
-  function_name                      = module.letter_status_update.function_name
+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 = [
diff --git a/infrastructure/terraform/components/api/module_lambda_amendment_event_transformer.tf b/infrastructure/terraform/components/api/module_lambda_amendment_event_transformer.tf
@@ -1,7 +1,7 @@
-module "letter_status_update" {
+module "amendment_event_transformer" {
   source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip"
 
-  function_name = "letter_status_update"
+  function_name = "amendment_event_transformer"
   description   = "Processes letter status updates"
 
   aws_account_id = var.aws_account_id
@@ -15,14 +15,14 @@ module "letter_status_update" {
   kms_key_arn           = module.kms.key_arn
 
   iam_policy_document = {
-    body = data.aws_iam_policy_document.letter_status_update.json
+    body = data.aws_iam_policy_document.amendment_event_transformer.json
   }
 
   function_s3_bucket      = local.acct.s3_buckets["lambda_function_artefacts"]["id"]
   function_code_base_path = local.aws_lambda_functions_dir_path
   function_code_dir       = "api-handler/dist"
   function_include_common = true
-  handler_function_name   = "letterStatusUpdate"
+  handler_function_name   = "transformAmendmentEvent"
   runtime                 = "nodejs22.x"
   memory                  = 128
   timeout                 = 29
@@ -37,7 +37,7 @@ module "letter_status_update" {
   lambda_env_vars = merge(local.common_lambda_env_vars, {})
 }
 
-data "aws_iam_policy_document" "letter_status_update" {
+data "aws_iam_policy_document" "amendment_event_transformer" {
   statement {
     sid    = "KMSPermissions"
     effect = "Allow"
@@ -78,7 +78,7 @@ data "aws_iam_policy_document" "letter_status_update" {
     ]
 
     resources = [
-    module.letter_status_updates_queue.sqs_queue_arn
+    module.amendments_queue.sqs_queue_arn
     ]
   }
 
diff --git a/infrastructure/terraform/components/api/module_lambda_patch_letter.tf b/infrastructure/terraform/components/api/module_lambda_patch_letter.tf
@@ -35,7 +35,7 @@ module "patch_letter" {
   log_subscription_role_arn = local.acct.log_subscription_role_arn
 
   lambda_env_vars = merge(local.common_lambda_env_vars, {
-    QUEUE_URL = module.letter_status_updates_queue.sqs_queue_url
+    QUEUE_URL = module.amendments_queue.sqs_queue_url
   })
 }
 
@@ -64,7 +64,7 @@ data "aws_iam_policy_document" "patch_letter_lambda" {
     ]
 
     resources = [
-      module.letter_status_updates_queue.sqs_queue_arn
+      module.amendments_queue.sqs_queue_arn
     ]
   }
 }
diff --git a/infrastructure/terraform/components/api/module_lambda_post_letters.tf b/infrastructure/terraform/components/api/module_lambda_post_letters.tf
@@ -35,7 +35,7 @@ module "post_letters" {
   log_subscription_role_arn = local.acct.log_subscription_role_arn
 
   lambda_env_vars = merge(local.common_lambda_env_vars, {
-    QUEUE_URL = module.letter_status_updates_queue.sqs_queue_url,
+    QUEUE_URL = module.amendments_queue.sqs_queue_url,
     MAX_LIMIT = var.max_get_limit
   })
 }
@@ -65,7 +65,7 @@ data "aws_iam_policy_document" "post_letters" {
     ]
 
     resources = [
-      module.letter_status_updates_queue.sqs_queue_arn
+      module.amendments_queue.sqs_queue_arn
     ]
   }
 }
diff --git a/infrastructure/terraform/components/api/module_sqs_letter_status_updates.tf b/infrastructure/terraform/components/api/module_sqs_letter_status_updates.tf
@@ -1,8 +1,8 @@
-# Queue to transport update letter status messages
-module "letter_status_updates_queue" {
+# Queue to transport letter status amendment messages
+module "amendments_queue" {
   source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.24/terraform-sqs.zip"
 
-  name = "letter_status_updates_queue"
+  name = "amendments_queue"
 
   aws_account_id = var.aws_account_id
   component      = var.component
diff --git a/lambdas/api-handler/src/handlers/__tests__/amendment-event-transformer.test.ts b/lambdas/api-handler/src/handlers/__tests__/amendment-event-transformer.test.ts
@@ -7,7 +7,7 @@ import { Letter, LetterRepository } from "@internal/datastore/src";
 import { UpdateLetterCommand } from "../../contracts/letters";
 import { EnvVars } from "../../config/env";
 import { Deps } from "../../config/deps";
-import createLetterStatusUpdateHandler from "../letter-status-update";
+import createTransformAmendmentEventHandler from "../amendment-event-transformer";
 
 // Make crypto return consistent values, since we"re calling it in both prod and test code and comparing the values
 const realCrypto = jest.requireActual("crypto");
@@ -104,9 +104,9 @@ describe("createLetterStatusUpdateHandler", () => {
     const context = mockDeep<Context>();
     const callback = jest.fn();
 
-    const letterStatusUpdateHandler =
-      createLetterStatusUpdateHandler(mockedDeps);
-    await letterStatusUpdateHandler(
+    const transformAmendmentEventHandler =
+      createTransformAmendmentEventHandler(mockedDeps);
+    await transformAmendmentEventHandler(
       buildEvent(updateLetterCommands),
       context,
       callback,
@@ -140,9 +140,9 @@ describe("createLetterStatusUpdateHandler", () => {
     const context = mockDeep<Context>();
     const callback = jest.fn();
 
-    const letterStatusUpdateHandler =
-      createLetterStatusUpdateHandler(mockedDeps);
-    await letterStatusUpdateHandler(
+    const transformAmendmentEventHandler =
+      createTransformAmendmentEventHandler(mockedDeps);
+    await transformAmendmentEventHandler(
       buildEvent([updateLetterCommands[1]]),
       context,
       callback,
@@ -170,9 +170,9 @@ describe("createLetterStatusUpdateHandler", () => {
     );
     (mockedDeps.snsClient.send as jest.Mock).mockResolvedValueOnce({});
 
-    const letterStatusUpdateHandler =
-      createLetterStatusUpdateHandler(mockedDeps);
-    const sqsBatchResponse = await letterStatusUpdateHandler(
+    const transformAmendmentEventHandler =
+      createTransformAmendmentEventHandler(mockedDeps);
+    const sqsBatchResponse = await transformAmendmentEventHandler(
       buildEvent(updateLetterCommands),
       mockDeep<Context>(),
       jest.fn(),
diff --git a/lambdas/api-handler/src/handlers/amendment-event-transformer.ts b/lambdas/api-handler/src/handlers/amendment-event-transformer.ts
@@ -8,7 +8,7 @@ import {
 } from "../contracts/letters";
 import { Deps } from "../config/deps";
 
-export default function createLetterStatusUpdateHandler(
+export default function createTransformAmendmentEventHandler(
   deps: Deps,
 ): SQSHandler {
   return async (event: SQSEvent) => {
diff --git a/lambdas/api-handler/src/index.ts b/lambdas/api-handler/src/index.ts
@@ -4,7 +4,7 @@ import createGetLetterDataHandler from "./handlers/get-letter-data";
 import createGetLettersHandler from "./handlers/get-letters";
 import createPatchLetterHandler from "./handlers/patch-letter";
 import createPostLettersHandler from "./handlers/post-letters";
-import createLetterStatusUpdateHandler from "./handlers/letter-status-update";
+import createTransformAmendmentEventHandler from "./handlers/amendment-event-transformer";
 import createPostMIHandler from "./handlers/post-mi";
 import createGetStatusHandler from "./handlers/get-status";
 
@@ -14,7 +14,8 @@ export const getLetter = createGetLetterHandler(container);
 export const getLetterData = createGetLetterDataHandler(container);
 export const getLetters = createGetLettersHandler(container);
 export const patchLetter = createPatchLetterHandler(container);
-export const letterStatusUpdate = createLetterStatusUpdateHandler(container);
+export const transformAmendmentEvent =
+  createTransformAmendmentEventHandler(container);
 export const postLetters = createPostLettersHandler(container);
 
 export const postMI = createPostMIHandler(container);

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ module "patch_letter" {`
`35`	`35`	`log_subscription_role_arn = local.acct.log_subscription_role_arn`
`36`	`36`
`37`	`37`	`lambda_env_vars = merge(local.common_lambda_env_vars, {`
`38`		`- QUEUE_URL = module.letter_status_updates_queue.sqs_queue_url`
	`38`	`+ QUEUE_URL = module.amendments_queue.sqs_queue_url`
`39`	`39`	`})`
`40`	`40`	`}`
`41`	`41`
`@@ -64,7 +64,7 @@ data "aws_iam_policy_document" "patch_letter_lambda" {`
`64`	`64`	`]`
`65`	`65`
`66`	`66`	`resources = [`
`67`		`- module.letter_status_updates_queue.sqs_queue_arn`
	`67`	`+ module.amendments_queue.sqs_queue_arn`
`68`	`68`	`]`
`69`	`69`	`}`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ module "post_letters" {`
`35`	`35`	`log_subscription_role_arn = local.acct.log_subscription_role_arn`
`36`	`36`
`37`	`37`	`lambda_env_vars = merge(local.common_lambda_env_vars, {`
`38`		`- QUEUE_URL = module.letter_status_updates_queue.sqs_queue_url,`
	`38`	`+ QUEUE_URL = module.amendments_queue.sqs_queue_url,`
`39`	`39`	`MAX_LIMIT = var.max_get_limit`
`40`	`40`	`})`
`41`	`41`	`}`
`@@ -65,7 +65,7 @@ data "aws_iam_policy_document" "post_letters" {`
`65`	`65`	`]`
`66`	`66`
`67`	`67`	`resources = [`
`68`		`- module.letter_status_updates_queue.sqs_queue_arn`
	`68`	`+ module.amendments_queue.sqs_queue_arn`
`69`	`69`	`]`
`70`	`70`	`}`
`71`	`71`	`}`