firebase-tools 10.7.1 → 10.7.2

package/lib/extensions/paramHelper.js

@@ -11,6 +11,7 @@ const askUserForParam = require("./askUserForParam");
 const track_1 = require("../track");
 const env = require("../functions/env");
 const utils_1 = require("../utils");
+const warnings_1 = require("./warnings");
 function getBaseParamBindings(params) {
     let ret = {};
     for (const [k, v] of Object.entries(params)) {
@@ -57,6 +58,7 @@ async function getParams(args) {
             paramsMessage);
     }
     else if (args.paramsEnvPath) {
+        (0, warnings_1.paramsFlagDeprecationWarning)();
         params = getParamsFromFile({
             paramSpecs: args.paramSpecs,
             paramsEnvPath: args.paramsEnvPath,

package/lib/extensions/warnings.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.displayWarningsForDeploy = exports.displayWarningPrompts = void 0;
+exports.paramsFlagDeprecationWarning = exports.displayWarningsForDeploy = exports.displayWarningPrompts = void 0;
 const { marked } = require("marked");
 const clc = require("cli-color");
 const extensionsApi_1 = require("./extensionsApi");
@@ -11,6 +11,7 @@ const deploymentSummary_1 = require("../deploy/extensions/deploymentSummary");
 const planner_1 = require("../deploy/extensions/planner");
 const functional_1 = require("../functional");
 const utils = require("../utils");
+const logger_1 = require("../logger");
 function displayEAPWarning({ publisherId, sourceDownloadUri, githubLink, }) {
     const publisherNameLink = githubLink ? `[${publisherId}](${githubLink})` : publisherId;
     const warningMsg = `This extension is in preview and is built by a developer in the [Extensions Publisher Early Access Program](http://bit.ly/firex-provider). Its functionality might change in backward-incompatible ways. Since this extension isn't built by Firebase, reach out to ${publisherNameLink} with questions about this extension.`;
@@ -68,3 +69,9 @@ async function displayWarningsForDeploy(instancesToCreate) {
     return experimental.length > 0 || eapExtensions.length > 0;
 }
 exports.displayWarningsForDeploy = displayWarningsForDeploy;
+function paramsFlagDeprecationWarning() {
+    logger_1.logger.warn("The --params flag is deprecated and will be removed in firebase-tools@11. " +
+        "Instead, use an extensions manifest and `firebase deploy --only extensions` to deploy extensions noninteractively. " +
+        "See https://firebase.google.com/docs/extensions/manifest for more details");
+}
+exports.paramsFlagDeprecationWarning = paramsFlagDeprecationWarning;

package/lib/gcp/cloudfunctionsv2.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.endpointFromFunction = exports.functionFromEndpoint = exports.deleteFunction = exports.updateFunction = exports.listAllFunctions = exports.listFunctions = exports.getFunction = exports.createFunction = exports.generateUploadUrl = exports.megabytes = exports.BLOCKING_LABEL = exports.CODEBASE_LABEL = exports.API_VERSION = void 0;
+exports.endpointFromFunction = exports.functionFromEndpoint = exports.deleteFunction = exports.updateFunction = exports.listAllFunctions = exports.listFunctions = exports.getFunction = exports.createFunction = exports.generateUploadUrl = exports.mebibytes = exports.BLOCKING_LABEL = exports.CODEBASE_LABEL = exports.API_VERSION = void 0;
 const clc = require("cli-color");
 const apiv2_1 = require("../apiv2");
 const error_1 = require("../error");
@@ -39,7 +39,7 @@ const BYTES_PER_UNIT = {
     Gi: 1 << 30,
     Ti: 1 << 40,
 };
-function megabytes(memory) {
+function mebibytes(memory) {
     const re = /^([0-9]+(\.[0-9]*)?)(Ki|Mi|Gi|Ti|k|M|G|T|([eE]([0-9]+)))?$/;
     const matches = re.exec(memory);
     if (!matches) {
@@ -54,9 +54,9 @@ function megabytes(memory) {
         const suffix = matches[3] || "";
         bytes = quantity * BYTES_PER_UNIT[suffix];
     }
-    return bytes / 1e6;
+    return bytes / (1 << 20);
 }
-exports.megabytes = megabytes;
+exports.mebibytes = mebibytes;
 function functionsOpLogReject(funcName, type, err) {
     var _a, _b;
     if (((_b = (_a = err === null || err === void 0 ? void 0 : err.context) === null || _a === void 0 ? void 0 : _a.response) === null || _b === void 0 ? void 0 : _b.statusCode) === 429) {
@@ -179,7 +179,14 @@ function functionFromEndpoint(endpoint, source) {
     };
     proto.copyIfPresent(gcfFunction, endpoint, "labels");
     proto.copyIfPresent(gcfFunction.serviceConfig, endpoint, "environmentVariables", "serviceAccountEmail", "ingressSettings", "timeoutSeconds");
-    proto.renameIfPresent(gcfFunction.serviceConfig, endpoint, "availableMemory", "availableMemoryMb", (mb) => `${mb}M`);
+    proto.renameIfPresent(gcfFunction.serviceConfig, endpoint, "availableMemory", "availableMemoryMb", (mb) => {
+        if (mb > 1024) {
+            return `${mb / 1024}Gi`;
+        }
+        else {
+            return `${mb}Mi`;
+        }
+    });
     proto.renameIfPresent(gcfFunction.serviceConfig, endpoint, "minInstanceCount", "minInstances");
     proto.renameIfPresent(gcfFunction.serviceConfig, endpoint, "maxInstanceCount", "maxInstances");
     if (endpoint.vpc) {
@@ -289,7 +296,7 @@ function endpointFromFunction(gcfFunction) {
         project,
         region }, trigger), { entryPoint: gcfFunction.buildConfig.entryPoint, runtime: gcfFunction.buildConfig.runtime, uri: gcfFunction.serviceConfig.uri });
     proto.copyIfPresent(endpoint, gcfFunction.serviceConfig, "serviceAccountEmail", "ingressSettings", "environmentVariables", "timeoutSeconds");
-    proto.renameIfPresent(endpoint, gcfFunction.serviceConfig, "availableMemoryMb", "availableMemory", megabytes);
+    proto.renameIfPresent(endpoint, gcfFunction.serviceConfig, "availableMemoryMb", "availableMemory", mebibytes);
     proto.renameIfPresent(endpoint, gcfFunction.serviceConfig, "minInstances", "minInstanceCount");
     proto.renameIfPresent(endpoint, gcfFunction.serviceConfig, "maxInstances", "maxInstanceCount");
     proto.copyIfPresent(endpoint, gcfFunction, "labels");