Fix retry in event triggers (#1463)

* fix retry in event triggers * changelog * fix tests * Use nullish coalescing instea of logical or. --------- Co-authored-by: Daniel Lee <danielylee@google.com> Co-authored-by: Daniel Lee <taeold@gmail.com>
firebase · Aug 23, 2024 · 2358cc1 · 2358cc1
1 parent 95ae33f
commit 2358cc1
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 7 deletions.
diff --git 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
@@ -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
@@ -217,7 +217,7 @@ export function onCustomEventPublished<T = any>(
     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
@@ -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
@@ -345,7 +345,7 @@ export function onMessagePublished<T = any>(
     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
@@ -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
@@ -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
@@ -282,6 +282,7 @@ export function onTaskDispatched<Args = any>(
     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
@@ -207,7 +207,7 @@ export function onTestMatrixCompleted(
     eventTrigger: {
       eventType,
       eventFilters: {},
-      retry: !!optsOrHandler.retry,
+      retry: optsOrHandler.retry ?? false,
     },
   };
   func.__endpoint = ep;