Merge branch 'master' of https://github.com/firebase/firebase-functions into launch.next

Author: taeold

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-functions",
-  "version": "3.23.0",
+  "version": "3.24.0",
   "description": "Firebase SDK for Cloud Functions",
   "keywords": [
     "firebase",
@@ -52,6 +52,7 @@
     "./v2/alerts/appDistribution": "./lib/v2/providers/alerts/appDistribution.js",
     "./v2/alerts/billing": "./lib/v2/providers/alerts/billing.js",
     "./v2/alerts/crashlytics": "./lib/v2/providers/alerts/crashlytics.js",
+    "./v2/alerts/performance": "./lib/v2/providers/alerts/performance.js",
     "./v2/eventarc": "./lib/v2/providers/eventarc.js",
     "./v2/identity": "./lib/v2/providers/identity.js",
     "./v2/database": "./lib/v2/providers/database.js",
@@ -114,6 +115,9 @@
       "v2/alerts/crashlytics": [
         "lib/v2/providers/alerts/crashlytics"
       ],
+      "v2/alerts/performance": [
+        "lib/v2/providers/alerts/performance"
+      ],
       "v2/base": [
         "lib/v2/base"
       ],

package.json

@@ -1,5 +1,5 @@
-import { stackToWire, ManifestStack } from "../../src/runtime/manifest";
 import { expect } from "chai";
+import { stackToWire, ManifestStack } from "../../src/runtime/manifest";
 import * as params from "../../src/params";
 
 describe("stackToWire", () => {

spec/runtime/manifest.spec.ts

@@ -1,4 +1,5 @@
 import { expect } from "chai";
+import { CloudEvent } from "../../../../src/v2";
 import * as options from "../../../../src/v2/options";
 import * as alerts from "../../../../src/v2/providers/alerts";
 import { FULL_ENDPOINT, FULL_OPTIONS } from "../fixtures";
@@ -166,4 +167,41 @@ describe("alerts", () => {
       expect(appId).to.be.equal(myOpts.appId);
     });
   });
+
+  describe("convertAlertAndApp", () => {
+    const event: CloudEvent<string> = {
+      specversion: "1.0",
+      id: "id",
+      source: "source",
+      type: "type",
+      time: "now",
+      data: "data",
+    };
+
+    it("should leave event unchanged if alerttype & appid are missing", () => {
+      const raw = { ...event };
+
+      const converted = alerts.convertAlertAndApp(raw);
+
+      expect(raw).to.deep.eq(converted);
+    });
+
+    it("should convert alerttype & appid when present", () => {
+      const raw = {
+        ...event,
+        alerttype: "my-alert",
+        appid: "my-app",
+      };
+
+      const converted = alerts.convertAlertAndApp(raw);
+
+      expect(converted).to.deep.eq({
+        ...event,
+        alerttype: "my-alert",
+        appid: "my-app",
+        alertType: "my-alert",
+        appId: "my-app",
+      });
+    });
+  });
 });