firebase-tools 9.21.0 → 9.23.2

package/lib/gcp/secretManager.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.grantServiceAgentRole = exports.addVersion = exports.createSecret = exports.parseSecretResourceName = exports.secretExists = exports.getSecretLabels = exports.getSecret = exports.listSecrets = void 0;
+exports.grantServiceAgentRole = exports.addVersion = exports.createSecret = exports.toSecretVersionResourceName = exports.parseSecretVersionResourceName = exports.parseSecretResourceName = exports.secretExists = exports.getSecretVersion = exports.getSecret = exports.listSecrets = exports.secretManagerConsoleUri = void 0;
+const utils_1 = require("../utils");
 const api = require("../api");
+exports.secretManagerConsoleUri = (projectId) => `https://console.cloud.google.com/security/secret-manager?project=${projectId}`;
 async function listSecrets(projectId) {
     const listRes = await api.request("GET", `/v1beta1/projects/${projectId}/secrets`, {
         auth: true,
@@ -11,21 +13,24 @@ async function listSecrets(projectId) {
 }
 exports.listSecrets = listSecrets;
 async function getSecret(projectId, name) {
+    var _a;
     const getRes = await api.request("GET", `/v1beta1/projects/${projectId}/secrets/${name}`, {
         auth: true,
         origin: api.secretManagerOrigin,
     });
-    return parseSecretResourceName(getRes.body.name);
+    const secret = parseSecretResourceName(getRes.body.name);
+    secret.labels = (_a = getRes.body.labels) !== null && _a !== void 0 ? _a : {};
+    return secret;
 }
 exports.getSecret = getSecret;
-async function getSecretLabels(projectId, name) {
-    const getRes = await api.request("GET", `/v1beta1/projects/${projectId}/secrets/${name}`, {
+async function getSecretVersion(projectId, name, version) {
+    const getRes = await api.request("GET", `/v1beta1/projects/${projectId}/secrets/${name}/versions/${version}`, {
         auth: true,
         origin: api.secretManagerOrigin,
     });
-    return getRes.body.labels;
+    return parseSecretVersionResourceName(getRes.body.name);
 }
-exports.getSecretLabels = getSecretLabels;
+exports.getSecretVersion = getSecretVersion;
 async function secretExists(projectId, name) {
     try {
         await getSecret(projectId, name);
@@ -47,6 +52,21 @@ function parseSecretResourceName(resourceName) {
     };
 }
 exports.parseSecretResourceName = parseSecretResourceName;
+function parseSecretVersionResourceName(resourceName) {
+    const nameTokens = resourceName.split("/");
+    return {
+        secret: {
+            projectId: nameTokens[1],
+            name: nameTokens[3],
+        },
+        versionId: nameTokens[5],
+    };
+}
+exports.parseSecretVersionResourceName = parseSecretVersionResourceName;
+function toSecretVersionResourceName(secretVersion) {
+    return `projects/${secretVersion.secret.projectId}/secrets/${secretVersion.secret.name}/versions/${secretVersion.versionId}`;
+}
+exports.toSecretVersionResourceName = toSecretVersionResourceName;
 async function createSecret(projectId, name, labels) {
     const createRes = await api.request("POST", `/v1beta1/projects/${projectId}/secrets?secretId=${name}`, {
         auth: true,
@@ -107,5 +127,6 @@ async function grantServiceAgentRole(secret, serviceAccountEmail, role) {
             },
         },
     });
+    utils_1.logLabeledSuccess("SecretManager", `Granted ${role} on projects/${secret.projectId}/secrets/${secret.name} to ${serviceAccountEmail}`);
 }
 exports.grantServiceAgentRole = grantServiceAgentRole;

package/lib/gcp/storage.js

@@ -1,26 +1,29 @@
 "use strict";
-var path = require("path");
-var api = require("../api");
-const { logger } = require("../logger");
-var { FirebaseError } = require("../error");
-function _getDefaultBucket(projectId) {
-    return api
-        .request("GET", "/v1/apps/" + projectId, {
-        auth: true,
-        origin: api.appengineOrigin,
-    })
-        .then(function (resp) {
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getServiceAccount = exports.getBucket = exports.deleteObject = exports.uploadObject = exports.upload = exports.getDefaultBucket = void 0;
+const path = require("path");
+const api = require("../api");
+const logger_1 = require("../logger");
+const error_1 = require("../error");
+async function getDefaultBucket(projectId) {
+    try {
+        const resp = await api.request("GET", "/v1/apps/" + projectId, {
+            auth: true,
+            origin: api.appengineOrigin,
+        });
         if (resp.body.defaultBucket === "undefined") {
-            logger.debug("Default storage bucket is undefined.");
-            return Promise.reject(new FirebaseError("Your project is being set up. Please wait a minute before deploying again."));
+            logger_1.logger.debug("Default storage bucket is undefined.");
+            throw new error_1.FirebaseError("Your project is being set up. Please wait a minute before deploying again.");
         }
-        return Promise.resolve(resp.body.defaultBucket);
-    }, function (err) {
-        logger.info("\n\nThere was an issue deploying your functions. Verify that your project has a Google App Engine instance setup at https://console.cloud.google.com/appengine and try again. If this issue persists, please contact support.");
-        return Promise.reject(err);
-    });
+        return resp.body.defaultBucket;
+    }
+    catch (err) {
+        logger_1.logger.info("\n\nThere was an issue deploying your functions. Verify that your project has a Google App Engine instance setup at https://console.cloud.google.com/appengine and try again. If this issue persists, please contact support.");
+        throw err;
+    }
 }
-async function _uploadSource(source, uploadUrl, extraHeaders) {
+exports.getDefaultBucket = getDefaultBucket;
+async function upload(source, uploadUrl, extraHeaders) {
     const url = new URL(uploadUrl);
     const result = await api.request("PUT", url.pathname + url.search, {
         data: source.stream,
@@ -33,9 +36,10 @@ async function _uploadSource(source, uploadUrl, extraHeaders) {
         generation: result.response.headers["x-goog-generation"],
     };
 }
-async function _uploadObject(source, bucketName) {
+exports.upload = upload;
+async function uploadObject(source, bucketName) {
     if (path.extname(source.file) !== ".zip") {
-        throw new FirebaseError(`Expected a file name ending in .zip, got ${source.file}`);
+        throw new error_1.FirebaseError(`Expected a file name ending in .zip, got ${source.file}`);
     }
     const location = `/${bucketName}/${path.basename(source.file)}`;
     const result = await api.request("PUT", location, {
@@ -55,13 +59,15 @@ async function _uploadObject(source, bucketName) {
         generation: result.response.headers["x-goog-generation"],
     };
 }
-function _deleteObject(location) {
+exports.uploadObject = uploadObject;
+function deleteObject(location) {
     return api.request("DELETE", location, {
         auth: true,
         origin: api.storageOrigin,
     });
 }
-async function _getBucket(bucketName) {
+exports.deleteObject = deleteObject;
+async function getBucket(bucketName) {
     try {
         const result = await api.request("GET", `/storage/v1/b/${bucketName}`, {
             auth: true,
@@ -70,16 +76,26 @@ async function _getBucket(bucketName) {
         return result.body;
     }
     catch (err) {
-        logger.debug(err);
-        throw new FirebaseError("Failed to obtain the storage bucket", {
+        logger_1.logger.debug(err);
+        throw new error_1.FirebaseError("Failed to obtain the storage bucket", {
+            original: err,
+        });
+    }
+}
+exports.getBucket = getBucket;
+async function getServiceAccount(projectId) {
+    try {
+        const response = await api.request("GET", `/storage/v1/projects/${projectId}/serviceAccount`, {
+            auth: true,
+            origin: api.storageOrigin,
+        });
+        return response.body;
+    }
+    catch (err) {
+        logger_1.logger.debug(err);
+        throw new error_1.FirebaseError("Failed to obtain the Cloud Storage service agent", {
             original: err,
         });
     }
 }
-module.exports = {
-    getDefaultBucket: _getDefaultBucket,
-    deleteObject: _deleteObject,
-    upload: _uploadSource,
-    uploadObject: _uploadObject,
-    getBucket: _getBucket,
-};
+exports.getServiceAccount = getServiceAccount;

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

@@ -5,7 +5,7 @@ const logger_1 = require("../../../logger");
 const prompt_1 = require("../../../prompt");
 const requirePermissions_1 = require("../../../requirePermissions");
 const previews_1 = require("../../../previews");
-const ensureApiEnabled = require("../../../ensureApiEnabled");
+const ensureApiEnabled_1 = require("../../../ensureApiEnabled");
 module.exports = async function (setup, config, options) {
     var _a, _b;
     logger_1.logger.info();
@@ -17,8 +17,8 @@ module.exports = async function (setup, config, options) {
     if (projectId) {
         await requirePermissions_1.requirePermissions(Object.assign(Object.assign({}, options), { project: projectId }));
         await Promise.all([
-            ensureApiEnabled.enable(projectId, "cloudfunctions.googleapis.com"),
-            ensureApiEnabled.enable(projectId, "runtimeconfig.googleapis.com"),
+            ensureApiEnabled_1.ensure(projectId, "cloudfunctions.googleapis.com", "unused", true),
+            ensureApiEnabled_1.ensure(projectId, "runtimeconfig.googleapis.com", "unused", true),
         ]);
     }
     const choices = [

package/lib/init/features/hosting/github.js

@@ -31,6 +31,9 @@ async function initGitHub(setup, config, options) {
     if (!setup.projectId) {
         return utils_1.reject("Could not determine Project ID, can't set up GitHub workflow.", { exit: 1 });
     }
+    if (!setup.config.hosting) {
+        return utils_1.reject(`Didn't find a Hosting config in firebase.json. Run ${cli_color_1.bold("firebase init hosting")} instead.`);
+    }
     logger_1.logger.info();
     const gitRoot = getGitFolderPath();
     GIT_DIR = path.join(gitRoot, ".git");

package/lib/init/features/project.js

@@ -72,7 +72,7 @@ async function doSetup(setup, config, options) {
     logger_1.logger.info(`but for now we'll just set up a default project.`);
     logger_1.logger.info();
     const projectFromRcFile = _.get(setup.rcfile, "projects.default");
-    if (projectFromRcFile) {
+    if (projectFromRcFile && !options.project) {
         utils.logBullet(`.firebaserc already has a default project, using ${projectFromRcFile}.`);
         const rcProject = await projects_1.getFirebaseProject(projectFromRcFile);
         setup.projectId = rcProject.projectId;
@@ -81,6 +81,7 @@ async function doSetup(setup, config, options) {
     }
     let projectMetaData;
     if (options.project) {
+        logger_1.logger.debug(`Using project from CLI flag: ${options.project}`);
         projectMetaData = await projects_1.getFirebaseProject(options.project);
     }
     else {

package/lib/previews.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.previews = void 0;
 const lodash_1 = require("lodash");
 const configstore_1 = require("./configstore");
-exports.previews = Object.assign({ rtdbrules: false, ext: false, extdev: false, rtdbmanagement: false, functionsv2: false, golang: false, deletegcfartifacts: false, dotenv: false, crashlyticsSymbolsUpload: false }, configstore_1.configstore.get("previews"));
+exports.previews = Object.assign({ rtdbrules: false, ext: false, extdev: false, rtdbmanagement: false, functionsv2: false, golang: false, deletegcfartifacts: false, dotenv: false, artifactregistry: false }, configstore_1.configstore.get("previews"));
 if (process.env.FIREBASE_CLI_PREVIEWS) {
     process.env.FIREBASE_CLI_PREVIEWS.split(",").forEach((feature) => {
         if (lodash_1.has(exports.previews, feature)) {

package/lib/projectUtils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.needProjectNumber = exports.needProjectId = exports.getProjectId = void 0;
+exports.getAliases = exports.needProjectNumber = exports.needProjectId = exports.getProjectId = void 0;
 const projects_1 = require("./management/projects");
 const clc = require("cli-color");
 const marked = require("marked");
@@ -48,3 +48,12 @@ async function needProjectNumber(options) {
     return options.projectNumber;
 }
 exports.needProjectNumber = needProjectNumber;
+function getAliases(options, projectId) {
+    if (options.rc.hasProjects) {
+        return Object.entries(options.rc.projects)
+            .filter((entry) => entry[1] === projectId)
+            .map((entry) => entry[0]);
+    }
+    return [];
+}
+exports.getAliases = getAliases;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-tools",
-  "version": "9.21.0",
+  "version": "9.23.2",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "bin": {
@@ -26,6 +26,7 @@
     "test:client-integration": "./scripts/client-integration-tests/run.sh",
     "test:compile": "tsc --project tsconfig.compile.json",
     "test:emulator": "./scripts/emulator-tests/run.sh",
+    "test:extensions-deploy": "./scripts/extensions-deploy-tests/run.sh",
     "test:extensions-emulator": "./scripts/extensions-emulator-tests/run.sh",
     "test:hosting": "./scripts/hosting-tests/run.sh",
     "test:triggers-end-to-end": "./scripts/triggers-end-to-end-tests/run.sh",
@@ -93,7 +94,7 @@
     "chokidar": "^3.0.2",
     "cjson": "^0.3.1",
     "cli-color": "^1.2.0",
-    "cli-table": "^0.3.1",
+    "cli-table": "0.3.11",
     "commander": "^4.0.1",
     "configstore": "^5.0.1",
     "cors": "^2.8.5",
@@ -137,7 +138,7 @@
     "universal-analytics": "^0.4.16",
     "unzipper": "^0.10.10",
     "update-notifier": "^5.1.0",
-    "uuid": "^3.0.0",
+    "uuid": "^8.3.2",
     "winston": "^3.0.0",
     "winston-transport": "^4.4.0",
     "ws": "^7.2.3"
@@ -181,7 +182,7 @@
     "@types/tmp": "^0.1.0",
     "@types/triple-beam": "^1.3.0",
     "@types/unzipper": "^0.10.0",
-    "@types/uuid": "^3.4.4",
+    "@types/uuid": "^8.3.1",
     "@types/winston": "^2.4.4",
     "@types/ws": "^7.2.3",
     "@typescript-eslint/eslint-plugin": "^4.12.0",

package/schema/firebase-config.json

@@ -1,6 +1,12 @@
 {
     "$schema": "http://json-schema.org/draft-07/schema#",
     "additionalProperties": false,
+    "definitions": {
+        "ExtensionsConfig": {
+            "additionalProperties": false,
+            "type": "object"
+        }
+    },
     "properties": {
         "database": {
             "anyOf": [
@@ -273,6 +279,9 @@
             },
             "type": "object"
         },
+        "extensions": {
+            "$ref": "#/definitions/ExtensionsConfig"
+        },
         "firestore": {
             "additionalProperties": false,
             "properties": {