use codersdk experiment value instead of hard-coded string

johnstcn · johnstcn · commit 832d91a92df6 · 2023-02-10T11:00:58.000Z
diff --git a/coderd/coderdtest/authorize_test.go b/coderd/coderdtest/authorize_test.go
@@ -11,10 +11,11 @@ import (
 
 	"github.com/coder/coder/coderd/coderdtest"
 	"github.com/coder/coder/coderd/rbac"
+	"github.com/coder/coder/codersdk"
 )
 
 func TestAuthorizeAllEndpoints(t *testing.T) {
-	if strings.Contains(os.Getenv("CODER_EXPERIMENTS_TEST"), "authz_querier") {
+	if strings.Contains(os.Getenv("CODER_EXPERIMENTS_TEST"), string(codersdk.ExperimentAuthzQuerier)) {
 		t.Skip("Skipping TestAuthorizeAllEndpoints for authz_querier experiment")
 	}
 	t.Parallel()
diff --git a/coderd/coderdtest/coderdtest.go b/coderd/coderdtest/coderdtest.go
@@ -181,7 +181,7 @@ func NewOptions(t *testing.T, options *Options) (func(http.Handler), context.Can
 		options.Database, options.Pubsub = dbtestutil.NewDB(t)
 	}
 	// TODO: remove this once we're ready to enable authz querier by default.
-	if strings.Contains(os.Getenv("CODER_EXPERIMENTS_TEST"), "authz_querier") {
+	if strings.Contains(os.Getenv("CODER_EXPERIMENTS_TEST"), string(codersdk.ExperimentAuthzQuerier)) {
 		if options.Authorizer == nil {
 			options.Authorizer = &RecordingAuthorizer{
 				Wrapped: rbac.NewAuthorizer(prometheus.NewRegistry()),
diff --git a/enterprise/coderd/coderdenttest/coderdenttest_test.go b/enterprise/coderd/coderdenttest/coderdenttest_test.go
@@ -24,7 +24,7 @@ func TestNew(t *testing.T) {
 }
 
 func TestAuthorizeAllEndpoints(t *testing.T) {
-	if strings.Contains(os.Getenv("CODER_EXPERIMENTS_TEST"), "authz_querier") {
+	if strings.Contains(os.Getenv("CODER_EXPERIMENTS_TEST"), string(codersdk.ExperimentAuthzQuerier)) {
 		t.Skip("Skipping TestAuthorizeAllEndpoints for authz_querier experiment")
 	}
 	t.Parallel()

Original file line number	Diff line number	Diff line change
`@@ -11,10 +11,11 @@ import (`
`11`	`11`
`12`	`12`	`"github.com/coder/coder/coderd/coderdtest"`
`13`	`13`	`"github.com/coder/coder/coderd/rbac"`
	`14`	`+ "github.com/coder/coder/codersdk"`
`14`	`15`	`)`
`15`	`16`
`16`	`17`	`func TestAuthorizeAllEndpoints(t *testing.T) {`
`17`		`- if strings.Contains(os.Getenv("CODER_EXPERIMENTS_TEST"), "authz_querier") {`
	`18`	`+ if strings.Contains(os.Getenv("CODER_EXPERIMENTS_TEST"), string(codersdk.ExperimentAuthzQuerier)) {`
`18`	`19`	`t.Skip("Skipping TestAuthorizeAllEndpoints for authz_querier experiment")`
`19`	`20`	`}`
`20`	`21`	`t.Parallel()`
Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,7 @@ func NewOptions(t testing.T, options Options) (func(http.Handler), context.Can`
`181`	`181`	`options.Database, options.Pubsub = dbtestutil.NewDB(t)`
`182`	`182`	`}`
`183`	`183`	`// TODO: remove this once we're ready to enable authz querier by default.`
`184`		`- if strings.Contains(os.Getenv("CODER_EXPERIMENTS_TEST"), "authz_querier") {`
	`184`	`+ if strings.Contains(os.Getenv("CODER_EXPERIMENTS_TEST"), string(codersdk.ExperimentAuthzQuerier)) {`
`185`	`185`	`if options.Authorizer == nil {`
`186`	`186`	`options.Authorizer = &RecordingAuthorizer{`
`187`	`187`	`Wrapped: rbac.NewAuthorizer(prometheus.NewRegistry()),`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ func TestNew(t *testing.T) {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`func TestAuthorizeAllEndpoints(t *testing.T) {`
`27`		`- if strings.Contains(os.Getenv("CODER_EXPERIMENTS_TEST"), "authz_querier") {`
	`27`	`+ if strings.Contains(os.Getenv("CODER_EXPERIMENTS_TEST"), string(codersdk.ExperimentAuthzQuerier)) {`
`28`	`28`	`t.Skip("Skipping TestAuthorizeAllEndpoints for authz_querier experiment")`
`29`	`29`	`}`
`30`	`30`	`t.Parallel()`