Merge pull request #3384 from yichengq/fix-shadow

test: use go vet shadow feature instead of go-nyet

etcdserver/auth/auth.go

@@ -191,7 +191,7 @@ func (s *store) GetUser(name string) (User, error) {
 func (s *store) CreateOrUpdateUser(user User) (out User, created bool, err error) {
 	_, err = s.GetUser(user.User)
 	if err == nil {
-		out, err := s.UpdateUser(user)
+		out, err = s.UpdateUser(user)
 		return out, false, err
 	}
 	u, err := s.CreateUser(user)

etcdserver/cluster.go

@@ -379,7 +379,8 @@ func membersFromStore(st store.Store) (map[types.ID]*Member, map[types.ID]bool)
 		plog.Panicf("get storeMembers should never fail: %v", err)
 	}
 	for _, n := range e.Node.Nodes {
-		m, err := nodeToMember(n)
+		var m *Member
+		m, err = nodeToMember(n)
 		if err != nil {
 			plog.Panicf("nodeToMember should never fail: %v", err)
 		}

etcdserver/cluster_util.go

@@ -236,7 +236,8 @@ func getVersion(m *Member, tr *http.Transport) (*version.Versions, error) {
 			}, nil
 		}
 
-		b, err := ioutil.ReadAll(resp.Body)
+		var b []byte
+		b, err = ioutil.ReadAll(resp.Body)
 		resp.Body.Close()
 		if err != nil {
 			plog.Warningf("failed to read out the response body from the peerURL(%s) of member %s (%v)", u, m.ID, err)

integration/cluster_test.go

@@ -186,7 +186,7 @@ func TestForceNewCluster(t *testing.T) {
 	cancel()
 	// ensure create has been applied in this machine
 	ctx, cancel = context.WithTimeout(context.Background(), requestTimeout)
-	if _, err := kapi.Watcher("/foo", &client.WatcherOptions{AfterIndex: resp.Node.ModifiedIndex - 1}).Next(ctx); err != nil {
+	if _, err = kapi.Watcher("/foo", &client.WatcherOptions{AfterIndex: resp.Node.ModifiedIndex - 1}).Next(ctx); err != nil {
 		t.Fatalf("unexpected watch error: %v", err)
 	}
 	cancel()

pkg/fileutil/fileutil_test.go

@@ -47,7 +47,8 @@ func TestReadDir(t *testing.T) {
 	}
 	files := []string{"def", "abc", "xyz", "ghi"}
 	for _, f := range files {
-		fh, err := os.Create(filepath.Join(tmpdir, f))
+		var fh *os.File
+		fh, err = os.Create(filepath.Join(tmpdir, f))
 		if err != nil {
 			t.Fatalf("error creating file: %v", err)
 		}

pkg/fileutil/purge_test.go

@@ -32,7 +32,7 @@ func TestPurgeFile(t *testing.T) {
 	defer os.RemoveAll(dir)
 
 	for i := 0; i < 5; i++ {
-		_, err := os.Create(path.Join(dir, fmt.Sprintf("%d.test", i)))
+		_, err = os.Create(path.Join(dir, fmt.Sprintf("%d.test", i)))
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -41,7 +41,7 @@ func TestPurgeFile(t *testing.T) {
 	stop := make(chan struct{})
 	errch := PurgeFile(dir, "test", 3, time.Millisecond, stop)
 	for i := 5; i < 10; i++ {
-		_, err := os.Create(path.Join(dir, fmt.Sprintf("%d.test", i)))
+		_, err = os.Create(path.Join(dir, fmt.Sprintf("%d.test", i)))
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -71,7 +71,7 @@ func TestPurgeFileHoldingLock(t *testing.T) {
 	defer os.RemoveAll(dir)
 
 	for i := 0; i < 10; i++ {
-		_, err := os.Create(path.Join(dir, fmt.Sprintf("%d.test", i)))
+		_, err = os.Create(path.Join(dir, fmt.Sprintf("%d.test", i)))
 		if err != nil {
 			t.Fatal(err)
 		}

pkg/transport/listener_test.go

@@ -164,7 +164,7 @@ func TestTLSInfoMissingFields(t *testing.T) {
 	}
 
 	for i, info := range tests {
-		if _, err := info.ServerConfig(); err == nil {
+		if _, err = info.ServerConfig(); err == nil {
 			t.Errorf("#%d: expected non-nil error from ServerConfig()", i)
 		}
 
@@ -184,7 +184,7 @@ func TestTLSInfoParseFuncError(t *testing.T) {
 	info := TLSInfo{CertFile: tmp, KeyFile: tmp, CAFile: tmp}
 	info.parseFunc = fakeCertificateParserFunc(tls.Certificate{}, errors.New("fake"))
 
-	if _, err := info.ServerConfig(); err == nil {
+	if _, err = info.ServerConfig(); err == nil {
 		t.Errorf("expected non-nil error from ServerConfig()")
 	}
 

pkg/transport/timeout_listener_test.go

@@ -50,9 +50,9 @@ func TestWriteReadTimeoutListener(t *testing.T) {
 	stop := make(chan struct{})
 
 	blocker := func() {
-		conn, err := net.Dial("tcp", ln.Addr().String())
-		if err != nil {
-			t.Fatalf("unexpected dail error: %v", err)
+		conn, derr := net.Dial("tcp", ln.Addr().String())
+		if derr != nil {
+			t.Fatalf("unexpected dail error: %v", derr)
 		}
 		defer conn.Close()
 		// block the receiver until the writer timeout

raft/multinode.go

@@ -283,16 +283,16 @@ func (mn *multiNode) run() {
 
 		case advs := <-advancec:
 			for groupID, rd := range advs {
-				group, ok := groups[groupID]
+				g, ok := groups[groupID]
 				if !ok {
 					continue
 				}
-				group.commitReady(rd)
+				g.commitReady(rd)
 
 				// We've been accumulating new entries in rds which may now be obsolete.
 				// Drop the old Ready object and create a new one if needed.
 				delete(rds, groupID)
-				newRd := group.newReady()
+				newRd := g.newReady()
 				if newRd.containsUpdates() {
 					rds[groupID] = newRd
 				}
@@ -300,8 +300,8 @@ func (mn *multiNode) run() {
 			advancec = nil
 
 		case ms := <-mn.status:
-			if group, ok := groups[ms.group]; ok {
-				s := getStatus(group.raft)
+			if g, ok := groups[ms.group]; ok {
+				s := getStatus(g.raft)
 				ms.ch <- &s
 			} else {
 				ms.ch <- nil

snap/snapshotter_test.go

@@ -124,7 +124,8 @@ func TestSnapNames(t *testing.T) {
 	}
 	defer os.RemoveAll(dir)
 	for i := 1; i <= 5; i++ {
-		if f, err := os.Create(path.Join(dir, fmt.Sprintf("%d.snap", i))); err != nil {
+		var f *os.File
+		if f, err = os.Create(path.Join(dir, fmt.Sprintf("%d.snap", i))); err != nil {
 			t.Fatal(err)
 		} else {
 			f.Close()

test

@@ -74,13 +74,18 @@ if [ -n "${vetRes}" ]; then
 	exit 255
 fi
 
-if command -v go-nyet >/dev/null 2>&1; then
-  echo "Checking go-nyet..."
-  nyetRes=$(go-nyet -exitWith 0 $FMT)
-  if [ -n "${nyetRes}" ]; then
-          echo -e "go-nyet checking failed:\n${nyetRes}"
-          exit 255
-  fi
-fi
+echo "Checking govet -shadow..."
+for path in $FMT; do
+	# only check go files under raft dir because
+	# auto generated file in raft/raftpb cannot pass shadow test
+	if [ "${path}" == "raft" ]; then
+		path="raft/*.go"
+	fi
+	vetRes=$(go tool vet -shadow ${path})
+	if [ -n "${vetRes}" ]; then
+		echo -e "govet checking ${path} failed:\n${vetRes}"
+		exit 255
+	fi
+done
 
 echo "Success"