firebase-tools 14.0.1 → 14.2.0

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/commands/dataconnect-sql-grant.js

@@ -9,8 +9,8 @@ const fileUtils_1 = require("../dataconnect/fileUtils");
 const schemaMigration_1 = require("../dataconnect/schemaMigration");
 const requireAuth_1 = require("../requireAuth");
 const error_1 = require("../error");
-const permissions_setup_1 = require("../gcp/cloudsql/permissions_setup");
-const allowedRoles = Object.keys(permissions_setup_1.fdcSqlRoleMap);
+const permissionsSetup_1 = require("../gcp/cloudsql/permissionsSetup");
+const allowedRoles = Object.keys(permissionsSetup_1.fdcSqlRoleMap);
 exports.command = new command_1.Command("dataconnect:sql:grant [serviceId]")
     .description("grants the SQL role <role> to the provided user or service account <email>")
     .option("-R, --role <role>", "The SQL role to grant. One of: owner, writer, or reader.")

package/lib/commands/dataconnect-sql-setup.js

@@ -8,7 +8,7 @@ const error_1 = require("../error");
 const requireAuth_1 = require("../requireAuth");
 const requirePermissions_1 = require("../requirePermissions");
 const ensureApis_1 = require("../dataconnect/ensureApis");
-const permissions_setup_1 = require("../gcp/cloudsql/permissions_setup");
+const permissionsSetup_1 = require("../gcp/cloudsql/permissionsSetup");
 const permissions_1 = require("../gcp/cloudsql/permissions");
 const schemaMigration_1 = require("../dataconnect/schemaMigration");
 const connect_1 = require("../gcp/cloudsql/connect");
@@ -35,6 +35,6 @@ exports.command = new command_1.Command("dataconnect:sql:setup [serviceId]")
     await (0, schemaMigration_1.ensureServiceIsConnectedToCloudSql)(serviceName, instanceName, databaseId, true);
     const { user, mode } = await (0, connect_1.getIAMUser)(options);
     await cloudSqlAdminClient.createUser(projectId, instanceId, mode, user);
-    const schemaInfo = await (0, permissions_setup_1.getSchemaMetadata)(instanceId, databaseId, permissions_1.DEFAULT_SCHEMA, options);
-    await (0, permissions_setup_1.setupSQLPermissions)(instanceId, databaseId, schemaInfo, options);
+    const schemaInfo = await (0, permissionsSetup_1.getSchemaMetadata)(instanceId, databaseId, permissions_1.DEFAULT_SCHEMA, options);
+    await (0, permissionsSetup_1.setupSQLPermissions)(instanceId, databaseId, schemaInfo, options);
 });

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/dataconnect/schemaMigration.js

@@ -7,7 +7,7 @@ const types_1 = require("./types");
 const client_1 = require("./client");
 const connect_1 = require("../gcp/cloudsql/connect");
 const projectUtils_1 = require("../projectUtils");
-const permissions_setup_1 = require("../gcp/cloudsql/permissions_setup");
+const permissionsSetup_1 = require("../gcp/cloudsql/permissionsSetup");
 const permissions_1 = require("../gcp/cloudsql/permissions");
 const prompt_1 = require("../prompt");
 const logger_1 = require("../logger");
@@ -18,13 +18,13 @@ const cloudSqlAdminClient = require("../gcp/cloudsql/cloudsqladmin");
 const errors = require("./errors");
 async function setupSchemaIfNecessary(instanceId, databaseId, options) {
     await (0, connect_1.setupIAMUsers)(instanceId, databaseId, options);
-    const schemaInfo = await (0, permissions_setup_1.getSchemaMetadata)(instanceId, databaseId, permissions_1.DEFAULT_SCHEMA, options);
-    if (schemaInfo.setupStatus !== permissions_setup_1.SchemaSetupStatus.BrownField &&
-        schemaInfo.setupStatus !== permissions_setup_1.SchemaSetupStatus.GreenField) {
-        return await (0, permissions_setup_1.setupSQLPermissions)(instanceId, databaseId, schemaInfo, options, true);
+    const schemaInfo = await (0, permissionsSetup_1.getSchemaMetadata)(instanceId, databaseId, permissions_1.DEFAULT_SCHEMA, options);
+    if (schemaInfo.setupStatus !== permissionsSetup_1.SchemaSetupStatus.BrownField &&
+        schemaInfo.setupStatus !== permissionsSetup_1.SchemaSetupStatus.GreenField) {
+        return await (0, permissionsSetup_1.setupSQLPermissions)(instanceId, databaseId, schemaInfo, options, true);
     }
     else {
-        logger_1.logger.info(`Detected schema "${schemaInfo.name}" is setup in ${schemaInfo.setupStatus} mode. Skipping Setup.`);
+        logger_1.logger.debug(`Detected schema "${schemaInfo.name}" is setup in ${schemaInfo.setupStatus} mode. Skipping Setup.`);
     }
     return schemaInfo.setupStatus;
 }
@@ -173,14 +173,14 @@ async function grantRoleToUserInSchema(options, schema) {
     const { instanceId, databaseId } = getIdentifiers(schema);
     const projectId = (0, projectUtils_1.needProjectId)(options);
     const { user, mode } = (0, connect_1.toDatabaseUser)(email);
-    const fdcSqlRole = permissions_setup_1.fdcSqlRoleMap[role](databaseId);
+    const fdcSqlRole = permissionsSetup_1.fdcSqlRoleMap[role](databaseId);
     await (0, connect_1.setupIAMUsers)(instanceId, databaseId, options);
     const userIsCSQLAdmin = await (0, cloudsqladmin_1.iamUserIsCSQLAdmin)(options);
     if (!userIsCSQLAdmin) {
         throw new error_1.FirebaseError(`Only users with 'roles/cloudsql.admin' can grant SQL roles. If you do not have this role, ask your database administrator to run this command or manually grant ${fdcSqlRole} to ${user}`);
     }
     const schemaSetupStatus = await setupSchemaIfNecessary(instanceId, databaseId, options);
-    if (schemaSetupStatus !== permissions_setup_1.SchemaSetupStatus.GreenField &&
+    if (schemaSetupStatus !== permissionsSetup_1.SchemaSetupStatus.GreenField &&
         fdcSqlRole === (0, permissions_1.firebaseowner)(databaseId, permissions_1.DEFAULT_SCHEMA)) {
         throw new error_1.FirebaseError(`Owner rule isn't available in brownfield databases. If you would like Data Connect to manage and own your database schema, run 'firebase dataconnect:sql:setup'`);
     }
@@ -260,13 +260,13 @@ async function handleIncompatibleSchemaError(args) {
         Please ask a user with 'roles/cloudsql.admin' to apply the following commands.\n
         ${commandsToExecuteBySuperUser.join("\n")}`);
         }
-        const schemaInfo = await (0, permissions_setup_1.getSchemaMetadata)(instanceId, databaseId, permissions_1.DEFAULT_SCHEMA, options);
-        if (schemaInfo.setupStatus !== permissions_setup_1.SchemaSetupStatus.GreenField) {
+        const schemaInfo = await (0, permissionsSetup_1.getSchemaMetadata)(instanceId, databaseId, permissions_1.DEFAULT_SCHEMA, options);
+        if (schemaInfo.setupStatus !== permissionsSetup_1.SchemaSetupStatus.GreenField) {
             throw new error_1.FirebaseError(`Brownfield database are protected from SQL changes by Data Connect.\n` +
                 `You can use the SQL diff generated by 'firebase dataconnect:sql:diff' to assist you in applying the required changes to your CloudSQL database. Connector deployment will succeed when there is no required diff changes.\n` +
                 `If you would like Data Connect to manage your database schema, run 'firebase dataconnect:sql:setup'`);
         }
-        if (!(await (0, permissions_setup_1.checkSQLRoleIsGranted)(options, instanceId, databaseId, (0, permissions_1.firebaseowner)(databaseId), (await (0, connect_1.getIAMUser)(options)).user))) {
+        if (!(await (0, permissionsSetup_1.checkSQLRoleIsGranted)(options, instanceId, databaseId, (0, permissions_1.firebaseowner)(databaseId), (await (0, connect_1.getIAMUser)(options)).user))) {
             throw new error_1.FirebaseError(`Command aborted. Only users granted firebaseowner SQL role can run migrations.`);
         }
         if (commandsToExecuteBySuperUser.length) {

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/apphosting/serve.js

@@ -75,12 +75,20 @@ async function serve(projectId, port, startCommand, backendRelativeDir) {
     const environmentVariablesToInject = Object.assign(Object.assign(Object.assign({}, getEmulatorEnvs()), Object.fromEntries(await Promise.all(resolveEnv))), { PORT: port.toString() });
     if (startCommand) {
         developmentServer_2.logger.logLabeled("BULLET", types_1.Emulators.APPHOSTING, `running custom start command: '${startCommand}'`);
-        await (0, spawn_1.spawnWithCommandString)(startCommand, backendRoot, environmentVariablesToInject);
+        (0, spawn_1.spawnWithCommandString)(startCommand, backendRoot, environmentVariablesToInject)
+            .catch((err) => {
+            developmentServer_2.logger.logLabeled("ERROR", types_1.Emulators.APPHOSTING, `failed to start Dev Server: ${err}`);
+        })
+            .then(() => developmentServer_2.logger.logLabeled("BULLET", types_1.Emulators.APPHOSTING, `Dev Server stopped`));
         return;
     }
     const detectedStartCommand = await (0, developmentServer_1.detectStartCommand)(backendRoot);
     developmentServer_2.logger.logLabeled("BULLET", types_1.Emulators.APPHOSTING, `starting app with: '${detectedStartCommand}'`);
-    await (0, spawn_1.spawnWithCommandString)(detectedStartCommand, backendRoot, environmentVariablesToInject);
+    (0, spawn_1.spawnWithCommandString)(detectedStartCommand, backendRoot, environmentVariablesToInject)
+        .catch((err) => {
+        developmentServer_2.logger.logLabeled("ERROR", types_1.Emulators.APPHOSTING, `failed to start Dev Server: ${err}`);
+    })
+        .then(() => developmentServer_2.logger.logLabeled("BULLET", types_1.Emulators.APPHOSTING, `Dev Server stopped`));
 }
 function availablePort(host, port) {
     return (0, portUtils_1.checkListenable)({

package/lib/emulator/dataconnectEmulator.js

@@ -246,7 +246,7 @@ class DataConnectEmulator {
         return false;
     }
     static async getEnv(account, extraEnv = {}) {
-        const credsEnv = await (0, env_1.getCredentialsEnvironment)(account, emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.DATACONNECT), "dataconnect");
+        const credsEnv = await (0, env_1.getCredentialsEnvironment)(account, emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.DATACONNECT), "dataconnect", true);
         return Object.assign(Object.assign(Object.assign({}, process.env), extraEnv), credsEnv);
     }
 }

package/lib/emulator/downloadableEmulators.js

@@ -48,20 +48,20 @@ const EMULATOR_UPDATE_DETAILS = {
     },
     dataconnect: process.platform === "darwin"
         ? {
-            version: "2.0.0",
-            expectedSize: 26440448,
-            expectedChecksum: "64fd9ad182e59a46b9462757db6d5aac",
+            version: "2.2.0",
+            expectedSize: 26538752,
+            expectedChecksum: "15304de22f04e51db155b1c76229e3f3",
         }
         : process.platform === "win32"
             ? {
-                version: "2.0.0",
-                expectedSize: 26884096,
-                expectedChecksum: "92d654dfbb07fee4e1db2328ba6e00a7",
+                version: "2.2.0",
+                expectedSize: 26982912,
+                expectedChecksum: "a7677c4dfe78275eab7320b1ff777e9e",
             }
             : {
-                version: "2.0.0",
-                expectedSize: 26353816,
-                expectedChecksum: "29c7a57a00cb11f44f9b0ffb4710bbd2",
+                version: "2.2.0",
+                expectedSize: 26452120,
+                expectedChecksum: "ef332cc135bc05e43121020e5c1fef09",
             },
 };
 exports.DownloadDetails = {

package/lib/emulator/env.js

@@ -37,16 +37,17 @@ function setEnvVarsForEmulators(env, emulators) {
                 break;
             case types_1.Emulators.DATACONNECT:
                 env[constants_1.Constants.FIREBASE_DATACONNECT_EMULATOR_HOST] = `http://${host}`;
-                env[constants_1.Constants.FIREBASE_DATACONNECT_ENV_ALT] = `http://${host}`;
+                env[constants_1.Constants.FIREBASE_DATACONNECT_ENV_ALT] = host;
                 env["FIREBASE_DATACONNECT_EMULATOR_HOST"] = host;
         }
     }
 }
 exports.setEnvVarsForEmulators = setEnvVarsForEmulators;
-async function getCredentialsEnvironment(account, logger, logLabel) {
+async function getCredentialsEnvironment(account, logger, logLabel, silent = false) {
     const credentialEnv = {};
     if (await (0, defaultCredentials_1.hasDefaultCredentials)()) {
-        logger.logLabeled("WARN", logLabel, `Application Default Credentials detected. Non-emulated services will access production using these credentials. Be careful!`);
+        !silent &&
+            logger.logLabeled("WARN", logLabel, `Application Default Credentials detected. Non-emulated services will access production using these credentials. Be careful!`);
     }
     else if (account) {
         const defaultCredPath = await (0, defaultCredentials_1.getCredentialPathAsync)(account);

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

@@ -663,11 +663,11 @@ class FunctionsEmulator {
         logger_1.logger.debug("Found a v2 firestore trigger.");
         const database = (_a = eventTrigger.eventFilters) === null || _a === void 0 ? void 0 : _a.database;
         if (!database) {
-            throw new error_1.FirebaseError("A database must be supplied.");
+            throw new error_1.FirebaseError(`A database must be supplied for event trigger ${key}`);
         }
         const namespace = (_b = eventTrigger.eventFilters) === null || _b === void 0 ? void 0 : _b.namespace;
         if (!namespace) {
-            throw new error_1.FirebaseError("A namespace must be supplied.");
+            throw new error_1.FirebaseError(`A namespace must be supplied for event trigger ${key}`);
         }
         let doc;
         let match;

package/lib/extensions/emulator/triggerHelper.js

@@ -16,6 +16,7 @@ const SUPPORTED_SYSTEM_PARAMS = {
     },
 };
 function functionResourceToEmulatedTriggerDefintion(resource, systemParams = {}) {
+    var _a, _b;
     const resourceType = resource.type;
     if (resource.type === types_2.FUNCTIONS_RESOURCE_TYPE) {
         const etd = {
@@ -91,6 +92,10 @@ function functionResourceToEmulatedTriggerDefintion(resource, systemParams = {})
                         eventFilterPathPatterns[filter.attribute] = filter.value;
                     }
                 }
+                if (properties.eventTrigger.eventType.includes("google.cloud.firestore")) {
+                    eventFilters["database"] = (_a = eventFilters["database"]) !== null && _a !== void 0 ? _a : "(default)";
+                    eventFilters["namespace"] = (_b = eventFilters["namespace"]) !== null && _b !== void 0 ? _b : "(default)";
+                }
                 etd.eventTrigger.eventFilters = eventFilters;
                 etd.eventTrigger.eventFilterPathPatterns = eventFilterPathPatterns;
             }

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/gcp/cloudsql/{permissions_setup.js → permissionsSetup.js}

@@ -1,17 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.brownfieldSqlSetup = exports.setupBrownfieldAsGreenfield = exports.getSchemaMetadata = exports.greenFieldSchemaSetup = exports.setupSQLPermissions = exports.checkSQLRoleIsGranted = exports.fdcSqlRoleMap = exports.SchemaSetupStatus = void 0;
+const clc = require("colorette");
 const permissions_1 = require("./permissions");
 const cloudsqladmin_1 = require("./cloudsqladmin");
 const connect_1 = require("./connect");
 const logger_1 = require("../../logger");
 const prompt_1 = require("../../prompt");
-const clc = require("colorette");
 const error_1 = require("../../error");
 const projectUtils_1 = require("../../projectUtils");
 const connect_2 = require("./connect");
 const lodash_1 = require("lodash");
 const connect_3 = require("./connect");
+const utils = require("../../utils");
 var SchemaSetupStatus;
 (function (SchemaSetupStatus) {
     SchemaSetupStatus["NotSetup"] = "not-setup";
@@ -65,8 +66,13 @@ async function checkSQLRoleIsGranted(options, instanceId, databaseId, grantedRol
 }
 exports.checkSQLRoleIsGranted = checkSQLRoleIsGranted;
 async function setupSQLPermissions(instanceId, databaseId, schemaInfo, options, silent = false) {
+    const logFn = silent
+        ? logger_1.logger.debug
+        : (message) => {
+            return utils.logLabeledBullet("dataconnect", message);
+        };
     const schema = schemaInfo.name;
-    logger_1.logger.info(`Detected schema "${schema}" setup status is ${schemaInfo.setupStatus}. Running setup...`);
+    logFn(`Detected schema "${schema}" setup status is ${schemaInfo.setupStatus}. Running setup...`);
     const userIsCSQLAdmin = await (0, cloudsqladmin_1.iamUserIsCSQLAdmin)(options);
     if (!userIsCSQLAdmin) {
         throw new error_1.FirebaseError(`Missing required IAM permission to setup SQL schemas. SQL schema setup requires 'roles/cloudsql.admin' or an equivalent role.`);
@@ -75,23 +81,23 @@ async function setupSQLPermissions(instanceId, databaseId, schemaInfo, options,
     let runGreenfieldSetup = false;
     if (schemaInfo.setupStatus === SchemaSetupStatus.GreenField) {
         runGreenfieldSetup = true;
-        logger_1.logger.info(`Database ${databaseId} has already been setup as greenfield project. Rerunning setup to repair any missing permissions.`);
+        logFn(`Database ${databaseId} has already been setup as greenfield project. Rerunning setup to repair any missing permissions.`);
     }
     if (schemaInfo.tables.length === 0) {
         runGreenfieldSetup = true;
-        logger_1.logger.info(`Found no tables in schema "${schema}", assuming greenfield project.`);
+        logFn(`Found no tables in schema "${schema}", assuming greenfield project.`);
     }
     if (runGreenfieldSetup) {
         const greenfieldSetupCmds = await greenFieldSchemaSetup(instanceId, databaseId, schema, options);
         await (0, connect_2.executeSqlCmdsAsSuperUser)(options, instanceId, databaseId, greenfieldSetupCmds, silent, true);
-        logger_1.logger.info(clc.green("Database setup complete."));
+        logFn(clc.green("Database setup complete."));
         return SchemaSetupStatus.GreenField;
     }
     if (options.nonInteractive || options.force) {
         throw new error_1.FirebaseError(`Schema "${schema}" isn't set up and can only be set up in interactive mode.`);
     }
     const currentTablesOwners = [...new Set(schemaInfo.tables.map((t) => t.owner))];
-    logger_1.logger.info(`We found some existing object owners [${currentTablesOwners.join(", ")}] in your cloudsql "${schema}" schema.`);
+    logFn(`We found some existing object owners [${currentTablesOwners.join(", ")}] in your cloudsql "${schema}" schema.`);
     const shouldSetupGreenfield = await (0, prompt_1.confirm)({
         message: clc.yellow("Would you like FDC to handle SQL migrations for you moving forward?\n" +
             `This means we will transfer schema and tables ownership to ${(0, permissions_1.firebaseowner)(databaseId, schema)}\n` +
@@ -101,14 +107,14 @@ async function setupSQLPermissions(instanceId, databaseId, schemaInfo, options,
     if (shouldSetupGreenfield) {
         await setupBrownfieldAsGreenfield(instanceId, databaseId, schemaInfo, options, silent);
         logger_1.logger.info(clc.green("Database setup complete."));
-        logger_1.logger.info(clc.yellow("IMPORTANT: please uncomment 'schemaValidation: \"COMPATIBLE\"' in your dataconnect.yaml file to avoid dropping any existing tables by mistake."));
+        logFn(clc.yellow("IMPORTANT: please uncomment 'schemaValidation: \"COMPATIBLE\"' in your dataconnect.yaml file to avoid dropping any existing tables by mistake."));
         return SchemaSetupStatus.GreenField;
     }
     else {
-        logger_1.logger.info(clc.yellow("Setting up database in brownfield mode.\n" +
+        logFn(clc.yellow("Setting up database in brownfield mode.\n" +
             `Note: SQL migrations can't be done through ${clc.bold("firebase dataconnect:sql:migrate")} in this mode.`));
         await brownfieldSqlSetup(instanceId, databaseId, schemaInfo, options, silent);
-        logger_1.logger.info(clc.green("Brownfield database setup complete."));
+        logFn(clc.green("Brownfield database setup complete."));
         return SchemaSetupStatus.BrownField;
     }
 }

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/dataconnect/sdk.js

@@ -84,7 +84,7 @@ async function askQuestions(setup, config) {
                 {
                     type: "checkbox",
                     name: "fdcFrameworks",
-                    message: `Which ${hasFrameworkEnabled && "additional "}frameworks would you like to generate SDKs for? ` +
+                    message: `Which ${hasFrameworkEnabled ? "additional " : ""}frameworks would you like to generate SDKs for? ` +
                         "Press Space to select features, then Enter to confirm your choices.",
                     choices: unusedFrameworks.map((frameworkStr) => ({
                         value: frameworkStr,

package/lib/track.js

@@ -154,7 +154,7 @@ function session(propertyName) {
     const validateOnly = !!process.env.FIREBASE_CLI_MP_VALIDATE;
     if (!usageEnabled() && propertyName !== "vscode") {
         if (validateOnly) {
-            logger_1.logger.warn("Google Analytics is DISABLED. To enable, (re)login and opt in to collection.");
+            logger_1.logger.debug("Google Analytics is DISABLED. To enable, (re)login and opt in to collection.");
         }
         return;
     }
@@ -181,7 +181,7 @@ function isDebugMode() {
     if (account === null || account === void 0 ? void 0 : account.user.email.endsWith("@google.com")) {
         try {
             require("../tsconfig.json");
-            logger_1.logger.info(`Using Google Analytics in DEBUG mode. Emulators (+ UI) events will be shown in GA Debug View only.`);
+            logger_1.logger.debug(`Using Google Analytics in DEBUG mode. Emulators (+ UI) events will be shown in GA Debug View only.`);
             return true;
         }
         catch (_a) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-tools",
-  "version": "14.0.1",
+  "version": "14.2.0",
   "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