Review changes/alarm

Author: stevebux

infrastructure/terraform/components/api/README.md

@@ -58,6 +58,7 @@ No requirements.
 | <a name="module_ddb_alarms_letters"></a> [ddb\_alarms\_letters](#module\_ddb\_alarms\_letters) | ../../modules/alarms-ddb | n/a |
 | <a name="module_ddb_alarms_mi"></a> [ddb\_alarms\_mi](#module\_ddb\_alarms\_mi) | ../../modules/alarms-ddb | n/a |
 | <a name="module_ddb_alarms_suppliers"></a> [ddb\_alarms\_suppliers](#module\_ddb\_alarms\_suppliers) | ../../modules/alarms-ddb | n/a |
+| <a name="module_ddb_alarms_upsert_idempotency"></a> [ddb\_alarms\_upsert\_idempotency](#module\_ddb\_alarms\_upsert\_idempotency) | ../../modules/alarms-ddb | n/a |
 | <a name="module_domain_truststore"></a> [domain\_truststore](#module\_domain\_truststore) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/3.0.6/terraform-s3bucket.zip | n/a |
 | <a name="module_eventpub"></a> [eventpub](#module\_eventpub) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/3.0.6/terraform-eventpub.zip | n/a |
 | <a name="module_eventsub"></a> [eventsub](#module\_eventsub) | ../../modules/eventsub | n/a |

infrastructure/terraform/components/api/ddb_table_upsert_idempotency.tf

@@ -10,4 +10,15 @@ resource "aws_dynamodb_table" "upsert_idempotency" {
     attribute_name = "expiration"
     enabled        = true
   }
+
+  point_in_time_recovery {
+    enabled = true
+  }
+
+  tags = merge(
+    local.default_tags,
+    {
+      NHSE-Enable-Dynamo-Backup-Acct = "True"
+    }
+  )
 }

infrastructure/terraform/components/api/module_ddb_alarms_upsert_idempotency.tf

@@ -0,0 +1,7 @@
+module "ddb_alarms_upsert_idempotency" {
+  count        = local.alarms_enabled ? 1 : 0
+  source       = "../../modules/alarms-ddb"
+  alarm_prefix = local.csi
+  table_name   = aws_dynamodb_table.upsert_idempotency.name
+  tags         = local.default_tags
+}

lambdas/upsert-letter/src/handler/__tests__/upsert-handler.test.ts

@@ -360,7 +360,7 @@ describe("createUpsertLetterHandler", () => {
     const evt: SQSEvent = createSQSEvent([
       createSqsRecord("msg2", JSON.stringify(v1message)),
     ]);
-    (makeIdempotent as jest.Mock).mockImplementationOnce((_fn) => {});
+    (makeIdempotent as jest.Mock).mockImplementationOnce((_fn) => "supplier1");
 
     await createUpsertLetterHandler(mockedDeps)(evt, {} as any, {} as any);
 

lambdas/upsert-letter/src/handler/upsert-handler.ts

@@ -15,7 +15,6 @@ import {
   IdempotencyConfig,
   makeIdempotent,
 } from "@aws-lambda-powertools/idempotency";
-import { AnyFunction } from "@aws-lambda-powertools/idempotency/lib/cjs/types/IdempotencyOptions";
 import { Deps } from "../config/deps";
 import {
   PreparedEvents,
@@ -189,7 +188,11 @@ function parseQueueMessage(queueMessage: string): QueueMessage {
 }
 
 export default function createUpsertLetterHandler(deps: Deps): SQSHandler {
-  const processRecordIdempotently = makeIdempotentOnId(processRecord, deps);
+  const processRecordIdempotently = makeIdempotent(processRecord, {
+    persistenceStore: deps.idempotencyLayer,
+    config: idempotencyConfig,
+  });
+
   return metricScope((metrics: MetricsLogger) => {
     return async (event: SQSEvent, context: Context) => {
       const batchItemFailures: SQSBatchItemFailure[] = [];
@@ -284,10 +287,3 @@ async function processRecord(
   perSupplierSuccess.set(supplier, (perSupplierSuccess.get(supplier) || 0) + 1);
   return supplier;
 }
-
-function makeIdempotentOnId(fn: AnyFunction, deps: Deps) {
-  return makeIdempotent(fn, {
-    persistenceStore: deps.idempotencyLayer,
-    config: idempotencyConfig,
-  });
-}

package-lock.json

@@ -135,8 +135,5 @@
     "scripts/utilities/*",
     "tests",
     "tests/contracts/*"
-  ],
-  "dependencies": {
-    "@aws-lambda-powertools/idempotency": "^2.33.0"
-  }
+  ]
 }

package.json

@@ -2,10 +2,11 @@ import { randomUUID } from "node:crypto";
 
 export function createPreparedV1Event(overrides: Record<string, unknown> = {}) {
   const now = new Date().toISOString();
+  const { id, ...dataOverrides } = overrides;
 
   return {
     specversion: "1.0",
-    id: randomUUID(),
+    id: (id as string) ?? randomUUID(),
     source: "/data-plane/letter-rendering/test",
     subject: "client/client1/letter-request/letterRequest1",
     type: "uk.nhs.notify.letter-rendering.letter-request.prepared.v1",
@@ -28,7 +29,7 @@ export function createPreparedV1Event(overrides: Record<string, unknown> = {}) {
       createdAt: now,
       pageCount: 1,
       status: "PREPARED",
-      ...overrides,
+      ...dataOverrides,
     },
     traceparent: "00-0af7651916cd43dd8448eb211c803191-b7ad6b7169203331-01",
     recordedtime: now,