Skip to content

fix(parser): EventBridge envelope uses correct path #3504

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.

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
merged 2 commits into from
Jan 21, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 27 additions & 20 deletions packages/parser/src/envelopes/event-bridge.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import type { ZodSchema, z } from 'zod';
import type { ZodError, ZodSchema, z } from 'zod';
import { ParseError } from '../errors.js';
import { EventBridgeSchema } from '../schemas/index.js';
import type { ParsedResult } from '../types/index.js';
import { Envelope, envelopeDiscriminator } from './envelope.js';
import { envelopeDiscriminator } from './envelope.js';

/**
* Envelope for EventBridge schema that extracts and parses data from the `detail` key.
Expand All @@ -14,34 +14,41 @@ export const EventBridgeEnvelope = {
*/
[envelopeDiscriminator]: 'object' as const,
parse<T extends ZodSchema>(data: unknown, schema: T): z.infer<T> {
return Envelope.parse(EventBridgeSchema.parse(data).detail, schema);
const extendedSchema = EventBridgeSchema.extend({
detail: schema,
});
try {
const parsed = extendedSchema.parse(data);
return parsed.detail;
} catch (error) {
throw new ParseError('Failed to parse EventBridge envelope', {
cause: error as ZodError,
});
}
},

safeParse<T extends ZodSchema>(data: unknown, schema: T): ParsedResult<unknown, z.infer<T>> {
const parsedEnvelope = EventBridgeSchema.safeParse(data);
safeParse<T extends ZodSchema>(
data: unknown,
schema: T
): ParsedResult<unknown, z.infer<T>> {
const extendedSchema = EventBridgeSchema.extend({
detail: schema,
});

if (!parsedEnvelope.success) {
const parsedResult = extendedSchema.safeParse(data);
if (!parsedResult.success) {
return {
success: false,
error: new ParseError('Failed to parse EventBridge envelope', {
cause: parsedEnvelope.error,
}),
originalEvent: data,
};
}

const parsedDetail = Envelope.safeParse(parsedEnvelope.data.detail, schema);

if (!parsedDetail.success) {
return {
success: false,
error: new ParseError('Failed to parse EventBridge envelope detail', {
cause: parsedDetail.error,
cause: parsedResult.error,
}),
originalEvent: data,
};
}

return parsedDetail;
return {
success: true,
data: parsedResult.data.detail,
};
},
};
72 changes: 0 additions & 72 deletions packages/parser/tests/events/apiGatewayAuthorizerRequestEvent.json

This file was deleted.

This file was deleted.

52 changes: 0 additions & 52 deletions packages/parser/tests/events/apiGatewayAuthorizerV2Event.json

This file was deleted.

71 changes: 0 additions & 71 deletions packages/parser/tests/events/apiGatewayProxyEvent.json

This file was deleted.

70 changes: 0 additions & 70 deletions packages/parser/tests/events/apiGatewayProxyEventAnotherPath.json

This file was deleted.

Loading
Loading