fix build errors

ammario · ammario · commit ac8f9df1d9db · 2023-05-05T18:26:36.000Z
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -398,7 +398,6 @@ func New(options *Options) *API {
 		tracing.StatusWriterMiddleware,
 		tracing.Middleware(api.TracerProvider),
 		httpmw.AttachRequestID,
-		httpmw.AttachAuthzCache,
 		httpmw.ExtractRealIP(api.RealIPConfig),
 		httpmw.Logger(api.Logger),
 		httpmw.Prometheus(options.PrometheusRegistry),
diff --git a/coderd/httpmw/authz.go b/coderd/httpmw/authz.go
@@ -6,7 +6,6 @@ import (
 	"github.com/go-chi/chi/v5"
 
 	"github.com/coder/coder/coderd/database/dbauthz"
-	"github.com/coder/coder/coderd/rbac"
 )
 
 // AsAuthzSystem is a chained handler that temporarily sets the dbauthz context
@@ -36,16 +35,3 @@ func AsAuthzSystem(mws ...func(http.Handler) http.Handler) func(http.Handler) ht
 		})
 	}
 }
-
-// AttachAuthzCache enables the authz cache for the authorizer. All rbac checks will
-// run against the cache, meaning duplicate checks will not be performed.
-//
-// Note the cache is safe for multiple actors. So mixing user and system checks
-// is ok.
-func AttachAuthzCache(next http.Handler) http.Handler {
-	return http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
-		ctx := rbac.WithCacheCtx(r.Context())
-
-		next.ServeHTTP(rw, r.WithContext(ctx))
-	})
-}
diff --git a/coderd/rbac/authz_test.go b/coderd/rbac/authz_test.go
@@ -312,29 +312,28 @@ func BenchmarkCacher(b *testing.B) {
 func TestCacher(t *testing.T) {
 	t.Parallel()
 
-	t.Run("EmptyCacheCtx", func(t *testing.T) {
+	t.Run("NoCache", func(t *testing.T) {
 		t.Parallel()
 
 		ctx := context.Background()
 		rec := &coderdtest.RecordingAuthorizer{
 			Wrapped: &coderdtest.FakeAuthorizer{AlwaysReturn: nil},
 		}
-		authz := rbac.Cacher(rec)
 		subj, obj, action := coderdtest.RandomRBACSubject(), coderdtest.RandomRBACObject(), coderdtest.RandomRBACAction()
 
 		// Two identical calls
-		_ = authz.Authorize(ctx, subj, action, obj)
-		_ = authz.Authorize(ctx, subj, action, obj)
+		_ = rec.Authorize(ctx, subj, action, obj)
+		_ = rec.Authorize(ctx, subj, action, obj)
 
 		// Yields two calls to the wrapped Authorizer
 		rec.AssertActor(t, subj, rec.Pair(action, obj), rec.Pair(action, obj))
 		require.NoError(t, rec.AllAsserted(), "all assertions should have been made")
 	})
 
-	t.Run("CacheCtx", func(t *testing.T) {
+	t.Run("Cache", func(t *testing.T) {
 		t.Parallel()
 
-		ctx := rbac.WithCacheCtx(context.Background())
+		ctx := context.Background()
 		rec := &coderdtest.RecordingAuthorizer{
 			Wrapped: &coderdtest.FakeAuthorizer{AlwaysReturn: nil},
 		}
@@ -353,7 +352,7 @@ func TestCacher(t *testing.T) {
 	t.Run("MultipleSubjects", func(t *testing.T) {
 		t.Parallel()
 
-		ctx := rbac.WithCacheCtx(context.Background())
+		ctx := context.Background()
 		rec := &coderdtest.RecordingAuthorizer{
 			Wrapped: &coderdtest.FakeAuthorizer{AlwaysReturn: nil},
 		}
