Promotes go1.22 & new built-in routing.

.github/workflows/tests.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go: ["1.20"]
+        go: ["1.22.3"]
     name: Go ${{ matrix.go }}
     steps:
       - uses: actions/checkout@v2

docker-compose.yml

@@ -3,7 +3,7 @@ version: "3.9"
 services:
   app:
     working_dir: /app
-    image: golang:1.20
+    image: golang:1.22.3
     command: sh -c "PORT=8080 DB_USER=admin DB_PWD=admin DB_HOST=db DB_NAME=local DB_SSL_MODE=disable ./bin/_dev.sh"
     volumes:
       - ./:/app

domain/admin/route.go

@@ -3,8 +3,6 @@ package admin
 import (
 	"net/http"
 
-	"github.com/julienschmidt/httprouter"
-
 	"github.com/chris-ramon/golang-scaffolding/pkg/ctxutil"
 	"github.com/chris-ramon/golang-scaffolding/pkg/route"
 )
@@ -22,7 +20,7 @@ func (ro *routes) All() []route.Route {
 		route.Route{
 			HTTPMethod: "GET",
 			Path:       "/admin",
-			Handler: func(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
+			Handler: func(w http.ResponseWriter, r *http.Request) {
 				r = r.WithContext(ctxutil.WithAuthHeader(r.Context(), r.Header))
 				ro.handlers.GetAdmin().ServeHTTP(w, r)
 			},

domain/auth/handler.go

@@ -7,8 +7,6 @@ import (
 	"log"
 	"net/http"
 
-	"github.com/julienschmidt/httprouter"
-
 	"github.com/chris-ramon/golang-scaffolding/domain/auth/types"
 	"github.com/chris-ramon/golang-scaffolding/pkg/ctxutil"
 )
@@ -22,14 +20,14 @@ type handlers struct {
 	service Service
 }
 
-func (h *handlers) GetPing() httprouter.Handle {
-	return func(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
+func (h *handlers) GetPing() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
 		w.Write([]byte("ok"))
 	}
 }
 
-func (h *handlers) GetCurrentUser() httprouter.Handle {
-	return func(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
+func (h *handlers) GetCurrentUser() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
 		r = r.WithContext(ctxutil.WithAuthHeader(r.Context(), r.Header))
 		jwtToken, err := ctxutil.AuthHeaderValueFromCtx(r.Context())
 		if err != nil {
@@ -49,8 +47,8 @@ func (h *handlers) GetCurrentUser() httprouter.Handle {
 	}
 }
 
-func (h *handlers) PostSignIn() httprouter.Handle {
-	return func(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
+func (h *handlers) PostSignIn() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
 		b, err := ioutil.ReadAll(r.Body)
 		if err != nil {
 			log.Printf("failed to read request body: %v", err)

domain/auth/handler_test.go

@@ -11,7 +11,6 @@ import (
 	"testing"
 
 	"github.com/chris-ramon/golang-scaffolding/domain/auth/types"
-	"github.com/julienschmidt/httprouter"
 )
 
 type testReaderError int
@@ -37,9 +36,8 @@ func TestGetPing(t *testing.T) {
 	h := NewHandlers(&serviceMock{})
 	req := httptest.NewRequest("GET", "/ping", nil)
 	w := httptest.NewRecorder()
-	params := httprouter.Params{}
 
-	h.GetPing()(w, req, params)
+	h.GetPing()(w, req)
 
 	body, err := io.ReadAll(w.Result().Body)
 	if err != nil {
@@ -56,7 +54,6 @@ func TestGetCurrentUser(t *testing.T) {
 		srvMock            *serviceMock
 		request            *http.Request
 		responseWriter     *httptest.ResponseRecorder
-		params             httprouter.Params
 		header             http.Header
 		expectedBody       string
 		expectedStatusCode uint
@@ -74,7 +71,6 @@ func TestGetCurrentUser(t *testing.T) {
 			},
 			request:        httptest.NewRequest("GET", "/auth/current-user", nil),
 			responseWriter: httptest.NewRecorder(),
-			params:         httprouter.Params{},
 			header: map[string][]string{
 				"Authorization": []string{"Bearer Test-JWT-Token"},
 			},
@@ -86,7 +82,6 @@ func TestGetCurrentUser(t *testing.T) {
 			srvMock:            &serviceMock{},
 			request:            httptest.NewRequest("GET", "/auth/current-user", nil),
 			responseWriter:     httptest.NewRecorder(),
-			params:             httprouter.Params{},
 			header:             map[string][]string{},
 			expectedBody:       "failed to get authorization header",
 			expectedStatusCode: http.StatusInternalServerError,
@@ -100,7 +95,6 @@ func TestGetCurrentUser(t *testing.T) {
 			},
 			request:        httptest.NewRequest("GET", "/auth/current-user", nil),
 			responseWriter: httptest.NewRecorder(),
-			params:         httprouter.Params{},
 			header: map[string][]string{
 				"Authorization": []string{"Bearer Test-JWT-Token"},
 			},
@@ -119,7 +113,7 @@ func TestGetCurrentUser(t *testing.T) {
 				}
 			}
 
-			h.GetCurrentUser()(testCase.responseWriter, testCase.request, testCase.params)
+			h.GetCurrentUser()(testCase.responseWriter, testCase.request)
 
 			if !strings.Contains(testCase.responseWriter.Body.String(), testCase.expectedBody) {
 				t.Fatalf("expected: %v, got: %v", testCase.expectedBody, testCase.responseWriter.Body.String())
@@ -134,7 +128,6 @@ func TestPostSignIn(t *testing.T) {
 		srvMock        *serviceMock
 		request        *http.Request
 		responseWriter *httptest.ResponseRecorder
-		params         httprouter.Params
 		expectedBody   string
 	}
 
@@ -154,7 +147,6 @@ func TestPostSignIn(t *testing.T) {
 				bytes.NewBuffer([]byte(`{"email":"[email protected]","password":"test-pwd"}`)),
 			),
 			responseWriter: httptest.NewRecorder(),
-			params:         httprouter.Params{},
 			expectedBody:   "test user",
 		},
 		{
@@ -172,7 +164,6 @@ func TestPostSignIn(t *testing.T) {
 				testReaderError(0),
 			),
 			responseWriter: httptest.NewRecorder(),
-			params:         httprouter.Params{},
 			expectedBody:   "failed to read request body",
 		},
 		{
@@ -190,7 +181,6 @@ func TestPostSignIn(t *testing.T) {
 				bytes.NewBuffer([]byte(`{invalid}`)),
 			),
 			responseWriter: httptest.NewRecorder(),
-			params:         httprouter.Params{},
 			expectedBody:   "failed to json unmarshal request body",
 		},
 		{
@@ -206,15 +196,14 @@ func TestPostSignIn(t *testing.T) {
 				bytes.NewBuffer([]byte(`{"email":"[email protected]","password":"test-pwd"}`)),
 			),
 			responseWriter: httptest.NewRecorder(),
-			params:         httprouter.Params{},
 			expectedBody:   "failed to find current user",
 		},
 	}
 
 	for _, testCase := range testCases {
 		t.Run(testCase.name, func(t *testing.T) {
 			h := NewHandlers(testCase.srvMock)
-			h.PostSignIn()(testCase.responseWriter, testCase.request, testCase.params)
+			h.PostSignIn()(testCase.responseWriter, testCase.request)
 			if !strings.Contains(testCase.responseWriter.Body.String(), testCase.expectedBody) {
 				t.Fatalf("expected: %v, got: %v", testCase.expectedBody, testCase.responseWriter.Body.String())
 			}

domain/auth/route.go

@@ -1,15 +1,15 @@
 package auth
 
 import (
-	"github.com/julienschmidt/httprouter"
+	"net/http"
 
 	"github.com/chris-ramon/golang-scaffolding/pkg/route"
 )
 
 type Handlers interface {
-	GetPing() httprouter.Handle
-	GetCurrentUser() httprouter.Handle
-	PostSignIn() httprouter.Handle
+	GetPing() http.HandlerFunc
+	GetCurrentUser() http.HandlerFunc
+	PostSignIn() http.HandlerFunc
 }
 
 type routes struct {

domain/auth/route_test.go

@@ -4,28 +4,26 @@ import (
 	"net/http"
 	"testing"
 
-	"github.com/julienschmidt/httprouter"
-
 	"github.com/chris-ramon/golang-scaffolding/pkg/route"
 )
 
 type handlersMock struct {
-	getPing        httprouter.Handle
-	getCurrentUser httprouter.Handle
-	postSignIn     httprouter.Handle
+	getPing        http.HandlerFunc
+	getCurrentUser http.HandlerFunc
+	postSignIn     http.HandlerFunc
 }
 
-func (h *handlersMock) GetPing() httprouter.Handle        { return h.getPing }
-func (h *handlersMock) GetCurrentUser() httprouter.Handle { return h.getCurrentUser }
-func (h *handlersMock) PostSignIn() httprouter.Handle     { return h.postSignIn }
+func (h *handlersMock) GetPing() http.HandlerFunc        { return h.getPing }
+func (h *handlersMock) GetCurrentUser() http.HandlerFunc { return h.getCurrentUser }
+func (h *handlersMock) PostSignIn() http.HandlerFunc     { return h.postSignIn }
 
 func TestRoutesAll(t *testing.T) {
 	h := &handlersMock{
-		getPing: func(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
+		getPing: func(w http.ResponseWriter, r *http.Request) {
 		},
-		getCurrentUser: func(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
+		getCurrentUser: func(w http.ResponseWriter, r *http.Request) {
 		},
-		postSignIn: func(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
+		postSignIn: func(w http.ResponseWriter, r *http.Request) {
 		},
 	}
 

domain/gql/route.go

@@ -4,7 +4,6 @@ import (
 	"net/http"
 
 	"github.com/graphql-go/handler"
-	"github.com/julienschmidt/httprouter"
 
 	"github.com/chris-ramon/golang-scaffolding/pkg/ctxutil"
 	"github.com/chris-ramon/golang-scaffolding/pkg/route"
@@ -24,15 +23,15 @@ func (ro *routes) All() []route.Route {
 		route.Route{
 			HTTPMethod: "GET",
 			Path:       "/graphql",
-			Handler: func(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
+			Handler: func(w http.ResponseWriter, r *http.Request) {
 				r = r.WithContext(ctxutil.WithAuthHeader(r.Context(), r.Header))
 				ro.handlers.GetGraphQL().ServeHTTP(w, r)
 			},
 		},
 		route.Route{
 			HTTPMethod: "POST",
 			Path:       "/graphql",
-			Handler: func(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
+			Handler: func(w http.ResponseWriter, r *http.Request) {
 				r = r.WithContext(ctxutil.WithAuthHeader(r.Context(), r.Header))
 				ro.handlers.PostGraphQL().ServeHTTP(w, r)
 			},

domain/users/handler.go

@@ -5,8 +5,6 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/julienschmidt/httprouter"
-
 	"github.com/admin-golang/admin/dataloader"
 	"github.com/chris-ramon/golang-scaffolding/domain/users/mappers"
 	userTypes "github.com/chris-ramon/golang-scaffolding/domain/users/types"
@@ -16,8 +14,8 @@ type handlers struct {
 	srv Service
 }
 
-func (h *handlers) GetUsers() httprouter.Handle {
-	return func(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
+func (h *handlers) GetUsers() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
 		users, err := h.srv.FindUsers(r.Context())
 
 		if err != nil {

domain/users/route.go

@@ -1,13 +1,13 @@
 package users
 
 import (
-	"github.com/julienschmidt/httprouter"
+	"net/http"
 
 	"github.com/chris-ramon/golang-scaffolding/pkg/route"
 )
 
 type Handlers interface {
-	GetUsers() httprouter.Handle
+	GetUsers() http.HandlerFunc
 }
 
 type routes struct {

go.mod

@@ -1,6 +1,6 @@
 module github.com/chris-ramon/golang-scaffolding
 
-go 1.20
+go 1.22.3
 
 require (
 	github.com/graphql-go/graphql v0.8.1
@@ -11,7 +11,6 @@ require (
 	github.com/admin-golang/admin v0.0.0-20220720064250-fa4d88cf3085
 	github.com/golang-jwt/jwt/v5 v5.0.0-rc.2
 	github.com/golang-migrate/migrate/v4 v4.15.2
-	github.com/julienschmidt/httprouter v1.3.0
 	github.com/lib/pq v1.10.8
 )
 

go.sum

@@ -724,7 +724,6 @@ github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
-github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U=
 github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
 github.com/jung-kurt/gofpdf v1.0.0/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes=
 github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes=

main.go

@@ -5,8 +5,6 @@ import (
 	"log"
 	"net/http"
 
-	"github.com/julienschmidt/httprouter"
-
 	"github.com/chris-ramon/golang-scaffolding/config"
 	"github.com/chris-ramon/golang-scaffolding/db"
 	"github.com/chris-ramon/golang-scaffolding/domain/admin"
@@ -36,7 +34,7 @@ func main() {
 		log.Println("successfully run migrations")
 	}
 
-	router := httprouter.New()
+	router := http.NewServeMux()
 
 	usersRepo := users.NewRepo(db)
 	usersService := users.NewService(usersRepo)
@@ -78,7 +76,7 @@ func main() {
 	routes = append(routes, usersRoutes.All()...)
 
 	for _, r := range routes {
-		router.Handle(r.HTTPMethod, r.Path, r.Handler)
+		router.HandleFunc(fmt.Sprintf("%s %s", r.HTTPMethod, r.Path), r.Handler)
 	}
 
 	log.Printf("server running on port :%s", conf.Port)

pkg/route/route.go

@@ -1,11 +1,11 @@
 package route
 
 import (
-	"github.com/julienschmidt/httprouter"
+	"net/http"
 )
 
 type Route struct {
 	HTTPMethod string
 	Path       string
-	Handler    httprouter.Handle
+	Handler    http.HandlerFunc
 }