firebase-tools 13.8.1 → 13.8.3

package/lib/dataconnect/schemaMigration.js

@@ -11,66 +11,104 @@ const logger_1 = require("../logger");
 const error_1 = require("../error");
 const projectUtils_1 = require("../projectUtils");
 const utils_1 = require("../utils");
-const IMCOMPATIBLE_SCHEMA_ERROR_TYPESTRING = "type.googleapis.com/google.firebase.dataconnect.v1main.IncompatibleSqlSchemaError";
+const errors = require("./errors");
 async function diffSchema(schema) {
-    var _a, _b;
-    const dbName = (_a = schema.primaryDatasource.postgresql) === null || _a === void 0 ? void 0 : _a.database;
-    const instanceName = (_b = schema.primaryDatasource.postgresql) === null || _b === void 0 ? void 0 : _b.cloudSql.instance;
-    if (!instanceName || !dbName) {
-        throw new error_1.FirebaseError(`tried to diff schema but ${instanceName} was undefined`);
-    }
+    const { serviceName, instanceName, databaseId } = getIdentifiers(schema);
+    await ensureServiceIsConnectedToCloudSql(serviceName, instanceName, databaseId);
     try {
-        const serviceName = schema.name.replace(`/schemas/${types_1.SCHEMA_ID}`, "");
-        await ensureServiceIsConnectedToCloudSql(serviceName);
         await (0, client_1.upsertSchema)(schema, true);
     }
     catch (err) {
-        const incompatible = getIncompatibleSchemaError(err);
+        const invalidConnectors = errors.getInvalidConnectors(err);
+        if (invalidConnectors.length) {
+            displayInvalidConnectors(invalidConnectors);
+        }
+        const incompatible = errors.getIncompatibleSchemaError(err);
         if (incompatible) {
             displaySchemaChanges(incompatible);
             return incompatible.diffs;
         }
-        throw err;
     }
-    logger_1.logger.debug(`Schema was up to date for ${instanceName}:${dbName}`);
+    (0, utils_1.logLabeledSuccess)("dataconnect", `Database schema is up to date.`);
     return [];
 }
 exports.diffSchema = diffSchema;
 async function migrateSchema(args) {
-    var _a, _b;
-    const { schema, validateOnly } = args;
-    const databaseId = (_a = schema.primaryDatasource.postgresql) === null || _a === void 0 ? void 0 : _a.database;
-    if (!databaseId) {
-        throw new error_1.FirebaseError("Schema is missing primaryDatasource.postgresql?.database, cannot migrate");
-    }
-    const instanceId = (_b = schema.primaryDatasource.postgresql) === null || _b === void 0 ? void 0 : _b.cloudSql.instance.split("/").pop();
-    if (!instanceId) {
-        throw new error_1.FirebaseError(`tried to migrate schema but ${instanceId} was undefined`);
-    }
+    const { options, schema, allowNonInteractiveMigration, validateOnly } = args;
+    const { serviceName, instanceId, instanceName, databaseId } = getIdentifiers(schema);
+    await ensureServiceIsConnectedToCloudSql(serviceName, instanceName, databaseId);
     try {
-        const serviceName = schema.name.replace(`/schemas/${types_1.SCHEMA_ID}`, "");
-        await ensureServiceIsConnectedToCloudSql(serviceName);
         await (0, client_1.upsertSchema)(schema, validateOnly);
         logger_1.logger.debug(`Database schema was up to date for ${instanceId}:${databaseId}`);
-        return [];
     }
     catch (err) {
-        const incompatible = getIncompatibleSchemaError(err);
-        if (!incompatible) {
+        const incompatible = errors.getIncompatibleSchemaError(err);
+        const invalidConnectors = errors.getInvalidConnectors(err);
+        if (!incompatible && !invalidConnectors.length) {
             throw err;
         }
-        const diffs = await handleIncompatibleSchemaError(Object.assign(Object.assign({}, args), { incompatibleSchemaError: incompatible, instanceId,
-            databaseId }));
+        const shouldDeleteInvalidConnectors = await promptForInvalidConnectorError(options, invalidConnectors, validateOnly);
+        if (!shouldDeleteInvalidConnectors && invalidConnectors.length) {
+            const cmd = suggestedCommand(serviceName, invalidConnectors);
+            throw new error_1.FirebaseError(`Command aborted. Try deploying compatible connectors first with ${clc.bold(cmd)}`);
+        }
+        const migrationMode = incompatible
+            ? await promptForSchemaMigration(options, databaseId, incompatible, allowNonInteractiveMigration)
+            : "none";
+        if (migrationMode === "none" && incompatible) {
+            throw new error_1.FirebaseError("Command aborted.");
+        }
+        let diffs = [];
+        if (incompatible) {
+            diffs = await handleIncompatibleSchemaError({
+                options,
+                databaseId,
+                instanceId,
+                incompatibleSchemaError: incompatible,
+                choice: migrationMode,
+            });
+        }
+        if (invalidConnectors.length) {
+            await deleteInvalidConnectors(invalidConnectors);
+        }
         await (0, client_1.upsertSchema)(schema, validateOnly);
         return diffs;
     }
+    return [];
 }
 exports.migrateSchema = migrateSchema;
+function getIdentifiers(schema) {
+    var _a, _b;
+    const databaseId = (_a = schema.primaryDatasource.postgresql) === null || _a === void 0 ? void 0 : _a.database;
+    if (!databaseId) {
+        throw new error_1.FirebaseError("Schema is missing primaryDatasource.postgresql?.database, cannot migrate");
+    }
+    const instanceName = (_b = schema.primaryDatasource.postgresql) === null || _b === void 0 ? void 0 : _b.cloudSql.instance;
+    if (!instanceName) {
+        throw new error_1.FirebaseError("tried to migrate schema but instance name was not provided in dataconnect.yaml");
+    }
+    const instanceId = instanceName.split("/").pop();
+    const serviceName = schema.name.replace(`/schemas/${types_1.SCHEMA_ID}`, "");
+    return {
+        databaseId,
+        instanceId,
+        instanceName,
+        serviceName,
+    };
+}
+function suggestedCommand(serviceName, invalidConnectorNames) {
+    const serviceId = serviceName.split("/")[5];
+    const connectorIds = invalidConnectorNames.map((i) => i.split("/")[7]);
+    const onlys = connectorIds.map((c) => `dataconnect:${serviceId}:${c}`).join(",");
+    return `firebase deploy --only ${onlys}`;
+}
 async function handleIncompatibleSchemaError(args) {
-    const { incompatibleSchemaError, options, instanceId, databaseId, allowNonInteractiveMigration } = args;
+    const { incompatibleSchemaError, options, instanceId, databaseId, choice } = args;
+    if (incompatibleSchemaError.destructive && choice === "safe") {
+        throw new error_1.FirebaseError("This schema migration includes potentially destructive changes. If you'd like to execute it anyway, rerun this command with --force");
+    }
     const projectId = (0, projectUtils_1.needProjectId)(options);
     const iamUser = await (0, connect_1.setupIAMUser)(instanceId, databaseId, options);
-    const choice = await promptForSchemaMigration(options, databaseId, incompatibleSchemaError, allowNonInteractiveMigration);
     const commandsToExecute = incompatibleSchemaError.diffs
         .filter((d) => {
         switch (choice) {
@@ -104,7 +142,6 @@ async function promptForSchemaMigration(options, databaseName, err, allowNonInte
         const choices = err.destructive
             ? [
                 { name: "Execute all changes (including destructive changes)", value: "all" },
-                { name: "Execute only safe changes", value: "safe" },
                 { name: "Abort changes", value: "none" },
             ]
             : [
@@ -132,23 +169,69 @@ async function promptForSchemaMigration(options, databaseName, err, allowNonInte
         return "none";
     }
 }
-async function ensureServiceIsConnectedToCloudSql(serviceName) {
+async function promptForInvalidConnectorError(options, invalidConnectors, validateOnly) {
+    if (!invalidConnectors.length) {
+        return false;
+    }
+    displayInvalidConnectors(invalidConnectors);
+    if (validateOnly) {
+        return false;
+    }
+    else if (options.force ||
+        (!options.nonInteractive &&
+            (await (0, prompt_1.confirm)(Object.assign(Object.assign({}, options), { message: "Would you like to delete and recreate these connectors?" }))))) {
+        return true;
+    }
+    return false;
+}
+async function deleteInvalidConnectors(invalidConnectors) {
+    return Promise.all(invalidConnectors.map(client_1.deleteConnector));
+}
+function displayInvalidConnectors(invalidConnectors) {
+    const connectorIds = invalidConnectors.map((i) => i.split("/").pop()).join(", ");
+    (0, utils_1.logLabeledWarning)("dataconnect", `The schema you are deploying is incompatible with the following existing connectors: ${connectorIds}.`);
+    (0, utils_1.logLabeledWarning)("dataconnect", `This is a ${clc.red("breaking")} change and will cause a brief downtime.`);
+}
+async function ensureServiceIsConnectedToCloudSql(serviceName, instanceId, databaseId) {
     let currentSchema;
     try {
         currentSchema = await (0, client_1.getSchema)(serviceName);
     }
     catch (err) {
         if (err.status === 404) {
-            return;
+            currentSchema = {
+                name: `${serviceName}/schemas/${types_1.SCHEMA_ID}`,
+                source: {
+                    files: [],
+                },
+                primaryDatasource: {
+                    postgresql: {
+                        database: databaseId,
+                        cloudSql: {
+                            instance: instanceId,
+                        },
+                    },
+                },
+            };
+        }
+        else {
+            throw err;
         }
-        throw err;
     }
     if (!currentSchema.primaryDatasource.postgresql ||
         currentSchema.primaryDatasource.postgresql.schemaValidation === "STRICT") {
         return;
     }
     currentSchema.primaryDatasource.postgresql.schemaValidation = "STRICT";
-    await (0, client_1.upsertSchema)(currentSchema, false);
+    try {
+        await (0, client_1.upsertSchema)(currentSchema, false);
+    }
+    catch (err) {
+        if (err.status >= 500) {
+            throw err;
+        }
+        logger_1.logger.debug(err);
+    }
 }
 function displaySchemaChanges(error) {
     const message = "Your new schema is incompatible with the schema of your CloudSQL database. " +
@@ -159,13 +242,3 @@ function displaySchemaChanges(error) {
 function toString(diff) {
     return `\/** ${diff.destructive ? clc.red("Destructive: ") : ""}${diff.description}*\/\n${(0, sql_formatter_1.format)(diff.sql, { language: "postgresql" })}`;
 }
-function getIncompatibleSchemaError(err) {
-    var _a;
-    const original = ((_a = err.context) === null || _a === void 0 ? void 0 : _a.body.error) || err.orignal;
-    if (!original) {
-        throw err;
-    }
-    const details = original.details;
-    const incompatibles = details.filter((d) => d["@type"] === IMCOMPATIBLE_SCHEMA_ERROR_TYPESTRING);
-    return incompatibles[0];
-}

package/lib/deploy/dataconnect/deploy.js

@@ -6,7 +6,6 @@ const types_1 = require("../../dataconnect/types");
 const projectUtils_1 = require("../../projectUtils");
 const provisionCloudSql_1 = require("../../dataconnect/provisionCloudSql");
 const names_1 = require("../../dataconnect/names");
-const prompt_1 = require("../../prompt");
 const api_1 = require("../../api");
 const ensureApiEnabled = require("../../ensureApiEnabled");
 async function default_1(context, options) {
@@ -33,19 +32,10 @@ async function default_1(context, options) {
         utils.logLabeledSuccess("dataconnect", `Created service ${s.serviceName}`);
     }));
     if (servicesToDelete.length) {
-        if (await (0, prompt_1.confirm)({
-            force: options.force,
-            nonInteractive: options.nonInteractive,
-            message: `The following services exist on ${projectId} but are not listed in your 'firebase.json'\n${servicesToDelete
-                .map((s) => s.name)
-                .join("\n")}\nWould you like to delete these services?`,
-        })) {
-            await Promise.all(servicesToDelete.map(async (s) => {
-                const { projectId, locationId, serviceId } = splitName(s.name);
-                await client.deleteService(projectId, locationId, serviceId);
-                utils.logLabeledSuccess("dataconnect", `Deleted service ${s.name}`);
-            }));
-        }
+        const warning = `The following services exist on ${projectId} but are not listed in your 'firebase.json'\n${servicesToDelete
+            .map((s) => s.name)
+            .join("\n")}\nConsider deleting these via the Firebase console if they are no longer needed.`;
+        utils.logLabeledWarning("dataconnect", warning);
     }
     utils.logLabeledBullet("dataconnect", "Checking for CloudSQL resources...");
     await Promise.all(serviceInfos

package/lib/deploy/dataconnect/prepare.js

@@ -9,9 +9,12 @@ const projectUtils_1 = require("../../projectUtils");
 const filters_1 = require("../../dataconnect/filters");
 const build_1 = require("../../dataconnect/build");
 const ensureApis_1 = require("../../dataconnect/ensureApis");
+const requireTosAcceptance_1 = require("../../requireTosAcceptance");
+const firedata_1 = require("../../gcp/firedata");
 async function default_1(context, options) {
     const projectId = (0, projectUtils_1.needProjectId)(options);
     await (0, ensureApis_1.ensureApis)(projectId);
+    await (0, requireTosAcceptance_1.requireTosAcceptance)(firedata_1.DATA_CONNECT_TOS_ID)(options);
     const serviceCfgs = (0, fileUtils_1.readFirebaseJson)(options.config);
     utils.logLabeledBullet("dataconnect", `Preparing to deploy`);
     const filters = (0, filters_1.getResourceFilters)(options);

package/lib/emulator/dataconnectEmulator.js

@@ -9,6 +9,7 @@ const types_1 = require("./types");
 const error_1 = require("../error");
 const emulatorLogger_1 = require("./emulatorLogger");
 const types_2 = require("../dataconnect/types");
+const grpcDefaultPort = 9510;
 class DataConnectEmulator {
     constructor(args) {
         this.args = args;
@@ -26,7 +27,7 @@ class DataConnectEmulator {
                 this.logger.logLabeled("WARN", "Data Connect", "Operations that use vector_embed will make calls to production Vertex AI");
             }
         }
-        return (0, downloadableEmulators_1.start)(types_1.Emulators.DATACONNECT, Object.assign(Object.assign({}, this.args), { http_port: port, grpc_port: port + 1, config_dir: this.args.configDir, local_connection_string: this.getLocalConectionString(), project_id: this.args.projectId, service_location: this.args.locationId }));
+        return (0, downloadableEmulators_1.start)(types_1.Emulators.DATACONNECT, Object.assign(Object.assign({}, this.args), { http_port: port, grpc_port: grpcDefaultPort, config_dir: this.args.configDir, local_connection_string: this.getLocalConectionString(), project_id: this.args.projectId, service_location: this.args.locationId }));
     }
     connect() {
         return Promise.resolve();

package/lib/emulator/downloadableEmulators.js

@@ -23,9 +23,9 @@ const EMULATOR_UPDATE_DETAILS = {
         expectedChecksum: "2fd771101c0e1f7898c04c9204f2ce63",
     },
     firestore: {
-        version: "1.19.5",
-        expectedSize: 66204670,
-        expectedChecksum: "6d9fb826605701668af722f25048ad95",
+        version: "1.19.6",
+        expectedSize: 66349770,
+        expectedChecksum: "2eaabbe3cdb4867df585b7ec5505bad7",
     },
     storage: {
         version: "1.1.3",
@@ -46,14 +46,14 @@ const EMULATOR_UPDATE_DETAILS = {
     },
     dataconnect: process.platform === "darwin"
         ? {
-            version: "1.1.15",
-            expectedSize: 25600896,
-            expectedChecksum: "36dcf9be7273b9ba6052faf0b3c0347f",
+            version: "1.1.17",
+            expectedSize: 25602224,
+            expectedChecksum: "1f9e3dd040a0ac4d1cb4d9dde4a3c0b0",
         }
         : {
-            version: "1.1.15",
-            expectedSize: 23036688,
-            expectedChecksum: "e42203947bf984993f295976ee3ba2be",
+            version: "1.1.17",
+            expectedSize: 23036912,
+            expectedChecksum: "a0ec0517108f842ed06fea14fe7c7e56",
         },
 };
 exports.DownloadDetails = {

package/lib/experiments.js

@@ -96,6 +96,11 @@ exports.ALL_EXPERIMENTS = experiments({
         fullDescription: "Enable Data Connect related features.",
         public: false,
     },
+    genkit: {
+        shortDescription: "Enable Genkit related features.",
+        fullDescription: "Enable Genkit related features.",
+        public: false,
+    },
 });
 function isValidExperiment(name) {
     return Object.keys(exports.ALL_EXPERIMENTS).includes(name);

package/lib/gcp/cloudsql/cloudsqladmin.js

@@ -113,27 +113,47 @@ async function createDatabase(projectId, instanceId, databaseId) {
 }
 exports.createDatabase = createDatabase;
 async function createUser(projectId, instanceId, type, username, password) {
-    const op = await client.post(`projects/${projectId}/instances/${instanceId}/users`, {
-        name: username,
-        instance: instanceId,
-        project: projectId,
-        password: password,
-        sqlserverUserDetails: {
-            disabled: false,
-            serverRoles: ["cloudsqlsuperuser"],
-        },
-        type,
-    });
-    const opName = `projects/${projectId}/operations/${op.body.name}`;
-    const pollRes = await operationPoller.pollOperation({
-        apiOrigin: (0, api_1.cloudSQLAdminOrigin)(),
-        apiVersion: API_VERSION,
-        operationResourceName: opName,
-        doneFn: (op) => op.status === "DONE",
-    });
-    return pollRes;
+    const maxRetries = 3;
+    let retries = 0;
+    while (true) {
+        try {
+            const op = await client.post(`projects/${projectId}/instances/${instanceId}/users`, {
+                name: username,
+                instance: instanceId,
+                project: projectId,
+                password: password,
+                sqlserverUserDetails: {
+                    disabled: false,
+                    serverRoles: ["cloudsqlsuperuser"],
+                },
+                type,
+            });
+            const opName = `projects/${projectId}/operations/${op.body.name}`;
+            const pollRes = await operationPoller.pollOperation({
+                apiOrigin: (0, api_1.cloudSQLAdminOrigin)(),
+                apiVersion: API_VERSION,
+                operationResourceName: opName,
+                doneFn: (op) => op.status === "DONE",
+            });
+            return pollRes;
+        }
+        catch (err) {
+            if (builtinRoleNotReady(err.message) && retries < maxRetries) {
+                retries++;
+                await new Promise((resolve) => {
+                    setTimeout(resolve, 1000 * retries);
+                });
+            }
+            else {
+                throw err;
+            }
+        }
+    }
 }
 exports.createUser = createUser;
+function builtinRoleNotReady(message) {
+    return message.includes("cloudsqliamuser");
+}
 async function getUser(projectId, instanceId, username) {
     const res = await client.get(`projects/${projectId}/instances/${instanceId}/users/${username}`);
     return res.body;

package/lib/gcp/firedata.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isProductTosAccepted = exports.getAcceptanceStatus = exports.getTosStatus = exports.APP_CHECK_TOS_ID = exports.APPHOSTING_TOS_ID = void 0;
+exports.isProductTosAccepted = exports.getAcceptanceStatus = exports.getTosStatus = exports.DATA_CONNECT_TOS_ID = exports.APP_CHECK_TOS_ID = exports.APPHOSTING_TOS_ID = void 0;
 const apiv2_1 = require("../apiv2");
 const api_1 = require("../api");
 const error_1 = require("../error");
 const client = new apiv2_1.Client({ urlPrefix: (0, api_1.firedataOrigin)(), auth: true, apiVersion: "v1" });
 exports.APPHOSTING_TOS_ID = "APP_HOSTING_TOS";
 exports.APP_CHECK_TOS_ID = "APP_CHECK";
+exports.DATA_CONNECT_TOS_ID = "FIREBASE_DATA_CONNECT";
 async function getTosStatus() {
     const res = await client.get("accessmanagement/tos:getStatus");
     return res.body;
@@ -15,7 +16,7 @@ exports.getTosStatus = getTosStatus;
 function getAcceptanceStatus(response, tosId) {
     const perServiceStatus = response.perServiceStatus.find((tosStatus) => tosStatus.tosId === tosId);
     if (perServiceStatus === undefined) {
-        throw new error_1.FirebaseError(`Missing terms of service status for  product: ${tosId}`);
+        throw new error_1.FirebaseError(`Missing terms of service status for product: ${tosId}`);
     }
     return perServiceStatus.serviceStatus.status;
 }

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

@@ -5,9 +5,11 @@ const path_1 = require("path");
 const prompt_1 = require("../../../prompt");
 const fs_1 = require("fs");
 const provisionCloudSql_1 = require("../../../dataconnect/provisionCloudSql");
+const freeTrial_1 = require("../../../dataconnect/freeTrial");
 const cloudsql = require("../../../gcp/cloudsql/cloudsqladmin");
 const ensureApis_1 = require("../../../dataconnect/ensureApis");
 const client_1 = require("../../../dataconnect/client");
+const emulators_1 = require("../emulators");
 const TEMPLATE_ROOT = (0, path_1.resolve)(__dirname, "../../../../templates/init/dataconnect/");
 const DATACONNECT_YAML_TEMPLATE = (0, fs_1.readFileSync)((0, path_1.join)(TEMPLATE_ROOT, "dataconnect.yaml"), "utf8");
 const CONNECTOR_YAML_TEMPLATE = (0, fs_1.readFileSync)((0, path_1.join)(TEMPLATE_ROOT, "connector.yaml"), "utf8");
@@ -24,61 +26,65 @@ async function doSetup(setup, config) {
         type: "input",
         default: "dataconnect",
     });
-    let locationOptions = [
-        { name: "us-central1", value: "us-central1" },
-        { name: "europe-north1", value: "europe-north1" },
-        { name: "europe-central2", value: "europe-central2" },
-        { name: "europe-west1", value: "europe-west1" },
-        { name: "southamerica-west1", value: "southamerica-west1" },
-        { name: "us-east4", value: "us-east4" },
-        { name: "us-west1", value: "us-west1" },
-        { name: "asia-southeast1", value: "asia-southeast1" },
-    ];
-    if (setup.projectId) {
-        const locations = await (0, client_1.listLocations)(setup.projectId);
-        locationOptions = locations.map((l) => {
-            return { name: l, value: l };
-        });
-    }
-    const locationId = await (0, prompt_1.promptOnce)({
-        message: "What location would you like to deploy this service into?",
-        type: "list",
-        choices: locationOptions,
-    });
     const connectorId = await (0, prompt_1.promptOnce)({
         message: "What ID would you like to use for your connector?",
         type: "input",
         default: "my-connector",
     });
-    const dir = config.get("dataconnect.source") || "dataconnect";
-    if (!config.has("dataconnect")) {
-        config.set("dataconnect.source", dir);
-        config.set("dataconnect.location", locationId);
-    }
     let cloudSqlInstanceId = "";
     let newInstance = false;
+    let locationId = "";
     if (setup.projectId) {
         const instances = await cloudsql.listInstances(setup.projectId);
-        const instancesInLocation = instances.filter((i) => i.region === locationId);
-        const choices = instancesInLocation.map((i) => {
-            return { name: i.name, value: i.name };
+        const choices = instances.map((i) => {
+            return { name: i.name, value: i.name, location: i.region };
         });
-        choices.push({ name: "Create a new instance", value: "" });
-        if (instancesInLocation.length) {
+        const freeTrialInstanceId = await (0, freeTrial_1.checkForFreeTrialInstance)(setup.projectId);
+        if (!freeTrialInstanceId) {
+            choices.push({ name: "Create a new instance", value: "", location: "" });
+        }
+        if (instances.length) {
             cloudSqlInstanceId = await (0, prompt_1.promptOnce)({
-                message: `Which CloudSSQL in ${locationId} would you like to use?`,
+                message: `Which CloudSSQL instance would you like to use?`,
                 type: "list",
                 choices,
             });
         }
+        locationId = choices.find((c) => c.value === cloudSqlInstanceId).location;
     }
     if (cloudSqlInstanceId === "") {
+        let locationOptions = [
+            { name: "us-central1", value: "us-central1" },
+            { name: "europe-north1", value: "europe-north1" },
+            { name: "europe-central2", value: "europe-central2" },
+            { name: "europe-west1", value: "europe-west1" },
+            { name: "southamerica-west1", value: "southamerica-west1" },
+            { name: "us-east4", value: "us-east4" },
+            { name: "us-west1", value: "us-west1" },
+            { name: "asia-southeast1", value: "asia-southeast1" },
+        ];
+        if (setup.projectId) {
+            const locations = await (0, client_1.listLocations)(setup.projectId);
+            locationOptions = locations.map((l) => {
+                return { name: l, value: l };
+            });
+        }
         newInstance = true;
         cloudSqlInstanceId = await (0, prompt_1.promptOnce)({
             message: `What ID would you like to use for your new CloudSQL instance?`,
             type: "input",
             default: `dataconnect-test`,
         });
+        locationId = await (0, prompt_1.promptOnce)({
+            message: "What location would you use for this instance?",
+            type: "list",
+            choices: locationOptions,
+        });
+    }
+    const dir = config.get("dataconnect.source") || "dataconnect";
+    if (!config.has("dataconnect")) {
+        config.set("dataconnect.source", dir);
+        config.set("dataconnect.location", locationId);
     }
     let cloudSqlDatabase = "";
     let newDB = false;
@@ -104,7 +110,7 @@ async function doSetup(setup, config) {
             default: `dataconnect`,
         });
     }
-    const defaultConnectionString = (_c = (_b = (_a = setup.rcfile.dataconnectEmulatorConfig) === null || _a === void 0 ? void 0 : _a.postgres) === null || _b === void 0 ? void 0 : _b.localConnectionString) !== null && _c !== void 0 ? _c : "postgresql://localhost:5432?sslmode=disable";
+    const defaultConnectionString = (_c = (_b = (_a = setup.rcfile.dataconnectEmulatorConfig) === null || _a === void 0 ? void 0 : _a.postgres) === null || _b === void 0 ? void 0 : _b.localConnectionString) !== null && _c !== void 0 ? _c : emulators_1.DEFAULT_POSTGRES_CONNECTION;
     const localConnectionString = await (0, prompt_1.promptOnce)({
         type: "input",
         name: "localConnectionString",

package/lib/init/features/emulators.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.doSetup = void 0;
+exports.doSetup = exports.DEFAULT_POSTGRES_CONNECTION = void 0;
 const clc = require("colorette");
 const _ = require("lodash");
 const utils = require("../../utils");
@@ -8,6 +8,7 @@ const prompt_1 = require("../../prompt");
 const types_1 = require("../../emulator/types");
 const constants_1 = require("../../emulator/constants");
 const downloadableEmulators_1 = require("../../emulator/downloadableEmulators");
+exports.DEFAULT_POSTGRES_CONNECTION = "postgresql://localhost:5432?sslmode=disable";
 async function doSetup(setup, config) {
     var _a, _b, _c;
     const choices = types_1.ALL_SERVICE_EMULATORS.map((e) => {
@@ -78,15 +79,13 @@ async function doSetup(setup, config) {
             }
         }
         if (selections.emulators.includes(types_1.Emulators.DATACONNECT)) {
-            const defaultConnectionString = (_c = (_b = (_a = setup.rcfile.dataconnectEmulatorConfig) === null || _a === void 0 ? void 0 : _a.postgres) === null || _b === void 0 ? void 0 : _b.localConnectionString) !== null && _c !== void 0 ? _c : "postgresql://localhost:5432";
-            const localConnectionString = await (0, prompt_1.prompt)(setup.config.emulators[types_1.Emulators.DATACONNECT], [
-                {
-                    type: "input",
-                    name: "localConnectionString",
-                    message: `What is the connection string of the local Postgres instance you would like to use with the Data Connect emulator?`,
-                    default: defaultConnectionString,
-                },
-            ]);
+            const defaultConnectionString = (_c = (_b = (_a = setup.rcfile.dataconnectEmulatorConfig) === null || _a === void 0 ? void 0 : _a.postgres) === null || _b === void 0 ? void 0 : _b.localConnectionString) !== null && _c !== void 0 ? _c : exports.DEFAULT_POSTGRES_CONNECTION;
+            const localConnectionString = await (0, prompt_1.promptOnce)({
+                type: "input",
+                name: "localConnectionString",
+                message: `What is the connection string of the local Postgres instance you would like to use with the Data Connect emulator?`,
+                default: defaultConnectionString,
+            });
             setup.rcfile.dataconnectEmulatorConfig = { postgres: { localConnectionString } };
         }
         await (0, prompt_1.prompt)(selections, [

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

@@ -130,6 +130,9 @@ async function overwriteCodebase(setup, config) {
     return languageSetup(setup, config);
 }
 async function languageSetup(setup, config) {
+    if (setup.languageOverride) {
+        return require("./" + setup.languageOverride).setup(setup, config);
+    }
     const choices = [
         {
             name: "JavaScript",
@@ -174,5 +177,6 @@ async function languageSetup(setup, config) {
             cbconfig.ignore = ["venv", ".git", "firebase-debug.log", "firebase-debug.*.log", "*.local"];
             break;
     }
+    setup.functions.languageChoice = language;
     return require("./" + language).setup(setup, config);
 }