Skip to content

remove eventbridge wrapper if present #350

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
masl2 merged 5 commits into from
Jan 16, 2026
Merged

remove eventbridge wrapper if present #350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b9d8e24
remove eventbridge wrapper if present
masl2 Jan 16, 2026
d09c071
lint
masl2 Jan 16, 2026
c26663c
Merge branch 'main' into fix/eventbridge-wrapper
masl2 Jan 16, 2026
6e26b12
test type
masl2 Jan 16, 2026
7e2e2c9
lint pass
masl2 Jan 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 41 additions & 6 deletions lambdas/upsert-letter/src/handler/__tests__/upsert-handler.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,31 @@ function createSqsRecord(msgId: string, body: string): SQSRecord {
};
}

function createNotification(
event:
| LetterRequestPreparedEventV2
| LetterRequestPreparedEvent
| LetterEvent,
type SupportedEvent =
| LetterRequestPreparedEventV2
| LetterRequestPreparedEvent
| LetterEvent;

function createEventBridgeNotification(
event: SupportedEvent,
): Partial<SNSMessage> {
return {
SignatureVersion: "",
Timestamp: "",
Signature: "",
SigningCertUrl: "",
MessageId: "",
Message: createEventBridgeEvent(event),
MessageAttributes: {},
Type: "Notification",
UnsubscribeUrl: "",
TopicArn: "",
Subject: "",
Token: "",
};
}

function createNotification(event: SupportedEvent): Partial<SNSMessage> {
return {
SignatureVersion: "",
Timestamp: "",
Expand All @@ -58,6 +77,22 @@ function createNotification(
};
}

function createEventBridgeEvent(event: SupportedEvent): 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 {
Expand Down Expand Up @@ -178,7 +213,7 @@ describe("createUpsertLetterHandler", () => {
const evt: SQSEvent = createSQSEvent([
createSqsRecord(
"msg1",
JSON.stringify(createNotification(createPreparedV2Event())),
JSON.stringify(createEventBridgeNotification(createPreparedV2Event())),
),
createSqsRecord(
"msg2",
Expand Down
12 changes: 11 additions & 1 deletion lambdas/upsert-letter/src/handler/upsert-handler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,14 @@ function parseSNSNotification(record: SQSRecord) {
return notification.Message;
}

function removeEventBridgeWrapper(event: any) {
Comment thread
masl2 marked this conversation as resolved.
const maybeEventBridge = event;
if (maybeEventBridge.source && maybeEventBridge.detail) {
return maybeEventBridge.detail;
}
return event;
}

function getType(event: unknown) {
const env = TypeEnvelope.safeParse(event);
if (!env.success) {
Expand Down Expand Up @@ -152,7 +160,9 @@ export default function createUpsertLetterHandler(deps: Deps): SQSHandler {
try {
const message: string = parseSNSNotification(record);

const letterEvent: unknown = JSON.parse(message);
const snsEvent = JSON.parse(message);

const letterEvent: unknown = removeEventBridgeWrapper(snsEvent);

const type = getType(letterEvent);

Expand Down
Loading