Attach rate limiter outside the pkg

Emyrk · Emyrk · commit 900709bf0201 · 2023-04-04T15:18:13.000-05:00
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -404,7 +404,10 @@ func New(options *Options) *API {
 	r.Get("/healthz", func(w http.ResponseWriter, r *http.Request) { _, _ = w.Write([]byte("OK")) })
 
 	// Attach workspace apps routes.
-	workspaceAppServer.Attach(r, apiRateLimiter)
+	r.Group(func(r chi.Router) {
+		r.Use(apiKeyMiddleware)
+		workspaceAppServer.Attach(r)
+	})
 
 	r.Route("/derp", func(r chi.Router) {
 		r.Get("/", derpHandler.ServeHTTP)
diff --git a/coderd/workspaceapps/proxy.go b/coderd/workspaceapps/proxy.go
@@ -86,9 +86,8 @@ type Server struct {
 	AppSigningKey       SigningKey
 }
 
-func (s *Server) Attach(r chi.Router, pathAppRateLimiter func(http.Handler) http.Handler) {
+func (s *Server) Attach(r chi.Router) {
 	servePathApps := func(r chi.Router) {
-		r.Use(pathAppRateLimiter)
 		r.HandleFunc("/*", s.workspaceAppsProxyPath)
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -86,9 +86,8 @@ type Server struct {`
`86`	`86`	`AppSigningKey SigningKey`
`87`	`87`	`}`
`88`	`88`
`89`		`-func (s *Server) Attach(r chi.Router, pathAppRateLimiter func(http.Handler) http.Handler) {`
	`89`	`+func (s *Server) Attach(r chi.Router) {`
`90`	`90`	`servePathApps := func(r chi.Router) {`
`91`		`- r.Use(pathAppRateLimiter)`
`92`	`91`	`r.HandleFunc("/*", s.workspaceAppsProxyPath)`
`93`	`92`	`}`
`94`	`93`