Fix bug where 2nd Gen firestore functions were mistakenly parsed as p…

…ubsub function.

Firestore trigger also includes pubsubTopic since they use pubsub as transport. This triggered a bug where 2nd Gen Firestore bugs were being parsed as pubsub function which manifests in bugs like #6453.

src/gcp/cloudfunctionsv2.ts

@@ -248,8 +248,8 @@
  * @param type Type of deployment - create, update, or delete.
  * @param err The error returned from the operation.
  */
 function functionsOpLogReject(func: InputCloudFunction, type: string, err: any): void {
   if (err?.message?.includes("maxScale may not exceed")) {
     const maxInstances = func.serviceConfig.maxInstanceCount || DEFAULT_MAX_INSTANCE_COUNT;
     utils.logLabeledWarning(
       "functions",
@@ -265,14 +265,14 @@
       `You can adjust the max instances value in your function's runtime options:\n\t${suggestedFix}`
     );
   } else {
     utils.logLabeledWarning("functions", `${err?.message}`);
     if (err?.context?.response?.statusCode === 429) {
       utils.logLabeledWarning(
         "functions",
         `Got "Quota Exceeded" error while trying to ${type} ${func.name}. Waiting to retry...`
       );
     } else if (
       err?.message?.includes(
         "If you recently started to use Eventarc, it may take a few minutes before all necessary permissions are propagated to the Service Agent"
       )
     ) {
@@ -288,8 +288,8 @@
     );
   }
   throw new FirebaseError(`Failed to ${type} function ${func.name}`, {
     original: err,
     status: err?.context?.response?.statusCode,
     context: { function: func.name },
   });
 }
@@ -661,7 +661,10 @@
   } else if (gcfFunction.eventTrigger) {
     const eventFilters: Record<string, string> = {};
     const eventFilterPathPatterns: Record<string, string> = {};
-    if (gcfFunction.eventTrigger.pubsubTopic) {
+    if (
+      gcfFunction.eventTrigger.pubsubTopic &&
+      gcfFunction.eventTrigger.eventType === PUBSUB_PUBLISH_EVENT
+    ) {
       eventFilters.topic = gcfFunction.eventTrigger.pubsubTopic;
     } else {
       for (const eventFilter of gcfFunction.eventTrigger.eventFilters || []) {

src/test/gcp/cloudfunctionsv2.spec.ts

@@ -475,6 +475,46 @@ describe("cloudfunctionsv2", () => {
           },
         })
       ).to.deep.equal(want);
+
+      // And again with a pattern match event trigger
+      want = {
+        ...want,
+        eventTrigger: {
+          eventType: "google.cloud.firestore.document.v1.written",
+          eventFilters: {
+            database: "(default)",
+            namespace: "(default)",
+          },
+          eventFilterPathPatterns: {
+            document: "users/{userId}",
+          },
+          retry: false,
+        },
+      };
+      expect(
+        cloudfunctionsv2.endpointFromFunction({
+          ...HAVE_CLOUD_FUNCTION_V2,
+          eventTrigger: {
+            eventType: "google.cloud.firestore.document.v1.written",
+            eventFilters: [
+              {
+                attribute: "database",
+                value: "(default)",
+              },
+              {
+                attribute: "namespace",
+                value: "(default)",
+              },
+              {
+                attribute: "document",
+                value: "users/{userId}",
+                operator: "match-path-pattern",
+              },
+            ],
+            pubsubTopic: "eventarc-us-central1-abc", // firestore triggers use pubsub as transport
+          },
+        })
+      ).to.deep.equal(want);
     });
 
     it("should translate custom event triggers", () => {