firebase-tools 14.3.1 → 14.5.0

package/lib/index.js

@@ -3,7 +3,6 @@ const program = require("commander");
 const clc = require("colorette");
 const leven = require("leven");
 const logger_1 = require("./logger");
-const utils_1 = require("./utils");
 const pkg = require("../package.json");
 program.version(pkg.version);
 program.option("-P, --project <alias_or_project_id>", "the Firebase project to use for this command");
@@ -54,7 +53,7 @@ const RENAMED_COMMANDS = {
     "prefs:token": "login:ci",
 };
 program.action((_, args) => {
-    (0, utils_1.setupLoggers)();
+    (0, logger_1.useConsoleLoggers)();
     const cmd = args[0];
     logger_1.logger.error(clc.bold(clc.red("Error:")), clc.bold(cmd), "is not a Firebase command");
     if (RENAMED_COMMANDS[cmd]) {

package/lib/init/features/apphosting.js

@@ -1,15 +1,94 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.doSetup = void 0;
+exports.upsertAppHostingConfig = exports.doSetup = void 0;
 const clc = require("colorette");
-const utils = require("../../utils");
-const templates_1 = require("../../templates");
+const fs_1 = require("fs");
+const ora = require("ora");
+const path = require("path");
+const app_1 = require("../../apphosting/app");
+const backend_1 = require("../../apphosting/backend");
+const error_1 = require("../../error");
+const apphosting_1 = require("../../gcp/apphosting");
 const cloudbilling_1 = require("../../gcp/cloudbilling");
+const prompt_1 = require("../../prompt");
+const templates_1 = require("../../templates");
+const utils = require("../../utils");
+const utils_1 = require("../../utils");
 const APPHOSTING_YAML_TEMPLATE = (0, templates_1.readTemplateSync)("init/apphosting/apphosting.yaml");
 async function doSetup(setup, config) {
-    await (0, cloudbilling_1.checkBillingEnabled)(setup.projectId);
+    const projectId = setup.projectId;
+    if (!(await (0, cloudbilling_1.isBillingEnabled)(setup))) {
+        throw new error_1.FirebaseError(`Firebase App Hosting requires billing to be enabled on your project. To upgrade, visit the following URL: https://console.firebase.google.com/project/${projectId}/usage/details`);
+    }
+    await (0, apphosting_1.ensureApiEnabled)({ projectId });
+    await (0, backend_1.ensureRequiredApisEnabled)(projectId);
+    const spinner = ora("Checking your App Hosting compute service account...").start();
+    try {
+        await (0, backend_1.ensureAppHostingComputeServiceAccount)(projectId, "", true);
+        spinner.succeed("App Hosting compute Service account is ready");
+    }
+    catch (err) {
+        if (err.status === 400) {
+            spinner.warn("Your App Hosting compute service account is still being provisioned. Please try again in a few moments.");
+        }
+        throw err;
+    }
+    utils.logBullet("This command links your local project to Firebase App Hosting. You will be able to deploy your web app with `firebase deploy` after setup.");
+    const backendConfig = {
+        backendId: "",
+        rootDir: "",
+        ignore: ["node_modules", ".git", "firebase-debug.log", "firebase-debug.*.log", "functions"],
+    };
+    const createOrLink = await (0, prompt_1.select)({
+        default: "Create a new backend",
+        message: "Please select an option",
+        choices: [
+            { name: "Create a new backend", value: "create" },
+            { name: "Link to an existing backend", value: "link" },
+        ],
+    });
+    if (createOrLink === "link") {
+        backendConfig.backendId = await (0, backend_1.promptExistingBackend)(projectId, "Which backend would you like to link?");
+    }
+    else {
+        (0, utils_1.logBullet)(`${clc.yellow("===")} Set up your backend`);
+        const location = await (0, backend_1.promptLocation)(projectId, "Select a primary region to host your backend:\n");
+        const backendId = await (0, backend_1.promptNewBackendId)(projectId, location);
+        utils.logSuccess(`Name set to ${backendId}\n`);
+        backendConfig.backendId = backendId;
+        const webApp = await app_1.webApps.getOrCreateWebApp(projectId, null, backendId);
+        if (!webApp) {
+            utils.logWarning(`Firebase web app not set`);
+        }
+        const createBackendSpinner = ora("Creating your new backend...").start();
+        const backend = await (0, backend_1.createBackend)(projectId, location, backendId, null, undefined, webApp === null || webApp === void 0 ? void 0 : webApp.id);
+        createBackendSpinner.succeed(`Successfully created backend!\n\t${backend.name}\n`);
+    }
+    (0, utils_1.logBullet)(`${clc.yellow("===")} Deploy local source setup`);
+    backendConfig.rootDir = await (0, prompt_1.input)({
+        default: "/",
+        message: "Specify your app's root directory relative to your firebase.json directory",
+    });
+    upsertAppHostingConfig(backendConfig, config);
+    config.writeProjectFile("firebase.json", config.src);
     utils.logBullet("Writing default settings to " + clc.bold("apphosting.yaml") + "...");
-    await config.askWriteProjectFile("apphosting.yaml", APPHOSTING_YAML_TEMPLATE);
-    utils.logSuccess("Create a new App Hosting backend with `firebase apphosting:backends:create`");
+    const absRootDir = path.join(process.cwd(), backendConfig.rootDir);
+    if (!(0, fs_1.existsSync)(absRootDir)) {
+        throw new error_1.FirebaseError(`Failed to write apphosting.yaml file because app root directory ${absRootDir} does not exist. Please try again with a valid directory.`);
+    }
+    await config.askWriteProjectFile(path.join(absRootDir, "apphosting.yaml"), APPHOSTING_YAML_TEMPLATE);
+    utils.logSuccess("Firebase initialization complete!");
 }
 exports.doSetup = doSetup;
+function upsertAppHostingConfig(backendConfig, config) {
+    if (!config.src.apphosting) {
+        config.set("apphosting", backendConfig);
+        return;
+    }
+    if (Array.isArray(config.src.apphosting)) {
+        config.set("apphosting", [...config.src.apphosting, backendConfig]);
+        return;
+    }
+    config.set("apphosting", [config.src.apphosting, backendConfig]);
+}
+exports.upsertAppHostingConfig = upsertAppHostingConfig;

package/lib/init/features/database.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.doSetup = void 0;
+exports.actuate = exports.askQuestions = exports.DEFAULT_RULES = void 0;
 const clc = require("colorette");
 const prompt_1 = require("../../prompt");
 const logger_1 = require("../../logger");
 const utils = require("../../utils");
-const fsutils = require("../../fsutils");
 const database_1 = require("../../management/database");
 const ora = require("ora");
 const ensureApiEnabled_1 = require("../../ensureApiEnabled");
@@ -13,10 +12,11 @@ const getDefaultDatabaseInstance_1 = require("../../getDefaultDatabaseInstance")
 const error_1 = require("../../error");
 const apiv2_1 = require("../../apiv2");
 const api_1 = require("../../api");
-const DEFAULT_RULES = JSON.stringify({ rules: { ".read": "auth != null", ".write": "auth != null" } }, null, 2);
+const DEFAULT_RULES_FILENAME = "database.rules.json";
+exports.DEFAULT_RULES = JSON.stringify({ rules: { ".read": "auth != null", ".write": "auth != null" } }, null, 2);
 async function getDBRules(instanceDetails) {
     if (!instanceDetails || !instanceDetails.name) {
-        return DEFAULT_RULES;
+        return exports.DEFAULT_RULES;
     }
     const client = new apiv2_1.Client({ urlPrefix: instanceDetails.databaseUrl });
     const response = await client.request({
@@ -30,9 +30,8 @@ async function getDBRules(instanceDetails) {
     }
     return await response.response.text();
 }
-function writeDBRules(rules, logMessagePrefix, filename, config) {
+function writeDBRules(rules, filename, config) {
     config.writeProjectFile(filename, rules);
-    utils.logSuccess(`${logMessagePrefix} have been written to ${clc.bold(filename)}.`);
     logger_1.logger.info(`Future modifications to ${clc.bold(filename)} will update Realtime Database Security Rules when you run`);
     logger_1.logger.info(clc.bold("firebase deploy") + ".");
 }
@@ -66,60 +65,72 @@ async function createDefaultDatabaseInstance(project) {
         throw err;
     }
 }
-async function doSetup(setup, config) {
-    setup.config = setup.config || {};
-    let instanceDetails;
-    if (setup.projectId) {
-        await (0, ensureApiEnabled_1.ensure)(setup.projectId, (0, api_1.rtdbManagementOrigin)(), "database", false);
-        logger_1.logger.info();
-        setup.instance =
-            setup.instance || (await (0, getDefaultDatabaseInstance_1.getDefaultDatabaseInstance)({ project: setup.projectId }));
-        if (setup.instance !== "") {
-            instanceDetails = await (0, database_1.getDatabaseInstanceDetails)(setup.projectId, setup.instance);
-        }
-        else {
-            const createDefault = await (0, prompt_1.confirm)({
-                message: "It seems like you haven’t initialized Realtime Database in your project yet. Do you want to set it up?",
-                default: true,
-            });
-            if (createDefault) {
-                instanceDetails = await createDefaultDatabaseInstance(setup.projectId);
-            }
-        }
+async function initializeDatabaseInstance(projectId) {
+    await (0, ensureApiEnabled_1.ensure)(projectId, (0, api_1.rtdbManagementOrigin)(), "database", false);
+    logger_1.logger.info();
+    const instance = await (0, getDefaultDatabaseInstance_1.getDefaultDatabaseInstance)({ project: projectId });
+    if (instance !== "") {
+        return await (0, database_1.getDatabaseInstanceDetails)(projectId, instance);
     }
-    setup.config.database = setup.config.database || {};
+    const createDefault = await (0, prompt_1.confirm)({
+        message: "It seems like you haven’t initialized Realtime Database in your project yet. Do you want to set it up?",
+        default: true,
+    });
+    if (createDefault) {
+        return await createDefaultDatabaseInstance(projectId);
+    }
+    return null;
+}
+async function askQuestions(setup, config) {
     logger_1.logger.info();
     logger_1.logger.info("Firebase Realtime Database Security Rules allow you to define how your data should be");
     logger_1.logger.info("structured and when your data can be read from and written to.");
     logger_1.logger.info();
-    setup.config.database.rules =
-        setup.config.database.rules ||
-            (await (0, prompt_1.input)({
-                message: "What file should be used for Realtime Database Security Rules?",
-                default: "database.rules.json",
-            }));
-    const filename = setup.config.database.rules;
-    if (!filename) {
+    const rulesFilename = await (0, prompt_1.input)({
+        message: "What file should be used for Realtime Database Security Rules?",
+        default: DEFAULT_RULES_FILENAME,
+    });
+    if (!rulesFilename) {
         throw new error_1.FirebaseError("Must specify location for Realtime Database rules file.");
     }
-    let writeRules = true;
-    if (fsutils.fileExistsSync(filename)) {
-        const rulesDescription = instanceDetails
-            ? `the Realtime Database Security Rules for ${clc.bold(instanceDetails.name)} from the Firebase console`
-            : "default rules";
-        const msg = `File ${clc.bold(filename)} already exists. Do you want to overwrite it with ${rulesDescription}?`;
-        writeRules = await (0, prompt_1.confirm)(msg);
-    }
-    if (writeRules) {
+    const info = {
+        rulesFilename,
+        rules: exports.DEFAULT_RULES,
+        writeRules: true,
+    };
+    if (setup.projectId) {
+        const instanceDetails = await initializeDatabaseInstance(setup.projectId);
         if (instanceDetails) {
-            writeDBRules(await getDBRules(instanceDetails), `Database Rules for ${instanceDetails.name}`, filename, config);
-            return;
+            info.rules = await getDBRules(instanceDetails);
+            utils.logBullet(`Downloaded the existing Realtime Database Security Rules of database ${clc.bold(instanceDetails.name)} from the Firebase console`);
         }
-        writeDBRules(DEFAULT_RULES, "Default rules", filename, config);
-        return;
     }
-    logger_1.logger.info("Skipping overwrite of Realtime Database Security Rules.");
-    logger_1.logger.info(`The security rules defined in ${clc.bold(filename)} will be published when you run ${clc.bold("firebase deploy")}.`);
-    return;
+    info.writeRules = await config.confirmWriteProjectFile(rulesFilename, info.rules);
+    setup.featureInfo = setup.featureInfo || {};
+    setup.featureInfo.database = info;
+}
+exports.askQuestions = askQuestions;
+async function actuate(setup, config) {
+    var _a;
+    const info = (_a = setup.featureInfo) === null || _a === void 0 ? void 0 : _a.database;
+    if (!info) {
+        throw new error_1.FirebaseError("No database RequiredInfo found in setup actuate.");
+    }
+    info.rules = info.rules || exports.DEFAULT_RULES;
+    info.rulesFilename = info.rulesFilename || "database.rules.json";
+    setup.config.database = { rules: info.rulesFilename };
+    if (info.writeRules) {
+        if (info.rules === exports.DEFAULT_RULES) {
+            writeDBRules(info.rules, info.rulesFilename, config);
+        }
+        else {
+            writeDBRules(info.rules, info.rulesFilename, config);
+        }
+    }
+    else {
+        logger_1.logger.info("Skipping overwrite of Realtime Database Security Rules.");
+        logger_1.logger.info(`The security rules defined in ${clc.bold(info.rulesFilename)} will be published when you run ${clc.bold("firebase deploy")}.`);
+    }
+    return Promise.resolve();
 }
-exports.doSetup = doSetup;
+exports.actuate = actuate;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toDNSCompatibleId = exports.actuate = exports.doSetup = void 0;
+exports.toDNSCompatibleId = exports.postSetup = exports.actuate = exports.askQuestions = void 0;
 const path_1 = require("path");
 const clc = require("colorette");
 const fs = require("fs-extra");
@@ -23,7 +23,7 @@ const CONNECTOR_YAML_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconn
 const SCHEMA_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconnect/schema.gql");
 const QUERIES_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconnect/queries.gql");
 const MUTATIONS_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconnect/mutations.gql");
-const serviceEnvVar = () => (0, utils_1.envOverride)("FDC_SERVICE", "");
+const serviceEnvVar = () => (0, utils_1.envOverride)("FDC_CONNECTOR", "") || (0, utils_1.envOverride)("FDC_SERVICE", "");
 const emptyConnector = {
     id: "default",
     path: "./connector",
@@ -44,29 +44,11 @@ const defaultConnector = {
     ],
 };
 const defaultSchema = { path: "schema.gql", content: SCHEMA_TEMPLATE };
-async function doSetup(setup, config) {
-    const isBillingEnabled = setup.projectId ? await (0, cloudbilling_1.checkBillingEnabled)(setup.projectId) : false;
+async function askQuestions(setup) {
+    const hasBilling = await (0, cloudbilling_1.isBillingEnabled)(setup);
     if (setup.projectId) {
-        isBillingEnabled ? await (0, ensureApis_1.ensureApis)(setup.projectId) : await (0, ensureApis_1.ensureSparkApis)(setup.projectId);
+        hasBilling ? await (0, ensureApis_1.ensureApis)(setup.projectId) : await (0, ensureApis_1.ensureSparkApis)(setup.projectId);
     }
-    const info = await askQuestions(setup, isBillingEnabled);
-    const dir = config.get("dataconnect.source", "dataconnect");
-    const dataDir = config.get("emulators.dataconnect.dataDir", `${dir}/.dataconnect/pgliteData`);
-    config.set("emulators.dataconnect.dataDir", dataDir);
-    await actuate(setup, config, info);
-    const cwdPlatformGuess = await (0, fileUtils_1.getPlatformFromFolder)(process.cwd());
-    if (cwdPlatformGuess !== types_1.Platform.NONE) {
-        await sdk.doSetup(setup, config);
-    }
-    else {
-        (0, utils_1.logBullet)(`If you'd like to add the generated SDK to your app later, run ${clc.bold("firebase init dataconnect:sdk")}`);
-    }
-    if (setup.projectId && !isBillingEnabled) {
-        (0, utils_1.logBullet)((0, freeTrial_1.upgradeInstructions)(setup.projectId));
-    }
-}
-exports.doSetup = doSetup;
-async function askQuestions(setup, isBillingEnabled) {
     let info = {
         serviceId: "",
         locationId: "",
@@ -74,19 +56,19 @@ async function askQuestions(setup, isBillingEnabled) {
         isNewInstance: false,
         cloudSqlDatabase: "",
         isNewDatabase: false,
-        connectors: [defaultConnector],
-        schemaGql: [defaultSchema],
+        connectors: [],
+        schemaGql: [],
         shouldProvisionCSQL: false,
     };
-    info = await promptForExistingServices(setup, info, isBillingEnabled);
+    info = await promptForExistingServices(setup, info);
     const requiredConfigUnset = info.serviceId === "" ||
         info.cloudSqlInstanceId === "" ||
         info.locationId === "" ||
         info.cloudSqlDatabase === "";
-    const shouldConfigureBackend = isBillingEnabled &&
+    const shouldConfigureBackend = hasBilling &&
         requiredConfigUnset &&
         (await (0, prompt_1.confirm)({
-            message: `Would you like to configure your backend resources now?`,
+            message: `Would you like to configure your Cloud SQL datasource now?`,
             default: true,
         }));
     if (shouldConfigureBackend) {
@@ -94,24 +76,36 @@ async function askQuestions(setup, isBillingEnabled) {
         info = await promptForCloudSQL(setup, info);
         info.shouldProvisionCSQL = !!(setup.projectId &&
             (info.isNewInstance || info.isNewDatabase) &&
-            isBillingEnabled &&
+            hasBilling &&
             (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,
             })));
     }
-    else {
-        const defaultServiceId = toDNSCompatibleId((0, path_1.basename)(process.cwd()));
-        info.serviceId = info.serviceId || defaultServiceId;
-        info.cloudSqlInstanceId =
-            info.cloudSqlInstanceId || `${info.serviceId.toLowerCase() || "app"}-fdc`;
-        info.locationId = info.locationId || `us-central1`;
-        info.cloudSqlDatabase = info.cloudSqlDatabase || `fdcdb`;
-    }
-    return info;
+    setup.featureInfo = setup.featureInfo || {};
+    setup.featureInfo.dataconnect = info;
 }
-async function actuate(setup, config, info) {
-    await writeFiles(config, info);
+exports.askQuestions = askQuestions;
+async function actuate(setup, config, options) {
+    var _a;
+    const dir = config.get("dataconnect.source", "dataconnect");
+    const dataDir = config.get("emulators.dataconnect.dataDir", `${dir}/.dataconnect/pgliteData`);
+    config.set("emulators.dataconnect.dataDir", dataDir);
+    const info = (_a = setup.featureInfo) === null || _a === void 0 ? void 0 : _a.dataconnect;
+    if (!info) {
+        throw new Error("Data Connect feature RequiredInfo is not provided");
+    }
+    const defaultServiceId = toDNSCompatibleId((0, path_1.basename)(process.cwd()));
+    info.serviceId = info.serviceId || defaultServiceId;
+    info.cloudSqlInstanceId =
+        info.cloudSqlInstanceId || `${info.serviceId.toLowerCase() || "app"}-fdc`;
+    info.locationId = info.locationId || `us-central1`;
+    info.cloudSqlDatabase = info.cloudSqlDatabase || `fdcdb`;
+    if (!info.schemaGql.length && !info.connectors.flatMap((r) => r.files).length) {
+        info.schemaGql = [defaultSchema];
+        info.connectors = [defaultConnector];
+    }
+    await writeFiles(config, info, options);
     if (setup.projectId && info.shouldProvisionCSQL) {
         await (0, provisionCloudSql_1.provisionCloudSql)({
             projectId: setup.projectId,
@@ -124,20 +118,27 @@ async function actuate(setup, config, info) {
     }
 }
 exports.actuate = actuate;
-async function writeFiles(config, info) {
+async function postSetup(setup, config) {
+    const cwdPlatformGuess = await (0, fileUtils_1.getPlatformFromFolder)(process.cwd());
+    if (cwdPlatformGuess !== types_1.Platform.NONE) {
+        await sdk.doSetup(setup, config);
+    }
+    else {
+        (0, utils_1.logBullet)(`If you'd like to add the generated SDK to your app later, run ${clc.bold("firebase init dataconnect:sdk")}`);
+    }
+    if (setup.projectId && !setup.isBillingEnabled) {
+        (0, utils_1.logBullet)((0, freeTrial_1.upgradeInstructions)(setup.projectId));
+    }
+}
+exports.postSetup = postSetup;
+async function writeFiles(config, info, options) {
     const dir = config.get("dataconnect.source") || "dataconnect";
     const subbedDataconnectYaml = subDataconnectYamlValues(Object.assign(Object.assign({}, info), { connectorDirs: info.connectors.map((c) => c.path) }));
-    if (!config.get("dataconnect.source")) {
-        if (!info.schemaGql.length && !info.connectors.flatMap((r) => r.files).length) {
-            info.schemaGql = [defaultSchema];
-            info.connectors = [defaultConnector];
-        }
-    }
     config.set("dataconnect", { source: dir });
-    await config.askWriteProjectFile((0, path_1.join)(dir, "dataconnect.yaml"), subbedDataconnectYaml, false, true);
+    await config.askWriteProjectFile((0, path_1.join)(dir, "dataconnect.yaml"), subbedDataconnectYaml, !!options.force, true);
     if (info.schemaGql.length) {
         for (const f of info.schemaGql) {
-            await config.askWriteProjectFile((0, path_1.join)(dir, "schema", f.path), f.content);
+            await config.askWriteProjectFile((0, path_1.join)(dir, "schema", f.path), f.content, !!options.force);
         }
     }
     else {
@@ -179,43 +180,17 @@ function subConnectorYamlValues(replacementValues) {
     }
     return replaced;
 }
-async function promptForExistingServices(setup, info, isBillingEnabled) {
+async function promptForExistingServices(setup, info) {
     var _a, _b, _c, _d;
-    if (!setup.projectId || !isBillingEnabled) {
+    if (!setup.projectId) {
         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),
-        };
+        return { service: s, schema: await (0, client_1.getSchema)(s.name) };
     }));
     if (existingServicesAndSchemas.length) {
-        let choice;
-        const [serviceLocationFromEnvVar, serviceIdFromEnvVar] = serviceEnvVar().split("/");
-        const serviceFromEnvVar = existingServicesAndSchemas.find((s) => {
-            const serviceName = (0, names_1.parseServiceName)(s.service.name);
-            return (serviceName.serviceId === serviceIdFromEnvVar &&
-                serviceName.location === serviceLocationFromEnvVar);
-        });
-        if (serviceFromEnvVar) {
-            choice = serviceFromEnvVar;
-        }
-        else {
-            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 });
-            choice = await (0, prompt_1.select)({
-                message: "Your project already has existing services. Which would you like to set up local files for?",
-                choices,
-            });
-        }
+        const choice = await chooseExistingService(existingServicesAndSchemas);
         if (choice) {
             const serviceName = (0, names_1.parseServiceName)(choice.service.name);
             info.serviceId = serviceName.serviceId;
@@ -251,6 +226,30 @@ async function promptForExistingServices(setup, info, isBillingEnabled) {
     }
     return info;
 }
+async function chooseExistingService(existing) {
+    const [serviceLocationFromEnvVar, serviceIdFromEnvVar] = serviceEnvVar().split("/");
+    const serviceFromEnvVar = existing.find((s) => {
+        const serviceName = (0, names_1.parseServiceName)(s.service.name);
+        return (serviceName.serviceId === serviceIdFromEnvVar &&
+            serviceName.location === serviceLocationFromEnvVar);
+    });
+    if (serviceFromEnvVar) {
+        (0, utils_1.logBullet)(`Picking up the existing service ${clc.bold(serviceLocationFromEnvVar + "/" + serviceIdFromEnvVar)}.`);
+        return serviceFromEnvVar;
+    }
+    const choices = existing.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 });
+    return await (0, prompt_1.select)({
+        message: "Your project already has existing services. Which would you like to set up local files for?",
+        choices,
+    });
+}
 async function promptForCloudSQL(setup, info) {
     if (info.cloudSqlInstanceId === "" && setup.projectId) {
         const instances = await cloudsql.listInstances(setup.projectId);

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

@@ -14,6 +14,7 @@ const error_1 = require("../../../error");
 const lodash_1 = require("lodash");
 const utils_1 = require("../../../utils");
 const auth_1 = require("../../../auth");
+const connectorEnvVar = () => (0, utils_1.envOverride)("FDC_CONNECTOR", "");
 exports.FDC_APP_FOLDER = "_FDC_APP_FOLDER";
 async function doSetup(setup, config) {
     const sdkInfo = await askQuestions(setup, config);
@@ -29,7 +30,7 @@ async function askQuestions(setup, config) {
         .map((si) => {
         return si.connectorInfo.map((ci) => {
             return {
-                name: `${si.dataConnectYaml.serviceId}/${ci.connectorYaml.connectorId}`,
+                name: `${si.dataConnectYaml.location}/${si.dataConnectYaml.serviceId}/${ci.connectorYaml.connectorId}`,
                 value: ci,
             };
         });
@@ -68,10 +69,7 @@ async function askQuestions(setup, config) {
     else {
         (0, utils_1.logSuccess)(`Detected ${targetPlatform} app in directory ${appDir}`);
     }
-    const connectorInfo = await (0, prompt_1.select)({
-        message: "Which connector do you want set up a generated SDK for?",
-        choices: connectorChoices,
-    });
+    const connectorInfo = await chooseExistingConnector(connectorChoices);
     const connectorYaml = JSON.parse(JSON.stringify(connectorInfo.connectorYaml));
     const newConnectorYaml = await generateSdkYaml(targetPlatform, connectorYaml, connectorInfo.directory, appDir);
     if (targetPlatform === types_1.Platform.WEB) {
@@ -98,6 +96,21 @@ async function askQuestions(setup, config) {
     const displayIOSWarning = targetPlatform === types_1.Platform.IOS;
     return { connectorYamlContents, connectorInfo, displayIOSWarning };
 }
+async function chooseExistingConnector(choices) {
+    if (choices.length === 1) {
+        return choices[0].value;
+    }
+    const nameFromEnvVar = connectorEnvVar();
+    const existingConnector = choices.find((c) => c.name === nameFromEnvVar);
+    if (existingConnector) {
+        (0, utils_1.logBullet)(`Picking up the existing connector ${clc.bold(nameFromEnvVar)}.`);
+        return existingConnector.value;
+    }
+    return await (0, prompt_1.select)({
+        message: "Which connector do you want set up a generated SDK for?",
+        choices: choices,
+    });
+}
 async function generateSdkYaml(targetPlatform, connectorYaml, connectorDir, appDir) {
     if (!connectorYaml.generate) {
         connectorYaml.generate = {};
@@ -155,7 +168,7 @@ async function actuate(sdkInfo, config) {
     var _a, _b;
     const connectorYamlPath = `${sdkInfo.connectorInfo.directory}/connector.yaml`;
     (0, utils_1.logBullet)(`Writing your new SDK configuration to ${connectorYamlPath}`);
-    await config.askWriteProjectFile(path.relative(config.projectDir, connectorYamlPath), sdkInfo.connectorYamlContents);
+    await config.askWriteProjectFile(path.relative(config.projectDir, connectorYamlPath), sdkInfo.connectorYamlContents, false, true);
     const account = (0, auth_1.getGlobalDefaultAccount)();
     await dataconnectEmulator_1.DataConnectEmulator.generate({
         configDir: sdkInfo.connectorInfo.directory,

package/lib/init/features/emulators.js

@@ -27,23 +27,27 @@ async function doSetup(setup, config) {
         return;
     }
     setup.config.emulators = setup.config.emulators || {};
+    const emulators = setup.config.emulators || {};
     for (const selected of selections.emulators) {
-        setup.config.emulators[selected] = setup.config.emulators[selected] || {};
-        const currentPort = setup.config.emulators[selected].port;
+        if (selected === "extensions")
+            continue;
+        const selectedEmulator = emulators[selected] || {};
+        const currentPort = selectedEmulator.port;
         if (currentPort) {
             utils.logBullet(`Port for ${selected} already configured: ${clc.cyan(currentPort)}`);
         }
         else {
-            setup.config.emulators[selected].port = await (0, prompt_1.number)({
+            selectedEmulator.port = await (0, prompt_1.number)({
                 message: `Which port do you want to use for the ${clc.underline(selected)} emulator?`,
                 default: constants_1.Constants.getDefaultPort(selected),
             });
         }
+        emulators[selected] = selectedEmulator;
         const additionalInitFn = initEmulators_1.AdditionalInitFns[selected];
         if (additionalInitFn) {
             const additionalOptions = await additionalInitFn(config);
             if (additionalOptions) {
-                setup.config.emulators[selected] = Object.assign(Object.assign({}, setup.config.emulators[selected]), additionalOptions);
+                emulators[selected] = Object.assign(Object.assign({}, setup.config.emulators[selected]), additionalOptions);
             }
         }
     }
@@ -61,9 +65,10 @@ async function doSetup(setup, config) {
                 default: true,
             });
             if (ui.enabled) {
-                ui.port = await (0, prompt_1.number)(`Which port do you want to use for the ${clc.underline(uiDesc)} (leave empty to use any available port)?`);
-                const portNum = Number.parseInt(ui.port);
-                ui.port = isNaN(portNum) ? undefined : portNum;
+                ui.port = await (0, prompt_1.number)({
+                    message: `Which port do you want to use for the ${clc.underline(uiDesc)} (leave empty to use any available port)?`,
+                    required: false,
+                });
             }
         }
         selections.download = await (0, prompt_1.confirm)({