Merge branch 'master' into fix-typo

Author: taeold

CHANGELOG.md

@@ -1 +1,2 @@
+- Fix retry in event triggered functions. (#1463)
 - Expose retry configuration in v2 RTDB trigger (#1588)

src/params/index.ts

@@ -115,7 +115,6 @@ export const storageBucket: Param<string> = new InternalExpression(
  * hinting during parameter resolution.
  *
  * @param name The name of the environment variable to use to load the parameter.
- * @param options Configuration options for the parameter.
  * @returns A parameter with a `string` return type for `.value`.
  */
 export function defineSecret(name: string): SecretParam {

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) {

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,
     },
   };

src/v2/providers/firestore.ts

@@ -685,7 +685,7 @@ export function makeEndpoint(
       eventType,
       eventFilters,
       eventFilterPathPatterns,
-      retry: !!opts.retry,
+      retry: opts.retry ?? false,
     },
   };
 }

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");

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;

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");

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 = [
     {

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;