From 43df62f6b9d0d0b7b65e407139cfc440577a07d7 Mon Sep 17 00:00:00 2001 From: Chun-Hung Tseng Date: Mon, 24 Feb 2025 21:30:53 +0000 Subject: [PATCH] Address issues reported by golangci-lint after bumping the version to v1.64.5 Signed-off-by: Chun-Hung Tseng --- .../clientv3/examples/example_cluster_test.go | 20 ++++---- .../clientv3/examples/example_kv_test.go | 46 +++++++++---------- .../clientv3/examples/example_lease_test.go | 16 +++---- .../examples/example_maintenance_test.go | 8 ++-- .../clientv3/examples/example_metrics_test.go | 4 +- .../clientv3/examples/example_test.go | 8 ++-- .../clientv3/examples/example_watch_test.go | 16 +++---- 7 files changed, 59 insertions(+), 59 deletions(-) diff --git a/tests/integration/clientv3/examples/example_cluster_test.go b/tests/integration/clientv3/examples/example_cluster_test.go index 1d2da78c777e..3a83e8a997fc 100644 --- a/tests/integration/clientv3/examples/example_cluster_test.go +++ b/tests/integration/clientv3/examples/example_cluster_test.go @@ -22,12 +22,12 @@ import ( clientv3 "go.etcd.io/etcd/client/v3" ) -func mockCluster_memberList() { +func mockClusterMemberList() { fmt.Println("members: 3") } func ExampleCluster_memberList() { - forUnitTestsRunInMockedContext(mockCluster_memberList, func() { + forUnitTestsRunInMockedContext(mockClusterMemberList, func() { cli, err := clientv3.New(clientv3.Config{ Endpoints: exampleEndpoints(), DialTimeout: dialTimeout, @@ -46,13 +46,13 @@ func ExampleCluster_memberList() { // Output: members: 3 } -func mockCluster_memberAdd() { +func mockClusterMemberAdd() { fmt.Println("added member.PeerURLs: [http://localhost:32380]") fmt.Println("members count: 4") } func ExampleCluster_memberAdd() { - forUnitTestsRunInMockedContext(mockCluster_memberAdd, func() { + forUnitTestsRunInMockedContext(mockClusterMemberAdd, func() { cli, err := clientv3.New(clientv3.Config{ Endpoints: exampleEndpoints(), DialTimeout: dialTimeout, @@ -81,13 +81,13 @@ func ExampleCluster_memberAdd() { // members count: 4 } -func mockCluster_memberAddAsLearner() { +func mockClusterMemberAddAsLearner() { fmt.Println("members count: 4") fmt.Println("added member.IsLearner: true") } func ExampleCluster_memberAddAsLearner() { - forUnitTestsRunInMockedContext(mockCluster_memberAddAsLearner, func() { + forUnitTestsRunInMockedContext(mockClusterMemberAddAsLearner, func() { cli, err := clientv3.New(clientv3.Config{ Endpoints: exampleEndpoints(), DialTimeout: dialTimeout, @@ -116,10 +116,10 @@ func ExampleCluster_memberAddAsLearner() { // added member.IsLearner: true } -func mockCluster_memberRemove() {} +func mockClusterMemberRemove() {} func ExampleCluster_memberRemove() { - forUnitTestsRunInMockedContext(mockCluster_memberRemove, func() { + forUnitTestsRunInMockedContext(mockClusterMemberRemove, func() { cli, err := clientv3.New(clientv3.Config{ Endpoints: exampleEndpoints(), DialTimeout: dialTimeout, @@ -147,10 +147,10 @@ func ExampleCluster_memberRemove() { }) } -func mockCluster_memberUpdate() {} +func mockClusterMemberUpdate() {} func ExampleCluster_memberUpdate() { - forUnitTestsRunInMockedContext(mockCluster_memberUpdate, func() { + forUnitTestsRunInMockedContext(mockClusterMemberUpdate, func() { cli, err := clientv3.New(clientv3.Config{ Endpoints: exampleEndpoints(), DialTimeout: dialTimeout, diff --git a/tests/integration/clientv3/examples/example_kv_test.go b/tests/integration/clientv3/examples/example_kv_test.go index e4fa4bf5f441..235404b6753f 100644 --- a/tests/integration/clientv3/examples/example_kv_test.go +++ b/tests/integration/clientv3/examples/example_kv_test.go @@ -16,6 +16,7 @@ package clientv3_test import ( "context" + "errors" "fmt" "log" @@ -23,10 +24,10 @@ import ( clientv3 "go.etcd.io/etcd/client/v3" ) -func mockKV_put() {} +func mockKVPut() {} func ExampleKV_put() { - forUnitTestsRunInMockedContext(mockKV_put, func() { + forUnitTestsRunInMockedContext(mockKVPut, func() { cli, err := clientv3.New(clientv3.Config{ Endpoints: exampleEndpoints(), DialTimeout: dialTimeout, @@ -46,12 +47,12 @@ func ExampleKV_put() { // Output: } -func mockKV_putErrorHandling() { +func mockKVPutErrorHandling() { fmt.Println("client-side error: etcdserver: key is not provided") } func ExampleKV_putErrorHandling() { - forUnitTestsRunInMockedContext(mockKV_putErrorHandling, func() { + forUnitTestsRunInMockedContext(mockKVPutErrorHandling, func() { cli, err := clientv3.New(clientv3.Config{ Endpoints: exampleEndpoints(), DialTimeout: dialTimeout, @@ -65,14 +66,13 @@ func ExampleKV_putErrorHandling() { _, err = cli.Put(ctx, "", "sample_value") cancel() if err != nil { - switch err { - case context.Canceled: + if errors.Is(err, context.Canceled) { fmt.Printf("ctx is canceled by another routine: %v\n", err) - case context.DeadlineExceeded: + } else if errors.Is(err, context.DeadlineExceeded) { fmt.Printf("ctx is attached with a deadline is exceeded: %v\n", err) - case rpctypes.ErrEmptyKey: + } else if errors.Is(err, rpctypes.ErrEmptyKey) { fmt.Printf("client-side error: %v\n", err) - default: + } else { fmt.Printf("bad cluster endpoints, which are not etcd servers: %v\n", err) } } @@ -80,12 +80,12 @@ func ExampleKV_putErrorHandling() { // Output: client-side error: etcdserver: key is not provided } -func mockKV_get() { +func mockKVGet() { fmt.Println("foo : bar") } func ExampleKV_get() { - forUnitTestsRunInMockedContext(mockKV_get, func() { + forUnitTestsRunInMockedContext(mockKVGet, func() { cli, err := clientv3.New(clientv3.Config{ Endpoints: exampleEndpoints(), DialTimeout: dialTimeout, @@ -113,12 +113,12 @@ func ExampleKV_get() { // Output: foo : bar } -func mockKV_getWithRev() { +func mockKVGetWithRev() { fmt.Println("foo : bar1") } func ExampleKV_getWithRev() { - forUnitTestsRunInMockedContext(mockKV_getWithRev, func() { + forUnitTestsRunInMockedContext(mockKVGetWithRev, func() { cli, err := clientv3.New(clientv3.Config{ Endpoints: exampleEndpoints(), DialTimeout: dialTimeout, @@ -150,14 +150,14 @@ func ExampleKV_getWithRev() { // Output: foo : bar1 } -func mockKV_getSortedPrefix() { +func mockKVGetSortedPrefix() { fmt.Println(`key_2 : value`) fmt.Println(`key_1 : value`) fmt.Println(`key_0 : value`) } func ExampleKV_getSortedPrefix() { - forUnitTestsRunInMockedContext(mockKV_getSortedPrefix, func() { + forUnitTestsRunInMockedContext(mockKVGetSortedPrefix, func() { cli, err := clientv3.New(clientv3.Config{ Endpoints: exampleEndpoints(), DialTimeout: dialTimeout, @@ -192,12 +192,12 @@ func ExampleKV_getSortedPrefix() { // key_0 : value } -func mockKV_delete() { +func mockKVDelete() { fmt.Println("Deleted all keys: true") } func ExampleKV_delete() { - forUnitTestsRunInMockedContext(mockKV_delete, func() { + forUnitTestsRunInMockedContext(mockKVDelete, func() { cli, err := clientv3.New(clientv3.Config{ Endpoints: exampleEndpoints(), DialTimeout: dialTimeout, @@ -228,10 +228,10 @@ func ExampleKV_delete() { // Deleted all keys: true } -func mockKV_compact() {} +func mockKVCompact() {} func ExampleKV_compact() { - forUnitTestsRunInMockedContext(mockKV_compact, func() { + forUnitTestsRunInMockedContext(mockKVCompact, func() { cli, err := clientv3.New(clientv3.Config{ Endpoints: exampleEndpoints(), DialTimeout: dialTimeout, @@ -259,12 +259,12 @@ func ExampleKV_compact() { // Output: } -func mockKV_txn() { +func mockKVTxn() { fmt.Println("key : XYZ") } func ExampleKV_txn() { - forUnitTestsRunInMockedContext(mockKV_txn, func() { + forUnitTestsRunInMockedContext(mockKVTxn, func() { cli, err := clientv3.New(clientv3.Config{ Endpoints: exampleEndpoints(), DialTimeout: dialTimeout, @@ -306,10 +306,10 @@ func ExampleKV_txn() { // Output: key : XYZ } -func mockKV_do() {} +func mockKVDo() {} func ExampleKV_do() { - forUnitTestsRunInMockedContext(mockKV_do, func() { + forUnitTestsRunInMockedContext(mockKVDo, func() { cli, err := clientv3.New(clientv3.Config{ Endpoints: exampleEndpoints(), DialTimeout: dialTimeout, diff --git a/tests/integration/clientv3/examples/example_lease_test.go b/tests/integration/clientv3/examples/example_lease_test.go index b0e6c5ef3668..f55e8314b2d3 100644 --- a/tests/integration/clientv3/examples/example_lease_test.go +++ b/tests/integration/clientv3/examples/example_lease_test.go @@ -22,11 +22,11 @@ import ( clientv3 "go.etcd.io/etcd/client/v3" ) -func mockLease_grant() { +func mockLeaseGrant() { } func ExampleLease_grant() { - forUnitTestsRunInMockedContext(mockLease_grant, func() { + forUnitTestsRunInMockedContext(mockLeaseGrant, func() { cli, err := clientv3.New(clientv3.Config{ Endpoints: exampleEndpoints(), DialTimeout: dialTimeout, @@ -51,12 +51,12 @@ func ExampleLease_grant() { // Output: } -func mockLease_revoke() { +func mockLeaseRevoke() { fmt.Println("number of keys: 0") } func ExampleLease_revoke() { - forUnitTestsRunInMockedContext(mockLease_revoke, func() { + forUnitTestsRunInMockedContext(mockLeaseRevoke, func() { cli, err := clientv3.New(clientv3.Config{ Endpoints: exampleEndpoints(), DialTimeout: dialTimeout, @@ -91,12 +91,12 @@ func ExampleLease_revoke() { // Output: number of keys: 0 } -func mockLease_keepAlive() { +func mockLeaseKeepAlive() { fmt.Println("ttl: 5") } func ExampleLease_keepAlive() { - forUnitTestsRunInMockedContext(mockLease_keepAlive, func() { + forUnitTestsRunInMockedContext(mockLeaseKeepAlive, func() { cli, err := clientv3.New(clientv3.Config{ Endpoints: exampleEndpoints(), DialTimeout: dialTimeout, @@ -132,12 +132,12 @@ func ExampleLease_keepAlive() { // Output: ttl: 5 } -func mockLease_keepAliveOnce() { +func mockLeaseKeepAliveOnce() { fmt.Println("ttl: 5") } func ExampleLease_keepAliveOnce() { - forUnitTestsRunInMockedContext(mockLease_keepAliveOnce, func() { + forUnitTestsRunInMockedContext(mockLeaseKeepAliveOnce, func() { cli, err := clientv3.New(clientv3.Config{ Endpoints: exampleEndpoints(), DialTimeout: dialTimeout, diff --git a/tests/integration/clientv3/examples/example_maintenance_test.go b/tests/integration/clientv3/examples/example_maintenance_test.go index ff545e8de7d5..2c901475a7c0 100644 --- a/tests/integration/clientv3/examples/example_maintenance_test.go +++ b/tests/integration/clientv3/examples/example_maintenance_test.go @@ -21,10 +21,10 @@ import ( clientv3 "go.etcd.io/etcd/client/v3" ) -func mockMaintenance_status() {} +func mockMaintenanceStatus() {} func ExampleMaintenance_status() { - forUnitTestsRunInMockedContext(mockMaintenance_status, func() { + forUnitTestsRunInMockedContext(mockMaintenanceStatus, func() { for _, ep := range exampleEndpoints() { cli, err := clientv3.New(clientv3.Config{ Endpoints: []string{ep}, @@ -44,10 +44,10 @@ func ExampleMaintenance_status() { // Output: } -func mockMaintenance_defragment() {} +func mockMaintenanceDefragment() {} func ExampleMaintenance_defragment() { - forUnitTestsRunInMockedContext(mockMaintenance_defragment, func() { + forUnitTestsRunInMockedContext(mockMaintenanceDefragment, func() { for _, ep := range exampleEndpoints() { cli, err := clientv3.New(clientv3.Config{ Endpoints: []string{ep}, diff --git a/tests/integration/clientv3/examples/example_metrics_test.go b/tests/integration/clientv3/examples/example_metrics_test.go index 75b47e53d23e..d467c8281333 100644 --- a/tests/integration/clientv3/examples/example_metrics_test.go +++ b/tests/integration/clientv3/examples/example_metrics_test.go @@ -31,12 +31,12 @@ import ( clientv3 "go.etcd.io/etcd/client/v3" ) -func mockClient_metrics() { +func mockClientMetrics() { fmt.Println(`grpc_client_started_total{grpc_method="Range",grpc_service="etcdserverpb.KV",grpc_type="unary"} 1`) } func ExampleClient_metrics() { - forUnitTestsRunInMockedContext(mockClient_metrics, func() { + forUnitTestsRunInMockedContext(mockClientMetrics, func() { clientMetrics := grpcprom.NewClientMetrics() prometheus.Register(clientMetrics) cli, err := clientv3.New(clientv3.Config{ diff --git a/tests/integration/clientv3/examples/example_test.go b/tests/integration/clientv3/examples/example_test.go index b9b8be461e7c..166f4fbd2aa6 100644 --- a/tests/integration/clientv3/examples/example_test.go +++ b/tests/integration/clientv3/examples/example_test.go @@ -22,10 +22,10 @@ import ( clientv3 "go.etcd.io/etcd/client/v3" ) -func mockConfig_insecure() {} +func mockConfigInsecure() {} func ExampleConfig_insecure() { - forUnitTestsRunInMockedContext(mockConfig_insecure, func() { + forUnitTestsRunInMockedContext(mockConfigInsecure, func() { cli, err := clientv3.New(clientv3.Config{ Endpoints: exampleEndpoints(), DialTimeout: dialTimeout, @@ -46,10 +46,10 @@ func ExampleConfig_insecure() { // Output: } -func mockConfig_withTLS() {} +func mockConfigWithTLS() {} func ExampleConfig_withTLS() { - forUnitTestsRunInMockedContext(mockConfig_withTLS, func() { + forUnitTestsRunInMockedContext(mockConfigWithTLS, func() { tlsInfo := transport.TLSInfo{ CertFile: "/tmp/test-certs/test-name-1.pem", KeyFile: "/tmp/test-certs/test-name-1-key.pem", diff --git a/tests/integration/clientv3/examples/example_watch_test.go b/tests/integration/clientv3/examples/example_watch_test.go index ac44f8ca38dd..c78d1e7f84e4 100644 --- a/tests/integration/clientv3/examples/example_watch_test.go +++ b/tests/integration/clientv3/examples/example_watch_test.go @@ -23,12 +23,12 @@ import ( clientv3 "go.etcd.io/etcd/client/v3" ) -func mockWatcher_watch() { +func mockWatcherWatch() { fmt.Println(`PUT "foo" : "bar"`) } func ExampleWatcher_watch() { - forUnitTestsRunInMockedContext(mockWatcher_watch, func() { + forUnitTestsRunInMockedContext(mockWatcherWatch, func() { cli, err := clientv3.New(clientv3.Config{ Endpoints: exampleEndpoints(), DialTimeout: dialTimeout, @@ -48,12 +48,12 @@ func ExampleWatcher_watch() { // PUT "foo" : "bar" } -func mockWatcher_watchWithPrefix() { +func mockWatcherWatchWithPrefix() { fmt.Println(`PUT "foo1" : "bar"`) } func ExampleWatcher_watchWithPrefix() { - forUnitTestsRunInMockedContext(mockWatcher_watchWithPrefix, func() { + forUnitTestsRunInMockedContext(mockWatcherWatchWithPrefix, func() { cli, err := clientv3.New(clientv3.Config{ Endpoints: exampleEndpoints(), DialTimeout: dialTimeout, @@ -73,14 +73,14 @@ func ExampleWatcher_watchWithPrefix() { // PUT "foo1" : "bar" } -func mockWatcher_watchWithRange() { +func mockWatcherWatchWithRange() { fmt.Println(`PUT "foo1" : "bar1"`) fmt.Println(`PUT "foo2" : "bar2"`) fmt.Println(`PUT "foo3" : "bar3"`) } func ExampleWatcher_watchWithRange() { - forUnitTestsRunInMockedContext(mockWatcher_watchWithRange, func() { + forUnitTestsRunInMockedContext(mockWatcherWatchWithRange, func() { cli, err := clientv3.New(clientv3.Config{ Endpoints: exampleEndpoints(), DialTimeout: dialTimeout, @@ -121,12 +121,12 @@ func ExampleWatcher_watchWithRange() { // PUT "foo3" : "bar3" } -func mockWatcher_watchWithProgressNotify() { +func mockWatcherWatchWithProgressNotify() { fmt.Println(`wresp.IsProgressNotify: true`) } func ExampleWatcher_watchWithProgressNotify() { - forUnitTestsRunInMockedContext(mockWatcher_watchWithProgressNotify, func() { + forUnitTestsRunInMockedContext(mockWatcherWatchWithProgressNotify, func() { cli, err := clientv3.New(clientv3.Config{ Endpoints: exampleEndpoints(), DialTimeout: dialTimeout,