firebase-tools 10.2.1 → 10.3.1

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.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");
@@ -13,6 +13,9 @@ function endpointTriggerType(endpoint) {
     else if (isHttpsTriggered(endpoint)) {
         return "https";
     }
+    else if (isCallableTriggered(endpoint)) {
+        return "callable";
+    }
     else if (isEventTriggered(endpoint)) {
         return endpoint.eventTrigger.eventType;
     }
@@ -39,10 +42,19 @@ 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");
 }
 exports.isHttpsTriggered = isHttpsTriggered;
+function isCallableTriggered(triggered) {
+    return {}.hasOwnProperty.call(triggered, "callableTrigger");
+}
+exports.isCallableTriggered = isCallableTriggered;
 function isEventTriggered(triggered) {
     return {}.hasOwnProperty.call(triggered, "eventTrigger");
 }
@@ -57,7 +69,7 @@ function isTaskQueueTriggered(triggered) {
 exports.isTaskQueueTriggered = isTaskQueueTriggered;
 function empty() {
     return {
-        requiredAPIs: {},
+        requiredAPIs: [],
         endpoints: {},
         environmentVariables: {},
     };
@@ -76,7 +88,7 @@ function of(...endpoints) {
 }
 exports.of = of;
 function isEmptyBackend(backend) {
-    return (Object.keys(backend.requiredAPIs).length == 0 && Object.keys(backend.endpoints).length === 0);
+    return (Object.keys(backend.requiredAPIs).length === 0 && Object.keys(backend.endpoints).length === 0);
 }
 exports.isEmptyBackend = isEmptyBackend;
 function functionName(cloudFunction) {
@@ -140,7 +152,7 @@ async function checkAvailability(context, want) {
     const gcfV1Regions = new Set();
     const gcfV2Regions = new Set();
     for (const ep of allEndpoints(want)) {
-        if (ep.platform == "gcfv1") {
+        if (ep.platform === "gcfv1") {
             gcfV1Regions.add(ep.region);
         }
         else {
@@ -218,8 +230,12 @@ 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) {
+    if (left.platform !== right.platform) {
         return right.platform < left.platform ? -1 : 1;
     }
     if (left.region < right.region) {

package/lib/deploy/functions/checkIam.js

@@ -52,7 +52,7 @@ async function checkHttpIam(context, options, payload) {
         return;
     }
     if (!passed) {
-        track("Error (User)", "deploy:functions:http_create_missing_iam");
+        void track("Error (User)", "deploy:functions:http_create_missing_iam");
         throw new error_1.FirebaseError(`Missing required permission on project ${(0, cli_color_1.bold)(context.projectId)} to deploy new HTTPS functions. The permission ${(0, cli_color_1.bold)(PERMISSION)} is required to deploy the following functions:\n\n- ` +
             newHttpsEndpoints.map((func) => func.id).join("\n- ") +
             `\n\nTo address this error, please ask a project Owner to assign your account the "Cloud Functions Admin" role at the following URL:\n\nhttps://console.cloud.google.com/iam-admin/iam?project=${context.projectId}`);
@@ -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/containerCleaner.js

@@ -71,7 +71,7 @@ async function cleanupBuildImages(haveFunctions, deletedFunctions, cleaners = {}
         let message = "Unhandled error cleaning up build images. This could result in a small monthly bill if not corrected. ";
         message +=
             "You can attempt to delete these images by redeploying or you can delete them manually at";
-        if (failedDomains.size == 1) {
+        if (failedDomains.size === 1) {
             message += " " + failedDomains.values().next().value;
         }
         else {
@@ -205,7 +205,7 @@ async function listGcfPaths(projectId, locations, dockerHelpers = {}) {
         .map((results) => results.children)
         .reduce((acc, val) => [...acc, ...val], [])
         .filter((loc) => locationsSet.has(loc));
-    if (failedSubdomains.length == subdomains.size) {
+    if (failedSubdomains.length === subdomains.size) {
         throw new error_1.FirebaseError("Failed to search all subdomains.");
     }
     else if (failedSubdomains.length > 0) {
@@ -237,7 +237,7 @@ async function deleteGcfArtifacts(projectId, locations, dockerHelpers = {}) {
         }
     });
     await Promise.all(deleteLocations);
-    if (failedSubdomains.length == subdomains.size) {
+    if (failedSubdomains.length === subdomains.size) {
         throw new error_1.FirebaseError("Failed to search all subdomains.");
     }
     else if (failedSubdomains.length > 0) {

package/lib/deploy/functions/ensure.js

@@ -26,7 +26,7 @@ async function defaultServiceAccount(e) {
 }
 exports.defaultServiceAccount = defaultServiceAccount;
 function nodeBillingError(projectId) {
-    track("functions_runtime_notices", "nodejs10_billing_error");
+    void track("functions_runtime_notices", "nodejs10_billing_error");
     return new error_1.FirebaseError(`Cloud Functions deployment requires the pay-as-you-go (Blaze) billing plan. To upgrade your project, visit the following URL:
       
 https://console.firebase.google.com/project/${projectId}/usage/details
@@ -36,7 +36,7 @@ For additional information about this requirement, see Firebase FAQs:
 ${FAQ_URL}`, { exit: 1 });
 }
 function nodePermissionError(projectId) {
-    track("functions_runtime_notices", "nodejs10_permission_error");
+    void track("functions_runtime_notices", "nodejs10_permission_error");
     return new error_1.FirebaseError(`Cloud Functions deployment requires the Cloud Build API to be enabled. The current credentials do not have permission to enable APIs for project ${clc.bold(projectId)}.
 
 Please ask a project owner to visit the following URL to enable Cloud Build:
@@ -99,7 +99,7 @@ async function secretAccess(projectId, wantBackend, haveBackend) {
         for (const serviceAccount of serviceAccounts) {
             (_a = wantSecrets[secret]) === null || _a === void 0 ? void 0 : _a.delete(serviceAccount);
         }
-        if (((_b = wantSecrets[secret]) === null || _b === void 0 ? void 0 : _b.size) == 0) {
+        if (((_b = wantSecrets[secret]) === null || _b === void 0 ? void 0 : _b.size) === 0) {
             delete wantSecrets[secret];
         }
     }

package/lib/deploy/functions/functionsDeployHelper.js

@@ -10,7 +10,7 @@ function functionMatchesAnyGroup(func, filterGroups) {
 exports.functionMatchesAnyGroup = functionMatchesAnyGroup;
 function functionMatchesGroup(func, groupChunks) {
     const functionNameChunks = func.id.split("-").slice(0, groupChunks.length);
-    if (functionNameChunks.length != groupChunks.length) {
+    if (functionNameChunks.length !== groupChunks.length) {
         return false;
     }
     for (let i = 0; i < groupChunks.length; i += 1) {
@@ -28,7 +28,7 @@ function getFilterGroups(options) {
     const only = options.only.split(",");
     const onlyFunctions = only.filter((filter) => {
         const opts = filter.split(":");
-        return opts[0] == "functions" && opts[1];
+        return opts[0] === "functions" && opts[1];
     });
     return onlyFunctions.map((filter) => {
         return filter.split(":")[1].split(/[.-]/);

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`);
@@ -69,7 +70,7 @@ async function prepare(context, options, payload) {
         : usedDotenv
             ? "dotenv"
             : "none";
-    await (0, track_1.track)("functions_codebase_deploy_env_method", tag);
+    void (0, track_1.track)("functions_codebase_deploy_env_method", tag);
     logger_1.logger.debug(`Analyzing ${runtimeDelegate.name} backend spec`);
     const wantBackend = await runtimeDelegate.discoverSpec(runtimeConfig, firebaseEnvs);
     wantBackend.environmentVariables = Object.assign(Object.assign({}, userEnvs), firebaseEnvs);
@@ -102,7 +103,7 @@ async function prepare(context, options, payload) {
     for (const endpoint of backend.allEndpoints(wantBackend)) {
         endpoint.environmentVariables = wantBackend.environmentVariables;
     }
-    await Promise.all(Object.values(wantBackend.requiredAPIs).map((api) => {
+    await Promise.all(Object.values(wantBackend.requiredAPIs).map(({ api }) => {
         return ensureApiEnabled.ensure(projectId, api, "functions", false);
     }));
     validate.endpointsAreValid(wantBackend);
@@ -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);
@@ -134,6 +135,7 @@ function inferDetailsFromExisting(want, have, usedDotenv) {
         if (!wantE.availableMemoryMb && haveE.availableMemoryMb) {
             wantE.availableMemoryMb = haveE.availableMemoryMb;
         }
+        wantE.securityLevel = haveE.securityLevel ? haveE.securityLevel : "SECURE_ALWAYS";
         maybeCopyTriggerRegion(wantE, haveE);
     }
 }

package/lib/deploy/functions/pricing.js

@@ -106,7 +106,7 @@ function canCalculateMinInstanceCost(endpoint) {
     if (!endpoint.minInstances) {
         return true;
     }
-    if (endpoint.platform == "gcfv1") {
+    if (endpoint.platform === "gcfv1") {
         if (!MB_TO_GHZ[endpoint.availableMemoryMb || 256]) {
             return false;
         }

package/lib/deploy/functions/prompts.js

@@ -21,7 +21,7 @@ async function promptForFailurePolicies(options, want, have) {
         const existing = (_a = have.endpoints[endpoint.region]) === null || _a === void 0 ? void 0 : _a[endpoint.id];
         return !(existing && backend.isEventTriggered(existing) && existing.eventTrigger.retry);
     });
-    if (newRetryEndpoints.length == 0) {
+    if (newRetryEndpoints.length === 0) {
         return;
     }
     const warnMessage = "The following functions will newly be retried in case of failure: " +
@@ -137,7 +137,7 @@ async function promptForMinInstances(options, want, have) {
         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)) {
+    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";
     }

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();
@@ -216,12 +216,12 @@ class Fabricator {
             })
                 .catch(rethrowAs(endpoint, "create topic"));
         }
-        const resultFunction = (await this.functionExecutor
+        const resultFunction = await this.functionExecutor
             .run(async () => {
             const op = await gcfV2.createFunction(apiFunction);
             return await poller.pollOperation(Object.assign(Object.assign({}, gcfV2PollerOptions), { pollerName: `create-${endpoint.region}-${endpoint.id}`, operationResourceName: op.name }));
         })
-            .catch(rethrowAs(endpoint, "create")));
+            .catch(rethrowAs(endpoint, "create"));
         endpoint.uri = resultFunction.serviceConfig.uri;
         const serviceName = resultFunction.serviceConfig.service;
         if (backend.isHttpsTriggered(endpoint)) {
@@ -243,7 +243,7 @@ class Fabricator {
             }
         }
         const mem = endpoint.availableMemoryMb || backend.DEFAULT_MEMORY;
-        if (mem >= backend.MIN_MEMORY_FOR_CONCURRENCY && endpoint.concurrency != 1) {
+        if (mem >= backend.MIN_MEMORY_FOR_CONCURRENCY && endpoint.concurrency !== 1) {
             await this.setConcurrency(endpoint, serviceName, endpoint.concurrency || DEFAULT_GCFV2_CONCURRENCY);
         }
     }

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

@@ -56,7 +56,7 @@ async function release(context, options, payload) {
     await containerCleaner.cleanupBuildImages(haveEndpoints, deletedEndpoints, opts);
     const allErrors = summary.results.filter((r) => r.error).map((r) => r.error);
     if (allErrors.length) {
-        const opts = allErrors.length == 1 ? { original: allErrors[0] } : { children: allErrors };
+        const opts = allErrors.length === 1 ? { original: allErrors[0] } : { children: allErrors };
         throw new error_1.FirebaseError("There was an error deploying functions", Object.assign(Object.assign({}, opts), { exit: 2 }));
     }
 }

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;