From fd9448cad72aa1d7a470c74715fe642d4f379256 Mon Sep 17 00:00:00 2001
From: Anbraten <anton@ju60.de>
Date: Wed, 13 Oct 2021 18:36:11 +0200
Subject: [PATCH] simplify routes (#437)

---
 server/router/api.go    | 21 +++++----------------
 server/router/router.go |  6 +-----
 2 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/server/router/api.go b/server/router/api.go
index 5a31c9358..eb8072364 100644
--- a/server/router/api.go
+++ b/server/router/api.go
@@ -113,22 +113,11 @@ func apiRoutes(e *gin.Engine) {
 
 	queue := e.Group("/api/queue")
 	{
-		queue.GET("/info",
-			session.MustAdmin(),
-			api.GetQueueInfo,
-		)
-		queue.GET("/pause",
-			session.MustAdmin(),
-			api.PauseQueue,
-		)
-		queue.GET("/resume",
-			session.MustAdmin(),
-			api.ResumeQueue,
-		)
-		queue.GET("/norunningbuilds",
-			session.MustAdmin(),
-			api.BlockTilQueueHasRunningItem,
-		)
+		queue.Use(session.MustAdmin())
+		queue.GET("/info", api.GetQueueInfo)
+		queue.GET("/pause", api.PauseQueue)
+		queue.GET("/resume", api.ResumeQueue)
+		queue.GET("/norunningbuilds", api.BlockTilQueueHasRunningItem)
 	}
 
 	debugger := e.Group("/api/debug")
diff --git a/server/router/router.go b/server/router/router.go
index def0976a8..2fa0a1c9f 100644
--- a/server/router/router.go
+++ b/server/router/router.go
@@ -67,11 +67,7 @@ func Load(serveHTTP func(w http.ResponseWriter, r *http.Request), middleware ...
 		auth.POST("/token", api.GetLoginToken)
 	}
 
-	monitor := e.Group("/metrics")
-	{
-		monitor.GET("", metrics.PromHandler())
-	}
-
+	e.GET("/metrics", metrics.PromHandler())
 	e.GET("/version", api.Version)
 	e.GET("/healthz", api.Health)