firebase-tools 13.7.4 → 13.7.5

package/lib/apphosting/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.promptLocation = exports.deleteBackendAndPoll = exports.orchestrateRollout = exports.setDefaultTrafficPolicy = exports.createBackend = exports.doSetup = void 0;
+exports.promptLocation = exports.deleteBackendAndPoll = exports.orchestrateRollout = exports.setDefaultTrafficPolicy = exports.createBackend = exports.ensureAppHostingComputeServiceAccount = exports.doSetup = void 0;
 const repo = require("./repo");
 const poller = require("../operation-poller");
 const apphosting = require("../gcp/apphosting");
@@ -30,14 +30,16 @@ async function doSetup(projectId, webAppName, location, serviceAccount, withDevC
         (0, ensureApiEnabled_1.ensure)(projectId, (0, api_1.secretManagerOrigin)(), "apphosting", true),
         (0, ensureApiEnabled_1.ensure)(projectId, (0, api_1.cloudRunApiOrigin)(), "apphosting", true),
         (0, ensureApiEnabled_1.ensure)(projectId, (0, api_1.artifactRegistryDomain)(), "apphosting", true),
+        (0, ensureApiEnabled_1.ensure)(projectId, (0, api_1.iamOrigin)(), "apphosting", true),
     ]);
+    (0, utils_1.logBullet)("First we need a few details to create your backend.\n");
+    await ensureAppHostingComputeServiceAccount(projectId, serviceAccount);
     const allowedLocations = (await apphosting.listLocations(projectId)).map((loc) => loc.locationId);
     if (location) {
         if (!allowedLocations.includes(location)) {
             throw new error_1.FirebaseError(`Invalid location ${location}. Valid choices are ${allowedLocations.join(", ")}`);
         }
     }
-    (0, utils_1.logBullet)("First we need a few details to create your backend.\n");
     location =
         location || (await promptLocation(projectId, "Select a location to host your backend:\n"));
     (0, utils_1.logSuccess)(`Location set to ${location}.\n`);
@@ -93,6 +95,25 @@ async function doSetup(projectId, webAppName, location, serviceAccount, withDevC
     (0, utils_1.logSuccess)(`Your backend is now deployed at:\n\thttps://${backend.uri}`);
 }
 exports.doSetup = doSetup;
+async function ensureAppHostingComputeServiceAccount(projectId, serviceAccount) {
+    const sa = serviceAccount || defaultComputeServiceAccountEmail(projectId);
+    const name = `projects/${projectId}/serviceAccounts/${sa}`;
+    try {
+        await iam.testResourceIamPermissions((0, api_1.iamOrigin)(), "v1", name, ["iam.serviceAccounts.actAs"], `projects/${projectId}`);
+    }
+    catch (err) {
+        if (!(err instanceof error_1.FirebaseError)) {
+            throw err;
+        }
+        if (err.status === 404) {
+            await provisionDefaultComputeServiceAccount(projectId);
+        }
+        else if (err.status === 403) {
+            throw new error_1.FirebaseError(`Failed to create backend due to missing delegation permissions for ${sa}. Make sure you have the iam.serviceAccounts.actAs permission.`, { original: err });
+        }
+    }
+}
+exports.ensureAppHostingComputeServiceAccount = ensureAppHostingComputeServiceAccount;
 async function promptNewBackendId(projectId, location, prompt) {
     while (true) {
         const backendId = await (0, prompt_1.promptOnce)(prompt);
@@ -127,33 +148,23 @@ async function createBackend(projectId, location, backendId, repository, service
         const op = await apphosting.createBackend(projectId, location, backendReqBody, backendId);
         return await poller.pollOperation(Object.assign(Object.assign({}, apphostingPollerOptions), { pollerName: `create-${projectId}-${location}-${backendId}`, operationResourceName: op.name }));
     }
-    try {
-        return await createBackendAndPoll();
-    }
-    catch (err) {
-        if (err.status === 403) {
-            if (err.message.includes(defaultServiceAccount)) {
-                await provisionDefaultComputeServiceAccount(projectId);
-                return await createBackendAndPoll();
-            }
-            else if (serviceAccount && err.message.includes(serviceAccount)) {
-                throw new error_1.FirebaseError(`Failed to create backend due to missing delegation permissions for ${serviceAccount}. Make sure you have the iam.serviceAccounts.actAs permission.`, { children: [err] });
-            }
-        }
-        throw err;
-    }
+    return await createBackendAndPoll();
 }
 exports.createBackend = createBackend;
 async function provisionDefaultComputeServiceAccount(projectId) {
     try {
-        await iam.createServiceAccount(projectId, DEFAULT_COMPUTE_SERVICE_ACCOUNT_NAME, "Firebase App Hosting compute service account", "Default service account used to run builds and deploys for Firebase App Hosting");
+        await iam.createServiceAccount(projectId, DEFAULT_COMPUTE_SERVICE_ACCOUNT_NAME, "Default service account used to run builds and deploys for Firebase App Hosting", "Firebase App Hosting compute service account");
     }
     catch (err) {
         if (err.status !== 409) {
             throw err;
         }
     }
-    await (0, resourceManager_1.addServiceAccountToRoles)(projectId, defaultComputeServiceAccountEmail(projectId), ["roles/firebaseapphosting.computeRunner", "roles/firebase.sdkAdminServiceAgent"], true);
+    await (0, resourceManager_1.addServiceAccountToRoles)(projectId, defaultComputeServiceAccountEmail(projectId), [
+        "roles/firebaseapphosting.computeRunner",
+        "roles/firebase.sdkAdminServiceAgent",
+        "roles/developerconnect.tokenAccessor",
+    ], true);
 }
 async function setDefaultTrafficPolicy(projectId, location, backendId, codebaseBranch) {
     const traffic = {
@@ -171,8 +182,12 @@ 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 = {

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

@@ -11,7 +11,7 @@ exports.command = new command_1.Command("apphosting:backends:create")
     .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 insetad of Cloud Build Repositories (testing)", false)
+    .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)
     .action(async (options) => {

package/package.json

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