From 93100adb69de2338982b5c2419c4dcef61ea2ca0 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 12 Oct 2019 20:40:19 +0200 Subject: [PATCH] api/server: use constants for http methods Signed-off-by: Sebastiaan van Stijn --- api/server/httputils/form_test.go | 12 ++++++------ api/server/middleware/debug.go | 2 +- api/server/middleware/version_test.go | 4 ++-- api/server/server_test.go | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/api/server/httputils/form_test.go b/api/server/httputils/form_test.go index e7e2daea20..2721b23e39 100644 --- a/api/server/httputils/form_test.go +++ b/api/server/httputils/form_test.go @@ -23,7 +23,7 @@ func TestBoolValue(t *testing.T) { for c, e := range cases { v := url.Values{} v.Set("test", c) - r, _ := http.NewRequest("POST", "", nil) + r, _ := http.NewRequest(http.MethodPost, "", nil) r.Form = v a := BoolValue(r, "test") @@ -34,14 +34,14 @@ func TestBoolValue(t *testing.T) { } func TestBoolValueOrDefault(t *testing.T) { - r, _ := http.NewRequest("GET", "", nil) + r, _ := http.NewRequest(http.MethodGet, "", nil) if !BoolValueOrDefault(r, "queryparam", true) { t.Fatal("Expected to get true default value, got false") } v := url.Values{} v.Set("param", "") - r, _ = http.NewRequest("GET", "", nil) + r, _ = http.NewRequest(http.MethodGet, "", nil) r.Form = v if BoolValueOrDefault(r, "param", true) { t.Fatal("Expected not to get true") @@ -59,7 +59,7 @@ func TestInt64ValueOrZero(t *testing.T) { for c, e := range cases { v := url.Values{} v.Set("test", c) - r, _ := http.NewRequest("POST", "", nil) + r, _ := http.NewRequest(http.MethodPost, "", nil) r.Form = v a := Int64ValueOrZero(r, "test") @@ -79,7 +79,7 @@ func TestInt64ValueOrDefault(t *testing.T) { for c, e := range cases { v := url.Values{} v.Set("test", c) - r, _ := http.NewRequest("POST", "", nil) + r, _ := http.NewRequest(http.MethodPost, "", nil) r.Form = v a, err := Int64ValueOrDefault(r, "test", -1) @@ -95,7 +95,7 @@ func TestInt64ValueOrDefault(t *testing.T) { func TestInt64ValueOrDefaultWithError(t *testing.T) { v := url.Values{} v.Set("test", "invalid") - r, _ := http.NewRequest("POST", "", nil) + r, _ := http.NewRequest(http.MethodPost, "", nil) r.Form = v _, err := Int64ValueOrDefault(r, "test", -1) diff --git a/api/server/middleware/debug.go b/api/server/middleware/debug.go index a02c1bc7de..1ec62602db 100644 --- a/api/server/middleware/debug.go +++ b/api/server/middleware/debug.go @@ -18,7 +18,7 @@ func DebugRequestMiddleware(handler func(ctx context.Context, w http.ResponseWri return func(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error { logrus.Debugf("Calling %s %s", r.Method, r.RequestURI) - if r.Method != "POST" { + if r.Method != http.MethodPost { return handler(ctx, w, r, vars) } if err := httputils.CheckForJSON(r); err != nil { diff --git a/api/server/middleware/version_test.go b/api/server/middleware/version_test.go index edbc0bcaa5..e00441d8c4 100644 --- a/api/server/middleware/version_test.go +++ b/api/server/middleware/version_test.go @@ -25,7 +25,7 @@ func TestVersionMiddlewareVersion(t *testing.T) { m := NewVersionMiddleware(defaultVersion, defaultVersion, minVersion) h := m.WrapHandler(handler) - req, _ := http.NewRequest("GET", "/containers/json", nil) + req, _ := http.NewRequest(http.MethodGet, "/containers/json", nil) resp := httptest.NewRecorder() ctx := context.Background() @@ -76,7 +76,7 @@ func TestVersionMiddlewareWithErrorsReturnsHeaders(t *testing.T) { m := NewVersionMiddleware(defaultVersion, defaultVersion, minVersion) h := m.WrapHandler(handler) - req, _ := http.NewRequest("GET", "/containers/json", nil) + req, _ := http.NewRequest(http.MethodGet, "/containers/json", nil) resp := httptest.NewRecorder() ctx := context.Background() diff --git a/api/server/server_test.go b/api/server/server_test.go index e0fac30ab7..a3e8124a88 100644 --- a/api/server/server_test.go +++ b/api/server/server_test.go @@ -22,7 +22,7 @@ func TestMiddlewares(t *testing.T) { srv.UseMiddleware(middleware.NewVersionMiddleware("0.1omega2", api.DefaultVersion, api.MinVersion)) - req, _ := http.NewRequest("GET", "/containers/json", nil) + req, _ := http.NewRequest(http.MethodGet, "/containers/json", nil) resp := httptest.NewRecorder() ctx := context.Background()