firebase-tools 10.7.0 → 10.8.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(","),
@@ -157,6 +161,7 @@ async function deleteFunction(cloudFunction) {
 }
 exports.deleteFunction = deleteFunction;
 function functionFromEndpoint(endpoint, source) {
+    var _a;
     if (endpoint.platform !== "gcfv2") {
         throw new error_1.FirebaseError("Trying to create a v2 CloudFunction with v1 API. This should never happen");
     }
@@ -177,8 +182,15 @@ 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");
+    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) {
@@ -223,7 +235,13 @@ function functionFromEndpoint(endpoint, source) {
     else if (backend.isBlockingTriggered(endpoint)) {
         gcfFunction.labels = Object.assign(Object.assign({}, gcfFunction.labels), { [exports.BLOCKING_LABEL]: BLOCKING_EVENT_TO_LABEL_KEY[endpoint.blockingTrigger.eventType] });
     }
-    gcfFunction.labels = Object.assign(Object.assign({}, gcfFunction.labels), { [exports.CODEBASE_LABEL]: endpoint.codebase || projectConfig.DEFAULT_CODEBASE });
+    const codebase = endpoint.codebase || projectConfig.DEFAULT_CODEBASE;
+    if (codebase !== projectConfig.DEFAULT_CODEBASE) {
+        gcfFunction.labels = Object.assign(Object.assign({}, gcfFunction.labels), { [exports.CODEBASE_LABEL]: codebase });
+    }
+    else {
+        (_a = gcfFunction.labels) === null || _a === void 0 ? true : delete _a[exports.CODEBASE_LABEL];
+    }
     return gcfFunction;
 }
 exports.functionFromEndpoint = functionFromEndpoint;
@@ -281,8 +299,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/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, extensionsemulator: false, rtdbmanagement: false, functionsv2: 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/functions.js

@@ -10,28 +10,29 @@ const auth_1 = require("../auth");
 const projectConfig = require("../functions/projectConfig");
 const utils = require("../utils");
 class FunctionsServer {
-    constructor() {
-        this.emulatorServer = undefined;
-        this.backend = undefined;
-    }
     assertServer() {
-        if (!this.emulatorServer || !this.backend) {
+        if (!this.emulatorServer || !this.backends) {
             throw new Error("Must call start() before calling any other operation!");
         }
     }
     async start(options, partialArgs) {
         const projectId = (0, projectUtils_1.needProjectId)(options);
-        const config = projectConfig.normalizeAndValidate(options.config.src.functions)[0];
-        const functionsDir = path.join(options.config.projectDir, config.source);
+        const config = projectConfig.normalizeAndValidate(options.config.src.functions);
+        const backends = [];
+        for (const cfg of config) {
+            const functionsDir = path.join(options.config.projectDir, cfg.source);
+            const nodeMajorVersion = (0, functionsEmulatorUtils_1.parseRuntimeVersion)(cfg.runtime);
+            backends.push({
+                functionsDir,
+                codebase: cfg.codebase,
+                nodeMajorVersion,
+                env: {},
+                secretEnv: [],
+            });
+        }
+        this.backends = backends;
         const account = (0, auth_1.getProjectDefaultAccount)(options.config.projectDir);
-        const nodeMajorVersion = (0, functionsEmulatorUtils_1.parseRuntimeVersion)(config.runtime);
-        this.backend = {
-            functionsDir,
-            nodeMajorVersion,
-            env: {},
-            secretEnv: [],
-        };
-        const args = Object.assign({ projectId, projectDir: options.config.projectDir, emulatableBackends: [this.backend], projectAlias: options.projectAlias, account }, partialArgs);
+        const args = Object.assign({ projectId, projectDir: options.config.projectDir, emulatableBackends: this.backends, projectAlias: options.projectAlias, account }, partialArgs);
         if (options.host) {
             utils.assertIsStringOrUndefined(options.host);
             args.host = options.host;
@@ -59,10 +60,6 @@ class FunctionsServer {
         this.assertServer();
         await this.emulatorServer.stop();
     }
-    getBackend() {
-        this.assertServer();
-        return this.backend;
-    }
     get() {
         this.assertServer();
         return this.emulatorServer.get();

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);
 }