chore: revert dynamic params as a safe experiment (#17510)

This commit is contained in:
Steven Masley
2025-04-22 16:21:15 +00:00
committed by GitHub
parent 5d97d82422
commit ca38729840
6 changed files with 15 additions and 17 deletions
+2 -2
View File
@@ -1816,10 +1816,10 @@ func ReadExperiments(log slog.Logger, raw []string) codersdk.Experiments {
for _, v := range raw { for _, v := range raw {
switch v { switch v {
case "*": case "*":
exps = append(exps, codersdk.ExperimentsAll...) exps = append(exps, codersdk.ExperimentsSafe...)
default: default:
ex := codersdk.Experiment(strings.ToLower(v)) ex := codersdk.Experiment(strings.ToLower(v))
if !slice.Contains(codersdk.ExperimentsAll, ex) { if !slice.Contains(codersdk.ExperimentsSafe, ex) {
log.Warn(context.Background(), "🐉 HERE BE DRAGONS: opting into hidden experiment", slog.F("experiment", ex)) log.Warn(context.Background(), "🐉 HERE BE DRAGONS: opting into hidden experiment", slog.F("experiment", ex))
} }
exps = append(exps, ex) exps = append(exps, ex)
+1 -1
View File
@@ -29,6 +29,6 @@ func (api *API) handleExperimentsGet(rw http.ResponseWriter, r *http.Request) {
func handleExperimentsSafe(rw http.ResponseWriter, r *http.Request) { func handleExperimentsSafe(rw http.ResponseWriter, r *http.Request) {
ctx := r.Context() ctx := r.Context()
httpapi.Write(ctx, rw, http.StatusOK, codersdk.AvailableExperiments{ httpapi.Write(ctx, rw, http.StatusOK, codersdk.AvailableExperiments{
Safe: codersdk.ExperimentsAll, Safe: codersdk.ExperimentsSafe,
}) })
} }
+5 -5
View File
@@ -69,8 +69,8 @@ func Test_Experiments(t *testing.T) {
experiments, err := client.Experiments(ctx) experiments, err := client.Experiments(ctx)
require.NoError(t, err) require.NoError(t, err)
require.NotNil(t, experiments) require.NotNil(t, experiments)
require.ElementsMatch(t, codersdk.ExperimentsAll, experiments) require.ElementsMatch(t, codersdk.ExperimentsSafe, experiments)
for _, ex := range codersdk.ExperimentsAll { for _, ex := range codersdk.ExperimentsSafe {
require.True(t, experiments.Enabled(ex)) require.True(t, experiments.Enabled(ex))
} }
require.False(t, experiments.Enabled("danger")) require.False(t, experiments.Enabled("danger"))
@@ -91,8 +91,8 @@ func Test_Experiments(t *testing.T) {
experiments, err := client.Experiments(ctx) experiments, err := client.Experiments(ctx)
require.NoError(t, err) require.NoError(t, err)
require.NotNil(t, experiments) require.NotNil(t, experiments)
require.ElementsMatch(t, append(codersdk.ExperimentsAll, "danger"), experiments) require.ElementsMatch(t, append(codersdk.ExperimentsSafe, "danger"), experiments)
for _, ex := range codersdk.ExperimentsAll { for _, ex := range codersdk.ExperimentsSafe {
require.True(t, experiments.Enabled(ex)) require.True(t, experiments.Enabled(ex))
} }
require.True(t, experiments.Enabled("danger")) require.True(t, experiments.Enabled("danger"))
@@ -131,6 +131,6 @@ func Test_Experiments(t *testing.T) {
experiments, err := client.SafeExperiments(ctx) experiments, err := client.SafeExperiments(ctx)
require.NoError(t, err) require.NoError(t, err)
require.NotNil(t, experiments) require.NotNil(t, experiments)
require.ElementsMatch(t, codersdk.ExperimentsAll, experiments.Safe) require.ElementsMatch(t, codersdk.ExperimentsSafe, experiments.Safe)
}) })
} }
@@ -655,7 +655,7 @@ func Experiments(registerer prometheus.Registerer, active codersdk.Experiments)
return err return err
} }
for _, exp := range codersdk.ExperimentsAll { for _, exp := range codersdk.ExperimentsSafe {
var val float64 var val float64
for _, enabled := range active { for _, enabled := range active {
if exp == enabled { if exp == enabled {
@@ -612,7 +612,7 @@ func TestAgentStats(t *testing.T) {
func TestExperimentsMetric(t *testing.T) { func TestExperimentsMetric(t *testing.T) {
t.Parallel() t.Parallel()
if len(codersdk.ExperimentsAll) == 0 { if len(codersdk.ExperimentsSafe) == 0 {
t.Skip("No experiments are currently defined; skipping test.") t.Skip("No experiments are currently defined; skipping test.")
} }
@@ -624,17 +624,17 @@ func TestExperimentsMetric(t *testing.T) {
{ {
name: "Enabled experiment is exported in metrics", name: "Enabled experiment is exported in metrics",
experiments: codersdk.Experiments{ experiments: codersdk.Experiments{
codersdk.ExperimentsAll[0], codersdk.ExperimentsSafe[0],
}, },
expected: map[codersdk.Experiment]float64{ expected: map[codersdk.Experiment]float64{
codersdk.ExperimentsAll[0]: 1, codersdk.ExperimentsSafe[0]: 1,
}, },
}, },
{ {
name: "Disabled experiment is exported in metrics", name: "Disabled experiment is exported in metrics",
experiments: codersdk.Experiments{}, experiments: codersdk.Experiments{},
expected: map[codersdk.Experiment]float64{ expected: map[codersdk.Experiment]float64{
codersdk.ExperimentsAll[0]: 0, codersdk.ExperimentsSafe[0]: 0,
}, },
}, },
{ {
+2 -4
View File
@@ -3258,13 +3258,11 @@ const (
ExperimentDynamicParameters Experiment = "dynamic-parameters" // Enables dynamic parameters when creating a workspace. ExperimentDynamicParameters Experiment = "dynamic-parameters" // Enables dynamic parameters when creating a workspace.
) )
// ExperimentsAll should include all experiments that are safe for // ExperimentsSafe should include all experiments that are safe for
// users to opt-in to via --experimental='*'. // users to opt-in to via --experimental='*'.
// Experiments that are not ready for consumption by all users should // Experiments that are not ready for consumption by all users should
// not be included here and will be essentially hidden. // not be included here and will be essentially hidden.
var ExperimentsAll = Experiments{ var ExperimentsSafe = Experiments{}
ExperimentDynamicParameters,
}
// Experiments is a list of experiments. // Experiments is a list of experiments.
// Multiple experiments may be enabled at the same time. // Multiple experiments may be enabled at the same time.