firebase-tools 11.9.0 → 11.10.0

package/lib/extensions/askUserForConsent.js

@@ -1,52 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.promptForPublisherTOS = exports.displayApis = exports.displayRoles = exports.retrieveRoleInfo = exports.formatDescription = void 0;
-const clc = require("colorette");
+exports.promptForPublisherTOS = void 0;
 const { marked } = require("marked");
 const TerminalRenderer = require("marked-terminal");
 const error_1 = require("../error");
 const extensionsHelper_1 = require("../extensions/extensionsHelper");
-const iam = require("../gcp/iam");
 const prompt_1 = require("../prompt");
 const utils = require("../utils");
 marked.setOptions({
     renderer: new TerminalRenderer(),
 });
-async function formatDescription(extensionName, projectId, roles) {
-    const question = `${clc.bold(extensionName)} will be granted the following access to project ${clc.bold(projectId)}`;
-    const results = await Promise.all(roles.map((role) => {
-        return retrieveRoleInfo(role);
-    }));
-    results.unshift(question);
-    return results.join("\n");
-}
-exports.formatDescription = formatDescription;
-async function retrieveRoleInfo(role) {
-    const res = await iam.getRole(role);
-    return `- ${res.title} (${res.description})`;
-}
-exports.retrieveRoleInfo = retrieveRoleInfo;
-async function displayRoles(extensionName, projectId, roles) {
-    if (!roles.length) {
-        return;
-    }
-    const message = await formatDescription(extensionName, projectId, roles);
-    utils.logLabeledBullet(extensionsHelper_1.logPrefix, message);
-}
-exports.displayRoles = displayRoles;
-function displayApis(extensionName, projectId, apis) {
-    if (!apis.length) {
-        return;
-    }
-    const question = `${clc.bold(extensionName)} will enable the following APIs for project ${clc.bold(projectId)}`;
-    const results = apis.map((api) => {
-        return `- ${api.apiName}: ${api.reason}`;
-    });
-    results.unshift(question);
-    const message = results.join("\n");
-    utils.logLabeledBullet(extensionsHelper_1.logPrefix, message);
-}
-exports.displayApis = displayApis;
 async function promptForPublisherTOS() {
     const termsOfServiceMsg = "By registering as a publisher, you confirm that you have read the Firebase Extensions Publisher Terms and Conditions (linked below) and you, on behalf of yourself and the organization you represent, agree to comply with it.  Here is a brief summary of the highlights of our terms and conditions:\n" +
         "  - You ensure extensions you publish comply with all laws and regulations; do not include any viruses, spyware, Trojan horses, or other malicious code; and do not violate any person’s rights, including intellectual property, privacy, and security rights.\n" +

package/lib/extensions/displayExtensionInfo.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.printSourceDownloadLink = exports.displayExtInfo = void 0;
+exports.retrieveRoleInfo = exports.printSourceDownloadLink = exports.displayExtInfo = void 0;
 const clc = require("colorette");
 const { marked } = require("marked");
 const TerminalRenderer = require("marked-terminal");
@@ -8,10 +8,12 @@ const utils = require("../utils");
 const extensionsHelper_1 = require("./extensionsHelper");
 const logger_1 = require("../logger");
 const error_1 = require("../error");
+const iam = require("../gcp/iam");
 marked.setOptions({
     renderer: new TerminalRenderer(),
 });
-function displayExtInfo(extensionName, publisher, spec, published = false) {
+async function displayExtInfo(extensionName, publisher, spec, published = false) {
+    var _a, _b;
     const lines = [];
     lines.push(`**Name**: ${spec.displayName}`);
     if (publisher) {
@@ -26,6 +28,12 @@ function displayExtInfo(extensionName, publisher, spec, published = false) {
         }
         lines.push(`**Source code**: ${spec.sourceUrl}`);
     }
+    if ((_a = spec.apis) === null || _a === void 0 ? void 0 : _a.length) {
+        lines.push(displayApis(spec.apis));
+    }
+    if ((_b = spec.roles) === null || _b === void 0 ? void 0 : _b.length) {
+        lines.push(await displayRoles(spec.roles));
+    }
     if (lines.length > 0) {
         utils.logLabeledBullet(extensionsHelper_1.logPrefix, `information about '${clc.bold(extensionName)}':`);
         const infoStr = lines.join("\n");
@@ -48,3 +56,20 @@ function printSourceDownloadLink(sourceDownloadUri) {
     utils.logBullet(marked(sourceDownloadMsg));
 }
 exports.printSourceDownloadLink = printSourceDownloadLink;
+async function retrieveRoleInfo(role) {
+    const res = await iam.getRole(role);
+    return `  ${res.title} (${res.description})`;
+}
+exports.retrieveRoleInfo = retrieveRoleInfo;
+async function displayRoles(roles) {
+    const lines = await Promise.all(roles.map((role) => {
+        return retrieveRoleInfo(role.role);
+    }));
+    return clc.bold("**Roles granted to this Extension**:\n") + lines.join("\n");
+}
+function displayApis(apis) {
+    const lines = apis.map((api) => {
+        return `  ${api.apiName} (${api.reason})`;
+    });
+    return "**APIs used by this Extension**:\n" + lines.join("\n");
+}

package/lib/extensions/updateHelper.js

@@ -1,17 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.inferUpdateSource = exports.updateFromPublisherSource = exports.updateToVersionFromPublisherSource = exports.updateFromUrlSource = exports.updateFromLocalSource = exports.update = exports.warningUpdateToOtherSource = exports.getExistingSourceOrigin = void 0;
+exports.inferUpdateSource = exports.updateFromUrlSource = exports.updateFromLocalSource = exports.update = exports.warningUpdateToOtherSource = exports.getExistingSourceOrigin = void 0;
 const clc = require("colorette");
 const semver = require("semver");
 const { marked } = require("marked");
 const error_1 = require("../error");
 const logger_1 = require("../logger");
 const extensionsApi = require("./extensionsApi");
-const refs = require("./refs");
 const extensionsHelper_1 = require("./extensionsHelper");
 const utils = require("../utils");
 const displayExtensionInfo_1 = require("./displayExtensionInfo");
-const changelog = require("./changelog");
 function invalidSourceErrMsgTemplate(instanceId, source) {
     return `Unable to update from the source \`${clc.bold(source)}\`. To update this instance, you can either:\n
   - Run \`${clc.bold("firebase ext:update " + instanceId)}\` to update from the published source.\n
@@ -80,7 +78,7 @@ async function update(updateOptions) {
 }
 exports.update = update;
 async function updateFromLocalSource(projectId, instanceId, localSource, existingSpec) {
-    (0, displayExtensionInfo_1.displayExtInfo)(instanceId, "", existingSpec, false);
+    await (0, displayExtensionInfo_1.displayExtInfo)(instanceId, "", existingSpec, false);
     let source;
     try {
         source = await (0, extensionsHelper_1.createSourceFromLocation)(projectId, localSource);
@@ -95,7 +93,7 @@ async function updateFromLocalSource(projectId, instanceId, localSource, existin
 }
 exports.updateFromLocalSource = updateFromLocalSource;
 async function updateFromUrlSource(projectId, instanceId, urlSource, existingSpec) {
-    (0, displayExtensionInfo_1.displayExtInfo)(instanceId, "", existingSpec, false);
+    await (0, displayExtensionInfo_1.displayExtInfo)(instanceId, "", existingSpec, false);
     let source;
     try {
         source = await (0, extensionsHelper_1.createSourceFromLocation)(projectId, urlSource);
@@ -109,36 +107,6 @@ async function updateFromUrlSource(projectId, instanceId, urlSource, existingSpe
     return source.name;
 }
 exports.updateFromUrlSource = updateFromUrlSource;
-async function updateToVersionFromPublisherSource(projectId, instanceId, extVersionRef, existingSpec) {
-    let source;
-    const ref = refs.parse(extVersionRef);
-    const version = ref.version;
-    const extensionRef = refs.toExtensionRef(ref);
-    (0, displayExtensionInfo_1.displayExtInfo)(instanceId, ref.publisherId, existingSpec, true);
-    const extension = await extensionsApi.getExtension(extensionRef);
-    try {
-        source = await extensionsApi.getExtensionVersion(extVersionRef);
-    }
-    catch (err) {
-        throw new error_1.FirebaseError(`Could not find source '${clc.bold(extVersionRef)}' because (${clc.bold(version || "")}) is not a published version. To update, use the latest version of this extension (${clc.bold(extension.latestVersion || "")}).`);
-    }
-    showUpdateVersionInfo(instanceId, existingSpec.version, source.spec.version, extVersionRef);
-    warningUpdateToOtherSource(extensionsHelper_1.SourceOrigin.PUBLISHED_EXTENSION);
-    const releaseNotes = await changelog.getReleaseNotesForUpdate({
-        extensionRef,
-        fromVersion: existingSpec.version,
-        toVersion: source.spec.version,
-    });
-    if (Object.keys(releaseNotes).length) {
-        changelog.displayReleaseNotes(releaseNotes, existingSpec.version);
-    }
-    return source.name;
-}
-exports.updateToVersionFromPublisherSource = updateToVersionFromPublisherSource;
-async function updateFromPublisherSource(projectId, instanceId, extRef, existingSpec) {
-    return updateToVersionFromPublisherSource(projectId, instanceId, `${extRef}@latest`, existingSpec);
-}
-exports.updateFromPublisherSource = updateFromPublisherSource;
 function inferUpdateSource(updateSource, existingRef) {
     if (!updateSource) {
         return `${existingRef}@latest`;

package/lib/gcp/cloudfunctionsv2.js

@@ -13,7 +13,7 @@ const proto = require("./proto");
 const utils = require("../utils");
 const projectConfig = require("../functions/projectConfig");
 const constants_1 = require("../functions/constants");
-exports.API_VERSION = "v2alpha";
+exports.API_VERSION = "v2";
 const client = new apiv2_1.Client({
     urlPrefix: api_1.functionsV2Origin,
     auth: true,
@@ -112,7 +112,10 @@ async function listFunctionsInternal(projectId, region) {
     let pageToken = "";
     while (true) {
         const url = `projects/${projectId}/locations/${region}/functions`;
-        const opts = pageToken === "" ? {} : { queryParams: { pageToken } };
+        const opts = { queryParams: { filter: `environment="GEN_2"` } };
+        if (pageToken !== "") {
+            opts.queryParams = Object.assign(Object.assign({}, opts.queryParams), { pageToken });
+        }
         const res = await client.get(url, opts);
         functions.push(...(res.body.functions || []));
         for (const region of res.body.unreachable || []) {

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, golang: false, deletegcfartifacts: false, emulatoruisnapshot: false, frameworkawareness: false, functionsparams: false, crossservicerules: false, skipdeployingnoopfunctions: false }, configstore_1.configstore.get("previews"));
+exports.previews = Object.assign({ rtdbrules: false, ext: false, extdev: false, rtdbmanagement: false, golang: false, deletegcfartifacts: false, emulatoruisnapshot: false, frameworkawareness: false, functionsparams: false, skipdeployingnoopfunctions: false }, configstore_1.configstore.get("previews"));
 if (process.env.FIREBASE_CLI_PREVIEWS) {
     process.env.FIREBASE_CLI_PREVIEWS.split(",").forEach((feature) => {
         if ((0, lodash_1.has)(exports.previews, feature)) {

package/lib/rulesDeploy.js

@@ -11,7 +11,6 @@ const utils = require("./utils");
 const prompt_1 = require("./prompt");
 const getProjectNumber_1 = require("./getProjectNumber");
 const resourceManager_1 = require("./gcp/resourceManager");
-const previews_1 = require("./previews");
 const QUOTA_EXCEEDED_STATUS_CODE = 429;
 const RULESET_COUNT_LIMIT = 1000;
 const RULESETS_TO_GC = 10;
@@ -99,7 +98,7 @@ class RulesDeploy {
                 this.rulesetNames[filename] = latestRulesetName;
                 continue;
             }
-            if (previews_1.previews.crossservicerules && service === RulesetServiceType.FIREBASE_STORAGE) {
+            if (service === RulesetServiceType.FIREBASE_STORAGE) {
                 await this.checkStorageRulesIamPermissions((_a = files[0]) === null || _a === void 0 ? void 0 : _a.content);
             }
             utils.logLabeledBullet(RulesetType[this.type], `uploading rules ${(0, colorette_1.bold)(filename)}...`);

package/lib/serve/hosting.js

@@ -48,7 +48,7 @@ function startServer(options, config, port, init) {
     };
     if (process.platform === "darwin") {
         try {
-            (0, child_process_1.execSync)(`lsof -i :${port}`);
+            (0, child_process_1.execSync)(`lsof -i :${port} -sTCP:LISTEN`);
             portInUse();
             return;
         }

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "firebase-tools",
-  "version": "11.9.0",
+  "version": "11.10.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "firebase-tools",
-      "version": "11.9.0",
+      "version": "11.10.0",
       "license": "MIT",
       "dependencies": {
         "@google-cloud/pubsub": "^3.0.1",
@@ -133,10 +133,11 @@
         "eslint-plugin-prettier": "^4.0.0",
         "firebase": "^7.24.0",
         "firebase-admin": "^9.4.2",
-        "firebase-functions": "^3.22.0",
+        "firebase-functions": "^3.23.0",
         "google-discovery-to-swagger": "^2.1.0",
         "mocha": "^9.1.3",
         "nock": "^13.0.5",
+        "node-mocks-http": "^1.11.0",
         "nyc": "^15.1.0",
         "openapi-merge": "^1.0.23",
         "prettier": "^2.5.1",
@@ -6349,9 +6350,9 @@
       "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="
     },
     "node_modules/firebase-functions": {
-      "version": "3.22.0",
-      "resolved": "https://registry.npmjs.org/firebase-functions/-/firebase-functions-3.22.0.tgz",
-      "integrity": "sha512-d1BxBpT95MhvVqXkpLWDvWbyuX7e2l69cFAiqG3U1XQDaMV88bM9S+Zg7H8i9pitEGFr+76ErjKgrY0n+g3ZDA==",
+      "version": "3.23.0",
+      "resolved": "https://registry.npmjs.org/firebase-functions/-/firebase-functions-3.23.0.tgz",
+      "integrity": "sha512-/jujnNChTWIuoXK3IPNGYu1zjXF1fYRy88uYbkrJhs3dhK6EdXZi0rX6JUEOCB7h6IkRQvbio+bvtaoI7h+4Lg==",
       "dev": true,
       "dependencies": {
         "@types/cors": "^2.8.5",
@@ -9992,6 +9993,39 @@
         "node": ">= 8"
       }
     },
+    "node_modules/node-mocks-http": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/node-mocks-http/-/node-mocks-http-1.11.0.tgz",
+      "integrity": "sha512-jS/WzSOcKbOeGrcgKbenZeNhxUNnP36Yw11+hL4TTxQXErGfqYZ+MaYNNvhaTiGIJlzNSqgQkk9j8dSu1YWSuw==",
+      "dev": true,
+      "dependencies": {
+        "accepts": "^1.3.7",
+        "content-disposition": "^0.5.3",
+        "depd": "^1.1.0",
+        "fresh": "^0.5.2",
+        "merge-descriptors": "^1.0.1",
+        "methods": "^1.1.2",
+        "mime": "^1.3.4",
+        "parseurl": "^1.3.3",
+        "range-parser": "^1.2.0",
+        "type-is": "^1.6.18"
+      },
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/node-mocks-http/node_modules/mime": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+      "dev": true,
+      "bin": {
+        "mime": "cli.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/node-preload": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/node-preload/-/node-preload-0.2.1.tgz",
@@ -19307,9 +19341,9 @@
       }
     },
     "firebase-functions": {
-      "version": "3.22.0",
-      "resolved": "https://registry.npmjs.org/firebase-functions/-/firebase-functions-3.22.0.tgz",
-      "integrity": "sha512-d1BxBpT95MhvVqXkpLWDvWbyuX7e2l69cFAiqG3U1XQDaMV88bM9S+Zg7H8i9pitEGFr+76ErjKgrY0n+g3ZDA==",
+      "version": "3.23.0",
+      "resolved": "https://registry.npmjs.org/firebase-functions/-/firebase-functions-3.23.0.tgz",
+      "integrity": "sha512-/jujnNChTWIuoXK3IPNGYu1zjXF1fYRy88uYbkrJhs3dhK6EdXZi0rX6JUEOCB7h6IkRQvbio+bvtaoI7h+4Lg==",
       "dev": true,
       "requires": {
         "@types/cors": "^2.8.5",
@@ -22170,6 +22204,32 @@
         }
       }
     },
+    "node-mocks-http": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/node-mocks-http/-/node-mocks-http-1.11.0.tgz",
+      "integrity": "sha512-jS/WzSOcKbOeGrcgKbenZeNhxUNnP36Yw11+hL4TTxQXErGfqYZ+MaYNNvhaTiGIJlzNSqgQkk9j8dSu1YWSuw==",
+      "dev": true,
+      "requires": {
+        "accepts": "^1.3.7",
+        "content-disposition": "^0.5.3",
+        "depd": "^1.1.0",
+        "fresh": "^0.5.2",
+        "merge-descriptors": "^1.0.1",
+        "methods": "^1.1.2",
+        "mime": "^1.3.4",
+        "parseurl": "^1.3.3",
+        "range-parser": "^1.2.0",
+        "type-is": "^1.6.18"
+      },
+      "dependencies": {
+        "mime": {
+          "version": "1.6.0",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+          "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+          "dev": true
+        }
+      }
+    },
     "node-preload": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/node-preload/-/node-preload-0.2.1.tgz",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-tools",
-  "version": "11.9.0",
+  "version": "11.10.0",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "bin": {
@@ -210,10 +210,11 @@
     "eslint-plugin-prettier": "^4.0.0",
     "firebase": "^7.24.0",
     "firebase-admin": "^9.4.2",
-    "firebase-functions": "^3.22.0",
+    "firebase-functions": "^3.23.0",
     "google-discovery-to-swagger": "^2.1.0",
     "mocha": "^9.1.3",
     "nock": "^13.0.5",
+    "node-mocks-http": "^1.11.0",
     "nyc": "^15.1.0",
     "openapi-merge": "^1.0.23",
     "prettier": "^2.5.1",