diff --git a/CHANGELOG.md b/CHANGELOG.md index 7fabc8933..9b35c39ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1 +1,2 @@ +- Fix retry in event triggered functions. (#1463) - Expose retry configuration in v2 RTDB trigger (#1588) diff --git a/src/v2/providers/alerts/alerts.ts b/src/v2/providers/alerts/alerts.ts index 09e0885ca..7355e81a9 100644 --- a/src/v2/providers/alerts/alerts.ts +++ b/src/v2/providers/alerts/alerts.ts @@ -250,7 +250,7 @@ export function getEndpointAnnotation( eventFilters: { alerttype: alertType, }, - retry: !!opts.retry, + retry: opts.retry ?? false, }, }; if (appId) { diff --git a/src/v2/providers/eventarc.ts b/src/v2/providers/eventarc.ts index 3ad523b6d..34981f18a 100644 --- a/src/v2/providers/eventarc.ts +++ b/src/v2/providers/eventarc.ts @@ -217,7 +217,7 @@ export function onCustomEventPublished( eventTrigger: { eventType: opts.eventType, eventFilters: {}, - retry: false, + retry: opts.retry ?? false, channel, }, }; diff --git a/src/v2/providers/firestore.ts b/src/v2/providers/firestore.ts index f351cc755..1adf1478d 100644 --- a/src/v2/providers/firestore.ts +++ b/src/v2/providers/firestore.ts @@ -685,7 +685,7 @@ export function makeEndpoint( eventType, eventFilters, eventFilterPathPatterns, - retry: !!opts.retry, + retry: opts.retry ?? false, }, }; } diff --git a/src/v2/providers/pubsub.ts b/src/v2/providers/pubsub.ts index 0cee195ea..67a1b7126 100644 --- a/src/v2/providers/pubsub.ts +++ b/src/v2/providers/pubsub.ts @@ -345,7 +345,7 @@ export function onMessagePublished( eventTrigger: { eventType: "google.cloud.pubsub.topic.v1.messagePublished", eventFilters: { topic }, - retry: false, + retry: opts.retry ?? false, }, }; copyIfPresent(endpoint.eventTrigger, opts, "retry", "retry"); diff --git a/src/v2/providers/remoteConfig.ts b/src/v2/providers/remoteConfig.ts index 23707dea2..a168dff1c 100644 --- a/src/v2/providers/remoteConfig.ts +++ b/src/v2/providers/remoteConfig.ts @@ -149,7 +149,7 @@ export function onConfigUpdated( eventTrigger: { eventType, eventFilters: {}, - retry: !!optsOrHandler.retry, + retry: optsOrHandler.retry ?? false, }, }; func.__endpoint = ep; diff --git a/src/v2/providers/storage.ts b/src/v2/providers/storage.ts index 582a3db7e..2a2583d53 100644 --- a/src/v2/providers/storage.ts +++ b/src/v2/providers/storage.ts @@ -624,7 +624,7 @@ export function onOperation( eventTrigger: { eventType, eventFilters: { bucket }, - retry: false, + retry: opts.retry ?? false, }, }; copyIfPresent(endpoint.eventTrigger, opts, "retry", "retry"); diff --git a/src/v2/providers/tasks.ts b/src/v2/providers/tasks.ts index 49d73bb39..15d850507 100644 --- a/src/v2/providers/tasks.ts +++ b/src/v2/providers/tasks.ts @@ -282,6 +282,7 @@ export function onTaskDispatched( convertInvoker ); convertIfPresent(func.__endpoint.taskQueueTrigger, opts, "invoker", "invoker", convertInvoker); + copyIfPresent(func.__endpoint.taskQueueTrigger, opts, "retry", "retry"); func.__requiredAPIs = [ { diff --git a/src/v2/providers/testLab.ts b/src/v2/providers/testLab.ts index cdf0c85f1..3b4e5a3c1 100644 --- a/src/v2/providers/testLab.ts +++ b/src/v2/providers/testLab.ts @@ -207,7 +207,7 @@ export function onTestMatrixCompleted( eventTrigger: { eventType, eventFilters: {}, - retry: !!optsOrHandler.retry, + retry: optsOrHandler.retry ?? false, }, }; func.__endpoint = ep;