review changes

Author: nhsd-david-wass

infrastructure/terraform/components/api/module_sqs_supplier_allocator.tf

@@ -18,29 +18,6 @@ module "sqs_supplier_allocator" {
 
 data "aws_iam_policy_document" "supplier_allocator_queue_policy" {
   version = "2012-10-17"
-  statement {
-    sid    = "AllowSNSToSendMessage"
-    effect = "Allow"
-
-    principals {
-      type        = "Service"
-      identifiers = ["sns.amazonaws.com"]
-    }
-
-    actions = [
-      "sqs:SendMessage"
-    ]
-
-    resources = [
-      "arn:aws:sqs:${var.region}:${var.aws_account_id}:${var.project}-${var.environment}-${var.component}-supplier-allocator-queue"
-    ]
-
-    condition {
-      test     = "ArnEquals"
-      variable = "aws:SourceArn"
-      values   = [module.eventsub.sns_topic.arn]
-    }
-  }
 
   statement {
     sid    = "AllowSNSPermissions"

lambdas/supplier-allocator/src/config/__tests__/deps.test.ts

@@ -2,8 +2,12 @@ import type { Deps } from "lambdas/supplier-allocator/src/config/deps";
 
 describe("createDependenciesContainer", () => {
   const env = {
-    LETTERS_TABLE_NAME: "LettersTable",
-    LETTER_TTL_HOURS: 12_960,
+    VARIANT_MAP: {
+      lv1: {
+        supplierId: "supplier1",
+        specId: "spec1",
+      },
+    },
   };
 
   beforeEach(() => {

lambdas/supplier-allocator/src/config/__tests__/env.test.ts

@@ -15,8 +15,6 @@ describe("lambdaEnv", () => {
   });
 
   it("should load all environment variables successfully", () => {
-    process.env.LETTERS_TABLE_NAME = "letters-table";
-    process.env.LETTER_TTL_HOURS = "12960";
     process.env.VARIANT_MAP = `{
       "lv1": {
         "supplierId": "supplier1",
@@ -27,8 +25,6 @@ describe("lambdaEnv", () => {
     const { envVars } = require("../env");
 
     expect(envVars).toEqual({
-      LETTERS_TABLE_NAME: "letters-table",
-      LETTER_TTL_HOURS: 12_960,
       VARIANT_MAP: {
         lv1: {
           supplierId: "supplier1",
@@ -39,8 +35,6 @@ describe("lambdaEnv", () => {
   });
 
   it("should throw if a required env var is missing", () => {
-    process.env.LETTERS_TABLE_NAME = "table";
-    process.env.LETTER_TTL_HOURS = "12960";
     process.env.VARIANT_MAP = undefined;
 
     expect(() => require("../env")).toThrow(ZodError);

lambdas/supplier-allocator/src/config/env.ts

@@ -10,8 +10,6 @@ const LetterVariantSchema = z.record(
 export type LetterVariant = z.infer<typeof LetterVariantSchema>;
 
 const EnvVarsSchema = z.object({
-  LETTERS_TABLE_NAME: z.string(),
-  LETTER_TTL_HOURS: z.coerce.number().int(),
   VARIANT_MAP: z.string().transform((str, _) => {
     const parsed = JSON.parse(str);
     return LetterVariantSchema.parse(parsed);

lambdas/supplier-allocator/src/handler/__tests__/allocate-handler.test.ts

@@ -141,8 +141,6 @@ describe("createSupplierAllocatorHandler", () => {
     mockedDeps = {
       logger: { error: jest.fn(), info: jest.fn() } as unknown as pino.Logger,
       env: {
-        LETTERS_TABLE_NAME: "LETTERS_TABLE_NAME",
-        LETTER_TTL_HOURS: 12_960,
         VARIANT_MAP: {
           lv1: {
             supplierId: "supplier1",

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

@@ -38,7 +38,7 @@ const QueueMessageSchema = z.union([
 ]);
 
 type UpsertOperation = {
-  name: "Insert" | "Update" | "Unknown";
+  name: "Insert" | "Update";
   schemas: z.ZodSchema[];
   handler: (
     request: unknown,
@@ -173,6 +173,19 @@ function getSupplierIdFromEvent(letterEvent: any): string {
   return "unknown";
 }
 
+function parseQueueMessage(queueMessage: string): any {
+  const result = QueueMessageSchema.safeParse(queueMessage);
+
+  if (!result.success) {
+    throw new Error(
+      `Message did not match an expected schema: ${JSON.stringify(
+        result.error.issues,
+      )}`,
+    );
+  }
+  return result.data;
+}
+
 export default function createUpsertLetterHandler(deps: Deps): SQSHandler {
   return metricScope((metrics: MetricsLogger) => {
     return async (event: SQSEvent) => {
@@ -190,30 +203,23 @@ export default function createUpsertLetterHandler(deps: Deps): SQSHandler {
           });
           const queueMessage = JSON.parse(record.body);
 
-          const result = QueueMessageSchema.safeParse(queueMessage);
+          const sqsEvent = parseQueueMessage(queueMessage);
 
-          if (!result.success) {
-            throw new Error(
-              `Message did not match expected schema: ${JSON.stringify(
-                result.error.issues,
-              )}`,
-            );
-          }
           let letterEvent: any;
           let supplierSpec: SupplierSpec | undefined;
 
-          if ("letterEvent" in result.data) {
-            letterEvent = result.data.letterEvent;
-            supplierSpec = result.data.supplierSpec;
+          if ("letterEvent" in sqsEvent) {
+            letterEvent = sqsEvent.letterEvent;
+            supplierSpec = sqsEvent.supplierSpec;
           } else {
-            letterEvent = result.data;
+            letterEvent = sqsEvent;
             supplierSpec = undefined;
           }
 
           deps.logger.info({
             description: "Extracted letter event",
             messageId: record.messageId,
-            type: letterEvent,
+            type: letterEvent.type,
             supplier: supplierSpec,
           });