fix: api gateway normalises custom headers to lowercase

lambdas/src/order-result-lambda/index.test.ts

@@ -1,4 +1,4 @@
-import { APIGatewayProxyEvent, Context } from 'aws-lambda';
+import { APIGatewayProxyEvent } from 'aws-lambda';
 
 const mockSQSClientSendMessage = jest.fn();
 
@@ -8,16 +8,6 @@ jest.mock('../lib/sqs/sqs-client', () => ({
     close: jest.fn(),
   })),
 }));
-// Silence validation errors from appearing on console output during tests
-const mockCommonsLoggerError = jest.fn();
-const mockCommonsLoggerInfo = jest.fn();
-
-jest.mock('../lib/commons', () => ({
-  ConsoleCommons: jest.fn().mockImplementation(() => ({
-    logError: mockCommonsLoggerError,
-    logInfo: mockCommonsLoggerInfo,
-  })),
-}));
 
 process.env.RESULT_QUEUE_URL = 'https://sqs.eu-west-1./wiremock:8080/test-results-queue';
 process.env.AWS_REGION = 'eu-west-1';
@@ -34,7 +24,9 @@ describe('Order Result Lambda Handler', () => {
       httpMethod: 'POST',
       path: '/result',
       body: null,
-      headers: {},
+      headers: {
+        'X-Correlation-ID': '550e8400-e29b-41d4-a716-446655440000',
+      },
     };
 
     body = {
@@ -73,8 +65,6 @@ describe('Order Result Lambda Handler', () => {
     };
 
     mockSQSClientSendMessage.mockReset();
-    mockCommonsLoggerError.mockReset();
-    mockCommonsLoggerInfo.mockReset();
   });
 
   afterEach(() => {
@@ -106,7 +96,6 @@ describe('Order Result Lambda Handler', () => {
       const result = await handler(mockEvent as APIGatewayProxyEvent);
 
       expect(result.statusCode).toBe(400);
-      expect(mockCommonsLoggerError).toHaveBeenCalledTimes(1);
       expect(JSON.parse(result.body)).toMatchObject({
         issue: [
           {
@@ -125,7 +114,6 @@ describe('Order Result Lambda Handler', () => {
       const result = await handler(mockEvent as APIGatewayProxyEvent);
 
       expect(result.statusCode).toBe(400);
-      expect(mockCommonsLoggerError).toHaveBeenCalledTimes(1);
       expect(JSON.parse(result.body)).toMatchObject({
         issue: [
           {

lambdas/src/order-result-lambda/index.ts

@@ -1,9 +1,10 @@
 import { APIGatewayProxyEvent, APIGatewayProxyResult } from 'aws-lambda';
-import { Observation, Parameters } from 'fhir/r4';
+import { Observation } from 'fhir/r4';
 import { z } from 'zod';
 import { AWSSQSClient } from '../lib/sqs/sqs-client';
 import { createFhirErrorResponse, createFhirResponse } from '../lib/fhir-response';
 import { ConsoleCommons } from '../lib/commons';
+import {getCorrelationIdFromEventHeaders} from "../lib/utils";
 
 const sqsClient = new AWSSQSClient();
 const commons = new ConsoleCommons();
@@ -64,7 +65,7 @@ export const handler = async (
 
   try{
     const orderUid = extractOrderUid(observation);
-    const correlationId = event.headers['X-Correlation-ID'];
+    const correlationId = getCorrelationIdFromEventHeaders(event);
     const messageBody = JSON.stringify({
       observation,
       correlationId,

scripts/config/gitleaks.toml

@@ -16,4 +16,14 @@ regexes = [
 ]
 
 [allowlist]
-paths = ['''.terraform.lock.hcl''', '''poetry.lock''', '''yarn.lock''', '''local-environment/*''', '''lambdas/.*\.test\..*''', '''tests/playwright.config.ts''', '''ui/.next/*''', '''ui/build/*''', '''cdk.out/*''', '''lambdas/dist/*''']
+paths = [
+  '''.terraform.lock.hcl''',
+  '''poetry.lock''',
+  '''yarn.lock''',
+  '''local-environment/*''',
+  '''lambdas/.*\.test\..*''', '''lambdas/dist/*''',
+  '''tests/playwright.config.ts''',
+  '''ui/.next/*''', '''ui/build/*''',
+  '''cdk.out/*''',
+  '''.idea/*'''
+]