firebase-tools 13.5.0 → 13.5.2

package/lib/api.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.githubApiOrigin = exports.githubOrigin = exports.apphostingOrigin = 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.deployOrigin = exports.consoleOrigin = exports.authOrigin = exports.appDistributionOrigin = exports.artifactRegistryDomain = 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 = void 0;
+exports.apphostingOrigin = 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.developerConnectP4SAOrigin = exports.developerConnectOrigin = 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.deployOrigin = exports.consoleOrigin = exports.authOrigin = exports.appDistributionOrigin = exports.artifactRegistryDomain = 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;
 const constants_1 = require("./emulator/constants");
 const logger_1 = require("./logger");
 const scopes = require("./scopes");
@@ -37,6 +37,8 @@ exports.functionsV2Origin = utils.envOverride("FIREBASE_FUNCTIONS_V2_URL", "http
 exports.runOrigin = utils.envOverride("CLOUD_RUN_URL", "https://run.googleapis.com");
 exports.functionsDefaultRegion = utils.envOverride("FIREBASE_FUNCTIONS_DEFAULT_REGION", "us-central1");
 exports.cloudbuildOrigin = utils.envOverride("FIREBASE_CLOUDBUILD_URL", "https://cloudbuild.googleapis.com");
+exports.developerConnectOrigin = utils.envOverride("FIREBASE_DEVELOPERCONNECT_URL", "https://developerconnect.googleapis.com");
+exports.developerConnectP4SAOrigin = utils.envOverride("FIREBASE_DEVELOPERCONNECT_P4SA_URL", "gcp-sa-developerconnect.iam.gserviceaccount.com");
 exports.cloudschedulerOrigin = utils.envOverride("FIREBASE_CLOUDSCHEDULER_URL", "https://cloudscheduler.googleapis.com");
 exports.cloudTasksOrigin = utils.envOverride("FIREBASE_CLOUD_TAKS_URL", "https://cloudtasks.googleapis.com");
 exports.pubsubOrigin = utils.envOverride("FIREBASE_PUBSUB_URL", "https://pubsub.googleapis.com");

package/lib/deploy/functions/prepare.js

@@ -189,6 +189,7 @@ function inferDetailsFromExisting(want, have, usedDotenv) {
         if (!haveE) {
             continue;
         }
+        wantE.runServiceId = haveE.runServiceId;
         if (!usedDotenv) {
             wantE.environmentVariables = Object.assign(Object.assign({}, haveE.environmentVariables), wantE.environmentVariables);
         }

package/lib/emulator/downloadableEmulators.js

@@ -35,9 +35,9 @@ const EMULATOR_UPDATE_DETAILS = {
     ui: experiments.isEnabled("emulatoruisnapshot")
         ? { version: "SNAPSHOT", expectedSize: -1, expectedChecksum: "" }
         : {
-            version: "1.11.7",
-            expectedSize: 3064105,
-            expectedChecksum: "bd2bcc331cbf613a5b3b55a1ce08998b",
+            version: "1.11.8",
+            expectedSize: 3523907,
+            expectedChecksum: "49f6dc1911dda9d10df62a6c09aaf9a0",
         },
     pubsub: {
         version: "0.7.1",
@@ -83,7 +83,7 @@ exports.DownloadDetails = {
         version: EMULATOR_UPDATE_DETAILS.ui.version,
         downloadPath: path.join(CACHE_DIR, `ui-v${EMULATOR_UPDATE_DETAILS.ui.version}.zip`),
         unzipDir: path.join(CACHE_DIR, `ui-v${EMULATOR_UPDATE_DETAILS.ui.version}`),
-        binaryPath: path.join(CACHE_DIR, `ui-v${EMULATOR_UPDATE_DETAILS.ui.version}`, "server", "server.js"),
+        binaryPath: path.join(CACHE_DIR, `ui-v${EMULATOR_UPDATE_DETAILS.ui.version}`, "server", "server.mjs"),
         opts: {
             cacheDir: CACHE_DIR,
             remoteUrl: `https://storage.googleapis.com/firebase-preview-drop/emulator/ui-v${EMULATOR_UPDATE_DETAILS.ui.version}.zip`,

package/lib/gcp/devConnect.js

@@ -0,0 +1,71 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.serviceAgentEmail = exports.getGitRepositoryLink = exports.createGitRepositoryLink = exports.fetchLinkableGitRepositories = exports.listConnections = exports.getConnection = exports.createConnection = exports.client = void 0;
+const apiv2_1 = require("../apiv2");
+const api_1 = require("../api");
+const PAGE_SIZE_MAX = 100;
+exports.client = new apiv2_1.Client({
+    urlPrefix: api_1.developerConnectOrigin,
+    auth: true,
+    apiVersion: "v1",
+});
+async function createConnection(projectId, location, connectionId, githubConfig) {
+    const config = Object.assign(Object.assign({}, githubConfig), { githubApp: "FIREBASE" });
+    const res = await exports.client.post(`projects/${projectId}/locations/${location}/connections`, {
+        githubConfig: config,
+    }, { queryParams: { connectionId } });
+    return res.body;
+}
+exports.createConnection = createConnection;
+async function getConnection(projectId, location, connectionId) {
+    const name = `projects/${projectId}/locations/${location}/connections/${connectionId}`;
+    const res = await exports.client.get(name);
+    return res.body;
+}
+exports.getConnection = getConnection;
+async function listConnections(projectId, location) {
+    const conns = [];
+    const getNextPage = async (pageToken = "") => {
+        const res = await exports.client.get(`/projects/${projectId}/locations/${location}/connections`, {
+            queryParams: {
+                pageSize: PAGE_SIZE_MAX,
+                pageToken,
+            },
+        });
+        if (Array.isArray(res.body.connections)) {
+            conns.push(...res.body.connections);
+        }
+        if (res.body.nextPageToken) {
+            await getNextPage(res.body.nextPageToken);
+        }
+    };
+    await getNextPage();
+    return conns;
+}
+exports.listConnections = listConnections;
+async function fetchLinkableGitRepositories(projectId, location, connectionId, pageToken = "", pageSize = 1000) {
+    const name = `projects/${projectId}/locations/${location}/connections/${connectionId}:fetchLinkableRepositories`;
+    const res = await exports.client.get(name, {
+        queryParams: {
+            pageSize,
+            pageToken,
+        },
+    });
+    return res.body;
+}
+exports.fetchLinkableGitRepositories = fetchLinkableGitRepositories;
+async function createGitRepositoryLink(projectId, location, connectionId, gitRepositoryLinkId, cloneUri) {
+    const res = await exports.client.post(`projects/${projectId}/locations/${location}/connections/${connectionId}/gitRepositoryLinks`, { cloneUri }, { queryParams: { gitRepositoryLinkId } });
+    return res.body;
+}
+exports.createGitRepositoryLink = createGitRepositoryLink;
+async function getGitRepositoryLink(projectId, location, connectionId, gitRepositoryLinkId) {
+    const name = `projects/${projectId}/locations/${location}/connections/${connectionId}/gitRepositoryLinks/${gitRepositoryLinkId}`;
+    const res = await exports.client.get(name);
+    return res.body;
+}
+exports.getGitRepositoryLink = getGitRepositoryLink;
+function serviceAgentEmail(projectNumber) {
+    return `service-${projectNumber}@${api_1.developerConnectP4SAOrigin}`;
+}
+exports.serviceAgentEmail = serviceAgentEmail;

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

@@ -172,9 +172,31 @@ async function orchestrateRollout(projectId, location, backendId, buildInput) {
     (0, utils_1.logBullet)("Starting a new rollout... this may take a few minutes.");
     const buildId = await apphosting.getNextRolloutId(projectId, location, backendId, 1);
     const buildOp = await apphosting.createBuild(projectId, location, backendId, buildId, buildInput);
-    const rolloutOp = await apphosting.createRollout(projectId, location, backendId, buildId, {
+    const rolloutBody = {
         build: `projects/${projectId}/locations/${location}/backends/${backendId}/builds/${buildId}`,
-    });
+    };
+    let tries = 0;
+    let done = false;
+    while (!done) {
+        tries++;
+        try {
+            const validateOnly = true;
+            await apphosting.createRollout(projectId, location, backendId, buildId, rolloutBody, validateOnly);
+            done = true;
+        }
+        catch (err) {
+            if (err instanceof error_1.FirebaseError && err.status === 400) {
+                if (tries >= 5) {
+                    throw err;
+                }
+                await new Promise((resolve) => setTimeout(resolve, 1000));
+            }
+            else {
+                throw err;
+            }
+        }
+    }
+    const rolloutOp = await apphosting.createRollout(projectId, location, backendId, buildId, rolloutBody);
     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]);

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

@@ -49,107 +49,107 @@ function generateConnectionId() {
     const randomHash = Math.random().toString(36).slice(6);
     return `apphosting-github-conn-${randomHash}`;
 }
-const ADD_REPO_CHOICE = "@ADD_REPO";
 const ADD_CONN_CHOICE = "@ADD_CONN";
-const CONFIGURE_REMOTE_URI_CHOICES = [ADD_REPO_CHOICE, ADD_CONN_CHOICE];
 async function linkGitHubRepository(projectId, location) {
-    var _a, _b, _c, _d;
+    var _a, _b;
     utils.logBullet(clc.bold(`${clc.yellow("===")} Set up a GitHub connection`));
-    let oauthConn = await getOrCreateConnection(projectId, location, APPHOSTING_OAUTH_CONN_NAME);
-    while (oauthConn.installationState.stage === "PENDING_USER_OAUTH") {
-        oauthConn = await promptConnectionAuth(oauthConn);
-    }
+    const oauthConn = await getOrCreateOauthConnection(projectId, location);
     const existingConns = await listAppHostingConnections(projectId);
-    if (existingConns.length < 1) {
-        const grantSuccess = await promptSecretManagerAdminGrant(projectId);
-        if (!grantSuccess) {
-            throw new error_1.FirebaseError("Insufficient IAM permissions to create a new connection to GitHub");
-        }
-        const connectionId = generateConnectionId();
-        const conn = await createConnection(projectId, location, connectionId, {
-            authorizerCredential: (_a = oauthConn.githubConfig) === null || _a === void 0 ? void 0 : _a.authorizerCredential,
-        });
-        let refreshedConn = conn;
-        while (refreshedConn.installationState.stage !== "COMPLETE") {
-            refreshedConn = await promptAppInstall(conn);
-        }
-        existingConns.push(refreshedConn);
+    if (existingConns.length === 0) {
+        await ensureSecretManagerAdminGrant(projectId);
+        existingConns.push(await createFullyInstalledConnection(projectId, location, generateConnectionId(), oauthConn));
     }
-    let { remoteUri, connection } = await promptRepositoryUri(projectId, existingConns);
-    while (CONFIGURE_REMOTE_URI_CHOICES.includes(remoteUri)) {
-        if (remoteUri === ADD_REPO_CHOICE) {
-            await utils.openInBrowser("https://github.com/apps/google-cloud-build/installations/new");
-            await (0, prompt_1.promptOnce)({
-                type: "input",
-                message: "Press ENTER once you have provided the GitHub app installation with access to your desired repository.",
-            });
-        }
-        else if (remoteUri === ADD_CONN_CHOICE) {
-            const connectionId = generateConnectionId();
-            const conn = await createConnection(projectId, location, connectionId, {
-                authorizerCredential: (_b = oauthConn.githubConfig) === null || _b === void 0 ? void 0 : _b.authorizerCredential,
-            });
-            let refreshedConn = conn;
-            while (refreshedConn.installationState.stage !== "COMPLETE") {
-                refreshedConn = await promptAppInstall(conn);
-            }
-            existingConns.push(refreshedConn);
+    let repoRemoteUri;
+    let connection;
+    do {
+        if (repoRemoteUri === ADD_CONN_CHOICE) {
+            existingConns.push(await createFullyInstalledConnection(projectId, location, generateConnectionId(), oauthConn));
         }
         const selection = await promptRepositoryUri(projectId, existingConns);
-        remoteUri = selection.remoteUri;
+        repoRemoteUri = selection.remoteUri;
         connection = selection.connection;
-    }
+    } while (repoRemoteUri === ADD_CONN_CHOICE);
     const { id: connectionId } = parseConnectionName(connection.name);
     await getOrCreateConnection(projectId, location, connectionId, {
-        authorizerCredential: (_c = connection.githubConfig) === null || _c === void 0 ? void 0 : _c.authorizerCredential,
-        appInstallationId: (_d = connection.githubConfig) === null || _d === void 0 ? void 0 : _d.appInstallationId,
+        authorizerCredential: (_a = connection.githubConfig) === null || _a === void 0 ? void 0 : _a.authorizerCredential,
+        appInstallationId: (_b = connection.githubConfig) === null || _b === void 0 ? void 0 : _b.appInstallationId,
     });
-    const repo = await getOrCreateRepository(projectId, location, connectionId, remoteUri);
+    const repo = await getOrCreateRepository(projectId, location, connectionId, repoRemoteUri);
     utils.logSuccess(`Successfully linked GitHub repository at remote URI`);
-    utils.logSuccess(`\t${remoteUri}`);
+    utils.logSuccess(`\t${repoRemoteUri}`);
     return repo;
 }
 exports.linkGitHubRepository = linkGitHubRepository;
+async function createFullyInstalledConnection(projectId, location, connectionId, oauthConn) {
+    var _a;
+    let conn = await createConnection(projectId, location, connectionId, {
+        authorizerCredential: (_a = oauthConn.githubConfig) === null || _a === void 0 ? void 0 : _a.authorizerCredential,
+    });
+    while (conn.installationState.stage !== "COMPLETE") {
+        utils.logBullet("Install the Cloud Build GitHub app to enable access to GitHub repositories");
+        const targetUri = conn.installationState.actionUri.replace("install_v2", "direct_install_v2");
+        utils.logBullet(targetUri);
+        await utils.openInBrowser(targetUri);
+        await (0, prompt_1.promptOnce)({
+            type: "input",
+            message: "Press Enter once you have installed or configured the Cloud Build GitHub app to access your GitHub repo.",
+        });
+        conn = await gcb.getConnection(projectId, location, connectionId);
+    }
+    return conn;
+}
+async function getOrCreateOauthConnection(projectId, location) {
+    let conn = await getOrCreateConnection(projectId, location, APPHOSTING_OAUTH_CONN_NAME);
+    while (conn.installationState.stage === "PENDING_USER_OAUTH") {
+        utils.logBullet("You must authorize the Cloud Build GitHub app.");
+        utils.logBullet("Sign in to GitHub and authorize Cloud Build GitHub app:");
+        const { url, cleanup } = await utils.openInBrowserPopup(conn.installationState.actionUri, "Authorize the GitHub app");
+        utils.logBullet(`\t${url}`);
+        await (0, prompt_1.promptOnce)({
+            type: "input",
+            message: "Press Enter once you have authorized the app",
+        });
+        cleanup();
+        const { projectId, location, id } = parseConnectionName(conn.name);
+        conn = await gcb.getConnection(projectId, location, id);
+    }
+    return conn;
+}
 async function promptRepositoryUri(projectId, connections) {
     const { repos, remoteUriToConnection } = await fetchAllRepositories(projectId, connections);
-    const searchRepos = (repos) => async (_, input = "") => {
-        return [
-            new inquirer.Separator(),
-            {
-                name: "Missing a repo? Select this option to configure your installation's access settings",
-                value: ADD_REPO_CHOICE,
-            },
-            {
-                name: "Missing an account or org? Select this option to create a new connection",
-                value: ADD_CONN_CHOICE,
-            },
-            new inquirer.Separator(),
-            ...fuzzy
-                .filter(input, repos, {
-                extract: (repo) => extractRepoSlugFromUri(repo.remoteUri) || "",
-            })
-                .map((result) => {
-                return {
-                    name: extractRepoSlugFromUri(result.original.remoteUri) || "",
-                    value: result.original.remoteUri,
-                };
-            }),
-        ];
-    };
     const remoteUri = await (0, prompt_1.promptOnce)({
         type: "autocomplete",
         name: "remoteUri",
         message: "Which of the following repositories would you like to deploy?",
-        source: searchRepos(repos),
+        source: (_, input = "") => {
+            return new Promise((resolve) => resolve([
+                new inquirer.Separator(),
+                {
+                    name: "Missing a repo? Select this option to configure your GitHub connection settings",
+                    value: ADD_CONN_CHOICE,
+                },
+                new inquirer.Separator(),
+                ...fuzzy
+                    .filter(input, repos, {
+                    extract: (repo) => extractRepoSlugFromUri(repo.remoteUri) || "",
+                })
+                    .map((result) => {
+                    return {
+                        name: extractRepoSlugFromUri(result.original.remoteUri) || "",
+                        value: result.original.remoteUri,
+                    };
+                }),
+            ]));
+        },
     });
     return { remoteUri, connection: remoteUriToConnection[remoteUri] };
 }
-async function promptSecretManagerAdminGrant(projectId) {
+async function ensureSecretManagerAdminGrant(projectId) {
     const projectNumber = await (0, getProjectNumber_1.getProjectNumber)({ projectId });
     const cbsaEmail = gcb.serviceAgentEmail(projectNumber);
     const alreadyGranted = await rm.serviceAccountHasRoles(projectId, cbsaEmail, ["roles/secretmanager.admin"], true);
     if (alreadyGranted) {
-        return true;
+        return;
     }
     utils.logBullet("To create a new GitHub connection, Secret Manager Admin role (roles/secretmanager.admin) is required on the Cloud Build Service Agent.");
     const grant = await (0, prompt_1.promptOnce)({
@@ -162,36 +162,10 @@ async function promptSecretManagerAdminGrant(projectId) {
             `\tgcloud projects add-iam-policy-binding ${projectId} \\\n` +
             `\t  --member="serviceAccount:${cbsaEmail} \\\n` +
             `\t  --role="roles/secretmanager.admin\n`);
-        return false;
+        throw new error_1.FirebaseError("Insufficient IAM permissions to create a new connection to GitHub");
     }
     await rm.addServiceAccountToRoles(projectId, cbsaEmail, ["roles/secretmanager.admin"], true);
     utils.logSuccess("Successfully granted the required role to the Cloud Build Service Agent!");
-    return true;
-}
-async function promptConnectionAuth(conn) {
-    utils.logBullet("You must authorize the Cloud Build GitHub app.");
-    utils.logBullet("Sign in to GitHub and authorize Cloud Build GitHub app:");
-    const { url, cleanup } = await utils.openInBrowserPopup(conn.installationState.actionUri, "Authorize the GitHub app");
-    utils.logBullet(`\t${url}`);
-    await (0, prompt_1.promptOnce)({
-        type: "input",
-        message: "Press Enter once you have authorized the app",
-    });
-    cleanup();
-    const { projectId, location, id } = parseConnectionName(conn.name);
-    return await gcb.getConnection(projectId, location, id);
-}
-async function promptAppInstall(conn) {
-    utils.logBullet("Install the Cloud Build GitHub app to enable access to GitHub repositories");
-    const targetUri = conn.installationState.actionUri.replace("install_v2", "direct_install_v2");
-    utils.logBullet(targetUri);
-    await utils.openInBrowser(targetUri);
-    await (0, prompt_1.promptOnce)({
-        type: "input",
-        message: "Press Enter once you have installed or configured the Cloud Build GitHub app to access your GitHub repo.",
-    });
-    const { projectId, location, id } = parseConnectionName(conn.name);
-    return await gcb.getConnection(projectId, location, id);
 }
 async function createConnection(projectId, location, connectionId, githubConfig) {
     const op = await gcb.createConnection(projectId, location, connectionId, githubConfig);

package/package.json

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