From b34033b12a39ee750646a01c2b2c1d7b909d78cd Mon Sep 17 00:00:00 2001 From: Ben Date: Mon, 24 Oct 2022 18:02:16 +0000 Subject: [PATCH 1/2] Revert "chore: Move deployment UI and HA into experimental (#4595)" This reverts commit 18c4368571c4a8ddcfc3d8e90746cee17f118d37. --- coderd/coderdtest/coderdtest.go | 2 -- enterprise/coderd/coderd.go | 2 +- enterprise/coderd/replicas_test.go | 9 ++------- site/src/components/Navbar/Navbar.tsx | 7 +------ 4 files changed, 4 insertions(+), 16 deletions(-) diff --git a/coderd/coderdtest/coderdtest.go b/coderd/coderdtest/coderdtest.go index f0b8e58f99c58..7a144a4e373e8 100644 --- a/coderd/coderdtest/coderdtest.go +++ b/coderd/coderdtest/coderdtest.go @@ -75,7 +75,6 @@ type Options struct { AppHostname string AWSCertificates awsidentity.Certificates Authorizer rbac.Authorizer - Experimental bool AzureCertificates x509.VerifyOptions GithubOAuth2Config *coderd.GithubOAuth2Config RealIPConfig *httpmw.RealIPConfig @@ -234,7 +233,6 @@ func NewOptions(t *testing.T, options *Options) (func(http.Handler), context.Can CacheDir: t.TempDir(), Database: options.Database, Pubsub: options.Pubsub, - Experimental: options.Experimental, Auditor: options.Auditor, AWSCertificates: options.AWSCertificates, diff --git a/enterprise/coderd/coderd.go b/enterprise/coderd/coderd.go index b9d095883824e..0c9bd0225d058 100644 --- a/enterprise/coderd/coderd.go +++ b/enterprise/coderd/coderd.go @@ -262,7 +262,7 @@ func (api *API) updateEntitlements(ctx context.Context) error { if changed, enabled := featureChanged(codersdk.FeatureHighAvailability); changed { coordinator := agpltailnet.NewCoordinator() - if api.Experimental && enabled { + if enabled { haCoordinator, err := tailnet.NewCoordinator(api.Logger, api.Pubsub) if err != nil { api.Logger.Error(ctx, "unable to set up high availability coordinator", slog.Error(err)) diff --git a/enterprise/coderd/replicas_test.go b/enterprise/coderd/replicas_test.go index b14e52dd58fb5..7a3e130cf7770 100644 --- a/enterprise/coderd/replicas_test.go +++ b/enterprise/coderd/replicas_test.go @@ -24,7 +24,6 @@ func TestReplicas(t *testing.T) { db, pubsub := dbtestutil.NewDB(t) firstClient := coderdenttest.New(t, &coderdenttest.Options{ Options: &coderdtest.Options{ - Experimental: true, IncludeProvisionerDaemon: true, Database: db, Pubsub: pubsub, @@ -55,7 +54,6 @@ func TestReplicas(t *testing.T) { IncludeProvisionerDaemon: true, Database: db, Pubsub: pubsub, - Experimental: true, }, }) firstUser := coderdtest.CreateFirstUser(t, firstClient) @@ -65,9 +63,8 @@ func TestReplicas(t *testing.T) { secondClient := coderdenttest.New(t, &coderdenttest.Options{ Options: &coderdtest.Options{ - Experimental: true, - Database: db, - Pubsub: pubsub, + Database: db, + Pubsub: pubsub, }, }) secondClient.SessionToken = firstClient.SessionToken @@ -95,7 +92,6 @@ func TestReplicas(t *testing.T) { certificates := []tls.Certificate{testutil.GenerateTLSCertificate(t, "localhost")} firstClient := coderdenttest.New(t, &coderdenttest.Options{ Options: &coderdtest.Options{ - Experimental: true, IncludeProvisionerDaemon: true, Database: db, Pubsub: pubsub, @@ -109,7 +105,6 @@ func TestReplicas(t *testing.T) { secondClient := coderdenttest.New(t, &coderdenttest.Options{ Options: &coderdtest.Options{ - Experimental: true, Database: db, Pubsub: pubsub, TLSCertificates: certificates, diff --git a/site/src/components/Navbar/Navbar.tsx b/site/src/components/Navbar/Navbar.tsx index 56d763b4a66f1..ba88831219fe5 100644 --- a/site/src/components/Navbar/Navbar.tsx +++ b/site/src/components/Navbar/Navbar.tsx @@ -14,15 +14,10 @@ export const Navbar: React.FC = () => { selectFeatureVisibility, shallowEqual, ) - const experimental = useSelector( - xServices.entitlementsXService, - (state) => state.context.entitlements.experimental, - ) const canViewAuditLog = featureVisibility[FeatureNames.AuditLog] && Boolean(permissions?.viewAuditLog) - const canViewDeployment = - experimental && Boolean(permissions?.viewDeploymentConfig) + const canViewDeployment = Boolean(permissions?.viewDeploymentConfig) const onSignOut = () => authSend("SIGN_OUT") return ( From 34f8bd0af381e8a705c17ac65dc3281a48a45b44 Mon Sep 17 00:00:00 2001 From: Ben Date: Tue, 25 Oct 2022 14:17:16 +0000 Subject: [PATCH 2/2] restore flag in coderdtest --- coderd/coderdtest/coderdtest.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/coderd/coderdtest/coderdtest.go b/coderd/coderdtest/coderdtest.go index 7a144a4e373e8..0b70b91d8f64e 100644 --- a/coderd/coderdtest/coderdtest.go +++ b/coderd/coderdtest/coderdtest.go @@ -75,6 +75,7 @@ type Options struct { AppHostname string AWSCertificates awsidentity.Certificates Authorizer rbac.Authorizer + Experimental bool AzureCertificates x509.VerifyOptions GithubOAuth2Config *coderd.GithubOAuth2Config RealIPConfig *httpmw.RealIPConfig @@ -233,7 +234,8 @@ func NewOptions(t *testing.T, options *Options) (func(http.Handler), context.Can CacheDir: t.TempDir(), Database: options.Database, Pubsub: options.Pubsub, - + Experimental: options.Experimental, + Auditor: options.Auditor, AWSCertificates: options.AWSCertificates, AzureCertificates: options.AzureCertificates,