firebase-tools 10.2.2 → 10.4.0

package/lib/commands/target-apply.js

@@ -3,12 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const clc = require("cli-color");
 const command_1 = require("../command");
 const logger_1 = require("../logger");
-const requireConfig = require("../requireConfig");
+const requireConfig_1 = require("../requireConfig");
 const utils = require("../utils");
 const error_1 = require("../error");
 exports.default = new command_1.Command("target:apply <type> <name> <resources...>")
     .description("apply a deploy target to a resource")
-    .before(requireConfig)
+    .before(requireConfig_1.requireConfig)
     .action((type, name, resources, options) => {
     if (!options.project) {
         throw new error_1.FirebaseError(`Must have an active project to set deploy targets. Try ${clc.bold("firebase use --add")}`);

package/lib/commands/target-clear.js

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const clc = require("cli-color");
 const command_1 = require("../command");
-const requireConfig = require("../requireConfig");
+const requireConfig_1 = require("../requireConfig");
 const utils = require("../utils");
 exports.default = new command_1.Command("target:clear <type> <target>")
     .description("clear all resources from a named resource target")
-    .before(requireConfig)
+    .before(requireConfig_1.requireConfig)
     .action((type, name, options) => {
     const existed = options.rc.clearTarget(options.project, type, name);
     if (existed) {

package/lib/commands/target-remove.js

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const clc = require("cli-color");
 const command_1 = require("../command");
-const requireConfig = require("../requireConfig");
+const requireConfig_1 = require("../requireConfig");
 const utils = require("../utils");
 exports.default = new command_1.Command("target:remove <type> <resource>")
     .description("remove a resource target")
-    .before(requireConfig)
+    .before(requireConfig_1.requireConfig)
     .action((type, resource, options) => {
     const name = options.rc.removeTarget(options.project, type, resource);
     if (name) {

package/lib/commands/target.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const clc = require("cli-color");
 const command_1 = require("../command");
 const logger_1 = require("../logger");
-const requireConfig = require("../requireConfig");
+const requireConfig_1 = require("../requireConfig");
 const utils = require("../utils");
 function logTargets(type, targets) {
     logger_1.logger.info(clc.cyan("[ " + type + " ]"));
@@ -13,7 +13,7 @@ function logTargets(type, targets) {
 }
 exports.default = new command_1.Command("target [type]")
     .description("display configured deploy targets for the current project")
-    .before(requireConfig)
+    .before(requireConfig_1.requireConfig)
     .action((type, options) => {
     if (!options.project) {
         return utils.reject("No active project, cannot list deploy targets.");

package/lib/config.js

@@ -17,12 +17,12 @@ const logger_1 = require("./logger");
 const loadCJSON = require("./loadCJSON");
 const parseBoltRules = require("./parseBoltRules");
 class Config {
-    constructor(src, options) {
+    constructor(src, options = {}) {
         this.data = {};
         this.defaults = {};
         this.notes = {};
-        this.options = options || {};
-        this.projectDir = options.projectDir || (0, detectProjectRoot_1.detectProjectRoot)(options);
+        this.options = options;
+        this.projectDir = this.options.projectDir || (0, detectProjectRoot_1.detectProjectRoot)(this.options);
         this._src = src;
         if (this._src.firebase) {
             this.defaults.project = this._src.firebase;
@@ -144,6 +144,12 @@ class Config {
         fs.ensureFileSync(this.path(p));
         fs.writeFileSync(this.path(p), content, "utf8");
     }
+    projectFileExists(p) {
+        return fs.existsSync(this.path(p));
+    }
+    deleteProjectFile(p) {
+        fs.removeSync(this.path(p));
+    }
     askWriteProjectFile(p, content, force) {
         const writeTo = this.path(p);
         let next;

package/lib/deploy/extensions/planner.js

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveVersion = exports.want = exports.have = exports.getExtension = exports.getExtensionVersion = void 0;
 const semver = require("semver");
-const error_1 = require("../../error");
 const extensionsApi = require("../../extensions/extensionsApi");
-const extensionsHelper_1 = require("../../extensions/extensionsHelper");
 const refs = require("../../extensions/refs");
-const params_1 = require("./params");
+const error_1 = require("../../error");
+const extensionsHelper_1 = require("../../extensions/extensionsHelper");
 const logger_1 = require("../../logger");
+const manifest_1 = require("../../extensions/manifest");
 async function getExtensionVersion(i) {
     if (!i.extensionVersion) {
         if (!i.ref) {
@@ -52,15 +52,15 @@ async function want(args) {
             const instanceId = e[0];
             const ref = refs.parse(e[1]);
             ref.version = await resolveVersion(ref);
-            const params = (0, params_1.readParams)({
+            const params = (0, manifest_1.readInstanceParam)({
                 projectDir: args.projectDir,
                 instanceId,
                 projectId: args.projectId,
                 projectNumber: args.projectNumber,
                 aliases: args.aliases,
-                checkLocal: args.checkLocal,
+                checkLocal: args.emulatorMode,
             });
-            const autoPopulatedParams = await (0, extensionsHelper_1.getFirebaseProjectParams)(args.projectId);
+            const autoPopulatedParams = await (0, extensionsHelper_1.getFirebaseProjectParams)(args.projectId, args.emulatorMode);
             const subbedParams = (0, extensionsHelper_1.substituteParams)(params, autoPopulatedParams);
             instanceSpecs.push({
                 instanceId,
@@ -81,11 +81,17 @@ async function want(args) {
 }
 exports.want = want;
 async function resolveVersion(ref) {
-    if (!ref.version || ref.version === "latest") {
-        return "latest";
-    }
     const extensionRef = refs.toExtensionRef(ref);
     const versions = await extensionsApi.listExtensionVersions(extensionRef);
+    if (versions.length === 0) {
+        throw new error_1.FirebaseError(`No versions found for ${extensionRef}`);
+    }
+    if (!ref.version || ref.version === "latest") {
+        return versions
+            .map((ev) => ev.spec.version)
+            .sort(semver.compare)
+            .pop();
+    }
     const maxSatisfying = semver.maxSatisfying(versions.map((ev) => ev.spec.version), ref.version);
     if (!maxSatisfying) {
         throw new error_1.FirebaseError(`No version of ${extensionRef} matches requested version ${ref.version}`);

package/lib/deploy/functions/backend.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.compareFunctions = exports.missingEndpoint = exports.hasEndpoint = exports.regionalEndpoints = exports.matchingBackend = exports.findEndpoint = exports.someEndpoint = exports.allEndpoints = exports.checkAvailability = exports.existingBackend = exports.scheduleIdForFunction = exports.functionName = exports.isEmptyBackend = exports.of = exports.empty = exports.isTaskQueueTriggered = exports.isScheduleTriggered = exports.isEventTriggered = exports.isCallableTriggered = exports.isHttpsTriggered = exports.SCHEDULED_FUNCTION_LABEL = exports.MIN_MEMORY_FOR_CONCURRENCY = exports.DEFAULT_MEMORY = exports.memoryOptionDisplayName = exports.endpointTriggerType = void 0;
+exports.compareFunctions = exports.findEventFilter = exports.missingEndpoint = exports.hasEndpoint = exports.regionalEndpoints = exports.matchingBackend = exports.findEndpoint = exports.someEndpoint = exports.allEndpoints = exports.checkAvailability = exports.existingBackend = exports.scheduleIdForFunction = exports.functionName = exports.isEmptyBackend = exports.of = exports.empty = exports.isTaskQueueTriggered = exports.isScheduleTriggered = exports.isEventTriggered = exports.isCallableTriggered = exports.isHttpsTriggered = exports.secretVersionName = exports.SCHEDULED_FUNCTION_LABEL = exports.MIN_MEMORY_FOR_CONCURRENCY = exports.DEFAULT_MEMORY = exports.memoryOptionDisplayName = exports.endpointTriggerType = void 0;
 const gcf = require("../../gcp/cloudfunctions");
 const gcfV2 = require("../../gcp/cloudfunctionsv2");
 const utils = require("../../utils");
@@ -42,6 +42,11 @@ exports.memoryOptionDisplayName = memoryOptionDisplayName;
 exports.DEFAULT_MEMORY = 256;
 exports.MIN_MEMORY_FOR_CONCURRENCY = 2048;
 exports.SCHEDULED_FUNCTION_LABEL = Object.freeze({ deployment: "firebase-schedule" });
+function secretVersionName(s) {
+    var _a;
+    return `projects/${s.projectId}/secrets/${s.secret}/versions/${(_a = s.version) !== null && _a !== void 0 ? _a : "latest"}`;
+}
+exports.secretVersionName = secretVersionName;
 function isHttpsTriggered(triggered) {
     return {}.hasOwnProperty.call(triggered, "httpsTrigger");
 }
@@ -225,6 +230,10 @@ const missingEndpoint = (backend) => (endpoint) => {
     return !(0, exports.hasEndpoint)(backend)(endpoint);
 };
 exports.missingEndpoint = missingEndpoint;
+function findEventFilter(endpoint, attribute) {
+    return endpoint.eventTrigger.eventFilters.find((ef) => ef.attribute === attribute);
+}
+exports.findEventFilter = findEventFilter;
 function compareFunctions(left, right) {
     if (left.platform !== right.platform) {
         return right.platform < left.platform ? -1 : 1;

package/lib/deploy/functions/checkIam.js

@@ -87,7 +87,7 @@ function mergeBindings(policy, allRequiredBindings) {
     }
 }
 exports.mergeBindings = mergeBindings;
-async function ensureServiceAgentRoles(projectId, want, have) {
+async function ensureServiceAgentRoles(projectNumber, want, have) {
     const wantServices = backend.allEndpoints(want).reduce(reduceEventsToServices, []);
     const haveServices = backend.allEndpoints(have).reduce(reduceEventsToServices, []);
     const newServices = wantServices.filter((wantS) => !haveServices.find((haveS) => wantS.name === haveS.name));
@@ -96,7 +96,7 @@ async function ensureServiceAgentRoles(projectId, want, have) {
     }
     let policy;
     try {
-        policy = await (0, resourceManager_1.getIamPolicy)(projectId);
+        policy = await (0, resourceManager_1.getIamPolicy)(projectNumber);
     }
     catch (err) {
         utils.logLabeledBullet("functions", "Could not verify the necessary IAM configuration for the following newly-integrated services: " +
@@ -105,11 +105,11 @@ async function ensureServiceAgentRoles(projectId, want, have) {
         return;
     }
     const findRequiredBindings = [];
-    newServices.forEach((service) => findRequiredBindings.push(service.requiredProjectBindings(projectId, policy)));
+    newServices.forEach((service) => findRequiredBindings.push(service.requiredProjectBindings(projectNumber, policy)));
     const allRequiredBindings = await Promise.all(findRequiredBindings);
     mergeBindings(policy, allRequiredBindings);
     try {
-        await (0, resourceManager_1.setIamPolicy)(projectId, policy, "bindings");
+        await (0, resourceManager_1.setIamPolicy)(projectNumber, policy, "bindings");
     }
     catch (err) {
         throw new error_1.FirebaseError("We failed to modify the IAM policy for the project. The functions " +

package/lib/deploy/functions/prepare.js

@@ -27,6 +27,7 @@ function hasDotenv(opts) {
 }
 async function prepare(context, options, payload) {
     const projectId = (0, projectUtils_1.needProjectId)(options);
+    const projectNumber = await (0, projectUtils_1.needProjectNumber)(options);
     const sourceDirName = options.config.get("functions.source");
     if (!sourceDirName) {
         throw new error_1.FirebaseError(`No functions code detected at default location (./functions), and no functions.source defined in firebase.json`);
@@ -111,7 +112,7 @@ async function prepare(context, options, payload) {
         return (0, functionsDeployHelper_1.functionMatchesAnyGroup)(endpoint, context.filters);
     });
     const haveBackend = await backend.existingBackend(context);
-    await (0, checkIam_1.ensureServiceAgentRoles)(projectId, wantBackend, haveBackend);
+    await (0, checkIam_1.ensureServiceAgentRoles)(projectNumber, wantBackend, haveBackend);
     inferDetailsFromExisting(wantBackend, haveBackend, usedDotenv);
     await (0, triggerRegionHelper_1.ensureTriggerRegions)(wantBackend);
     await (0, prompts_1.promptForFailurePolicies)(options, matchingBackend, haveBackend);

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

@@ -51,12 +51,12 @@ class Fabricator {
             totalTime: 0,
             results: [],
         };
-        const deployRegions = Object.values(plan).map(async (changes) => {
-            const results = await this.applyRegionalChanges(changes);
+        const deployChangesets = Object.values(plan).map(async (changes) => {
+            const results = await this.applyChangeset(changes);
             summary.results.push(...results);
             return;
         });
-        const promiseResults = await utils.allSettled(deployRegions);
+        const promiseResults = await utils.allSettled(deployChangesets);
         const errs = promiseResults
             .filter((r) => r.status === "rejected")
             .map((r) => r.reason);
@@ -66,7 +66,7 @@ class Fabricator {
         summary.totalTime = timer.stop();
         return summary;
     }
-    async applyRegionalChanges(changes) {
+    async applyChangeset(changes) {
         const deployResults = [];
         const handle = async (op, endpoint, fn) => {
             const timer = new timer_1.Timer();

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, " +
@@ -90,6 +103,7 @@ function changedTriggerRegion(want, have) {
 }
 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) {
@@ -149,17 +163,17 @@ 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.`);
+        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`);
+        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.`);
+        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/runtimes/discovery/v1alpha1.js

@@ -88,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, {

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

@@ -4,14 +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))) {
@@ -77,6 +83,27 @@ class Delegate {
         });
     }
     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/parseTriggers.js

@@ -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"));
@@ -73,6 +73,7 @@ function mergeRequiredAPIs(backend) {
 }
 exports.mergeRequiredAPIs = mergeRequiredAPIs;
 function addResourcesToBackend(projectId, runtime, annotation, want) {
+    var _a;
     Object.freeze(annotation);
     for (const region of annotation.regions || [api.functionsDefaultRegion]) {
         let triggered;
@@ -88,12 +89,18 @@ function addResourcesToBackend(projectId, runtime, annotation, want) {
             });
         }
         else if (annotation.httpsTrigger) {
-            const trigger = {};
-            if (annotation.failurePolicy) {
-                logger_1.logger.warn(`Ignoring retry policy for HTTPS function ${annotation.name}`);
+            if ((_a = annotation.labels) === null || _a === void 0 ? void 0 : _a["deployment-callable"]) {
+                delete annotation.labels["deployment-callable"];
+                triggered = { callableTrigger: {} };
+            }
+            else {
+                const trigger = {};
+                if (annotation.failurePolicy) {
+                    logger_1.logger.warn(`Ignoring retry policy for HTTPS function ${annotation.name}`);
+                }
+                proto.copyIfPresent(trigger, annotation.httpsTrigger, "invoker");
+                triggered = { httpsTrigger: trigger };
             }
-            proto.copyIfPresent(trigger, annotation.httpsTrigger, "invoker");
-            triggered = { httpsTrigger: trigger };
         }
         else if (annotation.schedule) {
             want.requiredAPIs.push({
@@ -106,16 +113,32 @@ function addResourcesToBackend(projectId, runtime, annotation, want) {
             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);

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

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

@@ -2,12 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ensureStorageTriggerRegion = exports.obtainStorageBindings = void 0;
 const storage = require("../../../gcp/storage");
+const backend = require("../backend");
 const logger_1 = require("../../../logger");
 const error_1 = require("../../../error");
 const location_1 = require("../../../gcp/location");
 const PUBSUB_PUBLISHER_ROLE = "roles/pubsub.publisher";
-async function obtainStorageBindings(projectId, existingPolicy) {
-    const storageResponse = await storage.getServiceAccount(projectId);
+async function obtainStorageBindings(projectNumber, existingPolicy) {
+    const storageResponse = await storage.getServiceAccount(projectNumber);
     const storageServiceAgent = `serviceAccount:${storageResponse.email_address}`;
     let pubsubBinding = existingPolicy.bindings.find((b) => b.role === PUBSUB_PUBLISHER_ROLE);
     if (!pubsubBinding) {
@@ -22,11 +23,16 @@ async function obtainStorageBindings(projectId, existingPolicy) {
     return [pubsubBinding];
 }
 exports.obtainStorageBindings = obtainStorageBindings;
-async function ensureStorageTriggerRegion(endpoint, eventTrigger) {
+async function ensureStorageTriggerRegion(endpoint) {
+    const { eventTrigger } = endpoint;
     if (!eventTrigger.region) {
         logger_1.logger.debug("Looking up bucket region for the storage event trigger");
+        const bucketFilter = backend.findEventFilter(endpoint, "bucket");
+        if (!bucketFilter) {
+            throw new error_1.FirebaseError("Storage event trigger unexpectedly missing event filter with bucket attribute.");
+        }
         try {
-            const bucket = await storage.getBucket(eventTrigger.eventFilters.bucket);
+            const bucket = await storage.getBucket(bucketFilter.value);
             eventTrigger.region = bucket.location.toLowerCase();
             logger_1.logger.debug("Setting the event trigger region to", eventTrigger.region, ".");
         }

package/lib/deploy/functions/triggerRegionHelper.js

@@ -9,7 +9,7 @@ async function ensureTriggerRegions(want) {
         if (ep.platform === "gcfv1" || !backend.isEventTriggered(ep)) {
             continue;
         }
-        regionLookups.push((0, services_1.serviceForEndpoint)(ep).ensureTriggerRegion(ep, ep.eventTrigger));
+        regionLookups.push((0, services_1.serviceForEndpoint)(ep).ensureTriggerRegion(ep));
     }
     await Promise.all(regionLookups);
 }