firebase-tools 12.4.6 → 12.4.8

package/lib/emulator/functionsEmulatorRuntime.js

@@ -642,22 +642,23 @@ async function main() {
     }
     const app = express();
     app.enable("trust proxy");
+    const bodyParserLimit = "32mb";
     app.use(bodyParser.json({
-        limit: "10mb",
+        limit: bodyParserLimit,
         verify: rawBodySaver,
     }));
     app.use(bodyParser.text({
-        limit: "10mb",
+        limit: bodyParserLimit,
         verify: rawBodySaver,
     }));
     app.use(bodyParser.urlencoded({
         extended: true,
-        limit: "10mb",
+        limit: bodyParserLimit,
         verify: rawBodySaver,
     }));
     app.use(bodyParser.raw({
         type: "*/*",
-        limit: "10mb",
+        limit: bodyParserLimit,
         verify: rawBodySaver,
     }));
     app.get("/__/health", (req, res) => {

package/lib/emulator/functionsEmulatorShell.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FunctionsEmulatorShell = void 0;
 const uuid = require("uuid");
-const functionsEmulator_1 = require("./functionsEmulator");
 const utils = require("../utils");
+const functionsEmulator_1 = require("./functionsEmulator");
 const logger_1 = require("../logger");
 const error_1 = require("../error");
 class FunctionsEmulatorShell {
@@ -20,37 +20,69 @@ class FunctionsEmulatorShell {
             }
         }
     }
-    call(name, data, opts) {
-        const trigger = this.getTrigger(name);
-        logger_1.logger.debug(`shell:${name}: trigger=${JSON.stringify(trigger)}`);
-        logger_1.logger.debug(`shell:${name}: opts=${JSON.stringify(opts)}, data=${JSON.stringify(data)}`);
-        if (!trigger.eventTrigger) {
-            throw new error_1.FirebaseError(`Function ${name} is not a background function`);
-        }
-        const eventType = trigger.eventTrigger.eventType;
+    createLegacyEvent(eventTrigger, data, opts) {
+        var _a, _b;
         let resource = opts.resource;
         if (typeof resource === "object" && resource.name) {
             resource = resource.name;
         }
-        const proto = {
+        return {
             eventId: uuid.v4(),
             timestamp: new Date().toISOString(),
-            eventType,
-            resource,
+            eventType: eventTrigger.eventType,
+            resource: resource,
             params: opts.params,
-            auth: opts.auth,
+            auth: { admin: ((_a = opts.auth) === null || _a === void 0 ? void 0 : _a.admin) || false, variable: (_b = opts.auth) === null || _b === void 0 ? void 0 : _b.variable },
             data,
         };
-        this.emu.sendRequest(trigger, proto);
     }
-    getTrigger(name) {
-        const result = this.triggers.find((trigger) => {
-            return trigger.name === name;
-        });
-        if (!result) {
-            throw new error_1.FirebaseError(`Could not find trigger ${name}`);
-        }
-        return result;
+    createCloudEvent(eventTrigger, data, opts) {
+        var _a, _b;
+        const ce = {
+            specversion: "1.0",
+            datacontenttype: "application/json",
+            id: uuid.v4(),
+            type: eventTrigger.eventType,
+            time: new Date().toISOString(),
+            source: "",
+            data,
+        };
+        if (eventTrigger.eventType.startsWith("google.cloud.storage")) {
+            ce.source = `projects/_/buckets/${(_a = eventTrigger.eventFilters) === null || _a === void 0 ? void 0 : _a.bucket}`;
+        }
+        else if (eventTrigger.eventType.startsWith("google.cloud.pubsub")) {
+            ce.source = eventTrigger.eventFilters.topic;
+            data = Object.assign(Object.assign({}, data), { messageId: uuid.v4() });
+        }
+        else if (eventTrigger.eventType.startsWith("google.cloud.firestore")) {
+            ce.source = `projects/_/databases/(default)`;
+            if (opts.resource) {
+                ce.document = opts.resource;
+            }
+        }
+        else if (eventTrigger.eventType.startsWith("google.firebase.database")) {
+            ce.source = `projects/_/locations/_/instances/${(_b = eventTrigger.eventFilterPathPatterns) === null || _b === void 0 ? void 0 : _b.instance}`;
+            if (opts.resource) {
+                ce.ref = opts.resource;
+            }
+        }
+        return ce;
+    }
+    call(trigger, data, opts) {
+        logger_1.logger.debug(`shell:${trigger.name}: trigger=${JSON.stringify(trigger)}`);
+        logger_1.logger.debug(`shell:${trigger.name}: opts=${JSON.stringify(opts)}, data=${JSON.stringify(data)}`);
+        const eventTrigger = trigger.eventTrigger;
+        if (!eventTrigger) {
+            throw new error_1.FirebaseError(`Function ${trigger.name} is not a background function`);
+        }
+        let body;
+        if (trigger.platform === "gcfv1") {
+            body = this.createLegacyEvent(eventTrigger, data, opts);
+        }
+        else {
+            body = this.createCloudEvent(eventTrigger, data, opts);
+        }
+        this.emu.sendRequest(trigger, body);
     }
 }
 exports.FunctionsEmulatorShell = FunctionsEmulatorShell;

package/lib/extensions/paramHelper.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isSystemParam = exports.readEnvFile = exports.promptForNewParams = exports.getParamsForUpdate = exports.getParams = exports.getParamsWithCurrentValuesAsDefaults = exports.setNewDefaults = exports.buildBindingOptionsWithBaseValue = exports.getBaseParamBindings = void 0;
+exports.isSystemParam = exports.readEnvFile = exports.promptForNewParams = exports.getParamsForUpdate = exports.getParams = exports.setNewDefaults = exports.buildBindingOptionsWithBaseValue = exports.getBaseParamBindings = void 0;
 const path = require("path");
 const clc = require("colorette");
 const fs = require("fs-extra");
@@ -9,7 +9,6 @@ const logger_1 = require("../logger");
 const extensionsHelper_1 = require("./extensionsHelper");
 const askUserForParam = require("./askUserForParam");
 const env = require("../functions/env");
-const utils_1 = require("../utils");
 const NONINTERACTIVE_ERROR_MESSAGE = "As of firebase-tools@11, `ext:install`, `ext:update` and `ext:configure` are interactive only commands. " +
     "To deploy an extension noninteractively, use an extensions manifest and `firebase deploy --only extensions`.  " +
     "See https://firebase.google.com/docs/extensions/manifest for more details";
@@ -30,21 +29,17 @@ function buildBindingOptionsWithBaseValue(baseParams) {
 }
 exports.buildBindingOptionsWithBaseValue = buildBindingOptionsWithBaseValue;
 function setNewDefaults(params, newDefaults) {
-    params.forEach((param) => {
-        if (newDefaults[param.param.toUpperCase()]) {
-            param.default = newDefaults[param.param.toUpperCase()];
+    for (const param of params) {
+        if (newDefaults[param.param]) {
+            param.default = newDefaults[param.param];
         }
-    });
+        else if ((param.param = `firebaseextensions.v1beta.function/location` && newDefaults["LOCATION"])) {
+            param.default = newDefaults["LOCATION"];
+        }
+    }
     return params;
 }
 exports.setNewDefaults = setNewDefaults;
-function getParamsWithCurrentValuesAsDefaults(extensionInstance) {
-    var _a, _b, _c, _d;
-    const specParams = (0, utils_1.cloneDeep)(((_c = (_b = (_a = extensionInstance === null || extensionInstance === void 0 ? void 0 : extensionInstance.config) === null || _a === void 0 ? void 0 : _a.source) === null || _b === void 0 ? void 0 : _b.spec) === null || _c === void 0 ? void 0 : _c.params) || []);
-    const currentParams = (0, utils_1.cloneDeep)(((_d = extensionInstance === null || extensionInstance === void 0 ? void 0 : extensionInstance.config) === null || _d === void 0 ? void 0 : _d.params) || {});
-    return setNewDefaults(specParams, currentParams);
-}
-exports.getParamsWithCurrentValuesAsDefaults = getParamsWithCurrentValuesAsDefaults;
 async function getParams(args) {
     let params;
     if (args.nonInteractive) {
@@ -81,6 +76,7 @@ async function getParamsForUpdate(args) {
 }
 exports.getParamsForUpdate = getParamsForUpdate;
 async function promptForNewParams(args) {
+    var _a, _b;
     const newParamBindingOptions = buildBindingOptionsWithBaseValue(args.currentParams);
     const firebaseProjectParams = await (0, extensionsHelper_1.getFirebaseProjectParams)(args.projectId);
     const sameParam = (param1) => (param2) => {
@@ -89,10 +85,22 @@ async function promptForNewParams(args) {
     const paramDiff = (left, right) => {
         return left.filter((aLeft) => !right.find(sameParam(aLeft)));
     };
-    const oldParams = args.spec.params.filter((p) => Object.keys(args.currentParams).includes(p.param));
-    let paramsDiffDeletions = paramDiff(oldParams, args.newSpec.params);
+    let combinedOldParams = args.spec.params.concat((_a = args.spec.systemParams.filter((p) => !p.advanced)) !== null && _a !== void 0 ? _a : []);
+    let combinedNewParams = args.newSpec.params.concat((_b = args.newSpec.systemParams.filter((p) => !p.advanced)) !== null && _b !== void 0 ? _b : []);
+    if (combinedOldParams.some((p) => p.param === "LOCATION") &&
+        combinedNewParams.some((p) => p.param === "firebaseextensions.v1beta.function/location") &&
+        !!args.currentParams["LOCATION"]) {
+        newParamBindingOptions["firebaseextensions.v1beta.function/location"] = {
+            baseValue: args.currentParams["LOCATION"],
+        };
+        delete newParamBindingOptions["LOCATION"];
+        combinedOldParams = combinedOldParams.filter((p) => p.param !== "LOCATION");
+        combinedNewParams = combinedNewParams.filter((p) => p.param !== "firebaseextensions.v1beta.function/location");
+    }
+    const oldParams = combinedOldParams.filter((p) => Object.keys(args.currentParams).includes(p.param));
+    let paramsDiffDeletions = paramDiff(oldParams, combinedNewParams);
     paramsDiffDeletions = (0, extensionsHelper_1.substituteParams)(paramsDiffDeletions, firebaseProjectParams);
-    let paramsDiffAdditions = paramDiff(args.newSpec.params, oldParams);
+    let paramsDiffAdditions = paramDiff(combinedNewParams, oldParams);
     paramsDiffAdditions = (0, extensionsHelper_1.substituteParams)(paramsDiffAdditions, firebaseProjectParams);
     if (paramsDiffDeletions.length) {
         logger_1.logger.info("The following params will no longer be used:");

package/lib/frameworks/astro/index.js

@@ -10,14 +10,10 @@ const utils_2 = require("./utils");
 exports.name = "Astro";
 exports.support = "experimental";
 exports.type = 2;
-function getAstroVersion(cwd) {
-    var _a;
-    return (_a = (0, utils_1.findDependency)("astro", { cwd, depth: 0, omitDev: false })) === null || _a === void 0 ? void 0 : _a.version;
-}
 async function discover(dir) {
     if (!(0, fs_extra_1.existsSync)((0, path_1.join)(dir, "package.json")))
         return;
-    if (!getAstroVersion(dir))
+    if (!(0, utils_2.getAstroVersion)(dir))
         return;
     const { output, publicDir: publicDirectory } = await (0, utils_2.getConfig)(dir);
     return {

package/lib/frameworks/astro/utils.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getConfig = exports.getBootstrapScript = void 0;
+exports.getAstroVersion = exports.getConfig = exports.getBootstrapScript = void 0;
 const path_1 = require("path");
+const utils_1 = require("../utils");
+const semver_1 = require("semver");
 const { dynamicImport } = require(true && "../../dynamicImport");
 function getBootstrapScript() {
     return `const entry = import('./entry.mjs');\nexport const handle = async (req, res) => (await entry).handler(req, res)`;
@@ -9,9 +11,20 @@ function getBootstrapScript() {
 exports.getBootstrapScript = getBootstrapScript;
 async function getConfig(cwd) {
     const astroDirectory = (0, path_1.dirname)(require.resolve("astro/package.json", { paths: [cwd] }));
-    const { openConfig } = await dynamicImport((0, path_1.join)(astroDirectory, "dist", "core", "config", "config.js"));
-    const logging = undefined;
-    const { astroConfig: config } = await openConfig({ cmd: "build", cwd, logging });
+    const version = getAstroVersion(cwd);
+    let config;
+    const configPath = (0, path_1.join)(astroDirectory, "dist", "core", "config", "config.js");
+    if ((0, semver_1.gte)(version, "2.9.7")) {
+        const { resolveConfig } = await dynamicImport(configPath);
+        const { astroConfig } = await resolveConfig({ root: cwd }, "build");
+        config = astroConfig;
+    }
+    else {
+        const { openConfig } = await dynamicImport(configPath);
+        const logging = undefined;
+        const { astroConfig } = await openConfig({ cmd: "build", cwd, logging });
+        config = astroConfig;
+    }
     return {
         outDir: (0, path_1.relative)(cwd, config.outDir.pathname),
         publicDir: (0, path_1.relative)(cwd, config.publicDir.pathname),
@@ -20,3 +33,8 @@ async function getConfig(cwd) {
     };
 }
 exports.getConfig = getConfig;
+function getAstroVersion(cwd) {
+    var _a;
+    return (_a = (0, utils_1.findDependency)("astro", { cwd, depth: 0, omitDev: false })) === null || _a === void 0 ? void 0 : _a.version;
+}
+exports.getAstroVersion = getAstroVersion;

package/lib/frameworks/next/index.js

@@ -29,6 +29,7 @@ exports.name = "Next.js";
 exports.support = "preview";
 exports.type = 2;
 exports.docsUrl = "https://firebase.google.com/docs/hosting/frameworks/nextjs";
+const BUNDLE_NEXT_CONFIG_TIMEOUT = 60000;
 const DEFAULT_NUMBER_OF_REASONS_TO_LIST = 5;
 function getReactVersion(cwd) {
     var _a;
@@ -297,7 +298,6 @@ async function ɵcodegenPublicDirectory(sourceDir, destDir, _, context) {
     }));
 }
 exports.ɵcodegenPublicDirectory = ɵcodegenPublicDirectory;
-const BUNDLE_NEXT_CONFIG_TIMEOUT = 10000;
 async function ɵcodegenFunctionsDirectory(sourceDir, destDir) {
     const { distDir } = await getConfig(sourceDir);
     const packageJson = await (0, utils_1.readJSON)((0, path_1.join)(sourceDir, "package.json"));

package/lib/frameworks/utils.js

@@ -144,14 +144,13 @@ function getNpmRoot(cwd) {
 }
 exports.getNpmRoot = getNpmRoot;
 function getNodeModuleBin(name, cwd) {
-    const cantFindExecutable = new error_1.FirebaseError(`Could not find the ${name} executable.`);
     const npmRoot = getNpmRoot(cwd);
     if (!npmRoot) {
-        throw cantFindExecutable;
+        throw new error_1.FirebaseError(`Error finding ${name} executable: failed to spawn 'npm'`);
     }
     const path = (0, path_1.join)(npmRoot, ".bin", name);
     if (!(0, fsutils_1.fileExistsSync)(path)) {
-        throw cantFindExecutable;
+        throw new error_1.FirebaseError(`Could not find the ${name} executable.`);
     }
     return path;
 }

package/lib/functions/secrets.js

@@ -44,7 +44,7 @@ function toUpperSnakeCase(key) {
 }
 function ensureApi(options) {
     const projectId = (0, projectUtils_1.needProjectId)(options);
-    return ensureApiEnabled.ensure(projectId, "secretmanager.googleapis.com", "runtimeconfig", true);
+    return ensureApiEnabled.ensure(projectId, "secretmanager.googleapis.com", "secretmanager", true);
 }
 exports.ensureApi = ensureApi;
 async function ensureValidKey(key, options) {

package/lib/gcp/frameworks.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createBuild = exports.createStack = exports.API_VERSION = void 0;
+exports.createBuild = exports.getStack = exports.createStack = exports.API_VERSION = void 0;
 const apiv2_1 = require("../apiv2");
 const api_1 = require("../api");
-exports.API_VERSION = "v2";
+exports.API_VERSION = "v1alpha";
 const client = new apiv2_1.Client({
     urlPrefix: api_1.frameworksOrigin,
     auth: true,
@@ -15,6 +15,12 @@ async function createStack(projectId, location, stackInput) {
     return res.body;
 }
 exports.createStack = createStack;
+async function getStack(projectId, location, stackId) {
+    const name = `projects/${projectId}/locations/${location}/stacks/${stackId}`;
+    const res = await client.get(name);
+    return res.body;
+}
+exports.getStack = getStack;
 async function createBuild(projectId, location, stackId, buildInput) {
     const buildId = buildInput.name;
     const res = await client.post(`projects/${projectId}/locations/${location}/stacks/${stackId}/builds`, buildInput, { queryParams: { buildId } });

package/lib/gcp/iam.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.testIamPermissions = exports.testResourceIamPermissions = exports.getRole = exports.deleteServiceAccount = exports.createServiceAccountKey = exports.getServiceAccount = exports.createServiceAccount = void 0;
+exports.testIamPermissions = exports.testResourceIamPermissions = exports.getRole = exports.listServiceAccountKeys = exports.deleteServiceAccount = exports.createServiceAccountKey = exports.getServiceAccount = exports.createServiceAccount = void 0;
 const api_1 = require("../api");
 const logger_1 = require("../logger");
 const apiv2_1 = require("../apiv2");
@@ -35,6 +35,11 @@ async function deleteServiceAccount(projectId, accountEmail) {
     });
 }
 exports.deleteServiceAccount = deleteServiceAccount;
+async function listServiceAccountKeys(projectId, serviceAccountName) {
+    const response = await apiClient.get(`/projects/${projectId}/serviceAccounts/${serviceAccountName}@${projectId}.iam.gserviceaccount.com/keys`);
+    return response.body.keys;
+}
+exports.listServiceAccountKeys = listServiceAccountKeys;
 async function getRole(role) {
     const response = await apiClient.get(`/roles/${role}`, {
         retryCodes: [500, 503],

package/lib/init/features/frameworks/index.js

@@ -1,16 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createStack = exports.doSetup = void 0;
+exports.createStack = exports.getOrCreateStack = exports.doSetup = void 0;
 const clc = require("colorette");
 const utils = require("../../../utils");
 const logger_1 = require("../../../logger");
 const prompt_1 = require("../../../prompt");
 const constants_1 = require("./constants");
-const repo_1 = require("./repo");
+const repo = require("./repo");
 const poller = require("../../../operation-poller");
 const api_1 = require("../../../api");
 const gcp = require("../../../gcp/frameworks");
 const frameworks_1 = require("../../../gcp/frameworks");
+const error_1 = require("../../../error");
 const frameworksPollerOptions = {
     apiOrigin: api_1.frameworksOrigin,
     apiVersion: frameworks_1.API_VERSION,
@@ -26,7 +27,7 @@ async function doSetup(setup) {
         name: "serviceName",
         type: "input",
         default: "acme-inc-web",
-        message: "Create a name for your service [6-32 characters]",
+        message: "Create a name for your service [1-30 characters]",
     }, setup.frameworks);
     await (0, prompt_1.promptOnce)({
         name: "region",
@@ -45,19 +46,62 @@ async function doSetup(setup) {
         message: "How do you want to deploy",
         choices: constants_1.ALLOWED_DEPLOY_METHODS,
     }, setup.frameworks);
-    if (setup.frameworks.deployMethod === "github") {
-        const cloudBuildConnRepo = await (0, repo_1.linkGitHubRepository)(projectId, setup.frameworks.region, setup.frameworks.serviceName);
-        toStack(cloudBuildConnRepo, setup.frameworks.serviceName);
-    }
+    await getOrCreateStack(projectId, setup);
 }
 exports.doSetup = doSetup;
 function toStack(cloudBuildConnRepo, stackId) {
     return {
         name: stackId,
-        codebase: { repository: cloudBuildConnRepo.name, rootDirectory: "/" },
         labels: {},
     };
 }
+async function getOrCreateStack(projectId, setup) {
+    const location = setup.frameworks.region;
+    const deployMethod = setup.frameworks.deployMethod;
+    try {
+        return await getExistingStack(projectId, setup, location);
+    }
+    catch (err) {
+        if (err.status === 404) {
+            logger_1.logger.info("Creating new stack.");
+            if (deployMethod === "github") {
+                const cloudBuildConnRepo = await repo.linkGitHubRepository(projectId, location, setup.frameworks.serviceName);
+                const stackDetails = toStack(cloudBuildConnRepo, setup.frameworks.serviceName);
+                return await createStack(projectId, location, stackDetails);
+            }
+        }
+        else {
+            throw new error_1.FirebaseError(`Failed to get or create a stack using the given initialization details: ${err}`);
+        }
+    }
+    return undefined;
+}
+exports.getOrCreateStack = getOrCreateStack;
+async function getExistingStack(projectId, setup, location) {
+    let stack = await gcp.getStack(projectId, location, setup.frameworks.serviceName);
+    while (stack) {
+        setup.frameworks.serviceName = undefined;
+        await (0, prompt_1.promptOnce)({
+            name: "existingStack",
+            type: "confirm",
+            default: true,
+            message: "A stack already exists for the given serviceName, do you want to use existing stack? (yes/no)",
+        }, setup.frameworks);
+        if (setup.frameworks.existingStack) {
+            logger_1.logger.info("Using the existing stack.");
+            return stack;
+        }
+        await (0, prompt_1.promptOnce)({
+            name: "serviceName",
+            type: "input",
+            default: "acme-inc-web",
+            message: "Please enter a new service name [1-30 characters]",
+        }, setup.frameworks);
+        stack = await gcp.getStack(projectId, location, setup.frameworks.serviceName);
+        setup.frameworks.existingStack = undefined;
+    }
+    return stack;
+}
 async function createStack(projectId, location, stackInput) {
     const op = await gcp.createStack(projectId, location, stackInput);
     const stack = await poller.pollOperation(Object.assign(Object.assign({}, frameworksPollerOptions), { pollerName: `create-${projectId}-${location}-${stackInput.name}`, operationResourceName: op.name }));

package/lib/init/features/frameworks/repo.js

@@ -32,7 +32,7 @@ async function linkGitHubRepository(projectId, location, stackId) {
         await utils.openInBrowser("https://github.com/apps/google-cloud-build/installations/new");
         await (0, prompt_1.promptOnce)({
             type: "input",
-            message: "Press any key once you have finished configuring your installation's access settings.",
+            message: "Press ENTER once you have finished configuring your installation's access settings.",
         });
         remoteUri = await promptRepositoryURI(projectId, location, connectionId);
     }

package/lib/init/features/hosting/github.js

@@ -17,6 +17,7 @@ const prompt_1 = require("../../../prompt");
 const utils_1 = require("../../../utils");
 const api_1 = require("../../../api");
 const apiv2_1 = require("../../../apiv2");
+const error_1 = require("../../../error");
 let GIT_DIR;
 let GITHUB_DIR;
 let WORKFLOW_DIR;
@@ -26,6 +27,7 @@ const YML_PULL_REQUEST_FILENAME = "firebase-hosting-pull-request.yml";
 const YML_MERGE_FILENAME = "firebase-hosting-merge.yml";
 const CHECKOUT_GITHUB_ACTION_NAME = "actions/checkout@v3";
 const HOSTING_GITHUB_ACTION_NAME = "FirebaseExtended/action-hosting-deploy@v0";
+const SERVICE_ACCOUNT_MAX_KEY_NUMBER = 10;
 const githubApiClient = new apiv2_1.Client({ urlPrefix: api_1.githubApiOrigin, auth: false });
 async function initGitHub(setup) {
     if (!setup.projectId) {
@@ -344,6 +346,13 @@ async function createServiceAccountAndKeyWithRetry(options, repo, accountId) {
     catch (e) {
         spinnerServiceAccount.stop();
         if (!e.message.includes("429")) {
+            const serviceAccountKeys = await (0, iam_1.listServiceAccountKeys)(options.projectId, accountId);
+            if (serviceAccountKeys.length >= SERVICE_ACCOUNT_MAX_KEY_NUMBER) {
+                throw new error_1.FirebaseError(`You cannot add another key because the service account ${(0, colorette_1.bold)(accountId)} already contains the max number of keys: ${SERVICE_ACCOUNT_MAX_KEY_NUMBER}.`, {
+                    original: e,
+                    exit: 1,
+                });
+            }
             throw e;
         }
         spinnerServiceAccount.start();

package/lib/localFunction.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const uuid = require("uuid");
 const request = require("request");
-const utils = require("./utils");
 const encodeFirestoreValue_1 = require("./firestore/encodeFirestoreValue");
+const utils = require("./utils");
 class LocalFunction {
     constructor(trigger, urls, controller) {
         this.trigger = trigger;
@@ -17,7 +18,7 @@ class LocalFunction {
         return resource.replace(this.paramWildcardRegex, (wildcard) => {
             const wildcardNoBraces = wildcard.slice(1, -1);
             const sub = params === null || params === void 0 ? void 0 : params[wildcardNoBraces];
-            return sub || `${wildcardNoBraces}${utils.randomInt(1, 9)}`;
+            return sub || wildcardNoBraces + utils.randomInt(1, 9);
         });
     }
     constructCallableFunc(data, opts) {
@@ -118,24 +119,30 @@ class LocalFunction {
     isFirestoreFunc(eventTrigger) {
         return utils.getFunctionsEventProvider(eventTrigger.eventType) === "Firestore";
     }
+    isPubsubFunc(eventTrigger) {
+        return utils.getFunctionsEventProvider(eventTrigger.eventType) === "PubSub";
+    }
     triggerEvent(data, opts) {
+        var _a, _b, _c, _d;
         opts = opts || {};
         let operationType;
         let dataPayload;
         if (this.trigger.httpsTrigger) {
-            this.controller.call(this.trigger.name, data || {}, opts);
+            this.controller.call(this.trigger, data || {}, opts);
         }
         else if (this.trigger.eventTrigger) {
             if (this.isDatabaseFn(this.trigger.eventTrigger)) {
                 operationType = utils.last(this.trigger.eventTrigger.eventType.split("."));
                 switch (operationType) {
                     case "create":
+                    case "created":
                         dataPayload = {
                             data: null,
                             delta: data,
                         };
                         break;
                     case "delete":
+                    case "deleted":
                         dataPayload = {
                             data: data,
                             delta: null,
@@ -147,20 +154,23 @@ class LocalFunction {
                             delta: data.after,
                         };
                 }
-                opts.resource = this.substituteParams(this.trigger.eventTrigger.resource, opts.params);
+                const resource = (_a = this.trigger.eventTrigger.resource) !== null && _a !== void 0 ? _a : (_b = this.trigger.eventTrigger.eventFilterPathPatterns) === null || _b === void 0 ? void 0 : _b.ref;
+                opts.resource = this.substituteParams(resource, opts.params);
                 opts.auth = this.constructAuth(opts.auth, opts.authType);
-                this.controller.call(this.trigger.name, dataPayload, opts);
+                this.controller.call(this.trigger, dataPayload, opts);
             }
             else if (this.isFirestoreFunc(this.trigger.eventTrigger)) {
                 operationType = utils.last(this.trigger.eventTrigger.eventType.split("."));
                 switch (operationType) {
                     case "create":
+                    case "created":
                         dataPayload = {
                             value: this.makeFirestoreValue(data),
                             oldValue: {},
                         };
                         break;
                     case "delete":
+                    case "deleted":
                         dataPayload = {
                             value: {},
                             oldValue: this.makeFirestoreValue(data),
@@ -172,14 +182,22 @@ class LocalFunction {
                             oldValue: this.makeFirestoreValue(data.before),
                         };
                 }
-                opts.resource = this.substituteParams(this.trigger.eventTrigger.resource, opts.params);
-                this.controller.call(this.trigger.name, dataPayload, opts);
+                const resource = (_c = this.trigger.eventTrigger.resource) !== null && _c !== void 0 ? _c : (_d = this.trigger.eventTrigger.eventFilterPathPatterns) === null || _d === void 0 ? void 0 : _d.document;
+                opts.resource = this.substituteParams(resource, opts.params);
+                this.controller.call(this.trigger, dataPayload, opts);
+            }
+            else if (this.isPubsubFunc(this.trigger.eventTrigger)) {
+                dataPayload = data;
+                if (this.trigger.platform === "gcfv2") {
+                    dataPayload = { message: Object.assign(Object.assign({}, data), { messageId: uuid.v4() }) };
+                }
+                this.controller.call(this.trigger, dataPayload || {}, opts);
             }
             else {
-                this.controller.call(this.trigger.name, data || {}, opts);
+                this.controller.call(this.trigger, data || {}, opts);
             }
         }
-        return console.log("Successfully invoked function.");
+        return "Successfully invoked function.";
     }
     makeFn() {
         var _a;

package/lib/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.openInBrowser = exports.connectableHostname = exports.randomInt = exports.debounce = exports.last = exports.cloneDeep = exports.groupBy = exports.assertIsStringOrUndefined = exports.assertIsNumber = exports.assertIsString = exports.thirtyDaysFromNow = exports.isRunningInWSL = exports.isCloudEnvironment = exports.datetimeString = exports.createDestroyer = exports.promiseWithSpinner = exports.setupLoggers = exports.tryParse = exports.tryStringify = exports.promiseProps = exports.withTimeout = exports.promiseWhile = exports.promiseAllSettled = exports.getFunctionsEventProvider = exports.endpoint = exports.makeActiveProject = exports.streamToString = exports.stringToStream = exports.explainStdin = exports.allSettled = exports.reject = exports.logLabeledError = exports.logLabeledWarning = exports.logWarning = exports.logLabeledBullet = exports.logBullet = exports.logLabeledSuccess = exports.logSuccess = exports.addSubdomain = exports.addDatabaseNamespace = exports.getDatabaseViewDataUrl = exports.getDatabaseUrl = exports.envOverride = exports.getInheritedOption = exports.consoleUrl = exports.envOverrides = void 0;
+exports.openInBrowser = exports.connectableHostname = exports.randomInt = exports.debounce = exports.last = exports.cloneDeep = exports.groupBy = exports.assertIsStringOrUndefined = exports.assertIsNumber = exports.assertIsString = exports.thirtyDaysFromNow = exports.isRunningInWSL = exports.isVSCodeExtension = exports.isCloudEnvironment = exports.datetimeString = exports.createDestroyer = exports.promiseWithSpinner = exports.setupLoggers = exports.tryParse = exports.tryStringify = exports.promiseProps = exports.withTimeout = exports.promiseWhile = exports.promiseAllSettled = exports.getFunctionsEventProvider = exports.endpoint = exports.makeActiveProject = exports.streamToString = exports.stringToStream = exports.explainStdin = exports.allSettled = exports.reject = exports.logLabeledError = exports.logLabeledWarning = exports.logWarning = exports.logLabeledBullet = exports.logBullet = exports.logLabeledSuccess = exports.logSuccess = exports.addSubdomain = exports.addDatabaseNamespace = exports.getDatabaseViewDataUrl = exports.getDatabaseUrl = exports.envOverride = exports.getInheritedOption = exports.consoleUrl = exports.envOverrides = void 0;
 const _ = require("lodash");
 const url = require("url");
 const clc = require("colorette");
@@ -194,7 +194,7 @@ function getFunctionsEventProvider(eventType) {
         const provider = last(parts[1].split("."));
         return _.capitalize(provider);
     }
-    if (/google.pubsub/.exec(eventType)) {
+    if (/google.*pubsub/.exec(eventType)) {
         return "PubSub";
     }
     else if (/google.storage/.exec(eventType)) {
@@ -212,7 +212,7 @@ function getFunctionsEventProvider(eventType) {
     else if (/google.firebase.crashlytics/.exec(eventType)) {
         return "Crashlytics";
     }
-    else if (/google.firestore/.exec(eventType)) {
+    else if (/google.*firestore/.exec(eventType)) {
         return "Firestore";
     }
     return _.capitalize(eventType.split(".")[1]);
@@ -367,6 +367,10 @@ function isCloudEnvironment() {
     return !!process.env.CODESPACES || !!process.env.GOOGLE_CLOUD_WORKSTATIONS;
 }
 exports.isCloudEnvironment = isCloudEnvironment;
+function isVSCodeExtension() {
+    return !!process.env.VSCODE_CWD;
+}
+exports.isVSCodeExtension = isVSCodeExtension;
 function isRunningInWSL() {
     return !!process.env.WSL_DISTRO_NAME;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-tools",
-  "version": "12.4.6",
+  "version": "12.4.8",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "bin": {