firebase-tools 14.1.0 → 14.2.1

package/lib/commands/apphosting-backends-create.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
 const command_1 = require("../command");
 const projectUtils_1 = require("../projectUtils");
+const requireAuth_1 = require("../requireAuth");
 const requireInteractive_1 = require("../requireInteractive");
 const backend_1 = require("../apphosting/backend");
 const apphosting_1 = require("../gcp/apphosting");
@@ -12,6 +13,7 @@ exports.command = new command_1.Command("apphosting:backends:create")
     .description("create a Firebase App Hosting backend")
     .option("-a, --app <webAppId>", "specify an existing Firebase web app's ID to associate your App Hosting backend with")
     .option("-s, --service-account <serviceAccount>", "specify the service account used to run the server", "")
+    .before(requireAuth_1.requireAuth)
     .before(apphosting_1.ensureApiEnabled)
     .before(requireInteractive_1.default)
     .before((0, requireTosAcceptance_1.requireTosAcceptance)(firedata_1.APPHOSTING_TOS_ID))

package/lib/commands/apphosting-backends-delete.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
 const command_1 = require("../command");
 const projectUtils_1 = require("../projectUtils");
+const requireAuth_1 = require("../requireAuth");
 const error_1 = require("../error");
 const prompt_1 = require("../prompt");
 const utils = require("../utils");
@@ -13,6 +14,7 @@ const ora = require("ora");
 exports.command = new command_1.Command("apphosting:backends:delete <backend>")
     .description("delete a Firebase App Hosting backend")
     .withForce()
+    .before(requireAuth_1.requireAuth)
     .before(apphosting.ensureApiEnabled)
     .action(async (backendId, options) => {
     const projectId = (0, projectUtils_1.needProjectId)(options);

package/lib/commands/apphosting-backends-get.js

@@ -3,12 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
 const command_1 = require("../command");
 const projectUtils_1 = require("../projectUtils");
+const requireAuth_1 = require("../requireAuth");
 const error_1 = require("../error");
 const utils_1 = require("../utils");
 const apphosting = require("../gcp/apphosting");
 const apphosting_backends_list_1 = require("./apphosting-backends-list");
 exports.command = new command_1.Command("apphosting:backends:get <backend>")
     .description("print info about a Firebase App Hosting backend")
+    .before(requireAuth_1.requireAuth)
     .before(apphosting.ensureApiEnabled)
     .action(async (backend, options) => {
     const projectId = (0, projectUtils_1.needProjectId)(options);

package/lib/commands/apphosting-backends-list.js

@@ -6,11 +6,13 @@ const utils_1 = require("../utils");
 const error_1 = require("../error");
 const logger_1 = require("../logger");
 const projectUtils_1 = require("../projectUtils");
+const requireAuth_1 = require("../requireAuth");
 const apphosting = require("../gcp/apphosting");
 const Table = require("cli-table3");
 const TABLE_HEAD = ["Backend", "Repository", "URL", "Primary Region", "Updated Date"];
 exports.command = new command_1.Command("apphosting:backends:list")
     .description("list Firebase App Hosting backends")
+    .before(requireAuth_1.requireAuth)
     .before(apphosting.ensureApiEnabled)
     .action(async (options) => {
     var _a;

package/lib/commands/apphosting-builds-create.js

@@ -5,12 +5,14 @@ const apphosting = require("../gcp/apphosting");
 const logger_1 = require("../logger");
 const command_1 = require("../command");
 const projectUtils_1 = require("../projectUtils");
+const requireAuth_1 = require("../requireAuth");
 const utils_1 = require("../utils");
 exports.command = new command_1.Command("apphosting:builds:create <backendId>")
     .description("create a build for an App Hosting backend")
     .option("-l, --location <location>", "specify the region of the backend")
     .option("-i, --id <buildId>", "id of the build (defaults to autogenerating a random id)", "")
     .option("-b, --branch <branch>", "repository branch to deploy (defaults to 'main')", "main")
+    .before(requireAuth_1.requireAuth)
     .before(apphosting.ensureApiEnabled)
     .action(async (backendId, options) => {
     var _a, _b;

package/lib/commands/apphosting-builds-get.js

@@ -5,10 +5,12 @@ const apphosting = require("../gcp/apphosting");
 const logger_1 = require("../logger");
 const command_1 = require("../command");
 const projectUtils_1 = require("../projectUtils");
+const requireAuth_1 = require("../requireAuth");
 const utils_1 = require("../utils");
 exports.command = new command_1.Command("apphosting:builds:get <backendId> <buildId>")
     .description("get a build for an App Hosting backend")
     .option("-l, --location <location>", "specify the region of the backend")
+    .before(requireAuth_1.requireAuth)
     .before(apphosting.ensureApiEnabled)
     .action(async (backendId, buildId, options) => {
     var _a;

package/lib/commands/apphosting-rollouts-create.js

@@ -4,6 +4,7 @@ exports.command = void 0;
 const apphosting = require("../gcp/apphosting");
 const command_1 = require("../command");
 const projectUtils_1 = require("../projectUtils");
+const requireAuth_1 = require("../requireAuth");
 const error_1 = require("../error");
 const rollout_1 = require("../apphosting/rollout");
 exports.command = new command_1.Command("apphosting:rollouts:create <backendId>")
@@ -11,6 +12,7 @@ exports.command = new command_1.Command("apphosting:rollouts:create <backendId>"
     .option("-b, --git-branch <gitBranch>", "repository branch to deploy (mutually exclusive with -g)")
     .option("-g, --git-commit <gitCommit>", "git commit to deploy (mutually exclusive with -b)")
     .withForce("Skip confirmation before creating rollout")
+    .before(requireAuth_1.requireAuth)
     .before(apphosting.ensureApiEnabled)
     .action(async (backendId, options) => {
     const projectId = (0, projectUtils_1.needProjectId)(options);

package/lib/commands/apphosting-rollouts-list.js

@@ -5,10 +5,12 @@ const apphosting = require("../gcp/apphosting");
 const logger_1 = require("../logger");
 const command_1 = require("../command");
 const projectUtils_1 = require("../projectUtils");
+const requireAuth_1 = require("../requireAuth");
 const utils_1 = require("../utils");
 exports.command = new command_1.Command("apphosting:rollouts:list <backendId>")
     .description("list rollouts of an App Hosting backend")
     .option("-l, --location <location>", "region of the rollouts (defaults to listing rollouts from all regions)")
+    .before(requireAuth_1.requireAuth)
     .before(apphosting.ensureApiEnabled)
     .action(async (backendId, options) => {
     var _a;

package/lib/dataconnect/build.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleBuildErrors = exports.build = void 0;
 const dataconnectEmulator_1 = require("../emulator/dataconnectEmulator");
 const error_1 = require("../error");
-const experiments = require("../experiments");
 const prompt_1 = require("../prompt");
 const utils = require("../utils");
 const graphqlError_1 = require("./graphqlError");
@@ -12,14 +11,7 @@ async function build(options, configDir, dryRun) {
     var _a, _b;
     const account = (0, auth_1.getProjectDefaultAccount)(options.projectRoot);
     const args = { configDir, account };
-    if (experiments.isEnabled("fdcconnectorevolution") && options.projectId) {
-        const flags = process.env["DATA_CONNECT_PREVIEW"];
-        if (flags) {
-            process.env["DATA_CONNECT_PREVIEW"] = flags + ",conn_evolution";
-        }
-        else {
-            process.env["DATA_CONNECT_PREVIEW"] = "conn_evolution";
-        }
+    if (options.projectId) {
         args.projectId = options.projectId;
     }
     const buildResult = await dataconnectEmulator_1.DataConnectEmulator.build(args);

package/lib/dataconnect/freeTrial.js

@@ -1,16 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.upgradeInstructions = exports.printFreeTrialUnavailable = exports.isFreeTrialError = exports.getFreeTrialInstanceId = exports.checkFreeTrialInstanceUsed = exports.freeTrialTermsLink = void 0;
+const clc = require("colorette");
 const cloudmonitoring_1 = require("../gcp/cloudmonitoring");
 const cloudsqladmin_1 = require("../gcp/cloudsql/cloudsqladmin");
 const utils = require("../utils");
-const clc = require("colorette");
 function freeTrialTermsLink() {
     return "https://firebase.google.com/pricing";
 }
 exports.freeTrialTermsLink = freeTrialTermsLink;
 const FREE_TRIAL_METRIC = "sqladmin.googleapis.com/fdc_lifetime_free_trial_per_project";
 async function checkFreeTrialInstanceUsed(projectId) {
+    utils.logLabeledBullet("dataconnect", "Checking Cloud SQL no cost trial eligibility...");
     const past7d = new Date();
     past7d.setDate(past7d.getDate() - 7);
     const query = {
@@ -20,12 +21,17 @@ async function checkFreeTrialInstanceUsed(projectId) {
     };
     try {
         const ts = await (0, cloudmonitoring_1.queryTimeSeries)(query, projectId);
+        let used = true;
         if (ts.length) {
-            return ts[0].points.some((p) => p.value.int64Value);
+            used = ts[0].points.some((p) => p.value.int64Value);
+        }
+        if (used) {
+            utils.logLabeledWarning("dataconnect", "CloudSQL no cost trial has already been used on this project.");
         }
-        return true;
+        return used;
     }
     catch (err) {
+        utils.logLabeledSuccess("dataconnect", "CloudSQL no cost trial available!");
         return false;
     }
 }

package/lib/dataconnect/provisionCloudSql.js

@@ -8,10 +8,9 @@ const utils_1 = require("../utils");
 const logger_1 = require("../logger");
 const GOOGLE_ML_INTEGRATION_ROLE = "roles/aiplatform.user";
 const freeTrial_1 = require("./freeTrial");
-const error_1 = require("../error");
 async function provisionCloudSql(args) {
     let connectionName = "";
-    const { projectId, locationId, instanceId, databaseId, configYamlPath, enableGoogleMlIntegration, waitForCreation, silent, dryRun, } = args;
+    const { projectId, location, instanceId, databaseId, enableGoogleMlIntegration, waitForCreation, silent, dryRun, } = args;
     try {
         const existingInstance = await cloudSqlAdminClient.getInstance(projectId, instanceId);
         silent || utils.logLabeledBullet("dataconnect", `Found existing instance ${instanceId}.`);
@@ -35,31 +34,31 @@ async function provisionCloudSql(args) {
         }
         cmekWarning();
         const cta = dryRun ? "It will be created on your next deploy" : "Creating it now.";
+        const freeTrialUsed = await (0, freeTrial_1.checkFreeTrialInstanceUsed)(projectId);
         silent ||
-            utils.logLabeledBullet("dataconnect", `CloudSQL instance '${instanceId}' not found.` +
-                cta +
-                `\nThis instance is provided under the terms of the Data Connect no-cost trial ${(0, freeTrial_1.freeTrialTermsLink)()}` +
-                `\nMonitor the progress at ${cloudSqlAdminClient.instanceConsoleLink(projectId, instanceId)}`);
+            utils.logLabeledBullet("dataconnect", `CloudSQL instance '${instanceId}' not found.` + cta + freeTrialUsed
+                ? ""
+                : `\nThis instance is provided under the terms of the Data Connect no-cost trial ${(0, freeTrial_1.freeTrialTermsLink)()}` +
+                    dryRun
+                    ? `\nMonitor the progress at ${cloudSqlAdminClient.instanceConsoleLink(projectId, instanceId)}`
+                    : "");
         if (!dryRun) {
-            try {
-                const newInstance = await (0, utils_1.promiseWithSpinner)(() => cloudSqlAdminClient.createInstance(projectId, locationId, instanceId, enableGoogleMlIntegration, waitForCreation), "Creating your instance...");
-                if (newInstance) {
-                    silent || utils.logLabeledBullet("dataconnect", "Instance created");
-                    connectionName = (newInstance === null || newInstance === void 0 ? void 0 : newInstance.connectionName) || "";
-                }
-                else {
-                    silent ||
-                        utils.logLabeledBullet("dataconnect", "Cloud SQL instance creation started - it should be ready shortly. Database and users will be created on your next deploy.");
-                    return connectionName;
-                }
+            const newInstance = await (0, utils_1.promiseWithSpinner)(() => cloudSqlAdminClient.createInstance({
+                projectId,
+                location,
+                instanceId,
+                enableGoogleMlIntegration,
+                waitForCreation,
+                freeTrial: !freeTrialUsed,
+            }), "Creating your instance...");
+            if (newInstance) {
+                silent || utils.logLabeledBullet("dataconnect", "Instance created");
+                connectionName = (newInstance === null || newInstance === void 0 ? void 0 : newInstance.connectionName) || "";
             }
-            catch (err) {
-                if (await (0, freeTrial_1.isFreeTrialError)(err, projectId)) {
-                    const freeTrialInstanceId = await (0, freeTrial_1.getFreeTrialInstanceId)(projectId);
-                    (0, freeTrial_1.printFreeTrialUnavailable)(projectId, configYamlPath, freeTrialInstanceId);
-                    throw new error_1.FirebaseError("No-cost Cloud SQL trial has already been used on this project.");
-                }
-                throw err;
+            else {
+                silent ||
+                    utils.logLabeledBullet("dataconnect", "Cloud SQL instance creation started - it should be ready shortly. Database and users will be created on your next deploy.");
+                return connectionName;
             }
         }
     }
@@ -114,7 +113,7 @@ function getUpdateReason(instance, requireGoogleMlIntegration) {
 }
 exports.getUpdateReason = getUpdateReason;
 function cmekWarning() {
-    const message = "The no-cost Cloud SQL trial instance does not support customer managed encryption keys.\n" +
+    const message = "Cloud SQL instances created via the Firebase CLI do not support customer managed encryption keys.\n" +
         "If you'd like to use a CMEK to encrypt your data, first create a CMEK encrypted instance (https://cloud.google.com/sql/docs/postgres/configure-cmek#createcmekinstance).\n" +
         "Then, edit your `dataconnect.yaml` file to use the encrypted instance and redeploy.";
     utils.logLabeledWarning("dataconnect", message);

package/lib/deploy/dataconnect/deploy.js

@@ -8,7 +8,6 @@ const provisionCloudSql_1 = require("../../dataconnect/provisionCloudSql");
 const names_1 = require("../../dataconnect/names");
 const api_1 = require("../../api");
 const ensureApiEnabled = require("../../ensureApiEnabled");
-const node_path_1 = require("node:path");
 const prompt_1 = require("../../prompt");
 async function default_1(context, options) {
     const projectId = (0, projectUtils_1.needProjectId)(options);
@@ -64,10 +63,9 @@ async function default_1(context, options) {
             const enableGoogleMlIntegration = (0, types_1.requiresVector)(s.deploymentMetadata);
             return (0, provisionCloudSql_1.provisionCloudSql)({
                 projectId,
-                locationId: (0, names_1.parseServiceName)(s.serviceName).location,
+                location: (0, names_1.parseServiceName)(s.serviceName).location,
                 instanceId,
                 databaseId,
-                configYamlPath: (0, node_path_1.join)(s.sourceDirectory, "dataconnect.yaml"),
                 enableGoogleMlIntegration,
                 waitForCreation: true,
             });

package/lib/deploy/dataconnect/prepare.js

@@ -17,7 +17,6 @@ const names_1 = require("../../dataconnect/names");
 const error_1 = require("../../error");
 const types_1 = require("../../dataconnect/types");
 const schemaMigration_1 = require("../../dataconnect/schemaMigration");
-const node_path_1 = require("node:path");
 const freeTrial_1 = require("../../dataconnect/freeTrial");
 async function default_1(context, options) {
     var _a;
@@ -73,10 +72,9 @@ async function default_1(context, options) {
                 const enableGoogleMlIntegration = (0, types_1.requiresVector)(s.deploymentMetadata);
                 return (0, provisionCloudSql_1.provisionCloudSql)({
                     projectId,
-                    locationId: (0, names_1.parseServiceName)(s.serviceName).location,
+                    location: (0, names_1.parseServiceName)(s.serviceName).location,
                     instanceId,
                     databaseId,
-                    configYamlPath: (0, node_path_1.join)(s.sourceDirectory, "dataconnect.yaml"),
                     enableGoogleMlIntegration,
                     waitForCreation: true,
                     dryRun: options.dryRun,

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

@@ -123,8 +123,8 @@ async function setupArtifactCleanupPolicies(options, projectId, locations) {
             `${locationsWithErrors.join(", ")}.` +
             "This could result in a small monthly bill as container images accumulate over time.");
         throw new error_1.FirebaseError(`Functions successfully deployed but could not set up cleanup policy in ` +
-            `${locationsWithErrors.length > 1 ? "regions" : "region"} ${locationsWithErrors.join(", ")}.` +
-            `Pass the --force option to automatically set up a cleanup policy or` +
+            `${locationsWithErrors.length > 1 ? "regions" : "region"} ${locationsWithErrors.join(", ")}. ` +
+            `Pass the --force option to automatically set up a cleanup policy or ` +
             "run 'firebase functions:artifacts:setpolicy' to set up a cleanup policy to automatically delete old images.");
     }
 }

package/lib/emulator/downloadableEmulators.js

@@ -48,20 +48,20 @@ const EMULATOR_UPDATE_DETAILS = {
     },
     dataconnect: process.platform === "darwin"
         ? {
-            version: "2.1.0",
-            expectedSize: 26440448,
-            expectedChecksum: "92f70b6815e1f9e46facc241728b7255",
+            version: "2.3.1",
+            expectedSize: 27271936,
+            expectedChecksum: "5ffcfe584c5af818477a00eb6450dd66",
         }
         : process.platform === "win32"
             ? {
-                version: "2.1.0",
-                expectedSize: 26884096,
-                expectedChecksum: "14964736145cc67764574a01e193b997",
+                version: "2.3.1",
+                expectedSize: 27729408,
+                expectedChecksum: "b71f1686724e8e051810b3a2e14c6d08",
             }
             : {
-                version: "2.1.0",
-                expectedSize: 26357912,
-                expectedChecksum: "0afb18767e56be16331be2b2b6d09ea1",
+                version: "2.3.1",
+                expectedSize: 27185304,
+                expectedChecksum: "54c40731f4563073404591ef1ffcdc20",
             },
 };
 exports.DownloadDetails = {

package/lib/emulator/env.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCredentialsEnvironment = exports.setEnvVarsForEmulators = void 0;
+exports.maybeUsePortForwarding = exports.getCredentialsEnvironment = exports.setEnvVarsForEmulators = void 0;
 const constants_1 = require("./constants");
 const types_1 = require("./types");
 const functionsEmulatorShared_1 = require("./functionsEmulatorShared");
 const defaultCredentials_1 = require("../defaultCredentials");
 function setEnvVarsForEmulators(env, emulators) {
+    maybeUsePortForwarding(emulators);
     for (const emu of emulators) {
         const host = (0, functionsEmulatorShared_1.formatHost)(emu);
         switch (emu.name) {
@@ -59,3 +60,29 @@ async function getCredentialsEnvironment(account, logger, logLabel, silent = fal
     return credentialEnv;
 }
 exports.getCredentialsEnvironment = getCredentialsEnvironment;
+function maybeUsePortForwarding(emulatorInfos) {
+    var _a;
+    const portForwardingHost = process.env.WEB_HOST;
+    if (portForwardingHost) {
+        for (const info of emulatorInfos) {
+            if (info.host.includes(portForwardingHost)) {
+                continue;
+            }
+            const url = `${info.port}-${portForwardingHost}`;
+            info.host = url;
+            info.listen = (_a = info.listen) === null || _a === void 0 ? void 0 : _a.map((l) => {
+                l.address = url;
+                l.port = 443;
+                return l;
+            });
+            info.port = 443;
+            const fsInfo = info;
+            if (fsInfo.webSocketPort) {
+                fsInfo.webSocketHost = `${fsInfo.webSocketPort}-${portForwardingHost}`;
+                fsInfo.webSocketPort = 443;
+            }
+        }
+    }
+    return emulatorInfos;
+}
+exports.maybeUsePortForwarding = maybeUsePortForwarding;

package/lib/emulator/extensionsEmulator.js

@@ -20,6 +20,7 @@ const validation_1 = require("./extensions/validation");
 const registry_1 = require("./registry");
 const types_1 = require("./types");
 const common_1 = require("../extensions/runtimes/common");
+const paramHelper_1 = require("../extensions/paramHelper");
 class ExtensionsEmulator {
     constructor(args) {
         this.want = [];
@@ -170,7 +171,8 @@ class ExtensionsEmulator {
     async toEmulatableBackend(instance) {
         const extensionDir = await this.ensureSourceCode(instance);
         const functionsDir = path.join(extensionDir, "functions");
-        const env = Object.assign(this.autoPopulatedParams(instance), instance.params);
+        const params = (0, paramHelper_1.populateDefaultParams)(instance.params, await planner.getExtensionSpec(instance));
+        const env = Object.assign(this.autoPopulatedParams(instance), params);
         const { extensionTriggers, runtime, nonSecretEnv, secretEnvVariables } = await (0, optionsHelper_1.getExtensionFunctionInfo)(instance, env);
         const emulatableBackend = {
             functionsDir,

package/lib/emulator/functionsEmulator.js

@@ -912,6 +912,7 @@ class FunctionsEmulator {
         if (this.args.remoteEmulators) {
             emulatorInfos = emulatorInfos.concat(Object.values(this.args.remoteEmulators));
         }
+        (0, env_1.maybeUsePortForwarding)(emulatorInfos);
         (0, env_1.setEnvVarsForEmulators)(envs, emulatorInfos);
         if (this.debugMode) {
             envs["FUNCTION_DEBUG_MODE"] = "true";
@@ -1082,10 +1083,9 @@ class FunctionsEmulator {
         return;
     }
     getEmulatorInfo(emulator) {
-        if (this.args.remoteEmulators) {
-            if (this.args.remoteEmulators[emulator]) {
-                return this.args.remoteEmulators[emulator];
-            }
+        var _a;
+        if ((_a = this.args.remoteEmulators) === null || _a === void 0 ? void 0 : _a[emulator]) {
+            return this.args.remoteEmulators[emulator];
         }
         return registry_1.EmulatorRegistry.getInfo(emulator);
     }

package/lib/emulator/ui.js

@@ -12,6 +12,7 @@ const constants_1 = require("./constants");
 const track_1 = require("../track");
 const ExpressBasedEmulator_1 = require("./ExpressBasedEmulator");
 const experiments_1 = require("../experiments");
+const env_1 = require("./env");
 class EmulatorUI extends ExpressBasedEmulator_1.ExpressBasedEmulator {
     constructor(args) {
         super({
@@ -35,13 +36,9 @@ class EmulatorUI extends ExpressBasedEmulator_1.ExpressBasedEmulator {
         const downloadDetails = downloadableEmulators.getDownloadDetails(types_1.Emulators.UI);
         const webDir = path.join(downloadDetails.unzipDir, "client");
         app.get("/api/config", this.jsonHandler(() => {
-            const json = Object.assign({ projectId, experiments: [] }, hub.getRunningEmulatorsMapping());
-            if (emulatorGaSession) {
-                json.analytics = emulatorGaSession;
-            }
-            if (enabledExperiments) {
-                json.experiments = enabledExperiments;
-            }
+            const emulatorInfos = hub.getRunningEmulatorsMapping();
+            (0, env_1.maybeUsePortForwarding)(Object.values(emulatorInfos));
+            const json = Object.assign({ projectId, experiments: enabledExperiments !== null && enabledExperiments !== void 0 ? enabledExperiments : [], analytics: emulatorGaSession }, emulatorInfos);
             return Promise.resolve(json);
         }));
         app.use(express.static(webDir));

package/lib/experiments.js

@@ -100,12 +100,6 @@ exports.ALL_EXPERIMENTS = experiments({
         default: false,
         public: true,
     },
-    fdcconnectorevolution: {
-        shortDescription: "Enable Data Connect connector evolution warnings.",
-        fullDescription: "Enable Data Connect connector evolution warnings.",
-        default: true,
-        public: false,
-    },
 });
 function isValidExperiment(name) {
     return Object.keys(exports.ALL_EXPERIMENTS).includes(name);

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.setNewDefaults = exports.buildBindingOptionsWithBaseValue = exports.getBaseParamBindings = void 0;
+exports.populateDefaultParams = 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");
@@ -138,3 +138,12 @@ function isSystemParam(paramName) {
     return regex.test(paramName);
 }
 exports.isSystemParam = isSystemParam;
+function populateDefaultParams(params, spec) {
+    var _a;
+    const ret = Object.assign({}, params);
+    for (const p of spec.params) {
+        ret[p.param] = (_a = ret[p.param]) !== null && _a !== void 0 ? _a : p.default;
+    }
+    return ret;
+}
+exports.populateDefaultParams = populateDefaultParams;

package/lib/functions/artifacts.js

@@ -93,6 +93,7 @@ async function setCleanupPolicy(repository, daysToKeep) {
     const update = {
         name: repository.name,
         cleanupPolicies: Object.assign(Object.assign({}, repository.cleanupPolicies), generateCleanupPolicy(daysToKeep)),
+        cleanupPolicyDryRun: false,
         labels,
     };
     await exports.updateRepository(update);

package/lib/gcp/artifactregistry.js

@@ -28,7 +28,7 @@ async function getRepository(repoPath) {
 }
 exports.getRepository = getRepository;
 async function updateRepository(repo) {
-    const updateMask = proto.fieldMasks(repo, "cleanupPolicies", "labels");
+    const updateMask = proto.fieldMasks(repo, "cleanupPolicies", "cleanupPolicyDryRun", "labels");
     if (updateMask.length === 0) {
         const res = await client.get(repo.name);
         return res.body;

package/lib/gcp/cloudsql/cloudsqladmin.js

@@ -50,16 +50,16 @@ function instanceConsoleLink(projectId, instanceId) {
     return `https://console.cloud.google.com/sql/instances/${instanceId}/overview?project=${projectId}`;
 }
 exports.instanceConsoleLink = instanceConsoleLink;
-async function createInstance(projectId, location, instanceId, enableGoogleMlIntegration, waitForCreation) {
+async function createInstance(args) {
     const databaseFlags = [{ name: "cloudsql.iam_authentication", value: "on" }];
-    if (enableGoogleMlIntegration) {
+    if (args.enableGoogleMlIntegration) {
         databaseFlags.push({ name: "cloudsql.enable_google_ml_integration", value: "on" });
     }
     let op;
     try {
-        op = await client.post(`projects/${projectId}/instances`, {
-            name: instanceId,
-            region: location,
+        op = await client.post(`projects/${args.projectId}/instances`, {
+            name: args.instanceId,
+            region: args.location,
             databaseVersion: "POSTGRES_15",
             settings: {
                 tier: "db-f1-micro",
@@ -67,10 +67,10 @@ async function createInstance(projectId, location, instanceId, enableGoogleMlInt
                 ipConfiguration: {
                     authorizedNetworks: [],
                 },
-                enableGoogleMlIntegration,
+                enableGoogleMlIntegration: args.enableGoogleMlIntegration,
                 databaseFlags,
                 storageAutoResize: false,
-                userLabels: { "firebase-data-connect": "ft" },
+                userLabels: { "firebase-data-connect": args.freeTrial ? "ft" : "nt" },
                 insightsConfig: {
                     queryInsightsEnabled: true,
                     queryPlansPerMinute: 5,
@@ -80,13 +80,13 @@ async function createInstance(projectId, location, instanceId, enableGoogleMlInt
         });
     }
     catch (err) {
-        handleAllowlistError(err, location);
+        handleAllowlistError(err, args.location);
         throw err;
     }
-    if (!waitForCreation) {
+    if (!args.waitForCreation) {
         return;
     }
-    const opName = `projects/${projectId}/operations/${op.body.name}`;
+    const opName = `projects/${args.projectId}/operations/${op.body.name}`;
     const pollRes = await operationPoller.pollOperation({
         apiOrigin: (0, api_1.cloudSQLAdminOrigin)(),
         apiVersion: API_VERSION,

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

@@ -83,12 +83,12 @@ async function askQuestions(setup, isBillingEnabled) {
         info.cloudSqlInstanceId === "" ||
         info.locationId === "" ||
         info.cloudSqlDatabase === "";
-    const shouldConfigureBackend = isBillingEnabled && requiredConfigUnset
-        ? await (0, prompt_1.confirm)({
+    const shouldConfigureBackend = isBillingEnabled &&
+        requiredConfigUnset &&
+        (await (0, prompt_1.confirm)({
             message: `Would you like to configure your backend resources now?`,
             default: true,
-        })
-        : false;
+        }));
     if (shouldConfigureBackend) {
         info = await promptForService(info);
         info = await promptForCloudSQL(setup, info);
@@ -115,10 +115,9 @@ async function actuate(setup, config, info) {
     if (setup.projectId && info.shouldProvisionCSQL) {
         await (0, provisionCloudSql_1.provisionCloudSql)({
             projectId: setup.projectId,
-            locationId: info.locationId,
+            location: info.locationId,
             instanceId: info.cloudSqlInstanceId,
             databaseId: info.cloudSqlDatabase,
-            configYamlPath: (0, path_1.join)(config.get("dataconnect.source"), "dataconnect.yaml"),
             enableGoogleMlIntegration: false,
             waitForCreation: false,
         });
@@ -269,6 +268,9 @@ async function promptForCloudSQL(setup, info) {
             if (!(await (0, freeTrial_1.checkFreeTrialInstanceUsed)(setup.projectId))) {
                 choices.push({ name: "Create a new free trial instance", value: "", location: "" });
             }
+            else {
+                choices.push({ name: "Create a new CloudSQL instance", value: "", location: "" });
+            }
             info.cloudSqlInstanceId = await (0, prompt_1.promptOnce)({
                 message: `Which CloudSQL instance would you like to use?`,
                 type: "list",

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

@@ -15,32 +15,43 @@ const logger_1 = require("../../../logger");
 const error_1 = require("../../../error");
 const utils_1 = require("../../../utils");
 const UNKNOWN_VERSION_TOO_HIGH = "2.0.0";
+const MIN_VERSION = "0.6.0";
 const LATEST_TEMPLATE = "1.0.0";
-async function getGenkitVersion() {
-    let genkitVersion;
-    let templateVersion = LATEST_TEMPLATE;
-    let useInit = false;
-    let stopInstall = false;
-    if (process.env.GENKIT_DEV_VERSION && typeof process.env.GENKIT_DEV_VERSION === "string") {
-        semver.parse(process.env.GENKIT_DEV_VERSION);
-        genkitVersion = process.env.GENKIT_DEV_VERSION;
-    }
-    else {
-        try {
-            genkitVersion = await (0, spawn_1.spawnWithOutput)("npm", ["view", "genkit", "version"]);
+async function getPackageVersion(packageName, envVariable) {
+    const envVal = process.env[envVariable];
+    if (envVal && typeof envVal === "string") {
+        if (semver.parse(envVal)) {
+            return envVal;
         }
-        catch (err) {
-            throw new error_1.FirebaseError("Unable to determine which genkit version to install.\n" +
-                `npm Error: ${(0, error_1.getErrMsg)(err)}\n\n` +
-                "For a possible workaround run\n  npm view genkit version\n" +
-                "and then set an environment variable:\n" +
-                "  export GENKIT_DEV_VERSION=<output from previous command>\n" +
-                "and run `firebase init genkit` again");
+        else {
+            throw new error_1.FirebaseError(`Invalid version string '${envVal}' specified in ${envVariable}`);
+        }
+    }
+    try {
+        const output = await (0, spawn_1.spawnWithOutput)("npm", ["view", packageName, "version"]);
+        if (!output) {
+            throw new error_1.FirebaseError(`Unable to determine ${packageName} version to install`);
         }
+        return output;
     }
-    if (!genkitVersion) {
-        throw new error_1.FirebaseError("Unable to determine genkit version to install");
+    catch (err) {
+        throw new error_1.FirebaseError(`Unable to determine which version of ${packageName} to install.\n` +
+            `npm Error: ${(0, error_1.getErrMsg)(err)}\n\n` +
+            "For a possible workaround run\n  npm view " +
+            packageName +
+            " version\n" +
+            "and then set an environment variable:\n" +
+            `  export ${envVariable}=<output from previous command>\n` +
+            "and run `firebase init genkit` again");
     }
+}
+async function getGenkitInfo() {
+    let templateVersion = LATEST_TEMPLATE;
+    let stopInstall = false;
+    const genkitVersion = await getPackageVersion("genkit", "GENKIT_DEV_VERSION");
+    const cliVersion = await getPackageVersion("genkit-cli", "GENKIT_CLI_DEV_VERSION");
+    const vertexVersion = await getPackageVersion("@genkit-ai/vertexai", "GENKIT_VERTEX_VERSION");
+    const googleAiVersion = await getPackageVersion("@genkit-ai/googleai", "GENKIT_GOOGLEAI_VERSION");
     if (semver.gte(genkitVersion, UNKNOWN_VERSION_TOO_HIGH)) {
         const continueInstall = await (0, prompt_1.confirm)({
             message: clc.yellow(`WARNING: The latest version of Genkit (${genkitVersion}) isn't supported by this\n` +
@@ -56,24 +67,32 @@ async function getGenkitVersion() {
     else if (semver.gte(genkitVersion, "1.0.0-rc.1")) {
         templateVersion = "1.0.0";
     }
-    else if (semver.gte(genkitVersion, "0.6.0")) {
+    else if (semver.gte(genkitVersion, MIN_VERSION)) {
         templateVersion = "0.9.0";
     }
     else {
-        templateVersion = "";
-        useInit = true;
-    }
-    return { genkitVersion, templateVersion, useInit, stopInstall };
+        throw new error_1.FirebaseError(`The requested version of Genkit (${genkitVersion}) is no ` +
+            `longer supported. Please specify a newer version.`);
+    }
+    return {
+        genkitVersion,
+        cliVersion,
+        vertexVersion,
+        googleAiVersion,
+        templateVersion,
+        stopInstall,
+    };
 }
-function showStartMessage(config, command) {
+function showStartMessage(setup, command) {
+    logger_1.logger.info();
     logger_1.logger.info("\nLogin to Google Cloud using:");
-    logger_1.logger.info(clc.bold(clc.green(`    gcloud auth application-default login --project ${config.options.project}\n`)));
+    logger_1.logger.info(clc.bold(clc.green(`    gcloud auth application-default login --project ${setup.projectId || "your-project-id"}\n`)));
     logger_1.logger.info("Then start the Genkit developer experience by running:");
     logger_1.logger.info(clc.bold(clc.green(`    ${command}`)));
 }
 async function doSetup(setup, config, options) {
     var _a;
-    const genkitInfo = await getGenkitVersion();
+    const genkitInfo = await getGenkitInfo();
     if (genkitInfo.stopInstall) {
         (0, utils_1.logLabeledWarning)("genkit", "Stopped Genkit initialization");
         return;
@@ -108,31 +127,16 @@ async function doSetup(setup, config, options) {
         },
     ])).choice;
     try {
-        (0, utils_1.logLabeledBullet)("genkit", `Installing Genkit CLI version ${genkitInfo.genkitVersion}`);
+        (0, utils_1.logLabeledBullet)("genkit", `Installing Genkit CLI version ${genkitInfo.cliVersion}`);
         if (installType === "globally") {
-            if (genkitInfo.useInit) {
-                await (0, spawn_1.wrapSpawn)("npm", ["install", "-g", `genkit@${genkitInfo.genkitVersion}`], projectDir);
-                await (0, spawn_1.wrapSpawn)("genkit", ["init", "-p", "firebase"], projectDir);
-                logger_1.logger.info("Start the Genkit developer experience by running:");
-                logger_1.logger.info(`    cd ${setup.functions.source} && genkit start`);
-            }
-            else {
-                await (0, spawn_1.wrapSpawn)("npm", ["install", "-g", `genkit-cli@${genkitInfo.genkitVersion}`], projectDir);
-                await genkitSetup(options, genkitInfo, projectDir);
-                showStartMessage(config, `cd ${setup.functions.source} && npm run genkit:start`);
-            }
+            await (0, spawn_1.wrapSpawn)("npm", ["install", "-g", `genkit-cli@${genkitInfo.cliVersion}`], projectDir);
+            await genkitSetup(options, genkitInfo, projectDir);
+            showStartMessage(setup, `cd ${setup.functions.source} && npm run genkit:start`);
         }
         else {
-            if (genkitInfo.useInit) {
-                await (0, spawn_1.wrapSpawn)("npm", ["install", `genkit@${genkitInfo.genkitVersion}`, "--save-dev"], projectDir);
-                await (0, spawn_1.wrapSpawn)("npx", ["genkit", "init", "-p", "firebase"], projectDir);
-                showStartMessage(config, `cd ${setup.functions.source} && npx genkit start`);
-            }
-            else {
-                await (0, spawn_1.wrapSpawn)("npm", ["install", `genkit-cli@${genkitInfo.genkitVersion}`, "--save-dev"], projectDir);
-                await genkitSetup(options, genkitInfo, projectDir);
-                showStartMessage(config, `cd ${setup.functions.source} && npm run genkit:start`);
-            }
+            await (0, spawn_1.wrapSpawn)("npm", ["install", `genkit-cli@${genkitInfo.cliVersion}`, "--save-dev"], projectDir);
+            await genkitSetup(options, genkitInfo, projectDir);
+            showStartMessage(setup, `cd ${setup.functions.source} && npm run genkit:start`);
         }
     }
     catch (err) {
@@ -151,17 +155,17 @@ async function ensureVertexApiEnabled(options) {
     return await (0, ensureApiEnabled_1.ensure)(projectId, VERTEX_AI_URL, "aiplatform", silently);
 }
 exports.ensureVertexApiEnabled = ensureVertexApiEnabled;
-function getModelOptions(genkitVersion) {
+function getModelOptions(genkitInfo) {
     const modelOptions = {
         vertexai: {
             label: "Google Cloud Vertex AI",
             plugin: "@genkit-ai/vertexai",
-            package: `@genkit-ai/vertexai@${genkitVersion}`,
+            package: `@genkit-ai/vertexai@${genkitInfo.vertexVersion}`,
         },
         googleai: {
             label: "Google AI",
             plugin: "@genkit-ai/googleai",
-            package: `@genkit-ai/googleai@${genkitVersion}`,
+            package: `@genkit-ai/googleai@${genkitInfo.googleAiVersion}`,
         },
         none: { label: "None", plugin: undefined, package: undefined },
     };
@@ -208,7 +212,7 @@ function getBasePackages(genkitVersion) {
 const externalDevPackages = ["typescript", "tsx"];
 async function genkitSetup(options, genkitInfo, projectDir) {
     var _a, _b;
-    const modelOptions = getModelOptions(genkitInfo.genkitVersion);
+    const modelOptions = getModelOptions(genkitInfo);
     const supportedModels = Object.keys(modelOptions);
     const answer = await inquirer.prompt([
         {

package/package.json

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

package/templates/init/functions/python/_gitignore

@@ -1 +1,6 @@
-*.local
+# Python bytecode
+__pycache__/
+
+# Python virtual environment
+venv/
+*.local