Skip to content

Commit ca38729

Browse files
authored
chore: revert dynamic params as a safe experiment (#17510)
1 parent 5d97d82 commit ca38729

File tree

6 files changed

+15
-17
lines changed

6 files changed

+15
-17
lines changed

coderd/coderd.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1816,10 +1816,10 @@ func ReadExperiments(log slog.Logger, raw []string) codersdk.Experiments {
18161816
for _, v := range raw {
18171817
switch v {
18181818
case "*":
1819-
exps = append(exps, codersdk.ExperimentsAll...)
1819+
exps = append(exps, codersdk.ExperimentsSafe...)
18201820
default:
18211821
ex := codersdk.Experiment(strings.ToLower(v))
1822-
if !slice.Contains(codersdk.ExperimentsAll, ex) {
1822+
if !slice.Contains(codersdk.ExperimentsSafe, ex) {
18231823
log.Warn(context.Background(), "🐉 HERE BE DRAGONS: opting into hidden experiment", slog.F("experiment", ex))
18241824
}
18251825
exps = append(exps, ex)

coderd/experiments.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ func (api *API) handleExperimentsGet(rw http.ResponseWriter, r *http.Request) {
2929
func handleExperimentsSafe(rw http.ResponseWriter, r *http.Request) {
3030
ctx := r.Context()
3131
httpapi.Write(ctx, rw, http.StatusOK, codersdk.AvailableExperiments{
32-
Safe: codersdk.ExperimentsAll,
32+
Safe: codersdk.ExperimentsSafe,
3333
})
3434
}

coderd/experiments_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ func Test_Experiments(t *testing.T) {
6969
experiments, err := client.Experiments(ctx)
7070
require.NoError(t, err)
7171
require.NotNil(t, experiments)
72-
require.ElementsMatch(t, codersdk.ExperimentsAll, experiments)
73-
for _, ex := range codersdk.ExperimentsAll {
72+
require.ElementsMatch(t, codersdk.ExperimentsSafe, experiments)
73+
for _, ex := range codersdk.ExperimentsSafe {
7474
require.True(t, experiments.Enabled(ex))
7575
}
7676
require.False(t, experiments.Enabled("danger"))
@@ -91,8 +91,8 @@ func Test_Experiments(t *testing.T) {
9191
experiments, err := client.Experiments(ctx)
9292
require.NoError(t, err)
9393
require.NotNil(t, experiments)
94-
require.ElementsMatch(t, append(codersdk.ExperimentsAll, "danger"), experiments)
95-
for _, ex := range codersdk.ExperimentsAll {
94+
require.ElementsMatch(t, append(codersdk.ExperimentsSafe, "danger"), experiments)
95+
for _, ex := range codersdk.ExperimentsSafe {
9696
require.True(t, experiments.Enabled(ex))
9797
}
9898
require.True(t, experiments.Enabled("danger"))
@@ -131,6 +131,6 @@ func Test_Experiments(t *testing.T) {
131131
experiments, err := client.SafeExperiments(ctx)
132132
require.NoError(t, err)
133133
require.NotNil(t, experiments)
134-
require.ElementsMatch(t, codersdk.ExperimentsAll, experiments.Safe)
134+
require.ElementsMatch(t, codersdk.ExperimentsSafe, experiments.Safe)
135135
})
136136
}

coderd/prometheusmetrics/prometheusmetrics.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -655,7 +655,7 @@ func Experiments(registerer prometheus.Registerer, active codersdk.Experiments)
655655
return err
656656
}
657657

658-
for _, exp := range codersdk.ExperimentsAll {
658+
for _, exp := range codersdk.ExperimentsSafe {
659659
var val float64
660660
for _, enabled := range active {
661661
if exp == enabled {

coderd/prometheusmetrics/prometheusmetrics_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -612,7 +612,7 @@ func TestAgentStats(t *testing.T) {
612612
func TestExperimentsMetric(t *testing.T) {
613613
t.Parallel()
614614

615-
if len(codersdk.ExperimentsAll) == 0 {
615+
if len(codersdk.ExperimentsSafe) == 0 {
616616
t.Skip("No experiments are currently defined; skipping test.")
617617
}
618618

@@ -624,17 +624,17 @@ func TestExperimentsMetric(t *testing.T) {
624624
{
625625
name: "Enabled experiment is exported in metrics",
626626
experiments: codersdk.Experiments{
627-
codersdk.ExperimentsAll[0],
627+
codersdk.ExperimentsSafe[0],
628628
},
629629
expected: map[codersdk.Experiment]float64{
630-
codersdk.ExperimentsAll[0]: 1,
630+
codersdk.ExperimentsSafe[0]: 1,
631631
},
632632
},
633633
{
634634
name: "Disabled experiment is exported in metrics",
635635
experiments: codersdk.Experiments{},
636636
expected: map[codersdk.Experiment]float64{
637-
codersdk.ExperimentsAll[0]: 0,
637+
codersdk.ExperimentsSafe[0]: 0,
638638
},
639639
},
640640
{

codersdk/deployment.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3258,13 +3258,11 @@ const (
32583258
ExperimentDynamicParameters Experiment = "dynamic-parameters" // Enables dynamic parameters when creating a workspace.
32593259
)
32603260

3261-
// ExperimentsAll should include all experiments that are safe for
3261+
// ExperimentsSafe should include all experiments that are safe for
32623262
// users to opt-in to via --experimental='*'.
32633263
// Experiments that are not ready for consumption by all users should
32643264
// not be included here and will be essentially hidden.
3265-
var ExperimentsAll = Experiments{
3266-
ExperimentDynamicParameters,
3267-
}
3265+
var ExperimentsSafe = Experiments{}
32683266

32693267
// Experiments is a list of experiments.
32703268
// Multiple experiments may be enabled at the same time.

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy