rename authzquery.NewAuthzQuerier to authzquery.New

johnstcn · johnstcn · commit eda4e0ae9cb3 · 2023-02-07T14:02:58.000Z
diff --git a/coderd/authzquery/authz_test.go b/coderd/authzquery/authz_test.go
@@ -38,7 +38,7 @@ func TestNotAuthorizedError(t *testing.T) {
 
 	t.Run("MissingActor", func(t *testing.T) {
 		t.Parallel()
-		q := authzquery.NewAuthzQuerier(dbfake.New(), &coderdtest.RecordingAuthorizer{
+		q := authzquery.New(dbfake.New(), &coderdtest.RecordingAuthorizer{
 			Wrapped: &coderdtest.FakeAuthorizer{AlwaysReturn: nil},
 		}, slog.Make())
 		// This should fail because the actor is missing.
@@ -52,7 +52,7 @@ func TestNotAuthorizedError(t *testing.T) {
 // as only the first db call will be made. But it is better than nothing.
 func TestAuthzQueryRecursive(t *testing.T) {
 	t.Parallel()
-	q := authzquery.NewAuthzQuerier(dbfake.New(), &coderdtest.RecordingAuthorizer{
+	q := authzquery.New(dbfake.New(), &coderdtest.RecordingAuthorizer{
 		Wrapped: &coderdtest.FakeAuthorizer{AlwaysReturn: nil},
 	}, slog.Make())
 	actor := rbac.Subject{
@@ -84,7 +84,7 @@ func TestAuthzQueryRecursive(t *testing.T) {
 func TestPing(t *testing.T) {
 	t.Parallel()
 
-	q := authzquery.NewAuthzQuerier(dbfake.New(), &coderdtest.RecordingAuthorizer{}, slog.Make())
+	q := authzquery.New(dbfake.New(), &coderdtest.RecordingAuthorizer{}, slog.Make())
 	_, err := q.Ping(context.Background())
 	require.NoError(t, err, "must not error")
 }
@@ -94,7 +94,7 @@ func TestInTX(t *testing.T) {
 	t.Parallel()
 
 	db := dbfake.New()
-	q := authzquery.NewAuthzQuerier(db, &coderdtest.RecordingAuthorizer{
+	q := authzquery.New(db, &coderdtest.RecordingAuthorizer{
 		Wrapped: &coderdtest.FakeAuthorizer{AlwaysReturn: xerrors.New("custom error")},
 	}, slog.Make())
 	actor := rbac.Subject{
diff --git a/coderd/authzquery/authzquerier.go b/coderd/authzquery/authzquerier.go
@@ -26,7 +26,7 @@ type AuthzQuerier struct {
 	log  slog.Logger
 }
 
-func NewAuthzQuerier(db database.Store, authorizer rbac.Authorizer, logger slog.Logger) *AuthzQuerier {
+func New(db database.Store, authorizer rbac.Authorizer, logger slog.Logger) *AuthzQuerier {
 	return &AuthzQuerier{
 		db:   db,
 		auth: authorizer,
@@ -47,7 +47,7 @@ func (q *AuthzQuerier) InTx(function func(querier database.Store) error, txOpts
 	// TODO: @emyrk verify this works.
 	return q.db.InTx(func(tx database.Store) error {
 		// Wrap the transaction store in an AuthzQuerier.
-		wrapped := NewAuthzQuerier(tx, q.auth, q.log)
+		wrapped := New(tx, q.auth, q.log)
 		return function(wrapped)
 	}, txOpts)
 }
diff --git a/coderd/authzquery/methods_test.go b/coderd/authzquery/methods_test.go
@@ -102,7 +102,7 @@ func (s *MethodTestSuite) RunMethodTest(testCaseF func(t *testing.T, db database
 	rec := &coderdtest.RecordingAuthorizer{
 		Wrapped: fakeAuthorizer,
 	}
-	az := authzquery.NewAuthzQuerier(db, rec, slog.Make())
+	az := authzquery.New(db, rec, slog.Make())
 	actor := rbac.Subject{
 		ID:     uuid.NewString(),
 		Roles:  rbac.RoleNames{rbac.RoleOwner()},
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -207,7 +207,7 @@ func New(options *Options) *API {
 	// TODO: remove this once we promote authz_querier out of experiments.
 	if experiments.Enabled(codersdk.ExperimentAuthzQuerier) {
 		if _, ok := (options.Database).(*authzquery.AuthzQuerier); !ok {
-			options.Database = authzquery.NewAuthzQuerier(options.Database, options.Authorizer, options.Logger.Named("authz_querier"))
+			options.Database = authzquery.New(options.Database, options.Authorizer, options.Logger.Named("authz_querier"))
 		}
 	}
 	if options.SetUserGroups == nil {
diff --git a/coderd/coderdtest/coderdtest.go b/coderd/coderdtest/coderdtest.go
@@ -187,7 +187,7 @@ func NewOptions(t *testing.T, options *Options) (func(http.Handler), context.Can
 				Wrapped: rbac.NewAuthorizer(prometheus.NewRegistry()),
 			}
 		}
-		options.Database = authzquery.NewAuthzQuerier(options.Database, options.Authorizer, slogtest.Make(t, nil).Leveled(slog.LevelDebug))
+		options.Database = authzquery.New(options.Database, options.Authorizer, slogtest.Make(t, nil).Leveled(slog.LevelDebug))
 	}
 	if options.DeploymentConfig == nil {
 		options.DeploymentConfig = DeploymentConfig(t)

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ func (s MethodTestSuite) RunMethodTest(testCaseF func(t testing.T, db database`
`102`	`102`	`rec := &coderdtest.RecordingAuthorizer{`
`103`	`103`	`Wrapped: fakeAuthorizer,`
`104`	`104`	`}`
`105`		`- az := authzquery.NewAuthzQuerier(db, rec, slog.Make())`
	`105`	`+ az := authzquery.New(db, rec, slog.Make())`
`106`	`106`	`actor := rbac.Subject{`
`107`	`107`	`ID: uuid.NewString(),`
`108`	`108`	`Roles: rbac.RoleNames{rbac.RoleOwner()},`
Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,7 @@ func New(options Options) API {`
`207`	`207`	`// TODO: remove this once we promote authz_querier out of experiments.`
`208`	`208`	`if experiments.Enabled(codersdk.ExperimentAuthzQuerier) {`
`209`	`209`	`if _, ok := (options.Database).(*authzquery.AuthzQuerier); !ok {`
`210`		`- options.Database = authzquery.NewAuthzQuerier(options.Database, options.Authorizer, options.Logger.Named("authz_querier"))`
	`210`	`+ options.Database = authzquery.New(options.Database, options.Authorizer, options.Logger.Named("authz_querier"))`
`211`	`211`	`}`
`212`	`212`	`}`
`213`	`213`	`if options.SetUserGroups == nil {`
Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ func NewOptions(t testing.T, options Options) (func(http.Handler), context.Can`
`187`	`187`	`Wrapped: rbac.NewAuthorizer(prometheus.NewRegistry()),`
`188`	`188`	`}`
`189`	`189`	`}`
`190`		`- options.Database = authzquery.NewAuthzQuerier(options.Database, options.Authorizer, slogtest.Make(t, nil).Leveled(slog.LevelDebug))`
	`190`	`+ options.Database = authzquery.New(options.Database, options.Authorizer, slogtest.Make(t, nil).Leveled(slog.LevelDebug))`
`191`	`191`	`}`
`192`	`192`	`if options.DeploymentConfig == nil {`
`193`	`193`	`options.DeploymentConfig = DeploymentConfig(t)`