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

all: don't convert byte slice to string when using verb %s

Browse Source 
This is unnecessary, as the documentation for 'go doc fmt' says:
%s the uninterpreted bytes of the string or slice

Signed-off-by: Jes Cok <xigua67damn@gmail.com>
This commit is contained in:
Jes Cok 2024-04-25 23:18:22 +08:00
parent 3ecb70de50
commit dafadd13c1
14 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/pkg/transport/timeout_transport_test.go
View File

@ -80,6 +80,6 @@ func TestNewTimeoutTransport(t *testing.T) {
}
if bytes.Equal(addr0, addr1) {
t.Errorf("addr0 = %s addr1= %s, want not equal", string(addr0), string(addr1))
t.Errorf("addr0 = %s addr1= %s, want not equal", addr0, addr1)
}
}

4
etcdctl/ctlv3/command/printer_simple.go
View File

@ -223,7 +223,7 @@ func (s *simplePrinter) RoleGet(role string, r v3.AuthRoleGetResponse) {
for _, perm := range r.Perm {
if perm.PermType == v3.PermRead || perm.PermType == v3.PermReadWrite {
if len(perm.RangeEnd) == 0 {
fmt.Printf("\t%s\n", string(perm.Key))
fmt.Printf("\t%s\n", perm.Key)
} else {
printRange((*v3.Permission)(perm))
}
@ -233,7 +233,7 @@ func (s *simplePrinter) RoleGet(role string, r v3.AuthRoleGetResponse) {
for _, perm := range r.Perm {
if perm.PermType == v3.PermWrite || perm.PermType == v3.PermReadWrite {
if len(perm.RangeEnd) == 0 {
fmt.Printf("\t%s\n", string(perm.Key))
fmt.Printf("\t%s\n", perm.Key)
} else {
printRange((*v3.Permission)(perm))
}

6
etcdutl/snapshot/v3_snapshot.go
View File

@ -143,10 +143,10 @@ func (s *v3Manager) Status(dbPath string) (ds Status, err error) {
for next, _ := c.First(); next != nil; next, _ = c.Next() {
b := tx.Bucket(next)
if b == nil {
return fmt.Errorf("cannot get hash of bucket %s", string(next))
return fmt.Errorf("cannot get hash of bucket %s", next)
}
if _, err = h.Write(next); err != nil {
return fmt.Errorf("cannot write bucket %s : %v", string(next), err)
return fmt.Errorf("cannot write bucket %s : %v", next, err)
}
iskeyb := (string(next) == "key")
if err = b.ForEach(func(k, v []byte) error {
@ -163,7 +163,7 @@ func (s *v3Manager) Status(dbPath string) (ds Status, err error) {
ds.TotalKey++
return nil
}); err != nil {
return fmt.Errorf("cannot write bucket %s : %v", string(next), err)
return fmt.Errorf("cannot write bucket %s : %v", next, err)
}
}
return nil

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

@ -278,7 +278,7 @@ func TestNewPeerHandlerOnMembersPromotePrefix(t *testing.T) {
t.Fatalf("#%d: code = %d, want %d", i, resp.StatusCode, tt.wcode)
}
if tt.checkBody && strings.Contains(string(body), tt.wKeyWords) {
t.Errorf("#%d: body: %s, want body to contain keywords: %s", i, string(body), tt.wKeyWords)
t.Errorf("#%d: body: %s, want body to contain keywords: %s", i, body, tt.wKeyWords)
}
}
}

4
server/etcdserver/cluster_util.go
View File

@ -327,14 +327,14 @@ func promoteMemberHTTP(ctx context.Context, url string, id uint64, peerRt http.R
if strings.Contains(string(b), membership.ErrMemberNotLearner.Error()) {
return nil, membership.ErrMemberNotLearner
}
return nil, fmt.Errorf("member promote: unknown error(%s)", string(b))
return nil, fmt.Errorf("member promote: unknown error(%s)", b)
}
if resp.StatusCode == http.StatusNotFound {
return nil, membership.ErrIDNotFound
}
if resp.StatusCode != http.StatusOK { // all other types of errors
return nil, fmt.Errorf("member promote: unknown error(%s)", string(b))
return nil, fmt.Errorf("member promote: unknown error(%s)", b)
}
var membs []*membership.Member

2
server/etcdserver/corrupt.go
View File

@ -615,7 +615,7 @@ func HashByRev(ctx context.Context, cid types.ID, cc *http.Client, url string, r
}
}
if resp.StatusCode != http.StatusOK {
return nil, fmt.Errorf("unknown error: %s", string(b))
return nil, fmt.Errorf("unknown error: %s", b)
}
hashResp := &pb.HashKVResponse{}

2
server/etcdserver/corrupt_test.go
View File

@ -573,7 +573,7 @@ func TestHashKVHandler(t *testing.T) {
}
if resp.StatusCode != http.StatusOK {
if !strings.Contains(string(body), tt.wKeyWords) {
t.Errorf("#%d: body: %s, want body to contain keywords: %s", i, string(body), tt.wKeyWords)
t.Errorf("#%d: body: %s, want body to contain keywords: %s", i, body, tt.wKeyWords)
}
return
}

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

@ -192,12 +192,12 @@ func RenewHTTP(ctx context.Context, id lease.LeaseID, url string, rt http.RoundT
}
if resp.StatusCode != http.StatusOK {
return -1, fmt.Errorf("lease: unknown error(%s)", string(b))
return -1, fmt.Errorf("lease: unknown error(%s)", b)
}
lresp := &pb.LeaseKeepAliveResponse{}
if err := lresp.Unmarshal(b); err != nil {
return -1, fmt.Errorf(`lease: %v. data = "%s"`, err, string(b))
return -1, fmt.Errorf(`lease: %v. data = "%s"`, err, b)
}
if lresp.ID != int64(id) {
return -1, fmt.Errorf("lease: renew id mismatch")

4
server/storage/backend/backend.go
View File

@ -394,7 +394,7 @@ func (b *backend) Hash(ignores func(bucketName, keyName []byte) bool) (uint32, e
for next, _ := c.First(); next != nil; next, _ = c.Next() {
b := tx.Bucket(next)
if b == nil {
return fmt.Errorf("cannot get hash of bucket %s", string(next))
return fmt.Errorf("cannot get hash of bucket %s", next)
}
h.Write(next)
b.ForEach(func(k, v []byte) error {
@ -598,7 +598,7 @@ func defragdb(odb, tmpdb *bolt.DB, limit int) error {
for next, _ := c.First(); next != nil; next, _ = c.Next() {
b := tx.Bucket(next)
if b == nil {
return fmt.Errorf("backend: cannot defrag bucket %s", string(next))
return fmt.Errorf("backend: cannot defrag bucket %s", next)
}
tmpb, berr := tmptx.CreateBucketIfNotExists(next)

2
server/storage/backend/batch_tx_test.go
View File

@ -52,7 +52,7 @@ func TestBatchTxPut(t *testing.T) {
_, gv := tx.UnsafeRange(schema.Test, []byte("foo"), nil, 0)
tx.Unlock()
if !reflect.DeepEqual(gv[0], v) {
t.Errorf("v = %s, want %s", string(gv[0]), string(v))
t.Errorf("v = %s, want %s", gv[0], v)
}
tx.Commit()
}

6
tests/integration/clientv3/naming/resolver_test.go
View File

@ -114,7 +114,7 @@ func testEtcdGRPCResolver(t *testing.T, lbPolicy string) {
t.Logf("Last response: %v", string(lastResponse))
if lbPolicy == "pick_first" {
if string(lastResponse) != "3500" {
t.Fatalf("unexpected total responses from foo: %s", string(lastResponse))
t.Fatalf("unexpected total responses from foo: %s", lastResponse)
}
}
@ -122,12 +122,12 @@ func testEtcdGRPCResolver(t *testing.T, lbPolicy string) {
if lbPolicy == "round_robin" {
responses, err := strconv.Atoi(string(lastResponse))
if err != nil {
t.Fatalf("couldn't convert to int: %s", string(lastResponse))
t.Fatalf("couldn't convert to int: %s", lastResponse)
}
// Allow 25% tolerance as round robin is not perfect and we don't want the test to flake
expected := float64(totalRequests) * 0.5
assert.InEpsilon(t, expected, float64(responses), 0.25, "unexpected total responses from foo: %s", string(lastResponse))
assert.InEpsilon(t, expected, float64(responses), 0.25, "unexpected total responses from foo: %s", lastResponse)
}
}

4
tests/integration/snapshot/member_test.go
View File

@ -114,10 +114,10 @@ func TestSnapshotV3RestoreMultiMemberAdd(t *testing.T) {
}
for i := range gresp.Kvs {
if string(gresp.Kvs[i].Key) != kvs[i].k {
t.Fatalf("#%d: key expected %s, got %s", i, kvs[i].k, string(gresp.Kvs[i].Key))
t.Fatalf("#%d: key expected %s, got %s", i, kvs[i].k, gresp.Kvs[i].Key)
}
if string(gresp.Kvs[i].Value) != kvs[i].v {
t.Fatalf("#%d: value expected %s, got %s", i, kvs[i].v, string(gresp.Kvs[i].Value))
t.Fatalf("#%d: value expected %s, got %s", i, kvs[i].v, gresp.Kvs[i].Value)
}
}
}

4
tests/integration/snapshot/v3_snapshot_test.go
View File

@ -95,7 +95,7 @@ func TestSnapshotV3RestoreSingle(t *testing.T) {
t.Fatal(err)
}
if string(gresp.Kvs[0].Value) != kvs[i].v {
t.Fatalf("#%d: value expected %s, got %s", i, kvs[i].v, string(gresp.Kvs[0].Value))
t.Fatalf("#%d: value expected %s, got %s", i, kvs[i].v, gresp.Kvs[0].Value)
}
}
}
@ -132,7 +132,7 @@ func TestSnapshotV3RestoreMulti(t *testing.T) {
t.Fatal(err)
}
if string(gresp.Kvs[0].Value) != kvs[i].v {
t.Fatalf("#%d: value expected %s, got %s", i, kvs[i].v, string(gresp.Kvs[0].Value))
t.Fatalf("#%d: value expected %s, got %s", i, kvs[i].v, gresp.Kvs[0].Value)
}
}
}

2
tests/integration/v3_failover_test.go
View File

@ -148,7 +148,7 @@ func getWithRetries(t *testing.T, cli *clientv3.Client, key, val string, retryCo
t.Fatalf("Expected 1 key, got %d", len(resp.Kvs))
}
if !bytes.Equal([]byte(val), resp.Kvs[0].Value) {
t.Fatalf("Unexpected value, expected: %s, got: %s", val, string(resp.Kvs[0].Value))
t.Fatalf("Unexpected value, expected: %s, got: %s", val, resp.Kvs[0].Value)
}
return nil
}()