Correct experiment description. Remove dead experiment (#5676)

firebase · Apr 13, 2023 · de50243 · de50243
1 parent d7c993e
commit de50243
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 23 deletions.
diff --git a/src/deploy/functions/build.ts b/src/deploy/functions/build.ts
@@ -2,7 +2,6 @@ import * as backend from "./backend";
 import * as proto from "../../gcp/proto";
 import * as api from "../../.../../api";
 import * as params from "./params";
-import * as experiments from "../../experiments";
 import { FirebaseError } from "../../error";
 import { assertExhaustive, mapObject, nullsafeVisitor } from "../../functional";
 import { UserEnvsOpts, writeUserEnvs } from "../../functions/env";
@@ -285,24 +284,22 @@ export async function resolveBackend(
   nonInteractive?: boolean
 ): Promise<{ backend: backend.Backend; envs: Record<string, params.ParamValue> }> {
   let paramValues: Record<string, params.ParamValue> = {};
-  if (experiments.isEnabled("functionsparams")) {
-    paramValues = await params.resolveParams(
-      build.params,
-      firebaseConfig,
-      envWithTypes(build.params, userEnvs),
-      nonInteractive
-    );
-
-    const toWrite: Record<string, string> = {};
-    for (const paramName of Object.keys(paramValues)) {
-      const paramValue = paramValues[paramName];
-      if (Object.prototype.hasOwnProperty.call(userEnvs, paramName) || paramValue.internal) {
-        continue;
-      }
-      toWrite[paramName] = paramValue.toString();
+  paramValues = await params.resolveParams(
+    build.params,
+    firebaseConfig,
+    envWithTypes(build.params, userEnvs),
+    nonInteractive
+  );
+
+  const toWrite: Record<string, string> = {};
+  for (const paramName of Object.keys(paramValues)) {
+    const paramValue = paramValues[paramName];
+    if (Object.prototype.hasOwnProperty.call(userEnvs, paramName) || paramValue.internal) {
+      continue;
     }
-    writeUserEnvs(toWrite, userEnvOpt);
+    toWrite[paramName] = paramValue.toString();
   }
+  writeUserEnvs(toWrite, userEnvOpt);
 
   return { backend: toBackend(build, paramValues), envs: paramValues };
 }

diff --git a/src/experiments.ts b/src/experiments.ts
@@ -64,10 +64,6 @@ export const ALL_EXPERIMENTS = experiments({
       "of how that image was created.",
     public: true,
   },
-  functionsparams: {
-    shortDescription: "Adds support for paramaterizing functions deployments",
-    default: true,
-  },
 
   // Emulator experiments
   emulatoruisnapshot: {
@@ -79,8 +75,7 @@ export const ALL_EXPERIMENTS = experiments({
     shortDescription: "Native support for popular web frameworks",
     fullDescription:
       "Adds support for popular web frameworks such as Next.js " +
-      "Angular, React, Svelte, and Vite-compatible frameworks. Firebase is " +
-      "committed to support these platforms long-term, but a manual migration " +
+      "Angular, React, Svelte, and Vite-compatible frameworks. A manual migration " +
       "may be required when the non-experimental support for these frameworks " +
       "is released",
     docsUri: "https://firebase.google.com/docs/hosting/frameworks-overview",