firebase-tools 10.2.1 → 10.2.2

package/lib/extensions/emulator/specHelper.js

@@ -2,13 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getNodeVersion = exports.getFunctionProperties = exports.getFunctionResourcesWithParamSubstitution = exports.readFileFromDirectory = exports.readExtensionYaml = void 0;
 const yaml = require("js-yaml");
-const _ = require("lodash");
 const path = require("path");
 const fs = require("fs-extra");
 const error_1 = require("../../error");
 const extensionsHelper_1 = require("../extensionsHelper");
-const emulatorLogger_1 = require("../../emulator/emulatorLogger");
-const types_1 = require("../../emulator/types");
+const functionsEmulatorUtils_1 = require("../../emulator/functionsEmulatorUtils");
 const SPEC_FILE = "extension.yaml";
 const validFunctionTypes = [
     "firebaseextensions.v1beta.function",
@@ -62,35 +60,24 @@ function getFunctionProperties(resources) {
 }
 exports.getFunctionProperties = getFunctionProperties;
 function getNodeVersion(resources) {
-    const functionNamesWithoutRuntime = [];
+    const invalidRuntimes = [];
     const versions = resources.map((r) => {
         var _a, _b;
-        if (_.includes(r.type, "function")) {
-            if ((_a = r.properties) === null || _a === void 0 ? void 0 : _a.runtime) {
-                return (_b = r.properties) === null || _b === void 0 ? void 0 : _b.runtime;
+        if ((_a = r.properties) === null || _a === void 0 ? void 0 : _a.runtime) {
+            const runtimeName = (_b = r.properties) === null || _b === void 0 ? void 0 : _b.runtime;
+            const runtime = (0, functionsEmulatorUtils_1.parseRuntimeVersion)(runtimeName);
+            if (!runtime) {
+                invalidRuntimes.push(runtimeName);
             }
             else {
-                functionNamesWithoutRuntime.push(r.name);
+                return runtime;
             }
         }
-        return "nodejs8";
-    });
-    if (functionNamesWithoutRuntime.length) {
-        emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.FUNCTIONS).logLabeled("WARN", "extensions", `No 'runtime' property found for the following functions, defaulting to nodejs8: ${functionNamesWithoutRuntime.join(", ")}`);
-    }
-    const invalidRuntimes = _.filter(versions, (v) => {
-        return !_.includes(v, "nodejs");
+        return 14;
     });
     if (invalidRuntimes.length) {
         throw new error_1.FirebaseError(`The following runtimes are not supported by the Emulator Suite: ${invalidRuntimes.join(", ")}. \n Only Node runtimes are supported.`);
     }
-    if (_.includes(versions, "nodejs10")) {
-        return "10";
-    }
-    if (_.includes(versions, "nodejs6")) {
-        emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.FUNCTIONS).logLabeled("WARN", "extensions", "Node 6 is deprecated. We recommend upgrading to a newer version.");
-        return "6";
-    }
-    return "8";
+    return Math.max(...versions);
 }
 exports.getNodeVersion = getNodeVersion;

package/lib/extensions/export.js

@@ -1,14 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.writeFiles = exports.displayExportInfo = exports.setSecretParamsToLatest = exports.parameterizeProject = void 0;
-const clc = require("cli-color");
-const refs = require("./refs");
-const config_1 = require("../config");
+exports.displayExportInfo = exports.setSecretParamsToLatest = exports.parameterizeProject = void 0;
 const planner_1 = require("../deploy/extensions/planner");
 const deploymentSummary_1 = require("../deploy/extensions/deploymentSummary");
 const logger_1 = require("../logger");
-const error_1 = require("../error");
-const prompt_1 = require("../prompt");
 const secretManager_1 = require("../gcp/secretManager");
 const secretsUtils_1 = require("./secretsUtils");
 function parameterizeProject(projectId, projectNumber, spec) {
@@ -60,48 +55,3 @@ function displaySpecs(specs) {
         logger_1.logger.info("");
     }
 }
-function writeExtensionsToFirebaseJson(have, existingConfig) {
-    const extensions = existingConfig.get("extensions", {});
-    for (const s of have) {
-        extensions[s.instanceId] = refs.toExtensionVersionRef(s.ref);
-    }
-    existingConfig.set("extensions", extensions);
-    logger_1.logger.info("Adding Extensions to " + clc.bold("firebase.json") + "...");
-    existingConfig.writeProjectFile("firebase.json", existingConfig.src);
-}
-async function writeEnvFile(spec, existingConfig, force) {
-    const content = Object.entries(spec.params)
-        .map((r) => `${r[0]}=${r[1]}`)
-        .join("\n");
-    await existingConfig.askWriteProjectFile(`extensions/${spec.instanceId}.env`, content, force);
-}
-async function writeFiles(have, options) {
-    const existingConfig = config_1.Config.load(options, true);
-    if (!existingConfig) {
-        throw new error_1.FirebaseError("Not currently in a Firebase directory. Please run `firebase init` to create a Firebase directory.");
-    }
-    if (existingConfig.has("extensions") &&
-        Object.keys(existingConfig.get("extensions")).length &&
-        !options.nonInteractive &&
-        !options.force) {
-        const currentExtensions = Object.entries(existingConfig.get("extensions"))
-            .map((i) => `${i[0]}: ${i[1]}`)
-            .join("\n\t");
-        const overwrite = await (0, prompt_1.promptOnce)({
-            type: "list",
-            message: `firebase.json already contains extensions:\n${currentExtensions}\nWould you like to overwrite or merge?`,
-            choices: [
-                { name: "Overwrite", value: true },
-                { name: "Merge", value: false },
-            ],
-        });
-        if (overwrite) {
-            existingConfig.set("extensions", {});
-        }
-    }
-    writeExtensionsToFirebaseJson(have, existingConfig);
-    for (const spec of have) {
-        await writeEnvFile(spec, existingConfig, options.force);
-    }
-}
-exports.writeFiles = writeFiles;

package/lib/extensions/extensionsApi.js

@@ -295,7 +295,7 @@ async function listExtensionVersions(ref, filter = "") {
 exports.listExtensionVersions = listExtensionVersions;
 async function getPublisherProfile(projectId, publisherId) {
     const res = await apiClient.get(`/projects/${projectId}/publisherProfile`, {
-        queryParams: publisherId == undefined
+        queryParams: publisherId === undefined
             ? undefined
             : {
                 publisherId,

package/lib/extensions/extensionsHelper.js

@@ -112,7 +112,7 @@ function populateDefaultParams(paramVars, paramSpecs) {
     const newParams = paramVars;
     for (const param of paramSpecs) {
         if (!paramVars[param.param]) {
-            if (param.default != undefined && param.required) {
+            if (param.default !== undefined && param.required) {
                 newParams[param.param] = param.default;
             }
             else if (param.required) {
@@ -197,13 +197,13 @@ function validateSpec(spec) {
         if (param.type && !_.includes(SpecParamType, param.type)) {
             errors.push(`Invalid type ${param.type} for param${param.param ? ` ${param.param}` : ""}. Valid types are ${_.values(SpecParamType).join(", ")}`);
         }
-        if (!param.type || param.type == SpecParamType.STRING) {
+        if (!param.type || param.type === SpecParamType.STRING) {
             if (param.options) {
                 errors.push(`Param${param.param ? ` ${param.param}` : ""} cannot have options because it is type STRING`);
             }
         }
         if (param.type &&
-            (param.type == SpecParamType.SELECT || param.type == SpecParamType.MULTISELECT)) {
+            (param.type === SpecParamType.SELECT || param.type === SpecParamType.MULTISELECT)) {
             if (param.validationRegex) {
                 errors.push(`Param${param.param ? ` ${param.param}` : ""} cannot have validationRegex because it is type ${param.type}`);
             }
@@ -211,12 +211,12 @@ function validateSpec(spec) {
                 errors.push(`Param${param.param ? ` ${param.param}` : ""} requires options because it is type ${param.type}`);
             }
             for (const opt of param.options || []) {
-                if (opt.value == undefined) {
+                if (opt.value === undefined) {
                     errors.push(`Option for param${param.param ? ` ${param.param}` : ""} is missing required field: value`);
                 }
             }
         }
-        if (param.type && param.type == SpecParamType.SELECTRESOURCE) {
+        if (param.type && param.type === SpecParamType.SELECTRESOURCE) {
             if (!param.resourceType) {
                 errors.push(`Param${param.param ? ` ${param.param}` : ""} must have resourceType because it is type ${param.type}`);
             }
@@ -268,7 +268,7 @@ async function archiveAndUploadSource(extPath, bucketName) {
 }
 async function publishExtensionVersionFromLocalSource(args) {
     const extensionSpec = await (0, localHelper_1.getLocalExtensionSpec)(args.rootDirectory);
-    if (extensionSpec.name != args.extensionId) {
+    if (extensionSpec.name !== args.extensionId) {
         throw new error_1.FirebaseError(`Extension ID '${clc.bold(args.extensionId)}' does not match the name in extension.yaml '${clc.bold(extensionSpec.name)}'.`);
     }
     const subbedSpec = JSON.parse(JSON.stringify(extensionSpec));
@@ -325,7 +325,9 @@ async function publishExtensionVersionFromLocalSource(args) {
     }
     catch (err) {
         uploadSpinner.fail();
-        throw err;
+        throw new error_1.FirebaseError(`Failed to archive and upload extension source, ${err}`, {
+            original: err,
+        });
     }
     const publishSpinner = ora(`Publishing ${clc.bold(ref)}`);
     let res;
@@ -336,7 +338,7 @@ async function publishExtensionVersionFromLocalSource(args) {
     }
     catch (err) {
         publishSpinner.fail();
-        if (err.status == 404) {
+        if (err.status === 404) {
             throw new error_1.FirebaseError(marked(`Couldn't find publisher ID '${clc.bold(args.publisherId)}'. Please ensure that you have registered this ID. To register as a publisher, you can check out the [Firebase documentation](https://firebase.google.com/docs/extensions/alpha/share#register_as_an_extensions_publisher) for step-by-step instructions.`));
         }
         throw err;
@@ -360,7 +362,9 @@ async function createSourceFromLocation(projectId, sourceUri) {
         }
         catch (err) {
             uploadSpinner.fail();
-            throw err;
+            throw new error_1.FirebaseError(`Failed to archive and upload extension source, ${err}`, {
+                original: err,
+            });
         }
     }
     else {

package/lib/extensions/manifest.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.writeToManifest = void 0;
+const clc = require("cli-color");
+const refs = require("./refs");
+const logger_1 = require("../logger");
+const prompt_1 = require("../prompt");
+async function writeToManifest(specs, config, options) {
+    if (config.has("extensions") &&
+        Object.keys(config.get("extensions")).length &&
+        !options.nonInteractive &&
+        !options.force) {
+        const currentExtensions = Object.entries(config.get("extensions"))
+            .map((i) => `${i[0]}: ${i[1]}`)
+            .join("\n\t");
+        const overwrite = await (0, prompt_1.promptOnce)({
+            type: "list",
+            message: `firebase.json already contains extensions:\n${currentExtensions}\nWould you like to overwrite or merge?`,
+            choices: [
+                { name: "Overwrite", value: true },
+                { name: "Merge", value: false },
+            ],
+        });
+        if (overwrite) {
+            config.set("extensions", {});
+        }
+    }
+    writeExtensionsToFirebaseJson(specs, config);
+    await writeEnvFiles(specs, config, options.force);
+}
+exports.writeToManifest = writeToManifest;
+function writeExtensionsToFirebaseJson(specs, config) {
+    const extensions = config.get("extensions", {});
+    for (const s of specs) {
+        extensions[s.instanceId] = refs.toExtensionVersionRef(s.ref);
+    }
+    config.set("extensions", extensions);
+    logger_1.logger.info("Adding Extensions to " + clc.bold("firebase.json") + "...");
+    config.writeProjectFile("firebase.json", config.src);
+}
+async function writeEnvFiles(specs, config, force) {
+    for (const spec of specs) {
+        const content = Object.entries(spec.params)
+            .map((r) => `${r[0]}=${r[1]}`)
+            .join("\n");
+        await config.askWriteProjectFile(`extensions/${spec.instanceId}.env`, content, force);
+    }
+}

package/lib/extensions/metricsUtils.js

@@ -7,19 +7,19 @@ function parseTimeseriesResponse(series) {
     const ret = [];
     for (const s of series) {
         const ref = buildRef(s);
-        if (ref == undefined) {
+        if (ref === undefined) {
             continue;
         }
         let valueToday;
         let value7dAgo;
         let value28dAgo;
-        if (s.points.length >= 28 && s.points[27].value.int64Value != undefined) {
+        if (s.points.length >= 28 && s.points[27].value.int64Value !== undefined) {
             value28dAgo = parseBucket(s.points[27].value.int64Value);
         }
-        if (s.points.length >= 7 && s.points[6].value.int64Value != undefined) {
+        if (s.points.length >= 7 && s.points[6].value.int64Value !== undefined) {
             value7dAgo = parseBucket(s.points[6].value.int64Value);
         }
-        if (s.points.length >= 1 && s.points[0].value.int64Value != undefined) {
+        if (s.points.length >= 1 && s.points[0].value.int64Value !== undefined) {
             valueToday = parseBucket(s.points[0].value.int64Value);
         }
         ret.push({

package/lib/extensions/paramHelper.js

@@ -49,7 +49,7 @@ async function getParams(args) {
         const firebaseProjectParams = await (0, extensionsHelper_1.getFirebaseProjectParams)(args.projectId);
         params = await askUserForParam.ask(args.projectId, args.instanceId, args.paramSpecs, firebaseProjectParams, !!args.reconfiguring);
     }
-    track("Extension Params", _.isEmpty(params) ? "Not Present" : "Present", _.size(params));
+    void track("Extension Params", _.isEmpty(params) ? "Not Present" : "Present", _.size(params));
     return params;
 }
 exports.getParams = getParams;
@@ -82,7 +82,7 @@ async function getParamsForUpdate(args) {
             instanceId: args.instanceId,
         });
     }
-    track("Extension Params", _.isEmpty(params) ? "Not Present" : "Present", _.size(params));
+    void track("Extension Params", _.isEmpty(params) ? "Not Present" : "Present", _.size(params));
     return params;
 }
 exports.getParamsForUpdate = getParamsForUpdate;
@@ -116,10 +116,10 @@ function getParamsFromFile(args) {
     let envParams;
     try {
         envParams = readEnvFile(args.paramsEnvPath);
-        track("Extension Env File", "Present");
+        void track("Extension Env File", "Present");
     }
     catch (err) {
-        track("Extension Env File", "Invalid");
+        void track("Extension Env File", "Invalid");
         throw new error_1.FirebaseError(`Error reading env file: ${err.message}\n`, { original: err });
     }
     const params = (0, extensionsHelper_1.populateDefaultParams)(envParams, args.paramSpecs);

package/lib/extensions/refs.js

@@ -20,7 +20,7 @@ function parse(refOrName) {
 exports.parse = parse;
 function parseRef(ref) {
     const parts = refRegex.exec(ref);
-    if (parts && (parts.length == 5 || parts.length == 7)) {
+    if (parts && (parts.length === 5 || parts.length === 7)) {
         const publisherId = parts[1];
         const extensionId = parts[2];
         const version = parts[4];

package/lib/extensions/secretsUtils.js

@@ -15,7 +15,7 @@ async function ensureSecretManagerApiEnabled(options) {
 }
 exports.ensureSecretManagerApiEnabled = ensureSecretManagerApiEnabled;
 function usesSecrets(spec) {
-    return spec.params && !!spec.params.find((p) => p.type == extensionsApi.ParamType.SECRET);
+    return spec.params && !!spec.params.find((p) => p.type === extensionsApi.ParamType.SECRET);
 }
 exports.usesSecrets = usesSecrets;
 async function grantFirexServiceAgentSecretAdminRole(secret) {
@@ -38,7 +38,7 @@ async function getManagedSecrets(instance) {
 exports.getManagedSecrets = getManagedSecrets;
 function getActiveSecrets(spec, params) {
     return spec.params
-        .map((p) => (p.type == extensionsApi.ParamType.SECRET ? params[p.param] : ""))
+        .map((p) => (p.type === extensionsApi.ParamType.SECRET ? params[p.param] : ""))
         .filter((pv) => !!pv);
 }
 exports.getActiveSecrets = getActiveSecrets;
@@ -50,7 +50,7 @@ function getSecretLabels(instanceId) {
 exports.getSecretLabels = getSecretLabels;
 function prettySecretName(secretResourceName) {
     const nameTokens = secretResourceName.split("/");
-    if (nameTokens.length != 4 && nameTokens.length != 6) {
+    if (nameTokens.length !== 4 && nameTokens.length !== 6) {
         logger_1.logger.debug(`unable to parse secret secretResourceName: ${secretResourceName}`);
         return secretResourceName;
     }

package/lib/functional.js

@@ -40,7 +40,7 @@ function reduceFlat(accum, next) {
 }
 exports.reduceFlat = reduceFlat;
 function* zip(left, right) {
-    if (left.length != right.length) {
+    if (left.length !== right.length) {
         throw new Error("Cannot zip between two lists of differen lengths");
     }
     for (let i = 0; i < left.length; i++) {

package/lib/functions/env.js

@@ -12,6 +12,7 @@ const RESERVED_PREFIXES = ["X_GOOGLE_", "FIREBASE_", "EXT_"];
 const RESERVED_KEYS = [
     "FIREBASE_CONFIG",
     "CLOUD_RUNTIME_CONFIG",
+    "EVENTARC_CLOUD_EVENT_SOURCE",
     "ENTRY_POINT",
     "GCP_PROJECT",
     "GCLOUD_PROJECT",
@@ -141,7 +142,7 @@ exports.hasUserEnvs = hasUserEnvs;
 function loadUserEnvs({ functionsSource, projectId, projectAlias, isEmulator, }) {
     var _a;
     const envFiles = findEnvfiles(functionsSource, projectId, projectAlias, isEmulator);
-    if (envFiles.length == 0) {
+    if (envFiles.length === 0) {
         return {};
     }
     if (projectAlias) {

package/lib/gcp/cloudfunctions.js

@@ -92,7 +92,7 @@ async function getIamPolicy(fnName) {
 }
 exports.getIamPolicy = getIamPolicy;
 async function setInvokerCreate(projectId, fnName, invoker) {
-    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);
@@ -108,7 +108,7 @@ async function setInvokerCreate(projectId, fnName, invoker) {
 exports.setInvokerCreate = setInvokerCreate;
 async function setInvokerUpdate(projectId, fnName, invoker) {
     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);
@@ -206,6 +206,7 @@ function endpointFromFunction(gcfFunction) {
     const [, project, , region, , id] = gcfFunction.name.split("/");
     let trigger;
     let uri;
+    let securityLevel;
     if ((_a = gcfFunction.labels) === null || _a === void 0 ? void 0 : _a["deployment-scheduled"]) {
         trigger = {
             scheduleTrigger: {},
@@ -219,6 +220,7 @@ function endpointFromFunction(gcfFunction) {
     else if (gcfFunction.httpsTrigger) {
         trigger = { httpsTrigger: {} };
         uri = gcfFunction.httpsTrigger.url;
+        securityLevel = gcfFunction.httpsTrigger.securityLevel;
     }
     else {
         trigger = {
@@ -240,12 +242,19 @@ function endpointFromFunction(gcfFunction) {
     if (uri) {
         endpoint.uri = uri;
     }
-    proto.copyIfPresent(endpoint, gcfFunction, "serviceAccountEmail", "availableMemoryMb", "timeout", "minInstances", "maxInstances", "vpcConnector", "vpcConnectorEgressSettings", "ingressSettings", "labels", "environmentVariables", "secretEnvironmentVariables", "sourceUploadUrl");
+    if (securityLevel) {
+        endpoint.securityLevel = securityLevel;
+    }
+    proto.copyIfPresent(endpoint, gcfFunction, "serviceAccountEmail", "availableMemoryMb", "timeout", "minInstances", "maxInstances", "ingressSettings", "labels", "environmentVariables", "secretEnvironmentVariables", "sourceUploadUrl");
+    if (gcfFunction.vpcConnector) {
+        endpoint.vpc = { connector: gcfFunction.vpcConnector };
+        proto.renameIfPresent(endpoint.vpc, gcfFunction, "egressSettings", "vpcConnectorEgressSettings");
+    }
     return endpoint;
 }
 exports.endpointFromFunction = endpointFromFunction;
 function functionFromEndpoint(endpoint, sourceUploadUrl) {
-    if (endpoint.platform != "gcfv1") {
+    if (endpoint.platform !== "gcfv1") {
         throw new error_1.FirebaseError("Trying to create a v1 CloudFunction with v2 API. This should never happen");
     }
     if (!runtimes.isValidRuntime(endpoint.runtime)) {
@@ -282,8 +291,18 @@ function functionFromEndpoint(endpoint, sourceUploadUrl) {
     }
     else {
         gcfFunction.httpsTrigger = {};
+        if (backend.isCallableTriggered(endpoint)) {
+            gcfFunction.labels = Object.assign(Object.assign({}, gcfFunction.labels), { "deployment-callabled": "true" });
+        }
+        if (endpoint.securityLevel) {
+            gcfFunction.httpsTrigger.securityLevel = endpoint.securityLevel;
+        }
+    }
+    proto.copyIfPresent(gcfFunction, endpoint, "serviceAccountEmail", "timeout", "availableMemoryMb", "minInstances", "maxInstances", "ingressSettings", "environmentVariables", "secretEnvironmentVariables");
+    if (endpoint.vpc) {
+        proto.renameIfPresent(gcfFunction, endpoint.vpc, "vpcConnector", "connector");
+        proto.renameIfPresent(gcfFunction, endpoint.vpc, "vpcConnectorEgressSettings", "egressSettings");
     }
-    proto.copyIfPresent(gcfFunction, endpoint, "serviceAccountEmail", "timeout", "availableMemoryMb", "minInstances", "maxInstances", "vpcConnector", "vpcConnectorEgressSettings", "ingressSettings", "environmentVariables", "secretEnvironmentVariables");
     return gcfFunction;
 }
 exports.functionFromEndpoint = functionFromEndpoint;

package/lib/gcp/cloudfunctionsv2.js

@@ -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,11 +166,15 @@ 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,
@@ -187,6 +192,7 @@ function functionFromEndpoint(endpoint, source) {
         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,6 +200,9 @@ 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;
@@ -238,12 +247,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/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 {