firebase-tools 13.7.1 → 13.7.3

package/lib/apphosting/app.js

@@ -0,0 +1,92 @@
+"use strict";
+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 CREATE_NEW_FIREBASE_WEB_APP = "CREATE_NEW_WEB_APP";
+const CONTINUE_WITHOUT_SELECTING_FIREBASE_WEB_APP = "CONTINUE_WITHOUT_SELECTING_FIREBASE_WEB_APP";
+const webApps = {
+    CREATE_NEW_FIREBASE_WEB_APP,
+    CONTINUE_WITHOUT_SELECTING_FIREBASE_WEB_APP,
+    getOrCreateWebApp,
+    promptFirebaseWebApp,
+};
+async function getOrCreateWebApp(projectId, firebaseWebAppName, backendId) {
+    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}`);
+        }
+        return { name: firebaseWebAppName, id: existingUserProjectWebApps.get(firebaseWebAppName) };
+    }
+    return await 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: firebaseWebAppName, id: existingUserProjectWebApps.get(firebaseWebAppName) };
+}
+async function createFirebaseWebApp(projectId, options) {
+    try {
+        return await (0, apps_1.createWebApp)(projectId, options);
+    }
+    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 });
+        }
+        throw new error_1.FirebaseError("Unable to create a Firebase web app", {
+            original: e instanceof Error ? e : undefined,
+        });
+    }
+}
+function isQuotaError(error) {
+    var _a, _b, _c, _d, _e;
+    const original = error.original;
+    const code = (original === null || original === void 0 ? void 0 : original.status) ||
+        ((_b = (_a = original === null || original === void 0 ? void 0 : original.context) === null || _a === void 0 ? void 0 : _a.response) === null || _b === void 0 ? void 0 : _b.statusCode) ||
+        ((_e = (_d = (_c = original === null || original === void 0 ? void 0 : original.context) === null || _c === void 0 ? void 0 : _c.body) === null || _d === void 0 ? void 0 : _d.error) === null || _e === void 0 ? void 0 : _e.code);
+    return code === 429;
+}
+module.exports = webApps;

package/lib/apphosting/config.js

@@ -1,31 +1,97 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.store = exports.load = exports.yamlPath = void 0;
-const path = require("path");
+exports.maybeAddSecretToYaml = exports.upsertEnv = exports.findEnv = exports.store = exports.load = exports.yamlPath = void 0;
+const path_1 = require("path");
 const fs_1 = require("fs");
-const yaml = require("js-yaml");
+const yaml = require("yaml");
 const fs = require("../fsutils");
+const prompt = require("../prompt");
+const dialogs = require("./secrets/dialogs");
 function yamlPath(cwd) {
     let dir = cwd;
-    while (!fs.fileExistsSync(path.resolve(dir, "apphosting.yaml"))) {
-        if (fs.fileExistsSync(path.resolve(dir, "firebase.json"))) {
+    while (!fs.fileExistsSync((0, path_1.resolve)(dir, "apphosting.yaml"))) {
+        if (fs.fileExistsSync((0, path_1.resolve)(dir, "firebase.json"))) {
             return null;
         }
-        const parent = path.dirname(dir);
+        const parent = (0, path_1.dirname)(dir);
         if (parent === dir) {
             return null;
         }
         dir = parent;
     }
-    return path.resolve(dir, "apphosting.yaml");
+    return (0, path_1.resolve)(dir, "apphosting.yaml");
 }
 exports.yamlPath = yamlPath;
 function load(yamlPath) {
     const raw = fs.readFile(yamlPath);
-    return yaml.load(raw, yaml.DEFAULT_FULL_SCHEMA);
+    return yaml.parseDocument(raw);
 }
 exports.load = load;
-function store(yamlPath, config) {
-    (0, fs_1.writeFileSync)(yamlPath, yaml.dump(config));
+function store(yamlPath, document) {
+    (0, fs_1.writeFileSync)(yamlPath, document.toString());
 }
 exports.store = store;
+function findEnv(document, variable) {
+    if (!document.has("env")) {
+        return undefined;
+    }
+    const envs = document.get("env");
+    for (const env of envs.items) {
+        if (env.get("variable") === variable) {
+            return env.toJSON();
+        }
+    }
+    return undefined;
+}
+exports.findEnv = findEnv;
+function upsertEnv(document, env) {
+    if (!document.has("env")) {
+        document.set("env", document.createNode([env]));
+        return;
+    }
+    const envs = document.get("env");
+    const envYaml = document.createNode(env);
+    for (let i = 0; i < envs.items.length; i++) {
+        if (envs.items[i].get("variable") === env.variable) {
+            envs.set(i, envYaml);
+            return;
+        }
+    }
+    envs.add(envYaml);
+}
+exports.upsertEnv = upsertEnv;
+async function maybeAddSecretToYaml(secretName) {
+    const dynamicDispatch = exports;
+    let path = dynamicDispatch.yamlPath(process.cwd());
+    let projectYaml;
+    if (path) {
+        projectYaml = dynamicDispatch.load(path);
+    }
+    else {
+        projectYaml = new yaml.Document();
+    }
+    if (dynamicDispatch.findEnv(projectYaml, secretName)) {
+        return;
+    }
+    const addToYaml = await prompt.confirm({
+        message: "Would you like to add this secret to apphosting.yaml?",
+        default: true,
+    });
+    if (!addToYaml) {
+        return;
+    }
+    if (!path) {
+        path = await prompt.promptOnce({
+            message: "It looks like you don't have an apphosting.yaml yet. Where would you like to store it?",
+            default: process.cwd(),
+        });
+        path = (0, path_1.join)(path, "apphosting.yaml");
+    }
+    const envName = await dialogs.envVarForSecret(secretName);
+    dynamicDispatch.upsertEnv(projectYaml, {
+        variable: envName,
+        secret: secretName,
+    });
+    dynamicDispatch.store(path, projectYaml);
+}
+exports.maybeAddSecretToYaml = maybeAddSecretToYaml;

package/lib/apphosting/githubConnections.js

@@ -64,7 +64,7 @@ async function linkGitHubRepository(projectId, location) {
     let connection;
     do {
         if (repoCloneUri === ADD_CONN_CHOICE) {
-            existingConns.push(await createFullyInstalledConnection(projectId, location, generateConnectionId(), oauthConn));
+            existingConns.push(await createFullyInstalledConnection(projectId, location, generateConnectionId(), oauthConn, true));
         }
         const selection = await promptCloneUri(projectId, existingConns);
         repoCloneUri = selection.cloneUri;
@@ -81,10 +81,10 @@ async function linkGitHubRepository(projectId, location) {
     return repo;
 }
 exports.linkGitHubRepository = linkGitHubRepository;
-async function createFullyInstalledConnection(projectId, location, connectionId, oauthConn) {
+async function createFullyInstalledConnection(projectId, location, connectionId, oauthConn, withNewInstallation = false) {
     var _a, _b;
     let conn = await createConnection(projectId, location, connectionId, {
-        appInstallationId: (_a = oauthConn.githubConfig) === null || _a === void 0 ? void 0 : _a.appInstallationId,
+        appInstallationId: withNewInstallation ? undefined : (_a = oauthConn.githubConfig) === null || _a === void 0 ? void 0 : _a.appInstallationId,
         authorizerCredential: (_b = oauthConn.githubConfig) === null || _b === void 0 ? void 0 : _b.authorizerCredential,
     });
     while (conn.installationState.stage !== "COMPLETE") {
@@ -135,7 +135,7 @@ async function promptCloneUri(projectId, connections) {
     const cloneUri = await (0, prompt_1.promptOnce)({
         type: "autocomplete",
         name: "cloneUri",
-        message: "Which of the following repositories would you like to deploy?",
+        message: "Which repository would you like to deploy?",
         source: (_, input = "") => {
             return new Promise((resolve) => resolve([
                 new inquirer.Separator(),

package/lib/apphosting/index.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.orchestrateRollout = exports.setDefaultTrafficPolicy = exports.createBackend = exports.doSetup = void 0;
-const clc = require("colorette");
+exports.deleteBackendAndPoll = exports.orchestrateRollout = exports.setDefaultTrafficPolicy = exports.createBackend = exports.doSetup = void 0;
 const repo = require("./repo");
 const poller = require("../operation-poller");
 const apphosting = require("../gcp/apphosting");
@@ -16,6 +15,7 @@ const prompt_1 = require("../prompt");
 const constants_1 = require("./constants");
 const ensureApiEnabled_1 = require("../ensureApiEnabled");
 const deploymentTool = require("../deploymentTool");
+const apps = require("./app");
 const DEFAULT_COMPUTE_SERVICE_ACCOUNT_NAME = "firebase-app-hosting-compute";
 const apphostingPollerOptions = {
     apiOrigin: (0, api_1.apphostingOrigin)(),
@@ -23,7 +23,7 @@ const apphostingPollerOptions = {
     masterTimeout: 25 * 60 * 1000,
     maxBackoff: 10000,
 };
-async function doSetup(projectId, location, serviceAccount, withDevConnect) {
+async function doSetup(projectId, webAppName, location, serviceAccount, withDevConnect) {
     await Promise.all([
         ...(withDevConnect ? [(0, ensureApiEnabled_1.ensure)(projectId, (0, api_1.developerConnectOrigin)(), "apphosting", true)] : []),
         (0, ensureApiEnabled_1.ensure)(projectId, (0, api_1.cloudbuildOrigin)(), "apphosting", true),
@@ -37,15 +37,14 @@ async function doSetup(projectId, location, serviceAccount, withDevConnect) {
             throw new error_1.FirebaseError(`Invalid location ${location}. Valid choices are ${allowedLocations.join(", ")}`);
         }
     }
-    (0, utils_1.logBullet)("First we need a few details to create your backend.");
+    (0, utils_1.logBullet)("First we need a few details to create your backend.\n");
     location =
         location ||
             (await (0, prompt_1.promptOnce)({
                 name: "region",
                 type: "list",
                 default: constants_1.DEFAULT_REGION,
-                message: "Please select a region " +
-                    `(${clc.yellow("info")}: Your region determines where your backend is located):\n`,
+                message: "Select a region to host your backend:\n",
                 choices: allowedLocations.map((loc) => ({ value: loc })),
             }));
     (0, utils_1.logSuccess)(`Region set to ${location}.\n`);
@@ -55,10 +54,23 @@ async function doSetup(projectId, location, serviceAccount, withDevConnect) {
         default: "my-web-app",
         message: "Create a name for your backend [1-30 characters]",
     });
+    const webApp = await apps.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 = withDevConnect
         ? await githubConnections.linkGitHubRepository(projectId, location)
         : await repo.linkGitHubRepository(projectId, location);
-    const backend = await createBackend(projectId, location, backendId, gitRepositoryConnection, serviceAccount);
+    const rootDir = await (0, prompt_1.promptOnce)({
+        name: "rootDir",
+        type: "input",
+        default: "/",
+        message: "Specify your app's root directory relative to your repository",
+    });
+    const backend = await createBackend(projectId, location, backendId, gitRepositoryConnection, serviceAccount, webApp === null || webApp === void 0 ? void 0 : webApp.id, rootDir);
     const branch = await (0, prompt_1.promptOnce)({
         name: "branch",
         type: "input",
@@ -74,7 +86,7 @@ async function doSetup(projectId, location, serviceAccount, withDevConnect) {
     });
     if (!confirmRollout) {
         (0, utils_1.logSuccess)(`Successfully created backend:\n\t${backend.name}`);
-        (0, utils_1.logSuccess)(`Your site will be deployed at:\n\thttps://${backend.uri}`);
+        (0, utils_1.logSuccess)(`Your backend will be deployed at:\n\thttps://${backend.uri}`);
         return;
     }
     await orchestrateRollout(projectId, location, backendId, {
@@ -85,7 +97,7 @@ async function doSetup(projectId, location, serviceAccount, withDevConnect) {
         },
     });
     (0, utils_1.logSuccess)(`Successfully created backend:\n\t${backend.name}`);
-    (0, utils_1.logSuccess)(`Your site is now deployed at:\n\thttps://${backend.uri}`);
+    (0, utils_1.logSuccess)(`Your backend is now deployed at:\n\thttps://${backend.uri}`);
 }
 exports.doSetup = doSetup;
 async function promptNewBackendId(projectId, location, prompt) {
@@ -106,16 +118,17 @@ async function promptNewBackendId(projectId, location, prompt) {
 function defaultComputeServiceAccountEmail(projectId) {
     return `${DEFAULT_COMPUTE_SERVICE_ACCOUNT_NAME}@${projectId}.iam.gserviceaccount.com`;
 }
-async function createBackend(projectId, location, backendId, repository, serviceAccount) {
+async function createBackend(projectId, location, backendId, repository, serviceAccount, webAppId, rootDir = "/") {
     const defaultServiceAccount = defaultComputeServiceAccountEmail(projectId);
     const backendReqBody = {
         servingLocality: "GLOBAL_ACCESS",
         codebase: {
             repository: `${repository.name}`,
-            rootDirectory: "/",
+            rootDirectory: rootDir,
         },
         labels: deploymentTool.labels(),
         serviceAccount: serviceAccount || defaultServiceAccount,
+        appId: webAppId,
     };
     delete backendReqBody.serviceAccount;
     async function createBackendAndPoll() {
@@ -215,3 +228,8 @@ async function orchestrateRollout(projectId, location, backendId, buildInput) {
     return { rollout, build };
 }
 exports.orchestrateRollout = orchestrateRollout;
+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;

package/lib/apphosting/repo.js

@@ -132,7 +132,7 @@ async function promptRepositoryUri(projectId, connections) {
     const remoteUri = await (0, prompt_1.promptOnce)({
         type: "autocomplete",
         name: "remoteUri",
-        message: "Which of the following repositories would you like to deploy?",
+        message: "Which repository would you like to deploy?",
         source: (_, input = "") => {
             return new Promise((resolve) => resolve([
                 new inquirer.Separator(),

package/lib/apphosting/secrets/dialogs.js

@@ -65,42 +65,43 @@ function selectFromMetadata(input, selected) {
     };
 }
 exports.selectFromMetadata = selectFromMetadata;
-exports.WARN_NO_BACKENDS = "To use this secret, your backend's service account must have secret accessor permission. " +
+exports.WARN_NO_BACKENDS = "To use this secret, your backend's service account must be granted access." +
     "It does not look like you have a backend yet. After creating a backend, grant access with " +
-    clc.bold("firebase apphosting:secrets:grantAccess");
+    clc.bold("firebase apphosting:secrets:grantaccess");
 exports.GRANT_ACCESS_IN_FUTURE = `To grant access in the future, run ${clc.bold("firebase apphosting:secrets:grantaccess")}`;
 async function selectBackendServiceAccounts(projectNumber, projectId, options) {
     const listBackends = await apphosting.listBackends(projectId, "-");
     if (listBackends.unreachable.length) {
-        utils.logLabeledWarning("apphosting", `Could not reach location(s) ${listBackends.unreachable.join(", ")}. You may need to run ` +
-            `${clc.bold("firebase apphosting:secrets:grantAccess")} at a later time if you have backends in these locations`);
+        utils.logWarning(`Could not reach location(s) ${listBackends.unreachable.join(", ")}. You may need to run ` +
+            `${clc.bold("firebase apphosting:secrets:grantaccess")} at a later time if you have backends in these locations`);
     }
     if (!listBackends.backends.length) {
-        utils.logLabeledWarning("apphosting", exports.WARN_NO_BACKENDS);
+        utils.logWarning(exports.WARN_NO_BACKENDS);
         return { buildServiceAccounts: [], runServiceAccounts: [] };
     }
     if (listBackends.backends.length === 1) {
         const grant = await prompt.confirm({
             nonInteractive: options.nonInteractive,
             default: true,
-            message: "To use this secret, your backend's service account must have secret accessor permission. Would you like to grant it now?",
+            message: "To use this secret, your backend's service account must be granted access. Would you like to grant access now?",
         });
         if (grant) {
             return (0, _1.toMulti)((0, _1.serviceAccountsForBackend)(projectNumber, listBackends.backends[0]));
         }
-        utils.logLabeledBullet("apphosting", exports.GRANT_ACCESS_IN_FUTURE);
+        utils.logBullet(exports.GRANT_ACCESS_IN_FUTURE);
         return { buildServiceAccounts: [], runServiceAccounts: [] };
     }
     const metadata = toMetadata(projectNumber, listBackends.backends);
     if (metadata.every(matchesServiceAccounts(metadata[0]))) {
-        utils.logLabeledBullet("apphosting", "To use this secret, your backend's service account must have secret accessor permission. All of your backends use " +
-            (sameServiceAccount(metadata[0]) ? "service account " : "service accounts ") +
+        utils.logBullet("To use this secret, your backend's service account must be granted access.");
+        utils.logBullet("All of your backends share the following " +
+            (sameServiceAccount(metadata[0]) ? "service account: " : "service accounts: ") +
             serviceAccountDisplay(metadata[0]) +
-            ". Granting access to one backend will grant access to all backends.");
+            ".\nGranting access to one backend will grant access to all backends.");
         const grant = await prompt.confirm({
             nonInteractive: options.nonInteractive,
             default: true,
-            message: "Would you like to grant it now?",
+            message: "Would you like to grant access to all backends now?",
         });
         if (grant) {
             return selectFromMetadata(metadata, [
@@ -108,10 +109,10 @@ async function selectBackendServiceAccounts(projectNumber, projectId, options) {
                 metadata[0].runServiceAccount,
             ]);
         }
-        utils.logLabeledBullet("apphosting", exports.GRANT_ACCESS_IN_FUTURE);
+        utils.logBullet(exports.GRANT_ACCESS_IN_FUTURE);
         return { buildServiceAccounts: [], runServiceAccounts: [] };
     }
-    utils.logLabeledBullet("apphosting", "To use this secret, your backend's service account must have secret accessor permission. Your backends use the following service accounts:");
+    utils.logBullet("To use this secret, your backend's service account must be granted access. Your backends use the following service accounts:");
     const tableData = tableForBackends(metadata);
     const table = new Table({
         head: tableData[0],
@@ -131,7 +132,7 @@ async function selectBackendServiceAccounts(projectNumber, projectId, options) {
         choices: [...allAccounts.values()].sort(),
     });
     if (!chosen.length) {
-        utils.logLabeledBullet("apphosting", exports.GRANT_ACCESS_IN_FUTURE);
+        utils.logBullet(exports.GRANT_ACCESS_IN_FUTURE);
     }
     return selectFromMetadata(metadata, chosen);
 }

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

@@ -7,7 +7,8 @@ const requireInteractive_1 = require("../requireInteractive");
 const apphosting_1 = require("../apphosting");
 const apphosting_2 = require("../gcp/apphosting");
 exports.command = new command_1.Command("apphosting:backends:create")
-    .description("create a backend in a Firebase project")
+    .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("-l, --location <location>", "specify the region of the backend", "")
     .option("-s, --service-account <serviceAccount>", "specify the service account used to run the server", "")
     .option("-w, --with-dev-connect", "use the Developer Connect flow insetad of Cloud Build Repositories (testing)", false)
@@ -15,8 +16,9 @@ exports.command = new command_1.Command("apphosting:backends:create")
     .before(requireInteractive_1.default)
     .action(async (options) => {
     const projectId = (0, projectUtils_1.needProjectId)(options);
+    const webApp = options.app;
     const location = options.location;
     const serviceAccount = options.serviceAccount;
     const withDevConnect = options.withDevConnect;
-    await (0, apphosting_1.doSetup)(projectId, location, serviceAccount, withDevConnect);
+    await (0, apphosting_1.doSetup)(projectId, webApp, location, serviceAccount, withDevConnect);
 });

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

@@ -9,9 +9,10 @@ const constants_1 = require("../apphosting/constants");
 const utils = require("../utils");
 const apphosting = require("../gcp/apphosting");
 const apphosting_backends_list_1 = require("./apphosting-backends-list");
+const apphosting_1 = require("../apphosting");
 exports.command = new command_1.Command("apphosting:backends:delete <backend>")
-    .description("delete a backend from a Firebase project")
-    .option("-l, --location <location>", "App Backend location", "")
+    .description("delete a Firebase App Hosting backend")
+    .option("-l, --location <location>", "specify the region of the backend", "")
     .withForce()
     .before(apphosting.ensureApiEnabled)
     .action(async (backendId, options) => {
@@ -52,7 +53,7 @@ exports.command = new command_1.Command("apphosting:backends:delete <backend>")
         throw new error_1.FirebaseError("Deletion Aborted");
     }
     try {
-        await apphosting.deleteBackend(projectId, location, backendId);
+        await (0, apphosting_1.deleteBackendAndPoll)(projectId, location, backendId);
         utils.logSuccess(`Successfully deleted the backend: ${backendId}`);
     }
     catch (err) {

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

@@ -7,30 +7,30 @@ const error_1 = require("../error");
 const utils_1 = require("../utils");
 const apphosting = require("../gcp/apphosting");
 const apphosting_backends_list_1 = require("./apphosting-backends-list");
-exports.command = new command_1.Command("apphosting:backends:get <backendId>")
-    .description("get backend details of a Firebase project")
-    .option("-l, --location <location>", "app backend location", "-")
+exports.command = new command_1.Command("apphosting:backends:get <backend>")
+    .description("print info about a Firebase App Hosting backend")
+    .option("-l, --location <location>", "backend location", "-")
     .before(apphosting.ensureApiEnabled)
-    .action(async (backendId, options) => {
+    .action(async (backend, options) => {
     const projectId = (0, projectUtils_1.needProjectId)(options);
     const location = options.location;
     let backendsList = [];
     try {
         if (location !== "-") {
-            const backendInRegion = await apphosting.getBackend(projectId, location, backendId);
+            const backendInRegion = await apphosting.getBackend(projectId, location, backend);
             backendsList.push(backendInRegion);
         }
         else {
             const resp = await apphosting.listBackends(projectId, "-");
             const allBackends = resp.backends || [];
-            backendsList = allBackends.filter((bkd) => bkd.name.split("/").pop() === backendId);
+            backendsList = allBackends.filter((bkd) => bkd.name.split("/").pop() === backend);
         }
     }
     catch (err) {
-        throw new error_1.FirebaseError(`Failed to get backend: ${backendId}. Please check the parameters you have provided.`, { original: err });
+        throw new error_1.FirebaseError(`Failed to get backend: ${backend}. Please check the parameters you have provided.`, { original: err });
     }
     if (backendsList.length === 0) {
-        (0, utils_1.logWarning)(`Found no backend with id: ${backendId}`);
+        (0, utils_1.logWarning)(`Backend "${backend}" not found`);
         return;
     }
     (0, apphosting_backends_list_1.printBackendsTable)(backendsList);

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

@@ -10,8 +10,8 @@ const apphosting = require("../gcp/apphosting");
 const Table = require("cli-table");
 const TABLE_HEAD = ["Backend ID", "Repository", "Location", "URL", "Created Date", "Updated Date"];
 exports.command = new command_1.Command("apphosting:backends:list")
-    .description("list backends of a Firebase project")
-    .option("-l, --location <location>", "app Backend location", "-")
+    .description("list Firebase App Hosting backends")
+    .option("-l, --location <location>", "list backends in the specified location", "-")
     .before(apphosting.ensureApiEnabled)
     .action(async (options) => {
     var _a;

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

@@ -11,8 +11,8 @@ const apphosting = require("../gcp/apphosting");
 const secrets = require("../apphosting/secrets");
 exports.command = new command_1.Command("apphosting:secrets:grantaccess <secretName>")
     .description("grant service accounts permissions to the provided secret")
-    .option("-l, --location <location>", "app backend location")
-    .option("-b, --backend <backend>", "app backend name")
+    .option("-l, --location <location>", "backend location")
+    .option("-b, --backend <backend>", "backend name")
     .before(requireAuth_1.requireAuth)
     .before(secretManager.ensureApi)
     .before(apphosting.ensureApiEnabled)

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

@@ -1,23 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
-const tty = require("tty");
 const clc = require("colorette");
-const path_1 = require("path");
 const command_1 = require("../command");
 const projectUtils_1 = require("../projectUtils");
 const requireAuth_1 = require("../requireAuth");
-const fs = require("fs");
 const gcsm = require("../gcp/secretManager");
 const apphosting = require("../gcp/apphosting");
 const requirePermissions_1 = require("../requirePermissions");
-const prompt_1 = require("../prompt");
 const secrets = require("../apphosting/secrets");
 const dialogs = require("../apphosting/secrets/dialogs");
 const config = require("../apphosting/config");
-const utils_1 = require("../utils");
+const utils = require("../utils");
 exports.command = new command_1.Command("apphosting:secrets:set <secretName>")
-    .description("grant service accounts permissions to the provided secret")
+    .description("create or update a secret for use in Firebase App Hosting")
     .option("-l, --location <location>", "optional location to retrict secret replication")
     .withForce("Automatically create a secret, grant permissions, and add to YAML.")
     .before(requireAuth_1.requireAuth)
@@ -33,73 +29,28 @@ exports.command = new command_1.Command("apphosting:secrets:set <secretName>")
 ])
     .option("--data-file <dataFile>", 'File path from which to read secret data. Set to "-" to read the secret data from stdin.')
     .action(async (secretName, options) => {
-    var _a;
-    const howToAccess = `You can access the contents of the secret's latest value with ${clc.bold(`firebase apphosting:secrets:access ${secretName}`)}`;
-    const grantAccess = `To use this secret in your backend, you must grant access. You can do so in the future with ${clc.bold("firebase apphosting:secrets:grantAccess")}`;
     const projectId = (0, projectUtils_1.needProjectId)(options);
     const projectNumber = await (0, projectUtils_1.needProjectNumber)(options);
     const created = await secrets.upsertSecret(projectId, secretName, options.location);
     if (created === null) {
         return;
     }
-    let secretValue;
-    if ((!options.dataFile || options.dataFile === "-") && tty.isatty(0)) {
-        secretValue = await (0, prompt_1.promptOnce)({
-            type: "password",
-            message: `Enter a value for ${secretName}`,
-        });
-    }
-    else {
-        let dataFile = 0;
-        if (options.dataFile && options.dataFile !== "-") {
-            dataFile = options.dataFile;
-        }
-        secretValue = fs.readFileSync(dataFile, "utf-8");
-    }
-    if (created) {
-        (0, utils_1.logSuccess)(`Created new secret projects/${projectId}/secrets/${secretName}`);
+    else if (created) {
+        utils.logSuccess(`Created new secret projects/${projectId}/secrets/${secretName}`);
     }
+    const secretValue = await utils.readSecretValue(`Enter a value for ${secretName}`, options.dataFile);
     const version = await gcsm.addVersion(projectId, secretName, secretValue);
-    (0, utils_1.logSuccess)(`Created new secret version ${gcsm.toSecretVersionResourceName(version)}`);
-    (0, utils_1.logSuccess)(howToAccess);
+    utils.logSuccess(`Created new secret version ${gcsm.toSecretVersionResourceName(version)}`);
+    utils.logBullet(`You can access the contents of the secret's latest value with ${clc.bold(`firebase apphosting:secrets:access ${secretName}\n`)}`);
     if (!created) {
-        (0, utils_1.logWarning)(grantAccess);
         return;
     }
     const accounts = await dialogs.selectBackendServiceAccounts(projectNumber, projectId, options);
     if (!accounts.buildServiceAccounts.length && !accounts.runServiceAccounts.length) {
-        (0, utils_1.logWarning)(grantAccess);
+        utils.logWarning(`To use this secret in your backend, you must grant access. You can do so in the future with ${clc.bold("firebase apphosting:secrets:grantaccess")}`);
     }
     else {
         await secrets.grantSecretAccess(projectId, secretName, accounts);
     }
-    let path = config.yamlPath(process.cwd());
-    let yaml = {};
-    if (path) {
-        yaml = config.load(path);
-        if ((_a = yaml.env) === null || _a === void 0 ? void 0 : _a.find((env) => env.variable === secretName)) {
-            return;
-        }
-    }
-    const addToYaml = await (0, prompt_1.confirm)({
-        message: "Would you like to add this secret to apphosting.yaml?",
-        default: true,
-    });
-    if (!addToYaml) {
-        return;
-    }
-    if (!path) {
-        path = await (0, prompt_1.promptOnce)({
-            message: "It looks like you don't have an apphosting.yaml yet. Where would you like to store it?",
-            default: process.cwd(),
-        });
-        path = (0, path_1.join)(path, "apphosting.yaml");
-    }
-    const envName = await dialogs.envVarForSecret(secretName);
-    yaml.env = yaml.env || [];
-    yaml.env.push({
-        variable: envName,
-        secret: secretName,
-    });
-    config.store(path, yaml);
+    await config.maybeAddSecretToYaml(secretName);
 });