Switch to native Go router

Signed-off-by: Stéphane Graber <[email protected]>

Author: stgraber

go.mod

@@ -6,7 +6,6 @@ require (
 	github.com/armon/go-proxyproto v0.1.0
 	github.com/fsnotify/fsnotify v1.9.0
 	github.com/goccy/go-yaml v1.17.1
-	github.com/gorilla/mux v1.8.1
 	github.com/gorilla/websocket v1.5.3
 	github.com/inconshreveable/log15 v2.16.0+incompatible
 	github.com/lib/pq v1.10.9

go.sum

@@ -21,8 +21,6 @@ github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX
 github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
-github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
 github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
 github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/inconshreveable/log15 v2.16.0+incompatible h1:6nvMKxtGcpgm7q0KiGs+Vc+xDvUXaBqsPKHWKsinccw=

internal/daemon/daemon.go

@@ -13,7 +13,6 @@ import (
 	"time"
 
 	"github.com/armon/go-proxyproto"
-	"github.com/gorilla/mux"
 	"github.com/inconshreveable/log15"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 
@@ -33,7 +32,7 @@ type Daemon struct {
 	db *database.DB
 
 	// Request router
-	router *mux.Router
+	router *http.ServeMux
 
 	// Log handler
 	logger log15.Logger
@@ -125,7 +124,7 @@ func (d *Daemon) Run() error {
 	d.config.ConfigPut = *dbConf
 
 	// Setup the REST API
-	d.router = mux.NewRouter()
+	d.router = http.NewServeMux()
 	err = rest.AttachFunctions(
 		d.config,
 		d.router,
@@ -239,7 +238,7 @@ func (d *Daemon) Run() error {
 
 		d.logger.Info("Binding Prometheus", log15.Ctx{"port": d.config.Daemon.PrometheusPort})
 		go func() {
-			router := mux.NewRouter()
+			router := http.NewServeMux()
 			router.Handle("/metrics", promhttp.Handler())
 
 			server := &http.Server{

internal/rest/api_flags.go

@@ -10,7 +10,6 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/gorilla/mux"
 	"github.com/inconshreveable/log15"
 
 	"github.com/nsec/askgod/api"
@@ -53,7 +52,7 @@ func (r *rest) getTeamFlags(writer http.ResponseWriter, request *http.Request, l
 }
 
 func (r *rest) getTeamFlag(writer http.ResponseWriter, request *http.Request, logger log15.Logger) {
-	idVar := mux.Vars(request)["id"]
+	idVar := request.PathValue("id")
 
 	// Convert the provided id to int
 	id, err := strconv.ParseInt(idVar, 10, 64)
@@ -100,7 +99,7 @@ func (r *rest) getTeamFlag(writer http.ResponseWriter, request *http.Request, lo
 }
 
 func (r *rest) updateTeamFlag(writer http.ResponseWriter, request *http.Request, logger log15.Logger) {
-	idVar := mux.Vars(request)["id"]
+	idVar := request.PathValue("id")
 
 	// Convert the provided id to int
 	id, err := strconv.ParseInt(idVar, 10, 64)
@@ -343,7 +342,7 @@ func (r *rest) adminCreateFlags(writer http.ResponseWriter, request *http.Reques
 }
 
 func (r *rest) adminGetFlag(writer http.ResponseWriter, request *http.Request, logger log15.Logger) {
-	idVar := mux.Vars(request)["id"]
+	idVar := request.PathValue("id")
 
 	// Convert the provided id to int
 	id, err := strconv.ParseInt(idVar, 10, 64)
@@ -372,7 +371,7 @@ func (r *rest) adminGetFlag(writer http.ResponseWriter, request *http.Request, l
 }
 
 func (r *rest) adminUpdateFlag(writer http.ResponseWriter, request *http.Request, logger log15.Logger) {
-	idVar := mux.Vars(request)["id"]
+	idVar := request.PathValue("id")
 
 	// Convert the provided id to int
 	id, err := strconv.ParseInt(idVar, 10, 64)
@@ -411,7 +410,7 @@ func (r *rest) adminUpdateFlag(writer http.ResponseWriter, request *http.Request
 }
 
 func (r *rest) adminDeleteFlag(writer http.ResponseWriter, request *http.Request, logger log15.Logger) {
-	idVar := mux.Vars(request)["id"]
+	idVar := request.PathValue("id")
 
 	// Convert the provided id to int
 	id, err := strconv.ParseInt(idVar, 10, 64)

internal/rest/api_scores.go

@@ -9,7 +9,6 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/gorilla/mux"
 	"github.com/inconshreveable/log15"
 
 	"github.com/nsec/askgod/api"
@@ -121,7 +120,7 @@ func (r *rest) adminCreateScoreCommon(writer http.ResponseWriter, request *http.
 }
 
 func (r *rest) adminGetScore(writer http.ResponseWriter, request *http.Request, logger log15.Logger) {
-	idVar := mux.Vars(request)["id"]
+	idVar := request.PathValue("id")
 
 	// Convert the provided id to int
 	id, err := strconv.ParseInt(idVar, 10, 64)
@@ -150,7 +149,7 @@ func (r *rest) adminGetScore(writer http.ResponseWriter, request *http.Request,
 }
 
 func (r *rest) adminUpdateScore(writer http.ResponseWriter, request *http.Request, logger log15.Logger) {
-	idVar := mux.Vars(request)["id"]
+	idVar := request.PathValue("id")
 
 	// Convert the provided id to int
 	id, err := strconv.ParseInt(idVar, 10, 64)
@@ -238,7 +237,7 @@ func (r *rest) adminUpdateScore(writer http.ResponseWriter, request *http.Reques
 }
 
 func (r *rest) adminDeleteScore(writer http.ResponseWriter, request *http.Request, logger log15.Logger) {
-	idVar := mux.Vars(request)["id"]
+	idVar := request.PathValue("id")
 
 	// Convert the provided id to int
 	id, err := strconv.ParseInt(idVar, 10, 64)

internal/rest/api_teams.go

@@ -11,7 +11,6 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/gorilla/mux"
 	"github.com/inconshreveable/log15"
 
 	"github.com/nsec/askgod/api"
@@ -251,7 +250,7 @@ func (r *rest) adminCreateTeams(writer http.ResponseWriter, request *http.Reques
 }
 
 func (r *rest) adminGetTeam(writer http.ResponseWriter, request *http.Request, logger log15.Logger) {
-	idVar := mux.Vars(request)["id"]
+	idVar := request.PathValue("id")
 
 	// Convert the provided id to int
 	id, err := strconv.ParseInt(idVar, 10, 64)
@@ -280,7 +279,7 @@ func (r *rest) adminGetTeam(writer http.ResponseWriter, request *http.Request, l
 }
 
 func (r *rest) adminUpdateTeam(writer http.ResponseWriter, request *http.Request, logger log15.Logger) {
-	idVar := mux.Vars(request)["id"]
+	idVar := request.PathValue("id")
 
 	// Convert the provided id to int
 	id, err := strconv.ParseInt(idVar, 10, 64)
@@ -320,7 +319,7 @@ func (r *rest) adminUpdateTeam(writer http.ResponseWriter, request *http.Request
 }
 
 func (r *rest) adminDeleteTeam(writer http.ResponseWriter, request *http.Request, logger log15.Logger) {
-	idVar := mux.Vars(request)["id"]
+	idVar := request.PathValue("id")
 
 	// Convert the provided id to int
 	id, err := strconv.ParseInt(idVar, 10, 64)

internal/rest/attach.go

@@ -6,7 +6,6 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/gorilla/mux"
 	"github.com/inconshreveable/log15"
 
 	"github.com/nsec/askgod/internal/config"
@@ -16,7 +15,7 @@ import (
 var clusterPeers []string
 
 // AttachFunctions attaches all the REST API functions to the provided router.
-func AttachFunctions(conf *config.Config, router *mux.Router, db *database.DB, logger log15.Logger) error {
+func AttachFunctions(conf *config.Config, router *http.ServeMux, db *database.DB, logger log15.Logger) error {
 	r := rest{
 		config: conf,
 		db:     db,

internal/rest/struct.go

@@ -1,7 +1,8 @@
 package rest
 
 import (
-	"github.com/gorilla/mux"
+	"net/http"
+
 	"github.com/inconshreveable/log15"
 
 	"github.com/nsec/askgod/internal/config"
@@ -12,6 +13,6 @@ type rest struct {
 	config      *config.Config
 	db          *database.DB
 	logger      log15.Logger
-	router      *mux.Router
+	router      *http.ServeMux
 	hiddenTeams []int64
 }