From 0a68fa86e80e61f41abdeab7b6431bbe2e97e77a Mon Sep 17 00:00:00 2001 From: Mihail Stoykov Date: Fri, 1 Dec 2023 11:34:07 +0200 Subject: [PATCH] Fix lint issues in api package --- api/server.go | 6 +++--- api/server_test.go | 10 +++++++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/api/server.go b/api/server.go index 8307d73dcf8..73e7eb6f548 100644 --- a/api/server.go +++ b/api/server.go @@ -73,15 +73,15 @@ type wrappedResponseWriter struct { status int } -func (w wrappedResponseWriter) WriteHeader(status int) { +func (w *wrappedResponseWriter) WriteHeader(status int) { w.status = status - w.ResponseWriter.WriteHeader(status) + w.ResponseWriter.WriteHeader(w.status) } // withLoggingHandler returns the middleware which logs response status for request. func withLoggingHandler(l logrus.FieldLogger, next http.Handler) http.HandlerFunc { return func(rw http.ResponseWriter, r *http.Request) { - wrapped := wrappedResponseWriter{ResponseWriter: rw, status: 200} // The default status code is 200 if it's not set + wrapped := &wrappedResponseWriter{ResponseWriter: rw, status: 200} // The default status code is 200 if it's not set next.ServeHTTP(wrapped, r) l.WithField("status", wrapped.status).Debugf("%s %s", r.Method, r.URL.Path) diff --git a/api/server_test.go b/api/server_test.go index 01ab9790340..8735a32e6a3 100644 --- a/api/server_test.go +++ b/api/server_test.go @@ -13,7 +13,7 @@ import ( "go.k6.io/k6/lib/testutils" ) -func testHTTPHandler(rw http.ResponseWriter, r *http.Request) { +func testHTTPHandler(rw http.ResponseWriter, _ *http.Request) { rw.Header().Add("Content-Type", "text/plain; charset=utf-8") if _, err := fmt.Fprint(rw, "ok"); err != nil { panic(err.Error()) @@ -21,10 +21,15 @@ func testHTTPHandler(rw http.ResponseWriter, r *http.Request) { } func TestLogger(t *testing.T) { + t.Parallel() for _, method := range []string{"GET", "POST", "PUT", "PATCH"} { + method := method t.Run("method="+method, func(t *testing.T) { + t.Parallel() for _, path := range []string{"/", "/test", "/test/path"} { + path := path t.Run("path="+path, func(t *testing.T) { + t.Parallel() rw := httptest.NewRecorder() r := httptest.NewRequest(method, "http://example.com"+path, nil) @@ -35,6 +40,7 @@ func TestLogger(t *testing.T) { res := rw.Result() assert.Equal(t, http.StatusOK, res.StatusCode) assert.Equal(t, "text/plain; charset=utf-8", res.Header.Get("Content-Type")) + assert.NoError(t, res.Body.Close()) if !assert.Len(t, hook.Entries, 1) { return @@ -51,6 +57,7 @@ func TestLogger(t *testing.T) { } func TestPing(t *testing.T) { + t.Parallel() logger := logrus.New() logger.SetOutput(testutils.NewTestOutput(t)) mux := handlePing(logger) @@ -62,4 +69,5 @@ func TestPing(t *testing.T) { res := rw.Result() assert.Equal(t, http.StatusOK, res.StatusCode) assert.Equal(t, []byte{'o', 'k'}, rw.Body.Bytes()) + assert.NoError(t, res.Body.Close()) }