firebase-tools 13.22.1 → 13.23.1

package/lib/apphosting/index.js

@@ -1,262 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getBackendForAmbiguousLocation = exports.promptLocation = exports.deleteBackendAndPoll = exports.setDefaultTrafficPolicy = exports.createBackend = exports.ensureAppHostingComputeServiceAccount = exports.doSetup = void 0;
-const clc = require("colorette");
-const poller = require("../operation-poller");
-const apphosting = require("../gcp/apphosting");
-const githubConnections = require("./githubConnections");
-const utils_1 = require("../utils");
-const api_1 = require("../api");
-const apphosting_1 = require("../gcp/apphosting");
-const resourceManager_1 = require("../gcp/resourceManager");
-const iam = require("../gcp/iam");
-const error_1 = require("../error");
-const prompt_1 = require("../prompt");
-const constants_1 = require("./constants");
-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 rollout_1 = require("./rollout");
-const DEFAULT_COMPUTE_SERVICE_ACCOUNT_NAME = "firebase-app-hosting-compute";
-const apphostingPollerOptions = {
-    apiOrigin: (0, api_1.apphostingOrigin)(),
-    apiVersion: apphosting_1.API_VERSION,
-    masterTimeout: 25 * 60 * 1000,
-    maxBackoff: 10000,
-};
-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) ||
-            "EPROTO" === (maybeNodeError === null || maybeNodeError === void 0 ? void 0 : maybeNodeError.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),
-        (0, ensureApiEnabled_1.ensure)(projectId, (0, api_1.secretManagerOrigin)(), "apphosting", true),
-        (0, ensureApiEnabled_1.ensure)(projectId, (0, api_1.cloudRunApiOrigin)(), "apphosting", true),
-        (0, ensureApiEnabled_1.ensure)(projectId, (0, api_1.artifactRegistryDomain)(), "apphosting", true),
-        (0, ensureApiEnabled_1.ensure)(projectId, (0, api_1.iamOrigin)(), "apphosting", true),
-    ]);
-    await ensureAppHostingComputeServiceAccount(projectId, serviceAccount);
-    const allowedLocations = (await apphosting.listLocations(projectId)).map((loc) => loc.locationId);
-    if (location) {
-        if (!allowedLocations.includes(location)) {
-            throw new error_1.FirebaseError(`Invalid location ${location}. Valid choices are ${allowedLocations.join(", ")}`);
-        }
-    }
-    location =
-        location || (await promptLocation(projectId, "Select a location to host your backend:\n"));
-    const gitRepositoryLink = 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 branch = await githubConnections.promptGitHubBranch(gitRepositoryLink);
-    (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, gitRepositoryLink, 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",
-        name: "rollout",
-        default: true,
-        message: "Do you want to deploy now?",
-    });
-    if (!confirmRollout) {
-        (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 may take a few minutes. It's safe to exit now.").start();
-    await (0, rollout_1.orchestrateRollout)({
-        projectId,
-        location,
-        backendId,
-        buildInput: {
-            source: {
-                codebase: {
-                    branch,
-                },
-            },
-        },
-        isFirstRollout: true,
-    });
-    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) {
-    const sa = serviceAccount || defaultComputeServiceAccountEmail(projectId);
-    const name = `projects/${projectId}/serviceAccounts/${sa}`;
-    try {
-        await iam.testResourceIamPermissions((0, api_1.iamOrigin)(), "v1", name, ["iam.serviceAccounts.actAs"], `projects/${projectId}`);
-    }
-    catch (err) {
-        if (!(err instanceof error_1.FirebaseError)) {
-            throw err;
-        }
-        if (err.status === 404) {
-            await provisionDefaultComputeServiceAccount(projectId);
-        }
-        else if (err.status === 403) {
-            throw new error_1.FirebaseError(`Failed to create backend due to missing delegation permissions for ${sa}. Make sure you have the iam.serviceAccounts.actAs permission.`, { original: err });
-        }
-    }
-}
-exports.ensureAppHostingComputeServiceAccount = ensureAppHostingComputeServiceAccount;
-async function promptNewBackendId(projectId, location, prompt) {
-    while (true) {
-        const backendId = await (0, prompt_1.promptOnce)(prompt);
-        try {
-            await apphosting.getBackend(projectId, location, backendId);
-        }
-        catch (err) {
-            if (err.status === 404) {
-                return backendId;
-            }
-            throw new error_1.FirebaseError(`Failed to check if backend with id ${backendId} already exists in ${location}`, { original: err });
-        }
-        (0, utils_1.logWarning)(`Backend with id ${backendId} already exists in ${location}`);
-    }
-}
-function defaultComputeServiceAccountEmail(projectId) {
-    return `${DEFAULT_COMPUTE_SERVICE_ACCOUNT_NAME}@${projectId}.iam.gserviceaccount.com`;
-}
-async function createBackend(projectId, location, backendId, repository, serviceAccount, webAppId, rootDir = "/") {
-    const defaultServiceAccount = defaultComputeServiceAccountEmail(projectId);
-    const backendReqBody = {
-        servingLocality: "GLOBAL_ACCESS",
-        codebase: {
-            repository: `${repository.name}`,
-            rootDirectory: rootDir,
-        },
-        labels: deploymentTool.labels(),
-        serviceAccount: serviceAccount || defaultServiceAccount,
-        appId: webAppId,
-    };
-    async function createBackendAndPoll() {
-        const op = await apphosting.createBackend(projectId, location, backendReqBody, backendId);
-        return await poller.pollOperation(Object.assign(Object.assign({}, apphostingPollerOptions), { pollerName: `create-${projectId}-${location}-${backendId}`, operationResourceName: op.name }));
-    }
-    return await createBackendAndPoll();
-}
-exports.createBackend = createBackend;
-async function provisionDefaultComputeServiceAccount(projectId) {
-    try {
-        await iam.createServiceAccount(projectId, DEFAULT_COMPUTE_SERVICE_ACCOUNT_NAME, "Default service account used to run builds and deploys for Firebase App Hosting", "Firebase App Hosting compute service account");
-    }
-    catch (err) {
-        if (err.status !== 409) {
-            throw err;
-        }
-    }
-    await (0, resourceManager_1.addServiceAccountToRoles)(projectId, defaultComputeServiceAccountEmail(projectId), [
-        "roles/firebaseapphosting.computeRunner",
-        "roles/firebase.sdkAdminServiceAgent",
-        "roles/developerconnect.readTokenAccessor",
-    ], true);
-}
-async function setDefaultTrafficPolicy(projectId, location, backendId, codebaseBranch) {
-    const traffic = {
-        rolloutPolicy: {
-            codebaseBranch: codebaseBranch,
-            stages: [
-                {
-                    progression: "IMMEDIATE",
-                    targetPercent: 100,
-                },
-            ],
-        },
-    };
-    const op = await apphosting.updateTraffic(projectId, location, backendId, traffic);
-    await poller.pollOperation(Object.assign(Object.assign({}, apphostingPollerOptions), { pollerName: `updateTraffic-${projectId}-${location}-${backendId}`, operationResourceName: op.name }));
-}
-exports.setDefaultTrafficPolicy = setDefaultTrafficPolicy;
-async function deleteBackendAndPoll(projectId, location, backendId) {
-    const op = await apphosting.deleteBackend(projectId, location, backendId);
-    await poller.pollOperation(Object.assign(Object.assign({}, apphostingPollerOptions), { pollerName: `delete-${projectId}-${location}-${backendId}`, operationResourceName: op.name }));
-}
-exports.deleteBackendAndPoll = deleteBackendAndPoll;
-async function promptLocation(projectId, prompt = "Please select a location:") {
-    const allowedLocations = (await apphosting.listLocations(projectId)).map((loc) => loc.locationId);
-    if (allowedLocations.length === 1) {
-        return allowedLocations[0];
-    }
-    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) {
-    let { unreachable, backends } = await apphosting.listBackends(projectId, "-");
-    if (unreachable && unreachable.length !== 0) {
-        (0, utils_1.logWarning)(`The following locations are currently unreachable: ${unreachable}.\n` +
-            "If your backend is in one of these regions, please try again later.");
-    }
-    backends = backends.filter((backend) => apphosting.parseBackendName(backend.name).id === backendId);
-    if (backends.length === 0) {
-        throw new error_1.FirebaseError(`No backend named "${backendId}" found.`);
-    }
-    if (backends.length === 1) {
-        return backends[0];
-    }
-    const backendsByLocation = new Map();
-    backends.forEach((backend) => backendsByLocation.set(apphosting.parseBackendName(backend.name).location, backend));
-    const location = await (0, prompt_1.promptOnce)({
-        name: "location",
-        type: "list",
-        message: locationDisambugationPrompt,
-        choices: [...backendsByLocation.keys()],
-    });
-    return backendsByLocation.get(location);
-}
-exports.getBackendForAmbiguousLocation = getBackendForAmbiguousLocation;
+exports.setupBackend = void 0;
+const backend_1 = require("./backend");
+Object.defineProperty(exports, "setupBackend", { enumerable: true, get: function () { return backend_1.doSetup; } });

package/lib/apphosting/rollout.js

@@ -7,9 +7,9 @@ const ora = require("ora");
 const devConnect_1 = require("../gcp/devConnect");
 const githubConnections_1 = require("../apphosting/githubConnections");
 const poller = require("../operation-poller");
-const prompt_1 = require("../prompt");
 const utils_1 = require("../utils");
 const api_1 = require("../api");
+const backend_1 = require("./backend");
 const apphostingPollerOptions = {
     apiOrigin: (0, api_1.apphostingOrigin)(),
     apiVersion: apphosting.API_VERSION,
@@ -18,7 +18,14 @@ const apphostingPollerOptions = {
 };
 const GIT_COMMIT_SHA_REGEX = /^(?:[0-9a-f]{40}|[0-9a-f]{7})$/;
 async function createRollout(backendId, projectId, location, branch, commit, force) {
-    const backend = await apphosting.getBackend(projectId, location, backendId);
+    let backend;
+    if (location === "-" || location === "") {
+        backend = await (0, backend_1.getBackendForAmbiguousLocation)(projectId, backendId, "Please select the location of the backend you'd like to roll out:", force);
+        location = apphosting.parseBackendName(backend.name).location;
+    }
+    else {
+        backend = await (0, backend_1.getBackendForLocation)(projectId, location, backendId);
+    }
     if (!backend.codebase.repository) {
         throw new error_1.FirebaseError(`Backend ${backendId} is misconfigured due to missing a connected repository. You can delete and recreate your backend using 'firebase apphosting:backends:delete' and 'firebase apphosting:backends:create'.`);
     }
@@ -48,18 +55,14 @@ async function createRollout(backendId, projectId, location, branch, commit, for
         }
     }
     else {
+        if (force) {
+            throw new error_1.FirebaseError(`Failed to create rollout with --force option because no target branch or commit was specified. Please specify which branch or commit to roll out with the --git-branch or --git-commit flag.`);
+        }
         branch = await (0, githubConnections_1.promptGitHubBranch)(repoLink);
         const branchInfo = await (0, githubConnections_1.getGitHubBranch)(owner, repo, branch, readToken.token);
         targetCommit = branchInfo.commit;
     }
     (0, utils_1.logBullet)(`You are about to deploy [${targetCommit.sha.substring(0, 7)}]: ${targetCommit.commit.message}`);
-    const confirmRollout = await (0, prompt_1.confirm)({
-        force: !!force,
-        message: "Do you want to continue?",
-    });
-    if (!confirmRollout) {
-        return;
-    }
     (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 may take a few minutes. It's safe to exit now.").start();
     try {

package/lib/bin/firebase.js

@@ -16,7 +16,7 @@ const marked_1 = require("marked");
 marked_1.marked.use((0, marked_terminal_1.markedTerminal)());
 const node_path_1 = require("node:path");
 const triple_beam_1 = require("triple-beam");
-const stripAnsi = require("strip-ansi");
+const node_util_1 = require("node:util");
 const fs = require("node:fs");
 const configstore_1 = require("../configstore");
 const errorOut_1 = require("../errorOut");
@@ -58,7 +58,7 @@ logger_1.logger.add(new winston.transports.File({
     filename: logFilename,
     format: winston.format.printf((info) => {
         const segments = [info.message, ...(info[triple_beam_1.SPLAT] || [])].map(utils.tryStringify);
-        return `[${info.level}] ${stripAnsi(segments.join(" "))}`;
+        return `[${info.level}] ${(0, node_util_1.stripVTControlCharacters)(segments.join(" "))}`;
     }),
 }));
 logger_1.logger.debug("-".repeat(70));

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

@@ -4,8 +4,8 @@ exports.command = void 0;
 const command_1 = require("../command");
 const projectUtils_1 = require("../projectUtils");
 const requireInteractive_1 = require("../requireInteractive");
-const apphosting_1 = require("../apphosting");
-const apphosting_2 = require("../gcp/apphosting");
+const backend_1 = require("../apphosting/backend");
+const apphosting_1 = require("../gcp/apphosting");
 const firedata_1 = require("../gcp/firedata");
 const requireTosAcceptance_1 = require("../requireTosAcceptance");
 exports.command = new command_1.Command("apphosting:backends:create")
@@ -13,7 +13,7 @@ exports.command = new command_1.Command("apphosting:backends:create")
     .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", "")
-    .before(apphosting_2.ensureApiEnabled)
+    .before(apphosting_1.ensureApiEnabled)
     .before(requireInteractive_1.default)
     .before((0, requireTosAcceptance_1.requireTosAcceptance)(firedata_1.APPHOSTING_TOS_ID))
     .action(async (options) => {
@@ -21,5 +21,5 @@ exports.command = new command_1.Command("apphosting:backends:create")
     const webAppId = options.app;
     const location = options.location;
     const serviceAccount = options.serviceAccount;
-    await (0, apphosting_1.doSetup)(projectId, webAppId, location, serviceAccount);
+    await (0, backend_1.doSetup)(projectId, webAppId, location, serviceAccount);
 });

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

@@ -8,7 +8,7 @@ const prompt_1 = require("../prompt");
 const utils = require("../utils");
 const apphosting = require("../gcp/apphosting");
 const apphosting_backends_list_1 = require("./apphosting-backends-list");
-const apphosting_1 = require("../apphosting");
+const backend_1 = require("../apphosting/backend");
 const ora = require("ora");
 exports.command = new command_1.Command("apphosting:backends:delete <backend>")
     .description("delete a Firebase App Hosting backend")
@@ -20,11 +20,11 @@ exports.command = new command_1.Command("apphosting:backends:delete <backend>")
     let location = options.location;
     let backend;
     if (location === "-" || location === "") {
-        backend = await (0, apphosting_1.getBackendForAmbiguousLocation)(projectId, backendId, "Please select the location of the backend you'd like to delete:");
+        backend = await (0, backend_1.getBackendForAmbiguousLocation)(projectId, backendId, "Please select the location of the backend you'd like to delete:");
         location = apphosting.parseBackendName(backend.name).location;
     }
     else {
-        backend = await getBackendForLocation(projectId, location, backendId);
+        backend = await (0, backend_1.getBackendForLocation)(projectId, location, backendId);
     }
     utils.logWarning("You are about to permanently delete this backend:");
     (0, apphosting_backends_list_1.printBackendsTable)([backend]);
@@ -39,7 +39,7 @@ exports.command = new command_1.Command("apphosting:backends:delete <backend>")
     }
     const spinner = ora("Deleting backend...").start();
     try {
-        await (0, apphosting_1.deleteBackendAndPoll)(projectId, location, backendId);
+        await (0, backend_1.deleteBackendAndPoll)(projectId, location, backendId);
         spinner.succeed(`Successfully deleted the backend: ${backendId}`);
     }
     catch (err) {
@@ -47,13 +47,3 @@ exports.command = new command_1.Command("apphosting:backends:delete <backend>")
         throw new error_1.FirebaseError(`Failed to delete backend: ${backendId}.`, { original: err });
     }
 });
-async function getBackendForLocation(projectId, location, backendId) {
-    try {
-        return await apphosting.getBackend(projectId, location, backendId);
-    }
-    catch (err) {
-        throw new error_1.FirebaseError(`No backend named "${backendId}" found in ${location}.`, {
-            original: err,
-        });
-    }
-}

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

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.command = void 0;
+const command_1 = require("../command");
+const projectUtils_1 = require("../projectUtils");
+const requireInteractive_1 = require("../requireInteractive");
+const backend_1 = require("../apphosting/backend");
+const apphosting_1 = require("../gcp/apphosting");
+const firedata_1 = require("../gcp/firedata");
+const requireTosAcceptance_1 = require("../requireTosAcceptance");
+exports.command = new command_1.Command("apphosting:repos:create")
+    .description("create a Firebase App Hosting Developer Connect Git Repository Link")
+    .option("-l, --location <location>", "specify the location of the backend", "")
+    .option("-g, --gitconnection <connection>", "id of the connection", "")
+    .before(apphosting_1.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 location = options.location;
+    const connection = options.gitconnection;
+    await (0, backend_1.createGitRepoLink)(projectId, location, connection);
+});

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

@@ -8,10 +8,9 @@ const error_1 = require("../error");
 const rollout_1 = require("../apphosting/rollout");
 exports.command = new command_1.Command("apphosting:rollouts:create <backendId>")
     .description("create a rollout using a build for an App Hosting backend")
-    .option("-l, --location <location>", "specify the region of the backend", "us-central1")
-    .option("-i, --id <rolloutId>", "id of the rollout (defaults to autogenerating a random id)", "")
-    .option("-gb, --git-branch <gitBranch>", "repository branch to deploy (mutually exclusive with -gc)")
-    .option("-gc, --git-commit <gitCommit>", "git commit to deploy (mutually exclusive with -gb)")
+    .option("-l, --location <location>", "specify the region of the backend", "-")
+    .option("-b, --git-branch <gitBranch>", "repository branch to deploy (mutually exclusive with -g)")
+    .option("-g, --git-commit <gitCommit>", "git commit to deploy (mutually exclusive with -b)")
     .withForce("Skip confirmation before creating rollout")
     .before(apphosting.ensureApiEnabled)
     .action(async (backendId, options) => {

package/lib/commands/apphosting-secrets-grantaccess.js

@@ -9,7 +9,7 @@ const secretManager = require("../gcp/secretManager");
 const requirePermissions_1 = require("../requirePermissions");
 const apphosting = require("../gcp/apphosting");
 const secrets = require("../apphosting/secrets");
-const apphosting_1 = require("../apphosting");
+const backend_1 = require("../apphosting/backend");
 exports.command = new command_1.Command("apphosting:secrets:grantaccess <secretName>")
     .description("grant service accounts permissions to the provided secret")
     .option("-l, --location <location>", "backend location", "-")
@@ -39,7 +39,7 @@ exports.command = new command_1.Command("apphosting:secrets:grantaccess <secretN
     const location = options.location;
     let backend;
     if (location === "" || location === "-") {
-        backend = await (0, apphosting_1.getBackendForAmbiguousLocation)(projectId, backendId, "Please select the location of your backend:");
+        backend = await (0, backend_1.getBackendForAmbiguousLocation)(projectId, backendId, "Please select the location of your backend:");
     }
     else {
         backend = await apphosting.getBackend(projectId, location, backendId);

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

@@ -0,0 +1,111 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.command = void 0;
+const pg = require("pg");
+const clc = require("colorette");
+const cloud_sql_connector_1 = require("@google-cloud/cloud-sql-connector");
+const command_1 = require("../command");
+const projectUtils_1 = require("../projectUtils");
+const ensureApis_1 = require("../dataconnect/ensureApis");
+const requirePermissions_1 = require("../requirePermissions");
+const fileUtils_1 = require("../dataconnect/fileUtils");
+const schemaMigration_1 = require("../dataconnect/schemaMigration");
+const requireAuth_1 = require("../requireAuth");
+const connect_1 = require("../gcp/cloudsql/connect");
+const cloudSqlAdminClient = require("../gcp/cloudsql/cloudsqladmin");
+const prompt_1 = require("../prompt");
+const logger_1 = require("../logger");
+const error_1 = require("../error");
+const fbToolsAuthClient_1 = require("../gcp/cloudsql/fbToolsAuthClient");
+const interactive_1 = require("../gcp/cloudsql/interactive");
+const sqlKeywords = [
+    "SELECT",
+    "FROM",
+    "WHERE",
+    "INSERT",
+    "UPDATE",
+    "DELETE",
+    "JOIN",
+    "GROUP",
+    "ORDER",
+    "LIMIT",
+    "GRANT",
+    "CREATE",
+    "DROP",
+];
+async function promptForQuery() {
+    let query = "";
+    let line = "";
+    do {
+        const question = {
+            type: "input",
+            name: "line",
+            message: query ? "> " : "Enter your SQL query (or '.exit'):",
+            transformer: (input) => {
+                return input
+                    .split(" ")
+                    .map((word) => (sqlKeywords.includes(word.toUpperCase()) ? clc.cyan(word) : word))
+                    .join(" ");
+            },
+        };
+        ({ line } = await (0, prompt_1.prompt)({ nonInteractive: false }, [question]));
+        line = line.trimEnd();
+        if (line.toLowerCase() === ".exit") {
+            return ".exit";
+        }
+        query += (query ? "\n" : "") + line;
+    } while (line !== "" && !query.endsWith(";"));
+    return query;
+}
+async function mainShellLoop(conn) {
+    while (true) {
+        const query = await promptForQuery();
+        if (query.toLowerCase() === ".exit") {
+            break;
+        }
+        if (query === "") {
+            continue;
+        }
+        if (await (0, interactive_1.confirmDangerousQuery)(query)) {
+            await (0, interactive_1.interactiveExecuteQuery)(query, conn);
+        }
+        else {
+            logger_1.logger.info(clc.yellow("Query cancelled."));
+        }
+    }
+}
+exports.command = new command_1.Command("dataconnect:sql:shell [serviceId]")
+    .description("Starts a shell connected directly to your dataconnect cloudsql instance.")
+    .before(requirePermissions_1.requirePermissions, ["firebasedataconnect.services.list", "cloudsql.instances.connect"])
+    .before(requireAuth_1.requireAuth)
+    .action(async (serviceId, options) => {
+    const projectId = (0, projectUtils_1.needProjectId)(options);
+    await (0, ensureApis_1.ensureApis)(projectId);
+    const serviceInfo = await (0, fileUtils_1.pickService)(projectId, options.config, serviceId);
+    const { instanceId, databaseId } = (0, schemaMigration_1.getIdentifiers)(serviceInfo.schema);
+    const { user: username } = await (0, connect_1.getIAMUser)(options);
+    const instance = await cloudSqlAdminClient.getInstance(projectId, instanceId);
+    const connectionName = instance.connectionName;
+    if (!connectionName) {
+        throw new error_1.FirebaseError(`Could not get instance connection string for ${options.instanceId}:${options.databaseId}`);
+    }
+    const connector = new cloud_sql_connector_1.Connector({
+        auth: new fbToolsAuthClient_1.FBToolsAuthClient(),
+    });
+    const clientOpts = await connector.getOptions({
+        instanceConnectionName: connectionName,
+        ipType: cloud_sql_connector_1.IpAddressTypes.PUBLIC,
+        authType: cloud_sql_connector_1.AuthTypes.IAM,
+    });
+    const pool = new pg.Pool(Object.assign(Object.assign({}, clientOpts), { user: username, database: databaseId }));
+    const conn = await pool.connect();
+    logger_1.logger.info(`Logged in as ${username}`);
+    logger_1.logger.info(clc.cyan("Welcome to Data Connect Cloud SQL Shell"));
+    logger_1.logger.info(clc.gray("Type your your SQL query or '.exit' to quit, queries should end with ';' or add empty line to execute."));
+    await mainShellLoop(conn);
+    logger_1.logger.info(clc.yellow("Exiting shell..."));
+    conn.release();
+    await pool.end();
+    connector.close();
+    return { projectId, serviceId };
+});

package/lib/commands/index.js

@@ -173,6 +173,8 @@ function load(client) {
             client.apphosting.builds = {};
             client.apphosting.builds.get = loadCommand("apphosting-builds-get");
             client.apphosting.builds.create = loadCommand("apphosting-builds-create");
+            client.apphosting.repos = {};
+            client.apphosting.repos.create = loadCommand("apphosting-repos-create");
             client.apphosting.rollouts = {};
             client.apphosting.rollouts.create = loadCommand("apphosting-rollouts-create");
             client.apphosting.rollouts.list = loadCommand("apphosting-rollouts-list");
@@ -210,6 +212,7 @@ function load(client) {
     client.dataconnect.sql.diff = loadCommand("dataconnect-sql-diff");
     client.dataconnect.sql.migrate = loadCommand("dataconnect-sql-migrate");
     client.dataconnect.sql.grant = loadCommand("dataconnect-sql-grant");
+    client.dataconnect.sql.shell = loadCommand("dataconnect-sql-shell");
     client.dataconnect.sdk = {};
     client.dataconnect.sdk.generate = loadCommand("dataconnect-sdk-generate");
     client.target = loadCommand("target");

package/lib/commands/init.js

@@ -37,6 +37,12 @@ let choices = [
         name: "Functions: Configure a Cloud Functions directory and its files",
         checked: false,
     },
+    {
+        value: "apphosting",
+        name: "App Hosting: Configure an apphosting.yaml file for App Hosting",
+        checked: false,
+        hidden: false,
+    },
     {
         value: "hosting",
         name: "Hosting: Configure files for Firebase Hosting and (optionally) set up GitHub Action deploys",
@@ -79,12 +85,6 @@ let choices = [
         checked: false,
         hidden: true,
     },
-    {
-        value: "apphosting",
-        name: "App Hosting: Configure an apphosting.yaml file for App Hosting",
-        checked: false,
-        hidden: false,
-    },
 ];
 if ((0, experiments_1.isEnabled)("genkit")) {
     choices = [

package/lib/dataconnect/schemaMigration.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.grantRoleToUserInSchema = exports.migrateSchema = exports.diffSchema = void 0;
+exports.getIdentifiers = exports.grantRoleToUserInSchema = exports.migrateSchema = exports.diffSchema = void 0;
 const clc = require("colorette");
 const sql_formatter_1 = require("sql-formatter");
 const types_1 = require("./types");
@@ -212,6 +212,7 @@ function getIdentifiers(schema) {
         serviceName,
     };
 }
+exports.getIdentifiers = getIdentifiers;
 function suggestedCommand(serviceName, invalidConnectorNames) {
     const serviceId = serviceName.split("/")[5];
     const connectorIds = invalidConnectorNames.map((i) => i.split("/")[7]);