back round 0 view raw

appview: remove redundant middleware argument in routers #727

merged

opened by

oppi.li 1 month ago targeting master from push-oplponvtsynl

Labels and Pipeline routers do not use middleware, this has been removed from their respective routers.

Signed-off-by: oppiliappan me@oppi.li

options

unified split

Changed files

+16 -24

appview

labels

labels.go

pipelines

pipelines.go

router.go

state

router.go

+1 -1

appview/labels/labels.go

···

       53
        
       	}

     

       54
        
       }

     

       55
        
       

     

       56
       -
       func (l *Labels) Router(mw *middleware.Middleware) http.Handler {

     

       57
        
       	r := chi.NewRouter()

     

       58
        
       

     

       59
        
       	r.Use(middleware.AuthMiddleware(l.oauth))

···

       53
        
       	}

     

       54
        
       }

     

       55
        
       

     

       56
       +
       func (l *Labels) Router() http.Handler {

     

       57
        
       	r := chi.NewRouter()

     

       58
        
       

     

       59
        
       	r.Use(middleware.AuthMiddleware(l.oauth))

appview/pipelines/pipelines.go

···

       35
        
       	logger        *slog.Logger

     

       36
        
       }

     

       37
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       38
        
       func New(

     

       39
        
       	oauth *oauth.OAuth,

     

       40
        
       	repoResolver *reporesolver.RepoResolver,

···

       35
        
       	logger        *slog.Logger

     

       36
        
       }

     

       37
        
       

     

       38
       +
       func (p *Pipelines) Router() http.Handler {

     

       39
       +
       	r := chi.NewRouter()

     

       40
       +
       	r.Get("/", p.Index)

     

       41
       +
       	r.Get("/{pipeline}/workflow/{workflow}", p.Workflow)

     

       42
       +
       	r.Get("/{pipeline}/workflow/{workflow}/logs", p.Logs)

     

       43
       +
       

     

       44
       +
       	return r

     

       45
       +
       }

     

       46
       +
       

     

       47
        
       func New(

     

       48
        
       	oauth *oauth.OAuth,

     

       49
        
       	repoResolver *reporesolver.RepoResolver,

-17

appview/pipelines/router.go

···

       1
       -
       package pipelines

     

       2
       -
       

     

       3
       -
       import (

     

       4
       -
       	"net/http"

     

       5
       -
       

     

       6
       -
       	"github.com/go-chi/chi/v5"

     

       7
       -
       	"tangled.org/core/appview/middleware"

     

       8
       -
       )

     

       9
       -
       

     

       10
       -
       func (p *Pipelines) Router(mw *middleware.Middleware) http.Handler {

     

       11
       -
       	r := chi.NewRouter()

     

       12
       -
       	r.Get("/", p.Index)

     

       13
       -
       	r.Get("/{pipeline}/workflow/{workflow}", p.Workflow)

     

       14
       -
       	r.Get("/{pipeline}/workflow/{workflow}/logs", p.Logs)

     

       15
       -
       

     

       16
       -
       	return r

     

       17
       -
       }

+6 -6

appview/state/router.go

···

       91
        
       			r.Mount("/", s.RepoRouter(mw))

     

       92
        
       			r.Mount("/issues", s.IssuesRouter(mw))

     

       93
        
       			r.Mount("/pulls", s.PullsRouter(mw))

     

       94
       -
       			r.Mount("/pipelines", s.PipelinesRouter(mw))

     

       95
       -
       			r.Mount("/labels", s.LabelsRouter(mw))

     

       96
        
       

     

       97
        
       			// These routes get proxied to the knot

     

       98
        
       			r.Get("/info/refs", s.InfoRefs)

     
···

       302
        
       	return repo.Router(mw)

     

       303
        
       }

     

       304
        
       

     

       305
       -
       func (s *State) PipelinesRouter(mw *middleware.Middleware) http.Handler {

     

       306
        
       	pipes := pipelines.New(

     

       307
        
       		s.oauth,

     

       308
        
       		s.repoResolver,

     
···

       314
        
       		s.enforcer,

     

       315
        
       		log.SubLogger(s.logger, "pipelines"),

     

       316
        
       	)

     

       317
       -
       	return pipes.Router(mw)

     

       318
        
       }

     

       319
        
       

     

       320
       -
       func (s *State) LabelsRouter(mw *middleware.Middleware) http.Handler {

     

       321
        
       	ls := labels.New(

     

       322
        
       		s.oauth,

     

       323
        
       		s.pages,

     
···

       326
        
       		s.enforcer,

     

       327
        
       		log.SubLogger(s.logger, "labels"),

     

       328
        
       	)

     

       329
       -
       	return ls.Router(mw)

     

       330
        
       }

     

       331
        
       

     

       332
        
       func (s *State) NotificationsRouter(mw *middleware.Middleware) http.Handler {

···

       91
        
       			r.Mount("/", s.RepoRouter(mw))

     

       92
        
       			r.Mount("/issues", s.IssuesRouter(mw))

     

       93
        
       			r.Mount("/pulls", s.PullsRouter(mw))

     

       94
       +
       			r.Mount("/pipelines", s.PipelinesRouter())

     

       95
       +
       			r.Mount("/labels", s.LabelsRouter())

     

       96
        
       

     

       97
        
       			// These routes get proxied to the knot

     

       98
        
       			r.Get("/info/refs", s.InfoRefs)

     
···

       302
        
       	return repo.Router(mw)

     

       303
        
       }

     

       304
        
       

     

       305
       +
       func (s *State) PipelinesRouter() http.Handler {

     

       306
        
       	pipes := pipelines.New(

     

       307
        
       		s.oauth,

     

       308
        
       		s.repoResolver,

     
···

       314
        
       		s.enforcer,

     

       315
        
       		log.SubLogger(s.logger, "pipelines"),

     

       316
        
       	)

     

       317
       +
       	return pipes.Router()

     

       318
        
       }

     

       319
        
       

     

       320
       +
       func (s *State) LabelsRouter() http.Handler {

     

       321
        
       	ls := labels.New(

     

       322
        
       		s.oauth,

     

       323
        
       		s.pages,

     
···

       326
        
       		s.enforcer,

     

       327
        
       		log.SubLogger(s.logger, "labels"),

     

       328
        
       	)

     

       329
       +
       	return ls.Router()

     

       330
        
       }

     

       331
        
       

     

       332
        
       func (s *State) NotificationsRouter(mw *middleware.Middleware) http.Handler {