firebase-tools 11.1.0 → 11.2.2

package/lib/deploy/functions/runtimes/discovery/v1alpha1.js

@@ -200,7 +200,8 @@ function assertManifestEndpoint(ep, id) {
 function parseEndpointForBuild(id, ep, project, defaultRegion, runtime) {
     let triggered;
     if (backend.isEventTriggered(ep)) {
-        const _a = ep.eventTrigger, { serviceAccountEmail } = _a, newTrigger = __rest(_a, ["serviceAccountEmail"]);
+        const newTrigger = __rest(ep.eventTrigger, []);
+        delete newTrigger.serviceAccountEmail;
         triggered = { eventTrigger: newTrigger };
         triggered.eventTrigger.serviceAccount = ep.eventTrigger.serviceAccountEmail;
         (0, proto_1.renameIfPresent)(triggered.eventTrigger, ep.eventTrigger, "channel", "channel", (c) => resolveChannelName(project, c, defaultRegion));
@@ -264,7 +265,7 @@ function parseEndpointForBuild(id, ep, project, defaultRegion, runtime) {
             "firebase-tools with npm install -g firebase-tools@latest");
     }
     const parsed = Object.assign({ platform: ep.platform || "gcfv2", region: ep.region || [defaultRegion], project,
-        runtime, entryPoint: ep.entryPoint, serviceAccount: ep.serviceAccountEmail || "default" }, triggered);
+        runtime, entryPoint: ep.entryPoint, serviceAccount: ep.serviceAccountEmail || null }, triggered);
     (0, proto_1.copyIfPresent)(parsed, ep, "availableMemoryMb", "maxInstances", "minInstances", "concurrency", "timeoutSeconds", "vpc", "labels", "ingressSettings", "environmentVariables");
     (0, proto_1.renameIfPresent)(parsed, ep, "secretEnvironmentVariables", "secretEnvironmentVariables", (senvs) => {
         const secretEnvironmentVariables = [];

package/lib/deploy/functions/runtimes/golang/index.js

@@ -5,11 +5,9 @@ const util_1 = require("util");
 const node_fetch_1 = require("node-fetch");
 const fs = require("fs");
 const path = require("path");
-const portfinder = require("portfinder");
 const spawn = require("cross-spawn");
 const error_1 = require("../../../../error");
 const logger_1 = require("../../../../logger");
-const discovery = require("../discovery");
 const gomod = require("./gomod");
 const VERSION_TO_RUNTIME = {
     "1.13": "go113",
@@ -105,26 +103,8 @@ class Delegate {
             return p;
         });
     }
-    async discoverBuild(configValues, envs) {
-        return { requiredAPIs: [], endpoints: {}, params: [] };
-    }
-    async discoverSpec(configValues, envs) {
-        let discovered = await discovery.detectFromYaml(this.sourceDir, this.projectId, this.runtime);
-        if (!discovered) {
-            const getPort = (0, util_1.promisify)(portfinder.getPort);
-            const port = await getPort();
-            portfinder.basePort = port + 1;
-            const adminPort = await getPort();
-            const kill = await this.serve(port, adminPort, envs);
-            try {
-                discovered = await discovery.detectFromPort(adminPort, this.projectId, this.runtime);
-            }
-            finally {
-                await kill();
-            }
-        }
-        discovered.environmentVariables = envs;
-        return discovered;
+    async discoverBuild() {
+        return Promise.resolve({ requiredAPIs: [], endpoints: {}, params: [] });
     }
 }
 exports.Delegate = Delegate;

package/lib/deploy/functions/runtimes/node/index.js

@@ -85,15 +85,15 @@ class Delegate {
             return p;
         });
     }
-    async discoverSpec(config, env) {
+    async discoverBuild(config, env) {
         if (!semver.valid(this.sdkVersion)) {
             logger_1.logger.debug(`Could not parse firebase-functions version '${this.sdkVersion}' into semver. Falling back to parseTriggers.`);
-            return parseTriggers.discoverBackend(this.projectId, this.sourceDir, this.runtime, config, env);
+            return parseTriggers.discoverBuild(this.projectId, this.sourceDir, this.runtime, config, env);
         }
         if (semver.lt(this.sdkVersion, MIN_FUNCTIONS_SDK_VERSION)) {
             (0, utils_1.logLabeledWarning)("functions", `You are using an old version of firebase-functions SDK (${this.sdkVersion}). ` +
                 `Please update firebase-functions SDK to >=${MIN_FUNCTIONS_SDK_VERSION}`);
-            return parseTriggers.discoverBackend(this.projectId, this.sourceDir, this.runtime, config, env);
+            return parseTriggers.discoverBuild(this.projectId, this.sourceDir, this.runtime, config, env);
         }
         let discovered = await discovery.detectFromYaml(this.sourceDir, this.projectId, this.runtime);
         if (!discovered) {
@@ -107,11 +107,7 @@ class Delegate {
                 await kill();
             }
         }
-        discovered.environmentVariables = env;
         return discovered;
     }
-    async discoverBuild(config, env) {
-        return parseTriggers.discoverBuild(this.projectId, this.sourceDir, this.runtime, config, env);
-    }
 }
 exports.Delegate = Delegate;

package/lib/deploy/functions/runtimes/node/parseTriggers.js

@@ -45,7 +45,7 @@ function parseTriggers(projectId, sourceDir, configValues, envs) {
         });
     });
 }
-function useStrategy(context) {
+function useStrategy() {
     return Promise.resolve(true);
 }
 exports.useStrategy = useStrategy;
@@ -179,7 +179,7 @@ function addResourcesToBuild(projectId, runtime, annotation, want) {
         };
     }
     const endpointId = annotation.name;
-    const endpoint = Object.assign({ platform: annotation.platform || "gcfv1", region: regions, project: projectId, entryPoint: annotation.entryPoint, runtime: runtime, serviceAccount: annotation.serviceAccountEmail || "default" }, triggered);
+    const endpoint = Object.assign({ platform: annotation.platform || "gcfv1", region: regions, project: projectId, entryPoint: annotation.entryPoint, runtime: runtime, serviceAccount: annotation.serviceAccountEmail || null }, triggered);
     if (annotation.vpcConnector != null) {
         let maybeId = annotation.vpcConnector;
         if (maybeId && !maybeId.includes("/")) {

package/lib/deploy/lifecycleHooks.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.lifecycleHooks = void 0;
-const _ = require("lodash");
 const utils = require("../utils");
 const clc = require("cli-color");
 const childProcess = require("child_process");
@@ -32,7 +31,7 @@ function runCommand(command, childOptions) {
                 reject(new Error("Command terminated with signal " + signal));
             }
             else if (code !== 0) {
-                reject(new Error("Command terminated with non-zero exit code" + code));
+                reject(new Error("Command terminated with non-zero exit code " + code));
             }
             else {
                 resolve();
@@ -54,7 +53,7 @@ function getChildEnvironment(target, overallOptions, config) {
         default:
             resourceDir = overallOptions.config.path(overallOptions.config.projectDir);
     }
-    return _.assign({}, process.env, {
+    return Object.assign({}, process.env, {
         GCLOUD_PROJECT: projectId,
         PROJECT_DIR: projectDir,
         RESOURCE_DIR: resourceDir,
@@ -74,10 +73,8 @@ function runTargetCommands(target, hook, overallOptions, config) {
         shell: true,
         stdio: [0, 1, 2],
     };
-    const runAllCommands = _.reduce(commands, (soFar, command) => {
-        return soFar.then(() => {
-            return runCommand(command, childOptions);
-        });
+    const runAllCommands = commands.reduce((soFar, command) => {
+        return soFar.then(() => runCommand(command, childOptions));
     }, Promise.resolve());
     let logIdentifier = target;
     if (config.target) {
@@ -96,14 +93,14 @@ function getReleventConfigs(target, options) {
     if (!targetConfigs) {
         return [];
     }
-    if (!_.isArray(targetConfigs)) {
+    if (!Array.isArray(targetConfigs)) {
         targetConfigs = [targetConfigs];
     }
     if (!options.only) {
         return targetConfigs;
     }
     let onlyTargets = options.only.split(",");
-    if (_.includes(onlyTargets, target)) {
+    if (onlyTargets.includes(target)) {
         return targetConfigs;
     }
     onlyTargets = onlyTargets
@@ -114,12 +111,12 @@ function getReleventConfigs(target, options) {
         return individualOnly.replace(`${target}:`, "");
     });
     return targetConfigs.filter((config) => {
-        return !config.target || _.includes(onlyTargets, config.target);
+        return !config.target || onlyTargets.includes(config.target);
     });
 }
 function lifecycleHooks(target, hook) {
     return function (context, options) {
-        return _.reduce(getReleventConfigs(target, options), (previousCommands, individualConfig) => {
+        return getReleventConfigs(target, options).reduce((previousCommands, individualConfig) => {
             return previousCommands.then(() => {
                 return runTargetCommands(target, hook, options, individualConfig);
             });

package/lib/deploy/storage/prepare.js

@@ -11,9 +11,9 @@ async function default_1(context, options) {
     _.set(context, "storage.rules", rulesConfig);
     const rulesDeploy = new rulesDeploy_1.RulesDeploy(options, rulesDeploy_1.RulesetServiceType.FIREBASE_STORAGE);
     _.set(context, "storage.rulesDeploy", rulesDeploy);
-    if (_.isPlainObject(rulesConfig)) {
+    if (typeof rulesConfig === "object" && rulesConfig !== null) {
         const defaultBucket = await gcp.storage.getDefaultBucket(options.project);
-        rulesConfig = [_.assign(rulesConfig, { bucket: defaultBucket })];
+        rulesConfig = [Object.assign(rulesConfig, { bucket: defaultBucket })];
         _.set(context, "storage.rules", rulesConfig);
     }
     rulesConfig.forEach((ruleConfig) => {

package/lib/emulator/auth/index.js

@@ -26,7 +26,7 @@ class AuthEmulator {
         return this.destroyServer ? this.destroyServer() : Promise.resolve();
     }
     getInfo() {
-        const host = this.args.host || constants_1.Constants.getDefaultHost(types_1.Emulators.AUTH);
+        const host = this.args.host || constants_1.Constants.getDefaultHost();
         const port = this.args.port || constants_1.Constants.getDefaultPort(types_1.Emulators.AUTH);
         return {
             name: this.getName(),