firebase-tools 11.1.0 → 11.2.0

package/lib/deploy/database/prepare.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.prepare = void 0;
-const _ = require("lodash");
 const clc = require("cli-color");
 const path = require("path");
 const error_1 = require("../../error");
@@ -24,7 +23,7 @@ function prepare(context, options) {
         ruleFiles[ruleConfig.rules] = null;
         deploys.push(ruleConfig);
     });
-    _.forEach(ruleFiles, (v, file) => {
+    for (const file of Object.keys(ruleFiles)) {
         switch (path.extname(file)) {
             case ".json":
                 ruleFiles[file] = options.config.readProjectFile(file);
@@ -35,7 +34,7 @@ function prepare(context, options) {
             default:
                 throw new error_1.FirebaseError("Unexpected rules format " + path.extname(file));
         }
-    });
+    }
     context.database = {
         deploys: deploys,
         ruleFiles: ruleFiles,

package/lib/deploy/extensions/secrets.js

@@ -6,7 +6,7 @@ const secretUtils = require("../../extensions/secretsUtils");
 const secretManager = require("../../gcp/secretManager");
 const planner_1 = require("./planner");
 const askUserForParam_1 = require("../../extensions/askUserForParam");
-const extensionsApi_1 = require("../../extensions/extensionsApi");
+const types_1 = require("../../extensions/types");
 const error_1 = require("../../error");
 const logger_1 = require("../../logger");
 const utils_1 = require("../../utils");
@@ -34,7 +34,7 @@ async function checkSpecForSecrets(i) {
 }
 exports.checkSpecForSecrets = checkSpecForSecrets;
 const secretsInSpec = (spec) => {
-    return spec.params.filter((p) => p.type === extensionsApi_1.ParamType.SECRET);
+    return spec.params.filter((p) => p.type === types_1.ParamType.SECRET);
 };
 async function handleSecretsCreateInstance(i, nonInteractive) {
     const extensionVersion = await (0, planner_1.getExtensionVersion)(i);
@@ -49,7 +49,7 @@ async function handleSecretsUpdateInstance(i, prevSpec, nonInteractive) {
     const secretParams = secretsInSpec(extensionVersion.spec);
     for (const s of secretParams) {
         const prevParam = prevExtensionVersion.spec.params.find((p) => p.param === s.param);
-        if ((prevParam === null || prevParam === void 0 ? void 0 : prevParam.type) === extensionsApi_1.ParamType.SECRET && prevSpec.params[prevParam === null || prevParam === void 0 ? void 0 : prevParam.param]) {
+        if ((prevParam === null || prevParam === void 0 ? void 0 : prevParam.type) === types_1.ParamType.SECRET && prevSpec.params[prevParam === null || prevParam === void 0 ? void 0 : prevParam.param]) {
             await handleSecretParamForUpdate(s, i, prevSpec.params[prevParam === null || prevParam === void 0 ? void 0 : prevParam.param], nonInteractive);
         }
         else {

package/lib/deploy/functions/build.js

@@ -93,8 +93,9 @@ function resolveBackend(build, userEnvs) {
                 };
                 proto.copyIfPresent(bkEndpoint.vpc, bdEndpoint.vpc, "egressSettings");
             }
-            if (bdEndpoint.serviceAccount) {
-                bkEndpoint.serviceAccountEmail = bdEndpoint.serviceAccount;
+            proto.renameIfPresent(bkEndpoint, bdEndpoint, "serviceAccountEmail", "serviceAccount");
+            if ("serviceAccountEmail" in bkEndpoint && !bdEndpoint.serviceAccount) {
+                delete bkEndpoint.serviceAccountEmail;
             }
             bkEndpoints.push(bkEndpoint);
         }

package/lib/deploy/functions/ensure.js

@@ -1,17 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.secretAccess = exports.maybeEnableAR = exports.cloudBuildEnabled = exports.defaultServiceAccount = void 0;
+exports.secretAccess = exports.cloudBuildEnabled = exports.defaultServiceAccount = void 0;
 const clc = require("cli-color");
 const ensureApiEnabled_1 = require("../../ensureApiEnabled");
 const error_1 = require("../../error");
 const utils_1 = require("../../utils");
 const secretManager_1 = require("../../gcp/secretManager");
-const previews_1 = require("../../previews");
 const projects_1 = require("../../management/projects");
 const functional_1 = require("../../functional");
 const track_1 = require("../../track");
 const backend = require("./backend");
-const ensureApiEnabled = require("../../ensureApiEnabled");
 const FAQ_URL = "https://firebase.google.com/support/faq#functions-runtime";
 const CLOUD_BUILD_API = "cloudbuild.googleapis.com";
 async function defaultServiceAccount(e) {
@@ -66,14 +64,6 @@ async function cloudBuildEnabled(projectId) {
     }
 }
 exports.cloudBuildEnabled = cloudBuildEnabled;
-async function maybeEnableAR(projectId) {
-    if (!previews_1.previews.artifactregistry) {
-        return ensureApiEnabled.check(projectId, "artifactregistry.googleapis.com", "functions", true);
-    }
-    await ensureApiEnabled.ensure(projectId, "artifactregistry.googleapis.com", "functions");
-    return true;
-}
-exports.maybeEnableAR = maybeEnableAR;
 async function secretsToServiceAccounts(b) {
     const secretsToSa = {};
     for (const e of backend.allEndpoints(b)) {

package/lib/deploy/functions/prepare.js

@@ -21,7 +21,6 @@ const triggerRegionHelper_1 = require("./triggerRegionHelper");
 const checkIam_1 = require("./checkIam");
 const error_1 = require("../../error");
 const projectConfig_1 = require("../../functions/projectConfig");
-const previews_1 = require("../../previews");
 const v1_1 = require("../../functions/events/v1");
 const serviceusage_1 = require("../../gcp/serviceusage");
 function hasUserConfig(config) {
@@ -40,9 +39,8 @@ async function prepare(context, options, payload) {
         ensureApiEnabled.ensure(projectId, "cloudfunctions.googleapis.com", "functions"),
         ensureApiEnabled.check(projectId, "runtimeconfig.googleapis.com", "runtimeconfig", true),
         ensure.cloudBuildEnabled(projectId),
-        ensure.maybeEnableAR(projectId),
+        ensureApiEnabled.check(projectId, "artifactregistry.googleapis.com", "artifactregistry"),
     ]);
-    context.artifactRegistryEnabled = checkAPIsEnabled[3];
     const firebaseConfig = await functionsConfig.getFirebaseConfig(options);
     context.firebaseConfig = firebaseConfig;
     let runtimeConfig = { firebase: firebaseConfig };
@@ -79,15 +77,8 @@ async function prepare(context, options, payload) {
         };
         const userEnvs = functionsEnv.loadUserEnvs(userEnvOpt);
         const envs = Object.assign(Object.assign({}, userEnvs), firebaseEnvs);
-        let wantBackend;
-        if (previews_1.previews.functionsparams) {
-            const wantBuild = await runtimeDelegate.discoverBuild(runtimeConfig, firebaseEnvs);
-            wantBackend = build.resolveBackend(wantBuild, userEnvs);
-        }
-        else {
-            logger_1.logger.debug(`Analyzing ${runtimeDelegate.name} backend spec`);
-            wantBackend = await runtimeDelegate.discoverSpec(runtimeConfig, firebaseEnvs);
-        }
+        const wantBuild = await runtimeDelegate.discoverBuild(runtimeConfig, firebaseEnvs);
+        const wantBackend = build.resolveBackend(wantBuild, userEnvs);
         wantBackend.environmentVariables = envs;
         for (const endpoint of backend.allEndpoints(wantBackend)) {
             endpoint.environmentVariables = wantBackend.environmentVariables;
@@ -145,7 +136,6 @@ async function prepare(context, options, payload) {
     }));
     if (backend.someEndpoint(wantBackend, (e) => e.platform === "gcfv2")) {
         const V2_APIS = [
-            "artifactregistry.googleapis.com",
             "run.googleapis.com",
             "eventarc.googleapis.com",
             "pubsub.googleapis.com",

package/lib/deploy/functions/prepareFunctionsUpload.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.prepareFunctionsUpload = exports.getFunctionsConfig = void 0;
-const _ = require("lodash");
 const archiver = require("archiver");
 const clc = require("cli-color");
 const filesize = require("filesize");
@@ -54,12 +53,12 @@ async function packageSource(sourceDir, config, runtimeConfig) {
     ignore.push("firebase-debug.log", "firebase-debug.*.log", CONFIG_DEST_FILE);
     try {
         const files = await fsAsync.readdirRecursive({ path: sourceDir, ignore: ignore });
-        _.forEach(files, (file) => {
+        for (const file of files) {
             archive.file(file.name, {
                 name: path.relative(sourceDir, file.name),
                 mode: file.mode,
             });
-        });
+        }
         if (typeof runtimeConfig !== "undefined") {
             archive.append(JSON.stringify(runtimeConfig, null, 2), {
                 name: CONFIG_DEST_FILE,

package/lib/deploy/functions/release/fabricator.js

@@ -36,7 +36,6 @@ const gcfV2PollerOptions = {
     masterTimeout: 25 * 60 * 1000,
     maxBackoff: 10000,
 };
-const DEFAULT_GCFV2_CONCURRENCY = 80;
 const rethrowAs = (endpoint, op) => (err) => {
     logger_1.logger.error(err.message);
     throw new reporter.DeploymentError(endpoint, op, err);

package/lib/deploy/functions/release/index.js

@@ -63,11 +63,7 @@ async function release(context, options, payload) {
     const deletedEndpoints = Object.values(plan)
         .map((r) => r.endpointsToDelete)
         .reduce(functional_1.reduceFlat, []);
-    const opts = {};
-    if (!context.artifactRegistryEnabled) {
-        opts.ar = new containerCleaner.NoopArtifactRegistryCleaner();
-    }
-    await containerCleaner.cleanupBuildImages(haveEndpoints, deletedEndpoints, opts);
+    await containerCleaner.cleanupBuildImages(haveEndpoints, deletedEndpoints);
     const allErrors = summary.results.filter((r) => r.error).map((r) => r.error);
     if (allErrors.length) {
         const opts = allErrors.length === 1 ? { original: allErrors[0] } : { children: allErrors };

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.detectFromPort = exports.detectFromYaml = exports.yamlToBackend = exports.readFileAsync = void 0;
+exports.detectFromPort = exports.detectFromYaml = exports.yamlToBuild = exports.yamlToBackend = exports.readFileAsync = void 0;
 const node_fetch_1 = require("node-fetch");
 const fs = require("fs");
 const path = require("path");
@@ -26,6 +26,21 @@ function yamlToBackend(yaml, project, region, runtime) {
     }
 }
 exports.yamlToBackend = yamlToBackend;
+function yamlToBuild(yaml, project, region, runtime) {
+    try {
+        if (!yaml.specVersion) {
+            throw new error_1.FirebaseError("Expect manifest yaml to specify a version number");
+        }
+        if (yaml.specVersion === "v1alpha1") {
+            return v1alpha1.buildFromV1Alpha1(yaml, project, region, runtime);
+        }
+        throw new error_1.FirebaseError("It seems you are using a newer SDK than this version of the CLI can handle. Please update your CLI with `npm install -g firebase-tools`");
+    }
+    catch (err) {
+        throw new error_1.FirebaseError("Failed to parse build specification", { children: [err] });
+    }
+}
+exports.yamlToBuild = yamlToBuild;
 async function detectFromYaml(directory, project, runtime) {
     let text;
     try {
@@ -42,7 +57,7 @@ async function detectFromYaml(directory, project, runtime) {
     }
     logger_1.logger.debug("Found functions.yaml. Got spec:", text);
     const parsed = yaml.load(text);
-    return yamlToBackend(parsed, project, api.functionsDefaultRegion, runtime);
+    return yamlToBuild(parsed, project, api.functionsDefaultRegion, runtime);
 }
 exports.detectFromYaml = detectFromYaml;
 async function detectFromPort(port, project, runtime, timeout = 30000) {
@@ -74,6 +89,6 @@ async function detectFromPort(port, project, runtime, timeout = 30000) {
         logger_1.logger.debug("Failed to parse functions.yaml", err);
         throw new error_1.FirebaseError(`Failed to load function definition from source: ${text}`);
     }
-    return yamlToBackend(parsed, project, api.functionsDefaultRegion, runtime);
+    return yamlToBuild(parsed, project, api.functionsDefaultRegion, runtime);
 }
 exports.detectFromPort = detectFromPort;

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;

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");
@@ -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

@@ -13,7 +13,7 @@ async function default_1(context, options) {
     _.set(context, "storage.rulesDeploy", rulesDeploy);
     if (_.isPlainObject(rulesConfig)) {
         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(),