diff --git a/client/v2/auth_role.go b/client/v2/auth_role.go index b6ba7e150..08c300433 100644 --- a/client/v2/auth_role.go +++ b/client/v2/auth_role.go @@ -88,7 +88,7 @@ type authRoleAPIList struct{} func (list *authRoleAPIList) HTTPRequest(ep url.URL) *http.Request { u := v2AuthURL(ep, "roles", "") - req, _ := http.NewRequest("GET", u.String(), nil) + req, _ := http.NewRequest(http.MethodGet, u.String(), nil) req.Header.Set("Content-Type", "application/json") return req } diff --git a/client/v2/auth_user.go b/client/v2/auth_user.go index 8e7e2efe8..8ab64e1fb 100644 --- a/client/v2/auth_user.go +++ b/client/v2/auth_user.go @@ -163,7 +163,7 @@ type authUserAPIList struct{} func (list *authUserAPIList) HTTPRequest(ep url.URL) *http.Request { u := v2AuthURL(ep, "users", "") - req, _ := http.NewRequest("GET", u.String(), nil) + req, _ := http.NewRequest(http.MethodGet, u.String(), nil) req.Header.Set("Content-Type", "application/json") return req } diff --git a/client/v2/keys.go b/client/v2/keys.go index fa8fdc6b2..8be1057f0 100644 --- a/client/v2/keys.go +++ b/client/v2/keys.go @@ -506,7 +506,7 @@ func (g *getAction) HTTPRequest(ep url.URL) *http.Request { params.Set("quorum", strconv.FormatBool(g.Quorum)) u.RawQuery = params.Encode() - req, _ := http.NewRequest("GET", u.String(), nil) + req, _ := http.NewRequest(http.MethodGet, u.String(), nil) return req } @@ -526,7 +526,7 @@ func (w *waitAction) HTTPRequest(ep url.URL) *http.Request { params.Set("recursive", strconv.FormatBool(w.Recursive)) u.RawQuery = params.Encode() - req, _ := http.NewRequest("GET", u.String(), nil) + req, _ := http.NewRequest(http.MethodGet, u.String(), nil) return req } @@ -581,7 +581,7 @@ func (a *setAction) HTTPRequest(ep url.URL) *http.Request { u.RawQuery = params.Encode() body := strings.NewReader(form.Encode()) - req, _ := http.NewRequest("PUT", u.String(), body) + req, _ := http.NewRequest(http.MethodPut, u.String(), body) req.Header.Set("Content-Type", "application/x-www-form-urlencoded") return req @@ -614,7 +614,7 @@ func (a *deleteAction) HTTPRequest(ep url.URL) *http.Request { } u.RawQuery = params.Encode() - req, _ := http.NewRequest("DELETE", u.String(), nil) + req, _ := http.NewRequest(http.MethodDelete, u.String(), nil) req.Header.Set("Content-Type", "application/x-www-form-urlencoded") return req @@ -637,7 +637,7 @@ func (a *createInOrderAction) HTTPRequest(ep url.URL) *http.Request { } body := strings.NewReader(form.Encode()) - req, _ := http.NewRequest("POST", u.String(), body) + req, _ := http.NewRequest(http.MethodPost, u.String(), body) req.Header.Set("Content-Type", "application/x-www-form-urlencoded") return req } diff --git a/client/v2/members.go b/client/v2/members.go index 5e868ec69..f53c2dbb2 100644 --- a/client/v2/members.go +++ b/client/v2/members.go @@ -225,7 +225,7 @@ type membersAPIActionList struct{} func (l *membersAPIActionList) HTTPRequest(ep url.URL) *http.Request { u := v2MembersURL(ep) - req, _ := http.NewRequest("GET", u.String(), nil) + req, _ := http.NewRequest(http.MethodGet, u.String(), nil) return req } @@ -236,7 +236,7 @@ type membersAPIActionRemove struct { func (d *membersAPIActionRemove) HTTPRequest(ep url.URL) *http.Request { u := v2MembersURL(ep) u.Path = path.Join(u.Path, d.memberID) - req, _ := http.NewRequest("DELETE", u.String(), nil) + req, _ := http.NewRequest(http.MethodDelete, u.String(), nil) return req } @@ -248,7 +248,7 @@ func (a *membersAPIActionAdd) HTTPRequest(ep url.URL) *http.Request { u := v2MembersURL(ep) m := memberCreateOrUpdateRequest{PeerURLs: a.peerURLs} b, _ := json.Marshal(&m) - req, _ := http.NewRequest("POST", u.String(), bytes.NewReader(b)) + req, _ := http.NewRequest(http.MethodPost, u.String(), bytes.NewReader(b)) req.Header.Set("Content-Type", "application/json") return req } @@ -263,7 +263,7 @@ func (a *membersAPIActionUpdate) HTTPRequest(ep url.URL) *http.Request { m := memberCreateOrUpdateRequest{PeerURLs: a.peerURLs} u.Path = path.Join(u.Path, a.memberID) b, _ := json.Marshal(&m) - req, _ := http.NewRequest("PUT", u.String(), bytes.NewReader(b)) + req, _ := http.NewRequest(http.MethodPut, u.String(), bytes.NewReader(b)) req.Header.Set("Content-Type", "application/json") return req } @@ -282,7 +282,7 @@ type membersAPIActionLeader struct{} func (l *membersAPIActionLeader) HTTPRequest(ep url.URL) *http.Request { u := v2MembersURL(ep) u.Path = path.Join(u.Path, defaultLeaderSuffix) - req, _ := http.NewRequest("GET", u.String(), nil) + req, _ := http.NewRequest(http.MethodGet, u.String(), nil) return req } diff --git a/contrib/raftexample/raftexample_test.go b/contrib/raftexample/raftexample_test.go index f7aa335eb..6a8e52746 100644 --- a/contrib/raftexample/raftexample_test.go +++ b/contrib/raftexample/raftexample_test.go @@ -200,7 +200,7 @@ func TestPutAndGetKeyValue(t *testing.T) { body := bytes.NewBufferString(wantValue) cli := srv.Client() - req, err := http.NewRequest("PUT", url, body) + req, err := http.NewRequest(http.MethodPut, url, body) if err != nil { t.Fatal(err) } diff --git a/server/etcdserver/api/etcdhttp/version_test.go b/server/etcdserver/api/etcdhttp/version_test.go index 25e0c4f3c..3da19bb79 100644 --- a/server/etcdserver/api/etcdhttp/version_test.go +++ b/server/etcdserver/api/etcdhttp/version_test.go @@ -24,7 +24,7 @@ import ( ) func TestServeVersion(t *testing.T) { - req, err := http.NewRequest("GET", "", nil) + req, err := http.NewRequest(http.MethodGet, "", nil) if err != nil { t.Fatalf("error creating request: %v", err) } diff --git a/server/etcdserver/api/rafthttp/http_test.go b/server/etcdserver/api/rafthttp/http_test.go index 8728fce13..fb3e1f66e 100644 --- a/server/etcdserver/api/rafthttp/http_test.go +++ b/server/etcdserver/api/rafthttp/http_test.go @@ -187,7 +187,7 @@ func TestServeRaftStreamPrefix(t *testing.T) { }, } for i, tt := range tests { - req, err := http.NewRequest("GET", "http://localhost:2380"+tt.path, nil) + req, err := http.NewRequest(http.MethodGet, "http://localhost:2380"+tt.path, nil) if err != nil { t.Fatalf("#%d: could not create request: %#v", i, err) } diff --git a/server/etcdserver/api/rafthttp/stream.go b/server/etcdserver/api/rafthttp/stream.go index c8a1f1fb5..994e080dc 100644 --- a/server/etcdserver/api/rafthttp/stream.go +++ b/server/etcdserver/api/rafthttp/stream.go @@ -574,7 +574,7 @@ func (cr *streamReader) dial(t streamType) (io.ReadCloser, error) { zap.String("address", uu.String()), ) } - req, err := http.NewRequest("GET", uu.String(), nil) + req, err := http.NewRequest(http.MethodGet, uu.String(), nil) if err != nil { cr.picker.unreachable(u) return nil, fmt.Errorf("failed to make http request to %v (%v)", u, err) diff --git a/server/etcdserver/api/rafthttp/util.go b/server/etcdserver/api/rafthttp/util.go index 91bc6884e..0f8d52071 100644 --- a/server/etcdserver/api/rafthttp/util.go +++ b/server/etcdserver/api/rafthttp/util.go @@ -64,7 +64,7 @@ func newStreamRoundTripper(tlsInfo transport.TLSInfo, dialTimeout time.Duration) func createPostRequest(lg *zap.Logger, u url.URL, path string, body io.Reader, ct string, urls types.URLs, from, cid types.ID) *http.Request { uu := u uu.Path = path - req, err := http.NewRequest("POST", uu.String(), body) + req, err := http.NewRequest(http.MethodPost, uu.String(), body) if err != nil { if lg != nil { lg.Panic("unexpected new request error", zap.Error(err)) diff --git a/server/etcdserver/cluster_util.go b/server/etcdserver/cluster_util.go index dd797baf0..065283a58 100644 --- a/server/etcdserver/cluster_util.go +++ b/server/etcdserver/cluster_util.go @@ -289,7 +289,7 @@ func promoteMemberHTTP(ctx context.Context, url string, id uint64, peerRt http.R // TODO: refactor member http handler code // cannot import etcdhttp, so manually construct url requestUrl := url + "/members/promote/" + fmt.Sprintf("%d", id) - req, err := http.NewRequest("POST", requestUrl, nil) + req, err := http.NewRequest(http.MethodPost, requestUrl, nil) if err != nil { return nil, err } diff --git a/server/etcdserver/txn/util_test.go b/server/etcdserver/txn/util_test.go index 1fc9eeac9..096b317d8 100644 --- a/server/etcdserver/txn/util_test.go +++ b/server/etcdserver/txn/util_test.go @@ -28,8 +28,8 @@ import ( // never panic no matter what data the txnResponse contains. func TestWarnOfExpensiveReadOnlyTxnRequest(t *testing.T) { kvs := []*mvccpb.KeyValue{ - &mvccpb.KeyValue{Key: []byte("k1"), Value: []byte("v1")}, - &mvccpb.KeyValue{Key: []byte("k2"), Value: []byte("v2")}, + {Key: []byte("k1"), Value: []byte("v1")}, + {Key: []byte("k2"), Value: []byte("v2")}, } testCases := []struct { diff --git a/server/lease/leasehttp/http.go b/server/lease/leasehttp/http.go index 542c3a82a..30caf22e7 100644 --- a/server/lease/leasehttp/http.go +++ b/server/lease/leasehttp/http.go @@ -151,7 +151,7 @@ func RenewHTTP(ctx context.Context, id lease.LeaseID, url string, rt http.RoundT } cc := &http.Client{Transport: rt} - req, err := http.NewRequest("POST", url, bytes.NewReader(lreq)) + req, err := http.NewRequest(http.MethodPost, url, bytes.NewReader(lreq)) if err != nil { return -1, err } @@ -202,7 +202,7 @@ func TimeToLiveHTTP(ctx context.Context, id lease.LeaseID, keys bool, url string return nil, err } - req, err := http.NewRequest("POST", url, bytes.NewReader(lreq)) + req, err := http.NewRequest(http.MethodPost, url, bytes.NewReader(lreq)) if err != nil { return nil, err } diff --git a/tests/linearizability/model/model.go b/tests/linearizability/model/model.go index 43a8efe1d..ae00a4b1c 100644 --- a/tests/linearizability/model/model.go +++ b/tests/linearizability/model/model.go @@ -404,7 +404,7 @@ func applyRequestToSingleState(s EtcdState, request EtcdRequest) (EtcdState, Etc case LeaseRevoke: //Delete the keys attached to the lease keyDeleted := false - for key, _ := range s.Leases[request.LeaseRevoke.LeaseID].Keys { + for key := range s.Leases[request.LeaseRevoke.LeaseID].Keys { //same as delete. if _, ok := s.KeyValues[key]; ok { if !keyDeleted {