Address review comments

Author: stevebux

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

@@ -18,7 +18,7 @@ import { makeApiGwEvent } from './utils/test-utils';
 import { ValidationError } from '../../errors';
 import * as errors from '../../contracts/errors';
 import { createGetLetterDataHandler } from '../get-letter-data';
-import { Destination, S3Client } from '@aws-sdk/client-s3';
+import { S3Client } from '@aws-sdk/client-s3';
 import pino from 'pino';
 import { LetterRepository } from '@internal/datastore/src';
 import { EnvVars } from '../../config/env';

lambdas/api-handler/src/handlers/__tests__/get_status.test.ts

@@ -56,19 +56,6 @@ describe('API Lambda handler', () => {
     }));
   });
 
-  it('fails if request ID is absent', async() => {
-    const event = makeApiGwEvent({path: '/_status',
-      headers: {'nhsd-supplier-id': 'supplier1', 'nhsd-correlation-id': 'correlationId'}
-    });
-
-    const getLetterDataHandler = createGetStatusHandler(getMockedDeps());
-    const result = await getLetterDataHandler(event,  mockDeep<Context>(), jest.fn());
-
-    expect(result).toEqual(expect.objectContaining({
-      statusCode: 500
-    }));
-  });
-
   function getMockedDeps(): jest.Mocked<Deps> {
     return {
       s3Client: { send: jest.fn()} as unknown as S3Client,

lambdas/api-handler/src/handlers/get-status.ts

@@ -1,34 +1,30 @@
 import { APIGatewayProxyHandler } from "aws-lambda";
 import { Deps } from "../config/deps";
 import { ListBucketsCommand, S3Client } from "@aws-sdk/client-s3";
-import { validateCommonHeaders } from "../utils/validation";
 import { mapErrorToResponse } from "../mappers/error-mapper";
 
 export function createGetStatusHandler(deps: Deps): APIGatewayProxyHandler {
 
   return async(event) => {
 
-    const commonHeadersResult = validateCommonHeaders(event.headers, deps);
-
-    if (!commonHeadersResult.ok) {
-      return mapErrorToResponse(commonHeadersResult.error, commonHeadersResult.correlationId, deps.logger);
-    }
+    const correlationId = Object.entries(event.headers)
+      .find(([headerName, _]) => headerName.toLowerCase() === deps.env.APIM_CORRELATION_HEADER)?.[1];
 
     try {
       await deps.dbHealthcheck.check();
       await s3HealthCheck(deps.s3Client);
 
       deps.logger.info({
         description: 'Healthcheck passed',
-        supplierId: commonHeadersResult.value.supplierId
+        correlationId
       });
 
       return {
         statusCode: 200,
         body: '{}'
       };
     } catch (error) {
-      return mapErrorToResponse(error, commonHeadersResult.value.correlationId, deps.logger);
+      return mapErrorToResponse(error, correlationId || '', deps.logger);
     }
   }
 }