firebase-tools 13.7.5 → 13.8.1

package/lib/api.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.serviceUsageOrigin = exports.cloudRunApiOrigin = exports.hostingApiOrigin = exports.firebaseStorageOrigin = exports.storageOrigin = exports.runtimeconfigOrigin = exports.rulesOrigin = exports.resourceManagerOrigin = exports.remoteConfigApiOrigin = exports.rtdbMetadataOrigin = exports.rtdbManagementOrigin = exports.realtimeOrigin = exports.extensionsTOSOrigin = exports.extensionsPublisherOrigin = exports.extensionsOrigin = exports.iamOrigin = exports.identityOrigin = exports.hostingOrigin = exports.googleOrigin = exports.pubsubOrigin = exports.cloudTasksOrigin = exports.cloudschedulerOrigin = exports.cloudbuildOrigin = exports.functionsDefaultRegion = exports.runOrigin = exports.functionsV2Origin = exports.functionsOrigin = exports.firestoreOrigin = exports.firestoreOriginOrEmulator = exports.firedataOrigin = exports.firebaseExtensionsRegistryOrigin = exports.firebaseApiOrigin = exports.eventarcOrigin = exports.dynamicLinksKey = exports.dynamicLinksOrigin = exports.consoleOrigin = exports.authOrigin = exports.apphostingP4SADomain = exports.apphostingOrigin = exports.appDistributionOrigin = exports.artifactRegistryDomain = exports.developerConnectP4SADomain = exports.developerConnectOrigin = exports.containerRegistryDomain = exports.cloudMonitoringOrigin = exports.cloudloggingOrigin = exports.cloudbillingOrigin = exports.clientSecret = exports.clientId = exports.authProxyOrigin = void 0;
-exports.setScopes = exports.getScopes = exports.githubClientSecret = exports.githubClientId = exports.computeOrigin = exports.secretManagerOrigin = exports.githubApiOrigin = exports.githubOrigin = void 0;
+exports.setScopes = exports.getScopes = exports.vertexAIOrigin = exports.cloudSQLAdminOrigin = exports.dataConnectLocalConnString = exports.dataconnectOrigin = exports.githubClientSecret = exports.githubClientId = exports.computeOrigin = exports.secretManagerOrigin = exports.githubApiOrigin = exports.githubOrigin = void 0;
 const constants_1 = require("./emulator/constants");
 const logger_1 = require("./logger");
 const scopes = require("./scopes");
@@ -124,6 +124,14 @@ const githubClientId = () => utils.envOverride("GITHUB_CLIENT_ID", "89cf50f02ac6
 exports.githubClientId = githubClientId;
 const githubClientSecret = () => utils.envOverride("GITHUB_CLIENT_SECRET", "3330d14abc895d9a74d5f17cd7a00711fa2c5bf0");
 exports.githubClientSecret = githubClientSecret;
+const dataconnectOrigin = () => utils.envOverride("FIREBASE_DATACONNECT_URL", "https://firebasedataconnect.googleapis.com");
+exports.dataconnectOrigin = dataconnectOrigin;
+const dataConnectLocalConnString = () => utils.envOverride("FIREBASE_DATACONNECT_POSTGRESQL_STRING", "");
+exports.dataConnectLocalConnString = dataConnectLocalConnString;
+const cloudSQLAdminOrigin = () => utils.envOverride("CLOUD_SQL_URL", "https://sqladmin.googleapis.com");
+exports.cloudSQLAdminOrigin = cloudSQLAdminOrigin;
+const vertexAIOrigin = () => utils.envOverride("VERTEX_AI_URL", "https://aiplatform.googleapis.com");
+exports.vertexAIOrigin = vertexAIOrigin;
 function getScopes() {
     return Array.from(commandScopes);
 }

package/lib/apiv2.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Client = exports.setAccessToken = exports.setRefreshToken = void 0;
+exports.Client = exports.getAccessToken = exports.setAccessToken = exports.setRefreshToken = exports.STANDARD_HEADERS = void 0;
 const url_1 = require("url");
 const stream_1 = require("stream");
 const proxy_agent_1 = require("proxy-agent");
@@ -15,6 +15,11 @@ const responseToError_1 = require("./responseToError");
 const FormData = require("form-data");
 const pkg = require("../package.json");
 const CLI_VERSION = pkg.version;
+exports.STANDARD_HEADERS = {
+    Connection: "keep-alive",
+    "User-Agent": `FirebaseCLI/${CLI_VERSION}`,
+    "X-Client-Version": `FirebaseCLI/${CLI_VERSION}`,
+};
 const GOOG_QUOTA_USER_HEADER = "x-goog-quota-user";
 const GOOG_USER_PROJECT_HEADER = "x-goog-user-project";
 const GOOGLE_CLOUD_QUOTA_PROJECT = process.env.GOOGLE_CLOUD_QUOTA_PROJECT;
@@ -28,6 +33,14 @@ function setAccessToken(token = "") {
     accessToken = token;
 }
 exports.setAccessToken = setAccessToken;
+async function getAccessToken() {
+    if (accessToken) {
+        return accessToken;
+    }
+    const data = await auth.getAccessToken(refreshToken, []);
+    return data.access_token;
+}
+exports.getAccessToken = getAccessToken;
 function proxyURIFromEnv() {
     return (process.env.HTTPS_PROXY ||
         process.env.https_proxy ||
@@ -125,11 +138,11 @@ class Client {
         if (!reqOptions.headers) {
             reqOptions.headers = new node_fetch_1.Headers();
         }
-        reqOptions.headers.set("Connection", "keep-alive");
-        if (!reqOptions.headers.has("User-Agent")) {
-            reqOptions.headers.set("User-Agent", `FirebaseCLI/${CLI_VERSION}`);
+        for (const [h, v] of Object.entries(exports.STANDARD_HEADERS)) {
+            if (!reqOptions.headers.has(h)) {
+                reqOptions.headers.set(h, v);
+            }
         }
-        reqOptions.headers.set("X-Client-Version", `FirebaseCLI/${CLI_VERSION}`);
         if (!reqOptions.headers.has("Content-Type")) {
             if (reqOptions.responseType === "json") {
                 reqOptions.headers.set("Content-Type", "application/json");
@@ -151,18 +164,11 @@ class Client {
             token = "owner";
         }
         else {
-            token = await this.getAccessToken();
+            token = await getAccessToken();
         }
         reqOptions.headers.set("Authorization", `Bearer ${token}`);
         return reqOptions;
     }
-    async getAccessToken() {
-        if (accessToken) {
-            return accessToken;
-        }
-        const data = await auth.getAccessToken(refreshToken, []);
-        return data.access_token;
-    }
     requestURL(options) {
         const versionPath = this.opts.apiVersion ? `/${this.opts.apiVersion}` : "";
         return `${this.opts.urlPrefix}${versionPath}${options.path}`;

package/lib/apphosting/app.js

@@ -1,86 +1,67 @@
 "use strict";
-const fuzzy = require("fuzzy");
-const inquirer = require("inquirer");
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.webApps = void 0;
 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";
-const webApps = {
+exports.webApps = {
     CREATE_NEW_FIREBASE_WEB_APP,
     CONTINUE_WITHOUT_SELECTING_FIREBASE_WEB_APP,
     getOrCreateWebApp,
-    promptFirebaseWebApp,
+    generateWebAppName,
 };
 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,
-        ];
-    }));
+    const existingUserProjectWebApps = firebaseAppsToMap(webAppsInProject);
     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),
+        };
     }
-    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 });
+        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;
@@ -89,4 +70,3 @@ function isQuotaError(error) {
         ((_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/githubConnections.js

@@ -77,7 +77,7 @@ async function linkGitHubRepository(projectId, location) {
     });
     const repo = await getOrCreateRepository(projectId, location, connectionId, repoCloneUri);
     utils.logSuccess(`Successfully linked GitHub repository at remote URI`);
-    utils.logSuccess(`\t${repo.cloneUri}`);
+    utils.logSuccess(`\t${repo.cloneUri}\n`);
     return repo;
 }
 exports.linkGitHubRepository = linkGitHubRepository;

package/lib/apphosting/index.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.promptLocation = exports.deleteBackendAndPoll = exports.orchestrateRollout = exports.setDefaultTrafficPolicy = exports.createBackend = exports.ensureAppHostingComputeServiceAccount = exports.doSetup = void 0;
-const repo = require("./repo");
+exports.getBackendForAmbiguousLocation = exports.promptLocation = exports.deleteBackendAndPoll = exports.orchestrateRollout = exports.setDefaultTrafficPolicy = exports.createBackend = exports.ensureAppHostingComputeServiceAccount = exports.doSetup = void 0;
 const poller = require("../operation-poller");
 const apphosting = require("../gcp/apphosting");
 const githubConnections = require("./githubConnections");
@@ -15,7 +14,9 @@ const prompt_1 = require("../prompt");
 const constants_1 = require("./constants");
 const ensureApiEnabled_1 = require("../ensureApiEnabled");
 const deploymentTool = require("../deploymentTool");
-const apps = require("./app");
+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)(),
@@ -23,9 +24,32 @@ const apphostingPollerOptions = {
     masterTimeout: 25 * 60 * 1000,
     maxBackoff: 10000,
 };
-async function doSetup(projectId, webAppName, location, serviceAccount, withDevConnect) {
+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([
-        ...(withDevConnect ? [(0, ensureApiEnabled_1.ensure)(projectId, (0, api_1.developerConnectOrigin)(), "apphosting", true)] : []),
+        (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),
@@ -49,23 +73,23 @@ async function doSetup(projectId, webAppName, location, serviceAccount, withDevC
         default: "my-web-app",
         message: "Create a name for your backend [1-30 characters]",
     });
-    const webApp = await apps.getOrCreateWebApp(projectId, webAppName, backendId);
+    const webApp = await app_1.webApps.getOrCreateWebApp(projectId, webAppName, backendId);
     if (webApp) {
-        (0, utils_1.logSuccess)(`Firebase web app set to ${webApp.name}.\n`);
+        (0, utils_1.logSuccess)(`Created a new Firebase web app named "${webApp.name}"`);
     }
     else {
         (0, utils_1.logWarning)(`Firebase web app not set`);
     }
-    const gitRepositoryConnection = withDevConnect
-        ? await githubConnections.linkGitHubRepository(projectId, location)
-        : await repo.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",
@@ -80,10 +104,12 @@ async function doSetup(projectId, webAppName, location, serviceAccount, withDevC
         message: "Do you want to deploy now?",
     });
     if (!confirmRollout) {
-        (0, utils_1.logSuccess)(`Successfully created backend:\n\t${backend.name}`);
         (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 orchestrateRollout(projectId, location, backendId, {
         source: {
             codebase: {
@@ -91,7 +117,12 @@ async function doSetup(projectId, webAppName, location, serviceAccount, withDevC
             },
         },
     });
-    (0, utils_1.logSuccess)(`Successfully created backend:\n\t${backend.name}`);
+    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;
@@ -163,7 +194,7 @@ async function provisionDefaultComputeServiceAccount(projectId) {
     await (0, resourceManager_1.addServiceAccountToRoles)(projectId, defaultComputeServiceAccountEmail(projectId), [
         "roles/firebaseapphosting.computeRunner",
         "roles/firebase.sdkAdminServiceAgent",
-        "roles/developerconnect.tokenAccessor",
+        "roles/developerconnect.readTokenAccessor",
     ], true);
 }
 async function setDefaultTrafficPolicy(projectId, location, backendId, codebaseBranch) {
@@ -182,12 +213,7 @@ async function setDefaultTrafficPolicy(projectId, location, backendId, codebaseB
     await poller.pollOperation(Object.assign(Object.assign({}, apphostingPollerOptions), { pollerName: `updateTraffic-${projectId}-${location}-${backendId}`, operationResourceName: op.name }));
 }
 exports.setDefaultTrafficPolicy = setDefaultTrafficPolicy;
-function delay(ms) {
-    return new Promise((resolve) => setTimeout(resolve, ms));
-}
 async function orchestrateRollout(projectId, location, backendId, buildInput) {
-    (0, utils_1.logBullet)("Starting a new rollout... this may take a few minutes.");
-    await delay(45 * 1000);
     const buildId = await apphosting.getNextRolloutId(projectId, location, backendId, 1);
     const buildOp = await apphosting.createBuild(projectId, location, backendId, buildId, buildInput);
     const rolloutBody = {
@@ -207,7 +233,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;
@@ -218,7 +244,6 @@ async function orchestrateRollout(projectId, location, backendId, buildInput) {
     const rolloutPoll = poller.pollOperation(Object.assign(Object.assign({}, apphostingPollerOptions), { pollerName: `create-${projectId}-${location}-backend-${backendId}-rollout-${buildId}`, operationResourceName: rolloutOp.name }));
     const buildPoll = poller.pollOperation(Object.assign(Object.assign({}, apphostingPollerOptions), { pollerName: `create-${projectId}-${location}-backend-${backendId}-build-${buildId}`, operationResourceName: buildOp.name }));
     const [rollout, build] = await Promise.all([rolloutPoll, buildPoll]);
-    (0, utils_1.logSuccess)("Rollout completed.");
     if (build.state !== "READY") {
         if (!build.buildLogsUri) {
             throw new error_1.FirebaseError("Failed to build your app, but failed to get build logs as well. " +
@@ -236,6 +261,9 @@ async function deleteBackendAndPoll(projectId, location, backendId) {
 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];
+    }
     return (await (0, prompt_1.promptOnce)({
         name: "location",
         type: "list",
@@ -245,3 +273,27 @@ async function promptLocation(projectId, prompt = "Please select a 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;

package/lib/checkValidTargetFilters.js

@@ -19,7 +19,14 @@ function targetsHaveFilters(...targets) {
 function targetsHaveNoFilters(...targets) {
     return targets.some((t) => !t.includes(":"));
 }
-const FILTERABLE_TARGETS = new Set(["hosting", "functions", "firestore", "storage", "database"]);
+const FILTERABLE_TARGETS = new Set([
+    "hosting",
+    "functions",
+    "firestore",
+    "storage",
+    "database",
+    "dataconnect",
+]);
 async function checkValidTargetFilters(options) {
     const only = !options.only ? [] : options.only.split(",");
     return new Promise((resolve, reject) => {

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("-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-dev-connect", "use the Developer Connect flow instead of Cloud Build Repositories (testing)", true)
     .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 location = options.location;
     const serviceAccount = options.serviceAccount;
-    const withDevConnect = options.withDevConnect;
-    await (0, apphosting_1.doSetup)(projectId, webApp, location, serviceAccount, withDevConnect);
+    await (0, apphosting_1.doSetup)(projectId, webApp, location, serviceAccount);
 });

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

@@ -9,29 +9,25 @@ const utils = require("../utils");
 const apphosting = require("../gcp/apphosting");
 const apphosting_backends_list_1 = require("./apphosting-backends-list");
 const apphosting_1 = require("../apphosting");
+const ora = require("ora");
 exports.command = new command_1.Command("apphosting:backends:delete <backend>")
     .description("delete a Firebase App Hosting backend")
-    .option("-l, --location <location>", "specify the location of the backend", "")
+    .option("-l, --location <location>", "specify the location of the backend", "-")
     .withForce()
     .before(apphosting.ensureApiEnabled)
     .action(async (backendId, options) => {
     const projectId = (0, projectUtils_1.needProjectId)(options);
     let location = options.location;
-    location =
-        location ||
-            (await (0, apphosting_1.promptLocation)(projectId, "Please select the location of the backend you'd like to delete:"));
     let backend;
-    try {
-        backend = await apphosting.getBackend(projectId, location, backendId);
+    if (location === "-" || location === "") {
+        backend = await (0, apphosting_1.getBackendForAmbiguousLocation)(projectId, backendId, "Please select the location of the backend you'd like to delete:");
+        location = apphosting.parseBackendName(backend.name).location;
     }
-    catch (err) {
-        throw new error_1.FirebaseError(`No backends found with given parameters. Command aborted.`, {
-            original: err,
-        });
+    else {
+        backend = await getBackendForLocation(projectId, location, backendId);
     }
-    utils.logWarning("You are about to permanently delete the backend:");
-    const backends = [backend];
-    (0, apphosting_backends_list_1.printBackendsTable)(backends);
+    utils.logWarning("You are about to permanently delete this backend:");
+    (0, apphosting_backends_list_1.printBackendsTable)([backend]);
     const confirmDeletion = await (0, prompt_1.promptOnce)({
         type: "confirm",
         name: "force",
@@ -39,14 +35,25 @@ exports.command = new command_1.Command("apphosting:backends:delete <backend>")
         message: "Are you sure?",
     }, options);
     if (!confirmDeletion) {
-        throw new error_1.FirebaseError("Deletion Aborted");
+        return;
     }
+    const spinner = ora("Deleting backend...").start();
     try {
         await (0, apphosting_1.deleteBackendAndPoll)(projectId, location, backendId);
-        utils.logSuccess(`Successfully deleted the backend: ${backendId}`);
+        spinner.succeed(`Successfully deleted the backend: ${backendId}`);
     }
     catch (err) {
-        throw new error_1.FirebaseError(`Failed to delete backend: ${backendId}. Please check the parameters you have provided.`, { original: err });
+        spinner.stop();
+        throw new error_1.FirebaseError(`Failed to delete backend: ${backendId}.`, { original: err });
     }
-    return backend;
 });
+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-backends-list.js

@@ -35,12 +35,12 @@ function printBackendsTable(backends) {
         style: { head: ["green"] },
     });
     for (const backend of backends) {
-        const [backendLocation, , backendId] = backend.name.split("/").slice(3, 6);
+        const { location, id } = apphosting.parseBackendName(backend.name);
         table.push([
-            backendId,
+            id,
             (_c = (_b = (_a = backend.codebase) === null || _a === void 0 ? void 0 : _a.repository) === null || _b === void 0 ? void 0 : _b.split("/").pop()) !== null && _c !== void 0 ? _c : "",
             backend.uri.startsWith("https:") ? backend.uri : "https://" + backend.uri,
-            backendLocation,
+            location,
             (0, utils_1.datetimeString)(new Date(backend.updateTime)),
         ]);
     }

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

@@ -12,7 +12,7 @@ const secrets = require("../apphosting/secrets");
 const apphosting_1 = require("../apphosting");
 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")
+    .option("-l, --location <location>", "backend location", "-")
     .option("-b, --backend <backend>", "backend name")
     .before(requireAuth_1.requireAuth)
     .before(secretManager.ensureApi)
@@ -31,15 +31,19 @@ exports.command = new command_1.Command("apphosting:secrets:grantaccess <secretN
     if (!options.backend) {
         throw new error_1.FirebaseError("Missing required flag --backend. See firebase apphosting:secrets:grantaccess --help for more info");
     }
-    let location = options.location;
-    location =
-        location || (await (0, apphosting_1.promptLocation)(projectId, "Please select the location of your backend"));
     const exists = await secretManager.secretExists(projectId, secretName);
     if (!exists) {
         throw new error_1.FirebaseError(`Cannot find secret ${secretName}`);
     }
     const backendId = options.backend;
-    const backend = await apphosting.getBackend(projectId, location, backendId);
+    const location = options.location;
+    let backend;
+    if (location === "" || location === "-") {
+        backend = await (0, apphosting_1.getBackendForAmbiguousLocation)(projectId, backendId, "Please select the location of your backend:");
+    }
+    else {
+        backend = await apphosting.getBackend(projectId, location, backendId);
+    }
     const accounts = secrets.toMulti(secrets.serviceAccountsForBackend(projectNumber, backend));
     await secrets.grantSecretAccess(projectId, projectNumber, secretName, accounts);
 });

package/lib/commands/dataconnect-list.js

@@ -0,0 +1,64 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.command = void 0;
+const command_1 = require("../command");
+const projectUtils_1 = require("../projectUtils");
+const names = require("../dataconnect/names");
+const client = require("../dataconnect/client");
+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")
+    .description("list all deployed services in your Firebase project")
+    .before(requirePermissions_1.requirePermissions, [
+    "dataconnect.services.list",
+    "dataconnect.schemas.list",
+    "dataconnect.connectors.list",
+])
+    .action(async (options) => {
+    var _a, _b, _c, _d, _e;
+    const projectId = (0, projectUtils_1.needProjectId)(options);
+    await (0, ensureApis_1.ensureApis)(projectId);
+    const services = await client.listAllServices(projectId);
+    const table = new Table({
+        head: [
+            "Service ID",
+            "Location",
+            "Data Source",
+            "Schema Last Updated",
+            "Connector ID",
+            "Connector Last Updated",
+        ],
+        style: { head: ["yellow"] },
+    });
+    const jsonOutput = { services: [] };
+    for (const service of services) {
+        const schema = await client.getSchema(service.name);
+        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 serviceJson = {
+            serviceId: serviceName.serviceId,
+            location: serviceName.location,
+            datasource: dbName,
+            schemaUpdateTime: schema === null || schema === void 0 ? void 0 : schema.updateTime,
+            connectors: [],
+        };
+        for (const conn of connectors) {
+            const connectorName = names.parseConnectorName(conn.name);
+            table.push(["", "", "", "", connectorName.connectorId, conn.updateTime]);
+            serviceJson.connectors.push({
+                connectorId: connectorName.connectorId,
+                connectorLastUpdated: (_e = conn.updateTime) !== null && _e !== void 0 ? _e : "",
+            });
+        }
+        jsonOutput.services.push(serviceJson);
+    }
+    logger_1.logger.info(table.toString());
+    return jsonOutput;
+});