use r.Group to override single endpoints

Emyrk · Emyrk · commit 59fb67f2cd02 · 2024-07-25T15:32:37.000-05:00
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -864,13 +864,11 @@ func New(options *Options) *API {
 			r.Use(
 				apiKeyMiddleware,
 			)
-			api.APISubRoutes.Organizations = r
 			r.Get("/", api.organizations)
 			r.Route("/{organization}", func(r chi.Router) {
 				r.Use(
 					httpmw.ExtractOrganizationParam(options.Database),
 				)
-				api.APISubRoutes.SingleOrganization = r
 				r.Get("/", api.organization)
 				r.Post("/templateversions", api.postTemplateVersionsByOrganization)
 				r.Route("/templates", func(r chi.Router) {
@@ -1335,13 +1333,6 @@ type API struct {
 
 	// APIHandler serves "/api/v2"
 	APIHandler chi.Router
-	// APISubRoutes are AGPL sub routers that are saved for enterprise
-	// to add endpoints to. Chi does not allow conflicting routers to
-	// exist, so this is the easier way to "merge" routers.
-	APISubRoutes struct {
-		Organizations      chi.Router
-		SingleOrganization chi.Router
-	}
 	// RootHandler serves "/"
 	RootHandler chi.Router
 
