firebase-tools 10.6.0 → 10.7.0

package/lib/deploy/functions/prepareFunctionsUpload.js

@@ -14,31 +14,26 @@ const functionsConfig = require("../../functionsConfig");
 const utils = require("../../utils");
 const fsAsync = require("../../fsAsync");
 const CONFIG_DEST_FILE = ".runtimeconfig.json";
-async function getFunctionsConfig(context) {
+async function getFunctionsConfig(projectId) {
     var _a, _b;
-    let config = {};
-    if (context.runtimeConfigEnabled) {
-        try {
-            config = await functionsConfig.materializeAll(context.firebaseConfig.projectId);
+    try {
+        return await functionsConfig.materializeAll(projectId);
+    }
+    catch (err) {
+        logger_1.logger.debug(err);
+        let errorCode = (_b = (_a = err === null || err === void 0 ? void 0 : err.context) === null || _a === void 0 ? void 0 : _a.response) === null || _b === void 0 ? void 0 : _b.statusCode;
+        if (!errorCode) {
+            logger_1.logger.debug("Got unexpected error from Runtime Config; it has no status code:", err);
+            errorCode = 500;
         }
-        catch (err) {
-            logger_1.logger.debug(err);
-            let errorCode = (_b = (_a = err === null || err === void 0 ? void 0 : err.context) === null || _a === void 0 ? void 0 : _a.response) === null || _b === void 0 ? void 0 : _b.statusCode;
-            if (!errorCode) {
-                logger_1.logger.debug("Got unexpected error from Runtime Config; it has no status code:", err);
-                errorCode = 500;
-            }
-            if (errorCode === 500 || errorCode === 503) {
-                throw new error_1.FirebaseError("Cloud Runtime Config is currently experiencing issues, " +
-                    "which is preventing your functions from being deployed. " +
-                    "Please wait a few minutes and then try to deploy your functions again." +
-                    "\nRun `firebase deploy --except functions` if you want to continue deploying the rest of your project.");
-            }
-            config = {};
+        if (errorCode === 500 || errorCode === 503) {
+            throw new error_1.FirebaseError("Cloud Runtime Config is currently experiencing issues, " +
+                "which is preventing your functions from being deployed. " +
+                "Please wait a few minutes and then try to deploy your functions again." +
+                "\nRun `firebase deploy --except functions` if you want to continue deploying the rest of your project.");
         }
     }
-    config.firebase = context.firebaseConfig;
-    return config;
+    return {};
 }
 exports.getFunctionsConfig = getFunctionsConfig;
 async function pipeAsync(from, to) {

package/lib/deploy/functions/pricing.js

@@ -93,14 +93,17 @@ exports.V2_FREE_TIER = {
     vCpu: 180000,
     egress: 1,
 };
+const VCPU_TO_GHZ = 2.4;
 const MB_TO_GHZ = {
     128: 0.2,
     256: 0.4,
     512: 0.8,
     1024: 1.4,
-    2048: 2.4,
-    4096: 4.8,
-    8192: 4.8,
+    2048: 1 * VCPU_TO_GHZ,
+    4096: 2 * VCPU_TO_GHZ,
+    8192: 2 * VCPU_TO_GHZ,
+    16384: 4 * VCPU_TO_GHZ,
+    32768: 8 * VCPU_TO_GHZ,
 };
 function canCalculateMinInstanceCost(endpoint) {
     if (!endpoint.minInstances) {

package/lib/deploy/functions/prompts.js

@@ -136,19 +136,13 @@ async function promptForMinInstances(options, want, have) {
         const cost = pricing.monthlyMinInstanceCost(backend.allEndpoints(want)).toFixed(2);
         costLine = `With these options, your minimum bill will be $${cost} in a 30-day month`;
     }
-    let cudAnnotation = "";
-    if (backend.someEndpoint(want, (fn) => fn.platform === "gcfv2" && !!fn.minInstances)) {
-        cudAnnotation =
-            "\nThis bill can be lowered with a one year commitment. See https://cloud.google.com/run/cud for more";
-    }
     const warnMessage = "The following functions have reserved minimum instances. This will " +
         "reduce the frequency of cold starts but increases the minimum cost. " +
         "You will be charged for the memory allocation and a fraction of the " +
         "CPU allocation of instances while they are idle.\n\n" +
         functionLines +
         "\n\n" +
-        costLine +
-        cudAnnotation;
+        costLine;
     utils.logLabeledWarning("functions", warnMessage);
     const proceed = await (0, prompt_1.promptOnce)({
         type: "confirm",

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

@@ -21,6 +21,8 @@ const reporter = require("./reporter");
 const run = require("../../../gcp/run");
 const scheduler = require("../../../gcp/cloudscheduler");
 const utils = require("../../../utils");
+const services = require("../services");
+const v1_1 = require("../../../functions/events/v1");
 const gcfV1PollerOptions = {
     apiOrigin: api_1.functionsOrigin,
     apiVersion: gcf.API_VERSION,
@@ -35,6 +37,7 @@ const gcfV2PollerOptions = {
 };
 const DEFAULT_GCFV2_CONCURRENCY = 80;
 const rethrowAs = (endpoint, op) => (err) => {
+    logger_1.logger.error(err.message);
     throw new reporter.DeploymentError(endpoint, op, err);
 };
 class Fabricator {
@@ -195,6 +198,14 @@ class Fabricator {
                     .catch(rethrowAs(endpoint, "set invoker"));
             }
         }
+        else if (backend.isBlockingTriggered(endpoint) &&
+            v1_1.AUTH_BLOCKING_EVENTS.includes(endpoint.blockingTrigger.eventType)) {
+            await this.executor
+                .run(async () => {
+                await gcf.setInvokerCreate(endpoint.project, backend.functionName(endpoint), ["public"]);
+            })
+                .catch(rethrowAs(endpoint, "set invoker"));
+        }
     }
     async createV2Function(endpoint) {
         var _a;
@@ -202,7 +213,7 @@ class Fabricator {
             logger_1.logger.debug("Precondition failed. Cannot create a GCFv2 function without storage");
             throw new Error("Precondition failed");
         }
-        const apiFunction = gcfV2.functionFromEndpoint(endpoint, this.storage[endpoint.region]);
+        const apiFunction = gcfV2.functionFromEndpoint(endpoint, this.storage);
         const topic = (_a = apiFunction.eventTrigger) === null || _a === void 0 ? void 0 : _a.pubsubTopic;
         if (topic) {
             await this.executor
@@ -252,6 +263,12 @@ class Fabricator {
                     .catch(rethrowAs(endpoint, "set invoker"));
             }
         }
+        else if (backend.isBlockingTriggered(endpoint) &&
+            v1_1.AUTH_BLOCKING_EVENTS.includes(endpoint.blockingTrigger.eventType)) {
+            await this.executor
+                .run(() => run.setInvokerCreate(endpoint.project, serviceName, ["public"]))
+                .catch(rethrowAs(endpoint, "set invoker"));
+        }
         const mem = endpoint.availableMemoryMb || backend.DEFAULT_MEMORY;
         if (mem >= backend.MIN_MEMORY_FOR_CONCURRENCY && endpoint.concurrency !== 1) {
             await this.setConcurrency(endpoint, serviceName, endpoint.concurrency || DEFAULT_GCFV2_CONCURRENCY);
@@ -279,6 +296,10 @@ class Fabricator {
         else if (backend.isTaskQueueTriggered(endpoint)) {
             invoker = endpoint.taskQueueTrigger.invoker;
         }
+        else if (backend.isBlockingTriggered(endpoint) &&
+            v1_1.AUTH_BLOCKING_EVENTS.includes(endpoint.blockingTrigger.eventType)) {
+            invoker = ["public"];
+        }
         if (invoker) {
             await this.executor
                 .run(() => gcf.setInvokerUpdate(endpoint.project, backend.functionName(endpoint), invoker))
@@ -291,7 +312,7 @@ class Fabricator {
             logger_1.logger.debug("Precondition failed. Cannot update a GCFv2 function without storage");
             throw new Error("Precondition failed");
         }
-        const apiFunction = gcfV2.functionFromEndpoint(endpoint, this.storage[endpoint.region]);
+        const apiFunction = gcfV2.functionFromEndpoint(endpoint, this.storage);
         if ((_a = apiFunction.eventTrigger) === null || _a === void 0 ? void 0 : _a.pubsubTopic) {
             delete apiFunction.eventTrigger.pubsubTopic;
         }
@@ -310,6 +331,10 @@ class Fabricator {
         else if (backend.isTaskQueueTriggered(endpoint)) {
             invoker = endpoint.taskQueueTrigger.invoker;
         }
+        else if (backend.isBlockingTriggered(endpoint) &&
+            v1_1.AUTH_BLOCKING_EVENTS.includes(endpoint.blockingTrigger.eventType)) {
+            invoker = ["public"];
+        }
         if (invoker) {
             await this.executor
                 .run(() => run.setInvokerUpdate(endpoint.project, serviceName, invoker))
@@ -369,6 +394,9 @@ class Fabricator {
         else if (backend.isTaskQueueTriggered(endpoint)) {
             await this.upsertTaskQueue(endpoint);
         }
+        else if (backend.isBlockingTriggered(endpoint)) {
+            await this.registerBlockingTrigger(endpoint);
+        }
     }
     async deleteTrigger(endpoint) {
         if (backend.isScheduleTriggered(endpoint)) {
@@ -385,6 +413,9 @@ class Fabricator {
         else if (backend.isTaskQueueTriggered(endpoint)) {
             await this.disableTaskQueue(endpoint);
         }
+        else if (backend.isBlockingTriggered(endpoint)) {
+            await this.unregisterBlockingTrigger(endpoint);
+        }
     }
     async upsertScheduleV1(endpoint) {
         const job = scheduler.jobFromEndpoint(endpoint, this.appEngineLocation);
@@ -406,6 +437,11 @@ class Fabricator {
                 .catch(rethrowAs(endpoint, "set invoker"));
         }
     }
+    async registerBlockingTrigger(endpoint) {
+        await this.executor
+            .run(() => services.serviceForEndpoint(endpoint).registerTrigger(endpoint))
+            .catch(rethrowAs(endpoint, "register blocking trigger"));
+    }
     async deleteScheduleV1(endpoint) {
         const job = scheduler.jobFromEndpoint(endpoint, this.appEngineLocation);
         await this.executor
@@ -427,6 +463,11 @@ class Fabricator {
             .run(() => cloudtasks.updateQueue(update))
             .catch(rethrowAs(endpoint, "disable task queue"));
     }
+    async unregisterBlockingTrigger(endpoint) {
+        await this.executor
+            .run(() => services.serviceForEndpoint(endpoint).unregisterTrigger(endpoint))
+            .catch(rethrowAs(endpoint, "unregister blocking trigger"));
+    }
     logOpStart(op, endpoint) {
         const runtime = (0, runtimes_1.getHumanFriendlyRuntimeName)(endpoint.runtime);
         const label = helper.getFunctionLabel(endpoint);

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

@@ -21,7 +21,11 @@ async function release(context, options, payload) {
     if (!context.config) {
         return;
     }
-    const plan = planner.createDeploymentPlan(payload.functions.backend, await backend.existingBackend(context), { filters: context.filters });
+    if (!payload.functions) {
+        return;
+    }
+    const { wantBackend, haveBackend } = payload.functions;
+    const plan = planner.createDeploymentPlan(wantBackend, haveBackend, context.filters);
     const fnsToDelete = Object.values(plan)
         .map((regionalChanges) => regionalChanges.endpointsToDelete)
         .reduce(functional_1.reduceFlat, []);
@@ -40,15 +44,15 @@ async function release(context, options, payload) {
     const fab = new fabricator.Fabricator({
         functionExecutor,
         executor: new executor.QueueExecutor({}),
-        sourceUrl: context.sourceUrl,
-        storage: context.storage,
+        sourceUrl: context.source.sourceUrl,
+        storage: context.source.storage,
         appEngineLocation: (0, functionsConfig_1.getAppEngineLocation)(context.firebaseConfig),
     });
     const summary = await fab.applyPlan(plan);
     await reporter.logAndTrackDeployStats(summary);
     reporter.printErrors(summary);
-    printTriggerUrls(payload.functions.backend);
-    const haveEndpoints = backend.allEndpoints(payload.functions.backend);
+    printTriggerUrls(payload.functions.wantBackend);
+    const haveEndpoints = backend.allEndpoints(payload.functions.wantBackend);
     const deletedEndpoints = Object.values(plan)
         .map((r) => r.endpointsToDelete)
         .reduce(functional_1.reduceFlat, []);
@@ -89,7 +93,7 @@ function printTriggerUrls(results) {
     }
     for (const httpsFunc of httpsFunctions) {
         if (!httpsFunc.uri) {
-            logger_1.logger.debug("Missing URI for HTTPS function in printTriggerUrls. This shouldn't happen");
+            logger_1.logger.debug("Not printing URL for HTTPS function. Typically this means it didn't match a filter or we failed deployment");
             continue;
         }
         logger_1.logger.info(clc.bold("Function URL"), `(${(0, functionsDeployHelper_1.getFunctionLabel)(httpsFunc)}):`, httpsFunc.uri);

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

@@ -7,13 +7,13 @@ const error_1 = require("../../../error");
 const utils = require("../../../utils");
 const backend = require("../backend");
 const v2events = require("../../../functions/events/v2");
-function calculateChangesets(want, have, keyFn, options) {
+function calculateChangesets(want, have, keyFn, deleteAll) {
     const toCreate = utils.groupBy(Object.keys(want)
         .filter((id) => !have[id])
         .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 || {}))
+        .filter((id) => deleteAll || (0, deploymentTool_1.isFirebaseManaged)(have[id].labels || {}))
         .map((id) => have[id]), keyFn);
     const toUpdate = utils.groupBy(Object.keys(want)
         .filter((id) => have[id])
@@ -48,17 +48,17 @@ function calculateUpdate(want, have) {
     return update;
 }
 exports.calculateUpdate = calculateUpdate;
-function createDeploymentPlan(want, have, options = {}) {
+function createDeploymentPlan(want, have, filters, deleteAll) {
     let deployment = {};
     want = backend.matchingBackend(want, (endpoint) => {
-        return (0, functionsDeployHelper_1.functionMatchesAnyGroup)(endpoint, options.filters || []);
+        return (0, functionsDeployHelper_1.endpointMatchesAnyFilter)(endpoint, filters);
     });
     have = backend.matchingBackend(have, (endpoint) => {
-        return (0, functionsDeployHelper_1.functionMatchesAnyGroup)(endpoint, options.filters || []);
+        return (0, functionsDeployHelper_1.endpointMatchesAnyFilter)(endpoint, filters);
     });
     const regions = new Set([...Object.keys(want.endpoints), ...Object.keys(have.endpoints)]);
     for (const region of regions) {
-        const changesets = calculateChangesets(want.endpoints[region] || {}, have.endpoints[region] || {}, (e) => `${e.region}-${e.availableMemoryMb || "default"}`, options);
+        const changesets = calculateChangesets(want.endpoints[region] || {}, have.endpoints[region] || {}, (e) => `${e.region}-${e.availableMemoryMb || "default"}`, deleteAll);
         deployment = Object.assign(Object.assign({}, deployment), changesets);
     }
     if (upgradedToGCFv2WithoutSettingConcurrency(want, have)) {
@@ -157,6 +157,9 @@ function checkForIllegalUpdate(want, have) {
         else if (backend.isTaskQueueTriggered(e)) {
             return "a task queue";
         }
+        else if (backend.isBlockingTriggered(e)) {
+            return e.blockingTrigger.eventType;
+        }
         throw Error("Functions release planner is not able to handle an unknown trigger type");
     };
     const wantType = triggerType(want);

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

@@ -4,7 +4,7 @@ exports.triggerTag = exports.printAbortedErrors = exports.printErrors = exports.
 const backend = require("../backend");
 const clc = require("cli-color");
 const logger_1 = require("../../../logger");
-const track = require("../../../track");
+const track_1 = require("../../../track");
 const utils = require("../../../utils");
 const functionsDeployHelper_1 = require("../functionsDeployHelper");
 class DeploymentError extends Error {
@@ -36,23 +36,23 @@ async function logAndTrackDeployStats(summary) {
         totalTime += result.durationMs;
         if (!result.error) {
             totalSuccesses++;
-            reports.push(track.track("function_deploy_success", tag, result.durationMs));
+            reports.push((0, track_1.track)("function_deploy_success", tag, result.durationMs));
         }
         else if (result.error instanceof AbortedDeploymentError) {
             totalAborts++;
-            reports.push(track.track("function_deploy_abort", tag, result.durationMs));
+            reports.push((0, track_1.track)("function_deploy_abort", tag, result.durationMs));
         }
         else {
             totalErrors++;
-            reports.push(track.track("function_deploy_failure", tag, result.durationMs));
+            reports.push((0, track_1.track)("function_deploy_failure", tag, result.durationMs));
         }
     }
     const regionCountTag = regions.size < 5 ? regions.size.toString() : ">=5";
-    reports.push(track.track("functions_region_count", regionCountTag, 1));
+    reports.push((0, track_1.track)("functions_region_count", regionCountTag, 1));
     const gcfv1 = summary.results.find((r) => r.endpoint.platform === "gcfv1");
     const gcfv2 = summary.results.find((r) => r.endpoint.platform === "gcfv2");
     const tag = gcfv1 && gcfv2 ? "v1+v2" : gcfv1 ? "v1" : "v2";
-    reports.push(track.track("functions_codebase_deploy", tag, summary.results.length));
+    reports.push((0, track_1.track)("functions_codebase_deploy", tag, summary.results.length));
     const avgTime = totalTime / (totalSuccesses + totalErrors);
     logger_1.logger.debug(`Total Function Deployment time: ${summary.totalTime}`);
     logger_1.logger.debug(`${totalErrors + totalSuccesses + totalAborts} Functions Deployed`);
@@ -61,15 +61,15 @@ async function logAndTrackDeployStats(summary) {
     logger_1.logger.debug(`Average Function Deployment time: ${avgTime}`);
     if (totalErrors + totalSuccesses > 0) {
         if (totalErrors === 0) {
-            reports.push(track.track("functions_deploy_result", "success", totalSuccesses));
+            reports.push((0, track_1.track)("functions_deploy_result", "success", totalSuccesses));
         }
         else if (totalSuccesses > 0) {
-            reports.push(track.track("functions_deploy_result", "partial_success", totalSuccesses));
-            reports.push(track.track("functions_deploy_result", "partial_failure", totalErrors));
-            reports.push(track.track("functions_deploy_result", "partial_error_ratio", totalErrors / (totalSuccesses + totalErrors)));
+            reports.push((0, track_1.track)("functions_deploy_result", "partial_success", totalSuccesses));
+            reports.push((0, track_1.track)("functions_deploy_result", "partial_failure", totalErrors));
+            reports.push((0, track_1.track)("functions_deploy_result", "partial_error_ratio", totalErrors / (totalSuccesses + totalErrors)));
         }
         else {
-            reports.push(track.track("functions_deploy_result", "failure", totalErrors));
+            reports.push((0, track_1.track)("functions_deploy_result", "failure", totalErrors));
         }
     }
     await utils.allSettled(reports);
@@ -171,6 +171,9 @@ function triggerTag(endpoint) {
         }
         return `${prefix}.https`;
     }
+    if (backend.isBlockingTriggered(endpoint)) {
+        return `${prefix}.blocking`;
+    }
     return endpoint.eventTrigger.eventType;
 }
 exports.triggerTag = triggerTag;

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

@@ -19,31 +19,37 @@ function assertKeyTypes(prefix, yaml, schema) {
     }
     for (const [keyAsString, value] of Object.entries(yaml)) {
         const key = keyAsString;
-        const fullKey = prefix ? prefix + "." + key : key;
+        const fullKey = prefix ? `${prefix}.${keyAsString}` : keyAsString;
         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.`);
         }
-        if (schema[key] === "string") {
+        const schemaType = schema[key];
+        if (typeof schemaType === "function") {
+            if (!schemaType(value)) {
+                throw new error_1.FirebaseError(`${Array.isArray(value) ? "array" : typeof value} ${fullKey} failed validation`);
+            }
+        }
+        else if (schemaType === "string") {
             if (typeof value !== "string") {
                 throw new error_1.FirebaseError(`Expected ${fullKey} to be string; was ${typeof value}`);
             }
         }
-        else if (schema[key] === "number") {
+        else if (schemaType === "number") {
             if (typeof value !== "number") {
                 throw new error_1.FirebaseError(`Expected ${fullKey} to be a number; was ${typeof value}`);
             }
         }
-        else if (schema[key] === "boolean") {
+        else if (schemaType === "boolean") {
             if (typeof value !== "boolean") {
                 throw new error_1.FirebaseError(`Expected ${fullKey} to be a boolean; was ${typeof value}`);
             }
         }
-        else if (schema[key] === "array") {
+        else if (schemaType === "array") {
             if (!Array.isArray(value)) {
                 throw new error_1.FirebaseError(`Expected ${fullKey} to be an array; was ${typeof value}`);
             }
         }
-        else if (schema[key] === "object") {
+        else if (schemaType === "object") {
             if (value === null || typeof value !== "object" || Array.isArray(value)) {
                 throw new error_1.FirebaseError(`Expected ${fullKey} to be an object; was ${typeof value}`);
             }

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

@@ -5,6 +5,12 @@ const backend = require("../../backend");
 const proto_1 = require("../../../../gcp/proto");
 const parsing_1 = require("./parsing");
 const error_1 = require("../../../../error");
+const CHANNEL_NAME_REGEX = new RegExp("(projects\\/" +
+    "(?<project>(?:\\d+)|(?:[A-Za-z]+[A-Za-z\\d-]*[A-Za-z\\d]?))\\/)?" +
+    "locations\\/" +
+    "(?<location>[A-Za-z\\d\\-_]+)\\/" +
+    "channels\\/" +
+    "(?<channel>[A-Za-z\\d\\-_]+)");
 function backendFromV1Alpha1(yaml, project, region, runtime) {
     const manifest = JSON.parse(JSON.stringify(yaml));
     const bkend = backend.empty();
@@ -42,9 +48,9 @@ function parseEndpoints(manifest, id, project, defaultRegion, runtime) {
     const ep = manifest.endpoints[id];
     (0, parsing_1.assertKeyTypes)(prefix, ep, {
         region: "array",
-        platform: "string",
+        platform: (platform) => backend.AllFunctionsPlatforms.includes(platform),
         entryPoint: "string",
-        availableMemoryMb: "number",
+        availableMemoryMb: (mem) => backend.AllMemoryOptions.includes(mem),
         maxInstances: "number",
         minInstances: "number",
         concurrency: "number",
@@ -52,7 +58,7 @@ function parseEndpoints(manifest, id, project, defaultRegion, runtime) {
         timeoutSeconds: "number",
         vpc: "object",
         labels: "object",
-        ingressSettings: "string",
+        ingressSettings: (setting) => backend.AllIngressSettings.includes(setting),
         environmentVariables: "object",
         secretEnvironmentVariables: "array",
         httpsTrigger: "object",
@@ -60,7 +66,16 @@ function parseEndpoints(manifest, id, project, defaultRegion, runtime) {
         eventTrigger: "object",
         scheduleTrigger: "object",
         taskQueueTrigger: "object",
+        blockingTrigger: "object",
+        cpu: (cpu) => typeof cpu === "number" || cpu === "gcf_gen1",
     });
+    if (ep.vpc) {
+        (0, parsing_1.assertKeyTypes)(prefix + ".vpc", ep.vpc, {
+            connector: "string",
+            egressSettings: (setting) => backend.AllVpcEgressSettings.includes(setting),
+        });
+        (0, parsing_1.requireKeys)(prefix + ".vpc", ep.vpc, "connector");
+    }
     let triggerCount = 0;
     if (ep.httpsTrigger) {
         triggerCount++;
@@ -77,6 +92,9 @@ function parseEndpoints(manifest, id, project, defaultRegion, runtime) {
     if (ep.taskQueueTrigger) {
         triggerCount++;
     }
+    if (ep.blockingTrigger) {
+        triggerCount++;
+    }
     if (!triggerCount) {
         throw new error_1.FirebaseError("Expected trigger in endpoint " + id);
     }
@@ -97,6 +115,7 @@ function parseEndpoints(manifest, id, project, defaultRegion, runtime) {
                 channel: "string",
             });
             triggered = { eventTrigger: ep.eventTrigger };
+            (0, proto_1.renameIfPresent)(triggered.eventTrigger, ep.eventTrigger, "channel", "channel", (c) => resolveChannelName(project, c, defaultRegion));
             for (const [k, v] of Object.entries(triggered.eventTrigger.eventFilters)) {
                 if (k === "topic" && !v.startsWith("projects/")) {
                     triggered.eventTrigger.eventFilters[k] = `projects/${project}/topics/${v}`;
@@ -151,6 +170,14 @@ function parseEndpoints(manifest, id, project, defaultRegion, runtime) {
             }
             triggered = { taskQueueTrigger: ep.taskQueueTrigger };
         }
+        else if (backend.isBlockingTriggered(ep)) {
+            (0, parsing_1.requireKeys)(prefix + ".blockingTrigger", ep.blockingTrigger, "eventType");
+            (0, parsing_1.assertKeyTypes)(prefix + ".blockingTrigger", ep.blockingTrigger, {
+                eventType: "string",
+                options: "object",
+            });
+            triggered = { blockingTrigger: ep.blockingTrigger };
+        }
         else {
             throw new error_1.FirebaseError(`Do not recognize trigger type for endpoint ${id}. Try upgrading ` +
                 "firebase-tools with npm install -g firebase-tools@latest");
@@ -165,3 +192,23 @@ function parseEndpoints(manifest, id, project, defaultRegion, runtime) {
     }
     return allParsed;
 }
+function resolveChannelName(projectId, channel, defaultRegion) {
+    if (!channel.includes("/")) {
+        const location = defaultRegion;
+        const channelId = channel;
+        return "projects/" + projectId + "/locations/" + location + "/channels/" + channelId;
+    }
+    const match = CHANNEL_NAME_REGEX.exec(channel);
+    if (!(match === null || match === void 0 ? void 0 : match.groups)) {
+        throw new error_1.FirebaseError("Invalid channel name format.");
+    }
+    const matchedProjectId = match.groups.project;
+    const location = match.groups.location;
+    const channelId = match.groups.channel;
+    if (matchedProjectId) {
+        return "projects/" + matchedProjectId + "/locations/" + location + "/channels/" + channelId;
+    }
+    else {
+        return "projects/" + projectId + "/locations/" + location + "/channels/" + channelId;
+    }
+}

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

@@ -4,7 +4,7 @@ exports.getRuntimeChoice = exports.DEPRECATED_NODE_VERSION_INFO = exports.UNSUPP
 const path = require("path");
 const clc = require("cli-color");
 const error_1 = require("../../../../error");
-const track = require("../../../../track");
+const track_1 = require("../../../../track");
 const runtimes = require("../../runtimes");
 const cjson = require("cjson");
 const ENGINE_RUNTIMES = {
@@ -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)) {
-        void track("functions_runtime_notices", "package_missing_runtime");
+        void (0, track_1.track)("functions_runtime_notices", "package_missing_runtime");
         throw new error_1.FirebaseError(errorMessage, { exit: 1 });
     }
     if (runtimes.isDeprecatedRuntime(runtime) || !runtimes.isValidRuntime(runtime)) {
-        void track("functions_runtime_notices", `${runtime}_deploy_prohibited`);
+        void (0, track_1.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

@@ -9,7 +9,7 @@ const logger_1 = require("../../../../logger");
 const backend = require("../../backend");
 const api = require("../../../../api");
 const proto = require("../../../../gcp/proto");
-const v2events = require("../../../../functions/events/v2");
+const events = require("../../../../functions/events");
 const TRIGGER_PARSER = path.resolve(__dirname, "./triggerParser.js");
 function removeInspectOptions(options) {
     return options.filter((opt) => !opt.startsWith("--inspect"));
@@ -62,7 +62,9 @@ function mergeRequiredAPIs(backend) {
     const apiToReasons = {};
     for (const { api, reason } of backend.requiredAPIs) {
         const reasons = apiToReasons[api] || new Set();
-        reasons.add(reason);
+        if (reason) {
+            reasons.add(reason);
+        }
         apiToReasons[api] = reasons;
     }
     const merged = [];
@@ -77,7 +79,10 @@ 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;
+        const triggerCount = +!!annotation.httpsTrigger +
+            +!!annotation.eventTrigger +
+            +!!annotation.taskQueueTrigger +
+            +!!annotation.blockingTrigger;
         if (triggerCount !== 1) {
             throw new error_1.FirebaseError("Unexpected annotation generated by the Firebase Functions SDK. This should never happen.");
         }
@@ -109,6 +114,20 @@ function addResourcesToBackend(projectId, runtime, annotation, want) {
             });
             triggered = { scheduleTrigger: annotation.schedule };
         }
+        else if (annotation.blockingTrigger) {
+            if (events.v1.AUTH_BLOCKING_EVENTS.includes(annotation.blockingTrigger.eventType)) {
+                want.requiredAPIs.push({
+                    api: "identitytoolkit.googleapis.com",
+                    reason: "Needed for auth blocking functions.",
+                });
+            }
+            triggered = {
+                blockingTrigger: {
+                    eventType: annotation.blockingTrigger.eventType,
+                    options: annotation.blockingTrigger.options,
+                },
+            };
+        }
         else {
             triggered = {
                 eventTrigger: {
@@ -118,10 +137,10 @@ function addResourcesToBackend(projectId, runtime, annotation, want) {
                 },
             };
             if (annotation.platform === "gcfv2") {
-                if (annotation.eventTrigger.eventType === v2events.PUBSUB_PUBLISH_EVENT) {
+                if (annotation.eventTrigger.eventType === events.v2.PUBSUB_PUBLISH_EVENT) {
                     triggered.eventTrigger.eventFilters = { topic: annotation.eventTrigger.resource };
                 }
-                if (v2events.STORAGE_EVENTS.find((event) => { var _a; return event === (((_a = annotation.eventTrigger) === null || _a === void 0 ? void 0 : _a.eventType) || ""); })) {
+                if (events.v2.STORAGE_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 };
                 }
             }

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

@@ -7,7 +7,7 @@ const semver = require("semver");
 const spawn = require("cross-spawn");
 const utils = require("../../../../utils");
 const logger_1 = require("../../../../logger");
-const track = require("../../../../track");
+const track_1 = require("../../../../track");
 const MIN_SDK_VERSION = "2.0.0";
 exports.FUNCTIONS_SDK_VERSION_TOO_OLD_WARNING = clc.bold.yellow("functions: ") +
     "You must have a " +
@@ -52,7 +52,7 @@ exports.getLatestSDKVersion = getLatestSDKVersion;
 function checkFunctionsSDKVersion(currentVersion) {
     try {
         if (semver.lt(currentVersion, MIN_SDK_VERSION)) {
-            void track("functions_runtime_notices", "functions_sdk_too_old");
+            void (0, track_1.track)("functions_runtime_notices", "functions_sdk_too_old");
             utils.logWarning(exports.FUNCTIONS_SDK_VERSION_TOO_OLD_WARNING);
         }
         const latest = exports.getLatestSDKVersion();