firebase-tools 10.2.0 → 10.3.0

package/lib/deploy/functions/release/planner.js

@@ -1,27 +1,39 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkForV2Upgrade = exports.checkForIllegalUpdate = exports.upgradedScheduleFromV1ToV2 = exports.changedV2PubSubTopic = exports.changedTriggerRegion = exports.upgradedToGCFv2WithoutSettingConcurrency = exports.createDeploymentPlan = exports.calculateUpdate = exports.calculateRegionalChanges = void 0;
+exports.checkForV2Upgrade = exports.checkForIllegalUpdate = exports.upgradedScheduleFromV1ToV2 = exports.changedV2PubSubTopic = exports.changedTriggerRegion = exports.upgradedToGCFv2WithoutSettingConcurrency = exports.createDeploymentPlan = exports.calculateUpdate = exports.calculateChangesets = void 0;
 const functionsDeployHelper_1 = require("../functionsDeployHelper");
-const functionsDeployHelper_2 = require("../functionsDeployHelper");
 const deploymentTool_1 = require("../../../deploymentTool");
 const error_1 = require("../../../error");
 const utils = require("../../../utils");
 const backend = require("../backend");
-const gcfv2 = require("../../../gcp/cloudfunctionsv2");
-function calculateRegionalChanges(want, have, options) {
-    const endpointsToCreate = Object.keys(want)
+const v2events = require("../../../functions/events/v2");
+function calculateChangesets(want, have, keyFn, options) {
+    const toCreate = utils.groupBy(Object.keys(want)
         .filter((id) => !have[id])
-        .map((id) => want[id]);
-    const endpointsToDelete = Object.keys(have)
+        .map((id) => want[id]), keyFn);
+    const toDelete = utils.groupBy(Object.keys(have)
         .filter((id) => !want[id])
         .filter((id) => options.deleteAll || (0, deploymentTool_1.isFirebaseManaged)(have[id].labels || {}))
-        .map((id) => have[id]);
-    const endpointsToUpdate = Object.keys(want)
+        .map((id) => have[id]), keyFn);
+    const toUpdate = utils.groupBy(Object.keys(want)
         .filter((id) => have[id])
-        .map((id) => calculateUpdate(want[id], have[id]));
-    return { endpointsToCreate, endpointsToUpdate, endpointsToDelete };
+        .map((id) => calculateUpdate(want[id], have[id])), (eu) => keyFn(eu.endpoint));
+    const result = {};
+    const keys = new Set([
+        ...Object.keys(toCreate),
+        ...Object.keys(toDelete),
+        ...Object.keys(toUpdate),
+    ]);
+    for (const key of keys) {
+        result[key] = {
+            endpointsToCreate: toCreate[key] || [],
+            endpointsToUpdate: toUpdate[key] || [],
+            endpointsToDelete: toDelete[key] || [],
+        };
+    }
+    return result;
 }
-exports.calculateRegionalChanges = calculateRegionalChanges;
+exports.calculateChangesets = calculateChangesets;
 function calculateUpdate(want, have) {
     checkForIllegalUpdate(want, have);
     const update = {
@@ -37,7 +49,7 @@ function calculateUpdate(want, have) {
 }
 exports.calculateUpdate = calculateUpdate;
 function createDeploymentPlan(want, have, options = {}) {
-    const deployment = {};
+    let deployment = {};
     want = backend.matchingBackend(want, (endpoint) => {
         return (0, functionsDeployHelper_1.functionMatchesAnyGroup)(endpoint, options.filters || []);
     });
@@ -46,7 +58,8 @@ function createDeploymentPlan(want, have, options = {}) {
     });
     const regions = new Set([...Object.keys(want.endpoints), ...Object.keys(have.endpoints)]);
     for (const region of regions) {
-        deployment[region] = calculateRegionalChanges(want.endpoints[region] || {}, have.endpoints[region] || {}, options);
+        const changesets = calculateChangesets(want.endpoints[region] || {}, have.endpoints[region] || {}, (e) => `${e.region}-${e.availableMemoryMb || "default"}`, options);
+        deployment = Object.assign(Object.assign({}, deployment), changesets);
     }
     if (upgradedToGCFv2WithoutSettingConcurrency(want, have)) {
         utils.logLabeledBullet("functions", "You are updating one or more functions to Google Cloud Functions v2, " +
@@ -74,10 +87,10 @@ function upgradedToGCFv2WithoutSettingConcurrency(want, have) {
 }
 exports.upgradedToGCFv2WithoutSettingConcurrency = upgradedToGCFv2WithoutSettingConcurrency;
 function changedTriggerRegion(want, have) {
-    if (want.platform != "gcfv2") {
+    if (want.platform !== "gcfv2") {
         return false;
     }
-    if (have.platform != "gcfv2") {
+    if (have.platform !== "gcfv2") {
         return false;
     }
     if (!backend.isEventTriggered(want)) {
@@ -86,10 +99,11 @@ function changedTriggerRegion(want, have) {
     if (!backend.isEventTriggered(have)) {
         return false;
     }
-    return want.eventTrigger.region != have.eventTrigger.region;
+    return want.eventTrigger.region !== have.eventTrigger.region;
 }
 exports.changedTriggerRegion = changedTriggerRegion;
 function changedV2PubSubTopic(want, have) {
+    var _a, _b;
     if (want.platform !== "gcfv2") {
         return false;
     }
@@ -102,13 +116,13 @@ function changedV2PubSubTopic(want, have) {
     if (!backend.isEventTriggered(have)) {
         return false;
     }
-    if (want.eventTrigger.eventType != gcfv2.PUBSUB_PUBLISH_EVENT) {
+    if (want.eventTrigger.eventType !== v2events.PUBSUB_PUBLISH_EVENT) {
         return false;
     }
-    if (have.eventTrigger.eventType !== gcfv2.PUBSUB_PUBLISH_EVENT) {
+    if (have.eventTrigger.eventType !== v2events.PUBSUB_PUBLISH_EVENT) {
         return false;
     }
-    return have.eventTrigger.eventFilters["resource"] != want.eventTrigger.eventFilters["resource"];
+    return (((_a = backend.findEventFilter(have, "topic")) === null || _a === void 0 ? void 0 : _a.value) !== ((_b = backend.findEventFilter(want, "topic")) === null || _b === void 0 ? void 0 : _b.value));
 }
 exports.changedV2PubSubTopic = changedV2PubSubTopic;
 function upgradedScheduleFromV1ToV2(want, have) {
@@ -132,6 +146,9 @@ function checkForIllegalUpdate(want, have) {
         if (backend.isHttpsTriggered(e)) {
             return "an HTTPS";
         }
+        else if (backend.isCallableTriggered(e)) {
+            return "a callable";
+        }
         else if (backend.isEventTriggered(e)) {
             return "a background triggered";
         }
@@ -145,18 +162,18 @@ function checkForIllegalUpdate(want, have) {
     };
     const wantType = triggerType(want);
     const haveType = triggerType(have);
-    if (wantType != haveType) {
-        throw new error_1.FirebaseError(`[${(0, functionsDeployHelper_2.getFunctionLabel)(want)}] Changing from ${haveType} function to ${wantType} function is not allowed. Please delete your function and create a new one instead.`);
+    if (wantType !== haveType) {
+        throw new error_1.FirebaseError(`[${(0, functionsDeployHelper_1.getFunctionLabel)(want)}] Changing from ${haveType} function to ${wantType} function is not allowed. Please delete your function and create a new one instead.`);
     }
-    if (want.platform == "gcfv1" && have.platform == "gcfv2") {
-        throw new error_1.FirebaseError(`[${(0, functionsDeployHelper_2.getFunctionLabel)(want)}] Functions cannot be downgraded from GCFv2 to GCFv1`);
+    if (want.platform === "gcfv1" && have.platform === "gcfv2") {
+        throw new error_1.FirebaseError(`[${(0, functionsDeployHelper_1.getFunctionLabel)(want)}] Functions cannot be downgraded from GCFv2 to GCFv1`);
     }
     exports.checkForV2Upgrade(want, have);
 }
 exports.checkForIllegalUpdate = checkForIllegalUpdate;
 function checkForV2Upgrade(want, have) {
-    if (want.platform == "gcfv2" && have.platform == "gcfv1") {
-        throw new error_1.FirebaseError(`[${(0, functionsDeployHelper_2.getFunctionLabel)(have)}] Upgrading from GCFv1 to GCFv2 is not yet supported. Please delete your old function or wait for this feature to be ready.`);
+    if (want.platform === "gcfv2" && have.platform === "gcfv1") {
+        throw new error_1.FirebaseError(`[${(0, functionsDeployHelper_1.getFunctionLabel)(have)}] Upgrading from GCFv1 to GCFv2 is not yet supported. Please delete your old function or wait for this feature to be ready.`);
     }
 }
 exports.checkForV2Upgrade = checkForV2Upgrade;

package/lib/deploy/functions/release/reporter.js

@@ -162,6 +162,9 @@ function triggerTag(endpoint) {
     if (backend.isTaskQueueTriggered(endpoint)) {
         return `${prefix}.taskQueue`;
     }
+    if (backend.isCallableTriggered(endpoint)) {
+        return `${prefix}.callable`;
+    }
     if (backend.isHttpsTriggered(endpoint)) {
         if ((_a = endpoint.labels) === null || _a === void 0 ? void 0 : _a["deployment-callable"]) {
             return `${prefix}.callable`;

package/lib/deploy/functions/runtimes/discovery/index.js

@@ -29,18 +29,18 @@ exports.yamlToBackend = yamlToBackend;
 async function detectFromYaml(directory, project, runtime) {
     let text;
     try {
-        text = await exports.readFileAsync(path.join(directory, "backend.yaml"), "utf8");
+        text = await exports.readFileAsync(path.join(directory, "functions.yaml"), "utf8");
     }
     catch (err) {
         if (err.code === "ENOENT") {
-            logger_1.logger.debug("Could not find backend.yaml. Must use http discovery");
+            logger_1.logger.debug("Could not find functions.yaml. Must use http discovery");
         }
         else {
-            logger_1.logger.debug("Unexpected error looking for backend.yaml file:", err);
+            logger_1.logger.debug("Unexpected error looking for functions.yaml file:", err);
         }
         return;
     }
-    logger_1.logger.debug("Found backend.yaml. Got spec:", text);
+    logger_1.logger.debug("Found functions.yaml. Got spec:", text);
     const parsed = yaml.load(text);
     return yamlToBackend(parsed, project, api.functionsDefaultRegion, runtime);
 }
@@ -54,7 +54,7 @@ async function detectFromPort(port, project, runtime, timeout = 30000) {
     });
     while (true) {
         try {
-            res = await Promise.race([(0, node_fetch_1.default)(`http://localhost:${port}/backend.yaml`), timedOut]);
+            res = await Promise.race([(0, node_fetch_1.default)(`http://localhost:${port}/__/functions.yaml`), timedOut]);
             break;
         }
         catch (err) {
@@ -65,7 +65,7 @@ async function detectFromPort(port, project, runtime, timeout = 30000) {
         }
     }
     const text = await res.text();
-    logger_1.logger.debug("Got response from /backend.yaml", text);
+    logger_1.logger.debug("Got response from /__/functions.yaml", text);
     let parsed;
     try {
         parsed = yaml.load(text);

package/lib/deploy/functions/runtimes/discovery/parsing.js

@@ -21,7 +21,7 @@ function assertKeyTypes(prefix, yaml, schema) {
         const key = keyAsString;
         const fullKey = prefix ? prefix + "." + key : key;
         if (!schema[key] || schema[key] === "omit") {
-            throw new error_1.FirebaseError(`Unexpected key ${fullKey}. You may need to install a newer version of the Firebase CLI`);
+            throw new error_1.FirebaseError(`Unexpected key ${fullKey}. You may need to install a newer version of the Firebase CLI.`);
         }
         if (schema[key] === "string") {
             if (typeof value !== "string") {

package/lib/deploy/functions/runtimes/discovery/v1alpha1.js

@@ -12,7 +12,7 @@ function backendFromV1Alpha1(yaml, project, region, runtime) {
     (0, parsing_1.requireKeys)("", manifest, "endpoints");
     (0, parsing_1.assertKeyTypes)("", manifest, {
         specVersion: "string",
-        requiredAPIs: "object",
+        requiredAPIs: "array",
         endpoints: "object",
     });
     for (const id of Object.keys(manifest.endpoints)) {
@@ -25,15 +25,14 @@ function backendFromV1Alpha1(yaml, project, region, runtime) {
 }
 exports.backendFromV1Alpha1 = backendFromV1Alpha1;
 function parseRequiredAPIs(manifest) {
-    const requiredAPIs = {};
-    if (typeof manifest !== "object" || Array.isArray(manifest)) {
-        throw new error_1.FirebaseError("Expected requiredApis to be a map of string to string");
-    }
-    for (const [api, reason] of Object.entries(manifest.requiredAPIs || {})) {
+    const requiredAPIs = manifest.requiredAPIs || [];
+    for (const { api, reason } of requiredAPIs) {
+        if (typeof api !== "string") {
+            throw new error_1.FirebaseError(`Invalid api "${JSON.stringify(api)}. Expected string`);
+        }
         if (typeof reason !== "string") {
             throw new error_1.FirebaseError(`Invalid reason "${JSON.stringify(reason)} for API ${api}. Expected string`);
         }
-        requiredAPIs[api] = reason;
     }
     return requiredAPIs;
 }
@@ -51,13 +50,13 @@ function parseEndpoints(manifest, id, project, defaultRegion, runtime) {
         concurrency: "number",
         serviceAccountEmail: "string",
         timeout: "string",
-        vpcConnector: "string",
-        vpcConnectorEgressSettings: "string",
+        vpc: "object",
         labels: "object",
         ingressSettings: "string",
         environmentVariables: "object",
         secretEnvironmentVariables: "array",
         httpsTrigger: "object",
+        callableTrigger: "object",
         eventTrigger: "object",
         scheduleTrigger: "object",
         taskQueueTrigger: "object",
@@ -66,6 +65,9 @@ function parseEndpoints(manifest, id, project, defaultRegion, runtime) {
     if (ep.httpsTrigger) {
         triggerCount++;
     }
+    if (ep.callableTrigger) {
+        triggerCount++;
+    }
     if (ep.eventTrigger) {
         triggerCount++;
     }
@@ -76,7 +78,7 @@ function parseEndpoints(manifest, id, project, defaultRegion, runtime) {
         triggerCount++;
     }
     if (!triggerCount) {
-        throw new error_1.FirebaseError("Expected trigger in endpoint" + id);
+        throw new error_1.FirebaseError("Expected trigger in endpoint " + id);
     }
     if (triggerCount > 1) {
         throw new error_1.FirebaseError("Multiple triggers defined for endpoint" + id);
@@ -86,13 +88,18 @@ function parseEndpoints(manifest, id, project, defaultRegion, runtime) {
         if (backend.isEventTriggered(ep)) {
             (0, parsing_1.requireKeys)(prefix + ".eventTrigger", ep.eventTrigger, "eventType", "eventFilters");
             (0, parsing_1.assertKeyTypes)(prefix + ".eventTrigger", ep.eventTrigger, {
-                eventFilters: "object",
+                eventFilters: "array",
                 eventType: "string",
                 retry: "boolean",
                 region: "string",
                 serviceAccountEmail: "string",
             });
             triggered = { eventTrigger: ep.eventTrigger };
+            for (const eventFilter of triggered.eventTrigger.eventFilters) {
+                if (eventFilter.attribute === "topic" && !eventFilter.value.startsWith("projects/")) {
+                    eventFilter.value = `projects/${project}/topics/${eventFilter.value}`;
+                }
+            }
         }
         else if (backend.isHttpsTriggered(ep)) {
             (0, parsing_1.assertKeyTypes)(prefix + ".httpsTrigger", ep.httpsTrigger, {
@@ -101,6 +108,9 @@ function parseEndpoints(manifest, id, project, defaultRegion, runtime) {
             triggered = { httpsTrigger: {} };
             (0, proto_1.copyIfPresent)(triggered.httpsTrigger, ep.httpsTrigger, "invoker");
         }
+        else if (backend.isCallableTriggered(ep)) {
+            triggered = { callableTrigger: {} };
+        }
         else if (backend.isScheduleTriggered(ep)) {
             (0, parsing_1.assertKeyTypes)(prefix + ".scheduleTrigger", ep.scheduleTrigger, {
                 schedule: "string",
@@ -149,7 +159,7 @@ function parseEndpoints(manifest, id, project, defaultRegion, runtime) {
             region,
             project,
             runtime, entryPoint: ep.entryPoint }, triggered);
-        (0, proto_1.copyIfPresent)(parsed, ep, "availableMemoryMb", "maxInstances", "minInstances", "concurrency", "serviceAccountEmail", "timeout", "vpcConnector", "vpcConnectorEgressSettings", "labels", "ingressSettings", "environmentVariables");
+        (0, proto_1.copyIfPresent)(parsed, ep, "availableMemoryMb", "maxInstances", "minInstances", "concurrency", "serviceAccountEmail", "timeout", "vpc", "labels", "ingressSettings", "environmentVariables");
         allParsed.push(parsed);
     }
     return allParsed;

package/lib/deploy/functions/runtimes/golang/index.js

@@ -71,7 +71,7 @@ class Delegate {
             },
             stdio: ["ignore", "pipe", "pipe"],
         });
-        if (genBinary.status != 0) {
+        if (genBinary.status !== 0) {
             throw new error_1.FirebaseError("Failed to run codegen", {
                 children: [new Error(genBinary.stderr.toString())],
             });
@@ -96,7 +96,7 @@ class Delegate {
                 childProcess.once("exit", resolve);
                 childProcess.once("error", reject);
             });
-            await (0, node_fetch_1.default)(`http://localhost:${adminPort}/quitquitquit`);
+            await (0, node_fetch_1.default)(`http://localhost:${adminPort}/__/quitquitquit`);
             setTimeout(() => {
                 if (!childProcess.killed) {
                     childProcess.kill("SIGKILL");

package/lib/deploy/functions/runtimes/node/index.js

@@ -4,12 +4,20 @@ exports.Delegate = exports.tryCreateDelegate = void 0;
 const util_1 = require("util");
 const fs = require("fs");
 const path = require("path");
+const portfinder = require("portfinder");
+const semver = require("semver");
+const spawn = require("cross-spawn");
+const node_fetch_1 = require("node-fetch");
 const error_1 = require("../../../../error");
 const parseRuntimeAndValidateSDK_1 = require("./parseRuntimeAndValidateSDK");
 const logger_1 = require("../../../../logger");
+const previews_1 = require("../../../../previews");
+const utils_1 = require("../../../../utils");
+const discovery = require("../discovery");
 const validate = require("./validate");
 const versioning = require("./versioning");
 const parseTriggers = require("./parseTriggers");
+const MIN_FUNCTIONS_SDK_VERSION = "3.19.0";
 async function tryCreateDelegate(context) {
     const packageJsonPath = path.join(context.sourceDir, "package.json");
     if (!(await (0, util_1.promisify)(fs.exists)(packageJsonPath))) {
@@ -50,7 +58,52 @@ class Delegate {
     watch() {
         return Promise.resolve(() => Promise.resolve());
     }
+    serve(port, envs) {
+        var _a;
+        const childProcess = spawn("./node_modules/.bin/firebase-functions", [this.sourceDir], {
+            env: Object.assign(Object.assign({}, envs), { PORT: port.toString(), FUNCTIONS_CONTROL_API: "true", HOME: process.env.HOME, PATH: process.env.PATH }),
+            cwd: this.sourceDir,
+            stdio: ["ignore", "pipe", "inherit"],
+        });
+        (_a = childProcess.stdout) === null || _a === void 0 ? void 0 : _a.on("data", (chunk) => {
+            logger_1.logger.debug(chunk.toString());
+        });
+        return Promise.resolve(async () => {
+            const p = new Promise((resolve, reject) => {
+                childProcess.once("exit", resolve);
+                childProcess.once("error", reject);
+            });
+            await (0, node_fetch_1.default)(`http://localhost:${port}/__/quitquitquit`);
+            setTimeout(() => {
+                if (!childProcess.killed) {
+                    childProcess.kill("SIGKILL");
+                }
+            }, 10000);
+            return p;
+        });
+    }
     async discoverSpec(config, env) {
+        if (previews_1.previews.functionsv2) {
+            if (semver.lt(this.sdkVersion, MIN_FUNCTIONS_SDK_VERSION)) {
+                (0, utils_1.logLabeledWarning)("functions", `You are using an old version of firebase-functions SDK (${this.sdkVersion}). ` +
+                    `Please update firebase-functions SDK to >=${MIN_FUNCTIONS_SDK_VERSION}`);
+                return parseTriggers.discoverBackend(this.projectId, this.sourceDir, this.runtime, config, env);
+            }
+            let discovered = await discovery.detectFromYaml(this.sourceDir, this.projectId, this.runtime);
+            if (!discovered) {
+                const getPort = (0, util_1.promisify)(portfinder.getPort);
+                const port = await getPort();
+                const kill = await this.serve(port, env);
+                try {
+                    discovered = await discovery.detectFromPort(port, this.projectId, this.runtime);
+                }
+                finally {
+                    await kill();
+                }
+            }
+            discovered.environmentVariables = env;
+            return discovered;
+        }
         return parseTriggers.discoverBackend(this.projectId, this.sourceDir, this.runtime, config, env);
     }
 }

package/lib/deploy/functions/runtimes/node/parseRuntimeAndValidateSDK.js

@@ -46,11 +46,11 @@ function getRuntimeChoice(sourceDir, runtimeFromConfig) {
         ? exports.UNSUPPORTED_NODE_VERSION_FIREBASE_JSON_MSG
         : exports.UNSUPPORTED_NODE_VERSION_PACKAGE_JSON_MSG) + exports.DEPRECATED_NODE_VERSION_INFO;
     if (!runtime || !ENGINE_RUNTIMES_NAMES.includes(runtime)) {
-        track("functions_runtime_notices", "package_missing_runtime");
+        void track("functions_runtime_notices", "package_missing_runtime");
         throw new error_1.FirebaseError(errorMessage, { exit: 1 });
     }
     if (runtimes.isDeprecatedRuntime(runtime) || !runtimes.isValidRuntime(runtime)) {
-        track("functions_runtime_notices", `${runtime}_deploy_prohibited`);
+        void track("functions_runtime_notices", `${runtime}_deploy_prohibited`);
         throw new error_1.FirebaseError(errorMessage, { exit: 1 });
     }
     return runtime;

package/lib/deploy/functions/runtimes/node/parseTriggers.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addResourcesToBackend = exports.discoverBackend = exports.useStrategy = void 0;
+exports.addResourcesToBackend = exports.mergeRequiredAPIs = exports.discoverBackend = exports.useStrategy = void 0;
 const path = require("path");
 const _ = require("lodash");
 const child_process_1 = require("child_process");
@@ -9,7 +9,7 @@ const logger_1 = require("../../../../logger");
 const backend = require("../../backend");
 const api = require("../../../../api");
 const proto = require("../../../../gcp/proto");
-const eventTypes_1 = require("../../eventTypes");
+const v2events = require("../../../../functions/events/v2");
 const TRIGGER_PARSER = path.resolve(__dirname, "./triggerParser.js");
 function removeInspectOptions(options) {
     return options.filter((opt) => !opt.startsWith("--inspect"));
@@ -58,17 +58,34 @@ async function discoverBackend(projectId, sourceDir, runtime, configValues, envs
     return want;
 }
 exports.discoverBackend = discoverBackend;
+function mergeRequiredAPIs(backend) {
+    const apiToReasons = {};
+    for (const { api, reason } of backend.requiredAPIs) {
+        const reasons = apiToReasons[api] || new Set();
+        reasons.add(reason);
+        apiToReasons[api] = reasons;
+    }
+    const merged = [];
+    for (const [api, reasons] of Object.entries(apiToReasons)) {
+        merged.push({ api, reason: Array.from(reasons).join(" ") });
+    }
+    backend.requiredAPIs = merged;
+}
+exports.mergeRequiredAPIs = mergeRequiredAPIs;
 function addResourcesToBackend(projectId, runtime, annotation, want) {
     Object.freeze(annotation);
     for (const region of annotation.regions || [api.functionsDefaultRegion]) {
         let triggered;
         const triggerCount = +!!annotation.httpsTrigger + +!!annotation.eventTrigger + +!!annotation.taskQueueTrigger;
-        if (triggerCount != 1) {
+        if (triggerCount !== 1) {
             throw new error_1.FirebaseError("Unexpected annotation generated by the Firebase Functions SDK. This should never happen.");
         }
         if (annotation.taskQueueTrigger) {
             triggered = { taskQueueTrigger: annotation.taskQueueTrigger };
-            want.requiredAPIs["cloudtasks"] = "cloudtasks.googleapis.com";
+            want.requiredAPIs.push({
+                api: "cloudtasks.googleapis.com",
+                reason: "Needed for task queue functions.",
+            });
         }
         else if (annotation.httpsTrigger) {
             const trigger = {};
@@ -79,24 +96,42 @@ function addResourcesToBackend(projectId, runtime, annotation, want) {
             triggered = { httpsTrigger: trigger };
         }
         else if (annotation.schedule) {
-            want.requiredAPIs["pubsub"] = "pubsub.googleapis.com";
-            want.requiredAPIs["scheduler"] = "cloudscheduler.googleapis.com";
+            want.requiredAPIs.push({
+                api: "cloudscheduler.googleapis.com",
+                reason: "Needed for scheduled functions.",
+            });
             triggered = { scheduleTrigger: annotation.schedule };
         }
         else {
             triggered = {
                 eventTrigger: {
                     eventType: annotation.eventTrigger.eventType,
-                    eventFilters: {
-                        resource: annotation.eventTrigger.resource,
-                    },
+                    eventFilters: [
+                        {
+                            attribute: "resource",
+                            value: annotation.eventTrigger.resource,
+                        },
+                    ],
                     retry: !!annotation.failurePolicy,
                 },
             };
-            if (eventTypes_1.STORAGE_V2_EVENTS.find((event) => { var _a; return event === (((_a = annotation.eventTrigger) === null || _a === void 0 ? void 0 : _a.eventType) || ""); })) {
-                triggered.eventTrigger.eventFilters = {
-                    bucket: annotation.eventTrigger.resource,
-                };
+            if (annotation.platform === "gcfv2") {
+                if (annotation.eventTrigger.eventType === v2events.PUBSUB_PUBLISH_EVENT) {
+                    triggered.eventTrigger.eventFilters = [
+                        {
+                            attribute: "topic",
+                            value: annotation.eventTrigger.resource,
+                        },
+                    ];
+                }
+                if (v2events.STORAGE_EVENTS.find((event) => { var _a; return event === (((_a = annotation.eventTrigger) === null || _a === void 0 ? void 0 : _a.eventType) || ""); })) {
+                    triggered.eventTrigger.eventFilters = [
+                        {
+                            attribute: "bucket",
+                            value: annotation.eventTrigger.resource,
+                        },
+                    ];
+                }
             }
         }
         const endpoint = Object.assign({ platform: annotation.platform || "gcfv1", id: annotation.name, region: region, project: projectId, entryPoint: annotation.entryPoint, runtime: runtime }, triggered);
@@ -105,7 +140,8 @@ function addResourcesToBackend(projectId, runtime, annotation, want) {
             if (maybeId && !maybeId.includes("/")) {
                 maybeId = `projects/${projectId}/locations/${region}/connectors/${maybeId}`;
             }
-            endpoint.vpcConnector = maybeId;
+            endpoint.vpc = { connector: maybeId };
+            proto.renameIfPresent(endpoint.vpc, annotation, "egressSettings", "vpcConnectorEgressSettings");
         }
         if (annotation.secrets) {
             const secretEnvs = [];
@@ -119,9 +155,10 @@ function addResourcesToBackend(projectId, runtime, annotation, want) {
             }
             endpoint.secretEnvironmentVariables = secretEnvs;
         }
-        proto.copyIfPresent(endpoint, annotation, "concurrency", "serviceAccountEmail", "labels", "vpcConnectorEgressSettings", "ingressSettings", "timeout", "maxInstances", "minInstances", "availableMemoryMb");
+        proto.copyIfPresent(endpoint, annotation, "concurrency", "serviceAccountEmail", "labels", "ingressSettings", "timeout", "maxInstances", "minInstances", "availableMemoryMb");
         want.endpoints[region] = want.endpoints[region] || {};
         want.endpoints[region][endpoint.id] = endpoint;
+        mergeRequiredAPIs(want);
     }
 }
 exports.addResourcesToBackend = addResourcesToBackend;

package/lib/deploy/functions/runtimes/node/versioning.js

@@ -52,7 +52,7 @@ exports.getLatestSDKVersion = getLatestSDKVersion;
 function checkFunctionsSDKVersion(currentVersion) {
     try {
         if (semver.lt(currentVersion, MIN_SDK_VERSION)) {
-            track("functions_runtime_notices", "functions_sdk_too_old");
+            void track("functions_runtime_notices", "functions_sdk_too_old");
             utils.logWarning(exports.FUNCTIONS_SDK_VERSION_TOO_OLD_WARNING);
         }
         const latest = exports.getLatestSDKVersion();
@@ -63,7 +63,7 @@ function checkFunctionsSDKVersion(currentVersion) {
             return;
         }
         utils.logWarning(clc.bold.yellow("functions: ") +
-            "package.json indicates an outdated version of firebase-functions.\nPlease upgrade using " +
+            "package.json indicates an outdated version of firebase-functions. Please upgrade using " +
             clc.bold("npm install --save firebase-functions@latest") +
             " in your functions directory.");
         if (semver.major(currentVersion) < semver.major(latest)) {

package/lib/deploy/functions/services/firebaseAlerts.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ensureFirebaseAlertsTriggerRegion = exports.obtainFirebaseAlertsBindings = exports.SERVICE_ACCOUNT_TOKEN_CREATOR_ROLE = void 0;
+const error_1 = require("../../../error");
+exports.SERVICE_ACCOUNT_TOKEN_CREATOR_ROLE = "roles/iam.serviceAccountTokenCreator";
+function obtainFirebaseAlertsBindings(projectNumber, existingPolicy) {
+    const pubsubServiceAgent = `serviceAccount:service-${projectNumber}@gcp-sa-pubsub.iam.gserviceaccount.com`;
+    let pubsubBinding = existingPolicy.bindings.find((b) => b.role === exports.SERVICE_ACCOUNT_TOKEN_CREATOR_ROLE);
+    if (!pubsubBinding) {
+        pubsubBinding = {
+            role: exports.SERVICE_ACCOUNT_TOKEN_CREATOR_ROLE,
+            members: [],
+        };
+    }
+    if (!pubsubBinding.members.find((m) => m === pubsubServiceAgent)) {
+        pubsubBinding.members.push(pubsubServiceAgent);
+    }
+    return Promise.resolve([pubsubBinding]);
+}
+exports.obtainFirebaseAlertsBindings = obtainFirebaseAlertsBindings;
+function ensureFirebaseAlertsTriggerRegion(endpoint) {
+    if (!endpoint.eventTrigger.region) {
+        endpoint.eventTrigger.region = "global";
+    }
+    if (endpoint.eventTrigger.region !== "global") {
+        throw new error_1.FirebaseError("A firebase alerts trigger must specify 'global' trigger location");
+    }
+    return Promise.resolve();
+}
+exports.ensureFirebaseAlertsTriggerRegion = ensureFirebaseAlertsTriggerRegion;

package/lib/deploy/functions/services/index.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.serviceForEndpoint = exports.EVENT_SERVICE_MAPPING = exports.StorageService = exports.PubSubService = exports.NoOpService = void 0;
+exports.serviceForEndpoint = exports.EVENT_SERVICE_MAPPING = exports.FirebaseAlertsService = exports.StorageService = exports.PubSubService = exports.NoOpService = void 0;
 const backend = require("../backend");
 const storage_1 = require("./storage");
+const firebaseAlerts_1 = require("./firebaseAlerts");
 const noop = () => Promise.resolve();
 exports.NoOpService = {
     name: "noop",
@@ -22,12 +23,19 @@ exports.StorageService = {
     requiredProjectBindings: storage_1.obtainStorageBindings,
     ensureTriggerRegion: storage_1.ensureStorageTriggerRegion,
 };
+exports.FirebaseAlertsService = {
+    name: "firebasealerts",
+    api: "logging.googleapis.com",
+    requiredProjectBindings: firebaseAlerts_1.obtainFirebaseAlertsBindings,
+    ensureTriggerRegion: firebaseAlerts_1.ensureFirebaseAlertsTriggerRegion,
+};
 exports.EVENT_SERVICE_MAPPING = {
     "google.cloud.pubsub.topic.v1.messagePublished": exports.PubSubService,
     "google.cloud.storage.object.v1.finalized": exports.StorageService,
     "google.cloud.storage.object.v1.archived": exports.StorageService,
     "google.cloud.storage.object.v1.deleted": exports.StorageService,
     "google.cloud.storage.object.v1.metadataUpdated": exports.StorageService,
+    "google.firebase.firebasealerts.alerts.v1.published": exports.FirebaseAlertsService,
 };
 function serviceForEndpoint(endpoint) {
     if (!backend.isEventTriggered(endpoint)) {