firebase-tools 14.12.1 → 14.13.0

package/README.md

@@ -1,4 +1,4 @@
-# Firebase CLI [![Actions Status][gh-actions-badge]][gh-actions] [![Node Version][node-badge]][npm] [![NPM version][npm-badge]][npm]
+# Firebase CLI [![Actions Status][gh-actions-badge]][gh-actions] [![Node Version][node-badge]][npm] [![NPM version][npm-badge]][npm] [![Install MCP Server](https://cursor.com/deeplink/mcp-install-dark.svg)](https://cursor.com/en/install-mcp?name=firebase&config=eyJjb21tYW5kIjoibnB4IiwiYXJncyI6WyIteSIsImZpcmViYXNlLXRvb2xzIiwiZXhwZXJpbWVudGFsOm1jcCIsIi0tZGlyIiwiLiJdfQ==)
 
 The Firebase Command Line Interface (CLI) Tools can be used to test, manage, and deploy your Firebase project from the command line.
 

package/lib/commands/dataconnect-services-list.js

@@ -17,7 +17,7 @@ exports.command = new command_1.Command("dataconnect:services:list")
     "dataconnect.connectors.list",
 ])
     .action(async (options) => {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     const projectId = (0, projectUtils_1.needProjectId)(options);
     await (0, ensureApis_1.ensureApis)(projectId);
     const services = await client.listAllServices(projectId);
@@ -42,15 +42,15 @@ exports.command = new command_1.Command("dataconnect:services:list")
         const connectors = await client.listConnectors(service.name);
         const serviceName = names.parseServiceName(service.name);
         const postgresDatasource = schema === null || schema === void 0 ? void 0 : schema.datasources.find((d) => d.postgresql);
-        const instanceName = (_c = (_b = postgresDatasource === null || postgresDatasource === void 0 ? void 0 : postgresDatasource.postgresql) === null || _b === void 0 ? void 0 : _b.cloudSql.instance) !== null && _c !== void 0 ? _c : "";
+        const instanceName = (_d = (_c = (_b = postgresDatasource === null || postgresDatasource === void 0 ? void 0 : postgresDatasource.postgresql) === null || _b === void 0 ? void 0 : _b.cloudSql) === null || _c === void 0 ? void 0 : _c.instance) !== null && _d !== void 0 ? _d : "";
         const instanceId = instanceName.split("/").pop();
-        const dbId = (_e = (_d = postgresDatasource === null || postgresDatasource === void 0 ? void 0 : postgresDatasource.postgresql) === null || _d === void 0 ? void 0 : _d.database) !== null && _e !== void 0 ? _e : "";
+        const dbId = (_f = (_e = postgresDatasource === null || postgresDatasource === void 0 ? void 0 : postgresDatasource.postgresql) === null || _e === void 0 ? void 0 : _e.database) !== null && _f !== void 0 ? _f : "";
         const dbName = `CloudSQL Instance: ${instanceId}\nDatabase: ${dbId}`;
         table.push([
             serviceName.serviceId,
             serviceName.location,
             dbName,
-            (_f = schema === null || schema === void 0 ? void 0 : schema.updateTime) !== null && _f !== void 0 ? _f : "",
+            (_g = schema === null || schema === void 0 ? void 0 : schema.updateTime) !== null && _g !== void 0 ? _g : "",
             "",
             "",
         ]);
@@ -66,7 +66,7 @@ exports.command = new command_1.Command("dataconnect:services:list")
             table.push(["", "", "", "", connectorName.connectorId, conn.updateTime]);
             serviceJson.connectors.push({
                 connectorId: connectorName.connectorId,
-                connectorLastUpdated: (_g = conn.updateTime) !== null && _g !== void 0 ? _g : "",
+                connectorLastUpdated: (_h = conn.updateTime) !== null && _h !== void 0 ? _h : "",
             });
         }
         jsonOutput.services.push(serviceJson);

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

@@ -10,6 +10,7 @@ const schemaMigration_1 = require("../dataconnect/schemaMigration");
 const requireAuth_1 = require("../requireAuth");
 const error_1 = require("../error");
 const permissionsSetup_1 = require("../gcp/cloudsql/permissionsSetup");
+const cloudsqladmin_1 = require("../gcp/cloudsql/cloudsqladmin");
 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>")
@@ -29,6 +30,10 @@ exports.command = new command_1.Command("dataconnect:sql:grant [serviceId]")
     if (!allowedRoles.includes(role.toLowerCase())) {
         throw new error_1.FirebaseError(`Role should be one of ${allowedRoles.join(" | ")}.`);
     }
+    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 ${role} to ${email}`);
+    }
     const projectId = (0, projectUtils_1.needProjectId)(options);
     await (0, ensureApis_1.ensureApis)(projectId);
     const serviceInfo = await (0, fileUtils_1.pickService)(projectId, options.config, serviceId);

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

@@ -12,7 +12,6 @@ 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");
-const cloudSqlAdminClient = require("../gcp/cloudsql/cloudsqladmin");
 exports.command = new command_1.Command("dataconnect:sql:setup [serviceId]")
     .description("set up your CloudSQL database")
     .before(requirePermissions_1.requirePermissions, [
@@ -33,8 +32,7 @@ exports.command = new command_1.Command("dataconnect:sql:setup [serviceId]")
     }
     const { serviceName, instanceName, databaseId } = (0, schemaMigration_1.getIdentifiers)(serviceInfo.schema);
     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);
+    await (0, connect_1.setupIAMUsers)(instanceId, 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/crashlytics/getIssueDetails.js

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getIssueDetails = void 0;
+const apiv2_1 = require("../apiv2");
+const logger_1 = require("../logger");
+const error_1 = require("../error");
+const api_1 = require("../api");
+const TIMEOUT = 10000;
+const apiClient = new apiv2_1.Client({
+    urlPrefix: (0, api_1.crashlyticsApiOrigin)(),
+    apiVersion: "v1alpha",
+});
+async function getIssueDetails(appId, issueId) {
+    try {
+        const requestProjectNumber = parseProjectNumber(appId);
+        if (requestProjectNumber === undefined) {
+            throw new error_1.FirebaseError("Unable to get the projectId from the AppId.");
+        }
+        const response = await apiClient.request({
+            method: "GET",
+            headers: {
+                "Content-Type": "application/json",
+            },
+            path: `/projects/${requestProjectNumber}/apps/${appId}/issues/${issueId}`,
+            timeout: TIMEOUT,
+        });
+        return response.body;
+    }
+    catch (err) {
+        logger_1.logger.debug(err.message);
+        throw new error_1.FirebaseError(`Failed to fetch the issue details for the Firebase AppId ${appId}, IssueId ${issueId}. Error: ${err}.`, { original: err });
+    }
+}
+exports.getIssueDetails = getIssueDetails;
+function parseProjectNumber(appId) {
+    const appIdParts = appId.split(":");
+    if (appIdParts.length > 1) {
+        return appIdParts[1];
+    }
+    return undefined;
+}

package/lib/crashlytics/getSampleCrash.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getSampleCrash = void 0;
+const apiv2_1 = require("../apiv2");
+const logger_1 = require("../logger");
+const error_1 = require("../error");
+const api_1 = require("../api");
+const TIMEOUT = 10000;
+const apiClient = new apiv2_1.Client({
+    urlPrefix: (0, api_1.crashlyticsApiOrigin)(),
+    apiVersion: "v1alpha",
+});
+async function getSampleCrash(appId, issueId, sampleCount, variantId) {
+    try {
+        const queryParams = new URLSearchParams();
+        queryParams.set("filter.issue.id", issueId);
+        queryParams.set("page_size", String(sampleCount));
+        if (variantId) {
+            queryParams.set("filter.issue.variant_id", variantId);
+        }
+        const requestProjectNumber = parseProjectNumber(appId);
+        if (requestProjectNumber === undefined) {
+            throw new error_1.FirebaseError("Unable to get the projectId from the AppId.");
+        }
+        const response = await apiClient.request({
+            method: "GET",
+            headers: {
+                "Content-Type": "application/json",
+            },
+            path: `/projects/${requestProjectNumber}/apps/${appId}/events`,
+            queryParams: queryParams,
+            timeout: TIMEOUT,
+        });
+        return response.body;
+    }
+    catch (err) {
+        logger_1.logger.debug(err.message);
+        throw new error_1.FirebaseError(`Failed to fetch the same crash for the Firebase AppId ${appId}, IssueId ${issueId}. Error: ${err}.`, { original: err });
+    }
+}
+exports.getSampleCrash = getSampleCrash;
+function parseProjectNumber(appId) {
+    const appIdParts = appId.split(":");
+    if (appIdParts.length > 1) {
+        return appIdParts[1];
+    }
+    return undefined;
+}

package/lib/dataconnect/client.js

@@ -30,19 +30,27 @@ async function listAllServices(projectId) {
 }
 exports.listAllServices = listAllServices;
 async function createService(projectId, locationId, serviceId) {
-    const op = await dataconnectClient().post(`/projects/${projectId}/locations/${locationId}/services`, {
-        name: `projects/${projectId}/locations/${locationId}/services/${serviceId}`,
-    }, {
-        queryParams: {
-            service_id: serviceId,
-        },
-    });
-    const pollRes = await operationPoller.pollOperation({
-        apiOrigin: (0, api_1.dataconnectOrigin)(),
-        apiVersion: DATACONNECT_API_VERSION,
-        operationResourceName: op.body.name,
-    });
-    return pollRes;
+    try {
+        const op = await dataconnectClient().post(`/projects/${projectId}/locations/${locationId}/services`, {
+            name: `projects/${projectId}/locations/${locationId}/services/${serviceId}`,
+        }, {
+            queryParams: {
+                service_id: serviceId,
+            },
+        });
+        const pollRes = await operationPoller.pollOperation({
+            apiOrigin: (0, api_1.dataconnectOrigin)(),
+            apiVersion: DATACONNECT_API_VERSION,
+            operationResourceName: op.body.name,
+        });
+        return pollRes;
+    }
+    catch (err) {
+        if (err.status !== 409) {
+            throw err;
+        }
+        return undefined;
+    }
 }
 exports.createService = createService;
 async function deleteService(serviceName) {
@@ -89,14 +97,14 @@ async function listSchemas(serviceName, fields = []) {
     return schemas;
 }
 exports.listSchemas = listSchemas;
-async function upsertSchema(schema, validateOnly = false) {
+async function upsertSchema(schema, validateOnly = false, async = false) {
     const op = await dataconnectClient().patch(`${schema.name}`, schema, {
         queryParams: {
             allowMissing: "true",
             validateOnly: validateOnly ? "true" : "false",
         },
     });
-    if (validateOnly) {
+    if (validateOnly || async) {
         return;
     }
     return operationPoller.pollOperation({

package/lib/dataconnect/ensureApis.js

@@ -1,20 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensureGIFApis = exports.ensureSparkApis = exports.ensureApis = void 0;
+exports.ensureGIFApis = exports.ensureApis = void 0;
 const api = require("../api");
 const ensureApiEnabled_1 = require("../ensureApiEnabled");
 const prefix = "dataconnect";
 async function ensureApis(projectId) {
-    await (0, ensureApiEnabled_1.ensure)(projectId, api.dataconnectOrigin(), prefix);
-    await (0, ensureApiEnabled_1.ensure)(projectId, api.cloudSQLAdminOrigin(), prefix);
-    await (0, ensureApiEnabled_1.ensure)(projectId, api.computeOrigin(), prefix);
+    await Promise.all([
+        (0, ensureApiEnabled_1.ensure)(projectId, api.dataconnectOrigin(), prefix),
+        (0, ensureApiEnabled_1.ensure)(projectId, api.cloudSQLAdminOrigin(), prefix),
+    ]);
 }
 exports.ensureApis = ensureApis;
-async function ensureSparkApis(projectId) {
-    await (0, ensureApiEnabled_1.ensure)(projectId, api.cloudSQLAdminOrigin(), prefix);
-    await (0, ensureApiEnabled_1.ensure)(projectId, api.dataconnectOrigin(), prefix);
-}
-exports.ensureSparkApis = ensureSparkApis;
 async function ensureGIFApis(projectId) {
     await (0, ensureApiEnabled_1.ensure)(projectId, api.cloudAiCompanionOrigin(), prefix);
 }

package/lib/dataconnect/fileUtils.js

@@ -4,6 +4,7 @@ exports.getFrameworksFromPackageJson = exports.frameworksMap = exports.SUPPORTED
 const fs = require("fs-extra");
 const path = require("path");
 const clc = require("colorette");
+const glob_1 = require("glob");
 const error_1 = require("../error");
 const types_1 = require("./types");
 const utils_1 = require("../utils");
@@ -57,14 +58,12 @@ async function readGQLFiles(sourceDir) {
     if (!fs.existsSync(sourceDir)) {
         return [];
     }
-    const files = await fs.readdir(sourceDir);
-    return files
-        .filter((f) => f.endsWith(".gql") || f.endsWith(".graphql"))
-        .map((f) => toFile(sourceDir, f));
+    const files = await (0, glob_1.glob)("**/*.{gql,graphql}", { cwd: sourceDir, absolute: true, nodir: true });
+    return files.map((f) => toFile(sourceDir, f));
 }
 exports.readGQLFiles = readGQLFiles;
-function toFile(sourceDir, relPath) {
-    const fullPath = path.join(sourceDir, relPath);
+function toFile(sourceDir, fullPath) {
+    const relPath = path.relative(sourceDir, fullPath);
     if (!fs.existsSync(fullPath)) {
         throw new error_1.FirebaseError(`file ${fullPath} not found`);
     }

package/lib/dataconnect/freeTrial.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.upgradeInstructions = exports.printFreeTrialUnavailable = exports.isFreeTrialError = exports.getFreeTrialInstanceId = exports.checkFreeTrialInstanceUsed = exports.freeTrialTermsLink = void 0;
+exports.upgradeInstructions = 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");
 function freeTrialTermsLink() {
     return "https://firebase.google.com/pricing";
@@ -11,7 +10,6 @@ function freeTrialTermsLink() {
 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 = {
@@ -19,53 +17,32 @@ async function checkFreeTrialInstanceUsed(projectId) {
         "interval.endTime": new Date().toJSON(),
         "interval.startTime": past7d.toJSON(),
     };
+    let used = true;
     try {
         const ts = await (0, cloudmonitoring_1.queryTimeSeries)(query, projectId);
-        let used = true;
         if (ts.length) {
             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 used;
     }
     catch (err) {
+        used = false;
+    }
+    if (used) {
+        utils.logLabeledWarning("dataconnect", "CloudSQL no cost trial has already been used on this project.");
+    }
+    else {
         utils.logLabeledSuccess("dataconnect", "CloudSQL no cost trial available!");
-        return false;
     }
+    return used;
 }
 exports.checkFreeTrialInstanceUsed = checkFreeTrialInstanceUsed;
-async function getFreeTrialInstanceId(projectId) {
-    var _a;
-    const instances = await (0, cloudsqladmin_1.listInstances)(projectId);
-    return (_a = instances.find((i) => { var _a; return ((_a = i.settings.userLabels) === null || _a === void 0 ? void 0 : _a["firebase-data-connect"]) === "ft"; })) === null || _a === void 0 ? void 0 : _a.name;
-}
-exports.getFreeTrialInstanceId = getFreeTrialInstanceId;
-async function isFreeTrialError(err, projectId) {
-    return err.message.includes("Quota Exhausted") && (await checkFreeTrialInstanceUsed(projectId))
-        ? true
-        : false;
-}
-exports.isFreeTrialError = isFreeTrialError;
-function printFreeTrialUnavailable(projectId, configYamlPath, instanceId) {
-    if (!instanceId) {
-        utils.logLabeledError("dataconnect", "The CloudSQL free trial has already been used on this project.");
-        utils.logLabeledError("dataconnect", `You may create or use a paid CloudSQL instance by visiting https://console.cloud.google.com/sql/instances`);
-        return;
-    }
-    utils.logLabeledError("dataconnect", `Project '${projectId} already has a CloudSQL instance '${instanceId}' on the Firebase Data Connect no-cost trial.`);
-    const reuseHint = `To use a different database in the same instance, ${clc.bold(`change the ${clc.blue("instanceId")} to "${instanceId}"`)} and update ${clc.blue("location")} in ` +
-        `${clc.green(configYamlPath)}.`;
-    utils.logLabeledError("dataconnect", reuseHint);
-    utils.logLabeledError("dataconnect", `Alternatively, you may create a new (paid) CloudSQL instance at https://console.cloud.google.com/sql/instances`);
-}
-exports.printFreeTrialUnavailable = printFreeTrialUnavailable;
 function upgradeInstructions(projectId) {
-    return `If you'd like to provision a CloudSQL Postgres instance on the Firebase Data Connect no-cost trial:
-1. Please upgrade to the pay-as-you-go (Blaze) billing plan. Visit the following page:
-     https://console.firebase.google.com/project/${projectId}/usage/details
-2. Run ${clc.bold("firebase init dataconnect")} again to configure the Cloud SQL instance.
-3. Run ${clc.bold("firebase deploy --only dataconnect")} to deploy your Data Connect service.`;
+    return `To provision a CloudSQL Postgres instance on the Firebase Data Connect no-cost trial:
+
+  1. Please upgrade to the pay-as-you-go (Blaze) billing plan. Visit the following page:
+
+      https://console.firebase.google.com/project/${projectId}/usage/details
+
+  2. Run ${clc.bold("firebase deploy --only dataconnect")} to deploy your Data Connect service.`;
 }
 exports.upgradeInstructions = upgradeInstructions;

package/lib/dataconnect/provisionCloudSql.js

@@ -1,95 +1,98 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUpdateReason = exports.provisionCloudSql = void 0;
+exports.getUpdateReason = exports.cloudSQLBeingCreated = exports.setupCloudSql = void 0;
 const cloudSqlAdminClient = require("../gcp/cloudsql/cloudsqladmin");
 const utils = require("../utils");
 const checkIam_1 = require("./checkIam");
 const utils_1 = require("../utils");
 const logger_1 = require("../logger");
-const GOOGLE_ML_INTEGRATION_ROLE = "roles/aiplatform.user";
 const freeTrial_1 = require("./freeTrial");
-async function provisionCloudSql(args) {
-    let connectionName = "";
-    const { projectId, location, instanceId, databaseId, enableGoogleMlIntegration, waitForCreation, silent, dryRun, } = args;
+const GOOGLE_ML_INTEGRATION_ROLE = "roles/aiplatform.user";
+async function setupCloudSql(args) {
+    await upsertInstance(Object.assign({}, args));
+    const { projectId, instanceId, requireGoogleMlIntegration, dryRun } = args;
+    if (requireGoogleMlIntegration && !dryRun) {
+        await (0, checkIam_1.grantRolesToCloudSqlServiceAccount)(projectId, instanceId, [GOOGLE_ML_INTEGRATION_ROLE]);
+    }
+}
+exports.setupCloudSql = setupCloudSql;
+async function upsertInstance(args) {
+    const { projectId, instanceId, requireGoogleMlIntegration, dryRun } = args;
     try {
         const existingInstance = await cloudSqlAdminClient.getInstance(projectId, instanceId);
-        silent || utils.logLabeledBullet("dataconnect", `Found existing instance ${instanceId}.`);
-        connectionName = (existingInstance === null || existingInstance === void 0 ? void 0 : existingInstance.connectionName) || "";
-        const why = getUpdateReason(existingInstance, enableGoogleMlIntegration);
+        utils.logLabeledBullet("dataconnect", `Found existing Cloud SQL instance ${instanceId}.`);
+        const why = getUpdateReason(existingInstance, requireGoogleMlIntegration);
         if (why) {
-            const cta = dryRun
-                ? `It will be updated on your next deploy.`
-                : `Updating instance. This may take a few minutes...`;
-            silent ||
-                utils.logLabeledBullet("dataconnect", `Instance ${instanceId} settings not compatible with Firebase Data Connect. ` + cta + why);
-            if (!dryRun) {
-                await (0, utils_1.promiseWithSpinner)(() => cloudSqlAdminClient.updateInstanceForDataConnect(existingInstance, enableGoogleMlIntegration), "Updating your instance...");
-                silent || utils.logLabeledBullet("dataconnect", "Instance updated");
+            if (dryRun) {
+                utils.logLabeledBullet("dataconnect", `Cloud SQL instance ${instanceId} settings not compatible with Firebase Data Connect. ` +
+                    `It will be updated on your next deploy.` +
+                    why);
+            }
+            else {
+                utils.logLabeledBullet("dataconnect", `Cloud SQL instance ${instanceId} settings not compatible with Firebase Data Connect. ` +
+                    why);
+                await (0, utils_1.promiseWithSpinner)(() => cloudSqlAdminClient.updateInstanceForDataConnect(existingInstance, requireGoogleMlIntegration), "Updating your Cloud SQL instance...");
             }
         }
+        await upsertDatabase(Object.assign({}, args));
     }
     catch (err) {
         if (err.status !== 404) {
             throw err;
         }
-        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 + 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) {
-            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) || "";
-            }
-            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;
-            }
-        }
+        await createInstance(Object.assign({}, args));
+    }
+}
+async function createInstance(args) {
+    const { projectId, location, instanceId, requireGoogleMlIntegration, dryRun } = args;
+    const freeTrialUsed = await (0, freeTrial_1.checkFreeTrialInstanceUsed)(projectId);
+    if (dryRun) {
+        utils.logLabeledBullet("dataconnect", `Cloud SQL Instance ${instanceId} not found. It will be created on your next deploy.`);
+    }
+    else {
+        await cloudSqlAdminClient.createInstance({
+            projectId,
+            location,
+            instanceId,
+            enableGoogleMlIntegration: requireGoogleMlIntegration,
+            freeTrial: !freeTrialUsed,
+        });
+        utils.logLabeledBullet("dataconnect", cloudSQLBeingCreated(projectId, instanceId, !freeTrialUsed));
     }
+}
+function cloudSQLBeingCreated(projectId, instanceId, includeFreeTrialToS) {
+    return (`Cloud SQL Instance ${instanceId} is being created.` +
+        (includeFreeTrialToS
+            ? `\nThis instance is provided under the terms of the Data Connect no-cost trial ${(0, freeTrial_1.freeTrialTermsLink)()}`
+            : "") +
+        `
+   Meanwhile, your data are saved in a temporary database and will be migrated once complete. Monitor its progress at
+
+   ${cloudSqlAdminClient.instanceConsoleLink(projectId, instanceId)}
+`);
+}
+exports.cloudSQLBeingCreated = cloudSQLBeingCreated;
+async function upsertDatabase(args) {
+    const { projectId, instanceId, databaseId, dryRun } = args;
     try {
         await cloudSqlAdminClient.getDatabase(projectId, instanceId, databaseId);
-        silent || utils.logLabeledBullet("dataconnect", `Found existing database ${databaseId}.`);
+        utils.logLabeledBullet("dataconnect", `Found existing Postgres Database ${databaseId}.`);
     }
     catch (err) {
-        if (err.status === 404) {
-            if (dryRun) {
-                silent ||
-                    utils.logLabeledBullet("dataconnect", `Database ${databaseId} not found. It will be created on your next deploy.`);
-            }
-            else {
-                silent ||
-                    utils.logLabeledBullet("dataconnect", `Database ${databaseId} not found, creating it now...`);
-                await cloudSqlAdminClient.createDatabase(projectId, instanceId, databaseId);
-                silent || utils.logLabeledBullet("dataconnect", `Database ${databaseId} created.`);
-            }
+        if (err.status !== 404) {
+            logger_1.logger.debug(`Unexpected error from Cloud SQL: ${err}`);
+            utils.logLabeledWarning("dataconnect", `Postgres Database ${databaseId} is not accessible.`);
+            return;
+        }
+        if (dryRun) {
+            utils.logLabeledBullet("dataconnect", `Postgres Database ${databaseId} not found. It will be created on your next deploy.`);
         }
         else {
-            logger_1.logger.debug(`Unexpected error from CloudSQL: ${err}`);
-            silent || utils.logLabeledWarning("dataconnect", `Database ${databaseId} is not accessible.`);
+            await cloudSqlAdminClient.createDatabase(projectId, instanceId, databaseId);
+            utils.logLabeledBullet("dataconnect", `Postgres Database ${databaseId} created.`);
         }
     }
-    if (enableGoogleMlIntegration && !dryRun) {
-        await (0, checkIam_1.grantRolesToCloudSqlServiceAccount)(projectId, instanceId, [GOOGLE_ML_INTEGRATION_ROLE]);
-    }
-    return connectionName;
 }
-exports.provisionCloudSql = provisionCloudSql;
 function getUpdateReason(instance, requireGoogleMlIntegration) {
     var _a, _b, _c, _d;
     let reason = "";
@@ -112,9 +115,3 @@ function getUpdateReason(instance, requireGoogleMlIntegration) {
     return reason;
 }
 exports.getUpdateReason = getUpdateReason;
-function cmekWarning() {
-    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);
-}