coder · f0ssel · May 2, 2024 · May 1, 2024 · May 1, 2024 · May 1, 2024
diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go
diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -1055,9 +1055,6 @@ func New(options *Options) *API {
 				r.Put("/autoupdates", api.putWorkspaceAutoupdates)
 				r.Get("/resolve-autostart", api.resolveAutostart)
 				r.Route("/port-share", func(r chi.Router) {
-					r.Use(
-						httpmw.RequireExperiment(api.Experiments, codersdk.ExperimentSharedPorts),
-					)
 					r.Get("/", api.workspaceAgentPortShares)
 					r.Post("/", api.postWorkspaceAgentPortShare)
 					r.Delete("/", api.deleteWorkspaceAgentPortShare)

diff --git a/coderd/prometheusmetrics/prometheusmetrics_test.go b/coderd/prometheusmetrics/prometheusmetrics_test.go
@@ -511,23 +511,29 @@ func TestAgentStats(t *testing.T) {
 func TestExperimentsMetric(t *testing.T) {
 	t.Parallel()
 
+	if len(codersdk.ExperimentsAll) == 0 {
+		t.Skip("No experiments are currently defined; skipping test.")
+	}
+
 	tests := []struct {
 		name        string
 		experiments codersdk.Experiments
 		expected    map[codersdk.Experiment]float64
 	}{
 		{
-			name:        "Enabled experiment is exported in metrics",
-			experiments: codersdk.Experiments{codersdk.ExperimentSharedPorts},
+			name: "Enabled experiment is exported in metrics",
+			experiments: codersdk.Experiments{
+				codersdk.ExperimentsAll[0],
+			},
 			expected: map[codersdk.Experiment]float64{
-				codersdk.ExperimentSharedPorts: 1,
+				codersdk.ExperimentsAll[0]: 1,
 			},
 		},
 		{
 			name:        "Disabled experiment is exported in metrics",
 			experiments: codersdk.Experiments{},
 			expected: map[codersdk.Experiment]float64{
-				codersdk.ExperimentSharedPorts: 0,
+				codersdk.ExperimentsAll[0]: 0,
 			},
 		},
 		{

diff --git a/coderd/workspaceagentportshare_test.go b/coderd/workspaceagentportshare_test.go
@@ -19,11 +19,7 @@ func TestPostWorkspaceAgentPortShare(t *testing.T) {
 	t.Parallel()
 	ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
 	defer cancel()
-	dep := coderdtest.DeploymentValues(t)
-	dep.Experiments = append(dep.Experiments, string(codersdk.ExperimentSharedPorts))
-	ownerClient, db := coderdtest.NewWithDatabase(t, &coderdtest.Options{
-		DeploymentValues: dep,
-	})
+	ownerClient, db := coderdtest.NewWithDatabase(t, nil)
 	owner := coderdtest.CreateFirstUser(t, ownerClient)
 	client, user := coderdtest.CreateAnotherUser(t, ownerClient, owner.OrganizationID)
 
@@ -140,11 +136,7 @@ func TestGetWorkspaceAgentPortShares(t *testing.T) {
 	ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
 	defer cancel()
 
-	dep := coderdtest.DeploymentValues(t)
-	dep.Experiments = append(dep.Experiments, string(codersdk.ExperimentSharedPorts))
-	ownerClient, db := coderdtest.NewWithDatabase(t, &coderdtest.Options{
-		DeploymentValues: dep,
-	})
+	ownerClient, db := coderdtest.NewWithDatabase(t, nil)
 	owner := coderdtest.CreateFirstUser(t, ownerClient)
 	client, user := coderdtest.CreateAnotherUser(t, ownerClient, owner.OrganizationID)
 
@@ -180,11 +172,7 @@ func TestDeleteWorkspaceAgentPortShare(t *testing.T) {
 	ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
 	defer cancel()
 
-	dep := coderdtest.DeploymentValues(t)
-	dep.Experiments = append(dep.Experiments, string(codersdk.ExperimentSharedPorts))
-	ownerClient, db := coderdtest.NewWithDatabase(t, &coderdtest.Options{
-		DeploymentValues: dep,
-	})
+	ownerClient, db := coderdtest.NewWithDatabase(t, nil)
 	owner := coderdtest.CreateFirstUser(t, ownerClient)
 	client, user := coderdtest.CreateAnotherUser(t, ownerClient, owner.OrganizationID)
 

diff --git a/coderd/workspaceapps_test.go b/coderd/workspaceapps_test.go
@@ -257,7 +257,6 @@ func TestWorkspaceApps(t *testing.T) {
 		deploymentValues.DisablePathApps = serpent.Bool(opts.DisablePathApps)
 		deploymentValues.Dangerous.AllowPathAppSharing = serpent.Bool(opts.DangerousAllowPathAppSharing)
 		deploymentValues.Dangerous.AllowPathAppSiteOwnerAccess = serpent.Bool(opts.DangerousAllowPathAppSiteOwnerAccess)
-		deploymentValues.Experiments = append(deploymentValues.Experiments, string(codersdk.ExperimentSharedPorts))
 
 		if opts.DisableSubdomainApps {
 			opts.AppHost = ""

diff --git a/codersdk/deployment.go b/codersdk/deployment.go
@@ -2192,18 +2192,15 @@ type Experiment string
 
 const (
 	// Add new experiments here!
-	ExperimentExample            Experiment = "example" // This isn't used for anything.
-	ExperimentSharedPorts        Experiment = "shared-ports"
+	ExperimentExample            Experiment = "example"              // This isn't used for anything.
 	ExperimentAutoFillParameters Experiment = "auto-fill-parameters" // This should not be taken out of experiments until we have redesigned the feature.
 )
 
 // ExperimentsAll should include all experiments that are safe for
 // users to opt-in to via --experimental='*'.
 // Experiments that are not ready for consumption by all users should
 // not be included here and will be essentially hidden.
-var ExperimentsAll = Experiments{
-	ExperimentSharedPorts,
-}
+var ExperimentsAll = Experiments{}
 
 // Experiments is a list of experiments.
 // Multiple experiments may be enabled at the same time.

diff --git a/docs/api/schemas.md b/docs/api/schemas.md
diff --git a/enterprise/coderd/workspaceportshare_test.go b/enterprise/coderd/workspaceportshare_test.go
@@ -17,12 +17,9 @@ import (
 func TestWorkspacePortShare(t *testing.T) {
 	t.Parallel()
 
-	dep := coderdtest.DeploymentValues(t)
-	dep.Experiments = append(dep.Experiments, string(codersdk.ExperimentSharedPorts))
 	ownerClient, owner := coderdenttest.New(t, &coderdenttest.Options{
 		Options: &coderdtest.Options{
 			IncludeProvisionerDaemon: true,
-			DeploymentValues:         dep,
 		},
 		LicenseOptions: &coderdenttest.LicenseOptions{
 			Features: license.Features{

diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts