From 30dd006e5c63355690e47644a2f1f085e64cb14c Mon Sep 17 00:00:00 2001 From: Wei Fu Date: Sun, 17 Sep 2023 02:09:13 +0000 Subject: [PATCH] *: fix nakedret lint Signed-off-by: Wei Fu --- client/pkg/transport/keepalive_listener.go | 2 +- client/pkg/transport/listener.go | 24 +++++++++++----------- etcdctl/main_test.go | 2 +- etcdutl/main_test.go | 2 +- scripts/test.sh | 3 +-- server/etcdserver/bootstrap_test.go | 19 +++++++++-------- server/main_test.go | 2 +- server/storage/wal/wal.go | 2 +- tests/robustness/validate/operations.go | 6 ++---- 9 files changed, 31 insertions(+), 31 deletions(-) diff --git a/client/pkg/transport/keepalive_listener.go b/client/pkg/transport/keepalive_listener.go index 07b2dc136781..ad953d4d03e8 100644 --- a/client/pkg/transport/keepalive_listener.go +++ b/client/pkg/transport/keepalive_listener.go @@ -104,7 +104,7 @@ type tlsKeepaliveListener struct { func (l *tlsKeepaliveListener) Accept() (c net.Conn, err 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 index 5e0e13e25a73..c062574686c1 100644 --- a/client/pkg/transport/listener.go +++ b/client/pkg/transport/listener.go @@ -110,7 +110,7 @@ func newKeepAliveListener(cfg *net.ListenConfig, addr string) (ln net.Listener, ln, err = net.Listen("tcp", addr) } if err != nil { - return + return nil, err } return NewKeepAliveListener(ln, "tcp", nil) @@ -213,7 +213,7 @@ func SelfCert(lg *zap.Logger, dirpath string, hosts []string, selfSignedCertVali "cannot generate cert", zap.Error(err), ) - return + return info, err } err = fileutil.TouchDirAll(lg, dirpath) if err != nil { @@ -223,16 +223,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 +242,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 +254,7 @@ func SelfCert(lg *zap.Logger, dirpath string, hosts []string, selfSignedCertVali zap.Error(err), ) } - return + return info, err } tmpl := x509.Certificate{ @@ -292,7 +292,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 +303,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 +313,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 +323,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 +334,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 index 8edbb0ae9b88..c94930099f57 100644 --- a/etcdctl/main_test.go +++ b/etcdctl/main_test.go @@ -33,7 +33,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 index 1fe58afb8375..5e3c4cc166e6 100644 --- a/etcdutl/main_test.go +++ b/etcdutl/main_test.go @@ -33,7 +33,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 index c8c6550ffa68..0bd2b6a02cef 100755 --- 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 index 55a20684fe8d..724374e1a9eb 100644 --- a/server/etcdserver/bootstrap_test.go +++ b/server/etcdserver/bootstrap_test.go @@ -222,13 +222,16 @@ func createDataDir(t *testing.T) (dataDir string, err error) { // 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 @@ -236,7 +239,7 @@ func prepareData(cfg config.ServerConfig) (err error) { var snapshotTerm, snapshotIndex uint64 = 2, 5 if err = createWALFileWithSnapshotRecord(cfg, snapshotTerm, snapshotIndex); err != nil { - return + return err } return createSnapshotAndBackendDB(cfg, snapshotTerm, snapshotIndex) @@ -245,7 +248,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,7 +265,7 @@ 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) @@ -283,7 +286,7 @@ func createSnapshotAndBackendDB(cfg config.ServerConfig, snapshotTerm, snapshotI Term: snapshotTerm, }, }); err != nil { - return + return err } // create snapshot db file: "%016x.snap.db" @@ -292,11 +295,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 index bc96bb33d746..c6fe648a7d1f 100644 --- a/server/main_test.go +++ b/server/main_test.go @@ -37,7 +37,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 index 7f8b25f5ddd2..4eeafbd90989 100644 --- 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 index 9705531ecf21..0ca61072be3a 100644 --- a/tests/robustness/validate/operations.go +++ b/tests/robustness/validate/operations.go @@ -35,17 +35,15 @@ func validateOperationsAndVisualize(t *testing.T, lg *zap.Logger, operations []p 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 }