firebase-tools 13.0.3 → 13.2.0

package/lib/init/features/apphosting/index.js

@@ -12,6 +12,7 @@ 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 apphostingPollerOptions = {
     apiOrigin: api_1.apphostingOrigin,
     apiVersion: apphosting_1.API_VERSION,
@@ -54,6 +55,25 @@ async function doSetup(setup, projectId) {
         (0, utils_1.logWarning)(`Backend with id ${backendId} already exists in ${location}`);
     }
     const backend = await onboardBackend(projectId, location, backendId);
+    const branch = await (0, prompt_1.promptOnce)({
+        name: "branch",
+        type: "input",
+        default: "main",
+        message: "Pick a branch for continuous deployment",
+    });
+    const traffic = {
+        rolloutPolicy: {
+            codebaseBranch: branch,
+            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 }));
     const confirmRollout = await (0, prompt_1.promptOnce)({
         type: "confirm",
         name: "rollout",
@@ -65,12 +85,6 @@ async function doSetup(setup, projectId) {
         (0, utils_1.logSuccess)(`Your site will be deployed at:\n\thttps://${backend.uri}`);
         return;
     }
-    const branch = await (0, prompt_1.promptOnce)({
-        name: "branch",
-        type: "input",
-        default: "main",
-        message: "Which branch do you want to deploy?",
-    });
     const { build } = await onboardRollout(projectId, location, backendId, {
         source: {
             codebase: {
@@ -79,6 +93,10 @@ async function doSetup(setup, projectId) {
         },
     });
     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. " +
+                "This is an internal error and should be reported");
+        }
         throw new error_1.FirebaseError(`Failed to build your app. Please inspect the build logs at ${build.buildLogsUri}.`, { children: [build.error] });
     }
     (0, utils_1.logSuccess)(`Successfully created backend:\n\t${backend.name}`);
@@ -103,7 +121,7 @@ function toBackend(cloudBuildConnRepo) {
             repository: `${cloudBuildConnRepo.name}`,
             rootDirectory: "/",
         },
-        labels: {},
+        labels: deploymentTool.labels(),
     };
 }
 async function onboardBackend(projectId, location, backendId) {
@@ -120,13 +138,12 @@ async function createBackend(projectId, location, backendReqBoby, backendId) {
 exports.createBackend = createBackend;
 async function onboardRollout(projectId, location, backendId, buildInput) {
     (0, utils_1.logBullet)("Starting a new rollout... this may take a few minutes.");
-    const buildId = (0, utils_1.generateId)();
+    const buildId = await apphosting.getNextRolloutId(projectId, location, backendId, 1);
     const buildOp = await apphosting.createBuild(projectId, location, backendId, buildId, buildInput);
-    const rolloutId = (0, utils_1.generateId)();
-    const rolloutOp = await apphosting.createRollout(projectId, location, backendId, rolloutId, {
+    const rolloutOp = await apphosting.createRollout(projectId, location, backendId, buildId, {
         build: `projects/${projectId}/locations/${location}/backends/${backendId}/builds/${buildId}`,
     });
-    const rolloutPoll = poller.pollOperation(Object.assign(Object.assign({}, apphostingPollerOptions), { pollerName: `create-${projectId}-${location}-backend-${backendId}-rollout-${rolloutId}`, operationResourceName: rolloutOp.name }));
+    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.");

package/lib/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateId = exports.getHostnameFromUrl = exports.openInBrowserPopup = exports.openInBrowser = exports.connectableHostname = exports.randomInt = exports.debounce = exports.last = exports.cloneDeep = exports.groupBy = exports.assertIsStringOrUndefined = exports.assertIsNumber = exports.assertIsString = exports.thirtyDaysFromNow = exports.isRunningInWSL = exports.isVSCodeExtension = exports.isCloudEnvironment = exports.datetimeString = exports.createDestroyer = exports.promiseWithSpinner = exports.setupLoggers = exports.tryParse = exports.tryStringify = exports.promiseProps = exports.withTimeout = exports.promiseWhile = exports.promiseAllSettled = exports.getFunctionsEventProvider = exports.endpoint = exports.makeActiveProject = exports.streamToString = exports.stringToStream = exports.explainStdin = exports.allSettled = exports.reject = exports.logLabeledError = exports.logLabeledWarning = exports.logWarning = exports.logLabeledBullet = exports.logBullet = exports.logLabeledSuccess = exports.logSuccess = exports.addSubdomain = exports.addDatabaseNamespace = exports.getDatabaseViewDataUrl = exports.getDatabaseUrl = exports.envOverride = exports.getInheritedOption = exports.consoleUrl = exports.envOverrides = void 0;
+exports.getHostnameFromUrl = exports.openInBrowserPopup = exports.openInBrowser = exports.connectableHostname = exports.randomInt = exports.debounce = exports.last = exports.cloneDeep = exports.groupBy = exports.assertIsStringOrUndefined = exports.assertIsNumber = exports.assertIsString = exports.thirtyDaysFromNow = exports.isRunningInWSL = exports.isVSCodeExtension = exports.isCloudEnvironment = exports.datetimeString = exports.createDestroyer = exports.promiseWithSpinner = exports.setupLoggers = exports.tryParse = exports.tryStringify = exports.promiseProps = exports.withTimeout = exports.promiseWhile = exports.promiseAllSettled = exports.getFunctionsEventProvider = exports.endpoint = exports.makeActiveProject = exports.streamToString = exports.stringToStream = exports.explainStdin = exports.allSettled = exports.reject = exports.logLabeledError = exports.logLabeledWarning = exports.logWarning = exports.logLabeledBullet = exports.logBullet = exports.logLabeledSuccess = exports.logSuccess = exports.addSubdomain = exports.addDatabaseNamespace = exports.getDatabaseViewDataUrl = exports.getDatabaseUrl = exports.envOverride = exports.getInheritedOption = exports.consoleUrl = exports.envOverrides = void 0;
 const fs = require("node:fs");
 const path = require("node:path");
 const _ = require("lodash");
@@ -524,14 +524,3 @@ function getHostnameFromUrl(url) {
     }
 }
 exports.getHostnameFromUrl = getHostnameFromUrl;
-function generateId(n = 6) {
-    const letters = "abcdefghijklmnopqrstuvwxyz";
-    const allChars = "01234567890-abcdefghijklmnopqrstuvwxyz";
-    let id = letters[Math.floor(Math.random() * letters.length)];
-    for (let i = 1; i < n; i++) {
-        const idx = Math.floor(Math.random() * allChars.length);
-        id += allChars[idx];
-    }
-    return id;
-}
-exports.generateId = generateId;

package/package.json

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