Remove VARIANT_MAP

Author: nhsd-david-wass

infrastructure/terraform/components/api/module_lambda_supplier_allocator.tf

@@ -35,7 +35,6 @@ module "supplier_allocator" {
   log_subscription_role_arn = local.acct.log_subscription_role_arn
 
   lambda_env_vars = merge(local.common_lambda_env_vars, {
-    VARIANT_MAP              = jsonencode(var.letter_variant_map)
     UPSERT_LETTERS_QUEUE_URL = module.sqs_letter_updates.sqs_queue_url
   })
 }

infrastructure/terraform/components/api/module_lambda_upsert_letter.tf

@@ -33,10 +33,6 @@ module "upsert_letter" {
 
   log_destination_arn       = local.destination_arn
   log_subscription_role_arn = local.acct.log_subscription_role_arn
-
-  lambda_env_vars = merge(local.common_lambda_env_vars, {
-    VARIANT_MAP = jsonencode(var.letter_variant_map)
-  })
 }
 
 data "aws_iam_policy_document" "upsert_letter_lambda" {

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

@@ -4,13 +4,6 @@ describe("createDependenciesContainer", () => {
   const env = {
     SUPPLIER_CONFIG_TABLE_NAME: "SupplierConfigTable",
     SUPPLIER_QUOTAS_TABLE_NAME: "SupplierQuotasTable",
-    VARIANT_MAP: {
-      lv1: {
-        supplierId: "supplier1",
-        specId: "spec1",
-        billingId: "billing1",
-      },
-    },
   };
 
   beforeEach(() => {

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

@@ -17,34 +17,12 @@ describe("lambdaEnv", () => {
   it("should load all environment variables successfully", () => {
     process.env.SUPPLIER_CONFIG_TABLE_NAME = "SupplierConfigTable";
     process.env.SUPPLIER_QUOTAS_TABLE_NAME = "SupplierQuotasTable";
-    process.env.VARIANT_MAP = `{
-      "lv1": {
-        "supplierId": "supplier1",
-        "specId": "spec1",
-        "priority": 10,
-        "billingId": "billing1"
-      }
-    }`;
 
     const { envVars } = require("../env");
 
     expect(envVars).toEqual({
       SUPPLIER_CONFIG_TABLE_NAME: "SupplierConfigTable",
       SUPPLIER_QUOTAS_TABLE_NAME: "SupplierQuotasTable",
-      VARIANT_MAP: {
-        lv1: {
-          supplierId: "supplier1",
-          specId: "spec1",
-          priority: 10,
-          billingId: "billing1",
-        },
-      },
     });
   });
-
-  it("should throw if a required env var is missing", () => {
-    process.env.VARIANT_MAP = undefined;
-
-    expect(() => require("../env")).toThrow(ZodError);
-  });
 });

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

@@ -15,10 +15,6 @@ const EnvVarsSchema = z.object({
   SUPPLIER_CONFIG_TABLE_NAME: z.string(),
   SUPPLIER_QUOTAS_TABLE_NAME: z.string(),
   PINO_LOG_LEVEL: z.coerce.string().optional(),
-  VARIANT_MAP: z.string().transform((str, _) => {
-    const parsed = JSON.parse(str);
-    return LetterVariantSchema.parse(parsed);
-  }),
 });
 
 export type EnvVars = z.infer<typeof EnvVarsSchema>;

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

@@ -222,14 +222,6 @@ describe("createSupplierAllocatorHandler", () => {
       env: {
         SUPPLIER_CONFIG_TABLE_NAME: "SupplierConfigTable",
         SUPPLIER_QUOTAS_TABLE_NAME: "SupplierQuotasTable",
-        VARIANT_MAP: {
-          lv1: {
-            supplierId: "supplier1",
-            specId: "spec1",
-            priority: 1,
-            billingId: "billing1",
-          },
-        },
       } as EnvVars,
       sqsClient: mockSqsClient,
       supplierConfigRepo: mockedSupplierConfigRepo,
@@ -415,68 +407,6 @@ describe("createSupplierAllocatorHandler", () => {
     );
   });
 
-  test("returns batch failure when variant mapping is missing", async () => {
-    const preparedEvent = createPreparedV2Event();
-    preparedEvent.data.letterVariantId = "missing-variant";
-
-    const evt: SQSEvent = createSQSEvent([
-      createSqsRecord("msg1", JSON.stringify(preparedEvent)),
-    ]);
-
-    process.env.UPSERT_LETTERS_QUEUE_URL = "https://sqs.test.queue";
-
-    // Override variant map to be empty for this test
-    mockedDeps.env.VARIANT_MAP = {} as any;
-
-    const handler = createSupplierAllocatorHandler(mockedDeps);
-    const result = await handler(evt, {} as any, {} as any);
-    if (!result) throw new Error("expected BatchResponse, got void");
-
-    expect(result.batchItemFailures).toHaveLength(1);
-    expect(result.batchItemFailures[0].itemIdentifier).toBe("msg1");
-    expect(
-      (mockedDeps.logger.error as jest.Mock).mock.calls.length,
-    ).toBeGreaterThan(0);
-    expect((mockedDeps.logger.error as jest.Mock).mock.calls[0][0]).toEqual(
-      expect.objectContaining({
-        description: "No supplier mapping found for variant",
-      }),
-    );
-  });
-
-  test("returns batch failure when variant mapping is missing for multiple events", async () => {
-    const preparedEvent1 = createPreparedV2Event();
-    preparedEvent1.data.letterVariantId = "missing-variant1";
-    const preparedEvent2 = createPreparedV2Event();
-    preparedEvent2.data.letterVariantId = "missing-variant2";
-
-    const evt: SQSEvent = createSQSEvent([
-      createSqsRecord("msg1", JSON.stringify(preparedEvent1)),
-      createSqsRecord("msg2", JSON.stringify(preparedEvent2)),
-    ]);
-
-    process.env.UPSERT_LETTERS_QUEUE_URL = "https://sqs.test.queue";
-
-    // Override variant map to be empty for this test
-    mockedDeps.env.VARIANT_MAP = {} as any;
-
-    const handler = createSupplierAllocatorHandler(mockedDeps);
-    const result = await handler(evt, {} as any, {} as any);
-    if (!result) throw new Error("expected BatchResponse, got void");
-
-    expect(result.batchItemFailures).toHaveLength(2);
-    expect(result.batchItemFailures[0].itemIdentifier).toBe("msg1");
-    expect(result.batchItemFailures[1].itemIdentifier).toBe("msg2");
-    expect(
-      (mockedDeps.logger.error as jest.Mock).mock.calls.length,
-    ).toBeGreaterThan(0);
-    expect((mockedDeps.logger.error as jest.Mock).mock.calls[0][0]).toEqual(
-      expect.objectContaining({
-        description: "No supplier mapping found for variant",
-      }),
-    );
-  });
-
   test("handles SQS send errors and returns batch failure", async () => {
     const preparedEvent = createPreparedV2Event();
 

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

@@ -28,22 +28,6 @@ import { PreparedEvents, SupplierDetails, SupplierSpec } from "./types";
 // small envelope that must exist in all inputs
 const TypeEnvelope = z.object({ type: z.string().min(1) });
 
-function resolveSupplierForVariant(
-  variantId: string,
-  deps: Deps,
-): SupplierSpec {
-  const supplier = deps.env.VARIANT_MAP[variantId];
-  if (!supplier) {
-    deps.logger.error({
-      description: "No supplier mapping found for variant",
-      variantId,
-    });
-    throw new Error(`No supplier mapping for variantId: ${variantId}`);
-  }
-
-  return supplier;
-}
-
 function validateType(event: unknown) {
   const env = TypeEnvelope.safeParse(event);
   if (!env.success) {
@@ -138,10 +122,6 @@ async function getSupplierFromConfig(
   }
 }
 
-function getSupplier(letterEvent: PreparedEvents, deps: Deps): SupplierSpec {
-  return resolveSupplierForVariant(letterEvent.data.letterVariantId, deps);
-}
-
 type AllocationMetrics = Map<string, Map<string, number>>;
 type VolumeGroupAllocation = Map<string, Record<string, number>>;
 
@@ -232,7 +212,6 @@ export default function createSupplierAllocatorHandler(deps: Deps): SQSHandler {
 
         validateType(letterEvent);
 
-        getSupplier(letterEvent as PreparedEvents, deps);
         const supplierDetails: SupplierDetails = await getSupplierFromConfig(
           letterEvent as PreparedEvents,
           deps,