firebase-tools 10.2.0 → 10.3.0

package/lib/commands/ext-uninstall.js

@@ -16,25 +16,25 @@ const prompt_1 = require("../prompt");
 const requirePermissions_1 = require("../requirePermissions");
 const utils = require("../utils");
 const logger_1 = require("../logger");
+const manifest = require("../extensions/manifest");
 marked.setOptions({
     renderer: new TerminalRenderer(),
 });
-function consoleUninstallOnly(projectId, instanceId) {
-    const instanceURL = `https://console.firebase.google.com/project/${projectId}/extensions/instances/${instanceId}`;
-    const consoleUninstall = "This extension has additional uninstall checks that are not currently supported by the CLI, and can only be uninstalled through the Firebase Console. " +
-        `Please visit **[${instanceURL}](${instanceURL})** to uninstall this extension.`;
-    logger_1.logger.info("\n");
-    utils.logLabeledWarning(extensionsHelper_1.logPrefix, marked(consoleUninstall));
-    return Promise.resolve();
-}
 exports.default = new command_1.Command("ext:uninstall <extensionInstanceId>")
     .description("uninstall an extension that is installed in your Firebase project by instance ID")
     .withForce()
+    .option("--local", "remove from firebase.json rather than directly uninstall from a Firebase project")
     .before(requirePermissions_1.requirePermissions, ["firebaseextensions.instances.delete"])
     .before(extensionsHelper_1.ensureExtensionsApiEnabled)
     .before(checkMinRequiredVersion_1.checkMinRequiredVersion, "extMinVersion")
     .before(extensionsHelper_1.diagnoseAndFixProject)
     .action(async (instanceId, options) => {
+    if (options.local) {
+        const config = manifest.loadConfig(options);
+        manifest.removeFromManifest(instanceId, config);
+        manifest.showPreviewWarning();
+        return;
+    }
     const projectId = (0, projectUtils_1.needProjectId)(options);
     let instance;
     try {
@@ -101,4 +101,13 @@ exports.default = new command_1.Command("ext:uninstall <extensionInstanceId>")
         return utils.reject(`Error occurred uninstalling extension ${instanceId}`, { original: err });
     }
     utils.logLabeledSuccess(extensionsHelper_1.logPrefix, `uninstalled ${clc.bold(instanceId)}`);
+    manifest.showDeprecationWarning();
 });
+function consoleUninstallOnly(projectId, instanceId) {
+    const instanceURL = `https://console.firebase.google.com/project/${projectId}/extensions/instances/${instanceId}`;
+    const consoleUninstall = "This extension has additional uninstall checks that are not currently supported by the CLI, and can only be uninstalled through the Firebase Console. " +
+        `Please visit **[${instanceURL}](${instanceURL})** to uninstall this extension.`;
+    logger_1.logger.info("\n");
+    utils.logLabeledWarning(extensionsHelper_1.logPrefix, marked(consoleUninstall));
+    return Promise.resolve();
+}

package/lib/commands/ext-update.js

@@ -22,18 +22,10 @@ const projectUtils_1 = require("../projectUtils");
 const requirePermissions_1 = require("../requirePermissions");
 const utils = require("../utils");
 const previews_1 = require("../previews");
+const manifest = require("../extensions/manifest");
 marked.setOptions({
     renderer: new TerminalRenderer(),
 });
-function isValidUpdate(existingSourceOrigin, newSourceOrigin) {
-    if (existingSourceOrigin === extensionsHelper_1.SourceOrigin.PUBLISHED_EXTENSION) {
-        return [extensionsHelper_1.SourceOrigin.PUBLISHED_EXTENSION, extensionsHelper_1.SourceOrigin.PUBLISHED_EXTENSION_VERSION].includes(newSourceOrigin);
-    }
-    else if (existingSourceOrigin === extensionsHelper_1.SourceOrigin.LOCAL) {
-        return [extensionsHelper_1.SourceOrigin.LOCAL, extensionsHelper_1.SourceOrigin.URL].includes(newSourceOrigin);
-    }
-    return false;
-}
 exports.default = new command_1.Command("ext:update <extensionInstanceId> [updateSource]")
     .description(previews_1.previews.extdev
     ? "update an existing extension instance to the latest version or from a local or URL source"
@@ -47,10 +39,61 @@ exports.default = new command_1.Command("ext:update <extensionInstanceId> [updat
     .before(extensionsHelper_1.diagnoseAndFixProject)
     .withForce()
     .option("--params <paramsFile>", "name of params variables file with .env format.")
+    .option("--local", "save the update to firebase.json rather than directly update an existing Extension instance on a Firebase project")
     .action(async (instanceId, updateSource, options) => {
+    var _a, _b;
+    const projectId = (0, projectUtils_1.needProjectId)(options);
+    if (options.local) {
+        const config = manifest.loadConfig(options);
+        const oldRef = manifest.getInstanceRef(instanceId, config);
+        const oldExtensionVersion = await extensionsApi.getExtensionVersion(refs.toExtensionVersionRef(oldRef));
+        updateSource = (0, updateHelper_1.inferUpdateSource)(updateSource, refs.toExtensionRef(oldRef));
+        const newSourceOrigin = (0, extensionsHelper_1.getSourceOrigin)(updateSource);
+        if (![extensionsHelper_1.SourceOrigin.PUBLISHED_EXTENSION, extensionsHelper_1.SourceOrigin.PUBLISHED_EXTENSION_VERSION].includes(newSourceOrigin)) {
+            throw new error_1.FirebaseError(`Only updating to a published extension version is allowed`);
+        }
+        const newExtensionVersion = await extensionsApi.getExtensionVersion(updateSource);
+        if (oldExtensionVersion.ref === newExtensionVersion.ref) {
+            utils.logLabeledBullet(extensionsHelper_1.logPrefix, `${clc.bold(instanceId)} is already up to date. Its version is ${clc.bold(newExtensionVersion.ref)}.`);
+            return;
+        }
+        utils.logLabeledBullet(extensionsHelper_1.logPrefix, `Updating ${clc.bold(instanceId)} from version ${clc.bold(oldExtensionVersion.ref)} to version ${clc.bold(newExtensionVersion.ref)}.`);
+        if (!(await (0, extensionsHelper_1.confirm)({
+            nonInteractive: options.nonInteractive,
+            force: options.force,
+            default: false,
+        }))) {
+            utils.logLabeledBullet(extensionsHelper_1.logPrefix, "Update aborted.");
+            return;
+        }
+        const oldParamValues = manifest.readInstanceParam({
+            instanceId,
+            projectDir: config.projectDir,
+        });
+        const newParams = await paramHelper.getParamsForUpdate({
+            spec: oldExtensionVersion.spec,
+            newSpec: newExtensionVersion.spec,
+            currentParams: oldParamValues,
+            projectId,
+            paramsEnvPath: ((_a = options.params) !== null && _a !== void 0 ? _a : ""),
+            nonInteractive: options.nonInteractive,
+            instanceId,
+        });
+        await manifest.writeToManifest([
+            {
+                instanceId,
+                ref: refs.parse(newExtensionVersion.ref),
+                params: newParams,
+            },
+        ], config, {
+            nonInteractive: options.nonInteractive,
+            force: true,
+        });
+        manifest.showPreviewWarning();
+        return;
+    }
     const spinner = ora(`Updating ${clc.bold(instanceId)}. This usually takes 3 to 5 minutes...`);
     try {
-        const projectId = (0, projectUtils_1.needProjectId)(options);
         let existingInstance;
         try {
             existingInstance = await extensionsApi.getInstance(projectId, instanceId);
@@ -157,7 +200,7 @@ exports.default = new command_1.Command("ext:update <extensionInstanceId> [updat
             newSpec,
             currentParams: existingParams,
             projectId,
-            paramsEnvPath: options.params,
+            paramsEnvPath: ((_b = options.params) !== null && _b !== void 0 ? _b : ""),
             nonInteractive: options.nonInteractive,
             instanceId,
         });
@@ -179,6 +222,7 @@ exports.default = new command_1.Command("ext:update <extensionInstanceId> [updat
         spinner.stop();
         utils.logLabeledSuccess(extensionsHelper_1.logPrefix, `successfully updated ${clc.bold(instanceId)}.`);
         utils.logLabeledBullet(extensionsHelper_1.logPrefix, marked(`You can view your updated instance in the Firebase console: ${utils.consoleUrl(projectId, `/extensions/instances/${instanceId}?tab=usage`)}`));
+        manifest.showDeprecationWarning();
     }
     catch (err) {
         if (spinner.isSpinning) {
@@ -192,3 +236,12 @@ exports.default = new command_1.Command("ext:update <extensionInstanceId> [updat
         throw err;
     }
 });
+function isValidUpdate(existingSourceOrigin, newSourceOrigin) {
+    if (existingSourceOrigin === extensionsHelper_1.SourceOrigin.PUBLISHED_EXTENSION) {
+        return [extensionsHelper_1.SourceOrigin.PUBLISHED_EXTENSION, extensionsHelper_1.SourceOrigin.PUBLISHED_EXTENSION_VERSION].includes(newSourceOrigin);
+    }
+    else if (existingSourceOrigin === extensionsHelper_1.SourceOrigin.LOCAL) {
+        return [extensionsHelper_1.SourceOrigin.LOCAL, extensionsHelper_1.SourceOrigin.URL].includes(newSourceOrigin);
+    }
+    return false;
+}

package/lib/commands/functions-config-clone.js

@@ -38,7 +38,7 @@ exports.default = new command_1.Command("functions:config:clone")
     else if (options.only && options.except) {
         throw new error_1.FirebaseError("Cannot use both --only and --except at the same time.");
     }
-    let only = [];
+    let only;
     let except = [];
     if (options.only) {
         only = options.only.split(",");

package/lib/commands/functions-config-export.js

@@ -96,7 +96,7 @@ exports.default = new command_1.Command("functions:config:export")
             throw new error_1.FirebaseError("Exceeded max attempts to fix invalid config keys.");
         }
         const errMsg = configExport.hydrateEnvs(pInfos, prefix);
-        if (errMsg.length == 0) {
+        if (errMsg.length === 0) {
             break;
         }
         prefix = await promptForPrefix(errMsg);

package/lib/commands/hosting-clone.js

@@ -32,8 +32,8 @@ exports.default = new command_1.Command("hosting:clone <source> <targetChannel>"
     if (sourceChannelId) {
         sourceChannelId = (0, api_1.normalizeName)(sourceChannelId);
     }
-    const equalSiteIds = sourceSiteId == targetSiteId;
-    const equalChannelIds = sourceChannelId == targetChannelId;
+    const equalSiteIds = sourceSiteId === targetSiteId;
+    const equalChannelIds = sourceChannelId === targetChannelId;
     if (equalSiteIds && equalChannelIds) {
         throw new error_1.FirebaseError(`Source and destination cannot be equal. Please pick a different source or desination.`);
     }
@@ -67,7 +67,7 @@ exports.default = new command_1.Command("hosting:clone <source> <targetChannel>"
         }
     }
     const currentTargetVersionName = (_d = (_c = tChannel.release) === null || _c === void 0 ? void 0 : _c.version) === null || _d === void 0 ? void 0 : _d.name;
-    if (equalSiteIds && sourceVersionName == currentTargetVersionName) {
+    if (equalSiteIds && sourceVersionName === currentTargetVersionName) {
         utils.logSuccess(`Channels ${(0, cli_color_1.bold)(sourceChannelId)} and ${(0, cli_color_1.bold)(targetChannel)} are serving identical versions. No need to clone.`);
         return;
     }

package/lib/commands/remoteconfig-get.js

@@ -15,7 +15,7 @@ const error_1 = require("../error");
 const tableHead = ["Entry Name", "Value"];
 const MAX_DISPLAY_ITEMS = 20;
 function checkValidOptionalNumber(versionNumber) {
-    if (!versionNumber || typeof Number(versionNumber) == "number") {
+    if (!versionNumber || typeof Number(versionNumber) === "number") {
         return versionNumber;
     }
     throw new error_1.FirebaseError(`Could not interpret "${versionNumber}" as a valid number.`);

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,9 @@ class Config {
         fs.ensureFileSync(this.path(p));
         fs.writeFileSync(this.path(p), content, "utf8");
     }
+    deleteProjectFile(p) {
+        fs.removeSync(this.path(p));
+    }
     askWriteProjectFile(p, content, force) {
         const writeTo = this.path(p);
         let next;

package/lib/deploy/extensions/deploymentSummary.js

@@ -7,8 +7,8 @@ const humanReadable = (dep) => `${clc.bold(dep.instanceId)} (${dep.ref ? `${refs
 exports.humanReadable = humanReadable;
 const humanReadableUpdate = (from, to) => {
     var _a, _b, _c, _d, _e;
-    if (((_a = from.ref) === null || _a === void 0 ? void 0 : _a.publisherId) == ((_b = to.ref) === null || _b === void 0 ? void 0 : _b.publisherId) &&
-        ((_c = from.ref) === null || _c === void 0 ? void 0 : _c.extensionId) == ((_d = to.ref) === null || _d === void 0 ? void 0 : _d.extensionId)) {
+    if (((_a = from.ref) === null || _a === void 0 ? void 0 : _a.publisherId) === ((_b = to.ref) === null || _b === void 0 ? void 0 : _b.publisherId) &&
+        ((_c = from.ref) === null || _c === void 0 ? void 0 : _c.extensionId) === ((_d = to.ref) === null || _d === void 0 ? void 0 : _d.extensionId)) {
         return `\t${clc.bold(from.instanceId)} (${refs.toExtensionVersionRef(from.ref)} => ${(_e = to.ref) === null || _e === void 0 ? void 0 : _e.version})`;
     }
     else {
@@ -28,7 +28,7 @@ exports.createsSummary = createsSummary;
 function updatesSummary(toUpdate, have) {
     const instancesToUpdate = toUpdate
         .map((to) => {
-        const from = have.find((exists) => exists.instanceId == to.instanceId);
+        const from = have.find((exists) => exists.instanceId === to.instanceId);
         return humanReadableUpdate(from, to);
     })
         .join("\n");

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,14 +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.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,
@@ -80,7 +81,7 @@ async function want(args) {
 }
 exports.want = want;
 async function resolveVersion(ref) {
-    if (!ref.version || ref.version == "latest") {
+    if (!ref.version || ref.version === "latest") {
         return "latest";
     }
     const extensionRef = refs.toExtensionRef(ref);

package/lib/deploy/extensions/tasks.js

@@ -5,7 +5,7 @@ const clc = require("cli-color");
 const extensionsApi = require("../../extensions/extensionsApi");
 const refs = require("../../extensions/refs");
 const utils = require("../../utils");
-const isRetryable = (err) => err.status == 429 || err.status == 409;
+const isRetryable = (err) => err.status === 429 || err.status === 409;
 function extensionsDeploymentHandler(errorHandler) {
     return async (task) => {
         var _a, _b, _c, _d;

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 }));
     }
 }