Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: Use http constants to replace numbers as parameters

Browse Source 
Signed-off-by: xin.li <xin.li@daocloud.io>
This commit is contained in:
xin.li 2023-02-19 20:41:10 +08:00 committed by Benjamin Wang
parent 8e56e2f5ce
commit b17b9c1428
13 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/v2/auth_role.go
View File

@ -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
}

2
client/v2/auth_user.go
View File

@ -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
}

10
client/v2/keys.go
View File

@ -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
}

10
client/v2/members.go
View File

@ -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
}

2
contrib/raftexample/raftexample_test.go
View File

@ -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)
}

2
server/etcdserver/api/etcdhttp/version_test.go
View File

@ -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)
}

2
server/etcdserver/api/rafthttp/http_test.go
View File

@ -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)
}

2
server/etcdserver/api/rafthttp/stream.go
View File

@ -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)

2
server/etcdserver/api/rafthttp/util.go
View File

@ -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))

2
server/etcdserver/cluster_util.go
View File

@ -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
}

4
server/etcdserver/txn/util_test.go
View File

@ -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 {

4
server/lease/leasehttp/http.go
View File

@ -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
}

2
tests/linearizability/model/model.go
View File

@ -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 {