firebase-tools 10.2.1 → 10.3.1

package/lib/gcp/cloudfunctionsv2.js

@@ -1,11 +1,12 @@
 "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.PUBSUB_PUBLISH_EVENT = exports.API_VERSION = void 0;
+exports.endpointFromFunction = exports.functionFromEndpoint = exports.deleteFunction = exports.updateFunction = exports.listAllFunctions = exports.listFunctions = exports.getFunction = exports.createFunction = exports.generateUploadUrl = exports.megabytes = exports.API_VERSION = void 0;
 const clc = require("cli-color");
 const apiv2_1 = require("../apiv2");
 const error_1 = require("../error");
 const api_1 = require("../api");
 const logger_1 = require("../logger");
+const v2_1 = require("../functions/events/v2");
 const backend = require("../deploy/functions/backend");
 const runtimes = require("../deploy/functions/runtimes");
 const proto = require("./proto");
@@ -16,7 +17,6 @@ const client = new apiv2_1.Client({
     auth: true,
     apiVersion: exports.API_VERSION,
 });
-exports.PUBSUB_PUBLISH_EVENT = "google.cloud.pubsub.topic.v1.messagePublished";
 const BYTES_PER_UNIT = {
     "": 1,
     k: 1e3,
@@ -106,7 +106,7 @@ async function listFunctionsInternal(projectId, region) {
     let pageToken = "";
     while (true) {
         const url = `projects/${projectId}/locations/${region}/functions`;
-        const opts = pageToken == "" ? {} : { queryParams: { pageToken } };
+        const opts = pageToken === "" ? {} : { queryParams: { pageToken } };
         const res = await client.get(url, opts);
         functions.push(...(res.body.functions || []));
         for (const region of res.body.unreachable || []) {
@@ -122,9 +122,10 @@ async function listFunctionsInternal(projectId, region) {
     }
 }
 async function updateFunction(cloudFunction) {
+    const fieldMasks = proto.fieldMasks(cloudFunction, "labels", "serviceConfig.environmentVariables");
     try {
         const queryParams = {
-            updateMask: proto.fieldMasks(cloudFunction).join(","),
+            updateMask: fieldMasks.join(","),
         };
         const res = await client.patch(cloudFunction.name, cloudFunction, { queryParams });
         return res.body;
@@ -145,7 +146,7 @@ async function deleteFunction(cloudFunction) {
 }
 exports.deleteFunction = deleteFunction;
 function functionFromEndpoint(endpoint, source) {
-    if (endpoint.platform != "gcfv2") {
+    if (endpoint.platform !== "gcfv2") {
         throw new error_1.FirebaseError("Trying to create a v2 CloudFunction with v1 API. This should never happen");
     }
     if (!runtimes.isValidRuntime(endpoint.runtime)) {
@@ -165,28 +166,43 @@ function functionFromEndpoint(endpoint, source) {
         serviceConfig: {},
     };
     proto.copyIfPresent(gcfFunction, endpoint, "labels");
-    proto.copyIfPresent(gcfFunction.serviceConfig, endpoint, "environmentVariables", "vpcConnector", "vpcConnectorEgressSettings", "serviceAccountEmail", "ingressSettings");
+    proto.copyIfPresent(gcfFunction.serviceConfig, endpoint, "environmentVariables", "serviceAccountEmail", "ingressSettings");
     proto.renameIfPresent(gcfFunction.serviceConfig, endpoint, "availableMemory", "availableMemoryMb", (mb) => `${mb}M`);
     proto.renameIfPresent(gcfFunction.serviceConfig, endpoint, "timeoutSeconds", "timeout", proto.secondsFromDuration);
     proto.renameIfPresent(gcfFunction.serviceConfig, endpoint, "minInstanceCount", "minInstances");
     proto.renameIfPresent(gcfFunction.serviceConfig, endpoint, "maxInstanceCount", "maxInstances");
+    if (endpoint.vpc) {
+        proto.renameIfPresent(gcfFunction.serviceConfig, endpoint.vpc, "vpcConnector", "connector");
+        proto.renameIfPresent(gcfFunction.serviceConfig, endpoint.vpc, "vpcConnectorEgressSettings", "egressSettings");
+    }
     if (backend.isEventTriggered(endpoint)) {
         gcfFunction.eventTrigger = {
             eventType: endpoint.eventTrigger.eventType,
         };
-        if (gcfFunction.eventTrigger.eventType === exports.PUBSUB_PUBLISH_EVENT) {
-            gcfFunction.eventTrigger.pubsubTopic = endpoint.eventTrigger.eventFilters.resource;
+        if (gcfFunction.eventTrigger.eventType === v2_1.PUBSUB_PUBLISH_EVENT) {
+            const pubsubFilter = backend.findEventFilter(endpoint, "topic");
+            if (!pubsubFilter) {
+                throw new error_1.FirebaseError("Invalid pubsub endpoint. Expected eventFilter with 'topic' attribute but found none.");
+            }
+            gcfFunction.eventTrigger.pubsubTopic = pubsubFilter.value;
+            for (const filter of endpoint.eventTrigger.eventFilters) {
+                if (filter.attribute === "topic") {
+                    continue;
+                }
+                if (!gcfFunction.eventTrigger.eventFilters) {
+                    gcfFunction.eventTrigger.eventFilters = [];
+                }
+                gcfFunction.eventTrigger.eventFilters.push(filter);
+            }
         }
         else {
-            gcfFunction.eventTrigger.eventFilters = [];
-            for (const [attribute, value] of Object.entries(endpoint.eventTrigger.eventFilters)) {
-                gcfFunction.eventTrigger.eventFilters.push({ attribute, value });
-            }
+            gcfFunction.eventTrigger.eventFilters = endpoint.eventTrigger.eventFilters;
         }
         proto.renameIfPresent(gcfFunction.eventTrigger, endpoint.eventTrigger, "triggerRegion", "region");
         if (endpoint.eventTrigger.retry) {
             logger_1.logger.warn("Cannot set a retry policy on Cloud Function", endpoint.id);
         }
+        gcfFunction.serviceConfig.environmentVariables = Object.assign(Object.assign({}, gcfFunction.serviceConfig.environmentVariables), { FUNCTION_SIGNATURE_TYPE: "cloudevent" });
     }
     else if (backend.isScheduleTriggered(endpoint)) {
         gcfFunction.labels = Object.assign(Object.assign({}, gcfFunction.labels), { "deployment-scheduled": "true" });
@@ -194,11 +210,14 @@ function functionFromEndpoint(endpoint, source) {
     else if (backend.isTaskQueueTriggered(endpoint)) {
         gcfFunction.labels = Object.assign(Object.assign({}, gcfFunction.labels), { "deployment-taskqueue": "true" });
     }
+    else if (backend.isCallableTriggered(endpoint)) {
+        gcfFunction.labels = Object.assign(Object.assign({}, gcfFunction.labels), { "deployment-callable": "true" });
+    }
     return gcfFunction;
 }
 exports.functionFromEndpoint = functionFromEndpoint;
 function endpointFromFunction(gcfFunction) {
-    var _a, _b;
+    var _a, _b, _c;
     const [, project, , region, , id] = gcfFunction.name.split("/");
     let trigger;
     if (((_a = gcfFunction.labels) === null || _a === void 0 ? void 0 : _a["deployment-scheduled"]) === "true") {
@@ -211,20 +230,28 @@ function endpointFromFunction(gcfFunction) {
             taskQueueTrigger: {},
         };
     }
+    else if (((_c = gcfFunction.labels) === null || _c === void 0 ? void 0 : _c["deployment-callable"]) === "true") {
+        trigger = {
+            callableTrigger: {},
+        };
+    }
     else if (gcfFunction.eventTrigger) {
         trigger = {
             eventTrigger: {
                 eventType: gcfFunction.eventTrigger.eventType,
-                eventFilters: {},
+                eventFilters: [],
                 retry: false,
             },
         };
         if (gcfFunction.eventTrigger.pubsubTopic) {
-            trigger.eventTrigger.eventFilters.resource = gcfFunction.eventTrigger.pubsubTopic;
+            trigger.eventTrigger.eventFilters.push({
+                attribute: "topic",
+                value: gcfFunction.eventTrigger.pubsubTopic,
+            });
         }
         else {
             for (const { attribute, value } of gcfFunction.eventTrigger.eventFilters || []) {
-                trigger.eventTrigger.eventFilters[attribute] = value;
+                trigger.eventTrigger.eventFilters.push({ attribute, value });
             }
         }
         proto.renameIfPresent(trigger.eventTrigger, gcfFunction.eventTrigger, "region", "triggerRegion");
@@ -238,12 +265,16 @@ 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", "vpcConnector", "vpcConnectorEgressSettings", "ingressSettings", "environmentVariables");
+    proto.copyIfPresent(endpoint, gcfFunction.serviceConfig, "serviceAccountEmail", "ingressSettings", "environmentVariables");
     proto.renameIfPresent(endpoint, gcfFunction.serviceConfig, "availableMemoryMb", "availableMemory", megabytes);
     proto.renameIfPresent(endpoint, gcfFunction.serviceConfig, "timeout", "timeoutSeconds", proto.durationFromSeconds);
     proto.renameIfPresent(endpoint, gcfFunction.serviceConfig, "minInstances", "minInstanceCount");
     proto.renameIfPresent(endpoint, gcfFunction.serviceConfig, "maxInstances", "maxInstanceCount");
     proto.copyIfPresent(endpoint, gcfFunction, "labels");
+    if (gcfFunction.serviceConfig.vpcConnector) {
+        endpoint.vpc = { connector: gcfFunction.serviceConfig.vpcConnector };
+        proto.renameIfPresent(endpoint.vpc, gcfFunction.serviceConfig, "egressSettings", "vpcConnectorEgressSettings");
+    }
     return endpoint;
 }
 exports.endpointFromFunction = endpointFromFunction;

package/lib/gcp/cloudtasks.js

@@ -102,7 +102,7 @@ async function setEnqueuer(name, invoker, assumeEmpty = false) {
     const invokerMembers = proto.getInvokerMembers(invoker, project);
     while (true) {
         const policy = {
-            bindings: existing.bindings.filter((binding) => binding.role != ENQUEUER_ROLE),
+            bindings: existing.bindings.filter((binding) => binding.role !== ENQUEUER_ROLE),
             etag: existing.etag,
             version: existing.version,
         };

package/lib/gcp/docker.js

@@ -58,7 +58,7 @@ class Client {
         if (!response.body) {
             return;
         }
-        if (((_a = response.body.errors) === null || _a === void 0 ? void 0 : _a.length) != 0) {
+        if (((_a = response.body.errors) === null || _a === void 0 ? void 0 : _a.length) !== 0) {
             throw new error_1.FirebaseError(`Failed to delete tag ${tag} at path ${path}`, {
                 children: response.body.errors,
             });
@@ -70,7 +70,7 @@ class Client {
         if (!response.body) {
             return;
         }
-        if (((_a = response.body.errors) === null || _a === void 0 ? void 0 : _a.length) != 0) {
+        if (((_a = response.body.errors) === null || _a === void 0 ? void 0 : _a.length) !== 0) {
             throw new error_1.FirebaseError(`Failed to delete image ${digest} at path ${path}`, {
                 children: response.body.errors,
             });

package/lib/gcp/resourceManager.js

@@ -13,13 +13,13 @@ exports.firebaseRoles = {
     hostingAdmin: "roles/firebasehosting.admin",
     runViewer: "roles/run.viewer",
 };
-async function getIamPolicy(projectId) {
-    const response = await apiClient.post(`/projects/${projectId}:getIamPolicy`);
+async function getIamPolicy(projectIdOrNumber) {
+    const response = await apiClient.post(`/projects/${projectIdOrNumber}:getIamPolicy`);
     return response.body;
 }
 exports.getIamPolicy = getIamPolicy;
-async function setIamPolicy(projectId, newPolicy, updateMask = "") {
-    const response = await apiClient.post(`/projects/${projectId}:setIamPolicy`, {
+async function setIamPolicy(projectIdOrNumber, newPolicy, updateMask = "") {
+    const response = await apiClient.post(`/projects/${projectIdOrNumber}:setIamPolicy`, {
         policy: newPolicy,
         updateMask: updateMask,
     });

package/lib/gcp/run.js

@@ -63,7 +63,7 @@ async function getIamPolicy(serviceName, httpClient = client) {
 }
 exports.getIamPolicy = getIamPolicy;
 async function setInvokerCreate(projectId, serviceName, invoker, httpClient = client) {
-    if (invoker.length == 0) {
+    if (invoker.length === 0) {
         throw new error_1.FirebaseError("Invoker cannot be an empty array");
     }
     const invokerMembers = proto.getInvokerMembers(invoker, projectId);
@@ -79,7 +79,7 @@ async function setInvokerCreate(projectId, serviceName, invoker, httpClient = cl
 exports.setInvokerCreate = setInvokerCreate;
 async function setInvokerUpdate(projectId, serviceName, invoker, httpClient = client) {
     var _a;
-    if (invoker.length == 0) {
+    if (invoker.length === 0) {
         throw new error_1.FirebaseError("Invoker cannot be an empty array");
     }
     const invokerMembers = proto.getInvokerMembers(invoker, projectId);

package/lib/hosting/api.js

@@ -192,7 +192,7 @@ async function removeAuthDomain(project, url) {
         return domains;
     }
     const targetDomain = url.replace("https://", "");
-    const authDomains = domains.filter((domain) => domain != targetDomain);
+    const authDomains = domains.filter((domain) => domain !== targetDomain);
     return (0, auth_1.updateAuthDomains)(project, authDomains);
 }
 exports.removeAuthDomain = removeAuthDomain;

package/lib/hosting/proxy.js

@@ -54,7 +54,7 @@ function proxyRequestHandler(url, rewriteIdentifier) {
                 continue;
             }
             const value = req.headers[key];
-            if (value == undefined) {
+            if (value === undefined) {
                 headers.delete(key);
             }
             else if (Array.isArray(value)) {
@@ -115,7 +115,7 @@ function proxyRequestHandler(url, rewriteIdentifier) {
         if (location) {
             try {
                 const locationURL = new url_1.URL(location);
-                if (locationURL.origin == u.origin) {
+                if (locationURL.origin === u.origin) {
                     const unborkedLocation = location.replace(locationURL.origin, "");
                     proxyRes.response.headers.set("location", unborkedLocation);
                 }

package/lib/init/features/account.js

@@ -27,7 +27,7 @@ async function promptForAccount() {
         message: "Please select an option:",
         choices,
     });
-    if (emailChoice == "__add__") {
+    if (emailChoice === "__add__") {
         const newAccount = await (0, auth_1.loginAdditionalAccount)(true);
         if (!newAccount) {
             throw new error_1.FirebaseError("Failed to add new account", { exit: 1 });

package/lib/management/database.js

@@ -168,7 +168,7 @@ function convertDatabaseInstance(serverInstance) {
         throw new error_1.FirebaseError(`DatabaseInstance response is missing field "name"`);
     }
     const m = serverInstance.name.match(INSTANCE_RESOURCE_NAME_REGEX);
-    if (!m || m.length != 4) {
+    if (!m || m.length !== 4) {
         throw new error_1.FirebaseError(`Error parsing instance resource name: ${serverInstance.name}, matches: ${m}`);
     }
     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, rtdbmanagement: false, functionsv2: false, golang: false, deletegcfartifacts: false, artifactregistry: false, emulatoruisnapshot: 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 }, 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

@@ -29,8 +29,9 @@ class FunctionsServer {
             functionsDir,
             nodeMajorVersion,
             env: {},
+            secretEnv: [],
         };
-        const args = Object.assign({ projectId, projectDir: options.config.projectDir, emulatableBackends: [this.backend], account }, partialArgs);
+        const args = Object.assign({ projectId, projectDir: options.config.projectDir, emulatableBackends: [this.backend], projectAlias: options.projectAlias, account }, partialArgs);
         if (options.host) {
             utils.assertIsStringOrUndefined(options.host);
             args.host = options.host;

package/lib/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.assertIsStringOrUndefined = exports.assertIsNumber = exports.assertIsString = exports.assertDefined = exports.thirtyDaysFromNow = exports.isRunningInWSL = exports.isCloudEnvironment = exports.datetimeString = exports.createDestroyer = exports.promiseWithSpinner = exports.setupLoggers = exports.tryParse = exports.tryStringify = exports.promiseProps = exports.promiseWhile = exports.promiseAllSettled = exports.getFunctionsEventProvider = exports.endpoint = exports.makeActiveProject = exports.streamToString = exports.stringToStream = exports.explainStdin = exports.allSettled = exports.reject = exports.logLabeledError = exports.logLabeledWarning = exports.logWarning = exports.logLabeledBullet = exports.logBullet = exports.logLabeledSuccess = exports.logSuccess = exports.addSubdomain = exports.addDatabaseNamespace = exports.getDatabaseViewDataUrl = exports.getDatabaseUrl = exports.envOverride = exports.getInheritedOption = exports.consoleUrl = exports.envOverrides = void 0;
+exports.groupBy = exports.assertIsStringOrUndefined = exports.assertIsNumber = exports.assertIsString = exports.assertDefined = exports.thirtyDaysFromNow = exports.isRunningInWSL = exports.isCloudEnvironment = exports.datetimeString = exports.createDestroyer = exports.promiseWithSpinner = exports.setupLoggers = exports.tryParse = exports.tryStringify = exports.promiseProps = exports.promiseWhile = exports.promiseAllSettled = exports.getFunctionsEventProvider = exports.endpoint = exports.makeActiveProject = exports.streamToString = exports.stringToStream = exports.explainStdin = exports.allSettled = exports.reject = exports.logLabeledError = exports.logLabeledWarning = exports.logWarning = exports.logLabeledBullet = exports.logBullet = exports.logLabeledSuccess = exports.logSuccess = exports.addSubdomain = exports.addDatabaseNamespace = exports.getDatabaseViewDataUrl = exports.getDatabaseUrl = exports.envOverride = exports.getInheritedOption = exports.consoleUrl = exports.envOverrides = void 0;
 const _ = require("lodash");
 const url = require("url");
 const clc = require("cli-color");
@@ -295,7 +295,7 @@ function setupLoggers() {
         logger_1.logger.add(new winston.transports.Console({
             level: "info",
             format: winston.format.printf((info) => [info.message, ...(info[triple_beam_1.SPLAT] || [])]
-                .filter((chunk) => typeof chunk == "string")
+                .filter((chunk) => typeof chunk === "string")
                 .join(" ")),
         }));
     }
@@ -393,3 +393,16 @@ function assertIsStringOrUndefined(val, message) {
     }
 }
 exports.assertIsStringOrUndefined = assertIsStringOrUndefined;
+function groupBy(arr, f) {
+    return arr.reduce((result, item) => {
+        const key = f(item);
+        if (result[key]) {
+            result[key].push(item);
+        }
+        else {
+            result[key] = [item];
+        }
+        return result;
+    }, {});
+}
+exports.groupBy = groupBy;