From bc3f10957245be0a46b2c377b26f7bec250b12e9 Mon Sep 17 00:00:00 2001 From: Ivan Valdes Date: Tue, 23 Apr 2024 20:08:40 -0700 Subject: [PATCH 1/3] etcdutl: address var-naming lint warnings Signed-off-by: Ivan Valdes --- etcdutl/etcdutl/snapshot_command.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/etcdutl/etcdutl/snapshot_command.go b/etcdutl/etcdutl/snapshot_command.go index 8fa89fba0..98958b8e0 100644 --- a/etcdutl/etcdutl/snapshot_command.go +++ b/etcdutl/etcdutl/snapshot_command.go @@ -35,7 +35,7 @@ var ( restoreCluster string restoreClusterToken string restoreDataDir string - restoreWalDir string + restoreWALDir string restorePeerURLs string restoreName string skipHashCheck bool @@ -73,7 +73,7 @@ func NewSnapshotRestoreCommand() *cobra.Command { Run: snapshotRestoreCommandFunc, } cmd.Flags().StringVar(&restoreDataDir, "data-dir", "", "Path to the output data directory") - cmd.Flags().StringVar(&restoreWalDir, "wal-dir", "", "Path to the WAL directory (use --data-dir if none given)") + cmd.Flags().StringVar(&restoreWALDir, "wal-dir", "", "Path to the WAL directory (use --data-dir if none given)") cmd.Flags().StringVar(&restoreCluster, "initial-cluster", initialClusterFromName(defaultName), "Initial cluster configuration for restore bootstrap") cmd.Flags().StringVar(&restoreClusterToken, "initial-cluster-token", "etcd-cluster", "Initial cluster token for the etcd cluster during restore bootstrap") cmd.Flags().StringVar(&restorePeerURLs, "initial-advertise-peer-urls", defaultInitialAdvertisePeerURLs, "List of this member's peer URLs to advertise to the rest of the cluster") @@ -106,14 +106,14 @@ func SnapshotStatusCommandFunc(cmd *cobra.Command, args []string) { } func snapshotRestoreCommandFunc(_ *cobra.Command, args []string) { - SnapshotRestoreCommandFunc(restoreCluster, restoreClusterToken, restoreDataDir, restoreWalDir, + SnapshotRestoreCommandFunc(restoreCluster, restoreClusterToken, restoreDataDir, restoreWALDir, restorePeerURLs, restoreName, skipHashCheck, initialMmapSize, revisionBump, markCompacted, args) } func SnapshotRestoreCommandFunc(restoreCluster string, restoreClusterToken string, restoreDataDir string, - restoreWalDir string, + restoreWALDir string, restorePeerURLs string, restoreName string, skipHashCheck bool, @@ -136,7 +136,7 @@ func SnapshotRestoreCommandFunc(restoreCluster string, dataDir = restoreName + ".etcd" } - walDir := restoreWalDir + walDir := restoreWALDir if walDir == "" { walDir = datadir.ToWALDir(dataDir) } From 7300abc55282e8967aae86d9f9ac3abc7381da09 Mon Sep 17 00:00:00 2001 From: Ivan Valdes Date: Tue, 23 Apr 2024 20:09:06 -0700 Subject: [PATCH 2/3] tests/common: address var-naming lint warnings Signed-off-by: Ivan Valdes --- tests/common/status_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/common/status_test.go b/tests/common/status_test.go index a6a984439..7ee4cdadb 100644 --- a/tests/common/status_test.go +++ b/tests/common/status_test.go @@ -43,14 +43,14 @@ func TestStatus(t *testing.T) { if len(rs) != tc.config.ClusterSize { t.Fatalf("wrong number of status responses. expected:%d, got:%d ", tc.config.ClusterSize, len(rs)) } - memberIds := make(map[uint64]struct{}) + memberIDs := make(map[uint64]struct{}) for _, r := range rs { if r == nil { t.Fatalf("status response is nil") } - memberIds[r.Header.MemberId] = struct{}{} + memberIDs[r.Header.MemberId] = struct{}{} } - if len(rs) != len(memberIds) { + if len(rs) != len(memberIDs) { t.Fatalf("found duplicated members") } }) From fce8949dd0d901e658a972d21c3a9aae3413c7b0 Mon Sep 17 00:00:00 2001 From: Ivan Valdes Date: Tue, 23 Apr 2024 20:13:02 -0700 Subject: [PATCH 3/3] tools/etcd-dump-logs: address var-naming lint warnings Signed-off-by: Ivan Valdes --- tools/etcd-dump-logs/etcd-dump-log_test.go | 4 ++-- tools/etcd-dump-logs/raw_test.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/etcd-dump-logs/etcd-dump-log_test.go b/tools/etcd-dump-logs/etcd-dump-log_test.go index e646e2e77..4f8febe9a 100644 --- a/tools/etcd-dump-logs/etcd-dump-log_test.go +++ b/tools/etcd-dump-logs/etcd-dump-log_test.go @@ -51,7 +51,7 @@ func TestEtcdDumpLogEntryType(t *testing.T) { p := t.TempDir() - mustCreateWalLog(t, p) + mustCreateWALLog(t, p) argtests := []struct { name string @@ -96,7 +96,7 @@ func TestEtcdDumpLogEntryType(t *testing.T) { } -func mustCreateWalLog(t *testing.T, path string) { +func mustCreateWALLog(t *testing.T, path string) { memberdir := filepath.Join(path, "member") err := os.Mkdir(memberdir, 0744) if err != nil { diff --git a/tools/etcd-dump-logs/raw_test.go b/tools/etcd-dump-logs/raw_test.go index d1509ec4e..3deb4bc39 100644 --- a/tools/etcd-dump-logs/raw_test.go +++ b/tools/etcd-dump-logs/raw_test.go @@ -22,7 +22,7 @@ import ( func Test_readRaw(t *testing.T) { path := t.TempDir() - mustCreateWalLog(t, path) + mustCreateWALLog(t, path) var out bytes.Buffer readRaw(nil, walDir(path), &out) assert.Equal(t,