Use sentinel error always

Emyrk · Emyrk · commit 75747f5c4108 · 2023-02-02T09:02:49.000-06:00
diff --git a/coderd/authzquery/authzquerier.go b/coderd/authzquery/authzquerier.go
@@ -7,8 +7,6 @@ import (
 
 	"cdr.dev/slog"
 
-	"golang.org/x/xerrors"
-
 	"github.com/coder/coder/coderd/database"
 	"github.com/coder/coder/coderd/rbac"
 )
@@ -58,12 +56,12 @@ func (q *AuthzQuerier) InTx(function func(querier database.Store) error, txOpts
 func (q *AuthzQuerier) authorizeContext(ctx context.Context, action rbac.Action, object rbac.Objecter) error {
 	act, ok := ActorFromContext(ctx)
 	if !ok {
-		return xerrors.Errorf("no authorization actor in context")
+		return NoActorError
 	}
 
 	err := q.authorizer.Authorize(ctx, act, action, object.RBACObject())
 	if err != nil {
-		return xerrors.Errorf("unauthorized: %w", err)
+		return LogNotAuthorizedError(ctx, q.logger, err)
 	}
 	return nil
 }
diff --git a/coderd/authzquery/methods_test.go b/coderd/authzquery/methods_test.go
@@ -90,7 +90,9 @@ func (s *MethodTestSuite) RunMethodTest(testCaseF func(t *testing.T, db database
 
 	db := databasefake.New()
 	rec := &coderdtest.RecordingAuthorizer{
-		Wrapped: &coderdtest.FakeAuthorizer{},
+		Wrapped: &coderdtest.FakeAuthorizer{
+			AlwaysReturn: nil,
+		},
 	}
 	az := authzquery.NewAuthzQuerier(db, rec, slog.Make())
 	actor := rbac.Subject{

Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,6 @@ import (`
`7`	`7`
`8`	`8`	`"cdr.dev/slog"`
`9`	`9`
`10`		`- "golang.org/x/xerrors"`
`11`		`-`
`12`	`10`	`"github.com/coder/coder/coderd/database"`
`13`	`11`	`"github.com/coder/coder/coderd/rbac"`
`14`	`12`	`)`
`@@ -58,12 +56,12 @@ func (q *AuthzQuerier) InTx(function func(querier database.Store) error, txOpts`
`58`	`56`	`func (q *AuthzQuerier) authorizeContext(ctx context.Context, action rbac.Action, object rbac.Objecter) error {`
`59`	`57`	`act, ok := ActorFromContext(ctx)`
`60`	`58`	`if !ok {`
`61`		`- return xerrors.Errorf("no authorization actor in context")`
	`59`	`+ return NoActorError`
`62`	`60`	`}`
`63`	`61`
`64`	`62`	`err := q.authorizer.Authorize(ctx, act, action, object.RBACObject())`
`65`	`63`	`if err != nil {`
`66`		`- return xerrors.Errorf("unauthorized: %w", err)`
	`64`	`+ return LogNotAuthorizedError(ctx, q.logger, err)`
`67`	`65`	`}`
`68`	`66`	`return nil`
`69`	`67`	`}`