firebase-tools 10.2.2 → 10.3.0

package/lib/commands/ext-configure.js

@@ -15,6 +15,9 @@ const paramHelper = require("../extensions/paramHelper");
 const requirePermissions_1 = require("../requirePermissions");
 const utils = require("../utils");
 const logger_1 = require("../logger");
+const refs = require("../extensions/refs");
+const manifest = require("../extensions/manifest");
+const functional_1 = require("../functional");
 marked.setOptions({
     renderer: new TerminalRenderer(),
 });
@@ -22,6 +25,7 @@ exports.default = new command_1.Command("ext:configure <extensionInstanceId>")
     .description("configure an existing extension instance")
     .withForce()
     .option("--params <paramsFile>", "path of params file with .env format.")
+    .option("--local", "save to firebase.json rather than directly install to a Firebase project")
     .before(requirePermissions_1.requirePermissions, [
     "firebaseextensions.instances.update",
     "firebaseextensions.instances.get",
@@ -29,9 +33,46 @@ exports.default = new command_1.Command("ext:configure <extensionInstanceId>")
     .before(checkMinRequiredVersion_1.checkMinRequiredVersion, "extMinVersion")
     .before(extensionsHelper_1.diagnoseAndFixProject)
     .action(async (instanceId, options) => {
+    var _a;
+    const projectId = (0, projectUtils_1.needProjectId)(options);
+    if (options.local) {
+        if (options.nonInteractive) {
+            throw new error_1.FirebaseError(`Command not supported in non-interactive mode, edit ./extensions/${instanceId}.env directly instead`);
+        }
+        const config = manifest.loadConfig(options);
+        const targetRef = manifest.getInstanceRef(instanceId, config);
+        const extensionVersion = await extensionsApi.getExtensionVersion(refs.toExtensionVersionRef(targetRef));
+        const oldParamValues = manifest.readInstanceParam({
+            instanceId,
+            projectDir: config.projectDir,
+        });
+        const [immutableParams, tbdParams] = (0, functional_1.partition)(extensionVersion.spec.params, (param) => { var _a; return (_a = param.immutable) !== null && _a !== void 0 ? _a : false; });
+        infoImmutableParams(immutableParams, oldParamValues);
+        paramHelper.setNewDefaults(tbdParams, oldParamValues);
+        const mutableParamsValues = await paramHelper.getParams({
+            projectId,
+            paramSpecs: tbdParams,
+            nonInteractive: false,
+            paramsEnvPath: ((_a = options.params) !== null && _a !== void 0 ? _a : ""),
+            instanceId,
+            reconfiguring: true,
+        });
+        const newParamValues = Object.assign(Object.assign({}, oldParamValues), mutableParamsValues);
+        await manifest.writeToManifest([
+            {
+                instanceId,
+                ref: targetRef,
+                params: newParamValues,
+            },
+        ], config, {
+            nonInteractive: false,
+            force: true,
+        });
+        manifest.showPreviewWarning();
+        return;
+    }
     const spinner = ora(`Configuring ${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);
@@ -45,9 +86,7 @@ exports.default = new command_1.Command("ext:configure <extensionInstanceId>")
             throw err;
         }
         const paramSpecWithNewDefaults = paramHelper.getParamsWithCurrentValuesAsDefaults(existingInstance);
-        const immutableParams = _.remove(paramSpecWithNewDefaults, (param) => {
-            return param.immutable || param.param === "LOCATION";
-        });
+        const immutableParams = _.remove(paramSpecWithNewDefaults, (param) => param.immutable);
         const params = await paramHelper.getParams({
             projectId,
             paramSpecs: paramSpecWithNewDefaults,
@@ -74,6 +113,7 @@ exports.default = new command_1.Command("ext:configure <extensionInstanceId>")
         spinner.stop();
         utils.logLabeledSuccess(extensionsHelper_1.logPrefix, `successfully configured ${clc.bold(instanceId)}.`);
         utils.logLabeledBullet(extensionsHelper_1.logPrefix, marked(`You can view your reconfigured instance in the Firebase console: ${utils.consoleUrl(projectId, `/extensions/instances/${instanceId}?tab=config`)}`));
+        manifest.showDeprecationWarning();
         return res;
     }
     catch (err) {
@@ -88,3 +128,17 @@ exports.default = new command_1.Command("ext:configure <extensionInstanceId>")
         throw err;
     }
 });
+function infoImmutableParams(immutableParams, paramValues) {
+    if (!immutableParams.length) {
+        return;
+    }
+    const plural = immutableParams.length > 1;
+    utils.logLabeledWarning(extensionsHelper_1.logPrefix, marked(`The following param${plural ? "s are" : " is"} immutable and won't be changed:`));
+    for (const { param } of immutableParams) {
+        logger_1.logger.info(`param: ${param}, value: ${paramValues[param]}`);
+    }
+    logger_1.logger.info((plural
+        ? "To set different values for these params"
+        : "To set a different value for this param") +
+        ", uninstall the extension, then install a new instance of this extension.");
+}

package/lib/commands/ext-export.js

@@ -2,12 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const checkMinRequiredVersion_1 = require("../checkMinRequiredVersion");
 const command_1 = require("../command");
-const config_1 = require("../config");
 const planner = require("../deploy/extensions/planner");
-const error_1 = require("../error");
 const export_1 = require("../extensions/export");
 const extensionsHelper_1 = require("../extensions/extensionsHelper");
-const manifest_1 = require("../extensions/manifest");
+const manifest = require("../extensions/manifest");
 const functional_1 = require("../functional");
 const getProjectNumber_1 = require("../getProjectNumber");
 const logger_1 = require("../logger");
@@ -43,12 +41,9 @@ module.exports = new command_1.Command("ext:export")
         logger_1.logger.info("Exiting. No changes made.");
         return;
     }
-    const existingConfig = config_1.Config.load(options, true);
-    if (!existingConfig) {
-        throw new error_1.FirebaseError("Not currently in a Firebase directory. Please run `firebase init` to create a Firebase directory.");
-    }
-    await (0, manifest_1.writeToManifest)(withRef, existingConfig, {
+    const existingConfig = manifest.loadConfig(options);
+    await manifest.writeToManifest(withRef, existingConfig, {
         nonInteractive: options.nonInteractive,
         force: options.force,
-    });
+    }, true);
 });

package/lib/commands/ext-install.js

@@ -27,6 +27,7 @@ const utils = require("../utils");
 const track_1 = require("../track");
 const logger_1 = require("../logger");
 const previews_1 = require("../previews");
+const manifest = require("../extensions/manifest");
 marked.setOptions({
     renderer: new TerminalRenderer(),
 });
@@ -38,13 +39,15 @@ exports.default = new command_1.Command("ext:install [extensionName]")
     "or run with `-i` to see all available extensions.")
     .withForce()
     .option("--params <paramsFile>", "name of params variables file with .env format.")
+    .option("--local", "save to firebase.json rather than directly install to a Firebase project")
     .before(requirePermissions_1.requirePermissions, ["firebaseextensions.instances.create"])
     .before(extensionsHelper_1.ensureExtensionsApiEnabled)
     .before(checkMinRequiredVersion_1.checkMinRequiredVersion, "extMinVersion")
     .before(extensionsHelper_1.diagnoseAndFixProject)
     .action(async (extensionName, options) => {
+    var _a;
     const projectId = (0, projectUtils_1.needProjectId)(options);
-    const paramsEnvPath = options.params;
+    const paramsEnvPath = ((_a = options.params) !== null && _a !== void 0 ? _a : "");
     let learnMore = false;
     if (!extensionName) {
         if (options.interactive) {
@@ -59,12 +62,18 @@ exports.default = new command_1.Command("ext:install [extensionName]")
     }
     let source;
     let extVersion;
+    if ((0, extensionsHelper_1.isUrlPath)(extensionName)) {
+        void (0, track_1.track)("Extension Install", "Install by url path", options.interactive ? 1 : 0);
+    }
     if ((0, extensionsHelper_1.isLocalOrURLPath)(extensionName)) {
-        (0, track_1.track)("Extension Install", "Install by Source", options.interactive ? 1 : 0);
+        void (0, track_1.track)("Extension Install", "Install by Source", options.interactive ? 1 : 0);
+        if (options.local) {
+            throw new error_1.FirebaseError("Installing a local source locally is not supported yet, please use ext:dev:emulator commands");
+        }
         source = await infoInstallBySource(projectId, extensionName);
     }
     else {
-        (0, track_1.track)("Extension Install", "Install by Extension Ref", options.interactive ? 1 : 0);
+        void (0, track_1.track)("Extension Install", "Install by Extension Ref", options.interactive ? 1 : 0);
         extVersion = await infoInstallByReference(extensionName, options.interactive);
     }
     if (!(await (0, extensionsHelper_1.confirm)({
@@ -86,6 +95,27 @@ exports.default = new command_1.Command("ext:install [extensionName]")
             `${spec.description}\n` +
             `View details: https://firebase.google.com/products/extensions/${spec.name}\n`);
     }
+    if (options.local) {
+        try {
+            return installToManifest({
+                paramsEnvPath,
+                projectId,
+                extensionName,
+                source,
+                extVersion,
+                nonInteractive: options.nonInteractive,
+                force: options.force,
+            });
+        }
+        catch (err) {
+            if (!(err instanceof error_1.FirebaseError)) {
+                throw new error_1.FirebaseError(`Error occurred saving the extension to manifest: ${err.message}`, {
+                    original: err,
+                });
+            }
+            throw err;
+        }
+    }
     try {
         return installExtension({
             paramsEnvPath,
@@ -126,7 +156,7 @@ async function infoInstallByReference(extensionName, interactive) {
     const ref = refs.parse(extensionName);
     const extension = await extensionsApi.getExtension(refs.toExtensionRef(ref));
     if (!ref.version) {
-        (0, track_1.track)("Extension Install", "Install by Extension Version Ref", interactive ? 1 : 0);
+        void (0, track_1.track)("Extension Install", "Install by Extension Version Ref", interactive ? 1 : 0);
         extensionName = `${extensionName}@latest`;
     }
     const extVersion = await extensionsApi.getExtensionVersion(extensionName);
@@ -134,6 +164,34 @@ async function infoInstallByReference(extensionName, interactive) {
     await (0, warnings_1.displayWarningPrompts)(ref.publisherId, extension.registryLaunchStage, extVersion);
     return extVersion;
 }
+async function installToManifest(options) {
+    const { projectId, extensionName, extVersion, paramsEnvPath, nonInteractive, force } = options;
+    const spec = extVersion === null || extVersion === void 0 ? void 0 : extVersion.spec;
+    if (!spec) {
+        throw new error_1.FirebaseError(`Could not find the extension.yaml for ${extensionName}. Please make sure this is a valid extension and try again.`);
+    }
+    const config = manifest.loadConfig(options);
+    let instanceId = spec.name;
+    while (manifest.instanceExists(instanceId, config)) {
+        instanceId = await (0, extensionsHelper_1.promptForValidInstanceId)(`${spec.name}-${(0, utils_1.getRandomString)(4)}`);
+    }
+    const params = await paramHelper.getParams({
+        projectId,
+        paramSpecs: spec.params,
+        nonInteractive,
+        paramsEnvPath,
+        instanceId,
+    });
+    const ref = refs.parse(extVersion.ref);
+    await manifest.writeToManifest([
+        {
+            instanceId,
+            ref,
+            params,
+        },
+    ], config, { nonInteractive, force: force !== null && force !== void 0 ? force : false });
+    manifest.showPreviewWarning();
+}
 async function installExtension(options) {
     const { projectId, extensionName, source, extVersion, paramsEnvPath, nonInteractive, force } = options;
     const spec = (source === null || source === void 0 ? void 0 : source.spec) || (extVersion === null || extVersion === void 0 ? void 0 : extVersion.spec);
@@ -253,6 +311,7 @@ async function installExtension(options) {
             `which may include some required post-installation tasks: ${utils.consoleUrl(projectId, `/extensions/instances/${instanceId}?tab=usage`)}`));
         logger_1.logger.info(marked("You can run `firebase ext` to view available Firebase Extensions commands, " +
             "including those to update, reconfigure, or delete your installed extension."));
+        manifest.showDeprecationWarning();
     }
     catch (err) {
         if (spinner.isSpinning) {

package/lib/commands/ext-uninstall.js

@@ -16,17 +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(),
 });
 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 {
@@ -93,6 +101,7 @@ 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}`;

package/lib/commands/ext-update.js

@@ -22,6 +22,7 @@ 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(),
 });
@@ -38,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);
@@ -148,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,
         });
@@ -170,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) {

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/planner.js

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveVersion = exports.want = exports.have = exports.getExtension = exports.getExtensionVersion = void 0;
 const semver = require("semver");
-const error_1 = require("../../error");
 const extensionsApi = require("../../extensions/extensionsApi");
-const extensionsHelper_1 = require("../../extensions/extensionsHelper");
 const refs = require("../../extensions/refs");
-const params_1 = require("./params");
+const error_1 = require("../../error");
+const extensionsHelper_1 = require("../../extensions/extensionsHelper");
 const logger_1 = require("../../logger");
+const manifest_1 = require("../../extensions/manifest");
 async function getExtensionVersion(i) {
     if (!i.extensionVersion) {
         if (!i.ref) {
@@ -52,15 +52,15 @@ async function want(args) {
             const instanceId = e[0];
             const ref = refs.parse(e[1]);
             ref.version = await resolveVersion(ref);
-            const params = (0, params_1.readParams)({
+            const params = (0, manifest_1.readInstanceParam)({
                 projectDir: args.projectDir,
                 instanceId,
                 projectId: args.projectId,
                 projectNumber: args.projectNumber,
                 aliases: args.aliases,
-                checkLocal: args.checkLocal,
+                checkLocal: args.emulatorMode,
             });
-            const autoPopulatedParams = await (0, extensionsHelper_1.getFirebaseProjectParams)(args.projectId);
+            const autoPopulatedParams = await (0, extensionsHelper_1.getFirebaseProjectParams)(args.projectId, args.emulatorMode);
             const subbedParams = (0, extensionsHelper_1.substituteParams)(params, autoPopulatedParams);
             instanceSpecs.push({
                 instanceId,

package/lib/deploy/functions/backend.js

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

package/lib/deploy/functions/checkIam.js

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

package/lib/deploy/functions/prepare.js

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

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

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