firebase-tools 15.14.0 → 15.15.0

package/lib/api.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.storageOrigin = exports.runtimeconfigOrigin = exports.rulesOrigin = exports.resourceManagerOrigin = exports.crashlyticsApiOrigin = exports.messagingApiOrigin = exports.remoteConfigApiOrigin = exports.rtdbMetadataOrigin = exports.rtdbManagementOrigin = exports.realtimeOrigin = exports.extensionsTOSOrigin = exports.extensionsPublisherOrigin = exports.extensionsOrigin = exports.iamOrigin = exports.identityOrigin = exports.hostingOrigin = exports.googleOrigin = exports.pubsubOrigin = exports.cloudTasksOrigin = exports.cloudschedulerOrigin = exports.cloudbuildOrigin = exports.functionsDefaultRegion = exports.runOrigin = exports.functionsV2Origin = exports.functionsOrigin = exports.firestoreOrigin = exports.firestoreOriginOrEmulator = exports.firedataOrigin = exports.firebaseExtensionsRegistryOrigin = exports.firebaseApiOrigin = exports.eventarcOrigin = exports.dynamicLinksKey = exports.dynamicLinksOrigin = exports.consoleOrigin = exports.authManagementOrigin = exports.authOrigin = exports.apphostingGitHubAppInstallationURL = exports.apphostingP4SADomain = exports.apphostingOrigin = exports.appDistributionOrigin = exports.artifactRegistryDomain = exports.developerConnectP4SADomain = exports.developerConnectOrigin = exports.containerRegistryDomain = exports.cloudMonitoringOrigin = exports.cloudloggingOrigin = exports.cloudbillingOrigin = exports.clientSecret = exports.clientId = exports.authProxyOrigin = void 0;
-exports.developerKnowledgeOrigin = exports.cloudTestingOrigin = exports.appTestingOrigin = exports.cloudAiCompanionOrigin = exports.aiLogicProxyOrigin = exports.vertexAIOrigin = exports.cloudSQLAdminOrigin = exports.dataConnectLocalConnString = exports.dataconnectP4SADomain = exports.dataconnectOrigin = exports.githubClientSecret = exports.githubClientId = exports.computeOrigin = exports.secretManagerOrigin = exports.githubApiOrigin = exports.githubOrigin = exports.studioApiOrigin = exports.serviceUsageOrigin = exports.cloudRunApiOrigin = exports.hostingApiOrigin = exports.firebaseStorageOrigin = void 0;
+exports.hostingApiOrigin = exports.firebaseStorageOrigin = exports.storageOrigin = exports.runtimeconfigOrigin = exports.rulesOrigin = exports.resourceManagerOrigin = exports.crashlyticsApiOrigin = exports.messagingApiOrigin = exports.remoteConfigApiOrigin = exports.rtdbMetadataOrigin = exports.rtdbManagementOrigin = exports.realtimeOrigin = exports.extensionsTOSOrigin = exports.extensionsPublisherOrigin = exports.extensionsOrigin = exports.iamOrigin = exports.identityOrigin = exports.hostingOrigin = exports.googleOrigin = exports.pubsubOrigin = exports.cloudTasksOrigin = exports.cloudschedulerOrigin = exports.cloudbuildOrigin = exports.functionsDefaultRegion = exports.runOrigin = exports.functionsV2Origin = exports.functionsOrigin = exports.firestoreOrigin = exports.firestoreOriginOrEmulator = exports.firedataOrigin = exports.firebaseExtensionsRegistryOrigin = exports.firebaseApiOrigin = exports.eventarcOrigin = exports.consoleOrigin = exports.authManagementOrigin = exports.authOrigin = exports.apphostingGitHubAppInstallationURL = exports.apphostingP4SADomain = exports.apphostingOrigin = exports.appDistributionOrigin = exports.artifactRegistryDomain = exports.developerConnectP4SADomain = exports.developerConnectOrigin = exports.containerRegistryDomain = exports.cloudMonitoringOrigin = exports.cloudloggingOrigin = exports.cloudbillingOrigin = exports.clientSecret = exports.clientId = exports.authProxyOrigin = void 0;
+exports.developerKnowledgeOrigin = exports.cloudTestingOrigin = exports.appTestingOrigin = exports.cloudAiCompanionOrigin = exports.aiLogicProxyOrigin = exports.vertexAIOrigin = exports.cloudSQLAdminOrigin = exports.dataConnectLocalConnString = exports.dataconnectP4SADomain = exports.dataconnectOrigin = exports.githubClientSecret = exports.githubClientId = exports.computeOrigin = exports.secretManagerOrigin = exports.githubApiOrigin = exports.githubOrigin = exports.studioApiOrigin = exports.serviceUsageOrigin = exports.cloudRunApiOrigin = void 0;
 exports.getScopes = getScopes;
 exports.setScopes = setScopes;
 const constants_1 = require("./emulator/constants");
@@ -43,10 +43,6 @@ const authManagementOrigin = () => utils.envOverride("FIREBASE_AUTH_MANAGEMENT_U
 exports.authManagementOrigin = authManagementOrigin;
 const consoleOrigin = () => utils.envOverride("FIREBASE_CONSOLE_URL", "https://console.firebase.google.com");
 exports.consoleOrigin = consoleOrigin;
-const dynamicLinksOrigin = () => utils.envOverride("FIREBASE_DYNAMIC_LINKS_URL", "https://firebasedynamiclinks.googleapis.com");
-exports.dynamicLinksOrigin = dynamicLinksOrigin;
-const dynamicLinksKey = () => utils.envOverride("FIREBASE_DYNAMIC_LINKS_KEY", "AIzaSyB6PtY5vuiSB8MNgt20mQffkOlunZnHYiQ");
-exports.dynamicLinksKey = dynamicLinksKey;
 const eventarcOrigin = () => utils.envOverride("EVENTARC_URL", "https://eventarc.googleapis.com");
 exports.eventarcOrigin = eventarcOrigin;
 const firebaseApiOrigin = () => utils.envOverride("FIREBASE_API_URL", "https://firebase.googleapis.com");

package/lib/command.js

@@ -111,23 +111,22 @@ class Command {
                     });
                 }
                 const duration = Math.floor((process.uptime() - start) * 1000);
-                try {
-                    const trackSuccess = (0, track_1.trackGA4)("command_execution", {
-                        command_name: this.name,
-                        result: "success",
-                        interactive: (0, utils_1.getInheritedOption)(options, "nonInteractive") ? "false" : "true",
-                    }, duration);
-                    const tracks = [trackSuccess];
-                    if (isEmulator) {
-                        tracks.push((0, track_1.trackEmulator)("command_success", {
+                const trackSuccess = (0, track_1.trackGA4)("command_execution", {
+                    command_name: this.name,
+                    result: "success",
+                    interactive: (0, utils_1.getInheritedOption)(options, "nonInteractive") ? "false" : "true",
+                }, duration);
+                if (!isEmulator) {
+                    await (0, utils_1.withTimeout)(5000, trackSuccess);
+                }
+                else {
+                    await (0, utils_1.withTimeout)(5000, Promise.all([
+                        trackSuccess,
+                        (0, track_1.trackEmulator)("command_success", {
                             command_name: this.name,
                             duration,
-                        }));
-                    }
-                    await (0, utils_1.withTimeout)(1000, Promise.all(tracks));
-                }
-                catch (gaErr) {
-                    logger_1.logger.debug("Analytics tracking failed during success path:", gaErr);
+                        }),
+                    ]));
                 }
                 process.exit();
             })
@@ -141,25 +140,20 @@ class Command {
                     });
                 }
                 const duration = Math.floor((process.uptime() - start) * 1000);
-                try {
-                    const trackError = (0, track_1.trackGA4)("command_execution", {
+                await (0, utils_1.withTimeout)(5000, Promise.all([
+                    (0, track_1.trackGA4)("command_execution", {
                         command_name: this.name,
                         result: "error",
                         interactive: (0, utils_1.getInheritedOption)(options, "nonInteractive") ? "false" : "true",
-                    }, duration);
-                    const tracks = [trackError];
-                    if (isEmulator) {
-                        tracks.push((0, track_1.trackEmulator)("command_error", {
+                    }, duration),
+                    isEmulator
+                        ? (0, track_1.trackEmulator)("command_error", {
                             command_name: this.name,
                             duration,
-                            error_type: err?.exit === 1 ? "user" : "unexpected",
-                        }));
-                    }
-                    await (0, utils_1.withTimeout)(1000, Promise.all(tracks));
-                }
-                catch (gaErr) {
-                    logger_1.logger.debug("Analytics tracking failed during error path:", gaErr);
-                }
+                            error_type: err.exit === 1 ? "user" : "unexpected",
+                        })
+                        : Promise.resolve(),
+                ]));
                 client.errorOut(err);
             });
         });

package/lib/commands/dataconnect-compile.js

@@ -12,18 +12,18 @@ const hub_1 = require("../emulator/hub");
 const build_1 = require("../dataconnect/build");
 const error_1 = require("../error");
 exports.command = new command_1.Command("dataconnect:compile")
-    .description("compile your Data Connect schema and connector config and GQL files.")
-    .option("--service <serviceId>", "the serviceId of the Data Connect service. If not provided, compiles all services.")
-    .option("--location <location>", "the location of the Data Connect service. Only needed if service ID is used in multiple locations.")
+    .description("compile your SQL Connect schema and connector config and GQL files.")
+    .option("--service <serviceId>", "the serviceId of the SQL Connect service. If not provided, compiles all services.")
+    .option("--location <location>", "the location of the SQL Connect service. Only needed if service ID is used in multiple locations.")
     .action(async (options) => {
     const projectId = (0, projectUtils_1.getProjectId)(options);
     const config = options.config;
     if (!config || !config.has("dataconnect")) {
-        throw new error_1.FirebaseError(`No Data Connect project directory found. Please run ${clc.bold("firebase init dataconnect")} to set it up first.`);
+        throw new error_1.FirebaseError(`No SQL Connect project directory found. Please run ${clc.bold("firebase init dataconnect")} to set it up first.`);
     }
     const serviceInfos = await (0, load_1.pickServices)(projectId || hub_1.EmulatorHub.MISSING_PROJECT_PLACEHOLDER, config, options.service, options.location);
     if (!serviceInfos.length) {
-        throw new error_1.FirebaseError("No Data Connect services found to compile.");
+        throw new error_1.FirebaseError("No SQL Connect services found to compile.");
     }
     for (const serviceInfo of serviceInfos) {
         const configDir = serviceInfo.sourceDirectory;
@@ -41,6 +41,6 @@ exports.command = new command_1.Command("dataconnect:compile")
             configDir,
             account,
         });
-        (0, utils_1.logLabeledSuccess)("dataconnect", `Successfully compiled Data Connect service: ${clc.bold(serviceInfo.dataConnectYaml.serviceId)}`);
+        (0, utils_1.logLabeledSuccess)("dataconnect", `Successfully compiled SQL Connect service: ${clc.bold(serviceInfo.dataConnectYaml.serviceId)}`);
     }
 });

package/lib/commands/dataconnect-execute.js

@@ -23,7 +23,7 @@ const logger_1 = require("../logger");
 const responseToError_1 = require("../responseToError");
 let stdinUsedFor = undefined;
 exports.command = new command_1.Command("dataconnect:execute [file] [operationName]")
-    .description("execute a Data Connect query or mutation. If FIREBASE_DATACONNECT_EMULATOR_HOST is set (such as during 'firebase emulator:exec', executes against the emulator instead.")
+    .description("execute a SQL Connect query or mutation. If FIREBASE_DATACONNECT_EMULATOR_HOST is set (such as during 'firebase emulator:exec', executes against the emulator instead.")
     .option("--service <serviceId>", "The service ID to execute against (optional if there's only one service)")
     .option("--location <locationId>", "The location ID to execute against (optional if there's only one service). Ignored by the emulator.")
     .option("--vars, --variables <vars>", "Supply variables to the operation execution, which must be a JSON object whose keys are variable names. If vars begin with the character @, the rest is interpreted as a file name to read from, or - to read from stdin.")

package/lib/commands/dataconnect-sdk-generate.js

@@ -15,9 +15,9 @@ const error_1 = require("../error");
 const init_1 = require("./init");
 const hub_1 = require("../emulator/hub");
 exports.command = new command_1.Command("dataconnect:sdk:generate")
-    .description("generate typed SDKs to use Data Connect in your apps")
-    .option("--service <serviceId>", "the serviceId of the Data Connect service. If not provided, generates SDKs for all services.")
-    .option("--location <location>", "the location of the Data Connect service. Only needed if service ID is used in multiple locations.")
+    .description("generate typed SDKs to use SQL Connect in your apps")
+    .option("--service <serviceId>", "the serviceId of the SQL Connect service. If not provided, generates SDKs for all services.")
+    .option("--location <location>", "the location of the SQL Connect service. Only needed if service ID is used in multiple locations.")
     .option("--watch", "watch for changes to your connector GQL files and regenerate your SDKs when updates occur")
     .action(async (options) => {
     const projectId = (0, projectUtils_1.getProjectId)(options);

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

@@ -10,7 +10,7 @@ const requirePermissions_1 = require("../requirePermissions");
 const ensureApis_1 = require("../dataconnect/ensureApis");
 const Table = require("cli-table3");
 exports.command = new command_1.Command("dataconnect:services:list")
-    .description("list all deployed Data Connect services")
+    .description("list all deployed SQL Connect services")
     .before(requirePermissions_1.requirePermissions, [
     "dataconnect.services.list",
     "dataconnect.schemas.list",

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

@@ -10,9 +10,9 @@ const schemaMigration_1 = require("../dataconnect/schemaMigration");
 const requireAuth_1 = require("../requireAuth");
 const types_1 = require("../dataconnect/types");
 exports.command = new command_1.Command("dataconnect:sql:diff")
-    .description("display the differences between the local Data Connect schema and your CloudSQL database's schema")
-    .option("--service <serviceId>", "the serviceId of the Data Connect service")
-    .option("--location <location>", "the location of the Data Connect service. Only needed if service ID is used in multiple locations.")
+    .description("display the differences between the local SQL Connect schema and your CloudSQL database's schema")
+    .option("--service <serviceId>", "the serviceId of the SQL Connect service")
+    .option("--location <location>", "the location of the SQL Connect service. Only needed if service ID is used in multiple locations.")
     .before(requirePermissions_1.requirePermissions, [
     "firebasedataconnect.services.list",
     "firebasedataconnect.schemas.list",

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

@@ -17,8 +17,8 @@ exports.command = new command_1.Command("dataconnect:sql:grant")
     .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.")
     .option("-E, --email <email>", "The email of the user or service account we would like to grant the role to.")
-    .option("--service <serviceId>", "the serviceId of the Data Connect service")
-    .option("--location <location>", "the location of the Data Connect service. Only needed if service ID is used in multiple locations.")
+    .option("--service <serviceId>", "the serviceId of the SQL Connect service")
+    .option("--location <location>", "the location of the SQL Connect service. Only needed if service ID is used in multiple locations.")
     .before(requirePermissions_1.requirePermissions, ["firebasedataconnect.services.list"])
     .before(requireAuth_1.requireAuth)
     .action(async (options) => {

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

@@ -12,9 +12,9 @@ const ensureApis_1 = require("../dataconnect/ensureApis");
 const utils_1 = require("../utils");
 const types_1 = require("../dataconnect/types");
 exports.command = new command_1.Command("dataconnect:sql:migrate")
-    .description("migrate your CloudSQL database's schema to match your local Data Connect schema")
-    .option("--service <serviceId>", "the serviceId of the Data Connect service")
-    .option("--location <location>", "the location of the Data Connect service. Only needed if service ID is used in multiple locations.")
+    .description("migrate your CloudSQL database's schema to match your local SQL Connect schema")
+    .option("--service <serviceId>", "the serviceId of the SQL Connect service")
+    .option("--location <location>", "the location of the SQL Connect service. Only needed if service ID is used in multiple locations.")
     .before(requirePermissions_1.requirePermissions, [
     "firebasedataconnect.services.list",
     "firebasedataconnect.schemas.list",
@@ -40,7 +40,7 @@ exports.command = new command_1.Command("dataconnect:sql:migrate")
             ?.schemaValidation,
     });
     if (diffs.length) {
-        (0, utils_1.logLabeledSuccess)("dataconnect", `Database schema sucessfully migrated! Run 'firebase deploy' to deploy your new schema to your Data Connect service.`);
+        (0, utils_1.logLabeledSuccess)("dataconnect", `Database schema sucessfully migrated! Run 'firebase deploy' to deploy your new schema to your SQL Connect service.`);
     }
     else {
         (0, utils_1.logLabeledSuccess)("dataconnect", "Database schema is already up to date!");

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

@@ -14,8 +14,8 @@ const load_1 = require("../dataconnect/load");
 const types_1 = require("../dataconnect/types");
 exports.command = new command_1.Command("dataconnect:sql:setup")
     .description("set up your CloudSQL database")
-    .option("--service <serviceId>", "the serviceId of the Data Connect service")
-    .option("--location <location>", "the location of the Data Connect service. Only needed if service ID is used in multiple locations.")
+    .option("--service <serviceId>", "the serviceId of the SQL Connect service")
+    .option("--location <location>", "the location of the SQL Connect service. Only needed if service ID is used in multiple locations.")
     .before(requirePermissions_1.requirePermissions, [
     "firebasedataconnect.services.list",
     "firebasedataconnect.schemas.list",

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

@@ -74,9 +74,9 @@ async function mainShellLoop(conn) {
     }
 }
 exports.command = new command_1.Command("dataconnect:sql:shell")
-    .description("start a shell connected directly to your Data Connect service's linked CloudSQL instance")
-    .option("--service <serviceId>", "the serviceId of the Data Connect service")
-    .option("--location <location>", "the location of the Data Connect service. Only needed if service ID is used in multiple locations.")
+    .description("start a shell connected directly to your SQL Connect service's linked CloudSQL instance")
+    .option("--service <serviceId>", "the serviceId of the SQL Connect service")
+    .option("--location <location>", "the location of the SQL Connect service. Only needed if service ID is used in multiple locations.")
     .before(requirePermissions_1.requirePermissions, ["firebasedataconnect.services.list", "cloudsql.instances.connect"])
     .before(requireAuth_1.requireAuth)
     .action(async (options) => {
@@ -106,7 +106,7 @@ exports.command = new command_1.Command("dataconnect:sql:shell")
     const conn = await pool.connect();
     await conn.query(`SET search_path TO "${schemaName}"`);
     logger_1.logger.info(`Logged in as ${username}`);
-    logger_1.logger.info(clc.cyan("Welcome to Data Connect Cloud SQL Shell"));
+    logger_1.logger.info(clc.cyan("Welcome to SQL Connect Cloud SQL Shell"));
     logger_1.logger.info(clc.gray("Type your your SQL query or '.exit' to quit, queries should end with ';' or add empty line to execute."));
     await mainShellLoop(conn);
     logger_1.logger.info(clc.yellow("Exiting shell..."));

package/lib/commands/ext-dev-usage.js

@@ -14,7 +14,6 @@ const extensionsHelper_1 = require("../extensions/extensionsHelper");
 const error_1 = require("../error");
 const logger_1 = require("../logger");
 const prompt_1 = require("../prompt");
-const shortenUrl_1 = require("../shortenUrl");
 exports.command = new command_1.Command("ext:dev:usage <publisherId>")
     .description("get usage statistics for an extension")
     .help("use this command to get the usage of extensions you published. " +
@@ -134,6 +133,5 @@ async function buildCloudMonitoringLink(args) {
     let uri = `https://console.cloud.google.com/monitoring/metrics-explorer?project=${args.projectNumber}` +
         `&pageState=${JSON.stringify(pageState)}`;
     uri = encodeURI(uri);
-    uri = await (0, shortenUrl_1.shortenUrl)(uri);
     return uri;
 }

package/lib/commands/init.js

@@ -27,7 +27,7 @@ function isOutside(from, to) {
 let choices = [
     {
         value: "dataconnect",
-        name: "Data Connect: Set up a Firebase Data Connect service",
+        name: "SQL Connect: Set up a Firebase SQL Connect service",
         checked: false,
     },
     {
@@ -84,7 +84,7 @@ let choices = [
     },
     {
         value: "dataconnect:sdk",
-        name: "Data Connect: Set up a generated SDK for your Firebase Data Connect service",
+        name: "SQL Connect: Set up a generated SDK for your Firebase SQL Connect service",
         checked: false,
         hidden: true,
     },
@@ -97,7 +97,7 @@ let choices = [
 if ((0, experiments_1.isEnabled)("fdcwebhooks")) {
     choices.push({
         value: "dataconnect:resolver",
-        name: "Data Connect: Set up a custom resolver for your Firebase Data Connect service",
+        name: "SQL Connect: Set up a custom resolver for your Firebase SQL Connect service",
         checked: false,
         hidden: true,
     });

package/lib/commands/open.js

@@ -20,7 +20,7 @@ const LINKS = [
     { name: "Crash Reporting", arg: "crash", consolePath: "/crashlytics" },
     { name: "Database: Data", arg: "database", consolePath: "/database/data" },
     { name: "Database: Rules", arg: "database:rules", consolePath: "/database/rules" },
-    { name: "Data Connect", arg: "dataconnect", consolePath: "/dataconnect" },
+    { name: "SQL Connect", arg: "dataconnect", consolePath: "/dataconnect" },
     { name: "Docs", arg: "docs", url: "https://firebase.google.com/docs" },
     { name: "Dynamic Links", arg: "links", consolePath: "/durablelinks" },
     { name: "Extensions", arg: "extensions", consolePath: "/extensions" },

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

@@ -11,7 +11,7 @@ exports.command = new command_1.Command(`setup:emulators:${NAME}`)
     .action(async (options) => {
     await (0, downloadableEmulators_1.downloadIfNecessary)(NAME);
     if (!options.config) {
-        logger_1.logger.info("Not currently in a Firebase project directory. Run this command from a project directory to configure the Data Connect emulator.");
+        logger_1.logger.info("Not currently in a Firebase project directory. Run this command from a project directory to configure the SQL Connect emulator.");
         return;
     }
     logger_1.logger.info("Setup complete!");

package/lib/dataconnect/freeTrial.js

@@ -30,11 +30,11 @@ async function checkFreeTrialInstanceUsed(projectId) {
     return used;
 }
 function upgradeInstructions(projectId, trialUsed) {
-    return `To provision a ${trialUsed ? "paid CloudSQL Postgres instance" : "CloudSQL Postgres instance on the Firebase Data Connect no-cost trial"}:
+    return `To provision a ${trialUsed ? "paid CloudSQL Postgres instance" : "CloudSQL Postgres instance on the Firebase SQL 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.`;
+  2. Run ${clc.bold("firebase deploy --only dataconnect")} to deploy your SQL Connect service.`;
 }

package/lib/dataconnect/load.js

@@ -29,8 +29,8 @@ async function pickOneService(projectId, config, service, location) {
 async function pickServices(projectId, config, serviceId, location) {
     const serviceInfos = await loadAll(projectId, config);
     if (serviceInfos.length === 0) {
-        throw new error_1.FirebaseError("No Data Connect services found in firebase.json. " +
-            `\nYou can run ${clc.bold("firebase init dataconnect")} to add a Data Connect service.`);
+        throw new error_1.FirebaseError("No SQL Connect services found in firebase.json. " +
+            `\nYou can run ${clc.bold("firebase init dataconnect")} to add a SQL Connect service.`);
     }
     const matchingServices = serviceInfos.filter((i) => (!serviceId || i.dataConnectYaml.serviceId === serviceId) &&
         (!location || i.dataConnectYaml.location === location));

package/lib/dataconnect/provisionCloudSql.js

@@ -49,12 +49,12 @@ async function upsertInstance(stats, args) {
         const why = getUpdateReason(existingInstance, requireGoogleMlIntegration);
         if (why) {
             if (dryRun) {
-                utils.logLabeledBullet("dataconnect", `Cloud SQL instance ${clc.bold(instanceId)} settings are not compatible with Firebase Data Connect. ` +
+                utils.logLabeledBullet("dataconnect", `Cloud SQL instance ${clc.bold(instanceId)} settings are not compatible with Firebase SQL Connect. ` +
                     `It will be updated on your next deploy.` +
                     why);
             }
             else {
-                utils.logLabeledBullet("dataconnect", `Cloud SQL instance ${clc.bold(instanceId)} settings are not compatible with Firebase Data Connect. ` +
+                utils.logLabeledBullet("dataconnect", `Cloud SQL instance ${clc.bold(instanceId)} settings are not compatible with Firebase SQL Connect. ` +
                     why);
                 stats.action = "update";
                 await (0, utils_1.promiseWithSpinner)(() => cloudSqlAdminClient.updateInstanceForDataConnect(existingInstance, requireGoogleMlIntegration), "Updating your Cloud SQL instance...");
@@ -92,7 +92,7 @@ async function createInstance(args) {
 function cloudSQLBeingCreated(projectId, instanceId, isFreeTrial, billingEnabled) {
     return (`Cloud SQL Instance ${clc.bold(instanceId)} is being created.` +
         (isFreeTrial
-            ? `\nThis instance is provided under the terms of the Data Connect no-cost trial ${(0, freeTrial_1.freeTrialTermsLink)()}`
+            ? `\nThis instance is provided under the terms of the SQL Connect no-cost trial ${(0, freeTrial_1.freeTrialTermsLink)()}`
             : "") +
         `\n
    Meanwhile, your data are saved in a temporary database and will be migrated once complete.` +

package/lib/dataconnect/schemaMigration.js

@@ -248,7 +248,7 @@ async function grantRoleToUserInSchema(options, schema) {
     await ensureServiceIsConnectedToCloudSql(serviceName, instanceName, databaseId, false, schemaName);
     const schemaSetupStatus = await setupSchemaIfNecessary(instanceId, databaseId, schemaName, options);
     if (schemaSetupStatus !== permissionsSetup_1.SchemaSetupStatus.GreenField && role === "owner") {
-        throw new error_1.FirebaseError(`Owner rule isn't available in ${schemaSetupStatus} databases. If you would like Data Connect to manage and own your database schema, run 'firebase dataconnect:sql:setup'`);
+        throw new error_1.FirebaseError(`Owner rule isn't available in ${schemaSetupStatus} databases. If you would like SQL Connect to manage and own your database schema, run 'firebase dataconnect:sql:setup'`);
     }
     await (0, permissionsSetup_1.grantRoleTo)(options, instanceId, databaseId, role, email, schemaName);
 }
@@ -275,11 +275,11 @@ function getIdentifiers(schema) {
     const postgresDatasource = schema.datasources.find((d) => d.postgresql);
     const databaseId = postgresDatasource?.postgresql?.database;
     if (!databaseId) {
-        throw new error_1.FirebaseError("Data Connect schema must have a postgres datasource with a database name.");
+        throw new error_1.FirebaseError("SQL Connect schema must have a postgres datasource with a database name.");
     }
     const instanceName = postgresDatasource?.postgresql?.cloudSql?.instance;
     if (!instanceName) {
-        throw new error_1.FirebaseError("Data Connect schema must have a postgres datasource with a CloudSQL instance.");
+        throw new error_1.FirebaseError("SQL Connect schema must have a postgres datasource with a CloudSQL instance.");
     }
     const instanceId = instanceName.split("/").pop();
     const schemaName = postgresDatasource?.postgresql?.schema || permissions_1.DEFAULT_SCHEMA;
@@ -325,9 +325,9 @@ async function handleIncompatibleSchemaError(args) {
         }
         const schemaInfo = await (0, permissionsSetup_1.getSchemaMetadata)(instanceId, databaseId, schemaName, options);
         if (schemaInfo.setupStatus !== permissionsSetup_1.SchemaSetupStatus.GreenField) {
-            throw new error_1.FirebaseError(`Brownfield database are protected from SQL changes by Data Connect.\n` +
+            throw new error_1.FirebaseError(`Brownfield database are protected from SQL changes by SQL 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 you would like SQL Connect to manage your database schema, run 'firebase dataconnect:sql:setup'`);
         }
         if (!(await (0, permissionsSetup_1.checkSQLRoleIsGranted)(options, instanceId, databaseId, (0, permissions_1.firebaseowner)(databaseId, schemaName), (await (0, connect_1.getIAMUser)(options)).user))) {
             if (!userIsCSQLAdmin) {
@@ -387,7 +387,7 @@ async function promptForSchemaMigration(options, instanceId, databaseId, err, va
         return ans;
     }
     if (!validateOnly) {
-        throw new error_1.FirebaseError("Command aborted. Your database schema is incompatible with your Data Connect schema. Run `firebase dataconnect:sql:migrate` to migrate your database schema");
+        throw new error_1.FirebaseError("Command aborted. Your database schema is incompatible with your SQL Connect schema. Run `firebase dataconnect:sql:migrate` to migrate your database schema");
     }
     else if (options.force) {
         return defaultChoice;
@@ -509,10 +509,10 @@ function displayStartSchemaDiff(validationMode) {
 function displayNoSchemaDiff(instanceId, databaseId, validationMode) {
     switch (validationMode) {
         case "COMPATIBLE":
-            (0, utils_1.logLabeledSuccess)("dataconnect", `Database schema of ${instanceId}:${databaseId} is compatible with Data Connect Schema.`);
+            (0, utils_1.logLabeledSuccess)("dataconnect", `Database schema of ${instanceId}:${databaseId} is compatible with SQL Connect Schema.`);
             break;
         case "STRICT":
-            (0, utils_1.logLabeledSuccess)("dataconnect", `Database schema of ${instanceId}:${databaseId} matches Data Connect Schema exactly.`);
+            (0, utils_1.logLabeledSuccess)("dataconnect", `Database schema of ${instanceId}:${databaseId} matches SQL Connect Schema exactly.`);
             break;
     }
 }
@@ -522,21 +522,21 @@ function displaySchemaChanges(error, validationMode) {
             {
                 switch (validationMode) {
                     case "COMPATIBLE":
-                        (0, utils_1.logLabeledWarning)("dataconnect", `PostgreSQL schema is incompatible with the Data Connect Schema.
+                        (0, utils_1.logLabeledWarning)("dataconnect", `PostgreSQL schema is incompatible with the SQL Connect Schema.
 Those SQL statements will migrate it to be compatible:
 
 ${diffsToString(error.diffs)}
 `);
                         break;
                     case "STRICT_AFTER_COMPATIBLE":
-                        (0, utils_1.logLabeledBullet)("dataconnect", `PostgreSQL schema contains unused SQL objects not part of the Data Connect Schema.
+                        (0, utils_1.logLabeledBullet)("dataconnect", `PostgreSQL schema contains unused SQL objects not part of the SQL Connect Schema.
 Those SQL statements will migrate it to match exactly:
 
 ${diffsToString(error.diffs)}
 `);
                         break;
                     case "STRICT":
-                        (0, utils_1.logLabeledWarning)("dataconnect", `PostgreSQL schema does not match the Data Connect Schema.
+                        (0, utils_1.logLabeledWarning)("dataconnect", `PostgreSQL schema does not match the SQL Connect Schema.
 Those SQL statements will migrate it to match exactly:
 
 ${diffsToString(error.diffs)}

package/lib/dataconnect/webhook.js

@@ -27,6 +27,6 @@ async function sendVSCodeMessage(body) {
         });
     }
     catch (e) {
-        logger_1.logger.debug(`Could not find VSCode notification endpoint: ${e}. If you are not running the Firebase Data Connect VSCode extension, this is expected and not an issue.`);
+        logger_1.logger.debug(`Could not find VSCode notification endpoint: ${e}. If you are not running the Firebase SQL Connect VSCode extension, this is expected and not an issue.`);
     }
 }

package/lib/deploy/functions/backend.js

@@ -210,7 +210,7 @@ async function loadExistingBackend(ctx) {
         existingBackend.endpoints[endpoint.region][endpoint.id] = endpoint;
     }
     unreachableRegions.gcfV1 = gcfV1Results.unreachable;
-    if (experiments.isEnabled("functionsrunapionly")) {
+    if (experiments.isEnabled("functionsrunapionly") || experiments.isEnabled("dartfunctions")) {
         try {
             const runServices = await run.listServices(ctx.projectId);
             for (const service of runServices) {

package/lib/deploy/functions/build.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AllIngressSettings = exports.AllVpcEgressSettings = exports.AllFunctionsPlatforms = void 0;
+exports.AllIngressSettings = exports.AllVpcEgressSettings = exports.AllFunctionsPlatforms = exports.REGION_TBD = void 0;
 exports.empty = empty;
 exports.of = of;
 exports.isHttpsTriggered = isHttpsTriggered;
@@ -16,11 +16,11 @@ exports.toBackend = toBackend;
 exports.applyPrefix = applyPrefix;
 const backend = require("./backend");
 const proto = require("../../gcp/proto");
-const api = require("../../api");
 const params = require("./params");
 const error_1 = require("../../error");
 const functional_1 = require("../../functional");
 const cel_1 = require("./cel");
+exports.REGION_TBD = "REGION_TBD";
 function empty() {
     return {
         requiredAPIs: [],
@@ -175,7 +175,7 @@ function toBackend(build, paramValues) {
         }
         let regions = [];
         if (!bdEndpoint.region) {
-            regions = [api.functionsDefaultRegion()];
+            regions = [exports.REGION_TBD];
         }
         else if (Array.isArray(bdEndpoint.region)) {
             regions = params.resolveList(bdEndpoint.region, paramValues);

package/lib/deploy/functions/deploy.js

@@ -15,6 +15,7 @@ const gcf = require("../../gcp/cloudfunctions");
 const gcfv2 = require("../../gcp/cloudfunctionsv2");
 const backend = require("./backend");
 const experiments = require("../../experiments");
+const supported = require("./runtimes/supported");
 const backend_1 = require("./backend");
 const extensions_1 = require("../extensions");
 const getProjectNumber_1 = require("../../getProjectNumber");
@@ -54,8 +55,10 @@ async function uploadSourceV2(projectId, projectNumber, source, wantBackend) {
         file: source.functionsSourceV2,
         stream: exports.createReadStream(source.functionsSourceV2),
     };
-    if (!experiments.isEnabled("functionsrunapionly") &&
-        !v2Endpoints.some((e) => e.platform === "run")) {
+    const isDart = v2Endpoints.some((e) => supported.runtimeIsLanguage(e.runtime, "dart"));
+    const useApiOnly = experiments.isEnabled("functionsrunapionly") ||
+        (isDart && experiments.isEnabled("dartfunctions"));
+    if (!useApiOnly && !v2Endpoints.some((e) => e.platform === "run")) {
         if (process.env.GOOGLE_CLOUD_QUOTA_PROJECT) {
             (0, utils_1.logLabeledWarning)("functions", "GOOGLE_CLOUD_QUOTA_PROJECT is not usable when uploading source for Cloud Functions.");
         }

package/lib/deploy/functions/prepare.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EVENTARC_SOURCE_ENV = void 0;
 exports.prepare = prepare;
+exports.matchRegionsForExisting = matchRegionsForExisting;
+exports.resolveDefaultRegions = resolveDefaultRegions;
 exports.inferDetailsFromExisting = inferDetailsFromExisting;
 exports.updateEndpointTargetedStatus = updateEndpointTargetedStatus;
 exports.inferBlockingDetails = inferBlockingDetails;
@@ -24,6 +26,7 @@ const ensure = require("./ensure");
 const api_1 = require("../../api");
 const functionsDeployHelper_1 = require("./functionsDeployHelper");
 const utils_1 = require("../../utils");
+const triggerSupport_1 = require("./runtimes/dart/triggerSupport");
 const prepareFunctionsUpload_1 = require("./prepareFunctionsUpload");
 const prompts_1 = require("./prompts");
 const projectUtils_1 = require("../../projectUtils");
@@ -190,6 +193,7 @@ async function prepare(context, options, payload) {
         payload.functions[codebase] = { wantBackend, haveBackend };
     }
     for (const [codebase, { wantBackend, haveBackend }] of Object.entries(payload.functions)) {
+        await resolveDefaultRegions(wantBackend, haveBackend);
         inferDetailsFromExisting(wantBackend, haveBackend, codebaseUsesEnvs.includes(codebase));
         await (0, triggerRegionHelper_1.ensureTriggerRegions)(wantBackend);
         resolveCpuAndConcurrency(wantBackend);
@@ -200,6 +204,7 @@ async function prepare(context, options, payload) {
     const haveBackend = backend.merge(...Object.values(haveBackends));
     await ensureAllRequiredAPIsEnabled(projectNumber, wantBackend);
     await warnIfNewGenkitFunctionIsMissingSecrets(wantBackend, haveBackend, options);
+    warnIfDartBackendHasUnsupportedTriggers(wantBackend);
     const matchingBackend = backend.matchingBackend(wantBackend, (endpoint) => {
         return (0, functionsDeployHelper_1.endpointMatchesAnyFilter)(endpoint, context.filters);
     });
@@ -214,6 +219,41 @@ async function prepare(context, options, payload) {
     validate.checkFiltersIntegrity(wantBackends, context.filters);
     (0, applyHash_1.applyBackendHashToBackends)(wantBackends, context);
 }
+function moveEndpointToRegion(backend, endpoint, region) {
+    endpoint.region = region;
+    backend.endpoints[region] = backend.endpoints[region] || {};
+    backend.endpoints[region][endpoint.id] = endpoint;
+    delete backend.endpoints[build.REGION_TBD][endpoint.id];
+    if (Object.keys(backend.endpoints[build.REGION_TBD]).length === 0) {
+        delete backend.endpoints[build.REGION_TBD];
+    }
+}
+function matchRegionsForExisting(want, have) {
+    for (const [id, wantE] of Object.entries(want.endpoints[build.REGION_TBD] || {})) {
+        let matching;
+        for (const region of Object.keys(have.endpoints)) {
+            if (region === build.REGION_TBD) {
+                continue;
+            }
+            if (have.endpoints[region][id]) {
+                if (matching) {
+                    throw new error_1.FirebaseError(`Cannot resolve default region for function ${id}. It exists in multiple regions. The region must be specified to continue.`);
+                }
+                matching = have.endpoints[region][id];
+            }
+        }
+        if (!matching) {
+            continue;
+        }
+        moveEndpointToRegion(want, wantE, matching.region);
+    }
+}
+async function resolveDefaultRegions(want, have) {
+    matchRegionsForExisting(want, have);
+    for (const endpoint of Object.values(want.endpoints[build.REGION_TBD] || {})) {
+        moveEndpointToRegion(want, endpoint, "us-central1");
+    }
+}
 function inferDetailsFromExisting(want, have, usedDotenv) {
     for (const wantE of backend.allEndpoints(want)) {
         const haveE = have.endpoints[wantE.region]?.[wantE.id];
@@ -347,6 +387,19 @@ async function loadCodebases(config, options, firebaseConfig, runtimeConfig, fil
     }
     return wantBuilds;
 }
+function warnIfDartBackendHasUnsupportedTriggers(want) {
+    const dartEndpoints = backend.allEndpoints(want).filter(triggerSupport_1.isDartEndpoint);
+    if (dartEndpoints.length === 0) {
+        return;
+    }
+    const { emulatorOnly, experimental } = (0, triggerSupport_1.classifyNonProductionEndpoints)(dartEndpoints);
+    const unsupported = [...emulatorOnly, ...experimental];
+    if (unsupported.length > 0) {
+        (0, utils_1.logLabeledWarning)("functions", `The following Dart functions use triggers that are not yet supported for production deployment: ${unsupported.map((ep) => ep.id).join(", ")}. ` +
+            "They will be deployed but may not work as expected. " +
+            "See https://github.com/firebase/firebase-functions-dart for current trigger support.");
+    }
+}
 async function warnIfNewGenkitFunctionIsMissingSecrets(have, want, options) {
     if (options.force) {
         return;