From 9dcf29c9f8c7c63064ed2fa5aa98b85b0760a38f Mon Sep 17 00:00:00 2001 From: oppiliappan Date: Thu, 30 Oct 2025 09:52:55 +0000 Subject: [PATCH] appview: remove redundant middleware argument in routers Change-Id: oplponvtsynloonuqqwsvpxwnyytoxtq Labels and Pipeline routers do not use middleware, this has been removed from their respective routers. Signed-off-by: oppiliappan --- appview/labels/labels.go | 2 +- appview/pipelines/pipelines.go | 9 +++++++++ appview/pipelines/router.go | 17 ----------------- appview/state/router.go | 12 ++++++------ 4 files changed, 16 insertions(+), 24 deletions(-) delete mode 100644 appview/pipelines/router.go diff --git a/appview/labels/labels.go b/appview/labels/labels.go index 2e5819e5..ab9740ac 100644 --- a/appview/labels/labels.go +++ b/appview/labels/labels.go @@ -53,7 +53,7 @@ func New( } } -func (l *Labels) Router(mw *middleware.Middleware) http.Handler { +func (l *Labels) Router() http.Handler { r := chi.NewRouter() r.Use(middleware.AuthMiddleware(l.oauth)) diff --git a/appview/pipelines/pipelines.go b/appview/pipelines/pipelines.go index 397c6631..963bd240 100644 --- a/appview/pipelines/pipelines.go +++ b/appview/pipelines/pipelines.go @@ -35,6 +35,15 @@ type Pipelines struct { logger *slog.Logger } +func (p *Pipelines) Router() http.Handler { + r := chi.NewRouter() + r.Get("/", p.Index) + r.Get("/{pipeline}/workflow/{workflow}", p.Workflow) + r.Get("/{pipeline}/workflow/{workflow}/logs", p.Logs) + + return r +} + func New( oauth *oauth.OAuth, repoResolver *reporesolver.RepoResolver, diff --git a/appview/pipelines/router.go b/appview/pipelines/router.go deleted file mode 100644 index f55a7921..00000000 --- a/appview/pipelines/router.go +++ /dev/null @@ -1,17 +0,0 @@ -package pipelines - -import ( - "net/http" - - "github.com/go-chi/chi/v5" - "tangled.org/core/appview/middleware" -) - -func (p *Pipelines) Router(mw *middleware.Middleware) http.Handler { - r := chi.NewRouter() - r.Get("/", p.Index) - r.Get("/{pipeline}/workflow/{workflow}", p.Workflow) - r.Get("/{pipeline}/workflow/{workflow}/logs", p.Logs) - - return r -} diff --git a/appview/state/router.go b/appview/state/router.go index ca5f9bd7..04a736f3 100644 --- a/appview/state/router.go +++ b/appview/state/router.go @@ -91,8 +91,8 @@ func (s *State) UserRouter(mw *middleware.Middleware) http.Handler { r.Mount("/", s.RepoRouter(mw)) r.Mount("/issues", s.IssuesRouter(mw)) r.Mount("/pulls", s.PullsRouter(mw)) - r.Mount("/pipelines", s.PipelinesRouter(mw)) - r.Mount("/labels", s.LabelsRouter(mw)) + r.Mount("/pipelines", s.PipelinesRouter()) + r.Mount("/labels", s.LabelsRouter()) // These routes get proxied to the knot r.Get("/info/refs", s.InfoRefs) @@ -302,7 +302,7 @@ func (s *State) RepoRouter(mw *middleware.Middleware) http.Handler { return repo.Router(mw) } -func (s *State) PipelinesRouter(mw *middleware.Middleware) http.Handler { +func (s *State) PipelinesRouter() http.Handler { pipes := pipelines.New( s.oauth, s.repoResolver, @@ -314,10 +314,10 @@ func (s *State) PipelinesRouter(mw *middleware.Middleware) http.Handler { s.enforcer, log.SubLogger(s.logger, "pipelines"), ) - return pipes.Router(mw) + return pipes.Router() } -func (s *State) LabelsRouter(mw *middleware.Middleware) http.Handler { +func (s *State) LabelsRouter() http.Handler { ls := labels.New( s.oauth, s.pages, @@ -326,7 +326,7 @@ func (s *State) LabelsRouter(mw *middleware.Middleware) http.Handler { s.enforcer, log.SubLogger(s.logger, "labels"), ) - return ls.Router(mw) + return ls.Router() } func (s *State) NotificationsRouter(mw *middleware.Middleware) http.Handler { -- 2.43.0