coder · Emyrk · Dec 19, 2023 · Dec 19, 2023 · Dec 19, 2023 · Dec 19, 2023
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/codersdk/deployment.go b/codersdk/deployment.go
@@ -2073,10 +2073,6 @@ func (c *Client) BuildInfo(ctx context.Context) (BuildInfoResponse, error) {
 type Experiment string
 
 const (
-	// ExperimentMoons enabled the workspace proxy endpoints and CRUD. This
-	// feature is not yet complete in functionality.
-	ExperimentMoons Experiment = "moons"
-
 	// https://github.com/coder/coder/milestone/19
 	ExperimentWorkspaceActions Experiment = "workspace_actions"
 

diff --git a/docs/admin/workspace-proxies.md b/docs/admin/workspace-proxies.md
@@ -1,13 +1,5 @@
 # Workspace Proxies
 
-> Workspace proxies are in an
-> [experimental state](../contributing/feature-stages.md#experimental-features)
-> and the behavior is subject to change. Use
-> [GitHub issues](https://github.com/coder/coder) to leave feedback. This
-> experiment must be specifically enabled with the `--experiments="moons"`
-> option on both coderd and the workspace proxy. If you have all experiements
-> enabled, you have to add moons as well. `--experiments="*,moons"`
-
 Workspace proxies provide low-latency experiences for geo-distributed teams.
 
 Coder's networking does a best effort to make direct connections to a workspace.
@@ -130,10 +122,6 @@ coder:
     - name: CODER_WILDCARD_ACCESS_URL
       value: "*.<app_hostname_of_proxy>"
 
-    # enables new paid features that are in alpha state
-    - name: CODER_EXPERIMENTS
-      value: "*,moons"
-
   tls:
     secretNames:
       - kubernetes-wsproxy-secret

diff --git a/docs/api/general.md b/docs/api/general.md
diff --git a/docs/api/schemas.md b/docs/api/schemas.md
diff --git a/enterprise/cli/workspaceproxy_test.go b/enterprise/cli/workspaceproxy_test.go
@@ -9,7 +9,6 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/coder/coder/v2/cli/clitest"
-	"github.com/coder/coder/v2/coderd/coderdtest"
 	"github.com/coder/coder/v2/codersdk"
 	"github.com/coder/coder/v2/enterprise/coderd/coderdenttest"
 	"github.com/coder/coder/v2/enterprise/coderd/license"
@@ -23,16 +22,7 @@ func Test_ProxyCRUD(t *testing.T) {
 	t.Run("Create", func(t *testing.T) {
 		t.Parallel()
 
-		dv := coderdtest.DeploymentValues(t)
-		dv.Experiments = []string{
-			string(codersdk.ExperimentMoons),
-			"*",
-		}
-
 		client, _ := coderdenttest.New(t, &coderdenttest.Options{
-			Options: &coderdtest.Options{
-				DeploymentValues: dv,
-			},
 			LicenseOptions: &coderdenttest.LicenseOptions{
 				Features: license.Features{
 					codersdk.FeatureWorkspaceProxy: 1,
@@ -94,17 +84,7 @@ func Test_ProxyCRUD(t *testing.T) {
 
 	t.Run("Delete", func(t *testing.T) {
 		t.Parallel()
-
-		dv := coderdtest.DeploymentValues(t)
-		dv.Experiments = []string{
-			string(codersdk.ExperimentMoons),
-			"*",
-		}
-
 		client, _ := coderdenttest.New(t, &coderdenttest.Options{
-			Options: &coderdtest.Options{
-				DeploymentValues: dv,
-			},
 			LicenseOptions: &coderdenttest.LicenseOptions{
 				Features: license.Features{
 					codersdk.FeatureWorkspaceProxy: 1,

diff --git a/enterprise/coderd/coderd.go b/enterprise/coderd/coderd.go
@@ -362,34 +362,33 @@ func New(ctx context.Context, options *Options) (_ *API, err error) {
 	}
 	api.derpMesh = derpmesh.New(options.Logger.Named("derpmesh"), api.DERPServer, meshTLSConfig)
 
-	if api.AGPL.Experiments.Enabled(codersdk.ExperimentMoons) {
-		// Proxy health is a moon feature.
-		api.ProxyHealth, err = proxyhealth.New(&proxyhealth.Options{
-			Interval:   options.ProxyHealthInterval,
-			DB:         api.Database,
-			Logger:     options.Logger.Named("proxyhealth"),
-			Client:     api.HTTPClient,
-			Prometheus: api.PrometheusRegistry,
-		})
-		if err != nil {
-			return nil, xerrors.Errorf("initialize proxy health: %w", err)
-		}
-		go api.ProxyHealth.Run(ctx)
-		// Force the initial loading of the cache. Do this in a go routine in case
-		// the calls to the workspace proxies hang and this takes some time.
-		go api.forceWorkspaceProxyHealthUpdate(ctx)
-
-		// Use proxy health to return the healthy workspace proxy hostnames.
-		f := api.ProxyHealth.ProxyHosts
-		api.AGPL.WorkspaceProxyHostsFn.Store(&f)
-
-		// Wire this up to healthcheck.
-		var fetchUpdater healthcheck.WorkspaceProxiesFetchUpdater = &workspaceProxiesFetchUpdater{
-			fetchFunc:  api.fetchWorkspaceProxies,
-			updateFunc: api.ProxyHealth.ForceUpdate,
-		}
-		api.AGPL.WorkspaceProxiesFetchUpdater.Store(&fetchUpdater)
+	// Moon feature init. Proxyhealh is a go routine to periodically check
+	// the health of all workspace proxies.
+	api.ProxyHealth, err = proxyhealth.New(&proxyhealth.Options{
+		Interval:   options.ProxyHealthInterval,
+		DB:         api.Database,
+		Logger:     options.Logger.Named("proxyhealth"),
+		Client:     api.HTTPClient,
+		Prometheus: api.PrometheusRegistry,
+	})
+	if err != nil {
+		return nil, xerrors.Errorf("initialize proxy health: %w", err)
+	}
+	go api.ProxyHealth.Run(ctx)
+	// Force the initial loading of the cache. Do this in a go routine in case
+	// the calls to the workspace proxies hang and this takes some time.
+	go api.forceWorkspaceProxyHealthUpdate(ctx)
+
+	// Use proxy health to return the healthy workspace proxy hostnames.
+	f := api.ProxyHealth.ProxyHosts
+	api.AGPL.WorkspaceProxyHostsFn.Store(&f)
+
+	// Wire this up to healthcheck.
+	var fetchUpdater healthcheck.WorkspaceProxiesFetchUpdater = &workspaceProxiesFetchUpdater{
+		fetchFunc:  api.fetchWorkspaceProxies,
+		updateFunc: api.ProxyHealth.ForceUpdate,
 	}
+	api.AGPL.WorkspaceProxiesFetchUpdater.Store(&fetchUpdater)
 
 	err = api.PrometheusRegistry.Register(&api.licenseMetricsCollector)
 	if err != nil {

diff --git a/enterprise/coderd/templates.go b/enterprise/coderd/templates.go
@@ -344,12 +344,6 @@ func (api *API) templateRBACEnabledMW(next http.Handler) http.Handler {
 
 func (api *API) moonsEnabledMW(next http.Handler) http.Handler {
 	return http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
-		// The experiment must be enabled.
-		if !api.AGPL.Experiments.Enabled(codersdk.ExperimentMoons) {
-			httpapi.RouteNotFound(rw)
-			return
-		}
-
 		// Entitlement must be enabled.
 		api.entitlementsMu.RLock()
 		proxy := api.entitlements.Features[codersdk.FeatureWorkspaceProxy].Enabled

diff --git a/enterprise/coderd/workspaceproxy_test.go b/enterprise/coderd/workspaceproxy_test.go
@@ -36,20 +36,13 @@ func TestRegions(t *testing.T) {
 	t.Run("OK", func(t *testing.T) {
 		t.Parallel()
 
-		dv := coderdtest.DeploymentValues(t)
-		dv.Experiments = []string{
-			string(codersdk.ExperimentMoons),
-			"*",
-		}
-
 		db, pubsub := dbtestutil.NewDB(t)
 
 		client, _ := coderdenttest.New(t, &coderdenttest.Options{
 			Options: &coderdtest.Options{
-				AppHostname:      appHostname,
-				Database:         db,
-				Pubsub:           pubsub,
-				DeploymentValues: dv,
+				AppHostname: appHostname,
+				Database:    db,
+				Pubsub:      pubsub,
 			},
 		})
 
@@ -79,20 +72,13 @@ func TestRegions(t *testing.T) {
 	t.Run("WithProxies", func(t *testing.T) {
 		t.Parallel()
 
-		dv := coderdtest.DeploymentValues(t)
-		dv.Experiments = []string{
-			string(codersdk.ExperimentMoons),
-			"*",
-		}
-
 		db, pubsub := dbtestutil.NewDB(t)
 
 		client, closer, api, _ := coderdenttest.NewWithAPI(t, &coderdenttest.Options{
 			Options: &coderdtest.Options{
-				AppHostname:      appHostname,
-				Database:         db,
-				Pubsub:           pubsub,
-				DeploymentValues: dv,
+				AppHostname: appHostname,
+				Database:    db,
+				Pubsub:      pubsub,
 			},
 			LicenseOptions: &coderdenttest.LicenseOptions{
 				Features: license.Features{
@@ -173,17 +159,10 @@ func TestRegions(t *testing.T) {
 	t.Run("RequireAuth", func(t *testing.T) {
 		t.Parallel()
 
-		dv := coderdtest.DeploymentValues(t)
-		dv.Experiments = []string{
-			string(codersdk.ExperimentMoons),
-			"*",
-		}
-
 		ctx := testutil.Context(t, testutil.WaitLong)
 		client, _ := coderdenttest.New(t, &coderdenttest.Options{
 			Options: &coderdtest.Options{
-				AppHostname:      appHostname,
-				DeploymentValues: dv,
+				AppHostname: appHostname,
 			},
 		})
 
@@ -200,15 +179,7 @@ func TestWorkspaceProxyCRUD(t *testing.T) {
 	t.Run("CreateAndUpdate", func(t *testing.T) {
 		t.Parallel()
 
-		dv := coderdtest.DeploymentValues(t)
-		dv.Experiments = []string{
-			string(codersdk.ExperimentMoons),
-			"*",
-		}
 		client, _ := coderdenttest.New(t, &coderdenttest.Options{
-			Options: &coderdtest.Options{
-				DeploymentValues: dv,
-			},
 			LicenseOptions: &coderdenttest.LicenseOptions{
 				Features: license.Features{
 					codersdk.FeatureWorkspaceProxy: 1,
@@ -251,15 +222,7 @@ func TestWorkspaceProxyCRUD(t *testing.T) {
 	t.Run("Delete", func(t *testing.T) {
 		t.Parallel()
 
-		dv := coderdtest.DeploymentValues(t)
-		dv.Experiments = []string{
-			string(codersdk.ExperimentMoons),
-			"*",
-		}
 		client, _ := coderdenttest.New(t, &coderdenttest.Options{
-			Options: &coderdtest.Options{
-				DeploymentValues: dv,
-			},
 			LicenseOptions: &coderdenttest.LicenseOptions{
 				Features: license.Features{
 					codersdk.FeatureWorkspaceProxy: 1,
@@ -287,16 +250,9 @@ func TestProxyRegisterDeregister(t *testing.T) {
 	t.Parallel()
 
 	setup := func(t *testing.T) (*codersdk.Client, database.Store) {
-		dv := coderdtest.DeploymentValues(t)
-		dv.Experiments = []string{
-			string(codersdk.ExperimentMoons),
-			"*",
-		}
-
 		db, pubsub := dbtestutil.NewDB(t)
 		client, _ := coderdenttest.New(t, &coderdenttest.Options{
 			Options: &coderdtest.Options{
-				DeploymentValues:         dv,
 				Database:                 db,
 				Pubsub:                   pubsub,
 				IncludeProvisionerDaemon: true,
@@ -635,16 +591,9 @@ func TestProxyRegisterDeregister(t *testing.T) {
 func TestIssueSignedAppToken(t *testing.T) {
 	t.Parallel()
 
-	dv := coderdtest.DeploymentValues(t)
-	dv.Experiments = []string{
-		string(codersdk.ExperimentMoons),
-		"*",
-	}
-
 	db, pubsub := dbtestutil.NewDB(t)
 	client, user := coderdenttest.New(t, &coderdenttest.Options{
 		Options: &coderdtest.Options{
-			DeploymentValues:         dv,
 			Database:                 db,
 			Pubsub:                   pubsub,
 			IncludeProvisionerDaemon: true,
@@ -732,16 +681,9 @@ func TestIssueSignedAppToken(t *testing.T) {
 func TestReconnectingPTYSignedToken(t *testing.T) {
 	t.Parallel()
 
-	dv := coderdtest.DeploymentValues(t)
-	dv.Experiments = []string{
-		string(codersdk.ExperimentMoons),
-		"*",
-	}
-
 	db, pubsub := dbtestutil.NewDB(t)
 	client, closer, api, user := coderdenttest.NewWithAPI(t, &coderdenttest.Options{
 		Options: &coderdtest.Options{
-			DeploymentValues:         dv,
 			Database:                 db,
 			Pubsub:                   pubsub,
 			IncludeProvisionerDaemon: true,