firebase-tools 13.20.2 → 13.22.0

package/lib/extensions/runtimes/common.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.longestCommonPrefix = exports.snakeToCamelCase = exports.lowercaseFirstLetter = exports.capitalizeFirstLetter = exports.toTitleCase = exports.getInstallPathPrefix = exports.getCodebaseDir = exports.writeSDK = exports.getCodebaseRuntime = exports.copyDirectory = exports.writeFile = exports.isTypescriptCodebase = exports.extensionMatchesAnyFilter = exports.extractExtensionsFromBuilds = exports.getErrorMessage = exports.fixDarkBlueText = void 0;
+exports.longestCommonPrefix = exports.snakeToCamelCase = exports.lowercaseFirstLetter = exports.capitalizeFirstLetter = exports.toTitleCase = exports.getInstallPathPrefix = exports.getCodebaseDir = exports.writeSDK = exports.getCodebaseRuntime = exports.copyDirectory = exports.writeFile = exports.isTypescriptCodebase = exports.extensionMatchesAnyFilter = exports.extractExtensionsFromBuilds = exports.fixDarkBlueText = void 0;
 const fs = require("fs");
 const path = require("path");
 const prompt_1 = require("../../prompt");
@@ -8,7 +8,6 @@ const fsutils = require("../../fsutils");
 const utils_1 = require("../../utils");
 const error_1 = require("../../error");
 const projectConfig_1 = require("../../functions/projectConfig");
-const types_1 = require("../types");
 const functionRuntimes = require("../../deploy/functions/runtimes");
 const nodeRuntime = require("./node");
 function fixDarkBlueText(txt) {
@@ -17,15 +16,6 @@ function fixDarkBlueText(txt) {
     return txt.replaceAll(DARK_BLUE, BRIGHT_CYAN);
 }
 exports.fixDarkBlueText = fixDarkBlueText;
-function getErrorMessage(err, defaultMsg) {
-    if ((0, types_1.isObject)(err) && err.message && typeof err.message === "string") {
-        return err.message;
-    }
-    else {
-        return defaultMsg;
-    }
-}
-exports.getErrorMessage = getErrorMessage;
 function extractExtensionsFromBuilds(builds, filters) {
     const extRecords = {};
     for (const [codebase, build] of Object.entries(builds)) {
@@ -80,7 +70,7 @@ async function writeFile(filePath, data, options) {
                 (0, utils_1.logLabeledBullet)("extensions", `successfully wrote ${shortFilePath}`);
             }
             catch (err) {
-                throw new error_1.FirebaseError(`Failed to write ${shortFilePath}:\n    ${err}`);
+                throw new error_1.FirebaseError(`Failed to write ${shortFilePath}:\n    ${(0, error_1.getErrMsg)(err)}`);
             }
         }
         else {
@@ -95,11 +85,11 @@ async function writeFile(filePath, data, options) {
                 (0, utils_1.logLabeledBullet)("extensions", `successfully created ${shortFilePath}`);
             }
             catch (err) {
-                throw new error_1.FirebaseError(`Failed to create ${shortFilePath}:\n    ${err}`);
+                throw new error_1.FirebaseError(`Failed to create ${shortFilePath}:\n    ${(0, error_1.getErrMsg)(err)}`);
             }
         }
         catch (err) {
-            throw new error_1.FirebaseError(`Error during SDK file creation:\n    ${err}`);
+            throw new error_1.FirebaseError(`Error during SDK file creation:\n    ${(0, error_1.getErrMsg)(err)}`);
         }
     }
 }
@@ -121,14 +111,14 @@ async function copyDirectory(src, dest, options) {
                     if (srcPath.includes("node_modules")) {
                         continue;
                     }
-                    await copyDirectory(srcPath, destPath, { force: true });
+                    await copyDirectory(srcPath, destPath, Object.assign(Object.assign({}, options), { force: true }));
                 }
                 else if (entry.isFile())
                     try {
                         await fs.promises.copyFile(srcPath, destPath);
                     }
                     catch (err) {
-                        throw new error_1.FirebaseError(`Failed to copy ${destPath.replace(process.cwd(), ".")}:\n    ${err}`);
+                        throw new error_1.FirebaseError(`Failed to copy ${destPath.replace(process.cwd(), ".")}:\n    ${(0, error_1.getErrMsg)(err)}`);
                     }
             }
         }
@@ -137,9 +127,8 @@ async function copyDirectory(src, dest, options) {
         }
     }
     else {
-        await fs.promises.mkdir(dest, { recursive: true }).then(async () => {
-            await copyDirectory(src, dest, { force: true });
-        });
+        await fs.promises.mkdir(dest, { recursive: true });
+        await copyDirectory(src, dest, Object.assign(Object.assign({}, options), { force: true }));
     }
 }
 exports.copyDirectory = copyDirectory;
@@ -177,6 +166,9 @@ async function writeSDK(extensionRef, localPath, spec, options) {
 }
 exports.writeSDK = writeSDK;
 function getCodebaseDir(options) {
+    if (!options.projectRoot) {
+        throw new error_1.FirebaseError("Unable to determine root directory of project");
+    }
     const config = (0, projectConfig_1.normalizeAndValidate)(options.config.src.functions);
     const codebaseConfig = (0, projectConfig_1.configForCodebase)(config, options.codebase || projectConfig_1.DEFAULT_CODEBASE);
     return `${options.projectRoot}/${codebaseConfig.source}/`;

package/lib/extensions/runtimes/node.js

@@ -1,18 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeSDK = exports.TYPESCRIPT_VERSION = exports.FIREBASE_FUNCTIONS_VERSION = exports.SDK_GENERATION_VERSION = void 0;
+const path = require("path");
+const child_process_1 = require("child_process");
+const marked_terminal_1 = require("marked-terminal");
+const marked_1 = require("marked");
 const types_1 = require("../types");
 const prompt_1 = require("../../prompt");
 const secretsUtils = require("../secretsUtils");
-const child_process_1 = require("child_process");
 const utils_1 = require("../../utils");
-const path = require("path");
 const common_1 = require("./common");
 const askUserForEventsConfig_1 = require("../askUserForEventsConfig");
 const extensionsHelper_1 = require("../extensionsHelper");
 const error_1 = require("../../error");
-const marked_terminal_1 = require("marked-terminal");
-const marked_1 = require("marked");
 marked_1.marked.use((0, marked_terminal_1.markedTerminal)());
 exports.SDK_GENERATION_VERSION = "1.0.0";
 exports.FIREBASE_FUNCTIONS_VERSION = ">=5.1.0";
@@ -67,7 +67,7 @@ function makeClassName(name) {
 function makeEventName(name, prefix) {
     let eventName;
     const versionedEvent = /^(?:[^.]+[.])+(?:[vV]\d+[.])(?<event>.*)$/;
-    const match = name.match(versionedEvent);
+    const match = versionedEvent.exec(name);
     if (match) {
         eventName = match[1];
     }
@@ -79,7 +79,7 @@ function makeEventName(name, prefix) {
         eventName = parts[parts.length - 1];
     }
     const allCaps = /^[A-Z._-]+$/;
-    eventName = eventName.match(allCaps) ? eventName : eventName.replace(/([A-Z])/g, " $1").trim();
+    eventName = allCaps.exec(eventName) ? eventName : eventName.replace(/([A-Z])/g, " $1").trim();
     eventName = eventName.replace(/[._-]/g, " ");
     eventName = eventName.toLowerCase().startsWith("on") ? eventName : "on " + eventName;
     eventName = eventName.replace(/\w\S*/g, common_1.toTitleCase);
@@ -87,6 +87,15 @@ function makeEventName(name, prefix) {
     eventName = eventName.charAt(0).toLowerCase() + eventName.substring(1);
     return eventName;
 }
+function addPeerDependency(pkgJson, dependency, version) {
+    if (!pkgJson.peerDependencies) {
+        pkgJson.peerDependencies = {};
+    }
+    if (!(0, types_1.isObject)(pkgJson.peerDependencies)) {
+        throw new error_1.FirebaseError("Internal error generating peer dependencies.");
+    }
+    pkgJson.peerDependencies[dependency] = version;
+}
 async function writeSDK(extensionRef, localPath, spec, options) {
     var _a, _b, _c;
     const sdkLines = [];
@@ -105,7 +114,7 @@ async function writeSDK(extensionRef, localPath, spec, options) {
         })) {
             const newLocalPath = path.join(dirPath, "src");
             await (0, common_1.copyDirectory)(localPath, newLocalPath, options);
-            localPath = newLocalPath.replace(options.projectRoot, ".");
+            localPath = newLocalPath.replace(options.projectRoot || ".", ".");
         }
     }
     if (!dirPath) {
@@ -115,7 +124,7 @@ async function writeSDK(extensionRef, localPath, spec, options) {
     const pkgJson = {
         name: packageName,
         version: `${exports.SDK_GENERATION_VERSION}`,
-        description: `Generated SDK for ${spec.displayName}@${spec.version}`,
+        description: `Generated SDK for ${spec.displayName || spec.name}@${spec.version}`,
         main: "./output/index.js",
         private: true,
         scripts: {
@@ -138,7 +147,7 @@ async function writeSDK(extensionRef, localPath, spec, options) {
         },
     };
     sdkLines.push("/**");
-    sdkLines.push(` * ${spec.displayName} SDK for ${spec.name}@${spec.version}`);
+    sdkLines.push(` * ${spec.displayName || spec.name} SDK for ${spec.name}@${spec.version}`);
     sdkLines.push(" *");
     sdkLines.push(" * When filing bugs or feature requests please specify:");
     if (extensionRef) {
@@ -155,18 +164,12 @@ async function writeSDK(extensionRef, localPath, spec, options) {
     if (hasEvents) {
         sdkLines.push(`import { CloudEvent } from "firebase-functions/v2";`);
         sdkLines.push(`import { onCustomEventPublished, EventarcTriggerOptions } from "firebase-functions/v2/eventarc";`);
-        if (!pkgJson.peerDependencies) {
-            pkgJson.peerDependencies = {};
-        }
-        pkgJson.peerDependencies["firebase-functions"] = exports.FIREBASE_FUNCTIONS_VERSION;
+        addPeerDependency(pkgJson, "firebase-functions", exports.FIREBASE_FUNCTIONS_VERSION);
     }
     const usesSecrets = secretsUtils.usesSecrets(spec);
     if (usesSecrets) {
         sdkLines.push(`import { defineSecret } from "firebase-functions/params";`);
-        if (!pkgJson.peerDependencies) {
-            pkgJson.peerDependencies = {};
-        }
-        pkgJson.peerDependencies["firebase-functions"] = exports.FIREBASE_FUNCTIONS_VERSION;
+        addPeerDependency(pkgJson, "firebase-functions", exports.FIREBASE_FUNCTIONS_VERSION);
     }
     if (hasEvents || usesSecrets) {
         sdkLines.push("");
@@ -289,7 +292,7 @@ async function writeSDK(extensionRef, localPath, spec, options) {
                 sdkLines.push(`  ${sysParam.param}${opt}: string;`);
                 break;
             default:
-                throw new error_1.FirebaseError(`Error: Unknown systemParam type: ${sysParam.type}.`);
+                throw new error_1.FirebaseError(`Error: Unknown systemParam type: ${sysParam.type || "undefined"}.`);
         }
         sdkLines.push("");
     }
@@ -299,7 +302,7 @@ async function writeSDK(extensionRef, localPath, spec, options) {
     sdkLines.push(`  return new ${className}(instanceId, params);`);
     sdkLines.push("}\n");
     sdkLines.push(`/**`);
-    sdkLines.push(` * ${spec.displayName}`);
+    sdkLines.push(` * ${spec.displayName || spec.name}`);
     (_c = spec.description) === null || _c === void 0 ? void 0 : _c.split("\n").forEach((val) => {
         sdkLines.push(` * ${val.replace(/\*\//g, "* /")}`);
     });
@@ -347,7 +350,7 @@ async function writeSDK(extensionRef, localPath, spec, options) {
         (0, child_process_1.execFileSync)("npm", ["--prefix", dirPath, "install"]);
     }
     catch (err) {
-        const errMsg = (0, common_1.getErrorMessage)(err, "unknown error");
+        const errMsg = (0, error_1.getErrMsg)(err, "unknown error");
         throw new error_1.FirebaseError(`Error during npm install in ${shortDirPath}: ${errMsg}`);
     }
     (0, utils_1.logLabeledBullet)("extensions", `running 'npm --prefix ${shortDirPath} run build'`);
@@ -355,7 +358,7 @@ async function writeSDK(extensionRef, localPath, spec, options) {
         (0, child_process_1.execFileSync)("npm", ["--prefix", dirPath, "run", "build"]);
     }
     catch (err) {
-        const errMsg = (0, common_1.getErrorMessage)(err, "unknown error");
+        const errMsg = (0, error_1.getErrMsg)(err, "unknown error");
         throw new error_1.FirebaseError(`Error during npm run build in ${shortDirPath}: ${errMsg}`);
     }
     const codebaseDir = (0, common_1.getCodebaseDir)(options);
@@ -372,7 +375,7 @@ async function writeSDK(extensionRef, localPath, spec, options) {
             (0, child_process_1.execFileSync)("npm", ["--prefix", codebaseDir, "install", "--save", dirPath]);
         }
         catch (err) {
-            const errMsg = (0, common_1.getErrorMessage)(err, "unknown error");
+            const errMsg = (0, error_1.getErrMsg)(err, "unknown error");
             throw new error_1.FirebaseError(`Error during npm install in ${codebaseDir}: ${errMsg}`);
         }
     }

package/lib/extensions/types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isExtensionSpec = exports.isResource = exports.isParam = exports.isObject = exports.ParamType = exports.FUNCTIONS_V2_RESOURCE_TYPE = exports.FUNCTIONS_RESOURCE_TYPE = exports.Visibility = exports.RegistryLaunchStage = void 0;
+exports.isExtensionSpec = exports.isResource = exports.isParam = exports.isObject = exports.ParamType = exports.FUNCTIONS_V2_RESOURCE_TYPE = exports.FUNCTIONS_RESOURCE_TYPE = exports.isExtensionInstance = exports.Visibility = exports.RegistryLaunchStage = void 0;
 var RegistryLaunchStage;
 (function (RegistryLaunchStage) {
     RegistryLaunchStage["EXPERIMENTAL"] = "EXPERIMENTAL";
@@ -14,6 +14,21 @@ var Visibility;
     Visibility["UNLISTED"] = "unlisted";
     Visibility["PUBLIC"] = "public";
 })(Visibility = exports.Visibility || (exports.Visibility = {}));
+const extensionInstanceState = [
+    "STATE_UNSPECIFIED",
+    "DEPLOYING",
+    "UNINSTALLING",
+    "ACTIVE",
+    "ERRORED",
+    "PAUSED",
+];
+const isExtensionInstance = (value) => {
+    if (!isObject(value) || typeof value.name !== "string") {
+        return false;
+    }
+    return true;
+};
+exports.isExtensionInstance = isExtensionInstance;
 const lifecycleStages = ["STAGE_UNSPECIFIED", "ON_INSTALL", "ON_UPDATE", "ON_CONFIGURE"];
 exports.FUNCTIONS_RESOURCE_TYPE = "firebaseextensions.v1beta.function";
 exports.FUNCTIONS_V2_RESOURCE_TYPE = "firebaseextensions.v1beta.v2function";

package/lib/gcp/cloudmonitoring.js

@@ -57,19 +57,19 @@ var ValueType;
     ValueType["DOUBLE"] = "DOUBLE";
     ValueType["STRING"] = "STRING";
 })(ValueType = exports.ValueType || (exports.ValueType = {}));
-async function queryTimeSeries(query, projectNumber) {
+async function queryTimeSeries(query, project) {
     const client = new apiv2_1.Client({
         urlPrefix: (0, api_1.cloudMonitoringOrigin)(),
         apiVersion: exports.CLOUD_MONITORING_VERSION,
     });
     try {
-        const res = await client.get(`/projects/${projectNumber}/timeSeries/`, {
+        const res = await client.get(`/projects/${project}/timeSeries/`, {
             queryParams: query,
         });
         return res.body.timeSeries;
     }
     catch (err) {
-        throw new error_1.FirebaseError(`Failed to get extension usage: ${err}`, {
+        throw new error_1.FirebaseError(`Failed to get Cloud Monitoring metric: ${err}`, {
             status: err.status,
         });
     }

package/lib/gcp/devConnect.js

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateP4SA = exports.serviceAgentEmail = exports.sortConnectionsByCreateTime = exports.getGitRepositoryLink = exports.createGitRepositoryLink = exports.fetchGitHubInstallations = exports.listAllBranches = exports.listAllLinkableGitRepositories = exports.listAllConnections = exports.getConnection = exports.deleteConnection = exports.createConnection = exports.client = void 0;
+exports.getRepoDetailsFromBackend = exports.extractGitRepositoryLinkComponents = exports.generateP4SA = exports.serviceAgentEmail = exports.sortConnectionsByCreateTime = exports.fetchGitRepositoryLinkReadToken = exports.getGitRepositoryLink = exports.createGitRepositoryLink = exports.fetchGitHubInstallations = exports.listAllBranches = exports.listAllLinkableGitRepositories = exports.listAllConnections = exports.getConnection = exports.deleteConnection = exports.createConnection = exports.client = void 0;
 const apiv2_1 = require("../apiv2");
 const api_1 = require("../api");
 const serviceusage_1 = require("./serviceusage");
+const error_1 = require("../error");
+const githubConnections_1 = require("../apphosting/githubConnections");
 const PAGE_SIZE_MAX = 1000;
 const LOCATION_OVERRIDE = process.env.FIREBASE_DEVELOPERCONNECT_LOCATION_OVERRIDE;
 exports.client = new apiv2_1.Client({
@@ -112,6 +114,12 @@ async function getGitRepositoryLink(projectId, location, connectionId, gitReposi
     return res.body;
 }
 exports.getGitRepositoryLink = getGitRepositoryLink;
+async function fetchGitRepositoryLinkReadToken(projectId, location, connectionId, gitRepositoryLinkId) {
+    const name = `projects/${projectId}/locations/${LOCATION_OVERRIDE !== null && LOCATION_OVERRIDE !== void 0 ? LOCATION_OVERRIDE : location}/connections/${connectionId}/gitRepositoryLinks/${gitRepositoryLinkId}:fetchReadToken`;
+    const res = await exports.client.post(name);
+    return res.body;
+}
+exports.fetchGitRepositoryLinkReadToken = fetchGitRepositoryLinkReadToken;
 function sortConnectionsByCreateTime(connections) {
     return connections.sort((a, b) => {
         return Date.parse(a.createTime) - Date.parse(b.createTime);
@@ -127,3 +135,32 @@ async function generateP4SA(projectNumber) {
     await (0, serviceusage_1.generateServiceIdentityAndPoll)(projectNumber, new URL(devConnectOrigin).hostname, "apphosting");
 }
 exports.generateP4SA = generateP4SA;
+function extractGitRepositoryLinkComponents(path) {
+    const connectionMatch = /connections\/([^\/]+)/.exec(path);
+    const repositoryMatch = /gitRepositoryLinks\/([^\/]+)/.exec(path);
+    const connection = connectionMatch ? connectionMatch[1] : null;
+    const gitRepoLink = repositoryMatch ? repositoryMatch[1] : null;
+    return { connection, gitRepoLink };
+}
+exports.extractGitRepositoryLinkComponents = extractGitRepositoryLinkComponents;
+async function getRepoDetailsFromBackend(projectId, location, gitRepoLinkPath) {
+    const { connection, gitRepoLink } = extractGitRepositoryLinkComponents(gitRepoLinkPath);
+    if (!connection || !gitRepoLink) {
+        throw new error_1.FirebaseError(`Failed to extract connection or repository resource names from backend repository name.`);
+    }
+    const repoLink = await getGitRepositoryLink(projectId, location, connection, gitRepoLink);
+    const repoSlug = (0, githubConnections_1.extractRepoSlugFromUri)(repoLink.cloneUri);
+    const owner = repoSlug === null || repoSlug === void 0 ? void 0 : repoSlug.split("/")[0];
+    const repo = repoSlug === null || repoSlug === void 0 ? void 0 : repoSlug.split("/")[1];
+    if (!owner || !repo) {
+        throw new error_1.FirebaseError("Failed to parse owner and repo from git repository link");
+    }
+    const readToken = await fetchGitRepositoryLinkReadToken(projectId, location, connection, gitRepoLink);
+    return {
+        repoLink,
+        owner,
+        repo,
+        readToken,
+    };
+}
+exports.getRepoDetailsFromBackend = getRepoDetailsFromBackend;

package/lib/init/features/apphosting.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.doSetup = void 0;
+const clc = require("colorette");
+const utils = require("../../utils");
+const templates_1 = require("../../templates");
+const APPHOSTING_YAML_TEMPLATE = (0, templates_1.readTemplateSync)("init/apphosting/apphosting.yaml");
+async function doSetup(setup, config) {
+    utils.logBullet("Writing default settings to " + clc.bold("apphosting.yaml") + "...");
+    await config.askWriteProjectFile("apphosting.yaml", APPHOSTING_YAML_TEMPLATE);
+}
+exports.doSetup = doSetup;

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

@@ -24,6 +24,11 @@ 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 emptyConnector = {
+    id: "default",
+    path: "./connector",
+    files: [],
+};
 const defaultConnector = {
     id: "default",
     path: "./connector",
@@ -38,29 +43,27 @@ const defaultConnector = {
         },
     ],
 };
+const defaultSchema = { path: "schema.gql", content: SCHEMA_TEMPLATE };
 async function doSetup(setup, config) {
-    const info = await askQuestions(setup);
+    const isBillingEnabled = setup.projectId ? await (0, cloudbilling_1.checkBillingEnabled)(setup.projectId) : false;
+    if (setup.projectId) {
+        isBillingEnabled ? await (0, ensureApis_1.ensureApis)(setup.projectId) : await (0, ensureApis_1.ensureSparkApis)(setup.projectId);
+    }
+    const info = await askQuestions(setup, isBillingEnabled);
     await actuate(setup, config, info);
     const cwdPlatformGuess = await (0, fileUtils_1.getPlatformFromFolder)(process.cwd());
-    if (cwdPlatformGuess !== types_1.Platform.UNDETERMINED) {
+    if (cwdPlatformGuess !== types_1.Platform.NONE) {
         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")}`);
-        }
+        (0, utils_1.logBullet)(`If you'd like to add the generated SDK to your app your, run ${clc.bold("firebase init dataconnect:sdk")}`);
+    }
+    if (setup.projectId && !isBillingEnabled) {
+        (0, utils_1.logBullet)((0, freeTrial_1.upgradeInstructions)(setup.projectId));
     }
-    logger_1.logger.info("");
 }
 exports.doSetup = doSetup;
-async function askQuestions(setup) {
+async function askQuestions(setup, isBillingEnabled) {
     let info = {
         serviceId: "",
         locationId: "",
@@ -69,14 +72,10 @@ async function askQuestions(setup) {
         cloudSqlDatabase: "",
         isNewDatabase: false,
         connectors: [defaultConnector],
-        schemaGql: [],
+        schemaGql: [defaultSchema],
         shouldProvisionCSQL: false,
     };
-    const isBillingEnabled = setup.projectId ? await (0, cloudbilling_1.checkBillingEnabled)(setup.projectId) : false;
-    if (setup.projectId) {
-        isBillingEnabled ? await (0, ensureApis_1.ensureApis)(setup.projectId) : await (0, ensureApis_1.ensureSparkApis)(setup.projectId);
-    }
-    info = await checkExistingInstances(setup, info, isBillingEnabled);
+    info = await promptForExistingServices(setup, info, isBillingEnabled);
     const requiredConfigUnset = info.serviceId === "" ||
         info.cloudSqlInstanceId === "" ||
         info.locationId === "" ||
@@ -84,13 +83,12 @@ async function askQuestions(setup) {
     const shouldConfigureBackend = isBillingEnabled && requiredConfigUnset
         ? await (0, prompt_1.confirm)({
             message: `Would you like to configure your backend resources now?`,
-            default: false,
+            default: true,
         })
         : false;
     if (shouldConfigureBackend) {
         info = await promptForService(info);
-        info = await promptForCloudSQLInstance(setup, info);
-        info = await promptForDatabase(info);
+        info = await promptForCloudSQL(setup, info);
         info.shouldProvisionCSQL = !!(setup.projectId &&
             (info.isNewInstance || info.isNewDatabase) &&
             isBillingEnabled &&
@@ -100,14 +98,10 @@ async function askQuestions(setup) {
             })));
     }
     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`;
+        info.serviceId = info.serviceId || (0, path_1.basename)(process.cwd());
+        info.cloudSqlInstanceId = info.cloudSqlInstanceId || `${info.serviceId || "app"}-fdc`;
+        info.locationId = info.locationId || `us-central1`;
+        info.cloudSqlDatabase = info.cloudSqlDatabase || `fdcdb`;
     }
     return info;
 }
@@ -129,17 +123,19 @@ exports.actuate = actuate;
 async function writeFiles(config, info) {
     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);
+    await config.askWriteProjectFile((0, path_1.join)(dir, "dataconnect.yaml"), subbedDataconnectYaml, false, true);
     if (info.schemaGql.length) {
-        (0, utils_1.logSuccess)("The service you chose already has GQL files deployed. We'll use those instead of the default templates.");
         for (const f of info.schemaGql) {
             await config.askWriteProjectFile((0, path_1.join)(dir, "schema", f.path), f.content);
         }
     }
-    else {
-        await config.askWriteProjectFile((0, path_1.join)(dir, "schema", "schema.gql"), SCHEMA_TEMPLATE);
-    }
     for (const c of info.connectors) {
         await writeConnectorFiles(config, c);
     }
@@ -178,8 +174,8 @@ function subConnectorYamlValues(replacementValues) {
     }
     return replaced;
 }
-async function checkExistingInstances(setup, info, isBillingEnabled) {
-    var _a, _b, _c;
+async function promptForExistingServices(setup, info, isBillingEnabled) {
+    var _a, _b, _c, _d;
     if (!setup.projectId || !isBillingEnabled) {
         return info;
     }
@@ -208,16 +204,18 @@ async function checkExistingInstances(setup, info, isBillingEnabled) {
             const serviceName = (0, names_1.parseServiceName)(choice.service.name);
             info.serviceId = serviceName.serviceId;
             info.locationId = serviceName.location;
+            info.schemaGql = [];
+            info.connectors = [emptyConnector];
             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) {
+                if ((_b = choice.schema.source.files) === null || _b === void 0 ? void 0 : _b.length) {
                     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 : "";
+                info.cloudSqlDatabase = (_d = (_c = primaryDatasource === null || primaryDatasource === void 0 ? void 0 : primaryDatasource.postgresql) === null || _c === void 0 ? void 0 : _c.database) !== null && _d !== void 0 ? _d : "";
                 const connectors = await (0, client_1.listConnectors)(choice.service.name, [
                     "connectors.name",
                     "connectors.source.files",
@@ -234,20 +232,24 @@ async function checkExistingInstances(setup, info, isBillingEnabled) {
                 }
             }
         }
-        else {
-            info = await promptForService(info);
-        }
     }
-    if (info.cloudSqlInstanceId === "") {
+    return info;
+}
+async function promptForCloudSQL(setup, info) {
+    if (info.cloudSqlInstanceId === "" && setup.projectId) {
         const instances = await cloudsql.listInstances(setup.projectId);
         let choices = instances.map((i) => {
-            return { name: i.name, value: i.name, location: i.region };
+            var _a;
+            let display = `${i.name} (${i.region})`;
+            if (((_a = i.settings.userLabels) === null || _a === void 0 ? void 0 : _a["firebase-data-connect"]) === "ft") {
+                display += " (no cost trial)";
+            }
+            return { name: display, value: i.name, location: i.region };
         });
         choices = choices.filter((c) => info.locationId === "" || info.locationId === c.location);
         if (choices.length) {
-            const freeTrialInstanceId = await (0, freeTrial_1.checkForFreeTrialInstance)(setup.projectId);
-            if (!freeTrialInstanceId) {
-                choices.push({ name: "Create a new instance", value: "", location: "" });
+            if (!(await (0, freeTrial_1.checkFreeTrialInstanceUsed)(setup.projectId))) {
+                choices.push({ name: "Create a new free trial instance", value: "", location: "" });
             }
             info.cloudSqlInstanceId = await (0, prompt_1.promptOnce)({
                 message: `Which CloudSQL instance would you like to use?`,
@@ -257,12 +259,25 @@ async function checkExistingInstances(setup, info, isBillingEnabled) {
             if (info.cloudSqlInstanceId !== "") {
                 info.locationId = choices.find((c) => c.value === info.cloudSqlInstanceId).location;
             }
-            else {
-                info = await promptForCloudSQLInstance(setup, info);
-            }
         }
     }
-    if (info.cloudSqlDatabase === "" && info.cloudSqlInstanceId !== "") {
+    if (info.cloudSqlInstanceId === "") {
+        info.isNewInstance = true;
+        info.cloudSqlInstanceId = await (0, prompt_1.promptOnce)({
+            message: `What ID would you like to use for your new CloudSQL instance?`,
+            type: "input",
+            default: `${info.serviceId || "app"}-fdc`,
+        });
+    }
+    if (info.locationId === "") {
+        const choices = await locationChoices(setup);
+        info.locationId = await (0, prompt_1.promptOnce)({
+            message: "What location would like to use?",
+            type: "list",
+            choices,
+        });
+    }
+    if (info.cloudSqlDatabase === "" && setup.projectId) {
         try {
             const dbs = await cloudsql.listDatabases(setup.projectId, info.cloudSqlInstanceId);
             const choices = dbs.map((d) => {
@@ -275,15 +290,20 @@ async function checkExistingInstances(setup, info, isBillingEnabled) {
                     type: "list",
                     choices,
                 });
-                if (info.cloudSqlDatabase === "") {
-                    info = await promptForDatabase(info);
-                }
             }
         }
         catch (err) {
             logger_1.logger.debug(`[dataconnect] Cannot list databases during init: ${err}`);
         }
     }
+    if (info.cloudSqlDatabase === "") {
+        info.isNewDatabase = true;
+        info.cloudSqlDatabase = await (0, prompt_1.promptOnce)({
+            message: `What ID would you like to use for your new database in ${info.cloudSqlInstanceId}?`,
+            type: "input",
+            default: `fdcdb`,
+        });
+    }
     return info;
 }
 async function promptForService(info) {
@@ -296,25 +316,6 @@ async function promptForService(info) {
     }
     return info;
 }
-async function promptForCloudSQLInstance(setup, info) {
-    if (info.cloudSqlInstanceId === "") {
-        info.isNewInstance = true;
-        info.cloudSqlInstanceId = await (0, prompt_1.promptOnce)({
-            message: `What ID would you like to use for your new CloudSQL instance?`,
-            type: "input",
-            default: `${info.serviceId || "app"}-fdc`,
-        });
-    }
-    if (info.locationId === "") {
-        const choices = await locationChoices(setup);
-        info.locationId = await (0, prompt_1.promptOnce)({
-            message: "What location would like to use?",
-            type: "list",
-            choices,
-        });
-    }
-    return info;
-}
 async function locationChoices(setup) {
     if (setup.projectId) {
         const locations = await (0, client_1.listLocations)(setup.projectId);
@@ -335,14 +336,3 @@ async function locationChoices(setup) {
         ];
     }
 }
-async function promptForDatabase(info) {
-    if (info.cloudSqlDatabase === "") {
-        info.isNewDatabase = true;
-        info.cloudSqlDatabase = await (0, prompt_1.promptOnce)({
-            message: `What ID would you like to use for your new database in ${info.cloudSqlInstanceId}?`,
-            type: "input",
-            default: `fdcdb`,
-        });
-    }
-    return info;
-}