firebase-tools 14.20.0 → 14.22.0

package/lib/appUtils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractAppIdentifiersAndroid = exports.extractAppIdentifierIos = exports.extractAppIdentifiersFlutter = exports.detectApps = exports.getPlatformsFromFolder = exports.appDescription = exports.Framework = exports.Platform = void 0;
+exports.detectFiles = exports.extractAppIdentifiersAndroid = exports.extractAppIdentifierIos = exports.extractAppIdentifiersFlutter = exports.detectApps = exports.getPlatformsFromFolder = exports.appDescription = exports.Framework = exports.Platform = void 0;
 const fs = require("fs-extra");
 const path = require("path");
 const glob_1 = require("glob");
@@ -228,3 +228,4 @@ async function detectFiles(dirPath, filePattern) {
     };
     return (0, glob_1.glob)(`**/${filePattern}`, options);
 }
+exports.detectFiles = detectFiles;

package/lib/command.js

@@ -106,9 +106,8 @@ class Command {
                 const trackSuccess = (0, track_1.trackGA4)("command_execution", {
                     command_name: this.name,
                     result: "success",
-                    duration,
                     interactive: (0, utils_1.getInheritedOption)(options, "nonInteractive") ? "false" : "true",
-                });
+                }, duration);
                 if (!isEmulator) {
                     await (0, utils_1.withTimeout)(5000, trackSuccess);
                 }
@@ -154,21 +153,18 @@ class Command {
     async prepare(options) {
         options = options || {};
         options.project = (0, utils_1.getInheritedOption)(options, "project");
-        if (!process.stdin.isTTY || (0, utils_1.getInheritedOption)(options, "nonInteractive")) {
+        if (!process.stdin.isTTY ||
+            (0, utils_1.getInheritedOption)(options, "nonInteractive") ||
+            (0, utils_1.getInheritedOption)(options, "json")) {
             options.nonInteractive = true;
         }
         if ((0, utils_1.getInheritedOption)(options, "interactive")) {
-            options.interactive = true;
             options.nonInteractive = false;
         }
         if ((0, utils_1.getInheritedOption)(options, "debug")) {
             options.debug = true;
         }
-        if ((0, utils_1.getInheritedOption)(options, "json")) {
-            options.interactive = false;
-            options.nonInteractive = true;
-        }
-        else if (!options.isMCP) {
+        if (!(0, utils_1.getInheritedOption)(options, "json") && !options.isMCP) {
             (0, logger_1.useConsoleLoggers)();
         }
         if ((0, utils_1.getInheritedOption)(options, "config")) {

package/lib/commands/dataconnect-sdk-generate.js

@@ -6,28 +6,80 @@ const command_1 = require("../command");
 const dataconnectEmulator_1 = require("../emulator/dataconnectEmulator");
 const projectUtils_1 = require("../projectUtils");
 const load_1 = require("../dataconnect/load");
-const logger_1 = require("../logger");
 const auth_1 = require("../auth");
 const utils_1 = require("../utils");
+const config_1 = require("../config");
+const dataconnectInit = require("../init/features/dataconnect");
+const dataconnectSdkInit = require("../init/features/dataconnect/sdk");
+const error_1 = require("../error");
+const init_1 = require("./init");
+const hub_1 = require("../emulator/hub");
 exports.command = new command_1.Command("dataconnect:sdk:generate")
     .description("generate typed SDKs for your Data Connect connectors")
     .option("--watch", "watch for changes to your connector GQL files and regenerate your SDKs when updates occur")
     .action(async (options) => {
-    const projectId = (0, projectUtils_1.needProjectId)(options);
-    const serviceInfos = await (0, load_1.loadAll)(projectId, options.config);
-    const serviceInfosWithSDKs = serviceInfos.filter((serviceInfo) => serviceInfo.connectorInfo.some((c) => {
+    const projectId = (0, projectUtils_1.getProjectId)(options);
+    let justRanInit = false;
+    let config = options.config;
+    if (!config || !config.has("dataconnect")) {
+        if (options.nonInteractive) {
+            throw new error_1.FirebaseError(`No dataconnect project directory found. Please run ${clc.bold("firebase init dataconnect")} to set it up first.`);
+        }
+        (0, utils_1.logWarning)("No dataconnect project directory found.");
+        (0, utils_1.logBullet)(`Running ${clc.bold("firebase init dataconnect")} to setup a dataconnect project directory.`);
+        if (!config) {
+            const cwd = options.cwd || process.cwd();
+            config = new config_1.Config({}, { projectDir: cwd, cwd: cwd });
+        }
+        const setup = {
+            config: config.src,
+            projectId: projectId,
+            rcfile: options.rc.data,
+            featureInfo: {
+                dataconnectSource: "gen_sdk_init",
+            },
+            instructions: [],
+        };
+        await dataconnectInit.askQuestions(setup);
+        await dataconnectInit.actuate(setup, config, options);
+        await (0, init_1.postInitSaves)(setup, config);
+        justRanInit = true;
+        options.config = config;
+    }
+    let serviceInfosWithSDKs = await loadAllWithSDKs(projectId, config);
+    if (!serviceInfosWithSDKs.length) {
+        if (justRanInit || options.nonInteractive) {
+            throw new error_1.FirebaseError(`No generated SDKs are configured during init. Please run ${clc.bold("firebase init dataconnect:sdk")} to configure a generated SDK.`);
+        }
+        (0, utils_1.logWarning)("No generated SDKs have been configured.");
+        (0, utils_1.logBullet)(`Running ${clc.bold("firebase init dataconnect:sdk")} to configure a generated SDK.`);
+        const setup = {
+            config: config.src,
+            projectId: projectId,
+            rcfile: options.rc.data,
+            featureInfo: {
+                dataconnectSource: "gen_sdk_init_sdk",
+            },
+            instructions: [],
+        };
+        await dataconnectSdkInit.askQuestions(setup);
+        await dataconnectSdkInit.actuate(setup, config);
+        justRanInit = true;
+        serviceInfosWithSDKs = await loadAllWithSDKs(projectId, config);
+    }
+    await generateSDKsInAll(options, serviceInfosWithSDKs, justRanInit);
+});
+async function loadAllWithSDKs(projectId, config) {
+    const serviceInfos = await (0, load_1.loadAll)(projectId || hub_1.EmulatorHub.MISSING_PROJECT_PLACEHOLDER, config);
+    return serviceInfos.filter((serviceInfo) => serviceInfo.connectorInfo.some((c) => {
         var _a, _b, _c, _d;
         return (((_a = c.connectorYaml.generate) === null || _a === void 0 ? void 0 : _a.javascriptSdk) ||
             ((_b = c.connectorYaml.generate) === null || _b === void 0 ? void 0 : _b.kotlinSdk) ||
             ((_c = c.connectorYaml.generate) === null || _c === void 0 ? void 0 : _c.swiftSdk) ||
             ((_d = c.connectorYaml.generate) === null || _d === void 0 ? void 0 : _d.dartSdk));
     }));
-    if (!serviceInfosWithSDKs.length) {
-        logger_1.logger.warn("No generated SDKs have been declared in connector.yaml files.");
-        logger_1.logger.warn(`Run ${clc.bold("firebase init dataconnect:sdk")} to configure a generated SDK.`);
-        logger_1.logger.warn(`See https://firebase.google.com/docs/data-connect/web-sdk for more details of how to configure generated SDKs.`);
-        return;
-    }
+}
+async function generateSDKsInAll(options, serviceInfosWithSDKs, justRanInit) {
     async function generateSDK(serviceInfo) {
         return dataconnectEmulator_1.DataConnectEmulator.generate({
             configDir: serviceInfo.sourceDirectory,
@@ -39,10 +91,13 @@ exports.command = new command_1.Command("dataconnect:sdk:generate")
         await Promise.race(serviceInfosWithSDKs.map(generateSDK));
     }
     else {
+        if (justRanInit) {
+            return;
+        }
         for (const s of serviceInfosWithSDKs) {
             await generateSDK(s);
         }
         const services = serviceInfosWithSDKs.map((s) => s.dataConnectYaml.serviceId).join(", ");
         (0, utils_1.logLabeledSuccess)("dataconnect", `Successfully Generated SDKs for services: ${clc.bold(services)}`);
     }
-});
+}

package/lib/commands/deploy.js

@@ -15,6 +15,7 @@ const error_1 = require("../error");
 const colorette_1 = require("colorette");
 const interactive_1 = require("../hosting/interactive");
 const utils_1 = require("../utils");
+const api_1 = require("../hosting/api");
 exports.VALID_DEPLOY_TARGETS = [
     "database",
     "storage",
@@ -107,7 +108,7 @@ exports.command = new command_1.Command("deploy")
         await (0, requireDatabaseInstance_1.requireDatabaseInstance)(options);
     }
     if (options.filteredTargets.includes("hosting")) {
-        let createSite = false;
+        let shouldCreateSite = false;
         try {
             await (0, requireHostingSite_1.requireHostingSite)(options);
         }
@@ -119,17 +120,18 @@ exports.command = new command_1.Command("deploy")
                 throw err;
             }
             else if (err === getDefaultHostingSite_1.errNoDefaultSite) {
-                createSite = true;
+                shouldCreateSite = true;
             }
         }
-        if (!createSite) {
+        if (!shouldCreateSite) {
             return;
         }
         if (options.nonInteractive) {
             throw new error_1.FirebaseError(`Unable to deploy to Hosting as there is no Hosting site. Use ${(0, colorette_1.bold)("firebase hosting:sites:create")} to create a site.`);
         }
         (0, utils_1.logBullet)("No Hosting site detected.");
-        await (0, interactive_1.interactiveCreateHostingSite)("", "", options);
+        const siteId = await (0, interactive_1.pickHostingSiteName)("", options);
+        await (0, api_1.createSite)(options.project, siteId);
     }
 })
     .before(checkValidTargetFilters_1.checkValidTargetFilters)

package/lib/commands/firestore-databases-clone.js

@@ -0,0 +1,99 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.command = void 0;
+const clc = require("colorette");
+const command_1 = require("../command");
+const fsi = require("../firestore/api");
+const util_1 = require("../firestore/util");
+const logger_1 = require("../logger");
+const requirePermissions_1 = require("../requirePermissions");
+const types_1 = require("../emulator/types");
+const commandUtils_1 = require("../emulator/commandUtils");
+const options_1 = require("../firestore/options");
+const pretty_print_1 = require("../firestore/pretty-print");
+const error_1 = require("../error");
+exports.command = new command_1.Command("firestore:databases:clone <sourceDatabase> <targetDatabase>")
+    .description("clone one Firestore database to another")
+    .option("-e, --encryption-type <encryptionType>", `encryption method of the cloned database; one of ${options_1.EncryptionType.USE_SOURCE_ENCRYPTION} (default), ` +
+    `${options_1.EncryptionType.CUSTOMER_MANAGED_ENCRYPTION}, ${options_1.EncryptionType.GOOGLE_DEFAULT_ENCRYPTION}`)
+    .option("-k, --kms-key-name <kmsKeyName>", "resource ID of the Cloud KMS key to encrypt the cloned database. This " +
+    "feature is allowlist only in initial launch")
+    .option("-s, --snapshot-time <snapshotTime>", "snapshot time of the source database to use, in ISO 8601 format. Can be any minutely snapshot after the database's earliest version time. If unspecified, takes the most recent available snapshot")
+    .before(requirePermissions_1.requirePermissions, ["datastore.databases.clone"])
+    .before(commandUtils_1.warnEmulatorNotSupported, types_1.Emulators.FIRESTORE)
+    .action(async (sourceDatabase, targetDatabase, options) => {
+    const api = new fsi.FirestoreApi();
+    const printer = new pretty_print_1.PrettyPrint();
+    const helpCommandText = "See firebase firestore:databases:clone --help for more info.";
+    if (options.database) {
+        throw new error_1.FirebaseError(`--database is not a supported flag for 'firestoree:databases:clone'. ${helpCommandText}`);
+    }
+    let snapshotTime;
+    if (options.snapshotTime) {
+        snapshotTime = options.snapshotTime;
+    }
+    else {
+        snapshotTime = (0, util_1.getCurrentMinuteAsIsoString)();
+    }
+    let encryptionConfig = undefined;
+    switch (options.encryptionType) {
+        case options_1.EncryptionType.GOOGLE_DEFAULT_ENCRYPTION:
+            throwIfKmsKeyNameIsSet(options.kmsKeyName);
+            encryptionConfig = { googleDefaultEncryption: {} };
+            break;
+        case options_1.EncryptionType.USE_SOURCE_ENCRYPTION:
+            throwIfKmsKeyNameIsSet(options.kmsKeyName);
+            encryptionConfig = { useSourceEncryption: {} };
+            break;
+        case options_1.EncryptionType.CUSTOMER_MANAGED_ENCRYPTION:
+            encryptionConfig = {
+                customerManagedEncryption: { kmsKeyName: getKmsKeyOrThrow(options.kmsKeyName) },
+            };
+            break;
+        case undefined:
+            throwIfKmsKeyNameIsSet(options.kmsKeyName);
+            break;
+        default:
+            throw new error_1.FirebaseError(`Invalid value for flag --encryption-type. ${helpCommandText}`);
+    }
+    const targetDatabaseName = (0, util_1.parseDatabaseName)(targetDatabase);
+    const parentProject = targetDatabaseName.projectId;
+    const targetDatabaseId = targetDatabaseName.databaseId;
+    const sourceProject = (0, util_1.parseDatabaseName)(sourceDatabase).projectId;
+    if (parentProject !== sourceProject) {
+        throw new error_1.FirebaseError(`Cloning across projects is not supported.`);
+    }
+    const lro = await api.cloneDatabase(sourceProject, {
+        database: sourceDatabase,
+        snapshotTime,
+    }, targetDatabaseId, encryptionConfig);
+    if (lro.error) {
+        logger_1.logger.error(clc.bold(`Clone to ${printer.prettyDatabaseString(targetDatabase)} failed. See below for details.`));
+        printer.prettyPrintOperation(lro);
+    }
+    else {
+        logger_1.logger.info(clc.bold(`Successfully initiated clone to ${printer.prettyDatabaseString(targetDatabase)}`));
+        logger_1.logger.info("Please be sure to configure Firebase rules in your Firebase config file for\n" +
+            "the new database. By default, created databases will have closed rules that\n" +
+            "block any incoming third-party traffic.");
+        logger_1.logger.info();
+        logger_1.logger.info(`You can monitor the progress of this clone by executing this command:`);
+        logger_1.logger.info();
+        logger_1.logger.info(`firebase firestore:operations:describe --database="${targetDatabaseId}" ${lro.name}`);
+        logger_1.logger.info();
+        logger_1.logger.info(`Once the clone is complete, your database may be viewed at ${printer.firebaseConsoleDatabaseUrl(options.project, targetDatabaseId)}`);
+    }
+    return lro;
+    function throwIfKmsKeyNameIsSet(kmsKeyName) {
+        if (kmsKeyName) {
+            throw new error_1.FirebaseError("--kms-key-name can only be set when specifying an --encryption-type " +
+                `of ${options_1.EncryptionType.CUSTOMER_MANAGED_ENCRYPTION}.`);
+        }
+    }
+    function getKmsKeyOrThrow(kmsKeyName) {
+        if (kmsKeyName)
+            return kmsKeyName;
+        throw new error_1.FirebaseError("--kms-key-name must be provided when specifying an --encryption-type " +
+            `of ${options_1.EncryptionType.CUSTOMER_MANAGED_ENCRYPTION}.`);
+    }
+});

package/lib/commands/functions-secrets-set.js

@@ -2,7 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
 const clc = require("colorette");
+const tty = require("tty");
 const logger_1 = require("../logger");
+const error_1 = require("../error");
 const secrets_1 = require("../functions/secrets");
 const command_1 = require("../command");
 const requirePermissions_1 = require("../requirePermissions");
@@ -26,12 +28,28 @@ exports.command = new command_1.Command("functions:secrets:set <KEY>")
     "secretmanager.versions.add",
 ])
     .option("--data-file <dataFile>", 'file path from which to read secret data. Set to "-" to read the secret data from stdin')
+    .option("--format <format>", "format of the secret value. 'string' (default) or 'json'")
     .action(async (unvalidatedKey, options) => {
     const projectId = (0, projectUtils_1.needProjectId)(options);
     const projectNumber = await (0, projectUtils_1.needProjectNumber)(options);
     const key = await (0, secrets_1.ensureValidKey)(unvalidatedKey, options);
     const secret = await (0, secrets_1.ensureSecret)(projectId, key, options);
-    const secretValue = await (0, utils_1.readSecretValue)(`Enter a value for ${key}`, options.dataFile);
+    let format = options.format;
+    const dataFile = options.dataFile;
+    if (!format && dataFile && dataFile !== "-") {
+        if (dataFile.endsWith(".json")) {
+            format = "json";
+        }
+    }
+    if (!dataFile && tty.isatty(0) && options.nonInteractive) {
+        throw new error_1.FirebaseError(`Cannot prompt for secret value in non-interactive mode.\n` +
+            `Use --data-file to provide the secret value from a file.`);
+    }
+    const promptSuffix = format === "json" ? " (JSON format)" : "";
+    const secretValue = await (0, utils_1.readSecretValue)(`Enter a value for ${key}${promptSuffix}:`, dataFile);
+    if (format === "json") {
+        (0, secrets_1.validateJsonSecret)(key, secretValue);
+    }
     const secretVersion = await (0, secretManager_1.addVersion)(projectId, key, secretValue);
     (0, utils_1.logSuccess)(`Created a new secret version ${(0, secretManager_1.toSecretVersionResourceName)(secretVersion)}`);
     if (!(0, secretManager_1.isFunctionsManaged)(secret)) {

package/lib/commands/hosting-sites-create.js

@@ -8,6 +8,7 @@ const utils_1 = require("../utils");
 const logger_1 = require("../logger");
 const projectUtils_1 = require("../projectUtils");
 const requirePermissions_1 = require("../requirePermissions");
+const api_1 = require("../hosting/api");
 const error_1 = require("../error");
 const LOG_TAG = "hosting:sites";
 exports.command = new command_1.Command("hosting:sites:create [siteId]")
@@ -18,10 +19,10 @@ exports.command = new command_1.Command("hosting:sites:create [siteId]")
     const projectId = (0, projectUtils_1.needProjectId)(options);
     const appId = options.app;
     if (options.nonInteractive && !siteId) {
-        throw new error_1.FirebaseError(`${(0, colorette_1.bold)(siteId)} is required in a non-interactive environment`);
+        throw new error_1.FirebaseError(`${(0, colorette_1.bold)("siteId")} is required in a non-interactive environment`);
     }
-    const site = await (0, interactive_1.interactiveCreateHostingSite)(siteId, appId, options);
-    siteId = (0, utils_1.last)(site.name.split("/"));
+    siteId = await (0, interactive_1.pickHostingSiteName)(siteId !== null && siteId !== void 0 ? siteId : "", options);
+    const site = await (0, api_1.createSite)(projectId, siteId, appId);
     logger_1.logger.info();
     (0, utils_1.logLabeledSuccess)(LOG_TAG, `Site ${(0, colorette_1.bold)(siteId)} has been created in project ${(0, colorette_1.bold)(projectId)}.`);
     if (appId) {

package/lib/commands/index.js

@@ -110,6 +110,7 @@ function load(client) {
     client.firestore.databases.update = loadCommand("firestore-databases-update");
     client.firestore.databases.delete = loadCommand("firestore-databases-delete");
     client.firestore.databases.restore = loadCommand("firestore-databases-restore");
+    client.firestore.databases.clone = loadCommand("firestore-databases-clone");
     client.firestore.backups = {};
     client.firestore.backups.schedules = {};
     client.firestore.backups.list = loadCommand("firestore-backups-list");

package/lib/commands/init.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initAction = exports.command = void 0;
+exports.postInitSaves = exports.initAction = exports.command = void 0;
 const clc = require("colorette");
 const os = require("os");
 const path = require("path");
@@ -217,6 +217,16 @@ async function initAction(feature, options) {
         setup.features = setup.features.filter((f) => f !== "dataconnect:sdk");
     }
     await (0, init_1.init)(setup, config, options);
+    await postInitSaves(setup, config);
+    if (setup.instructions.length) {
+        logger_1.logger.info(`\n${clc.bold("To get started:")}\n`);
+        for (const i of setup.instructions) {
+            (0, utils_1.logBullet)(i + "\n");
+        }
+    }
+}
+exports.initAction = initAction;
+async function postInitSaves(setup, config) {
     logger_1.logger.info();
     config.writeProjectFile("firebase.json", setup.config);
     config.writeProjectFile(".firebaserc", setup.rcfile);
@@ -225,11 +235,5 @@ async function initAction(feature, options) {
     }
     logger_1.logger.info();
     utils.logSuccess("Firebase initialization complete!");
-    if (setup.instructions.length) {
-        logger_1.logger.info(`\n${clc.bold("To get started:")}\n`);
-        for (const i of setup.instructions) {
-            (0, utils_1.logBullet)(i + "\n");
-        }
-    }
 }
-exports.initAction = initAction;
+exports.postInitSaves = postInitSaves;

package/lib/commands/internaltesting-functions-discover.js

@@ -10,7 +10,6 @@ const projectUtils_1 = require("../projectUtils");
 const error_1 = require("../error");
 const ensureApiEnabled = require("../ensureApiEnabled");
 const api_1 = require("../api");
-const experiments = require("../experiments");
 const prepareFunctionsUpload_1 = require("../deploy/functions/prepareFunctionsUpload");
 exports.command = new command_1.Command("internaltesting:functions:discover")
     .description("discover function triggers defined in the current project directory")
@@ -22,8 +21,7 @@ exports.command = new command_1.Command("internaltesting:functions:discover")
         throw new error_1.FirebaseError("Admin SDK config unexpectedly undefined - have you run firebase init?");
     }
     let runtimeConfig = { firebase: firebaseConfig };
-    const allowFunctionsConfig = experiments.isEnabled("dangerouslyAllowFunctionsConfig");
-    if (allowFunctionsConfig) {
+    if (fnConfig.some(projectConfig_1.shouldUseRuntimeConfig)) {
         try {
             const runtimeConfigApiEnabled = await ensureApiEnabled.check(projectId, (0, api_1.runtimeconfigOrigin)(), "runtimeconfig", true);
             if (runtimeConfigApiEnabled) {

package/lib/dataconnect/provisionCloudSql.js

@@ -22,7 +22,7 @@ async function setupCloudSql(args) {
     }
     finally {
         if (!dryRun) {
-            await (0, track_1.trackGA4)("dataconnect_cloud_sql", {
+            void (0, track_1.trackGA4)("dataconnect_cloud_sql", {
                 source: args.source,
                 action: success ? stats.action : `${stats.action}_error`,
                 location: args.location,
@@ -44,7 +44,8 @@ async function upsertInstance(stats, args) {
         const existingInstance = await cloudSqlAdminClient.getInstance(projectId, instanceId);
         utils.logLabeledBullet("dataconnect", `Found existing Cloud SQL instance ${clc.bold(instanceId)}.`);
         stats.databaseVersion = existingInstance.databaseVersion;
-        stats.dataconnectLabel = (_b = (_a = existingInstance.settings) === null || _a === void 0 ? void 0 : _a.userLabels) === null || _b === void 0 ? void 0 : _b["firebase-data-connect"];
+        stats.dataconnectLabel =
+            ((_b = (_a = existingInstance.settings) === null || _a === void 0 ? void 0 : _a.userLabels) === null || _b === void 0 ? void 0 : _b["firebase-data-connect"]) || "absent";
         const why = getUpdateReason(existingInstance, requireGoogleMlIntegration);
         if (why) {
             if (dryRun) {

package/lib/deploy/extensions/prepare.js

@@ -18,6 +18,7 @@ const v2FunctionHelper_1 = require("./v2FunctionHelper");
 const tos_1 = require("../../extensions/tos");
 const common_1 = require("../../extensions/runtimes/common");
 const functionsDeployHelper_1 = require("../functions/functionsDeployHelper");
+const projectConfig_1 = require("../../functions/projectConfig");
 const matchesInstanceId = (dep) => (test) => {
     return dep.instanceId === test.instanceId;
 };
@@ -117,7 +118,8 @@ async function prepareHelper(context, options, payload, wantExtensions, haveExte
     }
 }
 async function prepareDynamicExtensions(context, options, payload, builds) {
-    const filters = (0, functionsDeployHelper_1.getEndpointFilters)(options);
+    const functionsConfig = (0, projectConfig_1.normalizeAndValidate)(options.config.src.functions);
+    const filters = (0, functionsDeployHelper_1.getEndpointFilters)(options, functionsConfig);
     const extensions = (0, common_1.extractExtensionsFromBuilds)(builds, filters);
     const projectId = (0, projectUtils_1.needProjectId)(options);
     const projectNumber = await (0, projectUtils_1.needProjectNumber)(options);

package/lib/deploy/functions/checkIam.js

@@ -44,7 +44,7 @@ async function checkHttpIam(context, options, payload) {
     if (!payload.functions) {
         return;
     }
-    const filters = context.filters || (0, functionsDeployHelper_1.getEndpointFilters)(options);
+    const filters = context.filters || (0, functionsDeployHelper_1.getEndpointFilters)(options, context.config);
     const wantBackends = Object.values(payload.functions).map(({ wantBackend }) => wantBackend);
     const httpEndpoints = [...(0, functional_1.flattenArray)(wantBackends.map((b) => backend.allEndpoints(b)))]
         .filter(backend.isHttpsTriggered)

package/lib/deploy/functions/functionsDeployHelper.js

@@ -32,13 +32,14 @@ function endpointMatchesFilter(endpoint, filter) {
     return true;
 }
 exports.endpointMatchesFilter = endpointMatchesFilter;
-function parseFunctionSelector(selector) {
+function parseFunctionSelector(selector, config) {
     const fragments = selector.split(":");
     if (fragments.length < 2) {
-        return [
-            { codebase: fragments[0] },
-            { codebase: projectConfig_1.DEFAULT_CODEBASE, idChunks: fragments[0].split(/[-.]/) },
-        ];
+        const codebaseNames = config.map((c) => c.codebase);
+        if (codebaseNames.includes(fragments[0])) {
+            return [{ codebase: fragments[0] }];
+        }
+        return [{ codebase: projectConfig_1.DEFAULT_CODEBASE, idChunks: fragments[0].split(/[-.]/) }];
     }
     return [
         {
@@ -48,7 +49,7 @@ function parseFunctionSelector(selector) {
     ];
 }
 exports.parseFunctionSelector = parseFunctionSelector;
-function getEndpointFilters(options) {
+function getEndpointFilters(options, config) {
     if (!options.only) {
         return undefined;
     }
@@ -58,7 +59,7 @@ function getEndpointFilters(options) {
         if (selector.startsWith("functions:")) {
             selector = selector.replace("functions:", "");
             if (selector.length > 0) {
-                filters.push(...parseFunctionSelector(selector));
+                filters.push(...parseFunctionSelector(selector, config));
             }
         }
     }

package/lib/deploy/functions/params.js

@@ -4,6 +4,7 @@ exports.resolveParams = exports.ParamValue = exports.isMultiSelectInput = export
 const logger_1 = require("../../logger");
 const error_1 = require("../../error");
 const prompt_1 = require("../../prompt");
+const secrets_1 = require("../../functions/secrets");
 const functional_1 = require("../../functional");
 const secretManager = require("../../gcp/secretManager");
 const storage_1 = require("../../gcp/storage");
@@ -169,11 +170,11 @@ async function resolveParams(params, firebaseConfig, userEnvs, nonInteractive, i
     const [needSecret, needPrompt] = (0, functional_1.partition)(outstanding, (param) => param.type === "secret");
     if (!isEmulator) {
         for (const param of needSecret) {
-            await handleSecret(param, firebaseConfig.projectId);
+            await handleSecret(param, firebaseConfig.projectId, nonInteractive);
         }
     }
     if (nonInteractive && needPrompt.length > 0) {
-        const envNames = outstanding.map((p) => p.name).join(", ");
+        const envNames = needPrompt.map((p) => p.name).join(", ");
         throw new error_1.FirebaseError(`In non-interactive mode but have no value for the following environment variables: ${envNames}\n` +
             "To continue, either run `firebase deploy` with an interactive terminal, or add values to a dotenv file. " +
             "For information regarding how to use dotenv files, see https://firebase.google.com/docs/functions/config-env");
@@ -220,15 +221,24 @@ function populateDefaultParams(config) {
     }
     return defaultParams;
 }
-async function handleSecret(secretParam, projectId) {
+async function handleSecret(secretParam, projectId, nonInteractive) {
     const metadata = await secretManager.getSecretMetadata(projectId, secretParam.name, "latest");
     if (!metadata.secret) {
+        if (nonInteractive) {
+            throw new error_1.FirebaseError(`In non-interactive mode but have no value for the secret: ${secretParam.name}\n\n` +
+                "Set this secret before deploying:\n" +
+                `\tfirebase functions:secrets:set ${secretParam.name}${secretParam.format === "json" ? " --format=json --data-file <file.json>" : ""}`);
+        }
+        const promptMessage = `This secret will be stored in Cloud Secret Manager (https://cloud.google.com/secret-manager/pricing) as ${secretParam.name}. Enter ${secretParam.format === "json" ? "a JSON value" : "a value"} for ${secretParam.label || secretParam.name}:`;
         const secretValue = await (0, prompt_1.password)({
-            message: `This secret will be stored in Cloud Secret Manager (https://cloud.google.com/secret-manager/pricing) as ${secretParam.name}. Enter a value for ${secretParam.label || secretParam.name}:`,
+            message: promptMessage,
         });
+        if (secretParam.format === "json") {
+            (0, secrets_1.validateJsonSecret)(secretParam.name, secretValue);
+        }
         await secretManager.createSecret(projectId, secretParam.name, (0, secretManager_1.labels)());
         await secretManager.addVersion(projectId, secretParam.name, secretValue);
-        return secretValue;
+        return;
     }
     else if (!metadata.secretVersion) {
         throw new error_1.FirebaseError(`Cloud Secret Manager has no latest version of the secret defined by param ${secretParam.label || secretParam.name}`);

package/lib/deploy/functions/prepare.js

@@ -12,7 +12,6 @@ const runtimes = require("./runtimes");
 const supported = require("./runtimes/supported");
 const validate = require("./validate");
 const ensure = require("./ensure");
-const experiments = require("../../experiments");
 const api_1 = require("../../api");
 const functionsDeployHelper_1 = require("./functionsDeployHelper");
 const utils_1 = require("../../utils");
@@ -37,7 +36,7 @@ async function prepare(context, options, payload) {
     const projectId = (0, projectUtils_1.needProjectId)(options);
     const projectNumber = await (0, projectUtils_1.needProjectNumber)(options);
     context.config = (0, projectConfig_1.normalizeAndValidate)(options.config.src.functions);
-    context.filters = (0, functionsDeployHelper_1.getEndpointFilters)(options);
+    context.filters = (0, functionsDeployHelper_1.getEndpointFilters)(options, context.config);
     const codebases = (0, functionsDeployHelper_1.targetCodebases)(context.config, context.filters);
     if (codebases.length === 0) {
         throw new error_1.FirebaseError("No function matches given --only filters. Aborting deployment.");
@@ -55,8 +54,8 @@ async function prepare(context, options, payload) {
     context.firebaseConfig = firebaseConfig;
     context.codebaseDeployEvents = {};
     let runtimeConfig = { firebase: firebaseConfig };
-    const allowFunctionsConfig = experiments.isEnabled("dangerouslyAllowFunctionsConfig");
-    if (allowFunctionsConfig && checkAPIsEnabled[1]) {
+    const targetedCodebaseConfigs = context.config.filter((cfg) => codebases.includes(cfg.codebase));
+    if (checkAPIsEnabled[1] && targetedCodebaseConfigs.some(projectConfig_1.shouldUseRuntimeConfig)) {
         runtimeConfig = Object.assign(Object.assign({}, runtimeConfig), (await (0, prepareFunctionsUpload_1.getFunctionsConfig)(projectId)));
     }
     context.hasRuntimeConfig = Object.keys(runtimeConfig).some((k) => k !== "firebase");
@@ -157,7 +156,8 @@ async function prepare(context, options, payload) {
             source.functionsSourceV2Hash = packagedSource === null || packagedSource === void 0 ? void 0 : packagedSource.hash;
         }
         if (backend.someEndpoint(wantBackend, (e) => e.platform === "gcfv1")) {
-            const packagedSource = await (0, prepareFunctionsUpload_1.prepareFunctionsUpload)(sourceDir, localCfg, runtimeConfig);
+            const configForUpload = (0, projectConfig_1.shouldUseRuntimeConfig)(localCfg) ? runtimeConfig : undefined;
+            const packagedSource = await (0, prepareFunctionsUpload_1.prepareFunctionsUpload)(sourceDir, localCfg, configForUpload);
             source.functionsSourceV1 = packagedSource === null || packagedSource === void 0 ? void 0 : packagedSource.pathToSource;
             source.functionsSourceV1Hash = packagedSource === null || packagedSource === void 0 ? void 0 : packagedSource.hash;
         }
@@ -314,7 +314,10 @@ async function loadCodebases(config, options, firebaseConfig, runtimeConfig, fil
         await runtimeDelegate.build();
         const firebaseEnvs = functionsEnv.loadFirebaseEnvs(firebaseConfig, projectId);
         (0, utils_1.logLabeledBullet)("functions", `Loading and analyzing source code for codebase ${codebase} to determine what to deploy`);
-        const discoveredBuild = await runtimeDelegate.discoverBuild(runtimeConfig, Object.assign(Object.assign({}, firebaseEnvs), { GOOGLE_CLOUD_QUOTA_PROJECT: projectId }));
+        const codebaseRuntimeConfig = (0, projectConfig_1.shouldUseRuntimeConfig)(codebaseConfig)
+            ? runtimeConfig
+            : { firebase: firebaseConfig };
+        const discoveredBuild = await runtimeDelegate.discoverBuild(codebaseRuntimeConfig, Object.assign(Object.assign({}, firebaseEnvs), { GOOGLE_CLOUD_QUOTA_PROJECT: projectId }));
         discoveredBuild.runtime = codebaseConfig.runtime;
         build.applyPrefix(discoveredBuild, codebaseConfig.prefix || "");
         wantBuilds[codebase] = discoveredBuild;

package/lib/detectProjectRoot.js

@@ -19,7 +19,7 @@ function detectProjectRoot(options) {
     while (!(0, fsutils_1.fileExistsSync)((0, path_1.resolve)(projectRootDir, "./firebase.json"))) {
         const parentDir = (0, path_1.dirname)(projectRootDir);
         if (parentDir === projectRootDir) {
-            return null;
+            return undefined;
         }
         projectRootDir = parentDir;
     }