Move supplier id header to config

Author: francisco-videira-nhs

infrastructure/terraform/components/api/locals.tf

@@ -14,4 +14,10 @@ locals {
   })
 
   destination_arn = "arn:aws:logs:${var.region}:${var.shared_infra_account_id}:destination:nhs-main-obs-firehose-logs"
+
+  common_db_access_lambda_env_vars = {
+    LETTERS_TABLE_NAME = aws_dynamodb_table.letters.name,
+    LETTER_TTL_HOURS = 24,
+    SUPPLIER_ID_HEADER = "nhsd-supplier-id"
+  }
 }

infrastructure/terraform/components/api/module_lambda_get_letters.tf

@@ -35,10 +35,7 @@ module "get_letters" {
   log_destination_arn       = local.destination_arn
   log_subscription_role_arn = local.acct.log_subscription_role_arn
 
-  lambda_env_vars = {
-    LETTERS_TABLE_NAME = aws_dynamodb_table.letters.name,
-    LETTER_TTL_HOURS = 24
-  }
+  lambda_env_vars = merge(locals.common_db_access_lambda_env_vars, {})
 }
 
 data "aws_iam_policy_document" "get_letters_lambda" {

infrastructure/terraform/components/api/module_lambda_patch_letters.tf

@@ -35,10 +35,7 @@ module "patch_letters" {
   log_destination_arn       = local.destination_arn
   log_subscription_role_arn = local.acct.log_subscription_role_arn
 
-  lambda_env_vars = {
-    LETTERS_TABLE_NAME = aws_dynamodb_table.letters.name,
-    LETTER_TTL_HOURS = 24
-  }
+  lambda_env_vars = merge(locals.common_db_access_lambda_env_vars, {})
 }
 
 data "aws_iam_policy_document" "patch_letters_lambda" {
@@ -56,7 +53,7 @@ data "aws_iam_policy_document" "patch_letters_lambda" {
     ]
   }
 
-    statement {
+  statement {
     sid    = "AllowDynamoDBAccess"
     effect = "Allow"
 

lambdas/api-handler/src/config/lambda-config.ts

@@ -0,0 +1,15 @@
+interface LambdaConfig {
+  SUPPLIER_ID_HEADER: string;
+}
+
+export const lambdaConfig: LambdaConfig = {
+  SUPPLIER_ID_HEADER: getEnv("SUPPLIER_ID_HEADER")!,
+};
+
+function getEnv(name: string, required = true): string | undefined {
+  const value = process.env[name];
+  if (!value && required) {
+    throw new Error(`Missing required env var: ${name}`);
+  }
+  return value;
+}

lambdas/api-handler/src/handlers/__tests__/get-letters.test.ts

@@ -6,6 +6,12 @@ import * as letterService from '../../services/letter-operations';
 
 jest.mock('../../services/letter-operations');
 
+jest.mock("../../config/lambda-config", () => ({
+  lambdaConfig: {
+    SUPPLIER_ID_HEADER: "nhsd-supplier-id"
+  }
+}));
+
 describe('API Lambda handler', () => {
 
   beforeEach(() => {

lambdas/api-handler/src/handlers/__tests__/hello-world.test.ts

@@ -2,6 +2,12 @@ import { helloWorld } from '../../index';
 import type { Context } from 'aws-lambda';
 import { mockDeep } from 'jest-mock-extended';
 
+jest.mock("../../config/lambda-config", () => ({
+  lambdaConfig: {
+    SUPPLIER_ID_HEADER: "nhsd-supplier-id"
+  }
+}));
+
 describe('API Lambda handler', () => {
   it('returns 200 OK with "Hello World" for the root path', async () => {
     const event = { path: '/' };

lambdas/api-handler/src/handlers/__tests__/patch-letters.test.ts

@@ -9,6 +9,12 @@ import { mapErrorToResponse } from '../../mappers/error-mapper';
 jest.mock('../../services/letter-operations');
 jest.mock('../../mappers/error-mapper');
 
+jest.mock("../../config/lambda-config", () => ({
+  lambdaConfig: {
+    SUPPLIER_ID_HEADER: "nhsd-supplier-id"
+  }
+}));
+
 const mockedMapErrorToResponse = jest.mocked(mapErrorToResponse);
 const expectedErrorResponse: APIGatewayProxyResult = {
   statusCode: 400,

lambdas/api-handler/src/handlers/patch-letters.ts

@@ -5,12 +5,13 @@ import { LetterApiDocument, LetterApiDocumentSchema } from '../contracts/letter-
 import * as errors from '../contracts/errors';
 import { ValidationError } from '../errors';
 import { mapErrorToResponse } from '../mappers/error-mapper';
+import { lambdaConfig } from "../config/lambda-config";
 
 const letterRepo = createLetterRepository();
 export const patchLetters: APIGatewayProxyHandler = async (event) => {
 
   try {
-    const supplierId = assertNotEmpty(event.headers['nhsd-supplier-id'], errors.ApiErrorDetail.InvalidRequestMissingSupplierId);
+    const supplierId = assertNotEmpty(event.headers[lambdaConfig.SUPPLIER_ID_HEADER], errors.ApiErrorDetail.InvalidRequestMissingSupplierId);
     const letterId = assertNotEmpty( event.pathParameters?.id, errors.ApiErrorDetail.InvalidRequestMissingLetterIdPathParameter);
     const body = assertNotEmpty(event.body, errors.ApiErrorDetail.InvalidRequestMissingBody);