Fix tests

f0ssel · f0ssel · commit c6534f6e9291 · 2022-03-30T20:12:32.000Z
diff --git a/coderd/httpmw/hsts.go b/coderd/httpmw/hsts.go
@@ -20,10 +20,11 @@ const (
 // This header only makes sense if the app is using tls.
 // Full header example
 //	Strict-Transport-Security: max-age=63072000; includeSubDomains; preload
-func HSTS(hsts bool) func(next http.Handler) http.Handler {
+// nolint:revive
+func HSTS(enable bool) func(next http.Handler) http.Handler {
 	return func(next http.Handler) http.Handler {
 		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			if hsts {
+			if enable {
 				w.Header().Set(HSTSHeader, fmt.Sprintf("max-age=%d", int64(HSTSMaxAge)))
 			}
 
diff --git a/coderd/httpmw/hsts_test.go b/coderd/httpmw/hsts_test.go
@@ -6,38 +6,40 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/coder/coder/coderd/httpmw"
 	"github.com/go-chi/chi/v5"
 	"github.com/stretchr/testify/require"
+
+	"github.com/coder/coder/coderd/httpmw"
 )
 
 func TestHSTS(t *testing.T) {
 	t.Parallel()
-	setup := func(hsts bool) *http.Response {
+
+	setup := func(enable bool) *http.Response {
 		rw := httptest.NewRecorder()
 		r := httptest.NewRequest("GET", "/", nil)
 
 		rtr := chi.NewRouter()
-		rtr.Use(httpmw.HSTS(hsts))
+		rtr.Use(httpmw.HSTS(enable))
 		rtr.Get("/", func(w http.ResponseWriter, r *http.Request) {
 			_, _ = w.Write([]byte("hello!"))
 		})
 		rtr.ServeHTTP(rw, r)
-		res := rw.Result()
-		defer res.Body.Close()
-		return res
+		return rw.Result()
 	}
 
 	t.Run("True", func(t *testing.T) {
 		t.Parallel()
 
 		res := setup(true)
+		defer res.Body.Close()
 		require.Contains(t, res.Header.Get(httpmw.HSTSHeader), fmt.Sprintf("max-age=%d", int64(httpmw.HSTSMaxAge)))
 	})
 	t.Run("False", func(t *testing.T) {
 		t.Parallel()
 
 		res := setup(false)
+		defer res.Body.Close()
 		require.NotContains(t, res.Header.Get(httpmw.HSTSHeader), fmt.Sprintf("max-age=%d", int64(httpmw.HSTSMaxAge)))
 	})
 }
