remove eventbridge wrapper if present

Author: masl2

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

@@ -36,6 +36,28 @@ function createSqsRecord(msgId: string, body: string): SQSRecord {
   };
 }
 
+function createEventBridgeNotification(
+  event:
+    | LetterRequestPreparedEventV2
+    | LetterRequestPreparedEvent
+    | LetterEvent,
+): Partial<SNSMessage> {
+  return {
+    SignatureVersion: "",
+    Timestamp: "",
+    Signature: "",
+    SigningCertUrl: "",
+    MessageId: "",
+    Message: createEventBridgeEvent(event),
+    MessageAttributes: {},
+    Type: "Notification",
+    UnsubscribeUrl: "",
+    TopicArn: "",
+    Subject: "",
+    Token: "",
+  };
+}
+
 function createNotification(
   event:
     | LetterRequestPreparedEventV2
@@ -58,6 +80,22 @@ function createNotification(
   };
 }
 
+function createEventBridgeEvent(event: any): string {
+  const now = new Date().toISOString();
+  const eventBridgeEnvelope = {
+    version: "0",
+    id: "4f28e649-6832-18e8-7261-4b63e6dcd3b5",
+    "detail-type": event.type,
+    source: "custom.event",
+    account: "815490582396",
+    time: now,
+    region: "eu-west-2",
+    resources: [],
+    detail: event,
+  };
+  return JSON.stringify(eventBridgeEnvelope);
+}
+
 function createPreparedV1Event(
   overrides: Partial<any> = {},
 ): LetterRequestPreparedEvent {
@@ -178,7 +216,7 @@ describe("createUpsertLetterHandler", () => {
     const evt: SQSEvent = createSQSEvent([
       createSqsRecord(
         "msg1",
-        JSON.stringify(createNotification(createPreparedV2Event())),
+        JSON.stringify(createEventBridgeNotification(createPreparedV2Event())),
       ),
       createSqsRecord(
         "msg2",

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

@@ -120,6 +120,14 @@ function parseSNSNotification(record: SQSRecord) {
   return notification.Message;
 }
 
+function removeEventBridgeWrapper(event: any) {
+  const maybeEventBridge = event as any;
+  if (maybeEventBridge.source && maybeEventBridge.detail) {
+    return maybeEventBridge.detail;
+  }
+  return event;
+}
+
 function getType(event: unknown) {
   const env = TypeEnvelope.safeParse(event);
   if (!env.success) {
@@ -152,7 +160,9 @@ export default function createUpsertLetterHandler(deps: Deps): SQSHandler {
       try {
         const message: string = parseSNSNotification(record);
 
-        const letterEvent: unknown = JSON.parse(message);
+        const event = JSON.parse(message);
+
+        const letterEvent: unknown = removeEventBridgeWrapper(event);
 
         const type = getType(letterEvent);