firebase-tools 13.7.1 → 13.7.2

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") {

package/lib/apphosting/index.js

@@ -58,7 +58,13 @@ async function doSetup(projectId, location, serviceAccount, withDevConnect) {
     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 the path to the root of the app you would like to deploy (relative to the repo root)",
+    });
+    const backend = await createBackend(projectId, location, backendId, gitRepositoryConnection, serviceAccount, rootDir);
     const branch = await (0, prompt_1.promptOnce)({
         name: "branch",
         type: "input",
@@ -106,13 +112,13 @@ 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, rootDir = "/") {
     const defaultServiceAccount = defaultComputeServiceAccountEmail(projectId);
     const backendReqBody = {
         servingLocality: "GLOBAL_ACCESS",
         codebase: {
             repository: `${repository.name}`,
-            rootDirectory: "/",
+            rootDirectory: rootDir,
         },
         labels: deploymentTool.labels(),
         serviceAccount: serviceAccount || defaultServiceAccount,

package/lib/commands/firestore-databases-create.js

@@ -52,6 +52,7 @@ exports.command = new command_1.Command("firestore:databases:create <database>")
         logger_1.logger.info("Please be sure to configure Firebase rules in your Firebase config file for\n" +
             "the new database. By default, created databases will have closed rules that\n" +
             "block any incoming third-party traffic.");
+        logger_1.logger.info(`Your database may be viewed at ${printer.firebaseConsoleDatabaseUrl(options.project, database)}`);
     }
     return databaseResp;
 });

package/lib/commands/firestore-databases-restore.js

@@ -37,6 +37,7 @@ exports.command = new command_1.Command("firestore:databases:restore")
         logger_1.logger.info("Please be sure to configure Firebase rules in your Firebase config file for\n" +
             "the new database. By default, created databases will have closed rules that\n" +
             "block any incoming third-party traffic.");
+        logger_1.logger.info(`Once the restore is complete, your database may be viewed at ${printer.firebaseConsoleDatabaseUrl(options.project, databaseId)}`);
     }
     return databaseResp;
 });

package/lib/commands/index.js

@@ -162,17 +162,11 @@ function load(client) {
         client.apphosting.backends.create = loadCommand("apphosting-backends-create");
         client.apphosting.backends.get = loadCommand("apphosting-backends-get");
         client.apphosting.backends.delete = loadCommand("apphosting-backends-delete");
-        client.apphosting.builds = {};
-        client.apphosting.builds.get = loadCommand("apphosting-builds-get");
-        client.apphosting.builds.create = loadCommand("apphosting-builds-create");
         client.apphosting.secrets = {};
         client.apphosting.secrets.set = loadCommand("apphosting-secrets-set");
         client.apphosting.secrets.grantaccess = loadCommand("apphosting-secrets-grantaccess");
         client.apphosting.secrets.describe = loadCommand("apphosting-secrets-describe");
         client.apphosting.secrets.access = loadCommand("apphosting-secrets-access");
-        client.apphosting.rollouts = {};
-        client.apphosting.rollouts.create = loadCommand("apphosting-rollouts-create");
-        client.apphosting.rollouts.list = loadCommand("apphosting-rollouts-list");
     }
     client.login = loadCommand("login");
     client.login.add = loadCommand("login-add");

package/lib/deploy/firestore/prepare.js

@@ -27,9 +27,11 @@ async function default_1(context, options) {
         const targets = options.only.split(",");
         const excludeRules = targets.indexOf("firestore:indexes") >= 0;
         const excludeIndexes = targets.indexOf("firestore:rules") >= 0;
+        const includeRules = targets.indexOf("firestore:rules") >= 0;
+        const includeIndexes = targets.indexOf("firestore:indexes") >= 0;
         const onlyFirestore = targets.indexOf("firestore") >= 0;
-        context.firestoreIndexes = !excludeIndexes || onlyFirestore;
-        context.firestoreRules = !excludeRules || onlyFirestore;
+        context.firestoreIndexes = !excludeIndexes || includeIndexes || onlyFirestore;
+        context.firestoreRules = !excludeRules || includeRules || onlyFirestore;
     }
     else {
         context.firestoreIndexes = true;

package/lib/deploy/functions/deploy.js

@@ -25,7 +25,7 @@ async function uploadSourceV1(projectId, source, wantBackend) {
         stream: fs.createReadStream(source.functionsSourceV1),
     };
     if (process.env.GOOGLE_CLOUD_QUOTA_PROJECT) {
-        (0, utils_1.logLabeledWarning)("functions", "GOOGLE_CLOUD_QUTOA_PROJECT is not usable when uploading source for Cloud Functions.");
+        (0, utils_1.logLabeledWarning)("functions", "GOOGLE_CLOUD_QUOTA_PROJECT is not usable when uploading source for Cloud Functions.");
     }
     await gcs.upload(uploadOpts, uploadUrl, {
         "x-goog-content-length-range": "0,104857600",
@@ -44,7 +44,7 @@ async function uploadSourceV2(projectId, source, wantBackend) {
         stream: fs.createReadStream(source.functionsSourceV2),
     };
     if (process.env.GOOGLE_CLOUD_QUOTA_PROJECT) {
-        (0, utils_1.logLabeledWarning)("functions", "GOOGLE_CLOUD_QUTOA_PROJECT is not usable when uploading source for Cloud Functions.");
+        (0, utils_1.logLabeledWarning)("functions", "GOOGLE_CLOUD_QUOTA_PROJECT is not usable when uploading source for Cloud Functions.");
     }
     await gcs.upload(uploadOpts, res.uploadUrl, undefined, true);
     return res.storageSource;

package/lib/deploy/functions/prepare.js

@@ -285,6 +285,7 @@ async function loadCodebases(config, options, firebaseConfig, runtimeConfig, fil
             projectId,
             sourceDir,
             projectDir: options.config.projectDir,
+            runtime: codebaseConfig.runtime,
         };
         const firebaseJsonRuntime = codebaseConfig.runtime;
         if (firebaseJsonRuntime && !supported.isRuntime(firebaseJsonRuntime)) {

package/lib/deploy/functions/pricing.js

@@ -107,7 +107,7 @@ const MB_TO_GHZ = {
     32768: 8 * VCPU_TO_GHZ,
 };
 function canCalculateMinInstanceCost(endpoint) {
-    if (!endpoint.minInstances) {
+    if (endpoint.minInstances === undefined || endpoint.minInstances === null) {
         return true;
     }
     if (endpoint.platform === "gcfv1") {
@@ -132,7 +132,7 @@ function monthlyMinInstanceCost(endpoints) {
         gcfv2: { 1: { ram: 0, cpu: 0 }, 2: { ram: 0, cpu: 0 } },
     };
     for (const endpoint of endpoints) {
-        if (!endpoint.minInstances) {
+        if (endpoint.minInstances === undefined || endpoint.minInstances === null) {
             continue;
         }
         const ramMb = endpoint.availableMemoryMb || backend.DEFAULT_MEMORY;

package/lib/downloadUtils.js

@@ -13,6 +13,7 @@ async function downloadToTmp(remoteUrl) {
     const tmpfile = tmp.fileSync();
     const writeStream = fs.createWriteStream(tmpfile.name);
     const res = await c.request({
+        ignoreQuotaProject: true,
         method: "GET",
         path: u.pathname,
         queryParams: u.searchParams,

package/lib/firestore/pretty-print.js

@@ -7,6 +7,7 @@ const sort = require("./api-sort");
 const types = require("./api-types");
 const logger_1 = require("../logger");
 const util = require("./util");
+const utils_1 = require("../utils");
 class PrettyPrint {
     prettyPrintIndexes(indexes) {
         if (indexes.length === 0) {
@@ -163,6 +164,10 @@ class PrettyPrint {
     prettyDatabaseString(database) {
         return clc.yellow(typeof database === "string" ? database : database.name);
     }
+    firebaseConsoleDatabaseUrl(project, databaseId) {
+        const urlFriendlyDatabaseId = databaseId === "(default)" ? "-default-" : databaseId;
+        return (0, utils_1.consoleUrl)(project, `/firestore/databases/${urlFriendlyDatabaseId}/data`);
+    }
     prettyFieldString(field) {
         let result = "";
         const parsedName = util.parseFieldName(field.name);

package/lib/frameworks/astro/index.js

@@ -10,7 +10,7 @@ const utils_2 = require("./utils");
 exports.name = "Astro";
 exports.support = "experimental";
 exports.type = 2;
-exports.supportedRange = "2 - 3";
+exports.supportedRange = "2 - 4";
 async function discover(dir) {
     if (!(0, fs_extra_1.existsSync)((0, path_1.join)(dir, "package.json")))
         return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-tools",
-  "version": "13.7.1",
+  "version": "13.7.2",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "bin": {

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

@@ -1,32 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.command = void 0;
-const apphosting = require("../gcp/apphosting");
-const logger_1 = require("../logger");
-const command_1 = require("../command");
-const projectUtils_1 = require("../projectUtils");
-exports.command = new command_1.Command("apphosting:builds:create <backendId>")
-    .description("create a build for an App Hosting backend")
-    .option("-l, --location <location>", "specify the region of the backend", "us-central1")
-    .option("-i, --id <buildId>", "id of the build (defaults to autogenerating a random id)", "")
-    .option("-b, --branch <branch>", "repository branch to deploy (defaults to 'main')", "main")
-    .before(apphosting.ensureApiEnabled)
-    .action(async (backendId, options) => {
-    var _a;
-    const projectId = (0, projectUtils_1.needProjectId)(options);
-    const location = options.location;
-    const buildId = options.buildId ||
-        (await apphosting.getNextRolloutId(projectId, location, backendId));
-    const branch = (_a = options.branch) !== null && _a !== void 0 ? _a : "main";
-    const op = await apphosting.createBuild(projectId, location, backendId, buildId, {
-        source: {
-            codebase: {
-                branch,
-            },
-        },
-    });
-    logger_1.logger.info(`Started a build for backend ${backendId} on branch ${branch}.`);
-    logger_1.logger.info("Check status by running:");
-    logger_1.logger.info(`\tfirebase apphosting:builds:get ${backendId} ${buildId} --location ${location}`);
-    return op;
-});

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

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.command = void 0;
-const apphosting = require("../gcp/apphosting");
-const logger_1 = require("../logger");
-const command_1 = require("../command");
-const projectUtils_1 = require("../projectUtils");
-exports.command = new command_1.Command("apphosting:builds:get <backendId> <buildId>")
-    .description("get a build for an App Hosting backend")
-    .option("-l, --location <location>", "specify the region of the backend", "us-central1")
-    .before(apphosting.ensureApiEnabled)
-    .action(async (backendId, buildId, options) => {
-    const projectId = (0, projectUtils_1.needProjectId)(options);
-    const location = options.location;
-    const build = await apphosting.getBuild(projectId, location, backendId, buildId);
-    logger_1.logger.info(JSON.stringify(build, null, 2));
-    return build;
-});

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

@@ -1,26 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.command = void 0;
-const apphosting = require("../gcp/apphosting");
-const logger_1 = require("../logger");
-const command_1 = require("../command");
-const projectUtils_1 = require("../projectUtils");
-exports.command = new command_1.Command("apphosting:rollouts:create <backendId> <buildId>")
-    .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)", "")
-    .before(apphosting.ensureApiEnabled)
-    .action(async (backendId, buildId, options) => {
-    const projectId = (0, projectUtils_1.needProjectId)(options);
-    const location = options.location;
-    const rolloutId = options.buildId ||
-        (await apphosting.getNextRolloutId(projectId, location, backendId));
-    const build = `projects/${projectId}/backends/${backendId}/builds/${buildId}`;
-    const op = await apphosting.createRollout(projectId, location, backendId, rolloutId, {
-        build,
-    });
-    logger_1.logger.info(`Started a rollout for backend ${backendId} with build ${buildId}.`);
-    logger_1.logger.info("Check status by running:");
-    logger_1.logger.info(`\tfirebase apphosting:rollouts:list --location ${location}`);
-    return op;
-});

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

@@ -1,21 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.command = void 0;
-const apphosting = require("../gcp/apphosting");
-const logger_1 = require("../logger");
-const command_1 = require("../command");
-const projectUtils_1 = require("../projectUtils");
-exports.command = new command_1.Command("apphosting:rollouts:list <backendId>")
-    .description("list rollouts of an App Hosting backend")
-    .option("-l, --location <location>", "region of the rollouts (defaults to listing rollouts from all regions)", "-")
-    .before(apphosting.ensureApiEnabled)
-    .action(async (backendId, options) => {
-    const projectId = (0, projectUtils_1.needProjectId)(options);
-    const location = options.location;
-    const rollouts = await apphosting.listRollouts(projectId, location, backendId);
-    if (rollouts.unreachable) {
-        logger_1.logger.error(`WARNING: the following locations were unreachable: ${rollouts.unreachable.join(", ")}`);
-    }
-    logger_1.logger.info(JSON.stringify(rollouts.rollouts, null, 2));
-    return rollouts;
-});