*: fix nakedret lint

fuweid · fuweid · commit e72c2c40d4f4 · 2023-09-17T23:52:41.000+08:00
Signed-off-by: Wei Fu &lt;fuweid89@gmail.com&gt;
diff --git a/client/pkg/transport/keepalive_listener.go b/client/pkg/transport/keepalive_listener.go
@@ -101,10 +101,10 @@ type tlsKeepaliveListener struct {
 
 // Accept waits for and returns the next incoming TLS connection.
 // The returned connection c is a *tls.Conn.
-func (l *tlsKeepaliveListener) Accept() (c net.Conn, err error) {
-	c, err = l.Listener.Accept()
+func (l *tlsKeepaliveListener) Accept() (net.Conn, error) {
+	c, err := l.Listener.Accept()
 	if err != nil {
-		return
+		return nil, err
 	}
 
 	c = tls.Server(c, l.config)
diff --git a/client/pkg/transport/listener.go b/client/pkg/transport/listener.go
@@ -103,14 +103,17 @@ func newListener(addr, scheme string, opts ...ListenerOption) (net.Listener, err
 	return wrapTLS(scheme, lnOpts.tlsInfo, lnOpts.Listener)
 }
 
-func newKeepAliveListener(cfg *net.ListenConfig, addr string) (ln net.Listener, err error) {
+func newKeepAliveListener(cfg *net.ListenConfig, addr string) (net.Listener, error) {
+	var ln net.Listener
+	var err error
+
 	if cfg != nil {
 		ln, err = cfg.Listen(context.TODO(), "tcp", addr)
 	} else {
 		ln, err = net.Listen("tcp", addr)
 	}
 	if err != nil {
-		return
+		return nil, err
 	}
 
 	return NewKeepAliveListener(ln, "tcp", nil)
@@ -204,16 +207,18 @@ func (info TLSInfo) Empty() bool {
 	return info.CertFile == "" && info.KeyFile == ""
 }
 
-func SelfCert(lg *zap.Logger, dirpath string, hosts []string, selfSignedCertValidity uint, additionalUsages ...x509.ExtKeyUsage) (info TLSInfo, err error) {
+func SelfCert(lg *zap.Logger, dirpath string, hosts []string, selfSignedCertValidity uint, additionalUsages ...x509.ExtKeyUsage) (TLSInfo, error) {
 	verify.Assert(lg != nil, "nil log isn't allowed")
-	info.Logger = lg
+
+	var err error
+	info := TLSInfo{Logger: lg}
 	if selfSignedCertValidity == 0 {
 		err = errors.New("selfSignedCertValidity is invalid,it should be greater than 0")
 		info.Logger.Warn(
 			"cannot generate cert",
 			zap.Error(err),
 		)
-		return
+		return info, err
 	}
 	err = fileutil.TouchDirAll(lg, dirpath)
 	if err != nil {
@@ -223,16 +228,16 @@ func SelfCert(lg *zap.Logger, dirpath string, hosts []string, selfSignedCertVali
 				zap.Error(err),
 			)
 		}
-		return
+		return info, err
 	}
 
 	certPath, err := filepath.Abs(filepath.Join(dirpath, "cert.pem"))
 	if err != nil {
-		return
+		return info, err
 	}
 	keyPath, err := filepath.Abs(filepath.Join(dirpath, "key.pem"))
 	if err != nil {
-		return
+		return info, err
 	}
 	_, errcert := os.Stat(certPath)
 	_, errkey := os.Stat(keyPath)
@@ -242,7 +247,7 @@ func SelfCert(lg *zap.Logger, dirpath string, hosts []string, selfSignedCertVali
 		info.ClientCertFile = certPath
 		info.ClientKeyFile = keyPath
 		info.selfCert = true
-		return
+		return info, err
 	}
 
 	serialNumberLimit := new(big.Int).Lsh(big.NewInt(1), 128)
@@ -254,7 +259,7 @@ func SelfCert(lg *zap.Logger, dirpath string, hosts []string, selfSignedCertVali
 				zap.Error(err),
 			)
 		}
-		return
+		return info, err
 	}
 
 	tmpl := x509.Certificate{
@@ -292,7 +297,7 @@ func SelfCert(lg *zap.Logger, dirpath string, hosts []string, selfSignedCertVali
 				zap.Error(err),
 			)
 		}
-		return
+		return info, err
 	}
 
 	derBytes, err := x509.CreateCertificate(rand.Reader, &tmpl, &tmpl, &priv.PublicKey, priv)
@@ -303,7 +308,7 @@ func SelfCert(lg *zap.Logger, dirpath string, hosts []string, selfSignedCertVali
 				zap.Error(err),
 			)
 		}
-		return
+		return info, err
 	}
 
 	certOut, err := os.Create(certPath)
@@ -313,7 +318,7 @@ func SelfCert(lg *zap.Logger, dirpath string, hosts []string, selfSignedCertVali
 			zap.String("path", certPath),
 			zap.Error(err),
 		)
-		return
+		return info, err
 	}
 	pem.Encode(certOut, &pem.Block{Type: "CERTIFICATE", Bytes: derBytes})
 	certOut.Close()
@@ -323,7 +328,7 @@ func SelfCert(lg *zap.Logger, dirpath string, hosts []string, selfSignedCertVali
 
 	b, err := x509.MarshalECPrivateKey(priv)
 	if err != nil {
-		return
+		return info, err
 	}
 	keyOut, err := os.OpenFile(keyPath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0600)
 	if err != nil {
@@ -334,7 +339,7 @@ func SelfCert(lg *zap.Logger, dirpath string, hosts []string, selfSignedCertVali
 				zap.Error(err),
 			)
 		}
-		return
+		return info, err
 	}
 	pem.Encode(keyOut, &pem.Block{Type: "EC PRIVATE KEY", Bytes: b})
 	keyOut.Close()
diff --git a/etcdctl/main_test.go b/etcdctl/main_test.go
@@ -21,7 +21,9 @@ import (
 	"testing"
 )
 
-func SplitTestArgs(args []string) (testArgs, appArgs []string) {
+func SplitTestArgs(args []string) ([]string, []string) {
+	var testArgs, appArgs []string
+
 	for i, arg := range args {
 		switch {
 		case strings.HasPrefix(arg, "-test."):
@@ -33,7 +35,7 @@ func SplitTestArgs(args []string) (testArgs, appArgs []string) {
 			appArgs = append(appArgs, arg)
 		}
 	}
-	return
+	return testArgs, appArgs
 }
 
 // TestEmpty is an empty test to avoid no-tests warning.
diff --git a/etcdutl/main_test.go b/etcdutl/main_test.go
@@ -21,7 +21,9 @@ import (
 	"testing"
 )
 
-func SplitTestArgs(args []string) (testArgs, appArgs []string) {
+func SplitTestArgs(args []string) ([]string, []string) {
+	var testArgs, appArgs []string
+
 	for i, arg := range args {
 		switch {
 		case strings.HasPrefix(arg, "-test."):
@@ -33,7 +35,7 @@ func SplitTestArgs(args []string) (testArgs, appArgs []string) {
 			appArgs = append(appArgs, arg)
 		}
 	}
-	return
+	return testArgs, appArgs
 }
 
 // TestEmpty is empty test to avoid no-tests warning.
diff --git a/scripts/test.sh b/scripts/test.sh
@@ -424,8 +424,7 @@ function ineffassign_pass {
 }
 
 function nakedret_pass {
-  # TODO: nakedret should work with -set_exit_status
-  run_for_modules generic_checker run_go_tool "github.com/alexkohler/nakedret"
+  run_for_modules generic_checker run_go_tool "github.com/alexkohler/nakedret/cmd/nakedret"
 }
 
 function license_header_per_module {
diff --git a/server/etcdserver/bootstrap_test.go b/server/etcdserver/bootstrap_test.go
@@ -216,27 +216,32 @@ func TestBootstrapBackend(t *testing.T) {
 	}
 }
 
-func createDataDir(t *testing.T) (dataDir string, err error) {
+func createDataDir(t *testing.T) (string, error) {
+	var err error
+
 	// create the temporary data dir
-	dataDir = t.TempDir()
+	dataDir := t.TempDir()
 
 	// create ${dataDir}/member/snap
 	if err = os.MkdirAll(datadir.ToSnapDir(dataDir), 0700); err != nil {
-		return
+		return "", err
 	}
 
 	// create ${dataDir}/member/wal
 	err = os.MkdirAll(datadir.ToWalDir(dataDir), 0700)
+	if err != nil {
+		return "", err
+	}
 
-	return
+	return dataDir, nil
 }
 
 // prepare data for the test case
-func prepareData(cfg config.ServerConfig) (err error) {
+func prepareData(cfg config.ServerConfig) error {
 	var snapshotTerm, snapshotIndex uint64 = 2, 5
 
-	if err = createWALFileWithSnapshotRecord(cfg, snapshotTerm, snapshotIndex); err != nil {
-		return
+	if err := createWALFileWithSnapshotRecord(cfg, snapshotTerm, snapshotIndex); err != nil {
+		return err
 	}
 
 	return createSnapshotAndBackendDB(cfg, snapshotTerm, snapshotIndex)
@@ -245,7 +250,7 @@ func prepareData(cfg config.ServerConfig) (err error) {
 func createWALFileWithSnapshotRecord(cfg config.ServerConfig, snapshotTerm, snapshotIndex uint64) (err error) {
 	var w *wal.WAL
 	if w, err = wal.Create(cfg.Logger, cfg.WALDir(), []byte("somedata")); err != nil {
-		return
+		return err
 	}
 
 	defer func() {
@@ -262,13 +267,15 @@ func createWALFileWithSnapshotRecord(cfg config.ServerConfig, snapshotTerm, snap
 	}
 
 	if err = w.SaveSnapshot(walSnap); err != nil {
-		return
+		return err
 	}
 
 	return w.Save(raftpb.HardState{Term: snapshotTerm, Vote: 3, Commit: snapshotIndex}, nil)
 }
 
-func createSnapshotAndBackendDB(cfg config.ServerConfig, snapshotTerm, snapshotIndex uint64) (err error) {
+func createSnapshotAndBackendDB(cfg config.ServerConfig, snapshotTerm, snapshotIndex uint64) error {
+	var err error
+
 	confState := raftpb.ConfState{
 		Voters: []uint64{1, 2, 3},
 	}
@@ -283,7 +290,7 @@ func createSnapshotAndBackendDB(cfg config.ServerConfig, snapshotTerm, snapshotI
 			Term:      snapshotTerm,
 		},
 	}); err != nil {
-		return
+		return err
 	}
 
 	// create snapshot db file: "%016x.snap.db"
@@ -292,11 +299,11 @@ func createSnapshotAndBackendDB(cfg config.ServerConfig, snapshotTerm, snapshotI
 	schema.UnsafeUpdateConsistentIndex(be.BatchTx(), snapshotIndex, snapshotTerm)
 	schema.MustUnsafeSaveConfStateToBackend(cfg.Logger, be.BatchTx(), &confState)
 	if err = be.Close(); err != nil {
-		return
+		return err
 	}
 	sdb := filepath.Join(cfg.SnapDir(), fmt.Sprintf("%016x.snap.db", snapshotIndex))
 	if err = os.Rename(cfg.BackendPath(), sdb); err != nil {
-		return
+		return err
 	}
 
 	// create backend db file
diff --git a/server/main_test.go b/server/main_test.go
@@ -25,7 +25,9 @@ import (
 	"go.etcd.io/etcd/server/v3/etcdmain"
 )
 
-func SplitTestArgs(args []string) (testArgs, appArgs []string) {
+func SplitTestArgs(args []string) ([]string, []string) {
+	var testArgs, appArgs []string
+
 	for i, arg := range args {
 		switch {
 		case strings.HasPrefix(arg, "-test."):
@@ -37,7 +39,7 @@ func SplitTestArgs(args []string) (testArgs, appArgs []string) {
 			appArgs = append(appArgs, arg)
 		}
 	}
-	return
+	return testArgs, appArgs
 }
 
 func TestEmpty(t *testing.T) {}
diff --git a/server/storage/wal/wal.go b/server/storage/wal/wal.go
@@ -553,7 +553,7 @@ func (w *WAL) ReadAll() (metadata []byte, state raftpb.HardState, ents []raftpb.
 		// create encoder (chain crc with the decoder), enable appending
 		w.encoder, err = newFileEncoder(w.tail().File, w.decoder.LastCRC())
 		if err != nil {
-			return
+			return nil, state, nil, err
 		}
 	}
 	w.decoder = nil
diff --git a/tests/robustness/validate/operations.go b/tests/robustness/validate/operations.go
@@ -28,24 +28,22 @@ import (
 	"go.etcd.io/etcd/tests/v3/robustness/model"
 )
 
-func validateOperationsAndVisualize(t *testing.T, lg *zap.Logger, operations []porcupine.Operation, eventHistory []model.WatchEvent) (visualize func(basepath string) error) {
+func validateOperationsAndVisualize(t *testing.T, lg *zap.Logger, operations []porcupine.Operation, eventHistory []model.WatchEvent) func(basepath string) error {
 	const timeout = 5 * time.Minute
 	lg.Info("Validating linearizable operations", zap.Duration("timeout", timeout))
 	result, visualize := validateLinearizableOperationAndVisualize(lg, operations, timeout)
 	switch result {
 	case porcupine.Illegal:
 		t.Error("Linearization failed")
-		return
 	case porcupine.Unknown:
 		t.Error("Linearization has timed out")
-		return
 	case porcupine.Ok:
 		t.Log("Linearization success")
+		lg.Info("Validating serializable operations")
+		validateSerializableOperations(t, operations, eventHistory)
 	default:
 		t.Fatalf("Unknown Linearization")
 	}
-	lg.Info("Validating serializable operations")
-	validateSerializableOperations(t, operations, eventHistory)
 	return visualize
 }
 

Original file line number	Diff line number	Diff line change
`@@ -103,14 +103,17 @@ func newListener(addr, scheme string, opts ...ListenerOption) (net.Listener, err`
`103`	`103`	`return wrapTLS(scheme, lnOpts.tlsInfo, lnOpts.Listener)`
`104`	`104`	`}`
`105`	`105`
`106`		`-func newKeepAliveListener(cfg *net.ListenConfig, addr string) (ln net.Listener, err error) {`
	`106`	`+func newKeepAliveListener(cfg *net.ListenConfig, addr string) (net.Listener, error) {`
	`107`	`+ var ln net.Listener`
	`108`	`+ var err error`
	`109`	`+`
`107`	`110`	`if cfg != nil {`
`108`	`111`	`ln, err = cfg.Listen(context.TODO(), "tcp", addr)`
`109`	`112`	`} else {`
`110`	`113`	`ln, err = net.Listen("tcp", addr)`
`111`	`114`	`}`
`112`	`115`	`if err != nil {`
`113`		`- return`
	`116`	`+ return nil, err`
`114`	`117`	`}`
`115`	`118`
`116`	`119`	`return NewKeepAliveListener(ln, "tcp", nil)`
`@@ -204,16 +207,18 @@ func (info TLSInfo) Empty() bool {`
`204`	`207`	`return info.CertFile == "" && info.KeyFile == ""`
`205`	`208`	`}`
`206`	`209`
`207`		`-func SelfCert(lg *zap.Logger, dirpath string, hosts []string, selfSignedCertValidity uint, additionalUsages ...x509.ExtKeyUsage) (info TLSInfo, err error) {`
	`210`	`+func SelfCert(lg *zap.Logger, dirpath string, hosts []string, selfSignedCertValidity uint, additionalUsages ...x509.ExtKeyUsage) (TLSInfo, error) {`
`208`	`211`	`verify.Assert(lg != nil, "nil log isn't allowed")`
`209`		`- info.Logger = lg`
	`212`	`+`
	`213`	`+ var err error`
	`214`	`+ info := TLSInfo{Logger: lg}`
`210`	`215`	`if selfSignedCertValidity == 0 {`
`211`	`216`	`err = errors.New("selfSignedCertValidity is invalid,it should be greater than 0")`
`212`	`217`	`info.Logger.Warn(`
`213`	`218`	`"cannot generate cert",`
`214`	`219`	`zap.Error(err),`
`215`	`220`	`)`
`216`		`- return`
	`221`	`+ return info, err`
`217`	`222`	`}`
`218`	`223`	`err = fileutil.TouchDirAll(lg, dirpath)`
`219`	`224`	`if err != nil {`
`@@ -223,16 +228,16 @@ func SelfCert(lg *zap.Logger, dirpath string, hosts []string, selfSignedCertVali`
`223`	`228`	`zap.Error(err),`
`224`	`229`	`)`
`225`	`230`	`}`
`226`		`- return`
	`231`	`+ return info, err`
`227`	`232`	`}`
`228`	`233`
`229`	`234`	`certPath, err := filepath.Abs(filepath.Join(dirpath, "cert.pem"))`
`230`	`235`	`if err != nil {`
`231`		`- return`
	`236`	`+ return info, err`
`232`	`237`	`}`
`233`	`238`	`keyPath, err := filepath.Abs(filepath.Join(dirpath, "key.pem"))`
`234`	`239`	`if err != nil {`
`235`		`- return`
	`240`	`+ return info, err`
`236`	`241`	`}`
`237`	`242`	`_, errcert := os.Stat(certPath)`
`238`	`243`	`_, errkey := os.Stat(keyPath)`
`@@ -242,7 +247,7 @@ func SelfCert(lg *zap.Logger, dirpath string, hosts []string, selfSignedCertVali`
`242`	`247`	`info.ClientCertFile = certPath`
`243`	`248`	`info.ClientKeyFile = keyPath`
`244`	`249`	`info.selfCert = true`
`245`		`- return`
	`250`	`+ return info, err`
`246`	`251`	`}`
`247`	`252`
`248`	`253`	`serialNumberLimit := new(big.Int).Lsh(big.NewInt(1), 128)`
`@@ -254,7 +259,7 @@ func SelfCert(lg *zap.Logger, dirpath string, hosts []string, selfSignedCertVali`
`254`	`259`	`zap.Error(err),`
`255`	`260`	`)`
`256`	`261`	`}`
`257`		`- return`
	`262`	`+ return info, err`
`258`	`263`	`}`
`259`	`264`
`260`	`265`	`tmpl := x509.Certificate{`
`@@ -292,7 +297,7 @@ func SelfCert(lg *zap.Logger, dirpath string, hosts []string, selfSignedCertVali`
`292`	`297`	`zap.Error(err),`
`293`	`298`	`)`
`294`	`299`	`}`
`295`		`- return`
	`300`	`+ return info, err`
`296`	`301`	`}`
`297`	`302`
`298`	`303`	`derBytes, err := x509.CreateCertificate(rand.Reader, &tmpl, &tmpl, &priv.PublicKey, priv)`
`@@ -303,7 +308,7 @@ func SelfCert(lg *zap.Logger, dirpath string, hosts []string, selfSignedCertVali`
`303`	`308`	`zap.Error(err),`
`304`	`309`	`)`
`305`	`310`	`}`
`306`		`- return`
	`311`	`+ return info, err`
`307`	`312`	`}`
`308`	`313`
`309`	`314`	`certOut, err := os.Create(certPath)`
`@@ -313,7 +318,7 @@ func SelfCert(lg *zap.Logger, dirpath string, hosts []string, selfSignedCertVali`
`313`	`318`	`zap.String("path", certPath),`
`314`	`319`	`zap.Error(err),`
`315`	`320`	`)`
`316`		`- return`
	`321`	`+ return info, err`
`317`	`322`	`}`
`318`	`323`	`pem.Encode(certOut, &pem.Block{Type: "CERTIFICATE", Bytes: derBytes})`
`319`	`324`	`certOut.Close()`
`@@ -323,7 +328,7 @@ func SelfCert(lg *zap.Logger, dirpath string, hosts []string, selfSignedCertVali`
`323`	`328`
`324`	`329`	`b, err := x509.MarshalECPrivateKey(priv)`
`325`	`330`	`if err != nil {`
`326`		`- return`
	`331`	`+ return info, err`
`327`	`332`	`}`
`328`	`333`	`keyOut, err := os.OpenFile(keyPath, os.O_WRONLY\|os.O_CREATE\|os.O_TRUNC, 0600)`
`329`	`334`	`if err != nil {`
`@@ -334,7 +339,7 @@ func SelfCert(lg *zap.Logger, dirpath string, hosts []string, selfSignedCertVali`
`334`	`339`	`zap.Error(err),`
`335`	`340`	`)`
`336`	`341`	`}`
`337`		`- return`
	`342`	`+ return info, err`
`338`	`343`	`}`
`339`	`344`	`pem.Encode(keyOut, &pem.Block{Type: "EC PRIVATE KEY", Bytes: b})`
`340`	`345`	`keyOut.Close()`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,9 @@ import (`
`21`	`21`	`"testing"`
`22`	`22`	`)`
`23`	`23`
`24`		`-func SplitTestArgs(args []string) (testArgs, appArgs []string) {`
	`24`	`+func SplitTestArgs(args []string) ([]string, []string) {`
	`25`	`+ var testArgs, appArgs []string`
	`26`	`+`
`25`	`27`	`for i, arg := range args {`
`26`	`28`	`switch {`
`27`	`29`	`case strings.HasPrefix(arg, "-test."):`
`@@ -33,7 +35,7 @@ func SplitTestArgs(args []string) (testArgs, appArgs []string) {`
`33`	`35`	`appArgs = append(appArgs, arg)`
`34`	`36`	`}`
`35`	`37`	`}`
`36`		`- return`
	`38`	`+ return testArgs, appArgs`
`37`	`39`	`}`
`38`	`40`
`39`	`41`	`// TestEmpty is an empty test to avoid no-tests warning.`
Original file line number	Diff line number	Diff line change
`@@ -424,8 +424,7 @@ function ineffassign_pass {`
`424`	`424`	`}`
`425`	`425`
`426`	`426`	`function nakedret_pass {`
`427`		`- # TODO: nakedret should work with -set_exit_status`
`428`		`- run_for_modules generic_checker run_go_tool "github.com/alexkohler/nakedret"`
	`427`	`+ run_for_modules generic_checker run_go_tool "github.com/alexkohler/nakedret/cmd/nakedret"`
`429`	`428`	`}`
`430`	`429`
`431`	`430`	`function license_header_per_module {`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,9 @@ import (`
`25`	`25`	`"go.etcd.io/etcd/server/v3/etcdmain"`
`26`	`26`	`)`
`27`	`27`
`28`		`-func SplitTestArgs(args []string) (testArgs, appArgs []string) {`
	`28`	`+func SplitTestArgs(args []string) ([]string, []string) {`
	`29`	`+ var testArgs, appArgs []string`
	`30`	`+`
`29`	`31`	`for i, arg := range args {`
`30`	`32`	`switch {`
`31`	`33`	`case strings.HasPrefix(arg, "-test."):`
`@@ -37,7 +39,7 @@ func SplitTestArgs(args []string) (testArgs, appArgs []string) {`
`37`	`39`	`appArgs = append(appArgs, arg)`
`38`	`40`	`}`
`39`	`41`	`}`
`40`		`- return`
	`42`	`+ return testArgs, appArgs`
`41`	`43`	`}`
`42`	`44`
`43`	`45`	`func TestEmpty(t *testing.T) {}`
Original file line number	Diff line number	Diff line change
`@@ -553,7 +553,7 @@ func (w *WAL) ReadAll() (metadata []byte, state raftpb.HardState, ents []raftpb.`
`553`	`553`	`// create encoder (chain crc with the decoder), enable appending`
`554`	`554`	`w.encoder, err = newFileEncoder(w.tail().File, w.decoder.LastCRC())`
`555`	`555`	`if err != nil {`
`556`		`- return`
	`556`	`+ return nil, state, nil, err`
`557`	`557`	`}`
`558`	`558`	`}`
`559`	`559`	`w.decoder = nil`