firebase-tools 13.8.0 → 13.8.2

package/lib/apphosting/app.js

@@ -1,88 +1,69 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.webApps = void 0;
-const fuzzy = require("fuzzy");
-const inquirer = require("inquirer");
 const apps_1 = require("../management/apps");
-const prompt_1 = require("../prompt");
 const error_1 = require("../error");
+const utils_1 = require("../utils");
 const CREATE_NEW_FIREBASE_WEB_APP = "CREATE_NEW_WEB_APP";
 const CONTINUE_WITHOUT_SELECTING_FIREBASE_WEB_APP = "CONTINUE_WITHOUT_SELECTING_FIREBASE_WEB_APP";
 exports.webApps = {
     CREATE_NEW_FIREBASE_WEB_APP,
     CONTINUE_WITHOUT_SELECTING_FIREBASE_WEB_APP,
     getOrCreateWebApp,
-    promptFirebaseWebApp,
+    generateWebAppName,
 };
-async function getOrCreateWebApp(projectId, firebaseWebAppName, backendId) {
+async function getOrCreateWebApp(projectId, firebaseWebAppId, backendId) {
+    var _a;
     const webAppsInProject = await (0, apps_1.listFirebaseApps)(projectId, apps_1.AppPlatform.WEB);
-    if (webAppsInProject.length === 0) {
-        const { displayName, appId } = await createFirebaseWebApp(projectId, {
-            displayName: backendId,
-        });
-        return { name: displayName, id: appId };
-    }
-    const existingUserProjectWebApps = new Map(webAppsInProject.map((obj) => {
-        var _a;
-        return [
-            (_a = obj.displayName) !== null && _a !== void 0 ? _a : obj.appId,
-            obj.appId,
-        ];
-    }));
-    if (firebaseWebAppName) {
-        if (existingUserProjectWebApps.get(firebaseWebAppName) === undefined) {
-            throw new error_1.FirebaseError(`The web app '${firebaseWebAppName}' does not exist in project ${projectId}`);
+    if (firebaseWebAppId) {
+        const webApp = webAppsInProject.find((app) => app.appId === firebaseWebAppId);
+        if (webApp === undefined) {
+            throw new error_1.FirebaseError(`The web app '${firebaseWebAppId}' does not exist in project ${projectId}`);
         }
-        return { name: firebaseWebAppName, id: existingUserProjectWebApps.get(firebaseWebAppName) };
-    }
-    return await exports.webApps.promptFirebaseWebApp(projectId, backendId, existingUserProjectWebApps);
-}
-async function promptFirebaseWebApp(projectId, backendId, existingUserProjectWebApps) {
-    const existingWebAppKeys = Array.from(existingUserProjectWebApps.keys());
-    const firebaseWebAppName = await (0, prompt_1.promptOnce)({
-        type: "autocomplete",
-        name: "app",
-        message: "Which of the following Firebase web apps would you like to associate your backend with?",
-        source: (_, input = "") => {
-            return new Promise((resolve) => resolve([
-                new inquirer.Separator(),
-                {
-                    name: "Create a new Firebase web app.",
-                    value: CREATE_NEW_FIREBASE_WEB_APP,
-                },
-                {
-                    name: "Continue without a Firebase web app.",
-                    value: CONTINUE_WITHOUT_SELECTING_FIREBASE_WEB_APP,
-                },
-                new inquirer.Separator(),
-                ...fuzzy.filter(input, existingWebAppKeys).map((result) => {
-                    return result.original;
-                }),
-            ]));
-        },
-    });
-    if (firebaseWebAppName === CREATE_NEW_FIREBASE_WEB_APP) {
-        const newFirebaseWebApp = await createFirebaseWebApp(projectId, { displayName: backendId });
-        return { name: newFirebaseWebApp.displayName, id: newFirebaseWebApp.appId };
-    }
-    else if (firebaseWebAppName === CONTINUE_WITHOUT_SELECTING_FIREBASE_WEB_APP) {
-        return;
+        return {
+            name: (_a = webApp.displayName) !== null && _a !== void 0 ? _a : webApp.appId,
+            id: webApp.appId,
+        };
     }
-    return { name: firebaseWebAppName, id: existingUserProjectWebApps.get(firebaseWebAppName) };
-}
-async function createFirebaseWebApp(projectId, options) {
+    const webAppName = await generateWebAppName(projectId, backendId);
     try {
-        return await (0, apps_1.createWebApp)(projectId, options);
+        const app = await (0, apps_1.createWebApp)(projectId, { displayName: webAppName });
+        (0, utils_1.logSuccess)(`Created a new Firebase web app named "${webAppName}"`);
+        return { name: app.displayName, id: app.appId };
     }
     catch (e) {
         if (isQuotaError(e)) {
-            throw new error_1.FirebaseError("Unable to create a new web app, the project has reached the quota for Firebase apps. Navigate to your Firebase console to manage or delete a Firebase app to continue. ", { original: e instanceof Error ? e : undefined });
+            (0, utils_1.logWarning)("Unable to create a new web app, the project has reached the quota for Firebase apps. Navigate to your Firebase console to manage or delete a Firebase app to continue. ");
+            return;
         }
         throw new error_1.FirebaseError("Unable to create a Firebase web app", {
             original: e instanceof Error ? e : undefined,
         });
     }
 }
+async function generateWebAppName(projectId, backendId) {
+    const webAppsInProject = await (0, apps_1.listFirebaseApps)(projectId, apps_1.AppPlatform.WEB);
+    const appsMap = firebaseAppsToMap(webAppsInProject);
+    if (!appsMap.get(backendId)) {
+        return backendId;
+    }
+    let uniqueId = 1;
+    let webAppName = `${backendId}_${uniqueId}`;
+    while (appsMap.get(webAppName)) {
+        uniqueId += 1;
+        webAppName = `${backendId}_${uniqueId}`;
+    }
+    return webAppName;
+}
+function firebaseAppsToMap(apps) {
+    return new Map(apps.map((obj) => {
+        var _a;
+        return [
+            (_a = obj.displayName) !== null && _a !== void 0 ? _a : obj.appId,
+            obj.appId,
+        ];
+    }));
+}
 function isQuotaError(error) {
     var _a, _b, _c, _d, _e;
     const original = error.original;

package/lib/apphosting/githubConnections.js

@@ -54,7 +54,7 @@ function generateConnectionId() {
 const ADD_CONN_CHOICE = "@ADD_CONN";
 async function linkGitHubRepository(projectId, location) {
     var _a, _b;
-    utils.logBullet(clc.bold(`${clc.yellow("===")} Set up a GitHub connection`));
+    utils.logBullet(clc.bold(`${clc.yellow("===")} Import a GitHub repository`));
     const oauthConn = await getOrCreateOauthConnection(projectId, location);
     const existingConns = await listAppHostingConnections(projectId);
     if (existingConns.length === 0) {
@@ -76,8 +76,6 @@ async function linkGitHubRepository(projectId, location) {
         appInstallationId: (_b = connection.githubConfig) === null || _b === void 0 ? void 0 : _b.appInstallationId,
     });
     const repo = await getOrCreateRepository(projectId, location, connectionId, repoCloneUri);
-    utils.logSuccess(`Successfully linked GitHub repository at remote URI`);
-    utils.logSuccess(`\t${repo.cloneUri}\n`);
     return repo;
 }
 exports.linkGitHubRepository = linkGitHubRepository;
@@ -115,18 +113,18 @@ async function getOrCreateOauthConnection(projectId, location) {
         }
     }
     while (conn.installationState.stage === "PENDING_USER_OAUTH") {
-        utils.logBullet("You must authorize the Firebase GitHub app.");
-        utils.logBullet("Sign in to GitHub and authorize Firebase GitHub app:");
+        utils.logBullet("Please authorize the Firebase GitHub app by visiting this url:");
         const { url, cleanup } = await utils.openInBrowserPopup(conn.installationState.actionUri, "Authorize the GitHub app");
         utils.logBullet(`\t${url}`);
         await (0, prompt_1.promptOnce)({
             type: "input",
-            message: "Press Enter once you have authorized the app",
+            message: "Press Enter once you have authorized the GitHub App.",
         });
         cleanup();
         const { projectId, location, id } = parseConnectionName(conn.name);
         conn = await devConnect.getConnection(projectId, location, id);
     }
+    utils.logSuccess("Connected with GitHub successfully\n");
     return conn;
 }
 exports.getOrCreateOauthConnection = getOrCreateOauthConnection;
@@ -135,7 +133,7 @@ async function promptCloneUri(projectId, connections) {
     const cloneUri = await (0, prompt_1.promptOnce)({
         type: "autocomplete",
         name: "cloneUri",
-        message: "Which repository would you like to deploy?",
+        message: "Which GitHub repo do you want to deploy?",
         source: (_, input = "") => {
             return new Promise((resolve) => resolve([
                 new inquirer.Separator(),
@@ -192,7 +190,7 @@ async function ensureSecretManagerAdminGrant(projectId) {
             throw e;
         }
     }
-    utils.logSuccess("Successfully granted the required role to the Developer Connect Service Agent!");
+    utils.logSuccess("Successfully granted the required role to the Developer Connect Service Agent!\n");
 }
 exports.ensureSecretManagerAdminGrant = ensureSecretManagerAdminGrant;
 async function createConnection(projectId, location, connectionId, githubConfig) {

package/lib/apphosting/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getBackendForAmbiguousLocation = exports.promptLocation = exports.deleteBackendAndPoll = exports.orchestrateRollout = exports.setDefaultTrafficPolicy = exports.createBackend = exports.ensureAppHostingComputeServiceAccount = exports.doSetup = void 0;
-const repo = require("./repo");
+const clc = require("colorette");
 const poller = require("../operation-poller");
 const apphosting = require("../gcp/apphosting");
 const githubConnections = require("./githubConnections");
@@ -17,6 +17,7 @@ const ensureApiEnabled_1 = require("../ensureApiEnabled");
 const deploymentTool = require("../deploymentTool");
 const app_1 = require("./app");
 const ora = require("ora");
+const node_fetch_1 = require("node-fetch");
 const DEFAULT_COMPUTE_SERVICE_ACCOUNT_NAME = "firebase-app-hosting-compute";
 const apphostingPollerOptions = {
     apiOrigin: (0, api_1.apphostingOrigin)(),
@@ -24,7 +25,30 @@ const apphostingPollerOptions = {
     masterTimeout: 25 * 60 * 1000,
     maxBackoff: 10000,
 };
-async function doSetup(projectId, webAppName, location, serviceAccount, withCloudBuildRepos) {
+async function tlsReady(url) {
+    var _a;
+    try {
+        await (0, node_fetch_1.default)(url);
+        return true;
+    }
+    catch (err) {
+        const maybeNodeError = err;
+        if (/HANDSHAKE_FAILURE/.test((_a = maybeNodeError === null || maybeNodeError === void 0 ? void 0 : maybeNodeError.cause) === null || _a === void 0 ? void 0 : _a.code)) {
+            return false;
+        }
+        return true;
+    }
+}
+async function awaitTlsReady(url) {
+    let ready;
+    do {
+        ready = await tlsReady(url);
+        if (!ready) {
+            await (0, utils_1.sleep)(1000);
+        }
+    } while (!ready);
+}
+async function doSetup(projectId, webAppName, location, serviceAccount) {
     await Promise.all([
         (0, ensureApiEnabled_1.ensure)(projectId, (0, api_1.developerConnectOrigin)(), "apphosting", true),
         (0, ensureApiEnabled_1.ensure)(projectId, (0, api_1.cloudbuildOrigin)(), "apphosting", true),
@@ -33,7 +57,6 @@ async function doSetup(projectId, webAppName, location, serviceAccount, withClou
         (0, ensureApiEnabled_1.ensure)(projectId, (0, api_1.artifactRegistryDomain)(), "apphosting", true),
         (0, ensureApiEnabled_1.ensure)(projectId, (0, api_1.iamOrigin)(), "apphosting", true),
     ]);
-    (0, utils_1.logBullet)("First we need a few details to create your backend.\n");
     await ensureAppHostingComputeServiceAccount(projectId, serviceAccount);
     const allowedLocations = (await apphosting.listLocations(projectId)).map((loc) => loc.locationId);
     if (location) {
@@ -43,38 +66,35 @@ async function doSetup(projectId, webAppName, location, serviceAccount, withClou
     }
     location =
         location || (await promptLocation(projectId, "Select a location to host your backend:\n"));
-    (0, utils_1.logSuccess)(`Location set to ${location}.\n`);
-    const backendId = await promptNewBackendId(projectId, location, {
-        name: "backendId",
-        type: "input",
-        default: "my-web-app",
-        message: "Create a name for your backend [1-30 characters]",
-    });
-    const webApp = await app_1.webApps.getOrCreateWebApp(projectId, webAppName, backendId);
-    if (webApp) {
-        (0, utils_1.logSuccess)(`Firebase web app set to ${webApp.name}.\n`);
-    }
-    else {
-        (0, utils_1.logWarning)(`Firebase web app not set`);
-    }
-    const gitRepositoryConnection = withCloudBuildRepos
-        ? await repo.linkGitHubRepository(projectId, location)
-        : await githubConnections.linkGitHubRepository(projectId, location);
+    const gitRepositoryConnection = await githubConnections.linkGitHubRepository(projectId, location);
     const rootDir = await (0, prompt_1.promptOnce)({
         name: "rootDir",
         type: "input",
         default: "/",
         message: "Specify your app's root directory relative to your repository",
     });
-    const createBackendSpinner = ora("Creating your new backend...").start();
-    const backend = await createBackend(projectId, location, backendId, gitRepositoryConnection, serviceAccount, webApp === null || webApp === void 0 ? void 0 : webApp.id, rootDir);
-    createBackendSpinner.succeed(`Successfully created backend:\n\t${backend.name}\n`);
     const branch = await (0, prompt_1.promptOnce)({
         name: "branch",
         type: "input",
         default: "main",
         message: "Pick a branch for continuous deployment",
     });
+    (0, utils_1.logSuccess)(`Repo linked successfully!\n`);
+    (0, utils_1.logBullet)(`${clc.yellow("===")} Set up your backend`);
+    const backendId = await promptNewBackendId(projectId, location, {
+        name: "backendId",
+        type: "input",
+        default: "my-web-app",
+        message: "Provide a name for your backend [1-30 characters]",
+    });
+    (0, utils_1.logSuccess)(`Name set to ${backendId}\n`);
+    const webApp = await app_1.webApps.getOrCreateWebApp(projectId, webAppName, backendId);
+    if (!webApp) {
+        (0, utils_1.logWarning)(`Firebase web app not set`);
+    }
+    const createBackendSpinner = ora("Creating your new backend...").start();
+    const backend = await createBackend(projectId, location, backendId, gitRepositoryConnection, serviceAccount, webApp === null || webApp === void 0 ? void 0 : webApp.id, rootDir);
+    createBackendSpinner.succeed(`Successfully created backend!\n\t${backend.name}\n`);
     await setDefaultTrafficPolicy(projectId, location, backendId, branch);
     const confirmRollout = await (0, prompt_1.promptOnce)({
         type: "confirm",
@@ -86,8 +106,9 @@ async function doSetup(projectId, webAppName, location, serviceAccount, withClou
         (0, utils_1.logSuccess)(`Your backend will be deployed at:\n\thttps://${backend.uri}`);
         return;
     }
+    const url = `https://${backend.uri}`;
     (0, utils_1.logBullet)(`You may also track this rollout at:\n\t${(0, api_1.consoleOrigin)()}/project/${projectId}/apphosting`);
-    const createRolloutSpinner = ora("Starting a new rollout... This make take a few minutes. It's safe to exit now.").start();
+    const createRolloutSpinner = ora("Starting a new rollout; this may take a few minutes. It's safe to exit now.").start();
     await orchestrateRollout(projectId, location, backendId, {
         source: {
             codebase: {
@@ -95,7 +116,13 @@ async function doSetup(projectId, webAppName, location, serviceAccount, withClou
             },
         },
     });
-    createRolloutSpinner.succeed(`Your backend is now deployed at:\n\thttps://${backend.uri}`);
+    createRolloutSpinner.succeed("Rollout complete");
+    if (!(await tlsReady(url))) {
+        const tlsSpinner = ora("Finalizing your backend's TLS certificate; this may take a few minutes.").start();
+        await awaitTlsReady(url);
+        tlsSpinner.succeed("TLS certificate ready");
+    }
+    (0, utils_1.logSuccess)(`Your backend is now deployed at:\n\thttps://${backend.uri}`);
 }
 exports.doSetup = doSetup;
 async function ensureAppHostingComputeServiceAccount(projectId, serviceAccount) {
@@ -205,7 +232,7 @@ async function orchestrateRollout(projectId, location, backendId, buildInput) {
                 if (tries >= 5) {
                     throw err;
                 }
-                await new Promise((resolve) => setTimeout(resolve, 1000));
+                await (0, utils_1.sleep)(1000);
             }
             else {
                 throw err;
@@ -236,13 +263,15 @@ async function promptLocation(projectId, prompt = "Please select a location:") {
     if (allowedLocations.length === 1) {
         return allowedLocations[0];
     }
-    return (await (0, prompt_1.promptOnce)({
+    const location = (await (0, prompt_1.promptOnce)({
         name: "location",
         type: "list",
         default: constants_1.DEFAULT_LOCATION,
         message: prompt,
         choices: allowedLocations,
     }));
+    (0, utils_1.logSuccess)(`Location set to ${location}.\n`);
+    return location;
 }
 exports.promptLocation = promptLocation;
 async function getBackendForAmbiguousLocation(projectId, backendId, locationDisambugationPrompt) {

package/lib/apphosting/repo.js

@@ -52,7 +52,7 @@ function generateConnectionId() {
 const ADD_CONN_CHOICE = "@ADD_CONN";
 async function linkGitHubRepository(projectId, location) {
     var _a, _b;
-    utils.logBullet(clc.bold(`${clc.yellow("===")} Set up a GitHub connection`));
+    utils.logBullet(clc.bold(`${clc.yellow("===")} Import a GitHub repository`));
     const oauthConn = await getOrCreateOauthConnection(projectId, location);
     const existingConns = await listAppHostingConnections(projectId);
     if (existingConns.length === 0) {
@@ -132,7 +132,7 @@ async function promptRepositoryUri(projectId, connections) {
     const remoteUri = await (0, prompt_1.promptOnce)({
         type: "autocomplete",
         name: "remoteUri",
-        message: "Which repository would you like to deploy?",
+        message: "Which GitHub repo do you want to deploy?",
         source: (_, input = "") => {
             return new Promise((resolve) => resolve([
                 new inquirer.Separator(),

package/lib/commands/apphosting-backends-create.js

@@ -6,19 +6,20 @@ const projectUtils_1 = require("../projectUtils");
 const requireInteractive_1 = require("../requireInteractive");
 const apphosting_1 = require("../apphosting");
 const apphosting_2 = require("../gcp/apphosting");
+const firedata_1 = require("../gcp/firedata");
+const requireTosAcceptance_1 = require("../requireTosAcceptance");
 exports.command = new command_1.Command("apphosting:backends:create")
     .description("create a Firebase App Hosting backend")
-    .option("-a, --app <webApp>", "specify an existing Firebase web app to associate your App Hosting backend with")
+    .option("-a, --app <webAppId>", "specify an existing Firebase web app's ID to associate your App Hosting backend with")
     .option("-l, --location <location>", "specify the location of the backend", "")
     .option("-s, --service-account <serviceAccount>", "specify the service account used to run the server", "")
-    .option("-w, --with-cloud-build-repos", "use Cloud Build Repositories flow instead of the Developer Connect flow")
     .before(apphosting_2.ensureApiEnabled)
     .before(requireInteractive_1.default)
+    .before((0, requireTosAcceptance_1.requireTosAcceptance)(firedata_1.APPHOSTING_TOS_ID))
     .action(async (options) => {
     const projectId = (0, projectUtils_1.needProjectId)(options);
-    const webApp = options.app;
+    const webAppId = options.app;
     const location = options.location;
     const serviceAccount = options.serviceAccount;
-    const withCloudBuildRepos = options.withCloudBuildRepos;
-    await (0, apphosting_1.doSetup)(projectId, webApp, location, serviceAccount, withCloudBuildRepos);
+    await (0, apphosting_1.doSetup)(projectId, webAppId, location, serviceAccount);
 });

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

@@ -25,11 +25,12 @@ exports.command = new command_1.Command("dataconnect:sdk:generate")
             configDir,
             auto_download: true,
             rc: options.rc,
+            locationId: service.location,
         };
         const dataconnectEmulator = new dataconnectEmulator_1.DataConnectEmulator(args);
         for (const conn of serviceInfo.connectorInfo) {
             const output = await dataconnectEmulator.generate(conn.connectorYaml.connectorId);
-            console.log(output);
+            logger_1.logger.info(output);
             logger_1.logger.info(`Generated SDKs for ${conn.connectorYaml.connectorId}`);
         }
     }

package/lib/commands/{dataconnect-list.js → dataconnect-services-list.js}

@@ -9,7 +9,7 @@ const logger_1 = require("../logger");
 const requirePermissions_1 = require("../requirePermissions");
 const ensureApis_1 = require("../dataconnect/ensureApis");
 const Table = require("cli-table");
-exports.command = new command_1.Command("dataconnect:list")
+exports.command = new command_1.Command("dataconnect:services:list")
     .description("list all deployed services in your Firebase project")
     .before(requirePermissions_1.requirePermissions, [
     "dataconnect.services.list",
@@ -17,7 +17,7 @@ exports.command = new command_1.Command("dataconnect:list")
     "dataconnect.connectors.list",
 ])
     .action(async (options) => {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     const projectId = (0, projectUtils_1.needProjectId)(options);
     await (0, ensureApis_1.ensureApis)(projectId);
     const services = await client.listAllServices(projectId);
@@ -34,14 +34,31 @@ exports.command = new command_1.Command("dataconnect:list")
     });
     const jsonOutput = { services: [] };
     for (const service of services) {
-        const schema = await client.getSchema(service.name);
+        let schema = {
+            name: "",
+            primaryDatasource: {},
+            source: { files: [] },
+        };
+        try {
+            schema = await client.getSchema(service.name);
+        }
+        catch (err) {
+            logger_1.logger.debug(`Error fetching schema: ${err}`);
+        }
         const connectors = await client.listConnectors(service.name);
         const serviceName = names.parseServiceName(service.name);
         const instanceName = (_b = (_a = schema === null || schema === void 0 ? void 0 : schema.primaryDatasource.postgresql) === null || _a === void 0 ? void 0 : _a.cloudSql.instance) !== null && _b !== void 0 ? _b : "";
         const instanceId = instanceName.split("/").pop();
         const dbId = (_d = (_c = schema === null || schema === void 0 ? void 0 : schema.primaryDatasource.postgresql) === null || _c === void 0 ? void 0 : _c.database) !== null && _d !== void 0 ? _d : "";
-        const dbName = `CloudSQL Instance: ${instanceId} Database:${dbId}`;
-        table.push([serviceName.serviceId, serviceName.location, dbName, schema === null || schema === void 0 ? void 0 : schema.updateTime, "", ""]);
+        const dbName = `CloudSQL Instance: ${instanceId}\nDatabase:${dbId}`;
+        table.push([
+            serviceName.serviceId,
+            serviceName.location,
+            dbName,
+            (_e = schema === null || schema === void 0 ? void 0 : schema.updateTime) !== null && _e !== void 0 ? _e : "",
+            "",
+            "",
+        ]);
         const serviceJson = {
             serviceId: serviceName.serviceId,
             location: serviceName.location,
@@ -54,7 +71,7 @@ exports.command = new command_1.Command("dataconnect:list")
             table.push(["", "", "", "", connectorName.connectorId, conn.updateTime]);
             serviceJson.connectors.push({
                 connectorId: connectorName.connectorId,
-                connectorLastUpdated: (_e = conn.updateTime) !== null && _e !== void 0 ? _e : "",
+                connectorLastUpdated: (_f = conn.updateTime) !== null && _f !== void 0 ? _f : "",
             });
         }
         jsonOutput.services.push(serviceJson);

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

@@ -4,12 +4,12 @@ exports.command = void 0;
 const command_1 = require("../command");
 const projectUtils_1 = require("../projectUtils");
 const fileUtils_1 = require("../dataconnect/fileUtils");
-const logger_1 = require("../logger");
 const error_1 = require("../error");
 const schemaMigration_1 = require("../dataconnect/schemaMigration");
 const requireAuth_1 = require("../requireAuth");
 const requirePermissions_1 = require("../requirePermissions");
 const ensureApis_1 = require("../dataconnect/ensureApis");
+const utils_1 = require("../utils");
 exports.command = new command_1.Command("dataconnect:sql:migrate [serviceId]")
     .description("migrates your CloudSQL database's schema to match your local DataConnect schema")
     .before(requirePermissions_1.requirePermissions, [
@@ -30,12 +30,17 @@ exports.command = new command_1.Command("dataconnect:sql:migrate [serviceId]")
     if (!instanceId) {
         throw new error_1.FirebaseError("dataconnect.yaml is missing field schema.datasource.postgresql.cloudsql.instanceId");
     }
-    const diffs = await (0, schemaMigration_1.migrateSchema)(options, serviceInfo.schema, true);
+    const diffs = await (0, schemaMigration_1.migrateSchema)({
+        options,
+        schema: serviceInfo.schema,
+        allowNonInteractiveMigration: true,
+        validateOnly: true,
+    });
     if (diffs.length) {
-        logger_1.logger.info(`Schema sucessfully migrated! Run 'firebase deploy' to deploy your new schema to your Data Connect service.`);
+        (0, utils_1.logLabeledSuccess)("dataconnect", `Database schema sucessfully migrated! Run 'firebase deploy' to deploy your new schema to your Data Connect service.`);
     }
     else {
-        logger_1.logger.info("Schema was already up to date!");
+        (0, utils_1.logLabeledSuccess)("dataconnect", "Database schema is already up to date!");
     }
     return { projectId, serviceId, diffs };
 });

package/lib/commands/index.js

@@ -203,7 +203,8 @@ function load(client) {
     if (experiments.isEnabled("dataconnect")) {
         client.dataconnect = {};
         client.setup.emulators.dataconnect = loadCommand("setup-emulators-dataconnect");
-        client.dataconnect.list = loadCommand("dataconnect-list");
+        client.dataconnect.services = {};
+        client.dataconnect.services.list = loadCommand("dataconnect-services-list");
         client.dataconnect.sql = {};
         client.dataconnect.sql.diff = loadCommand("dataconnect-sql-diff");
         client.dataconnect.sql.migrate = loadCommand("dataconnect-sql-migrate");

package/lib/commands/init.js

@@ -69,10 +69,10 @@ const choices = [
         checked: false,
     },
 ];
-if ((0, experiments_1.isEnabled)("apphosting")) {
+if ((0, experiments_1.isEnabled)("genkit")) {
     choices.push({
-        value: "apphosting",
-        name: "App Hosting: Get started with App Hosting projects.",
+        value: "genkit",
+        name: "Genkit: Setup a new Genkit project with Firebase",
         checked: false,
     });
 }

package/lib/dataconnect/client.js

@@ -21,7 +21,7 @@ exports.listLocations = listLocations;
 async function listAllServices(projectId) {
     const locations = await listLocations(projectId);
     let services = [];
-    for (const l of locations) {
+    await Promise.all(locations.map(async (l) => {
         try {
             const locationServices = await listServices(projectId, l);
             services = services.concat(locationServices);
@@ -29,7 +29,7 @@ async function listAllServices(projectId) {
         catch (err) {
             logger_1.logger.debug(`Unable to listServices in ${l}: ${err}`);
         }
-    }
+    }));
     return services;
 }
 exports.listAllServices = listAllServices;

package/lib/dataconnect/errors.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getInvalidConnectors = exports.getIncompatibleSchemaError = void 0;
+const INCOMPATIBLE_SCHEMA_ERROR_TYPESTRING = "IncompatibleSqlSchemaError";
+const PRECONDITION_ERROR_TYPESTRING = "type.googleapis.com/google.rpc.PreconditionFailure";
+const INCOMPATIBLE_CONNECTOR_TYPE = "INCOMPATIBLE_CONNECTOR";
+function getIncompatibleSchemaError(err) {
+    var _a, _b;
+    const original = ((_b = (_a = err.context) === null || _a === void 0 ? void 0 : _a.body) === null || _b === void 0 ? void 0 : _b.error) || err.orignal;
+    if (!original) {
+        throw err;
+    }
+    const details = original.details;
+    const incompatibles = details.filter((d) => { var _a; return (_a = d["@type"]) === null || _a === void 0 ? void 0 : _a.includes(INCOMPATIBLE_SCHEMA_ERROR_TYPESTRING); });
+    return incompatibles[0];
+}
+exports.getIncompatibleSchemaError = getIncompatibleSchemaError;
+function getInvalidConnectors(err) {
+    var _a, _b, _c, _d;
+    const invalidConns = [];
+    const original = ((_b = (_a = err.context) === null || _a === void 0 ? void 0 : _a.body) === null || _b === void 0 ? void 0 : _b.error) || (err === null || err === void 0 ? void 0 : err.orignal);
+    const details = original === null || original === void 0 ? void 0 : original.details;
+    const preconditionErrs = details === null || details === void 0 ? void 0 : details.filter((d) => { var _a; return (_a = d["@type"]) === null || _a === void 0 ? void 0 : _a.includes(PRECONDITION_ERROR_TYPESTRING); });
+    for (const preconditionErr of preconditionErrs) {
+        const incompatibleConnViolation = (_c = preconditionErr === null || preconditionErr === void 0 ? void 0 : preconditionErr.violations) === null || _c === void 0 ? void 0 : _c.filter((v) => v.type === INCOMPATIBLE_CONNECTOR_TYPE);
+        const newConns = (_d = incompatibleConnViolation === null || incompatibleConnViolation === void 0 ? void 0 : incompatibleConnViolation.map((i) => i.subject)) !== null && _d !== void 0 ? _d : [];
+        invalidConns.push(...newConns);
+    }
+    return invalidConns;
+}
+exports.getInvalidConnectors = getInvalidConnectors;

package/lib/dataconnect/fileUtils.js

@@ -51,17 +51,20 @@ function validateConnectorYaml(unvalidated) {
 }
 async function readGQLFiles(sourceDir) {
     const files = await fs.readdir(sourceDir);
-    return files.filter((f) => f.endsWith(".gql")).map((f) => toFile(path.join(sourceDir, f)));
+    return files
+        .filter((f) => f.endsWith(".gql") || f.endsWith(".graphql"))
+        .map((f) => toFile(sourceDir, f));
 }
 exports.readGQLFiles = readGQLFiles;
-function toFile(path) {
-    if (!fs.existsSync(path)) {
-        throw new error_1.FirebaseError(`file ${path} not found`);
+function toFile(sourceDir, relPath) {
+    const fullPath = path.join(sourceDir, relPath);
+    if (!fs.existsSync(fullPath)) {
+        throw new error_1.FirebaseError(`file ${fullPath} not found`);
     }
-    const file = fs.readFileSync(path).toString();
+    const content = fs.readFileSync(fullPath).toString();
     return {
-        path: path,
-        content: file,
+        path: relPath,
+        content,
     };
 }
 async function pickService(projectId, config, serviceId) {

package/lib/dataconnect/freeTrial.js

@@ -4,7 +4,7 @@ exports.printFreeTrialUnavailable = exports.checkForFreeTrialInstance = exports.
 const cloudsqladmin_1 = require("../gcp/cloudsql/cloudsqladmin");
 const utils = require("../utils");
 function freeTrialTermsLink() {
-    return "";
+    return "https://firebase.google.com/pricing";
 }
 exports.freeTrialTermsLink = freeTrialTermsLink;
 async function checkForFreeTrialInstance(projectId) {

package/lib/dataconnect/graphqlError.js

@@ -5,8 +5,8 @@ function prettify(err) {
     var _a;
     const message = err.message;
     let header = (_a = err.extensions.file) !== null && _a !== void 0 ? _a : "";
-    for (const loc of err.locations) {
-        header += `(${loc.line}, ${loc.column})`;
+    if (err.locations) {
+        header += `:${err.locations[0].line}`;
     }
     return header.length ? `${header}: ${message}` : message;
 }