Merge branch 'main' into feature/CCM-13610-letterRequestEventPerformance_secondBranch

Vlasis-Perdikidis · Vlasis-Perdikidis · commit a75180b33d54 · 2026-01-15T16:11:49.000Z
diff --git a/.github/actions/trivy-iac/action.yaml b/.github/actions/trivy-iac/action.yaml
@@ -8,7 +8,8 @@ runs:
       run: |
         components_exit_code=0
         modules_exit_code=0
-
+        asdf plugin add trivy || true
+        asdf install trivy || true
         ./scripts/terraform/trivy-scan.sh --mode iac ./infrastructure/terraform/components || components_exit_code=$?
         ./scripts/terraform/trivy-scan.sh --mode iac ./infrastructure/terraform/modules || modules_exit_code=$?
 
diff --git a/.github/actions/trivy-package/action.yaml b/.github/actions/trivy-package/action.yaml
@@ -7,7 +7,8 @@ runs:
       shell: bash
       run: |
         exit_code=0
-
+        asdf plugin add trivy || true
+        asdf install trivy || true
         ./scripts/terraform/trivy-scan.sh --mode package . || exit_code=$?
 
         if [ $exit_code -ne 0 ]; then
diff --git a/.github/workflows/release_created.yaml b/.github/workflows/release_created.yaml
@@ -2,7 +2,14 @@ name: Github Release Created
 
 on:
   release:
-    types: ["published"] # Inherits all input defaults
+    types: ["released"] # Inherits all input defaults
+  workflow_dispatch:
+    inputs:
+      releaseVersion:
+        description: Release, tag, branch, or commit ID to be used for deployment
+        required: false
+        default: "main"
+        type: string
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -27,7 +34,7 @@ jobs:
           APP_PEM_FILE: ${{ secrets.APP_PEM_FILE }}
         run: |
           bash .github/scripts/dispatch_internal_repo_workflow.sh \
-            --releaseVersion "${{ github.event.release.tag_name }}" \
+            --releaseVersion "${{ github.event.release.tag_name || inputs.releaseVersion }}" \
             --targetWorkflow "dispatch-deploy-static-notify-supplier-api-env.yaml" \
             --targetEnvironment "main" \
             --targetAccountGroup "nhs-notify-supplier-api-nonprod" \
@@ -58,5 +65,5 @@ jobs:
           environment: "main"
           apimEnv: "int"
           runId: "${{ github.run_id }}"
-          releaseVersion: "${{ github.event.release.tag_name }}"
+          releaseVersion: "${{ github.event.release.tag_name || inputs.releaseVersion }}"
           isRelease: true
diff --git a/.github/workflows/stage-1-commit.yaml b/.github/workflows/stage-1-commit.yaml
@@ -169,13 +169,6 @@ jobs:
         uses: actions/checkout@v4
       - name: "Setup ASDF"
         uses: asdf-vm/actions/setup@1902764435ca0dd2f3388eea723a4f92a4eb8302
-      - name: "Repo setup"
-        uses: ./.github/actions/node-install
-        with:
-          node-version: ${{ inputs.nodejs_version }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: "Perform Setup"
-        uses: ./.github/actions/setup
       - name: "Trivy IaC Scan"
         uses: ./.github/actions/trivy-iac
   trivy-package:
@@ -191,13 +184,6 @@ jobs:
         uses: actions/checkout@v4
       - name: "Setup ASDF"
         uses: asdf-vm/actions/setup@1902764435ca0dd2f3388eea723a4f92a4eb8302
-      - name: "Repo setup"
-        uses: ./.github/actions/node-install
-        with:
-          node-version: ${{ inputs.nodejs_version }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: "Perform Setup"
-        uses: ./.github/actions/setup
       - name: "Trivy Package Scan"
         uses: ./.github/actions/trivy-package
   count-lines-of-code:
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.0.1-${yyyy}${mm}${dd}.${HH}${MM}${SS}+${hash}
+1.1.0-${yyyy}${mm}${dd}.${HH}${MM}${SS}+${hash}
diff --git a/infrastructure/terraform/components/api/module_lambda_get_letter_data.tf b/infrastructure/terraform/components/api/module_lambda_get_letter_data.tf
@@ -24,7 +24,7 @@ module "get_letter_data" {
   function_include_common = true
   handler_function_name   = "getLetterData"
   runtime                 = "nodejs22.x"
-  memory                  = 128
+  memory                  = 512
   timeout                 = 29
   log_level               = var.log_level
 
diff --git a/infrastructure/terraform/components/api/module_lambda_letter_updates_transformer.tf b/infrastructure/terraform/components/api/module_lambda_letter_updates_transformer.tf
@@ -24,7 +24,7 @@ module "letter_updates_transformer" {
   function_include_common = true
   handler_function_name   = "handler"
   runtime                 = "nodejs22.x"
-  memory                  = 128
+  memory                  = 512
   timeout                 = 29
   log_level               = var.log_level
 
diff --git a/infrastructure/terraform/components/api/module_lambda_post_letters.tf b/infrastructure/terraform/components/api/module_lambda_post_letters.tf
@@ -24,7 +24,7 @@ module "post_letters" {
   function_include_common = true
   handler_function_name   = "postLetters"
   runtime                 = "nodejs22.x"
-  memory                  = 128
+  memory                  = 512
   timeout                 = 29
   log_level               = var.log_level
 
diff --git a/infrastructure/terraform/components/api/module_lambda_upsert_letter.tf b/infrastructure/terraform/components/api/module_lambda_upsert_letter.tf
@@ -24,7 +24,7 @@ module "upsert_letter" {
   function_include_common = true
   handler_function_name   = "upsertLetterHandler"
   runtime                 = "nodejs22.x"
-  memory                  = 128
+  memory                  = 512
   timeout                 = 29
   log_level               = var.log_level
 
diff --git a/infrastructure/terraform/components/api/modules_eventpub.tf b/infrastructure/terraform/components/api/modules_eventpub.tf
@@ -16,6 +16,8 @@ module "eventpub" {
   log_retention_in_days = var.log_retention_in_days
   log_level             = "INFO"
 
+  force_destroy = var.force_destroy
+
   event_cache_buffer_interval        = 500
   enable_sns_delivery_logging        = true
   sns_success_logging_sample_percent = 0
diff --git a/lambdas/api-handler/src/services/__tests__/letter-operations.test.ts b/lambdas/api-handler/src/services/__tests__/letter-operations.test.ts
@@ -192,26 +192,19 @@ describe("getLetterDataUrl function", () => {
   });
 });
 
+function makeUpdateLetterCommand(n: number): UpdateLetterCommand {
+  return {
+    id: `letter${n}`,
+    status: "PENDING",
+    supplierId: `testSupplier}`,
+  };
+}
+
 describe("enqueueLetterUpdateRequests function", () => {
   beforeEach(() => {
     jest.clearAllMocks();
   });
 
-  const updateLetterCommands: UpdateLetterCommand[] = [
-    {
-      id: "id1",
-      status: "REJECTED",
-      supplierId: "s1",
-      reasonCode: "123",
-      reasonText: "Reason text",
-    },
-    {
-      id: "id2",
-      status: "ACCEPTED",
-      supplierId: "s1",
-    },
-  ];
-
   it("should update the letter status successfully", async () => {
     const sqsClient = { send: jest.fn() } as unknown as SQSClient;
     const logger = { error: jest.fn() } as unknown as pino.Logger;
@@ -220,6 +213,13 @@ describe("enqueueLetterUpdateRequests function", () => {
     };
     const deps: Deps = { sqsClient, logger, env } as Deps;
 
+    const updateLetterCommands = Array.from({ length: 25 }, (_, i) =>
+      makeUpdateLetterCommand(i),
+    );
+
+    const sqsClientSendMock = sqsClient.send as jest.Mock;
+    sqsClientSendMock.mockResolvedValue({ Failed: [] });
+
     const result = await enqueueLetterUpdateRequests(
       updateLetterCommands,
       "correlationId1",
@@ -228,63 +228,55 @@ describe("enqueueLetterUpdateRequests function", () => {
 
     expect(result).toBeUndefined();
 
-    expect(deps.sqsClient.send).toHaveBeenNthCalledWith(
-      1,
-      expect.objectContaining({
-        input: {
-          QueueUrl: deps.env.QUEUE_URL,
-          MessageAttributes: {
-            CorrelationId: {
-              DataType: "String",
-              StringValue: "correlationId1",
-            },
-          },
-          MessageBody: JSON.stringify({
-            id: updateLetterCommands[0].id,
-            status: updateLetterCommands[0].status,
-            supplierId: updateLetterCommands[0].supplierId,
-            reasonCode: updateLetterCommands[0].reasonCode,
-            reasonText: updateLetterCommands[0].reasonText,
-          }),
-        },
-      }),
-    );
+    // processes 10 at a time (25 -> 10+10+5)
+    expect(sqsClientSendMock).toHaveBeenCalledTimes(3);
 
-    expect(deps.sqsClient.send).toHaveBeenNthCalledWith(
-      2,
-      expect.objectContaining({
-        input: {
-          QueueUrl: deps.env.QUEUE_URL,
-          MessageAttributes: {
-            CorrelationId: {
-              DataType: "String",
-              StringValue: "correlationId1",
-            },
-          },
-          MessageBody: JSON.stringify({
-            id: updateLetterCommands[1].id,
-            status: updateLetterCommands[1].status,
-            supplierId: updateLetterCommands[1].supplierId,
-          }),
-        },
-      }),
-    );
+    const firstCallArg = sqsClientSendMock.mock.calls[0][0];
+    const firstInput = firstCallArg.input;
+
+    expect(firstInput.QueueUrl).toBe(deps.env.QUEUE_URL);
+    expect(Array.isArray(firstInput.Entries)).toBe(true);
+    expect(firstInput.Entries.length).toBe(10);
+
+    expect(firstInput.Entries[0].Id).toBe("0-0");
+    expect(firstInput.Entries[9].Id).toBe("0-9");
+
+    expect(
+      firstInput.Entries[0].MessageAttributes.CorrelationId.StringValue,
+    ).toBe("correlationId1");
+
+    const parsed = JSON.parse(firstInput.Entries[0].MessageBody);
+    expect(parsed.id).toBe("letter0");
+
+    // check last batch had 5 entries
+    const thirdCallArg = sqsClientSendMock.mock.calls[2][0];
+    const thirdInput = thirdCallArg.input;
+    expect(thirdInput.Entries.length).toBe(5);
+    // ids in third batch should start "2-0"
+    expect(thirdInput.Entries[0].Id).toBe("2-0");
   });
 
-  it("should log error if enqueueing fails", async () => {
-    const mockError = new Error("error");
+  it("should log error when SendMessageBatch returns Failed entries", async () => {
     const sqsClient = {
       send: jest
         .fn()
-        .mockRejectedValueOnce(mockError)
-        .mockResolvedValueOnce({ MessageId: "m1" }),
+        .mockResolvedValueOnce({ Failed: [] }) // first batch succeeds
+        .mockResolvedValueOnce({
+          Failed: [
+            { Id: "1-1", SenderFault: false, Code: "Err", Message: "failed" },
+          ],
+        }),
     } as unknown as SQSClient;
     const logger = { error: jest.fn() } as unknown as pino.Logger;
     const env = {
       QUEUE_URL: "sqsUrl",
     };
     const deps: Deps = { sqsClient, logger, env } as Deps;
 
+    const updateLetterCommands = Array.from({ length: 12 }, (_, i) =>
+      makeUpdateLetterCommand(i),
+    );
+
     const result = await enqueueLetterUpdateRequests(
       updateLetterCommands,
       "correlationId1",
@@ -293,36 +285,44 @@ describe("enqueueLetterUpdateRequests function", () => {
 
     expect(result).toBeUndefined();
 
-    expect(deps.sqsClient.send).toHaveBeenNthCalledWith(
-      2,
-      expect.objectContaining({
-        input: {
-          QueueUrl: deps.env.QUEUE_URL,
-          MessageAttributes: {
-            CorrelationId: {
-              DataType: "String",
-              StringValue: "correlationId1",
-            },
-          },
-          MessageBody: JSON.stringify({
-            id: updateLetterCommands[1].id,
-            status: updateLetterCommands[1].status,
-            supplierId: updateLetterCommands[1].supplierId,
-          }),
-        },
-      }),
-    );
+    // 12 = 10 + 2
+    expect(deps.sqsClient.send).toHaveBeenCalledTimes(2);
 
     expect(deps.logger.error).toHaveBeenCalledTimes(1);
-    expect(deps.logger.error).toHaveBeenCalledWith(
-      {
-        err: mockError,
-        correlationId: "correlationId1",
-        letterId: updateLetterCommands[0].id,
-        letterStatus: updateLetterCommands[0].status,
-        supplierId: updateLetterCommands[0].supplierId,
-      },
-      "Error enqueuing letter status update",
+    const errorArgs = (deps.logger.error as jest.Mock).mock.calls[0][0];
+    expect(errorArgs.failed).toBeDefined();
+    expect(Array.isArray(errorArgs.failed)).toBe(true);
+    expect(errorArgs.failed[0].Id).toBe("1-1");
+  });
+
+  it("should log error if enqueueing fails", async () => {
+    const sqsClient = {
+      send: jest
+        .fn()
+        .mockResolvedValueOnce({ Failed: [] }) // batch 0
+        .mockImplementationOnce(() => {
+          throw new Error("some failure");
+        }) // batch 1
+        .mockResolvedValueOnce({ Failed: [] }), // batch 2
+    } as unknown as SQSClient;
+    const logger = { error: jest.fn() } as unknown as pino.Logger;
+    const env = {
+      QUEUE_URL: "sqsUrl",
+    };
+    const deps: Deps = { sqsClient, logger, env } as Deps;
+
+    const lettersToUpdate = Array.from({ length: 21 }, (_, i) =>
+      makeUpdateLetterCommand(i),
     );
+
+    await enqueueLetterUpdateRequests(lettersToUpdate, "correlationId1", deps);
+
+    // all 3 attempted
+    expect(deps.sqsClient.send).toHaveBeenCalledTimes(3);
+
+    expect(deps.logger.error).toHaveBeenCalledTimes(1);
+    const logged = (deps.logger.error as jest.Mock).mock.calls[0][0];
+    expect(logged.correlationId).toBe("correlationId1");
+    expect(logged.err).toBeInstanceOf(Error);
   });
 });
diff --git a/lambdas/api-handler/src/services/letter-operations.ts b/lambdas/api-handler/src/services/letter-operations.ts

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-1.0.1-${yyyy}${mm}${dd}.${HH}${MM}${SS}+${hash}`
	`1`	`+1.1.0-${yyyy}${mm}${dd}.${HH}${MM}${SS}+${hash}`