firebase-tools 13.13.0 → 13.13.2

package/lib/apphosting/githubConnections.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchAllRepositories = exports.listAppHostingConnections = exports.getOrCreateRepository = exports.getOrCreateConnection = exports.createConnection = exports.ensureSecretManagerAdminGrant = exports.getOrCreateOauthConnection = exports.linkGitHubRepository = exports.generateRepositoryId = exports.extractRepoSlugFromUri = exports.parseConnectionName = void 0;
+exports.fetchAllRepositories = exports.listAppHostingConnections = exports.getOrCreateRepository = exports.getOrCreateConnection = exports.createConnection = exports.ensureSecretManagerAdminGrant = exports.promptGitHubBranch = exports.getOrCreateOauthConnection = exports.linkGitHubRepository = exports.generateRepositoryId = exports.extractRepoSlugFromUri = exports.parseConnectionName = void 0;
 const clc = require("colorette");
 const devConnect = require("../gcp/devConnect");
 const rm = require("../gcp/resourceManager");
@@ -56,7 +56,7 @@ async function linkGitHubRepository(projectId, location) {
     var _a, _b;
     utils.logBullet(clc.bold(`${clc.yellow("===")} Import a GitHub repository`));
     const oauthConn = await getOrCreateOauthConnection(projectId, location);
-    const existingConns = await listAppHostingConnections(projectId);
+    const existingConns = await listAppHostingConnections(projectId, location);
     if (existingConns.length === 0) {
         existingConns.push(await createFullyInstalledConnection(projectId, location, generateConnectionId(), oauthConn));
     }
@@ -157,6 +157,22 @@ async function promptCloneUri(projectId, connections) {
     });
     return { cloneUri, connection: cloneUriToConnection[cloneUri] };
 }
+async function promptGitHubBranch(repoLink) {
+    const branches = await devConnect.listAllBranches(repoLink.name);
+    while (true) {
+        const branch = await (0, prompt_1.promptOnce)({
+            name: "branch",
+            type: "input",
+            default: "main",
+            message: "Pick a branch for continuous deployment",
+        });
+        if (branches.has(branch)) {
+            return branch;
+        }
+        utils.logWarning(`The branch "${branch}" does not exist on "${extractRepoSlugFromUri(repoLink.cloneUri)}". Please enter a valid branch for this repo.`);
+    }
+}
+exports.promptGitHubBranch = promptGitHubBranch;
 async function ensureSecretManagerAdminGrant(projectId) {
     const projectNumber = await (0, getProjectNumber_1.getProjectNumber)({ projectId });
     const dcsaEmail = devConnect.serviceAgentEmail(projectNumber);
@@ -237,8 +253,8 @@ async function getOrCreateRepository(projectId, location, connectionId, cloneUri
     return repo;
 }
 exports.getOrCreateRepository = getOrCreateRepository;
-async function listAppHostingConnections(projectId) {
-    const conns = await devConnect.listAllConnections(projectId, "-");
+async function listAppHostingConnections(projectId, location) {
+    const conns = await devConnect.listAllConnections(projectId, location);
     return conns.filter((conn) => APPHOSTING_CONN_PATTERN.test(conn.name) &&
         conn.installationState.stage === "COMPLETE" &&
         !conn.disabled);

package/lib/apphosting/index.js

@@ -66,19 +66,14 @@ async function doSetup(projectId, webAppName, location, serviceAccount) {
     }
     location =
         location || (await promptLocation(projectId, "Select a location to host your backend:\n"));
-    const gitRepositoryConnection = await githubConnections.linkGitHubRepository(projectId, location);
+    const gitRepositoryLink = 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 branch = await (0, prompt_1.promptOnce)({
-        name: "branch",
-        type: "input",
-        default: "main",
-        message: "Pick a branch for continuous deployment",
-    });
+    const branch = await githubConnections.promptGitHubBranch(gitRepositoryLink);
     (0, utils_1.logSuccess)(`Repo linked successfully!\n`);
     (0, utils_1.logBullet)(`${clc.yellow("===")} Set up your backend`);
     const backendId = await promptNewBackendId(projectId, location, {
@@ -93,7 +88,7 @@ async function doSetup(projectId, webAppName, location, serviceAccount) {
         (0, utils_1.logWarning)(`Firebase web app not set`);
     }
     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);
+    const backend = await createBackend(projectId, location, backendId, gitRepositoryLink, serviceAccount, webApp === null || webApp === void 0 ? void 0 : webApp.id, rootDir);
     createBackendSpinner.succeed(`Successfully created backend!\n\t${backend.name}\n`);
     await setDefaultTrafficPolicy(projectId, location, backendId, branch);
     const confirmRollout = await (0, prompt_1.promptOnce)({

package/lib/auth.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addAdditionalAccount = exports.logout = exports.getAccessToken = exports.findAccountByEmail = exports.loginGithub = exports.loginGoogle = exports.setGlobalDefaultAccount = exports.setProjectAccount = exports.loginAdditionalAccount = exports.selectAccount = exports.setRefreshToken = exports.setActiveAccount = exports.getAllAccounts = exports.getAdditionalAccounts = exports.getProjectDefaultAccount = exports.getGlobalDefaultAccount = void 0;
+exports.addAdditionalAccount = exports.logout = exports.getAccessToken = exports.findAccountByEmail = exports.loginGithub = exports.loginGoogle = exports.setGlobalDefaultAccount = exports.setProjectAccount = exports.loginAdditionalAccount = exports.selectAccount = exports.setAccessToken = exports.setRefreshToken = exports.setActiveAccount = exports.getAllAccounts = exports.getAdditionalAccounts = exports.getProjectDefaultAccount = exports.getGlobalDefaultAccount = void 0;
 const clc = require("colorette");
 const FormData = require("form-data");
 const http = require("http");
@@ -61,9 +61,10 @@ function getAllAccounts() {
     return res;
 }
 exports.getAllAccounts = getAllAccounts;
-function setActiveAccount(options, account) {
+async function setActiveAccount(options, account) {
     if (account.tokens.refresh_token) {
         setRefreshToken(account.tokens.refresh_token);
+        setAccessToken(await apiv2.getAccessToken());
     }
     options.user = account.user;
     options.tokens = account.tokens;
@@ -73,6 +74,10 @@ function setRefreshToken(token) {
     apiv2.setRefreshToken(token);
 }
 exports.setRefreshToken = setRefreshToken;
+function setAccessToken(token) {
+    apiv2.setAccessToken(token);
+}
+exports.setAccessToken = setAccessToken;
 function selectAccount(account, projectRoot) {
     const defaultUser = getProjectDefaultAccount(projectRoot);
     if (!account) {

package/lib/command.js

@@ -173,7 +173,7 @@ class Command {
         const projectRoot = options.projectRoot;
         const activeAccount = (0, auth_1.selectAccount)(account, projectRoot);
         if (activeAccount) {
-            (0, auth_1.setActiveAccount)(options, activeAccount);
+            await (0, auth_1.setActiveAccount)(options, activeAccount);
         }
         this.applyRC(options);
         if (options.project) {

package/lib/commands/dataconnect-services-list.js

@@ -44,7 +44,7 @@ exports.command = new command_1.Command("dataconnect:services:list")
         const instanceName = (_c = (_b = schema === null || schema === void 0 ? void 0 : schema.primaryDatasource.postgresql) === null || _b === void 0 ? void 0 : _b.cloudSql.instance) !== null && _c !== void 0 ? _c : "";
         const instanceId = instanceName.split("/").pop();
         const dbId = (_e = (_d = schema === null || schema === void 0 ? void 0 : schema.primaryDatasource.postgresql) === null || _d === void 0 ? void 0 : _d.database) !== null && _e !== void 0 ? _e : "";
-        const dbName = `CloudSQL Instance: ${instanceId}\nDatabase:${dbId}`;
+        const dbName = `CloudSQL Instance: ${instanceId}\nDatabase: ${dbId}`;
         table.push([
             serviceName.serviceId,
             serviceName.location,

package/lib/deploy/functions/build.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toBackend = exports.resolveBackend = exports.AllIngressSettings = exports.AllVpcEgressSettings = exports.AllFunctionsPlatforms = exports.isBlockingTriggered = exports.isTaskQueueTriggered = exports.isScheduleTriggered = exports.isEventTriggered = exports.isCallableTriggered = exports.isHttpsTriggered = exports.of = exports.empty = void 0;
+exports.toBackend = exports.envWithTypes = exports.resolveBackend = exports.AllIngressSettings = exports.AllVpcEgressSettings = exports.AllFunctionsPlatforms = exports.isBlockingTriggered = exports.isTaskQueueTriggered = exports.isScheduleTriggered = exports.isEventTriggered = exports.isCallableTriggered = exports.isHttpsTriggered = exports.of = exports.empty = void 0;
 const backend = require("./backend");
 const proto = require("../../gcp/proto");
 const api = require("../../.../../api");
@@ -114,12 +114,21 @@ function envWithTypes(definedParams, rawEnvs) {
                         list: true,
                     };
                 }
+                else if (param.type === "secret") {
+                    providedType = {
+                        string: true,
+                        boolean: false,
+                        number: false,
+                        list: false,
+                    };
+                }
             }
         }
         out[envName] = new params.ParamValue(value, false, providedType);
     }
     return out;
 }
+exports.envWithTypes = envWithTypes;
 class Resolver {
     constructor(paramValues) {
         this.paramValues = paramValues;

package/lib/emulator/controller.js

@@ -322,6 +322,7 @@ async function startAll(options, showUI = true, runningTestScript = false) {
                 env: Object.assign({}, options.extDevEnv),
                 secretEnv: [],
                 predefinedTriggers: options.extDevTriggers,
+                ignore: cfg.ignore,
             });
         }
     }

package/lib/emulator/downloadableEmulators.js

@@ -46,20 +46,20 @@ const EMULATOR_UPDATE_DETAILS = {
     },
     dataconnect: process.platform === "darwin"
         ? {
-            version: "1.2.3",
-            expectedSize: 24056640,
-            expectedChecksum: "3ed315b230965d5a6471de08e59c226a",
+            version: "1.2.4",
+            expectedSize: 24097600,
+            expectedChecksum: "e0a344620b71d64b79d99b2c358e7646",
         }
         : process.platform === "win32"
             ? {
-                version: "1.2.3",
-                expectedSize: 24466432,
-                expectedChecksum: "a371516844fea7ea6aad3c82baf0149c",
+                version: "1.2.4",
+                expectedSize: 24509440,
+                expectedChecksum: "44ebc07e481a85bd735fe8007fab3efe",
             }
             : {
-                version: "1.2.3",
-                expectedSize: 23965848,
-                expectedChecksum: "c5c342d76b0c118e74a5f6ecdcaa58b8",
+                version: "1.2.4",
+                expectedSize: 24010904,
+                expectedChecksum: "bf10e866f4c4e132bf8115460508e6e2",
             },
 };
 exports.DownloadDetails = {

package/lib/emulator/functionsEmulator.js

@@ -248,6 +248,7 @@ class FunctionsEmulator {
         return Promise.resolve();
     }
     async connect() {
+        var _a, _b;
         for (const backend of this.args.emulatableBackends) {
             this.logger.logLabeled("BULLET", "functions", `Watching "${backend.functionsDir}" for Cloud Functions...`);
             const watcher = chokidar.watch(backend.functionsDir, {
@@ -256,6 +257,7 @@ class FunctionsEmulator {
                     /(^|[\/\\])\../,
                     /.+\.log/,
                     /.+?[\\\/]venv[\\\/].+?/,
+                    ...((_b = (_a = backend.ignore) === null || _a === void 0 ? void 0 : _a.map((i) => `**/${i}`)) !== null && _b !== void 0 ? _b : []),
                 ],
                 persistent: true,
             });

package/lib/experiments.js

@@ -26,7 +26,7 @@ exports.ALL_EXPERIMENTS = experiments({
             "of deploys. This has been made an experiment due to backend bugs that are " +
             "temporarily causing failures in some regions with this optimization enabled",
         public: true,
-        default: false,
+        default: true,
     },
     deletegcfartifacts: {
         shortDescription: `Add the ${(0, colorette_1.bold)("functions:deletegcfartifacts")} command to purge docker build images`,

package/lib/gcp/cloudsql/cloudsqladmin.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.listUsers = exports.deleteUser = exports.getUser = exports.createUser = exports.createDatabase = exports.getDatabase = exports.listDatabases = exports.updateInstanceForDataConnect = exports.createInstance = exports.instanceConsoleLink = exports.getInstance = exports.listInstances = void 0;
+exports.listUsers = exports.deleteUser = exports.getUser = exports.createUser = exports.deleteDatabase = exports.createDatabase = exports.getDatabase = exports.listDatabases = exports.updateInstanceForDataConnect = exports.createInstance = exports.instanceConsoleLink = exports.getInstance = exports.listInstances = void 0;
 const apiv2_1 = require("../../apiv2");
 const api_1 = require("../../api");
 const operationPoller = require("../../operation-poller");
@@ -125,6 +125,11 @@ async function createDatabase(projectId, instanceId, databaseId) {
     return pollRes;
 }
 exports.createDatabase = createDatabase;
+async function deleteDatabase(projectId, instanceId, databaseId) {
+    const res = await client.delete(`projects/${projectId}/instances/${instanceId}/databases/${databaseId}`);
+    return res.body;
+}
+exports.deleteDatabase = deleteDatabase;
 async function createUser(projectId, instanceId, type, username, password) {
     const maxRetries = 3;
     let retries = 0;

package/lib/gcp/devConnect.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateP4SA = exports.serviceAgentEmail = exports.getGitRepositoryLink = exports.createGitRepositoryLink = exports.listAllLinkableGitRepositories = exports.listAllConnections = exports.getConnection = exports.deleteConnection = exports.createConnection = exports.client = void 0;
+exports.generateP4SA = exports.serviceAgentEmail = exports.getGitRepositoryLink = exports.createGitRepositoryLink = exports.listAllBranches = exports.listAllLinkableGitRepositories = exports.listAllConnections = exports.getConnection = exports.deleteConnection = exports.createConnection = exports.client = void 0;
 const apiv2_1 = require("../apiv2");
 const api_1 = require("../api");
 const serviceusage_1 = require("./serviceusage");
@@ -72,6 +72,29 @@ async function listAllLinkableGitRepositories(projectId, location, connectionId)
     return repos;
 }
 exports.listAllLinkableGitRepositories = listAllLinkableGitRepositories;
+async function listAllBranches(repoLinkName) {
+    const branches = new Set();
+    const getNextPage = async (pageToken = "") => {
+        const res = await exports.client.get(`${repoLinkName}:fetchGitRefs`, {
+            queryParams: {
+                refType: "BRANCH",
+                pageSize: PAGE_SIZE_MAX,
+                pageToken,
+            },
+        });
+        if (Array.isArray(res.body.refNames)) {
+            res.body.refNames.forEach((branch) => {
+                branches.add(branch);
+            });
+        }
+        if (res.body.nextPageToken) {
+            await getNextPage(res.body.nextPageToken);
+        }
+    };
+    await getNextPage();
+    return branches;
+}
+exports.listAllBranches = listAllBranches;
 async function createGitRepositoryLink(projectId, location, connectionId, gitRepositoryLinkId, cloneUri) {
     const res = await exports.client.post(`projects/${projectId}/locations/${LOCATION_OVERRIDE !== null && LOCATION_OVERRIDE !== void 0 ? LOCATION_OVERRIDE : location}/connections/${connectionId}/gitRepositoryLinks`, { cloneUri }, { queryParams: { gitRepositoryLinkId } });
     return res.body;

package/lib/init/features/account.js

@@ -52,7 +52,7 @@ async function doSetup(setup, config, options) {
     if (!account) {
         throw new error_1.FirebaseError(`No account selected, have you run "firebase login"?`, { exit: 1 });
     }
-    (0, auth_1.setActiveAccount)(options, account);
+    await (0, auth_1.setActiveAccount)(options, account);
     if (config.projectDir) {
         (0, auth_1.setProjectAccount)(config.projectDir, account.user.email);
     }

package/lib/requireAuth.js

@@ -20,9 +20,6 @@ function getAuthClient(config) {
     return authClient;
 }
 async function autoAuth(options, authScopes) {
-    if (process.env.MONOSPACE_ENV) {
-        throw new error_1.FirebaseError("autoAuth not yet implemented for IDX. Please run 'firebase login'");
-    }
     const client = getAuthClient({ scopes: authScopes, projectId: options.project });
     const token = await client.getAccessToken();
     token !== null ? apiv2.setAccessToken(token) : false;
@@ -34,6 +31,14 @@ async function autoAuth(options, authScopes) {
     catch (e) {
         logger_1.logger.debug(`Error getting account credentials.`);
     }
+    if (process.env.MONOSPACE_ENV && token && clientEmail) {
+        await (0, auth_1.setActiveAccount)(options, {
+            user: { email: clientEmail },
+            tokens: { access_token: token },
+        });
+        (0, auth_1.setGlobalDefaultAccount)({ user: { email: clientEmail }, tokens: { access_token: token } });
+        options.projectId = await client.getProjectId();
+    }
     return clientEmail;
 }
 async function requireAuth(options) {
@@ -71,7 +76,7 @@ async function requireAuth(options) {
     if (!user || !tokens) {
         throw new error_1.FirebaseError(AUTH_ERROR_MESSAGE);
     }
-    (0, auth_1.setActiveAccount)(options, { user, tokens });
+    await (0, auth_1.setActiveAccount)(options, { user, tokens });
     return user.email;
 }
 exports.requireAuth = requireAuth;

package/package.json

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