Merge branch 'master' into cors-fix2

Author: taeold

CHANGELOG.md

@@ -1 +1,3 @@
-Fix bug with CORS options for an array of one item for `onCall` (#1563)
+- Fix retry in event triggered functions. (#1463)
+- Expose retry configuration in v2 RTDB trigger (#1588)
+- Fix CORS options for v2 callable functions (#1564)

package-lock.json

@@ -280,6 +280,40 @@ describe("database", () => {
         },
       });
     });
+
+    it("should supply retry", () => {
+      const func = database.onChangedOperation(
+        database.writtenEventType,
+        {
+          ref: "/foo/{path=**}/{bar}/",
+          instance: "my-instance",
+          region: "us-central1",
+          cpu: "gcf_gen1",
+          minInstances: 2,
+          retry: true,
+        },
+        () => 2
+      );
+
+      expect(func.__endpoint).to.deep.equal({
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
+        cpu: "gcf_gen1",
+        minInstances: 2,
+        region: ["us-central1"],
+        labels: {},
+        eventTrigger: {
+          eventType: database.writtenEventType,
+          eventFilters: {
+            instance: "my-instance",
+          },
+          eventFilterPathPatterns: {
+            ref: "foo/{path=**}/{bar}",
+          },
+          retry: true,
+        },
+      });
+    });
   });
 
   describe("onOperation", () => {

spec/v2/providers/database.spec.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/params/index.ts

@@ -250,7 +250,7 @@ export function getEndpointAnnotation(
       eventFilters: {
         alerttype: alertType,
       },
-      retry: !!opts.retry,
+      retry: opts.retry ?? false,
     },
   };
   if (appId) {

src/v2/providers/alerts/alerts.ts

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

src/v2/providers/database.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/eventarc.ts

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

src/v2/providers/firestore.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/pubsub.ts

@@ -149,7 +149,7 @@ export function onConfigUpdated(
     eventTrigger: {
       eventType,
       eventFilters: {},
-      retry: !!optsOrHandler.retry,
+      retry: optsOrHandler.retry ?? false,
     },
   };
   func.__endpoint = ep;