firebase-tools 10.7.1 → 10.9.0

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,14 +54,18 @@ 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;
+    utils.logWarning(clc.bold.yellow("functions:") + ` ${err === null || err === void 0 ? void 0 : err.message}`);
     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) {
         utils.logWarning(`${clc.bold.yellow("functions:")} got "Quota Exceeded" error while trying to ${type} ${funcName}. Waiting to retry...`);
     }
+    else if (err === null || err === void 0 ? void 0 : err.message.includes("If you recently started to use Eventarc, it may take a few minutes before all necessary permissions are propagated to the Service Agent")) {
+        utils.logWarning(`${clc.bold.yellow("functions:")} since this is your first time using functions v2, we need a little bit longer to finish setting everything up, please retry the deployment in a few minutes.`);
+    }
     else {
         utils.logWarning(clc.bold.yellow("functions:") + " failed to " + type + " function " + funcName);
     }
@@ -133,7 +137,7 @@ async function listFunctionsInternal(projectId, region) {
     }
 }
 async function updateFunction(cloudFunction) {
-    const fieldMasks = proto.fieldMasks(cloudFunction, "labels", "serviceConfig.environmentVariables");
+    const fieldMasks = proto.fieldMasks(cloudFunction, "labels", "serviceConfig.environmentVariables", "serviceConfig.secretEnvironmentVariables");
     try {
         const queryParams = {
             updateMask: fieldMasks.join(","),
@@ -178,8 +182,9 @@ function functionFromEndpoint(endpoint, source) {
         serviceConfig: {},
     };
     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.copyIfPresent(gcfFunction.serviceConfig, endpoint, "environmentVariables", "secretEnvironmentVariables", "serviceAccountEmail", "ingressSettings", "timeoutSeconds");
+    const mem = endpoint.availableMemoryMb || backend.DEFAULT_MEMORY;
+    gcfFunction.serviceConfig.availableMemory = mem > 1024 ? `${mem / 1024}Gi` : `${mem}Mi`;
     proto.renameIfPresent(gcfFunction.serviceConfig, endpoint, "minInstanceCount", "minInstances");
     proto.renameIfPresent(gcfFunction.serviceConfig, endpoint, "maxInstanceCount", "maxInstances");
     if (endpoint.vpc) {
@@ -288,8 +293,8 @@ function endpointFromFunction(gcfFunction) {
     const endpoint = Object.assign(Object.assign({ platform: "gcfv2", id,
         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.copyIfPresent(endpoint, gcfFunction.serviceConfig, "serviceAccountEmail", "ingressSettings", "environmentVariables", "secretEnvironmentVariables", "timeoutSeconds");
+    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");

package/lib/gcp/serviceusage.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateServiceIdentity = void 0;
+const cli_color_1 = require("cli-color");
+const api_1 = require("../api");
+const apiv2_1 = require("../apiv2");
+const error_1 = require("../error");
+const utils = require("../utils");
+const apiClient = new apiv2_1.Client({
+    urlPrefix: api_1.serviceUsageOrigin,
+    apiVersion: "v1beta1",
+});
+async function generateServiceIdentity(projectNumber, service, prefix) {
+    utils.logLabeledBullet(prefix, `generating the service identity for ${(0, cli_color_1.bold)(service)}...`);
+    try {
+        return await apiClient.post(`projects/${projectNumber}/services/${service}:generateServiceIdentity`);
+    }
+    catch (err) {
+        throw new error_1.FirebaseError(`Error generating the service identity for ${service}.`, {
+            original: err,
+        });
+    }
+}
+exports.generateServiceIdentity = generateServiceIdentity;

package/lib/hosting/normalizedHostingConfigs.js

@@ -57,6 +57,9 @@ function filterExcept(configs, exceptOption) {
     return filteredConfigs;
 }
 function normalizedHostingConfigs(cmdOptions, options = {}) {
+    const normalizedHostingConfigs = cmdOptions.normalizedHostingConfigs;
+    if (normalizedHostingConfigs)
+        return normalizedHostingConfigs;
     let configs = (0, lodash_1.cloneDeep)(cmdOptions.config.get("hosting"));
     if (!configs) {
         return [];

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, extensionsemulator: false, rtdbmanagement: false, functionsv2: false, golang: false, deletegcfartifacts: false, artifactregistry: false, emulatoruisnapshot: false, frameworkawareness: false }, configstore_1.configstore.get("previews"));
+exports.previews = Object.assign({ rtdbrules: false, ext: false, extdev: false, rtdbmanagement: false, golang: false, deletegcfartifacts: false, artifactregistry: false, emulatoruisnapshot: false, frameworkawareness: false, functionsparams: 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/serve/index.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.serve = void 0;
 const _ = require("lodash");
 const logger_1 = require("../logger");
+const frameworks_1 = require("../frameworks");
 const previews_1 = require("../previews");
 const { FunctionsServer } = require("./functions");
 const TARGETS = {
@@ -15,7 +16,7 @@ async function serve(options) {
     if (previews_1.previews.frameworkawareness &&
         targetNames.includes("hosting") &&
         [].concat(options.config.get("hosting")).some((it) => it.source)) {
-        await require("firebase-frameworks").prepare(targetNames, { project: options.projectId }, options);
+        await (0, frameworks_1.prepareFrameworks)(targetNames, options, options);
     }
     await Promise.all(_.map(targetNames, (targetName) => {
         return TARGETS[targetName].start(options);

package/lib/throttler/throttler.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Throttler = exports.timeToWait = void 0;
+exports.Throttler = exports.timeToWait = exports.backoff = void 0;
 const logger_1 = require("../logger");
 const retries_exhausted_error_1 = require("./errors/retries-exhausted-error");
 const timeout_error_1 = require("./errors/timeout-error");
@@ -9,6 +9,7 @@ function backoff(retryNumber, delay, maxDelay) {
         setTimeout(resolve, timeToWait(retryNumber, delay, maxDelay));
     });
 }
+exports.backoff = backoff;
 function timeToWait(retryNumber, delay, maxDelay) {
     return Math.min(delay * Math.pow(2, retryNumber), maxDelay);
 }