bumped go to 1.19 & added github actions

gorilla · Jul 20, 2023 · b3c9a9f · b3c9a9f
1 parent 22b2312
commit b3c9a9f
Show file tree

Hide file tree

Showing 10 changed files with 181 additions and 145 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -14,8 +14,8 @@ jobs:
   golangci:
     strategy:
       matrix: 
-        go: ['1.19','1.20']
-        os: [ubuntu-latest]
+        go: ['1.18', '1.19','1.20']
+        os: [ubuntu-latest, macos-latest, windows-latest]
       fail-fast: true
     name: verify
     runs-on: ${{ matrix.os }}
@@ -36,4 +36,4 @@ jobs:
           args: --timeout=5m
 
       - name: Test
-        run: go test -race --coverprofile=coverage.coverprofile --covermode=atomic -v ./...
+        run: make test
diff --git a/Makefile b/Makefile
@@ -0,0 +1,33 @@
+SHELL := /bin/bash
+
+# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
+ifeq (,$(shell go env GOBIN))
+GOBIN=$(shell go env GOPATH)/bin
+else
+GOBIN=$(shell go env GOBIN)
+endif
+
+# LINT is the path to the golangci-lint binary
+LINT = $(shell which golangci-lint)
+
+.PHONY: golangci-lint
+golangci-lint:
+ifeq (, $(LINT))
+  ifeq (, $(shell which golangci-lint))
+	@{ \
+	set -e ;\
+	go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest ;\
+	}
+  override LINT=$(GOBIN)/golangci-lint
+  else
+  override LINT=$(shell which golangci-lint)
+  endif
+endif
+
+.PHONY: verify
+verify: golangci-lint
+	$(LINT) run
+
+.PHONY: test
+test:
+	go test -race --coverprofile=coverage.coverprofile --covermode=atomic -v ./...
diff --git a/go.mod b/go.mod
@@ -1,3 +1,3 @@
 module github.com/gorilla/mux
 
-go 1.12
+go 1.19
diff --git a/middleware_test.go b/middleware_test.go
@@ -158,7 +158,10 @@ func TestMiddlewareExecution(t *testing.T) {
 
 	router := NewRouter()
 	router.HandleFunc("/", func(w http.ResponseWriter, e *http.Request) {
-		w.Write(handlerStr)
+		_, err := w.Write(handlerStr)
+		if err != nil {
+			t.Fatalf("Failed writing HTTP response: %v", err)
+		}
 	})
 
 	t.Run("responds normally without middleware", func(t *testing.T) {
@@ -178,7 +181,10 @@ func TestMiddlewareExecution(t *testing.T) {
 
 		router.Use(func(h http.Handler) http.Handler {
 			return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-				w.Write(mwStr)
+				_, err := w.Write(mwStr)
+				if err != nil {
+					t.Fatalf("Failed writing HTTP response: %v", err)
+				}
 				h.ServeHTTP(w, r)
 			})
 		})
@@ -196,11 +202,17 @@ func TestMiddlewareNotFound(t *testing.T) {
 
 	router := NewRouter()
 	router.HandleFunc("/", func(w http.ResponseWriter, e *http.Request) {
-		w.Write(handlerStr)
+		_, err := w.Write(handlerStr)
+		if err != nil {
+			t.Fatalf("Failed writing HTTP response: %v", err)
+		}
 	})
 	router.Use(func(h http.Handler) http.Handler {
 		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			w.Write(mwStr)
+			_, err := w.Write(mwStr)
+			if err != nil {
+				t.Fatalf("Failed writing HTTP response: %v", err)
+			}
 			h.ServeHTTP(w, r)
 		})
 	})
@@ -221,7 +233,10 @@ func TestMiddlewareNotFound(t *testing.T) {
 		req := newRequest("GET", "/notfound")
 
 		router.NotFoundHandler = http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
-			rw.Write([]byte("Custom 404 handler"))
+			_, err := rw.Write([]byte("Custom 404 handler"))
+			if err != nil {
+				t.Fatalf("Failed writing HTTP response: %v", err)
+			}
 		})
 		router.ServeHTTP(rw, req)
 
@@ -237,12 +252,18 @@ func TestMiddlewareMethodMismatch(t *testing.T) {
 
 	router := NewRouter()
 	router.HandleFunc("/", func(w http.ResponseWriter, e *http.Request) {
-		w.Write(handlerStr)
+		_, err := w.Write(handlerStr)
+		if err != nil {
+			t.Fatalf("Failed writing HTTP response: %v", err)
+		}
 	}).Methods("GET")
 
 	router.Use(func(h http.Handler) http.Handler {
 		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			w.Write(mwStr)
+			_, err := w.Write(mwStr)
+			if err != nil {
+				t.Fatalf("Failed writing HTTP response: %v", err)
+			}
 			h.ServeHTTP(w, r)
 		})
 	})
@@ -262,7 +283,10 @@ func TestMiddlewareMethodMismatch(t *testing.T) {
 		req := newRequest("POST", "/")
 
 		router.MethodNotAllowedHandler = http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
-			rw.Write([]byte("Method not allowed"))
+			_, err := rw.Write([]byte("Method not allowed"))
+			if err != nil {
+				t.Fatalf("Failed writing HTTP response: %v", err)
+			}
 		})
 		router.ServeHTTP(rw, req)
 
@@ -278,17 +302,26 @@ func TestMiddlewareNotFoundSubrouter(t *testing.T) {
 
 	router := NewRouter()
 	router.HandleFunc("/", func(w http.ResponseWriter, e *http.Request) {
-		w.Write(handlerStr)
+		_, err := w.Write(handlerStr)
+		if err != nil {
+			t.Fatalf("Failed writing HTTP response: %v", err)
+		}
 	})
 
 	subrouter := router.PathPrefix("/sub/").Subrouter()
 	subrouter.HandleFunc("/", func(w http.ResponseWriter, e *http.Request) {
-		w.Write(handlerStr)
+		_, err := w.Write(handlerStr)
+		if err != nil {
+			t.Fatalf("Failed writing HTTP response: %v", err)
+		}
 	})
 
 	router.Use(func(h http.Handler) http.Handler {
 		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			w.Write(mwStr)
+			_, err := w.Write(mwStr)
+			if err != nil {
+				t.Fatalf("Failed writing HTTP response: %v", err)
+			}
 			h.ServeHTTP(w, r)
 		})
 	})
@@ -308,7 +341,10 @@ func TestMiddlewareNotFoundSubrouter(t *testing.T) {
 		req := newRequest("GET", "/sub/notfound")
 
 		subrouter.NotFoundHandler = http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
-			rw.Write([]byte("Custom 404 handler"))
+			_, err := rw.Write([]byte("Custom 404 handler"))
+			if err != nil {
+				t.Fatalf("Failed writing HTTP response: %v", err)
+			}
 		})
 		router.ServeHTTP(rw, req)
 
@@ -324,17 +360,26 @@ func TestMiddlewareMethodMismatchSubrouter(t *testing.T) {
 
 	router := NewRouter()
 	router.HandleFunc("/", func(w http.ResponseWriter, e *http.Request) {
-		w.Write(handlerStr)
+		_, err := w.Write(handlerStr)
+		if err != nil {
+			t.Fatalf("Failed writing HTTP response: %v", err)
+		}
 	})
 
 	subrouter := router.PathPrefix("/sub/").Subrouter()
 	subrouter.HandleFunc("/", func(w http.ResponseWriter, e *http.Request) {
-		w.Write(handlerStr)
+		_, err := w.Write(handlerStr)
+		if err != nil {
+			t.Fatalf("Failed writing HTTP response: %v", err)
+		}
 	}).Methods("GET")
 
 	router.Use(func(h http.Handler) http.Handler {
 		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			w.Write(mwStr)
+			_, err := w.Write(mwStr)
+			if err != nil {
+				t.Fatalf("Failed writing HTTP response: %v", err)
+			}
 			h.ServeHTTP(w, r)
 		})
 	})
@@ -354,7 +399,10 @@ func TestMiddlewareMethodMismatchSubrouter(t *testing.T) {
 		req := newRequest("POST", "/sub/")
 
 		router.MethodNotAllowedHandler = http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
-			rw.Write([]byte("Method not allowed"))
+			_, err := rw.Write([]byte("Method not allowed"))
+			if err != nil {
+				t.Fatalf("Failed writing HTTP response: %v", err)
+			}
 		})
 		router.ServeHTTP(rw, req)
 
@@ -508,7 +556,10 @@ func TestMiddlewareOnMultiSubrouter(t *testing.T) {
 	secondSubRouter := router.PathPrefix("/").Subrouter()
 
 	router.NotFoundHandler = http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
-		rw.Write([]byte(notFound))
+		_, err := rw.Write([]byte(notFound))
+		if err != nil {
+			t.Fatalf("Failed writing HTTP response: %v", err)
+		}
 	})
 
 	firstSubRouter.HandleFunc("/first", func(w http.ResponseWriter, r *http.Request) {
@@ -521,14 +572,20 @@ func TestMiddlewareOnMultiSubrouter(t *testing.T) {
 
 	firstSubRouter.Use(func(h http.Handler) http.Handler {
 		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			w.Write([]byte(first))
+			_, err := w.Write([]byte(first))
+			if err != nil {
+				t.Fatalf("Failed writing HTTP response: %v", err)
+			}
 			h.ServeHTTP(w, r)
 		})
 	})
 
 	secondSubRouter.Use(func(h http.Handler) http.Handler {
 		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			w.Write([]byte(second))
+			_, err := w.Write([]byte(second))
+			if err != nil {
+				t.Fatalf("Failed writing HTTP response: %v", err)
+			}
 			h.ServeHTTP(w, r)
 		})
 	})

diff --git a/mux_httpserver_test.go b/mux_httpserver_test.go
@@ -5,7 +5,7 @@ package mux
 
 import (
 	"bytes"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/http/httptest"
 	"testing"
@@ -14,10 +14,16 @@ import (
 func TestSchemeMatchers(t *testing.T) {
 	router := NewRouter()
 	router.HandleFunc("/", func(rw http.ResponseWriter, r *http.Request) {
-		rw.Write([]byte("hello http world"))
+		_, err := rw.Write([]byte("hello http world"))
+		if err != nil {
+			t.Fatalf("Failed writing HTTP response: %v", err)
+		}
 	}).Schemes("http")
 	router.HandleFunc("/", func(rw http.ResponseWriter, r *http.Request) {
-		rw.Write([]byte("hello https world"))
+		_, err := rw.Write([]byte("hello https world"))
+		if err != nil {
+			t.Fatalf("Failed writing HTTP response: %v", err)
+		}
 	}).Schemes("https")
 
 	assertResponseBody := func(t *testing.T, s *httptest.Server, expectedBody string) {
@@ -28,7 +34,7 @@ func TestSchemeMatchers(t *testing.T) {
 		if resp.StatusCode != 200 {
 			t.Fatalf("expected a status code of 200, got %v", resp.StatusCode)
 		}
-		body, err := ioutil.ReadAll(resp.Body)
+		body, err := io.ReadAll(resp.Body)
 		if err != nil {
 			t.Fatalf("unexpected error reading body: %v", err)
 		}