firebase-tools 13.29.0 → 13.29.2

package/lib/commands/appdistribution-distribute.js

@@ -51,7 +51,7 @@ exports.command = new command_1.Command("appdistribution:distribute <release-bin
     const testCases = (0, options_parser_util_1.parseIntoStringArray)(options.testCaseIds, options.testCaseIdsFile);
     const testDevices = (0, options_parser_util_1.parseTestDevices)(options.testDevices, options.testDevicesFile);
     if (testCases.length && (options.testUsernameResource || options.testPasswordResource)) {
-        throw new error_1.FirebaseError("Password and username resource names are not supported for the AI testing agent.");
+        throw new error_1.FirebaseError("Password and username resource names are not supported for the testing agent.");
     }
     const loginCredential = (0, options_parser_util_1.getLoginCredential)({
         username: options.testUsername,

package/lib/dataconnect/build.js

@@ -1,15 +1,74 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.build = void 0;
+exports.handleBuildErrors = exports.build = void 0;
 const dataconnectEmulator_1 = require("../emulator/dataconnectEmulator");
 const error_1 = require("../error");
+const experiments = require("../experiments");
+const prompt_1 = require("../prompt");
+const utils = require("../utils");
 const graphqlError_1 = require("./graphqlError");
-async function build(options, configDir) {
+async function build(options, configDir, dryRun) {
     var _a, _b;
-    const buildResult = await dataconnectEmulator_1.DataConnectEmulator.build({ configDir });
+    const args = { configDir };
+    if (experiments.isEnabled("fdcconnectorevolution") && options.projectId) {
+        const flags = process.env["DATA_CONNECT_PREVIEW"];
+        if (flags) {
+            process.env["DATA_CONNECT_PREVIEW"] = flags + ",conn_evolution";
+        }
+        else {
+            process.env["DATA_CONNECT_PREVIEW"] = "conn_evolution";
+        }
+        args.projectId = options.projectId;
+    }
+    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) {
-        throw new error_1.FirebaseError(`There are errors in your schema and connector files:\n${buildResult.errors.map(graphqlError_1.prettify).join("\n")}`);
+        await handleBuildErrors(buildResult.errors, options.nonInteractive, options.force, dryRun);
     }
     return (_b = buildResult === null || buildResult === void 0 ? void 0 : buildResult.metadata) !== null && _b !== void 0 ? _b : {};
 }
 exports.build = build;
+async function handleBuildErrors(errors, nonInteractive, force, dryRun) {
+    if (errors.filter((w) => { var _a; return !((_a = w.extensions) === null || _a === void 0 ? void 0 : _a.warningLevel); }).length) {
+        throw new error_1.FirebaseError(`There are errors in your schema and connector files:\n${errors.map(graphqlError_1.prettify).join("\n")}`);
+    }
+    const interactiveAcks = errors.filter((w) => { var _a; return ((_a = w.extensions) === null || _a === void 0 ? void 0 : _a.warningLevel) === "INTERACTIVE_ACK"; });
+    const requiredAcks = errors.filter((w) => { var _a; return ((_a = w.extensions) === null || _a === void 0 ? void 0 : _a.warningLevel) === "REQUIRE_ACK"; });
+    const choices = [
+        { name: "Acknowledge all changes and proceed", value: "proceed" },
+        { name: "Reject changes and abort", value: "abort" },
+    ];
+    if (requiredAcks.length) {
+        utils.logLabeledWarning("dataconnect", `There are changes in your schema or connectors that may break your existing applications. These changes require explicit acknowledgement to proceed. You may either reject the changes and update your sources with the suggested workaround(s), if any, or acknowledge these changes and proceed with the deployment:\n` +
+            (0, graphqlError_1.prettifyWithWorkaround)(requiredAcks));
+        if (nonInteractive && !force) {
+            throw new error_1.FirebaseError("Explicit acknowledgement required for breaking schema or connector changes. Rerun this command with --force to deploy these changes.");
+        }
+        else if (!nonInteractive && !force && !dryRun) {
+            const result = await (0, prompt_1.promptOnce)({
+                message: "Would you like to proceed with these breaking changes?",
+                type: "list",
+                choices,
+                default: "abort",
+            });
+            if (result === "abort") {
+                throw new error_1.FirebaseError(`Deployment aborted.`);
+            }
+        }
+    }
+    if (interactiveAcks.length) {
+        utils.logLabeledWarning("dataconnect", `There are changes in your schema or connectors that may cause unexpected behavior in your existing applications:\n` +
+            interactiveAcks.map(graphqlError_1.prettify).join("\n"));
+        if (!nonInteractive && !force && !dryRun) {
+            const result = await (0, prompt_1.promptOnce)({
+                message: "Would you like to proceed with these changes?",
+                type: "list",
+                choices,
+                default: "proceed",
+            });
+            if (result === "abort") {
+                throw new error_1.FirebaseError(`Deployment aborted.`);
+            }
+        }
+    }
+}
+exports.handleBuildErrors = handleBuildErrors;

package/lib/dataconnect/freeTrial.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.upgradeInstructions = exports.printFreeTrialUnavailable = exports.getFreeTrialInstanceId = exports.checkFreeTrialInstanceUsed = exports.freeTrialTermsLink = void 0;
+exports.upgradeInstructions = exports.printFreeTrialUnavailable = exports.isFreeTrialError = exports.getFreeTrialInstanceId = exports.checkFreeTrialInstanceUsed = exports.freeTrialTermsLink = void 0;
 const cloudmonitoring_1 = require("../gcp/cloudmonitoring");
 const cloudsqladmin_1 = require("../gcp/cloudsql/cloudsqladmin");
 const utils = require("../utils");
@@ -36,17 +36,23 @@ async function getFreeTrialInstanceId(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("data connect", "The CloudSQL free trial has already been used on this project.");
-        utils.logLabeledError("data connect", `You may create or use a paid CloudSQL instance by visiting https://console.cloud.google.com/sql/instances`);
+        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("data connect", `Project '${projectId} already has a CloudSQL instance '${instanceId}' on the Firebase Data Connect no-cost trial.`);
+    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("data connect", reuseHint);
-    utils.logLabeledError("data connect", `Alternatively, you may create a new (paid) CloudSQL instance at https://console.cloud.google.com/sql/instances`);
+    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) {

package/lib/dataconnect/graphqlError.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.prettify = void 0;
+exports.prettifyWithWorkaround = exports.prettify = void 0;
+const Table = require("cli-table");
 function prettify(err) {
     var _a, _b, _c, _d;
     const message = err.message;
@@ -14,3 +15,28 @@ function prettify(err) {
     return header.length ? `${header}: ${message}` : message;
 }
 exports.prettify = prettify;
+function prettifyWithWorkaround(errs) {
+    var _a, _b;
+    const table = new Table({
+        head: ["Issue", "Workaround", "Reason"],
+        style: { head: ["yellow"] },
+    });
+    for (const e of errs) {
+        if (!((_b = (_a = e.extensions) === null || _a === void 0 ? void 0 : _a.workarounds) === null || _b === void 0 ? void 0 : _b.length)) {
+            table.push([prettify(e), "", ""]);
+        }
+        else {
+            const workarounds = e.extensions.workarounds;
+            for (let i = 0; i < workarounds.length; i++) {
+                if (i === 0) {
+                    table.push([prettify(e), workarounds[i].Description, workarounds[i].Reason]);
+                }
+                else {
+                    table.push(["", workarounds[i].Description, workarounds[i].Reason]);
+                }
+            }
+        }
+    }
+    return table.toString();
+}
+exports.prettifyWithWorkaround = prettifyWithWorkaround;

package/lib/dataconnect/provisionCloudSql.js

@@ -33,11 +33,6 @@ async function provisionCloudSql(args) {
         if (err.status !== 404) {
             throw err;
         }
-        const freeTrialInstanceId = await (0, freeTrial_1.getFreeTrialInstanceId)(projectId);
-        if (await (0, freeTrial_1.checkFreeTrialInstanceUsed)(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.");
-        }
         const cta = dryRun ? "It will be created on your next deploy" : "Creating it now.";
         silent ||
             utils.logLabeledBullet("dataconnect", `CloudSQL instance '${instanceId}' not found.` +
@@ -45,15 +40,25 @@ async function provisionCloudSql(args) {
                 `\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)}`);
         if (!dryRun) {
-            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) || "";
+            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;
+                }
             }
-            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;
+            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;
             }
         }
     }

package/lib/dataconnect/schemaMigration.js

@@ -345,6 +345,7 @@ async function ensureServiceIsConnectedToCloudSql(serviceName, instanceId, datab
                 {
                     postgresql: {
                         database: databaseId,
+                        schemaValidation: "NONE",
                         cloudSql: {
                             instance: instanceId,
                         },
@@ -361,7 +362,7 @@ async function ensureServiceIsConnectedToCloudSql(serviceName, instanceId, datab
     if ((postgresql === null || postgresql === void 0 ? void 0 : postgresql.database) !== databaseId) {
         (0, utils_1.logLabeledWarning)("dataconnect", `Switching connected Postgres database from ${postgresql === null || postgresql === void 0 ? void 0 : postgresql.database} to ${databaseId}`);
     }
-    if (!postgresql || postgresql.schemaValidation === "STRICT") {
+    if (!postgresql || postgresql.schemaValidation !== "NONE") {
         return;
     }
     postgresql.schemaValidation = "STRICT";

package/lib/deploy/dataconnect/prepare.js

@@ -32,7 +32,7 @@ async function default_1(context, options) {
     const filters = (0, filters_1.getResourceFilters)(options);
     const serviceInfos = await Promise.all(serviceCfgs.map((c) => (0, load_1.load)(projectId, options.config, c.source)));
     for (const si of serviceInfos) {
-        si.deploymentMetadata = await (0, build_1.build)(options, si.sourceDirectory);
+        si.deploymentMetadata = await (0, build_1.build)(options, si.sourceDirectory, options.dryRun);
     }
     const unmatchedFilters = filters === null || filters === void 0 ? void 0 : filters.filter((f) => {
         const serviceMatched = serviceInfos.some((s) => s.dataConnectYaml.serviceId === f.serviceId);

package/lib/emulator/apphosting/serve.js

@@ -10,6 +10,8 @@ const developmentServer_2 = require("./developmentServer");
 const types_1 = require("../types");
 const config_1 = require("./config");
 const projectPath_1 = require("../../projectPath");
+const registry_1 = require("../registry");
+const env_1 = require("../env");
 async function start(options) {
     var _a;
     const hostname = constants_1.DEFAULT_HOST;
@@ -29,7 +31,7 @@ async function serve(port, startCommand, backendRelativeDir) {
     for (const env of apphostingLocalConfig.environmentVariables) {
         environmentVariablesAsRecord[env.variable] = env.value;
     }
-    const environmentVariablesToInject = Object.assign(Object.assign({}, environmentVariablesAsRecord), { PORT: port.toString() });
+    const environmentVariablesToInject = Object.assign(Object.assign(Object.assign({}, getEmulatorEnvs()), environmentVariablesAsRecord), { 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);
@@ -46,3 +48,9 @@ function availablePort(host, port) {
         family: (0, net_1.isIPv4)(host) ? "IPv4" : "IPv6",
     });
 }
+function getEmulatorEnvs() {
+    const envs = {};
+    const emulatorInfos = registry_1.EmulatorRegistry.listRunningWithInfo();
+    (0, env_1.setEnvVarsForEmulators)(envs, emulatorInfos);
+    return envs;
+}

package/lib/emulator/controller.js

@@ -572,6 +572,7 @@ async function startAll(options, showUI = true, runningTestScript = false) {
             postgresListen: listenForEmulator["dataconnect.postgres"],
             enable_output_generated_sdk: true,
             enable_output_schema_extensions: true,
+            debug: options.debug,
         };
         if (exportMetadata.dataconnect) {
             utils.assertIsString(options.import);
@@ -588,7 +589,7 @@ async function startAll(options, showUI = true, runningTestScript = false) {
                         default: false,
                     }))) {
                     await cleanShutdown();
-                    return { deprecationNotices: [] };
+                    throw new error_1.FirebaseError("Command aborted");
                 }
             }
             emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.DATACONNECT).logLabeled("BULLET", "dataconnect", `Importing data from ${exportMetadataFilePath}`);

package/lib/emulator/dataconnect/pgliteServer.js

@@ -30,13 +30,14 @@ const logger_1 = require("../../logger");
 const error_1 = require("../../error");
 exports.TRUNCATE_TABLES_SQL = `
 DO $do$
+DECLARE _clear text;
 BEGIN
-   EXECUTE
-   (SELECT 'TRUNCATE TABLE ' || string_agg(oid::regclass::text, ', ') || ' CASCADE'
+   SELECT 'TRUNCATE TABLE ' || string_agg(oid::regclass::text, ', ') || ' CASCADE'
     FROM   pg_class
     WHERE  relkind = 'r'
     AND    relnamespace = 'public'::regnamespace
-   );
+   INTO _clear;
+  EXECUTE COALESCE(_clear, 'select now()');
 END
 $do$;`;
 class PostgresServer {
@@ -77,8 +78,6 @@ class PostgresServer {
             const vector = (await dynamicImport("@electric-sql/pglite/vector")).vector;
             const uuidOssp = (await dynamicImport("@electric-sql/pglite/contrib/uuid_ossp")).uuid_ossp;
             const pgliteArgs = {
-                username: this.username,
-                database: this.database,
                 debug: this.debug,
                 extensions: {
                     vector,
@@ -133,8 +132,6 @@ class PostgresServer {
     constructor(args) {
         this.db = undefined;
         this.server = undefined;
-        this.username = args.username;
-        this.database = args.database;
         this.dataDirectory = args.dataDirectory;
         this.importPath = args.importPath;
         this.debug = args.debug ? 5 : 0;

package/lib/emulator/dataconnectEmulator.js

@@ -65,13 +65,14 @@ class DataConnectEmulator {
                 this.logger.logLabeled("INFO", "dataconnect", `FIREBASE_DATACONNECT_POSTGRESQL_STRING is set to ${clc.bold(connStr)} - using that instead of starting a new database`);
             }
             else if (pgHost && pgPort) {
-                const dataDirectory = this.args.config.get("emulators.dataconnect.dataDir");
+                let dataDirectory = this.args.config.get("emulators.dataconnect.dataDir");
+                if (dataDirectory) {
+                    dataDirectory = this.args.config.path(dataDirectory);
+                }
                 const postgresDumpPath = this.args.importPath
-                    ? path.join(this.args.importPath, "postgres.tar.gz")
+                    ? path.join(this.args.config.path(this.args.importPath), "postgres.tar.gz")
                     : undefined;
                 this.postgresServer = new pgliteServer_1.PostgresServer({
-                    database: dbId,
-                    username: "fdc",
                     dataDirectory,
                     importPath: postgresDumpPath,
                     debug: this.args.debug,
@@ -137,7 +138,7 @@ class DataConnectEmulator {
     }
     async exportData(exportPath) {
         if (this.postgresServer) {
-            await this.postgresServer.exportData(path.join(exportPath, "postgres.tar.gz"));
+            await this.postgresServer.exportData(path.join(this.args.config.path(exportPath), "postgres.tar.gz"));
         }
         else {
             throw new error_1.FirebaseError("The Data Connect emulator is currently connected to a separate Postgres instance. Export is not supported.");
@@ -176,6 +177,9 @@ class DataConnectEmulator {
         var _a;
         const commandInfo = await (0, downloadableEmulators_1.downloadIfNecessary)(types_1.Emulators.DATACONNECT);
         const cmd = ["--logtostderr", "-v=2", "build", `--config_dir=${args.configDir}`];
+        if (args.projectId) {
+            cmd.push(`--project_id=${args.projectId}`);
+        }
         const res = childProcess.spawnSync(commandInfo.binary, cmd, { encoding: "utf-8" });
         if ((0, downloadableEmulators_1.isIncomaptibleArchError)(res.error)) {
             throw new error_1.FirebaseError(`Unkown system error when running the Data Connect toolkit. ` +

package/lib/emulator/downloadableEmulators.js

@@ -48,20 +48,20 @@ const EMULATOR_UPDATE_DETAILS = {
     },
     dataconnect: process.platform === "darwin"
         ? {
-            version: "1.7.5",
-            expectedSize: 25281280,
-            expectedChecksum: "85d0de96b5c08b553fd8506a2bc381bb",
+            version: "1.7.6",
+            expectedSize: 25322240,
+            expectedChecksum: "2dda7394330fd1aba37605466941eef0",
         }
         : process.platform === "win32"
             ? {
-                version: "1.7.5",
-                expectedSize: 25711616,
-                expectedChecksum: "c99d67fa8e74d41760b96122b055b8e2",
+                version: "1.7.6",
+                expectedSize: 25752064,
+                expectedChecksum: "283c11e28a0072b596531b79462a8e94",
             }
             : {
-                version: "1.7.5",
-                expectedSize: 25190552,
-                expectedChecksum: "61d966b781e6f2887f8b38ec271b54e2",
+                version: "1.7.6",
+                expectedSize: 25235608,
+                expectedChecksum: "f66e24b3726df57cd1f1685a64a87904",
             },
 };
 exports.DownloadDetails = {

package/lib/emulator/hub.js

@@ -118,7 +118,7 @@ class EmulatorHub extends ExpressBasedEmulator_1.ExpressBasedEmulator {
                 return;
             }
             await instance.clearData();
-            res.status(200).send("Data cleared");
+            res.status(200).json({ success: true });
         });
         return app;
     }

package/lib/emulator/hubClient.js

@@ -38,6 +38,11 @@ class EmulatorHubClient {
         const res = await this.tryOrigins((client) => client.get(hub_1.EmulatorHub.PATH_EMULATORS));
         return res.body;
     }
+    async clearDataConnectData() {
+        const origin = await this.getStatus();
+        const apiClient = new apiv2_1.Client({ urlPrefix: origin, auth: false });
+        await apiClient.post(hub_1.EmulatorHub.PATH_CLEAR_DATA_CONNECT);
+    }
     async postExport(options) {
         const origin = await this.getStatus();
         const apiClient = new apiv2_1.Client({ urlPrefix: origin, auth: false });

package/lib/experiments.js

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

package/lib/firebaseConfigValidate.js

@@ -3,8 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getErrorMessage = exports.getValidator = void 0;
 const fs = require("fs");
 const path = require("path");
-const Ajv = require("ajv");
-const ajv = new Ajv();
+const ajv_1 = require("ajv");
+const ajv_formats_1 = require("ajv-formats");
+const ajv = new ajv_1.Ajv({ allowUnionTypes: true });
+(0, ajv_formats_1.default)(ajv);
 let _VALIDATOR = undefined;
 function getValidator() {
     if (!_VALIDATOR) {
@@ -17,13 +19,13 @@ function getValidator() {
 exports.getValidator = getValidator;
 function getErrorMessage(e) {
     if (e.keyword === "additionalProperties") {
-        return `Object "${e.dataPath}" in "firebase.json" has unknown property: ${JSON.stringify(e.params)}`;
+        return `Object "${e.instancePath}" in "firebase.json" has unknown property: ${JSON.stringify(e.params)}`;
     }
     else if (e.keyword === "required") {
-        return `Object "${e.dataPath}" in "firebase.json" is missing required property: ${JSON.stringify(e.params)}`;
+        return `Object "${e.instancePath}" in "firebase.json" is missing required property: ${JSON.stringify(e.params)}`;
     }
     else {
-        return `Field "${e.dataPath}" in "firebase.json" is possibly invalid: ${e.message}`;
+        return `Field "${e.instancePath}" in "firebase.json" is possibly invalid: ${e.message}`;
     }
 }
 exports.getErrorMessage = getErrorMessage;

package/lib/gcp/cloudfunctionsv2.js

@@ -259,9 +259,6 @@ function functionFromEndpoint(endpoint) {
     }
     else if (backend.isCallableTriggered(endpoint)) {
         gcfFunction.labels = Object.assign(Object.assign({}, gcfFunction.labels), { "deployment-callable": "true" });
-        if (endpoint.callableTrigger.genkitAction) {
-            gcfFunction.labels["genkit-action"] = endpoint.callableTrigger.genkitAction;
-        }
     }
     else if (backend.isBlockingTriggered(endpoint)) {
         gcfFunction.labels = Object.assign(Object.assign({}, gcfFunction.labels), { [constants_1.BLOCKING_LABEL]: constants_1.BLOCKING_EVENT_TO_LABEL_KEY[endpoint.blockingTrigger.eventType] });
@@ -297,9 +294,6 @@ function endpointFromFunction(gcfFunction) {
         trigger = {
             callableTrigger: {},
         };
-        if (gcfFunction.labels["genkit-action"]) {
-            trigger.callableTrigger.genkitAction = gcfFunction.labels["genkit-action"];
-        }
     }
     else if ((_d = gcfFunction.labels) === null || _d === void 0 ? void 0 : _d[constants_1.BLOCKING_LABEL]) {
         trigger = {

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.actuate = exports.doSetup = void 0;
+exports.toDNSCompatibleId = exports.actuate = exports.doSetup = void 0;
 const path_1 = require("path");
 const clc = require("colorette");
 const fs = require("fs-extra");
@@ -100,7 +100,8 @@ async function askQuestions(setup, isBillingEnabled) {
             })));
     }
     else {
-        info.serviceId = info.serviceId || (0, path_1.basename)(process.cwd());
+        const defaultServiceId = toDNSCompatibleId((0, path_1.basename)(process.cwd()));
+        info.serviceId = info.serviceId || defaultServiceId;
         info.cloudSqlInstanceId = info.cloudSqlInstanceId || `${info.serviceId || "app"}-fdc`;
         info.locationId = info.locationId || `us-central1`;
         info.cloudSqlDatabase = info.cloudSqlDatabase || `fdcdb`;
@@ -339,3 +340,17 @@ async function locationChoices(setup) {
         ];
     }
 }
+function toDNSCompatibleId(id) {
+    let defaultServiceId = (0, path_1.basename)(id)
+        .toLowerCase()
+        .replaceAll(/[^a-z0-9-]/g, "")
+        .slice(0, 63);
+    while (defaultServiceId.endsWith("-") && defaultServiceId.length) {
+        defaultServiceId = defaultServiceId.slice(0, defaultServiceId.length - 1);
+    }
+    while (defaultServiceId.startsWith("-") && defaultServiceId.length) {
+        defaultServiceId = defaultServiceId.slice(1, defaultServiceId.length);
+    }
+    return defaultServiceId || "app";
+}
+exports.toDNSCompatibleId = toDNSCompatibleId;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-tools",
-  "version": "13.29.0",
+  "version": "13.29.2",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "bin": {
@@ -64,7 +64,8 @@
     "@google-cloud/cloud-sql-connector": "^1.3.3",
     "@google-cloud/pubsub": "^4.5.0",
     "abort-controller": "^3.0.0",
-    "ajv": "^6.12.6",
+    "ajv": "^8.17.1",
+    "ajv-formats": "3.0.1",
     "archiver": "^7.0.0",
     "async-lock": "1.4.1",
     "body-parser": "^1.19.0",
@@ -75,8 +76,8 @@
     "commander": "^5.1.0",
     "configstore": "^5.0.1",
     "cors": "^2.8.5",
-    "cross-env": "^5.1.3",
-    "cross-spawn": "^7.0.3",
+    "cross-env": "^7.0.3",
+    "cross-spawn": "^7.0.5",
     "csv-parse": "^5.0.4",
     "deep-equal-in-any-order": "^2.0.6",
     "exegesis": "^4.2.0",