From 7e694022a648fe9f53bd583bab09a40a5773b03c Mon Sep 17 00:00:00 2001 From: Ville Vesilehto Date: Tue, 25 Jul 2023 16:03:02 +0000 Subject: [PATCH] backport of commit 14102979762cc48183cd70dc91e26c08f630ab9d --- command/agent/variable_endpoint.go | 2 +- command/agent/variable_endpoint_test.go | 46 ++++++++++++------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/command/agent/variable_endpoint.go b/command/agent/variable_endpoint.go index 98c581d54b1..04b0fd85662 100644 --- a/command/agent/variable_endpoint.go +++ b/command/agent/variable_endpoint.go @@ -10,7 +10,7 @@ import ( ) func (s *HTTPServer) VariablesListRequest(resp http.ResponseWriter, req *http.Request) (interface{}, error) { - if req.Method != "GET" { + if req.Method != http.MethodGet { return nil, CodedError(http.StatusMethodNotAllowed, ErrInvalidMethod) } diff --git a/command/agent/variable_endpoint_test.go b/command/agent/variable_endpoint_test.go index 74c32ecb7ff..9800d5dd19b 100644 --- a/command/agent/variable_endpoint_test.go +++ b/command/agent/variable_endpoint_test.go @@ -38,7 +38,7 @@ func TestHTTP_Variables(t *testing.T) { require.EqualError(t, err, ErrInvalidMethod) }) t.Run("error_parse_list", func(t *testing.T) { - req, err := http.NewRequest("GET", "/v1/vars?wait=99a", nil) + req, err := http.NewRequest(http.MethodGet, "/v1/vars?wait=99a", nil) require.NoError(t, err) respW := httptest.NewRecorder() _, _ = s.Server.VariablesListRequest(respW, req) @@ -46,7 +46,7 @@ func TestHTTP_Variables(t *testing.T) { require.Equal(t, "Invalid wait time", string(respW.Body.Bytes())) }) t.Run("error_rpc_list", func(t *testing.T) { - req, err := http.NewRequest("GET", "/v1/vars?region=bad", nil) + req, err := http.NewRequest(http.MethodGet, "/v1/vars?region=bad", nil) require.NoError(t, err) respW := httptest.NewRecorder() obj, err := s.Server.VariablesListRequest(respW, req) @@ -55,7 +55,7 @@ func TestHTTP_Variables(t *testing.T) { }) t.Run("list", func(t *testing.T) { // Test the empty list case - req, err := http.NewRequest("GET", "/v1/vars", nil) + req, err := http.NewRequest(http.MethodGet, "/v1/vars", nil) require.NoError(t, err) respW := httptest.NewRecorder() @@ -72,7 +72,7 @@ func TestHTTP_Variables(t *testing.T) { } // Make the HTTP request - req, err = http.NewRequest("GET", "/v1/vars", nil) + req, err = http.NewRequest(http.MethodGet, "/v1/vars", nil) require.NoError(t, err) respW = httptest.NewRecorder() @@ -89,7 +89,7 @@ func TestHTTP_Variables(t *testing.T) { require.Len(t, obj.([]*structs.VariableMetadata), 4) // test prefix query - req, err = http.NewRequest("GET", "/v1/vars?prefix="+svs[0].Path, nil) + req, err = http.NewRequest(http.MethodGet, "/v1/vars?prefix="+svs[0].Path, nil) require.NoError(t, err) respW = httptest.NewRecorder() @@ -109,7 +109,7 @@ func TestHTTP_Variables(t *testing.T) { require.Nil(t, obj) }) t.Run("error_parse_query", func(t *testing.T) { - req, err := http.NewRequest("GET", "/v1/var/does/not/exist?wait=99a", nil) + req, err := http.NewRequest(http.MethodGet, "/v1/var/does/not/exist?wait=99a", nil) require.NoError(t, err) respW := httptest.NewRecorder() _, _ = s.Server.VariableSpecificRequest(respW, req) @@ -117,7 +117,7 @@ func TestHTTP_Variables(t *testing.T) { require.Equal(t, "Invalid wait time", string(respW.Body.Bytes())) }) t.Run("error_rpc_query", func(t *testing.T) { - req, err := http.NewRequest("GET", "/v1/var/does/not/exist?region=bad", nil) + req, err := http.NewRequest(http.MethodGet, "/v1/var/does/not/exist?region=bad", nil) require.NoError(t, err) respW := httptest.NewRecorder() obj, err := s.Server.VariableSpecificRequest(respW, req) @@ -126,7 +126,7 @@ func TestHTTP_Variables(t *testing.T) { }) t.Run("query_unset_path", func(t *testing.T) { // Make a request for a non-existing variable - req, err := http.NewRequest("GET", "/v1/var/", nil) + req, err := http.NewRequest(http.MethodGet, "/v1/var/", nil) require.NoError(t, err) respW := httptest.NewRecorder() obj, err := s.Server.VariableSpecificRequest(respW, req) @@ -135,7 +135,7 @@ func TestHTTP_Variables(t *testing.T) { }) t.Run("query_unset_variable", func(t *testing.T) { // Make a request for a non-existing variable - req, err := http.NewRequest("GET", "/v1/var/not/real", nil) + req, err := http.NewRequest(http.MethodGet, "/v1/var/not/real", nil) require.NoError(t, err) respW := httptest.NewRecorder() obj, err := s.Server.VariableSpecificRequest(respW, req) @@ -149,7 +149,7 @@ func TestHTTP_Variables(t *testing.T) { require.NoError(t, rpcWriteSV(s, sv1, out)) // Query a variable - req, err := http.NewRequest("GET", "/v1/var/"+sv1.Path, nil) + req, err := http.NewRequest(http.MethodGet, "/v1/var/"+sv1.Path, nil) require.NoError(t, err) respW := httptest.NewRecorder() obj, err := s.Server.VariableSpecificRequest(respW, req) @@ -168,7 +168,7 @@ func TestHTTP_Variables(t *testing.T) { sv1 := mock.Variable() t.Run("error_parse_create", func(t *testing.T) { buf := encodeBrokenReq(&sv1) - req, err := http.NewRequest("PUT", "/v1/var/"+sv1.Path, buf) + req, err := http.NewRequest(http.MethodPut, "/v1/var/"+sv1.Path, buf) require.NoError(t, err) respW := httptest.NewRecorder() obj, err := s.Server.VariableSpecificRequest(respW, req) @@ -177,7 +177,7 @@ func TestHTTP_Variables(t *testing.T) { }) t.Run("error_rpc_create", func(t *testing.T) { buf := encodeReq(sv1) - req, err := http.NewRequest("PUT", "/v1/var/does/not/exist?region=bad", buf) + req, err := http.NewRequest(http.MethodPut, "/v1/var/does/not/exist?region=bad", buf) require.NoError(t, err) respW := httptest.NewRecorder() obj, err := s.Server.VariableSpecificRequest(respW, req) @@ -188,7 +188,7 @@ func TestHTTP_Variables(t *testing.T) { sv2 := sv1.Copy() sv2.Items = nil buf := encodeReq(sv2) - req, err := http.NewRequest("PUT", "/v1/var/"+sv1.Path, buf) + req, err := http.NewRequest(http.MethodPut, "/v1/var/"+sv1.Path, buf) require.NoError(t, err) respW := httptest.NewRecorder() obj, err := s.Server.VariableSpecificRequest(respW, req) @@ -197,7 +197,7 @@ func TestHTTP_Variables(t *testing.T) { }) t.Run("create", func(t *testing.T) { buf := encodeReq(sv1) - req, err := http.NewRequest("PUT", "/v1/var/"+sv1.Path, buf) + req, err := http.NewRequest(http.MethodPut, "/v1/var/"+sv1.Path, buf) require.NoError(t, err) respW := httptest.NewRecorder() obj, err := s.Server.VariableSpecificRequest(respW, req) @@ -228,7 +228,7 @@ func TestHTTP_Variables(t *testing.T) { // break the request body badBuf := encodeBrokenReq(&sv1U) - req, err := http.NewRequest("PUT", "/v1/var/"+sv1.Path, badBuf) + req, err := http.NewRequest(http.MethodPut, "/v1/var/"+sv1.Path, badBuf) require.NoError(t, err) respW := httptest.NewRecorder() @@ -246,7 +246,7 @@ func TestHTTP_Variables(t *testing.T) { // test broken rpc error buf := encodeReq(&sv1U) - req, err := http.NewRequest("PUT", "/v1/var/"+sv1.Path+"?region=bad", buf) + req, err := http.NewRequest(http.MethodPut, "/v1/var/"+sv1.Path+"?region=bad", buf) require.NoError(t, err) respW := httptest.NewRecorder() @@ -263,7 +263,7 @@ func TestHTTP_Variables(t *testing.T) { svU.Items["new"] = "new" // Make the HTTP request buf := encodeReq(&svU) - req, err := http.NewRequest("PUT", "/v1/var/"+sv.Path, buf) + req, err := http.NewRequest(http.MethodPut, "/v1/var/"+sv.Path, buf) require.NoError(t, err) respW := httptest.NewRecorder() @@ -301,7 +301,7 @@ func TestHTTP_Variables(t *testing.T) { // Make the HTTP request { buf := encodeReq(&svU) - req, err := http.NewRequest("PUT", "/v1/var/"+svU.Path+"?cas=1", buf) + req, err := http.NewRequest(http.MethodPut, "/v1/var/"+svU.Path+"?cas=1", buf) require.NoError(t, err) respW := httptest.NewRecorder() @@ -328,7 +328,7 @@ func TestHTTP_Variables(t *testing.T) { // Make the HTTP request { buf := encodeReq(&svU) - req, err := http.NewRequest("PUT", "/v1/var/"+svU.Path+"?cas="+fmt.Sprint(sv.ModifyIndex), buf) + req, err := http.NewRequest(http.MethodPut, "/v1/var/"+svU.Path+"?cas="+fmt.Sprint(sv.ModifyIndex), buf) require.NoError(t, err) respW := httptest.NewRecorder() @@ -379,7 +379,7 @@ func TestHTTP_Variables(t *testing.T) { require.NoError(t, rpcWriteSV(s, sv1, nil)) // Make the HTTP request - req, err := http.NewRequest("DELETE", "/v1/var/"+sv1.Path+"?region=bad", nil) + req, err := http.NewRequest(http.MethodDelete, "/v1/var/"+sv1.Path+"?region=bad", nil) require.NoError(t, err) respW := httptest.NewRecorder() @@ -396,7 +396,7 @@ func TestHTTP_Variables(t *testing.T) { // Make the HTTP request { - req, err := http.NewRequest("DELETE", "/v1/var/"+sv.Path+"?cas=1", nil) + req, err := http.NewRequest(http.MethodDelete, "/v1/var/"+sv.Path+"?cas=1", nil) require.NoError(t, err) respW := httptest.NewRecorder() @@ -424,7 +424,7 @@ func TestHTTP_Variables(t *testing.T) { } // Make the HTTP request { - req, err := http.NewRequest("DELETE", "/v1/var/"+sv.Path+"?cas="+fmt.Sprint(sv.ModifyIndex), nil) + req, err := http.NewRequest(http.MethodDelete, "/v1/var/"+sv.Path+"?cas="+fmt.Sprint(sv.ModifyIndex), nil) require.NoError(t, err) respW := httptest.NewRecorder() @@ -445,7 +445,7 @@ func TestHTTP_Variables(t *testing.T) { require.NoError(t, rpcWriteSV(s, sv1, nil)) // Make the HTTP request - req, err := http.NewRequest("DELETE", "/v1/var/"+sv1.Path, nil) + req, err := http.NewRequest(http.MethodDelete, "/v1/var/"+sv1.Path, nil) require.NoError(t, err) respW := httptest.NewRecorder()