firebase-tools 13.19.0 → 13.20.1

package/lib/emulator/dataconnectToolkitController.js

@@ -0,0 +1,44 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DataConnectToolkitController = void 0;
+const error_1 = require("../error");
+const portUtils = require("./portUtils");
+const utils_1 = require("../utils");
+const dataconnectEmulator_1 = require("./dataconnectEmulator");
+const name = "Data Connect Toolkit";
+class DataConnectToolkitController {
+    static async start(args) {
+        if (this.isRunning || this.instance) {
+            throw new error_1.FirebaseError(`${name} is already running!`, {});
+        }
+        this.instance = new dataconnectEmulator_1.DataConnectEmulator(args);
+        this.isRunning = true;
+        await this.instance.start();
+        const info = this.instance.getInfo();
+        await portUtils.waitForPortUsed(info.port, (0, utils_1.connectableHostname)(info.host), info.timeout);
+    }
+    static async stop() {
+        if (!this.isRunning) {
+            return;
+        }
+        try {
+            await this.instance.stop();
+            this.isRunning = false;
+        }
+        catch (e) {
+            throw new error_1.FirebaseError(`Data Connect Toolkit failed to stop with error: ${e}`);
+        }
+    }
+    static getInfo() {
+        return this.instance.getInfo();
+    }
+    static getUrl() {
+        const info = this.instance.getInfo();
+        if (info.host.includes(":")) {
+            return `http://[${info.host}]:${info.port}`;
+        }
+        return `http://${info.host}:${info.port}`;
+    }
+}
+exports.DataConnectToolkitController = DataConnectToolkitController;
+DataConnectToolkitController.isRunning = false;

package/lib/emulator/downloadableEmulators.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.start = exports.downloadIfNecessary = exports.stop = exports.getPID = exports.get = exports.getDownloadDetails = exports.requiresJava = exports.handleEmulatorProcessError = exports._getCommand = exports.getLogFileName = exports.DownloadDetails = void 0;
+const lsofi = require("lsofi");
 const types_1 = require("./types");
 const constants_1 = require("./constants");
 const error_1 = require("../error");
@@ -14,6 +15,7 @@ const os = require("os");
 const registry_1 = require("./registry");
 const download_1 = require("../emulator/download");
 const experiments = require("../experiments");
+const process = require("process");
 const EMULATOR_INSTANCE_KILL_TIMEOUT = 4000;
 const CACHE_DIR = process.env.FIREBASE_EMULATORS_PATH || path.join(os.homedir(), ".cache", "firebase", "emulators");
 const EMULATOR_UPDATE_DETAILS = {
@@ -46,20 +48,20 @@ const EMULATOR_UPDATE_DETAILS = {
     },
     dataconnect: process.platform === "darwin"
         ? {
-            version: "1.3.8",
-            expectedSize: 25027328,
-            expectedChecksum: "903f0e8dd8212fec575dc2eba34be6e7",
+            version: "1.4.3",
+            expectedSize: 25125632,
+            expectedChecksum: "1edc7180b101b1b3653429ecb8312d2d",
         }
         : process.platform === "win32"
             ? {
-                version: "1.3.8",
-                expectedSize: 25450496,
-                expectedChecksum: "e09999deda7301eba06f88face5e1744",
+                version: "1.4.3",
+                expectedSize: 25548800,
+                expectedChecksum: "16b31831577778e8842c8715f35b4faa",
             }
             : {
-                version: "1.3.8",
-                expectedSize: 24940696,
-                expectedChecksum: "69aeb9755d4ec2e77bdadbc40236b306",
+                version: "1.4.3",
+                expectedSize: 25034904,
+                expectedChecksum: "c959f7bd2ed3221c509cb7ad22956de3",
             },
 };
 exports.DownloadDetails = {
@@ -295,6 +297,7 @@ function _getCommand(emulator, args) {
         optionalArgs: baseCmd.optionalArgs,
         joinArgs: baseCmd.joinArgs,
         shell: baseCmd.shell,
+        port: args.port,
     };
 }
 exports._getCommand = _getCommand;
@@ -308,11 +311,15 @@ async function _fatal(emulator, errorMsg) {
         process.exit(1);
     }
 }
-async function handleEmulatorProcessError(emulator, err) {
+async function handleEmulatorProcessError(emulator, err, port) {
     const description = constants_1.Constants.description(emulator);
     if (err.path === "java" && err.code === "ENOENT") {
         await _fatal(emulator, `${description} has exited because java is not installed, you can install it from https://openjdk.java.net/install/`);
     }
+    else if (err.code === "EADDRINUSE") {
+        const ps = port ? await lsofi(port) : false;
+        await _fatal(emulator, `${description} has exited because its configured port is already in use${ps ? ` by process number ${ps}` : ""}. Are you running another copy of the emulator suite?`);
+    }
     else {
         await _fatal(emulator, `${description} has exited: ${err}`);
     }
@@ -366,9 +373,13 @@ async function _runBinary(emulator, command, extraEnv) {
             if (data.toString().includes("java.lang.UnsupportedClassVersionError")) {
                 logger.logLabeled("WARN", emulator.name, "Unsupported java version, make sure java --version reports 1.8 or higher.");
             }
+            if (data.toString().includes("address already in use")) {
+                const message = `${description} has exited because its configured port ${command.port} is already in use. Are you running another copy of the emulator suite?`;
+                logger.logLabeled("ERROR", emulator.name, message);
+            }
         });
         emulator.instance.on("error", (err) => {
-            handleEmulatorProcessError(emulator.name, err);
+            void handleEmulatorProcessError(emulator.name, err, command.port);
         });
         emulator.instance.once("exit", async (code, signal) => {
             if (signal) {

package/lib/emulator/hub.js

@@ -10,6 +10,7 @@ const types_1 = require("./types");
 const hubExport_1 = require("./hubExport");
 const registry_1 = require("./registry");
 const ExpressBasedEmulator_1 = require("./ExpressBasedEmulator");
+const utils_1 = require("../utils");
 const pkg = require("../../package.json");
 class EmulatorHub extends ExpressBasedEmulator_1.ExpressBasedEmulator {
     static readLocatorFile(projectId) {
@@ -19,7 +20,7 @@ class EmulatorHub extends ExpressBasedEmulator_1.ExpressBasedEmulator {
         }
         const data = fs.readFileSync(locatorPath, "utf8").toString();
         const locator = JSON.parse(data);
-        if (locator.version !== this.CLI_VERSION) {
+        if (!utils_1.isVSCodeExtension && locator.version !== this.CLI_VERSION) {
             logger_1.logger.debug(`Found locator with mismatched version, ignoring: ${JSON.stringify(locator)}`);
             return undefined;
         }

package/lib/emulator/portUtils.js

@@ -11,7 +11,6 @@ const types_1 = require("./types");
 const constants_1 = require("./constants");
 const emulatorLogger_1 = require("./emulatorLogger");
 const node_child_process_1 = require("node:child_process");
-const dataconnectEmulator_1 = require("./dataconnectEmulator");
 const RESTRICTED_PORTS = new Set([
     1,
     7,
@@ -147,6 +146,7 @@ const EMULATOR_CAN_LISTEN_ON_PRIMARY_ONLY = {
     firestore: true,
     "firestore.websocket": true,
     pubsub: true,
+    "dataconnect.postgres": true,
     dataconnect: false,
     hub: false,
     ui: false,
@@ -185,7 +185,11 @@ async function resolveHostAndAssignPorts(listenConfig) {
             lookupForHost.set(host, lookup);
         }
         const findAddrs = lookup.then(async (addrs) => {
-            const emuLogger = emulatorLogger_1.EmulatorLogger.forEmulator(name === "firestore.websocket" ? types_1.Emulators.FIRESTORE : name);
+            const emuLogger = emulatorLogger_1.EmulatorLogger.forEmulator(name === "firestore.websocket"
+                ? types_1.Emulators.FIRESTORE
+                : name === "dataconnect.postgres"
+                    ? types_1.Emulators.DATACONNECT
+                    : name);
             if (addrs.some((addr) => addr.address === dns_1.IPV6_UNSPECIFIED.address)) {
                 if (!addrs.some((addr) => addr.address === dns_1.IPV4_UNSPECIFIED.address)) {
                     emuLogger.logLabeled("DEBUG", name, `testing listening on IPv4 wildcard in addition to IPv6. To listen on IPv6 only, use "::0" instead.`);
@@ -222,14 +226,6 @@ async function resolveHostAndAssignPorts(listenConfig) {
                         available.push(listen);
                     }
                     else {
-                        if (/^dataconnect/i.exec(name)) {
-                            const alreadyRunning = await (0, dataconnectEmulator_1.checkIfDataConnectEmulatorRunningOnAddress)(listen);
-                            if (alreadyRunning) {
-                                emuLogger.logLabeled("DEBUG", "dataconnect", `Detected already running emulator on ${listen.address}:${listen.port}. Will attempt to reuse it.`);
-                            }
-                            available.push(listen);
-                            continue;
-                        }
                         if (!portFixed) {
                             if (i > 0) {
                                 emuLogger.logLabeled("DEBUG", name, `Port ${p} taken on secondary address ${addr.address}, will keep searching to find a better port.`);
@@ -281,7 +277,9 @@ exports.resolveHostAndAssignPorts = resolveHostAndAssignPorts;
 function portDescription(name) {
     return name === "firestore.websocket"
         ? `websocket server for ${types_1.Emulators.FIRESTORE}`
-        : constants_1.Constants.description(name);
+        : name === "dataconnect.postgres"
+            ? `postgres server for ${types_1.Emulators.DATACONNECT}`
+            : constants_1.Constants.description(name);
 }
 function warnPartiallyAvailablePort(emuLogger, port, available, unavailable) {
     emuLogger.logLabeled("WARN", `Port ${port} is available on ` +

package/lib/emulator/storage/rules/runtime.js

@@ -109,7 +109,7 @@ class StorageRulesRuntime {
             };
         });
         this._childprocess.on("error", (err) => {
-            (0, downloadableEmulators_1.handleEmulatorProcessError)(types_2.Emulators.STORAGE, err);
+            void (0, downloadableEmulators_1.handleEmulatorProcessError)(types_2.Emulators.STORAGE, err);
         });
         (_a = this._childprocess.stderr) === null || _a === void 0 ? void 0 : _a.on("data", (buf) => {
             const error = buf.toString();

package/lib/experiments.js

@@ -109,6 +109,7 @@ exports.ALL_EXPERIMENTS = experiments({
     fdccompatiblemode: {
         shortDescription: "Enable Data Connect schema migrations in Compatible Mode",
         fullDescription: "Enable Data Connect schema migrations in Compatible Mode",
+        default: true,
         public: false,
     },
 });

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

@@ -10,12 +10,14 @@ const cloudsql = require("../../../gcp/cloudsql/cloudsqladmin");
 const ensureApis_1 = require("../../../dataconnect/ensureApis");
 const experiments = require("../../../experiments");
 const client_1 = require("../../../dataconnect/client");
-const emulators_1 = require("../emulators");
+const types_1 = require("../../../dataconnect/types");
 const names_1 = require("../../../dataconnect/names");
 const logger_1 = require("../../../logger");
 const templates_1 = require("../../../templates");
 const utils_1 = require("../../../utils");
 const cloudbilling_1 = require("../../../gcp/cloudbilling");
+const sdk = require("./sdk");
+const fileUtils_1 = require("../../../dataconnect/fileUtils");
 const DATACONNECT_YAML_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconnect/dataconnect.yaml");
 const DATACONNECT_YAML_COMPAT_EXPERIMENT_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconnect/dataconnect-fdccompatiblemode.yaml");
 const CONNECTOR_YAML_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconnect/connector.yaml");
@@ -37,14 +39,28 @@ const defaultConnector = {
     ],
 };
 async function doSetup(setup, config) {
-    const info = await askQuestions(setup, config);
+    const info = await askQuestions(setup);
     await actuate(setup, config, info);
+    const cwdPlatformGuess = await (0, fileUtils_1.getPlatformFromFolder)(process.cwd());
+    if (cwdPlatformGuess !== types_1.Platform.UNDETERMINED) {
+        await sdk.doSetup(setup, config);
+    }
+    else {
+        const promptForSDKGeneration = await (0, prompt_1.confirm)({
+            message: `Would you like to configure generated SDKs now?`,
+            default: false,
+        });
+        if (promptForSDKGeneration) {
+            await sdk.doSetup(setup, config);
+        }
+        else {
+            (0, utils_1.logBullet)(`If you'd like to generate an SDK for your new connector later, run ${clc.bold("firebase init dataconnect:sdk")}`);
+        }
+    }
     logger_1.logger.info("");
-    (0, utils_1.logSuccess)(`If you'd like to generate an SDK for your new connector, run ${clc.bold("firebase init dataconnect:sdk")}`);
 }
 exports.doSetup = doSetup;
-async function askQuestions(setup, config) {
-    var _a, _b, _c;
+async function askQuestions(setup) {
     let info = {
         serviceId: "",
         locationId: "",
@@ -57,28 +73,42 @@ async function askQuestions(setup, config) {
         shouldProvisionCSQL: false,
     };
     const isBillingEnabled = setup.projectId ? await (0, cloudbilling_1.checkBillingEnabled)(setup.projectId) : false;
-    info = await promptForService(setup, info, isBillingEnabled);
-    if (info.cloudSqlInstanceId === "") {
+    if (setup.projectId) {
+        isBillingEnabled ? await (0, ensureApis_1.ensureApis)(setup.projectId) : await (0, ensureApis_1.ensureSparkApis)(setup.projectId);
+    }
+    info = await checkExistingInstances(setup, info, isBillingEnabled);
+    const requiredConfigUnset = info.serviceId === "" ||
+        info.cloudSqlInstanceId === "" ||
+        info.locationId === "" ||
+        info.cloudSqlDatabase === "";
+    const shouldConfigureBackend = isBillingEnabled && requiredConfigUnset
+        ? await (0, prompt_1.confirm)({
+            message: `Would you like to configure your backend resources now?`,
+            default: false,
+        })
+        : false;
+    if (shouldConfigureBackend) {
+        info = await promptForService(info);
         info = await promptForCloudSQLInstance(setup, info);
+        info = await promptForDatabase(info);
+        info.shouldProvisionCSQL = !!(setup.projectId &&
+            (info.isNewInstance || info.isNewDatabase) &&
+            isBillingEnabled &&
+            (await (0, prompt_1.confirm)({
+                message: `Would you like to provision your Cloud SQL instance and database now?${info.isNewInstance ? " This will take several minutes." : ""}.`,
+                default: true,
+            })));
     }
-    if (info.cloudSqlDatabase === "") {
-        info = await promptForDatabase(setup, config, info);
+    else {
+        if (requiredConfigUnset) {
+            (0, utils_1.logBullet)(`Setting placeholder values in dataconnect.yaml. You can edit these before you deploy to specify different IDs or regions.`);
+        }
+        info.serviceId = info.serviceId !== "" ? info.serviceId : (0, path_1.basename)(process.cwd());
+        info.cloudSqlInstanceId =
+            info.cloudSqlInstanceId !== "" ? info.cloudSqlInstanceId : `${info.serviceId || "app"}-fdc`;
+        info.locationId = info.locationId !== "" ? info.locationId : `us-central1`;
+        info.cloudSqlDatabase = info.cloudSqlDatabase !== "" ? info.cloudSqlDatabase : `fdcdb`;
     }
-    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",
-        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 } };
-    info.shouldProvisionCSQL = !!(setup.projectId &&
-        (info.isNewInstance || info.isNewDatabase) &&
-        isBillingEnabled &&
-        (await (0, prompt_1.confirm)({
-            message: `Would you like to provision your Cloud SQL instance and database now?${info.isNewInstance ? " This will take several minutes." : ""}.`,
-            default: true,
-        })));
     return info;
 }
 async function actuate(setup, config, info) {
@@ -89,6 +119,7 @@ async function actuate(setup, config, info) {
             locationId: info.locationId,
             instanceId: info.cloudSqlInstanceId,
             databaseId: info.cloudSqlDatabase,
+            configYamlPath: (0, path_1.join)(config.get("dataconnect.source"), "dataconnect.yaml"),
             enableGoogleMlIntegration: false,
             waitForCreation: false,
         });
@@ -97,7 +128,6 @@ async function actuate(setup, config, info) {
 exports.actuate = actuate;
 async function writeFiles(config, info) {
     const dir = config.get("dataconnect.source") || "dataconnect";
-    console.log(dir);
     const subbedDataconnectYaml = subDataconnectYamlValues(Object.assign(Object.assign({}, info), { connectorDirs: info.connectors.map((c) => c.path) }));
     config.set("dataconnect", { source: dir });
     await config.askWriteProjectFile((0, path_1.join)(dir, "dataconnect.yaml"), subbedDataconnectYaml);
@@ -148,79 +178,67 @@ function subConnectorYamlValues(replacementValues) {
     }
     return replaced;
 }
-async function promptForService(setup, info, isBillingEnabled) {
+async function checkExistingInstances(setup, info, isBillingEnabled) {
     var _a, _b, _c;
-    if (setup.projectId) {
-        if (isBillingEnabled) {
-            await (0, ensureApis_1.ensureApis)(setup.projectId);
-            const existingServices = await (0, client_1.listAllServices)(setup.projectId);
-            const existingServicesAndSchemas = await Promise.all(existingServices.map(async (s) => {
-                return {
-                    service: s,
-                    schema: await (0, client_1.getSchema)(s.name),
-                };
-            }));
-            if (existingServicesAndSchemas.length) {
-                const choices = existingServicesAndSchemas.map((s) => {
-                    const serviceName = (0, names_1.parseServiceName)(s.service.name);
-                    return {
-                        name: `${serviceName.location}/${serviceName.serviceId}`,
-                        value: s,
-                    };
-                });
-                choices.push({ name: "Create a new service", value: undefined });
-                const choice = await (0, prompt_1.promptOnce)({
-                    message: "Your project already has existing services. Which would you like to set up local files for?",
-                    type: "list",
-                    choices,
-                });
-                if (choice) {
-                    const serviceName = (0, names_1.parseServiceName)(choice.service.name);
-                    info.serviceId = serviceName.serviceId;
-                    info.locationId = serviceName.location;
-                    if (choice.schema) {
-                        const primaryDatasource = choice.schema.datasources.find((d) => d.postgresql);
-                        if ((_a = primaryDatasource === null || primaryDatasource === void 0 ? void 0 : primaryDatasource.postgresql) === null || _a === void 0 ? void 0 : _a.cloudSql.instance) {
-                            const instanceName = (0, names_1.parseCloudSQLInstanceName)(primaryDatasource.postgresql.cloudSql.instance);
-                            info.cloudSqlInstanceId = instanceName.instanceId;
-                        }
-                        if (choice.schema.source.files) {
-                            info.schemaGql = choice.schema.source.files;
-                        }
-                        info.cloudSqlDatabase = (_c = (_b = primaryDatasource === null || primaryDatasource === void 0 ? void 0 : primaryDatasource.postgresql) === null || _b === void 0 ? void 0 : _b.database) !== null && _c !== void 0 ? _c : "";
-                        const connectors = await (0, client_1.listConnectors)(choice.service.name, [
-                            "connectors.name",
-                            "connectors.source.files",
-                        ]);
-                        if (connectors.length) {
-                            info.connectors = connectors.map((c) => {
-                                const id = c.name.split("/").pop();
-                                return {
-                                    id,
-                                    path: connectors.length === 1 ? "./connector" : `./${id}`,
-                                    files: c.source.files || [],
-                                };
-                            });
-                        }
-                    }
+    if (!setup.projectId || !isBillingEnabled) {
+        return info;
+    }
+    const existingServices = await (0, client_1.listAllServices)(setup.projectId);
+    const existingServicesAndSchemas = await Promise.all(existingServices.map(async (s) => {
+        return {
+            service: s,
+            schema: await (0, client_1.getSchema)(s.name),
+        };
+    }));
+    if (existingServicesAndSchemas.length) {
+        const choices = existingServicesAndSchemas.map((s) => {
+            const serviceName = (0, names_1.parseServiceName)(s.service.name);
+            return {
+                name: `${serviceName.location}/${serviceName.serviceId}`,
+                value: s,
+            };
+        });
+        choices.push({ name: "Create a new service", value: undefined });
+        const choice = await (0, prompt_1.promptOnce)({
+            message: "Your project already has existing services. Which would you like to set up local files for?",
+            type: "list",
+            choices,
+        });
+        if (choice) {
+            const serviceName = (0, names_1.parseServiceName)(choice.service.name);
+            info.serviceId = serviceName.serviceId;
+            info.locationId = serviceName.location;
+            if (choice.schema) {
+                const primaryDatasource = choice.schema.datasources.find((d) => d.postgresql);
+                if ((_a = primaryDatasource === null || primaryDatasource === void 0 ? void 0 : primaryDatasource.postgresql) === null || _a === void 0 ? void 0 : _a.cloudSql.instance) {
+                    const instanceName = (0, names_1.parseCloudSQLInstanceName)(primaryDatasource.postgresql.cloudSql.instance);
+                    info.cloudSqlInstanceId = instanceName.instanceId;
+                }
+                if (choice.schema.source.files) {
+                    info.schemaGql = choice.schema.source.files;
+                }
+                info.cloudSqlDatabase = (_c = (_b = primaryDatasource === null || primaryDatasource === void 0 ? void 0 : primaryDatasource.postgresql) === null || _b === void 0 ? void 0 : _b.database) !== null && _c !== void 0 ? _c : "";
+                const connectors = await (0, client_1.listConnectors)(choice.service.name, [
+                    "connectors.name",
+                    "connectors.source.files",
+                ]);
+                if (connectors.length) {
+                    info.connectors = connectors.map((c) => {
+                        const id = c.name.split("/").pop();
+                        return {
+                            id,
+                            path: connectors.length === 1 ? "./connector" : `./${id}`,
+                            files: c.source.files || [],
+                        };
+                    });
                 }
             }
         }
         else {
-            await (0, ensureApis_1.ensureSparkApis)(setup.projectId);
+            info = await promptForService(info);
         }
     }
-    if (info.serviceId === "") {
-        info.serviceId = await (0, prompt_1.promptOnce)({
-            message: "What ID would you like to use for this service?",
-            type: "input",
-            default: "app",
-        });
-    }
-    return info;
-}
-async function promptForCloudSQLInstance(setup, info) {
-    if (setup.projectId) {
+    if (info.cloudSqlInstanceId === "") {
         const instances = await cloudsql.listInstances(setup.projectId);
         let choices = instances.map((i) => {
             return { name: i.name, value: i.name, location: i.region };
@@ -239,8 +257,46 @@ async function promptForCloudSQLInstance(setup, info) {
             if (info.cloudSqlInstanceId !== "") {
                 info.locationId = choices.find((c) => c.value === info.cloudSqlInstanceId).location;
             }
+            else {
+                info = await promptForCloudSQLInstance(setup, info);
+            }
+        }
+    }
+    if (info.cloudSqlDatabase === "" && info.cloudSqlInstanceId !== "") {
+        try {
+            const dbs = await cloudsql.listDatabases(setup.projectId, info.cloudSqlInstanceId);
+            const choices = dbs.map((d) => {
+                return { name: d.name, value: d.name };
+            });
+            choices.push({ name: "Create a new database", value: "" });
+            if (dbs.length) {
+                info.cloudSqlDatabase = await (0, prompt_1.promptOnce)({
+                    message: `Which database in ${info.cloudSqlInstanceId} would you like to use?`,
+                    type: "list",
+                    choices,
+                });
+                if (info.cloudSqlDatabase === "") {
+                    info = await promptForDatabase(info);
+                }
+            }
         }
+        catch (err) {
+            logger_1.logger.debug(`[dataconnect] Cannot list databases during init: ${err}`);
+        }
+    }
+    return info;
+}
+async function promptForService(info) {
+    if (info.serviceId === "") {
+        info.serviceId = await (0, prompt_1.promptOnce)({
+            message: "What ID would you like to use for this service?",
+            type: "input",
+            default: (0, path_1.basename)(process.cwd()),
+        });
     }
+    return info;
+}
+async function promptForCloudSQLInstance(setup, info) {
     if (info.cloudSqlInstanceId === "") {
         info.isNewInstance = true;
         info.cloudSqlInstanceId = await (0, prompt_1.promptOnce)({
@@ -279,26 +335,7 @@ async function locationChoices(setup) {
         ];
     }
 }
-async function promptForDatabase(setup, config, info) {
-    if (!info.isNewInstance && setup.projectId) {
-        try {
-            const dbs = await cloudsql.listDatabases(setup.projectId, info.cloudSqlInstanceId);
-            const choices = dbs.map((d) => {
-                return { name: d.name, value: d.name };
-            });
-            choices.push({ name: "Create a new database", value: "" });
-            if (dbs.length) {
-                info.cloudSqlDatabase = await (0, prompt_1.promptOnce)({
-                    message: `Which database in ${info.cloudSqlInstanceId} would you like to use?`,
-                    type: "list",
-                    choices,
-                });
-            }
-        }
-        catch (err) {
-            logger_1.logger.debug(`[dataconnect] Cannot list databases during init: ${err}`);
-        }
-    }
+async function promptForDatabase(info) {
     if (info.cloudSqlDatabase === "") {
         info.isNewDatabase = true;
         info.cloudSqlDatabase = await (0, prompt_1.promptOnce)({