firebase-tools 14.19.1 → 14.20.0

package/lib/commands/firestore-operations-list.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
 const command_1 = require("../command");
 const fsi = require("../firestore/api");
-const logger_1 = require("../logger");
 const types_1 = require("../emulator/types");
 const commandUtils_1 = require("../emulator/commandUtils");
 const pretty_print_1 = require("../firestore/pretty-print");
@@ -18,12 +17,7 @@ exports.command = new command_1.Command("firestore:operations:list")
     const limit = options.limit === undefined ? 100 : Number(options.limit);
     const api = new fsi.FirestoreApi();
     const { operations } = await api.listOperations(options.project, databaseId, limit);
-    if (options.json) {
-        logger_1.logger.info(JSON.stringify(operations, undefined, 2));
-    }
-    else {
-        const printer = new pretty_print_1.PrettyPrint();
-        printer.prettyPrintOperations(operations);
-    }
+    const printer = new pretty_print_1.PrettyPrint();
+    printer.prettyPrintOperations(operations);
     return operations;
 });

package/lib/commands/index.js

@@ -226,6 +226,7 @@ function load(client) {
     client.setup.emulators.ui = loadCommand("setup-emulators-ui");
     client.dataconnect = {};
     client.setup.emulators.dataconnect = loadCommand("setup-emulators-dataconnect");
+    client.dataconnect.execute = loadCommand("dataconnect-execute");
     client.dataconnect.services = {};
     client.dataconnect.services.list = loadCommand("dataconnect-services-list");
     client.dataconnect.sql = {};

package/lib/dataconnect/build.js

@@ -7,7 +7,7 @@ const prompt_1 = require("../prompt");
 const utils = require("../utils");
 const graphqlError_1 = require("./graphqlError");
 const auth_1 = require("../auth");
-async function build(options, configDir, dryRun) {
+async function build(options, configDir, deployStats) {
     var _a, _b;
     const account = (0, auth_1.getProjectDefaultAccount)(options.projectRoot);
     const args = { configDir, account };
@@ -16,7 +16,21 @@ async function build(options, configDir, dryRun) {
     }
     const buildResult = await dataconnectEmulator_1.DataConnectEmulator.build(args);
     if ((_a = buildResult === null || buildResult === void 0 ? void 0 : buildResult.errors) === null || _a === void 0 ? void 0 : _a.length) {
-        await handleBuildErrors(buildResult.errors, options.nonInteractive, options.force, dryRun);
+        buildResult.errors.forEach((e) => {
+            var _a, _b;
+            if ((_a = e.extensions) === null || _a === void 0 ? void 0 : _a.warningLevel) {
+                let key = e.extensions.warningLevel.toLowerCase();
+                const msgSp = e.message.split(": ");
+                if (msgSp.length >= 2) {
+                    key += `_${msgSp[0].toLowerCase()}`;
+                }
+                deployStats.numBuildWarnings.set(key, ((_b = deployStats.numBuildWarnings.get(key)) !== null && _b !== void 0 ? _b : 0) + 1);
+            }
+            else {
+                deployStats.numBuildErrors += 1;
+            }
+        });
+        await handleBuildErrors(buildResult.errors, options.nonInteractive, options.force, options.dryRun);
     }
     return (_b = buildResult === null || buildResult === void 0 ? void 0 : buildResult.metadata) !== null && _b !== void 0 ? _b : {};
 }

package/lib/dataconnect/load.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.readConnectorYaml = exports.readDataConnectYaml = exports.readFirebaseJson = exports.load = exports.loadAll = exports.pickService = void 0;
+exports.squashGraphQL = exports.readGQLFiles = exports.readConnectorYaml = exports.readDataConnectYaml = exports.readFirebaseJson = exports.load = exports.loadAll = exports.pickService = void 0;
 const path = require("path");
 const fs = require("fs-extra");
 const clc = require("colorette");
@@ -130,6 +130,7 @@ async function readGQLFiles(sourceDir) {
     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, fullPath) {
     const relPath = path.relative(sourceDir, fullPath);
     if (!fs.existsSync(fullPath)) {
@@ -141,3 +142,22 @@ function toFile(sourceDir, fullPath) {
         content,
     };
 }
+function squashGraphQL(source) {
+    if (!source.files || !source.files.length) {
+        return "";
+    }
+    if (source.files.length === 1) {
+        return source.files[0].content;
+    }
+    let query = "";
+    for (const f of source.files) {
+        if (!f.content || !/\S/.test(f.content)) {
+            continue;
+        }
+        query += `### Begin file ${f.path}\n`;
+        query += f.content;
+        query += `### End file ${f.path}\n`;
+    }
+    return query;
+}
+exports.squashGraphQL = squashGraphQL;

package/lib/dataconnect/names.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseCloudSQLInstanceName = exports.parseConnectorName = exports.parseServiceName = void 0;
+exports.isGraphqlName = exports.parseCloudSQLInstanceName = exports.parseConnectorName = exports.parseServiceName = void 0;
 const error_1 = require("../error");
 const serviceNameRegex = /projects\/(?<projectId>[^\/]+)\/locations\/(?<location>[^\/]+)\/services\/(?<serviceId>[^\/]+)/;
 function parseServiceName(serviceName) {
@@ -67,3 +67,8 @@ function parseCloudSQLInstanceName(cloudSQLInstanceName) {
     };
 }
 exports.parseCloudSQLInstanceName = parseCloudSQLInstanceName;
+const graphqlNameRegex = /^[A-Za-z_][A-Za-z0-9_]*$/;
+function isGraphqlName(name) {
+    return graphqlNameRegex.test(name);
+}
+exports.isGraphqlName = isGraphqlName;

package/lib/dataconnect/provisionCloudSql.js

@@ -1,27 +1,50 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getUpdateReason = exports.cloudSQLBeingCreated = exports.setupCloudSql = void 0;
-const cloudSqlAdminClient = require("../gcp/cloudsql/cloudsqladmin");
-const utils = require("../utils");
 const clc = require("colorette");
-const checkIam_1 = require("./checkIam");
-const utils_1 = require("../utils");
+const cloudSqlAdminClient = require("../gcp/cloudsql/cloudsqladmin");
 const logger_1 = require("../logger");
+const checkIam_1 = require("./checkIam");
 const freeTrial_1 = require("./freeTrial");
+const utils_1 = require("../utils");
+const track_1 = require("../track");
+const utils = require("../utils");
 const GOOGLE_ML_INTEGRATION_ROLE = "roles/aiplatform.user";
 async function setupCloudSql(args) {
-    await upsertInstance(Object.assign({}, args));
+    var _a;
     const { projectId, instanceId, requireGoogleMlIntegration, dryRun } = args;
+    const startTime = Date.now();
+    const stats = { action: "get" };
+    let success = false;
+    try {
+        await upsertInstance(stats, Object.assign({}, args));
+        success = true;
+    }
+    finally {
+        if (!dryRun) {
+            await (0, track_1.trackGA4)("dataconnect_cloud_sql", {
+                source: args.source,
+                action: success ? stats.action : `${stats.action}_error`,
+                location: args.location,
+                enable_google_ml_integration: args.requireGoogleMlIntegration.toString(),
+                database_version: ((_a = stats.databaseVersion) === null || _a === void 0 ? void 0 : _a.toLowerCase()) || "unknown",
+                dataconnect_label: stats.dataconnectLabel || "unknown",
+            }, Date.now() - startTime);
+        }
+    }
     if (requireGoogleMlIntegration && !dryRun) {
         await (0, checkIam_1.grantRolesToCloudSqlServiceAccount)(projectId, instanceId, [GOOGLE_ML_INTEGRATION_ROLE]);
     }
 }
 exports.setupCloudSql = setupCloudSql;
-async function upsertInstance(args) {
+async function upsertInstance(stats, args) {
+    var _a, _b;
     const { projectId, instanceId, requireGoogleMlIntegration, dryRun } = args;
     try {
         const existingInstance = await cloudSqlAdminClient.getInstance(projectId, instanceId);
         utils.logLabeledBullet("dataconnect", `Found existing Cloud SQL instance ${clc.bold(instanceId)}.`);
+        stats.databaseVersion = existingInstance.databaseVersion;
+        stats.dataconnectLabel = (_b = (_a = existingInstance.settings) === null || _a === void 0 ? void 0 : _a.userLabels) === null || _b === void 0 ? void 0 : _b["firebase-data-connect"];
         const why = getUpdateReason(existingInstance, requireGoogleMlIntegration);
         if (why) {
             if (dryRun) {
@@ -32,6 +55,7 @@ async function upsertInstance(args) {
             else {
                 utils.logLabeledBullet("dataconnect", `Cloud SQL instance ${clc.bold(instanceId)} settings are not compatible with Firebase Data Connect. ` +
                     why);
+                stats.action = "update";
                 await (0, utils_1.promiseWithSpinner)(() => cloudSqlAdminClient.updateInstanceForDataConnect(existingInstance, requireGoogleMlIntegration), "Updating your Cloud SQL instance...");
             }
         }
@@ -41,12 +65,15 @@ async function upsertInstance(args) {
         if (err.status !== 404) {
             throw err;
         }
-        await createInstance(Object.assign({}, args));
+        stats.action = "create";
+        stats.databaseVersion = cloudSqlAdminClient.DEFAULT_DATABASE_VERSION;
+        const freeTrialUsed = await (0, freeTrial_1.checkFreeTrialInstanceUsed)(projectId);
+        stats.dataconnectLabel = freeTrialUsed ? "nt" : "ft";
+        await createInstance(Object.assign(Object.assign({}, args), { freeTrialLabel: stats.dataconnectLabel }));
     }
 }
 async function createInstance(args) {
-    const { projectId, location, instanceId, requireGoogleMlIntegration, dryRun } = args;
-    const freeTrialUsed = await (0, freeTrial_1.checkFreeTrialInstanceUsed)(projectId);
+    const { projectId, location, instanceId, requireGoogleMlIntegration, dryRun, freeTrialLabel } = args;
     if (dryRun) {
         utils.logLabeledBullet("dataconnect", `Cloud SQL Instance ${clc.bold(instanceId)} not found. It will be created on your next deploy.`);
     }
@@ -56,9 +83,9 @@ async function createInstance(args) {
             location,
             instanceId,
             enableGoogleMlIntegration: requireGoogleMlIntegration,
-            freeTrial: !freeTrialUsed,
+            freeTrialLabel,
         });
-        utils.logLabeledBullet("dataconnect", cloudSQLBeingCreated(projectId, instanceId, !freeTrialUsed));
+        utils.logLabeledBullet("dataconnect", cloudSQLBeingCreated(projectId, instanceId, freeTrialLabel === "ft"));
     }
 }
 function cloudSQLBeingCreated(projectId, instanceId, includeFreeTrialToS) {

package/lib/dataconnect/schemaMigration.js

@@ -104,7 +104,7 @@ async function diffSchema(options, schema, schemaValidation) {
 exports.diffSchema = diffSchema;
 async function migrateSchema(args) {
     var _a;
-    const { options, schema, validateOnly, schemaValidation } = args;
+    const { options, schema, validateOnly, schemaValidation, stats } = args;
     let validationMode = schemaValidation !== null && schemaValidation !== void 0 ? schemaValidation : "COMPATIBLE";
     setSchemaValidationMode(schema, validationMode);
     displayStartSchemaDiff(validationMode);
@@ -113,6 +113,9 @@ async function migrateSchema(args) {
     await ensureServiceIsConnectedToCloudSql(serviceName, instanceName, databaseId, true);
     const existingInstance = await cloudSqlAdminClient.getInstance(projectId, instanceId);
     if (existingInstance.state === "PENDING_CREATE") {
+        if (stats) {
+            stats.numSchemaSkippedDueToPendingCreate++;
+        }
         const postgresql = (_a = schema.datasources.find((d) => d.postgresql)) === null || _a === void 0 ? void 0 : _a.postgresql;
         if (!postgresql) {
             throw new error_1.FirebaseError(`Cannot find Postgres datasource in the schema to deploy: ${serviceName}/schemas/${types_1.SCHEMA_ID}.\nIts datasources: ${JSON.stringify(schema.datasources)}`);
@@ -145,6 +148,14 @@ async function migrateSchema(args) {
             }
             throw err;
         }
+        if (stats) {
+            if (incompatible) {
+                stats.numSchemaSqlDiffs += incompatible.diffs.length;
+            }
+            if (invalidConnectors.length) {
+                stats.numSchemaInvalidConnectors += invalidConnectors.length;
+            }
+        }
         const migrationMode = await promptForSchemaMigration(options, instanceId, databaseId, incompatible, validateOnly, validationMode);
         const shouldDeleteInvalidConnectors = await promptForInvalidConnectorError(options, serviceName, invalidConnectors, validateOnly);
         if (incompatible) {
@@ -174,10 +185,12 @@ async function migrateSchema(args) {
                 throw err;
             }
             const incompatible = errors.getIncompatibleSchemaError(err);
-            const invalidConnectors = errors.getInvalidConnectors(err);
-            if (!incompatible && !invalidConnectors.length) {
+            if (!incompatible) {
                 throw err;
             }
+            if (stats && incompatible) {
+                stats.numSchemaSqlDiffs += incompatible.diffs.length;
+            }
             const migrationMode = await promptForSchemaMigration(options, instanceId, databaseId, incompatible, validateOnly, "STRICT_AFTER_COMPATIBLE");
             if (incompatible) {
                 const maybeDiffs = await handleIncompatibleSchemaError({

package/lib/dataconnect/types.js

@@ -1,21 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isGraphQLResponseError = exports.isGraphQLResponse = exports.toDatasource = exports.Platform = exports.requiresVector = exports.SCHEMA_ID = void 0;
+exports.isGraphQLResponseError = exports.isGraphQLResponse = exports.toDatasource = exports.requiresVector = exports.SCHEMA_ID = void 0;
 exports.SCHEMA_ID = "main";
 function requiresVector(dm) {
     var _a, _b, _c, _d;
     return (_d = (_c = (_b = (_a = dm === null || dm === void 0 ? void 0 : dm.primaryDataSource) === null || _a === void 0 ? void 0 : _a.postgres) === null || _b === void 0 ? void 0 : _b.requiredExtensions) === null || _c === void 0 ? void 0 : _c.includes("vector")) !== null && _d !== void 0 ? _d : false;
 }
 exports.requiresVector = requiresVector;
-var Platform;
-(function (Platform) {
-    Platform["NONE"] = "NONE";
-    Platform["ANDROID"] = "ANDROID";
-    Platform["WEB"] = "WEB";
-    Platform["IOS"] = "IOS";
-    Platform["FLUTTER"] = "FLUTTER";
-    Platform["MULTIPLE"] = "MULTIPLE";
-})(Platform = exports.Platform || (exports.Platform = {}));
 function toDatasource(projectId, locationId, ds) {
     if (ds === null || ds === void 0 ? void 0 : ds.postgresql) {
         return {

package/lib/deploy/dataconnect/context.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.deployStatsParams = exports.initDeployStats = void 0;
+function initDeployStats() {
+    return {
+        numBuildErrors: 0,
+        numBuildWarnings: new Map(),
+        numServiceCreated: 0,
+        numServiceDeleted: 0,
+        numSchemaMigrated: 0,
+        numConnectorUpdatedBeforeSchema: 0,
+        numConnectorUpdatedAfterSchema: 0,
+        numSchemaSkippedDueToPendingCreate: 0,
+        numSchemaSqlDiffs: 0,
+        numSchemaInvalidConnectors: 0,
+    };
+}
+exports.initDeployStats = initDeployStats;
+function deployStatsParams(stats) {
+    const buildWarnings = {};
+    for (const [type, num] of stats.numBuildWarnings.entries()) {
+        buildWarnings[`num_build_warnings_${type}`] = num;
+    }
+    return Object.assign({ missing_billing: (!!stats.missingBilling).toString(), num_service_created: stats.numServiceCreated, num_service_deleted: stats.numServiceDeleted, num_schema_migrated: stats.numSchemaMigrated, num_connector_updated_before_schema: stats.numConnectorUpdatedBeforeSchema, num_connector_updated_after_schema: stats.numConnectorUpdatedAfterSchema, num_schema_skipped_due_to_pending_create: stats.numSchemaSkippedDueToPendingCreate, num_schema_sql_diffs: stats.numSchemaSqlDiffs, num_schema_invalid_connectors: stats.numSchemaInvalidConnectors, num_build_errors: stats.numBuildErrors }, buildWarnings);
+}
+exports.deployStatsParams = deployStatsParams;

package/lib/deploy/dataconnect/deploy.js

@@ -10,10 +10,14 @@ const api_1 = require("../../api");
 const ensureApiEnabled = require("../../ensureApiEnabled");
 const prompt_1 = require("../../prompt");
 async function default_1(context, options) {
+    const dataconnect = context.dataconnect;
+    if (!dataconnect) {
+        throw new Error("dataconnect.prepare must be run before dataconnect.deploy");
+    }
     const projectId = (0, projectUtils_1.needProjectId)(options);
-    const serviceInfos = context.dataconnect.serviceInfos;
+    const serviceInfos = dataconnect.serviceInfos;
     const services = await client.listAllServices(projectId);
-    const filters = context.dataconnect.filters;
+    const filters = dataconnect.filters;
     if (serviceInfos.some((si) => {
         return (0, types_1.requiresVector)(si.deploymentMetadata);
     })) {
@@ -22,11 +26,14 @@ async function default_1(context, options) {
     const servicesToCreate = serviceInfos
         .filter((si) => !services.some((s) => matches(si, s)))
         .filter((si) => {
-        return !filters || (filters === null || filters === void 0 ? void 0 : filters.some((f) => si.dataConnectYaml.serviceId === f.serviceId));
+        return (!filters ||
+            (filters === null || filters === void 0 ? void 0 : filters.some((f) => si.dataConnectYaml.serviceId === f.serviceId)));
     });
+    dataconnect.deployStats.numServiceCreated = servicesToCreate.length;
     const servicesToDelete = filters
         ? []
         : services.filter((s) => !serviceInfos.some((si) => matches(si, s)));
+    dataconnect.deployStats.numServiceDeleted = servicesToDelete.length;
     await Promise.all(servicesToCreate.map(async (s) => {
         const { projectId, locationId, serviceId } = splitName(s.serviceName);
         await client.createService(projectId, locationId, serviceId);
@@ -49,7 +56,8 @@ async function default_1(context, options) {
     utils.logLabeledBullet("dataconnect", "Checking for CloudSQL resources...");
     await Promise.all(serviceInfos
         .filter((si) => {
-        return !filters || (filters === null || filters === void 0 ? void 0 : filters.some((f) => si.dataConnectYaml.serviceId === f.serviceId));
+        return (!filters ||
+            (filters === null || filters === void 0 ? void 0 : filters.some((f) => si.dataConnectYaml.serviceId === f.serviceId)));
     })
         .map(async (s) => {
         var _a, _b, _c;
@@ -66,6 +74,7 @@ async function default_1(context, options) {
                 instanceId,
                 databaseId,
                 requireGoogleMlIntegration: (0, types_1.requiresVector)(s.deploymentMetadata),
+                source: "deploy",
             });
         }
     }));

package/lib/deploy/dataconnect/prepare.js

@@ -17,18 +17,24 @@ const error_1 = require("../../error");
 const types_1 = require("../../dataconnect/types");
 const schemaMigration_1 = require("../../dataconnect/schemaMigration");
 const freeTrial_1 = require("../../dataconnect/freeTrial");
+const context_1 = require("./context");
 async function default_1(context, options) {
     var _a, _b, _c;
     const projectId = (0, projectUtils_1.needProjectId)(options);
+    await (0, ensureApis_1.ensureApis)(projectId);
+    context.dataconnect = {
+        serviceInfos: await (0, load_1.loadAll)(projectId, options.config),
+        filters: (0, filters_1.getResourceFilters)(options),
+        deployStats: (0, context_1.initDeployStats)(),
+    };
+    const { serviceInfos, filters, deployStats } = context.dataconnect;
     if (!(await (0, cloudbilling_1.checkBillingEnabled)(projectId))) {
+        deployStats.missingBilling = true;
         throw new error_1.FirebaseError((0, freeTrial_1.upgradeInstructions)(projectId));
     }
-    await (0, ensureApis_1.ensureApis)(projectId);
     await (0, requireTosAcceptance_1.requireTosAcceptance)(firedata_1.DATA_CONNECT_TOS_ID)(options);
-    const filters = (0, filters_1.getResourceFilters)(options);
-    const serviceInfos = await (0, load_1.loadAll)(projectId, options.config);
     for (const si of serviceInfos) {
-        si.deploymentMetadata = await (0, build_1.build)(options, si.sourceDirectory, options.dryRun);
+        si.deploymentMetadata = await (0, build_1.build)(options, si.sourceDirectory, deployStats);
     }
     const unmatchedFilters = filters === null || filters === void 0 ? void 0 : filters.filter((f) => {
         const serviceMatched = serviceInfos.some((s) => s.dataConnectYaml.serviceId === f.serviceId);
@@ -43,10 +49,6 @@ async function default_1(context, options) {
     if (unmatchedFilters === null || unmatchedFilters === void 0 ? void 0 : unmatchedFilters.length) {
         throw new error_1.FirebaseError(`The following filters were specified in --only but didn't match anything in this project: ${unmatchedFilters.map(filters_1.toString).map(clc.bold).join(", ")}`);
     }
-    context.dataconnect = {
-        serviceInfos,
-        filters,
-    };
     utils.logLabeledBullet("dataconnect", `Successfully compiled schema and connectors`);
     if (options.dryRun) {
         for (const si of serviceInfos) {
@@ -73,6 +75,7 @@ async function default_1(context, options) {
                     databaseId,
                     requireGoogleMlIntegration: (0, types_1.requiresVector)(s.deploymentMetadata),
                     dryRun: true,
+                    source: "deploy",
                 });
             }
         }));

package/lib/deploy/dataconnect/release.js

@@ -8,9 +8,13 @@ const projectUtils_1 = require("../../projectUtils");
 const names_1 = require("../../dataconnect/names");
 const logger_1 = require("../../logger");
 async function default_1(context, options) {
+    const dataconnect = context.dataconnect;
+    if (!dataconnect) {
+        throw new Error("dataconnect.prepare must be run before dataconnect.release");
+    }
     const project = (0, projectUtils_1.needProjectId)(options);
-    const serviceInfos = context.dataconnect.serviceInfos;
-    const filters = context.dataconnect.filters;
+    const serviceInfos = dataconnect.serviceInfos;
+    const filters = dataconnect.filters;
     const wantSchemas = serviceInfos
         .filter((si) => {
         return (!filters ||
@@ -43,6 +47,7 @@ async function default_1(context, options) {
             return c;
         }
         utils.logLabeledSuccess("dataconnect", `Deployed connector ${c.name}`);
+        dataconnect.deployStats.numConnectorUpdatedBeforeSchema++;
         return undefined;
     }));
     for (const s of wantSchemas) {
@@ -51,13 +56,16 @@ async function default_1(context, options) {
             schema: s.schema,
             validateOnly: false,
             schemaValidation: s.validationMode,
+            stats: dataconnect.deployStats,
         });
         utils.logLabeledSuccess("dataconnect", `Migrated schema ${s.schema.name}`);
+        dataconnect.deployStats.numSchemaMigrated++;
     }
     await Promise.all(remainingConnectors.map(async (c) => {
         if (c) {
             await (0, client_1.upsertConnector)(c);
             utils.logLabeledSuccess("dataconnect", `Deployed connector ${c.name}`);
+            dataconnect.deployStats.numConnectorUpdatedAfterSchema++;
         }
     }));
     const allConnectors = await deployedConnectors(serviceInfos);

package/lib/deploy/index.js

@@ -26,6 +26,7 @@ const prepare_1 = require("./hosting/prepare");
 const github_1 = require("../init/features/hosting/github");
 const deploy_1 = require("../commands/deploy");
 const requirePermissions_1 = require("../requirePermissions");
+const context_1 = require("./dataconnect/context");
 const TARGETS = {
     hosting: HostingTarget,
     database: DatabaseTarget,
@@ -63,7 +64,7 @@ const isDeployingWebFramework = (options) => {
 };
 exports.isDeployingWebFramework = isDeployingWebFramework;
 const deploy = async function (targetNames, options, customContext = {}) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     const projectId = (0, projectUtils_1.needProjectId)(options);
     const payload = {};
     const context = Object.assign({ projectId }, customContext);
@@ -115,34 +116,52 @@ const deploy = async function (targetNames, options, customContext = {}) {
     logger_1.logger.info((0, colorette_1.bold)((0, colorette_1.white)("===") + " Deploying to '" + projectId + "'..."));
     logger_1.logger.info();
     (0, utils_1.logBullet)("deploying " + (0, colorette_1.bold)(targetNames.join(", ")));
-    await chain(predeploys, context, options, payload);
-    await chain(prepares, context, options, payload);
-    await chain(deploys, context, options, payload);
-    await chain(releases, context, options, payload);
-    await chain(postdeploys, context, options, payload);
-    const duration = Date.now() - startTime;
-    const analyticsParams = {
-        interactive: options.nonInteractive ? "false" : "true",
-    };
-    Object.keys(TARGETS).reduce((accum, t) => {
-        accum[t] = "false";
-        return accum;
-    }, analyticsParams);
-    for (const t of targetNames) {
-        analyticsParams[t] = "true";
+    let result = "predeploys_error";
+    try {
+        await chain(predeploys, context, options, payload);
+        result = "prepares_error";
+        await chain(prepares, context, options, payload);
+        result = "deploys_error";
+        await chain(deploys, context, options, payload);
+        result = "releases_error";
+        await chain(releases, context, options, payload);
+        result = "postdeploys_error";
+        await chain(postdeploys, context, options, payload);
+        result = "success";
+    }
+    finally {
+        const baseParams = {
+            interactive: options.nonInteractive ? "false" : "true",
+            dry_run: options.dryRun ? "true" : "false",
+            result: result,
+        };
+        const duration = Date.now() - startTime;
+        const params = Object.assign({}, baseParams);
+        Object.keys(TARGETS).reduce((accum, t) => {
+            accum[t] = "false";
+            return accum;
+        }, params);
+        for (const t of targetNames) {
+            params[t] = "true";
+        }
+        void (0, track_1.trackGA4)("product_deploy", params, duration);
+        const stats = (_a = context === null || context === void 0 ? void 0 : context.dataconnect) === null || _a === void 0 ? void 0 : _a.deployStats;
+        if (stats) {
+            const fdcParams = (0, context_1.deployStatsParams)(stats);
+            void (0, track_1.trackGA4)("dataconnect_deploy", Object.assign(Object.assign({}, fdcParams), baseParams), duration);
+        }
     }
-    await (0, track_1.trackGA4)("product_deploy", analyticsParams, duration);
     const successMessage = options.dryRun ? "Dry run complete!" : "Deploy complete!";
     logger_1.logger.info();
     (0, utils_1.logSuccess)((0, colorette_1.bold)((0, colorette_1.underline)(successMessage)));
     logger_1.logger.info();
     const deployedHosting = (0, lodash_1.includes)(targetNames, "hosting");
-    logger_1.logger.info((0, colorette_1.bold)("Project Console:"), (0, utils_1.consoleUrl)((_a = options.project) !== null && _a !== void 0 ? _a : "_", "/overview"));
+    logger_1.logger.info((0, colorette_1.bold)("Project Console:"), (0, utils_1.consoleUrl)((_b = options.project) !== null && _b !== void 0 ? _b : "_", "/overview"));
     if (deployedHosting) {
-        (0, lodash_1.each)((_b = context.hosting) === null || _b === void 0 ? void 0 : _b.deploys, (deploy) => {
+        (0, lodash_1.each)((_c = context.hosting) === null || _c === void 0 ? void 0 : _c.deploys, (deploy) => {
             logger_1.logger.info((0, colorette_1.bold)("Hosting URL:"), (0, utils_1.addSubdomain)((0, api_1.hostingOrigin)(), deploy.config.site));
         });
-        const versionNames = (_c = context.hosting) === null || _c === void 0 ? void 0 : _c.deploys.map((deploy) => deploy.version);
+        const versionNames = (_d = context.hosting) === null || _d === void 0 ? void 0 : _d.deploys.map((deploy) => deploy.version);
         return { hosting: (versionNames === null || versionNames === void 0 ? void 0 : versionNames.length) === 1 ? versionNames[0] : versionNames };
     }
     else {

package/lib/emulator/downloadableEmulatorInfo.json

@@ -54,28 +54,28 @@
     },
     "dataconnect": {
         "darwin": {
-            "version": "2.14.0",
-            "expectedSize": 29602656,
-            "expectedChecksum": "4570cfde37b7def2ac9ead63752dda34",
-            "expectedChecksumSHA256": "88d3e13e860be59bc3520fe685b695be51341d13203838d48e7502c62504acb8",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-v2.14.0",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.14.0"
+            "version": "2.15.0",
+            "expectedSize": 29610848,
+            "expectedChecksum": "182ddca17f4974ec081fd5a769f8eeac",
+            "expectedChecksumSHA256": "3bcdc39b7f149f8c2d96f397188ca003daf1b43a1ce845780146b79217970a52",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-v2.15.0",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.15.0"
         },
         "win32": {
-            "version": "2.14.0",
-            "expectedSize": 30091264,
-            "expectedChecksum": "43338765d5f7ec2fabb6fe8f212bab82",
-            "expectedChecksumSHA256": "1de9ce32f4958c6e1e56ca7a0a7f5f4364d6cd17de77d08f76d3638830bc3c16",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-windows-v2.14.0",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.14.0.exe"
+            "version": "2.15.0",
+            "expectedSize": 30099456,
+            "expectedChecksum": "5dd4efd368c3987925c41784e21c7af6",
+            "expectedChecksumSHA256": "a664f29cd21f826dd4936f8b95f0673e0ea603ab0d85a426d8231f1aaa8947f9",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-windows-v2.15.0",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.15.0.exe"
         },
         "linux": {
-            "version": "2.14.0",
-            "expectedSize": 29524152,
-            "expectedChecksum": "711dd1e6d97bbeabc070efcdf0a22ee4",
-            "expectedChecksumSHA256": "bc468019bfb87b846adf02f21f65e5243854dbeee72258fe98f5e3201d1b1363",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-linux-v2.14.0",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.14.0"
+            "version": "2.15.0",
+            "expectedSize": 29532344,
+            "expectedChecksum": "38baf423fbfc9c67a89975a27f0a3974",
+            "expectedChecksumSHA256": "d3c5b26470639fedce9e3ac667948fa07473e77f6c2d0b361d78c5f2e856a1ec",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-linux-v2.15.0",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.15.0"
         }
     }
 }

package/lib/gcp/cloudsql/cloudsqladmin.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.listUsers = exports.deleteUser = exports.getUser = exports.createUser = exports.deleteDatabase = exports.createDatabase = exports.getDatabase = exports.listDatabases = exports.updateInstanceForDataConnect = exports.createInstance = exports.instanceConsoleLink = exports.getInstance = exports.listInstances = exports.iamUserIsCSQLAdmin = void 0;
+exports.listUsers = exports.deleteUser = exports.getUser = exports.createUser = exports.deleteDatabase = exports.createDatabase = exports.getDatabase = exports.listDatabases = exports.updateInstanceForDataConnect = exports.createInstance = exports.DEFAULT_DATABASE_VERSION = exports.instanceConsoleLink = exports.getInstance = exports.listInstances = exports.iamUserIsCSQLAdmin = void 0;
 const apiv2_1 = require("../../apiv2");
 const api_1 = require("../../api");
 const clc = require("colorette");
@@ -51,6 +51,7 @@ function instanceConsoleLink(projectId, instanceId) {
     return `https://console.cloud.google.com/sql/instances/${instanceId}/overview?project=${projectId}`;
 }
 exports.instanceConsoleLink = instanceConsoleLink;
+exports.DEFAULT_DATABASE_VERSION = "POSTGRES_15";
 async function createInstance(args) {
     const databaseFlags = [{ name: "cloudsql.iam_authentication", value: "on" }];
     if (args.enableGoogleMlIntegration) {
@@ -60,7 +61,7 @@ async function createInstance(args) {
         await client.post(`projects/${args.projectId}/instances`, {
             name: args.instanceId,
             region: args.location,
-            databaseVersion: "POSTGRES_15",
+            databaseVersion: exports.DEFAULT_DATABASE_VERSION,
             settings: {
                 tier: "db-f1-micro",
                 edition: "ENTERPRISE",
@@ -70,7 +71,7 @@ async function createInstance(args) {
                 enableGoogleMlIntegration: args.enableGoogleMlIntegration,
                 databaseFlags,
                 storageAutoResize: false,
-                userLabels: { "firebase-data-connect": args.freeTrial ? "ft" : "nt" },
+                userLabels: { "firebase-data-connect": args.freeTrialLabel },
                 insightsConfig: {
                     queryInsightsEnabled: true,
                     queryPlansPerMinute: 5,