Remove preview flag, add option to disable dotenv support. (#4022)

Preparing for launching dotenv support for CF3. At launch, CF3 environment variables support will default to picking up dotenv file if any, without need for preview flag.
firebase · taeold · Feb 10, 2022 · Jan 27, 2022 · Jan 31, 2022 · Jan 31, 2022
commit e799549bb4fde7b67e73edd996512349b98ecbb3
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1 @@
+- Add support for specifying environment variable of CF3 function using dotenv.
diff --git a/src/commands/index.js b/src/commands/index.js
@@ -95,9 +95,7 @@ module.exports = function (client) {
  client.functions = {};
  client.functions.config = {};
  client.functions.config.clone = loadCommand("functions-config-clone");
- if (previews.dotenv) {
- client.functions.config.export = loadCommand("functions-config-export");
- }
+ client.functions.config.export = loadCommand("functions-config-export");
  client.functions.config.get = loadCommand("functions-config-get");
  client.functions.config.set = loadCommand("functions-config-set");
  client.functions.config.unset = loadCommand("functions-config-unset");

diff --git a/src/deploy/functions/prepare.ts b/src/deploy/functions/prepare.ts
@@ -28,7 +28,7 @@ function hasUserConfig(config: Record<string, unknown>): boolean {
 }
 
 function hasDotenv(opts: functionsEnv.UserEnvsOpts): boolean {
- return previews.dotenv && functionsEnv.hasUserEnvs(opts);
+ return functionsEnv.hasUserEnvs(opts);
 }
 
 export async function prepare(
@@ -79,7 +79,7 @@ export async function prepare(
  const runtimeConfig = await getFunctionsConfig(context);
 
  const firebaseEnvs = functionsEnv.loadFirebaseEnvs(firebaseConfig, projectId);
- const userEnvOpt = {
+ const userEnvOpt: functionsEnv.UserEnvsOpts = {
  functionsSource: sourceDir,
  projectId: projectId,
  projectAlias: options.projectAlias,

diff --git a/src/functions/env.ts b/src/functions/env.ts
@@ -252,10 +252,6 @@ export function loadUserEnvs({
  projectAlias,
  isEmulator,
 }: UserEnvsOpts): Record<string, string> {
- if (!previews.dotenv) {
- return {};
- }
-
  const envFiles = findEnvfiles(functionsSource, projectId, projectAlias, isEmulator);
  if (envFiles.length == 0) {
  return {};

diff --git a/src/previews.ts b/src/previews.ts
@@ -9,7 +9,6 @@ interface PreviewFlags {
  functionsv2: boolean;
  golang: boolean;
  deletegcfartifacts: boolean;
- dotenv: boolean;
  artifactregistry: boolean;
 }
 
@@ -22,7 +21,6 @@ export const previews: PreviewFlags = {
  functionsv2: false,
  golang: false,
  deletegcfartifacts: false,
- dotenv: false,
  artifactregistry: false,
 
  ...(configstore.get("previews") as Partial<PreviewFlags>),

diff --git a/src/test/functions/env.spec.ts b/src/test/functions/env.spec.ts
@@ -5,7 +5,6 @@ import { sync as rimraf } from "rimraf";
 import { expect } from "chai";
 
 import * as env from "../../functions/env";
-import { previews } from "../../previews";
 
 describe("functions/env", () => {
  describe("parse", () => {
@@ -248,17 +247,12 @@ FOO=foo
  fs.writeFileSync(path.join(sourceDir, filename), data);
  }
  };
- const projectInfo = { projectId: "my-project", projectAlias: "dev" };
+ const projectInfo: Omit<env.UserEnvsOpts, "functionsSource"> = {
+ projectId: "my-project",
+ projectAlias: "dev",
+ };
  let tmpdir: string;
 
- before(() => {
- previews.dotenv = true;
- });
-
- after(() => {
- previews.dotenv = false;
- });
-
  beforeEach(() => {
  tmpdir = fs.mkdtempSync(path.join(os.tmpdir(), "test"));
  });