diff --git a/client/v3/clientv3util/example_key_test.go b/client/v3/clientv3util/example_key_test.go index 0d7cd3d19bd..fbbbe417260 100644 --- a/client/v3/clientv3util/example_key_test.go +++ b/client/v3/clientv3util/example_key_test.go @@ -18,7 +18,7 @@ import ( "context" "log" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/client/v3/clientv3util" ) diff --git a/client/v3/clientv3util/util.go b/client/v3/clientv3util/util.go index c8d5098a520..144777bd2c7 100644 --- a/client/v3/clientv3util/util.go +++ b/client/v3/clientv3util/util.go @@ -16,7 +16,7 @@ package clientv3util import ( - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" ) // KeyExists returns a comparison operation that evaluates to true iff the given diff --git a/client/v3/experimental/recipes/double_barrier.go b/client/v3/experimental/recipes/double_barrier.go index 0fce8d0e7c0..cc2416db23b 100644 --- a/client/v3/experimental/recipes/double_barrier.go +++ b/client/v3/experimental/recipes/double_barrier.go @@ -18,7 +18,7 @@ import ( "context" "go.etcd.io/etcd/api/v3/mvccpb" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/client/v3/concurrency" ) diff --git a/client/v3/experimental/recipes/watch.go b/client/v3/experimental/recipes/watch.go index fd4a8717a96..92e7bc648f4 100644 --- a/client/v3/experimental/recipes/watch.go +++ b/client/v3/experimental/recipes/watch.go @@ -18,7 +18,7 @@ import ( "context" "go.etcd.io/etcd/api/v3/mvccpb" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" ) // WaitEvents waits on a key until it observes the given events and returns the final one. diff --git a/client/v3/namespace/kv.go b/client/v3/namespace/kv.go index 9a428fa5850..aa338d5356d 100644 --- a/client/v3/namespace/kv.go +++ b/client/v3/namespace/kv.go @@ -19,7 +19,7 @@ import ( pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" ) type kvPrefix struct { diff --git a/client/v3/namespace/lease.go b/client/v3/namespace/lease.go index f274de5e998..b80b530467c 100644 --- a/client/v3/namespace/lease.go +++ b/client/v3/namespace/lease.go @@ -18,7 +18,7 @@ import ( "bytes" "context" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" ) type leasePrefix struct { diff --git a/client/v3/namespace/watch.go b/client/v3/namespace/watch.go index 12362856d09..edf1af87b58 100644 --- a/client/v3/namespace/watch.go +++ b/client/v3/namespace/watch.go @@ -18,7 +18,7 @@ import ( "context" "sync" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" ) type watcherPrefix struct { diff --git a/client/v3/ordering/kv.go b/client/v3/ordering/kv.go index 7914fc4b9c5..9075cbf9890 100644 --- a/client/v3/ordering/kv.go +++ b/client/v3/ordering/kv.go @@ -18,7 +18,7 @@ import ( "context" "sync" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" ) // kvOrdering ensures that serialized requests do not return diff --git a/client/v3/ordering/kv_test.go b/client/v3/ordering/kv_test.go index cc5c03bfa6b..2168c315752 100644 --- a/client/v3/ordering/kv_test.go +++ b/client/v3/ordering/kv_test.go @@ -21,7 +21,7 @@ import ( "testing" pb "go.etcd.io/etcd/api/v3/etcdserverpb" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" ) type mockKV struct { diff --git a/client/v3/ordering/util.go b/client/v3/ordering/util.go index f8f65c4c9b6..701cc709616 100644 --- a/client/v3/ordering/util.go +++ b/client/v3/ordering/util.go @@ -18,7 +18,7 @@ import ( "errors" "sync/atomic" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" ) type OrderViolationFunc func(op clientv3.Op, resp clientv3.OpResponse, prevRev int64) error diff --git a/client/v3/snapshot/v3_snapshot.go b/client/v3/snapshot/v3_snapshot.go index a034f954e50..cc27f643af3 100644 --- a/client/v3/snapshot/v3_snapshot.go +++ b/client/v3/snapshot/v3_snapshot.go @@ -24,7 +24,7 @@ import ( "github.com/dustin/go-humanize" "go.etcd.io/etcd/client/pkg/v3/fileutil" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" "go.uber.org/zap" ) diff --git a/client/v3/yaml/config.go b/client/v3/yaml/config.go index 3734696522a..99d07236433 100644 --- a/client/v3/yaml/config.go +++ b/client/v3/yaml/config.go @@ -23,7 +23,7 @@ import ( "sigs.k8s.io/yaml" "go.etcd.io/etcd/client/pkg/v3/tlsutil" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" ) type yamlConfig struct { diff --git a/etcdctl/ctlv3/command/compaction_command.go b/etcdctl/ctlv3/command/compaction_command.go index b0b7c3118f3..f4d27a35f78 100644 --- a/etcdctl/ctlv3/command/compaction_command.go +++ b/etcdctl/ctlv3/command/compaction_command.go @@ -19,7 +19,7 @@ import ( "strconv" "github.com/spf13/cobra" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/pkg/v3/cobrautl" ) diff --git a/etcdctl/ctlv3/command/elect_command.go b/etcdctl/ctlv3/command/elect_command.go index ae412f99e17..14feb13f5bf 100644 --- a/etcdctl/ctlv3/command/elect_command.go +++ b/etcdctl/ctlv3/command/elect_command.go @@ -21,7 +21,7 @@ import ( "os/signal" "syscall" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/client/v3/concurrency" "go.etcd.io/etcd/pkg/v3/cobrautl" diff --git a/etcdctl/ctlv3/command/lock_command.go b/etcdctl/ctlv3/command/lock_command.go index 3b383ec9a2e..0a3d866cdbc 100644 --- a/etcdctl/ctlv3/command/lock_command.go +++ b/etcdctl/ctlv3/command/lock_command.go @@ -23,7 +23,7 @@ import ( "os/signal" "syscall" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/client/v3/concurrency" "go.etcd.io/etcd/pkg/v3/cobrautl" diff --git a/etcdctl/ctlv3/command/move_leader_command.go b/etcdctl/ctlv3/command/move_leader_command.go index 7c69ffc6a43..7d78c738c05 100644 --- a/etcdctl/ctlv3/command/move_leader_command.go +++ b/etcdctl/ctlv3/command/move_leader_command.go @@ -19,7 +19,7 @@ import ( "strconv" "github.com/spf13/cobra" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/pkg/v3/cobrautl" ) diff --git a/etcdctl/ctlv3/command/printer_json.go b/etcdctl/ctlv3/command/printer_json.go index 4c75c85a8c7..dbe20ae22a7 100644 --- a/etcdctl/ctlv3/command/printer_json.go +++ b/etcdctl/ctlv3/command/printer_json.go @@ -21,7 +21,7 @@ import ( "os" "strconv" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" ) type jsonPrinter struct { diff --git a/etcdctl/ctlv3/command/role_command.go b/etcdctl/ctlv3/command/role_command.go index 885f11fdb34..c18f133bdf6 100644 --- a/etcdctl/ctlv3/command/role_command.go +++ b/etcdctl/ctlv3/command/role_command.go @@ -19,7 +19,7 @@ import ( "fmt" "github.com/spf13/cobra" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/pkg/v3/cobrautl" ) diff --git a/etcdutl/snapshot/v3_snapshot.go b/etcdutl/snapshot/v3_snapshot.go index a9344cbf269..25194f47081 100644 --- a/etcdutl/snapshot/v3_snapshot.go +++ b/etcdutl/snapshot/v3_snapshot.go @@ -30,7 +30,7 @@ import ( "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/client/pkg/v3/fileutil" "go.etcd.io/etcd/client/pkg/v3/types" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/client/v3/snapshot" "go.etcd.io/etcd/raft/v3" "go.etcd.io/etcd/raft/v3/raftpb" diff --git a/server/etcdserver/api/v3client/v3client.go b/server/etcdserver/api/v3client/v3client.go index 8342dc434c2..c44479ffad2 100644 --- a/server/etcdserver/api/v3client/v3client.go +++ b/server/etcdserver/api/v3client/v3client.go @@ -18,7 +18,7 @@ import ( "context" "time" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/server/v3/etcdserver" "go.etcd.io/etcd/server/v3/etcdserver/api/v3rpc" "go.etcd.io/etcd/server/v3/proxy/grpcproxy/adapter" diff --git a/server/etcdserver/api/v3discovery/discovery_test.go b/server/etcdserver/api/v3discovery/discovery_test.go index dc6f52bf513..12a35321eeb 100644 --- a/server/etcdserver/api/v3discovery/discovery_test.go +++ b/server/etcdserver/api/v3discovery/discovery_test.go @@ -9,7 +9,7 @@ import ( "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/client/pkg/v3/types" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" "go.uber.org/zap/zaptest" "github.com/jonboulle/clockwork" diff --git a/server/etcdserver/api/v3election/election.go b/server/etcdserver/api/v3election/election.go index 78b26ad7cc9..77a9c4bcb42 100644 --- a/server/etcdserver/api/v3election/election.go +++ b/server/etcdserver/api/v3election/election.go @@ -18,7 +18,7 @@ import ( "context" "errors" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/client/v3/concurrency" epb "go.etcd.io/etcd/server/v3/etcdserver/api/v3election/v3electionpb" ) diff --git a/server/etcdserver/api/v3lock/lock.go b/server/etcdserver/api/v3lock/lock.go index 8f9623361c7..c8ef56ebaeb 100644 --- a/server/etcdserver/api/v3lock/lock.go +++ b/server/etcdserver/api/v3lock/lock.go @@ -17,7 +17,7 @@ package v3lock import ( "context" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/client/v3/concurrency" "go.etcd.io/etcd/server/v3/etcdserver/api/v3lock/v3lockpb" ) diff --git a/server/proxy/grpcproxy/cluster.go b/server/proxy/grpcproxy/cluster.go index be4e1434016..6cf93e22b19 100644 --- a/server/proxy/grpcproxy/cluster.go +++ b/server/proxy/grpcproxy/cluster.go @@ -22,7 +22,7 @@ import ( "sync" pb "go.etcd.io/etcd/api/v3/etcdserverpb" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/client/v3/naming/endpoints" "golang.org/x/time/rate" diff --git a/server/proxy/grpcproxy/health.go b/server/proxy/grpcproxy/health.go index 882af4b46a8..2ed3ac23550 100644 --- a/server/proxy/grpcproxy/health.go +++ b/server/proxy/grpcproxy/health.go @@ -21,7 +21,7 @@ import ( "time" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/server/v3/etcdserver/api/etcdhttp" "go.uber.org/zap" ) diff --git a/server/proxy/grpcproxy/leader.go b/server/proxy/grpcproxy/leader.go index c078c89bb3b..158e3ee8814 100644 --- a/server/proxy/grpcproxy/leader.go +++ b/server/proxy/grpcproxy/leader.go @@ -19,7 +19,7 @@ import ( "math" "sync" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" "golang.org/x/time/rate" ) diff --git a/server/proxy/grpcproxy/lease.go b/server/proxy/grpcproxy/lease.go index 875256c4329..d206dcab49b 100644 --- a/server/proxy/grpcproxy/lease.go +++ b/server/proxy/grpcproxy/lease.go @@ -23,7 +23,7 @@ import ( pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/server/proxy/grpcproxy/register.go b/server/proxy/grpcproxy/register.go index 14ec034eadf..4fafb481022 100644 --- a/server/proxy/grpcproxy/register.go +++ b/server/proxy/grpcproxy/register.go @@ -18,7 +18,7 @@ import ( "encoding/json" "os" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/client/v3/concurrency" "go.etcd.io/etcd/client/v3/naming/endpoints" diff --git a/server/proxy/grpcproxy/watch.go b/server/proxy/grpcproxy/watch.go index 37e10721df5..478e0a6e8dc 100644 --- a/server/proxy/grpcproxy/watch.go +++ b/server/proxy/grpcproxy/watch.go @@ -20,7 +20,7 @@ import ( pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/server/v3/etcdserver/api/v3rpc" "go.uber.org/zap" "google.golang.org/grpc/codes" diff --git a/server/proxy/grpcproxy/watcher.go b/server/proxy/grpcproxy/watcher.go index a15edda8847..45d3a5352f5 100644 --- a/server/proxy/grpcproxy/watcher.go +++ b/server/proxy/grpcproxy/watcher.go @@ -19,7 +19,7 @@ import ( pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/api/v3/mvccpb" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/server/v3/storage/mvcc" ) diff --git a/server/storage/schema/version_test.go b/server/storage/schema/version_test.go index bb5d43031c9..67516287bb7 100644 --- a/server/storage/schema/version_test.go +++ b/server/storage/schema/version_test.go @@ -24,7 +24,7 @@ import ( "go.uber.org/zap/zaptest" "go.etcd.io/etcd/server/v3/storage/backend" - "go.etcd.io/etcd/server/v3/storage/backend/testing" + betesting "go.etcd.io/etcd/server/v3/storage/backend/testing" ) // TestVersion ensures that UnsafeSetStorageVersion/UnsafeReadStorageVersion work well together. diff --git a/tests/e2e/corrupt_test.go b/tests/e2e/corrupt_test.go index 91f19538ae8..a51d199b83b 100644 --- a/tests/e2e/corrupt_test.go +++ b/tests/e2e/corrupt_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" "go.etcd.io/etcd/api/v3/etcdserverpb" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/server/v3/storage/datadir" "go.etcd.io/etcd/server/v3/storage/mvcc/testutil" "go.etcd.io/etcd/tests/v3/framework/config" diff --git a/tests/framework/integration/cluster_direct.go b/tests/framework/integration/cluster_direct.go index dad4875251b..26994b46fd8 100644 --- a/tests/framework/integration/cluster_direct.go +++ b/tests/framework/integration/cluster_direct.go @@ -19,7 +19,7 @@ package integration import ( pb "go.etcd.io/etcd/api/v3/etcdserverpb" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/server/v3/etcdserver/api/v3election/v3electionpb" "go.etcd.io/etcd/server/v3/etcdserver/api/v3lock/v3lockpb" ) diff --git a/tests/framework/integration/cluster_proxy.go b/tests/framework/integration/cluster_proxy.go index a5266d09ed4..cec48cea501 100644 --- a/tests/framework/integration/cluster_proxy.go +++ b/tests/framework/integration/cluster_proxy.go @@ -21,7 +21,7 @@ import ( "context" "sync" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/client/v3/namespace" "go.etcd.io/etcd/server/v3/proxy/grpcproxy" "go.etcd.io/etcd/server/v3/proxy/grpcproxy/adapter" diff --git a/tests/functional/rpcpb/member.go b/tests/functional/rpcpb/member.go index 64f7e572f1f..1d9f2905786 100644 --- a/tests/functional/rpcpb/member.go +++ b/tests/functional/rpcpb/member.go @@ -25,7 +25,7 @@ import ( pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/client/pkg/v3/logutil" "go.etcd.io/etcd/client/pkg/v3/transport" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/etcdutl/v3/snapshot" "github.com/dustin/go-humanize" diff --git a/tests/functional/runner/global.go b/tests/functional/runner/global.go index 902baac663a..1e5023f397e 100644 --- a/tests/functional/runner/global.go +++ b/tests/functional/runner/global.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" "github.com/spf13/cobra" "golang.org/x/time/rate" diff --git a/tests/functional/runner/watch_command.go b/tests/functional/runner/watch_command.go index d3a7e11e9a5..96a52ddcb53 100644 --- a/tests/functional/runner/watch_command.go +++ b/tests/functional/runner/watch_command.go @@ -22,7 +22,7 @@ import ( "sync" "time" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/pkg/v3/stringutil" "github.com/spf13/cobra" diff --git a/tests/functional/tester/checker_lease_expire.go b/tests/functional/tester/checker_lease_expire.go index 0429b20f619..84b7eb744cc 100644 --- a/tests/functional/tester/checker_lease_expire.go +++ b/tests/functional/tester/checker_lease_expire.go @@ -20,7 +20,7 @@ import ( "time" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/tests/v3/functional/rpcpb" "go.uber.org/zap" diff --git a/tests/functional/tester/checker_short_ttl_lease_expire.go b/tests/functional/tester/checker_short_ttl_lease_expire.go index bf242f0241b..faa6137b29e 100644 --- a/tests/functional/tester/checker_short_ttl_lease_expire.go +++ b/tests/functional/tester/checker_short_ttl_lease_expire.go @@ -18,7 +18,7 @@ import ( "fmt" "time" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/tests/v3/functional/rpcpb" "go.uber.org/zap" diff --git a/tests/functional/tester/stresser_key.go b/tests/functional/tester/stresser_key.go index 8d505b84c42..a18afc1df62 100644 --- a/tests/functional/tester/stresser_key.go +++ b/tests/functional/tester/stresser_key.go @@ -24,7 +24,7 @@ import ( "time" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/raft/v3" "go.etcd.io/etcd/server/v3/etcdserver/errors" "go.etcd.io/etcd/tests/v3/functional/rpcpb" diff --git a/tests/integration/clientv3/concurrency/election_test.go b/tests/integration/clientv3/concurrency/election_test.go index d101f15d208..951c6a91fbf 100644 --- a/tests/integration/clientv3/concurrency/election_test.go +++ b/tests/integration/clientv3/concurrency/election_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/client/v3/concurrency" integration2 "go.etcd.io/etcd/tests/v3/framework/integration" ) diff --git a/tests/integration/clientv3/concurrency/example_election_test.go b/tests/integration/clientv3/concurrency/example_election_test.go index 7c9e968eb20..7ac8e436257 100644 --- a/tests/integration/clientv3/concurrency/example_election_test.go +++ b/tests/integration/clientv3/concurrency/example_election_test.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/client/v3/concurrency" ) diff --git a/tests/integration/clientv3/concurrency/example_mutex_test.go b/tests/integration/clientv3/concurrency/example_mutex_test.go index 671f464d70a..b33ba66b46c 100644 --- a/tests/integration/clientv3/concurrency/example_mutex_test.go +++ b/tests/integration/clientv3/concurrency/example_mutex_test.go @@ -19,7 +19,7 @@ import ( "fmt" "log" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/client/v3/concurrency" ) diff --git a/tests/integration/clientv3/concurrency/example_stm_test.go b/tests/integration/clientv3/concurrency/example_stm_test.go index 59dcf535754..1f39e5c278f 100644 --- a/tests/integration/clientv3/concurrency/example_stm_test.go +++ b/tests/integration/clientv3/concurrency/example_stm_test.go @@ -21,7 +21,7 @@ import ( "math/rand" "sync" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/client/v3/concurrency" ) diff --git a/tests/integration/clientv3/concurrency/mutex_test.go b/tests/integration/clientv3/concurrency/mutex_test.go index 0ddca0e022e..9313926fa8d 100644 --- a/tests/integration/clientv3/concurrency/mutex_test.go +++ b/tests/integration/clientv3/concurrency/mutex_test.go @@ -19,7 +19,7 @@ import ( "errors" "testing" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/client/v3/concurrency" integration2 "go.etcd.io/etcd/tests/v3/framework/integration" ) diff --git a/tests/integration/clientv3/connectivity/black_hole_test.go b/tests/integration/clientv3/connectivity/black_hole_test.go index befe703869c..b0771d764dc 100644 --- a/tests/integration/clientv3/connectivity/black_hole_test.go +++ b/tests/integration/clientv3/connectivity/black_hole_test.go @@ -23,9 +23,9 @@ import ( "time" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" integration2 "go.etcd.io/etcd/tests/v3/framework/integration" - "go.etcd.io/etcd/tests/v3/integration/clientv3" + clientv3test "go.etcd.io/etcd/tests/v3/integration/clientv3" "google.golang.org/grpc" ) diff --git a/tests/integration/clientv3/connectivity/dial_test.go b/tests/integration/clientv3/connectivity/dial_test.go index d6284d4099a..4f9f7784f45 100644 --- a/tests/integration/clientv3/connectivity/dial_test.go +++ b/tests/integration/clientv3/connectivity/dial_test.go @@ -23,7 +23,7 @@ import ( pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/client/pkg/v3/transport" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" integration2 "go.etcd.io/etcd/tests/v3/framework/integration" "go.etcd.io/etcd/tests/v3/framework/testutils" clientv3test "go.etcd.io/etcd/tests/v3/integration/clientv3" diff --git a/tests/integration/clientv3/connectivity/network_partition_test.go b/tests/integration/clientv3/connectivity/network_partition_test.go index cf4de8c0f98..83acf747234 100644 --- a/tests/integration/clientv3/connectivity/network_partition_test.go +++ b/tests/integration/clientv3/connectivity/network_partition_test.go @@ -25,9 +25,9 @@ import ( pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" integration2 "go.etcd.io/etcd/tests/v3/framework/integration" - "go.etcd.io/etcd/tests/v3/integration/clientv3" + clientv3test "go.etcd.io/etcd/tests/v3/integration/clientv3" "google.golang.org/grpc" ) diff --git a/tests/integration/clientv3/connectivity/server_shutdown_test.go b/tests/integration/clientv3/connectivity/server_shutdown_test.go index 4cc4fb9c058..0da7b9d1682 100644 --- a/tests/integration/clientv3/connectivity/server_shutdown_test.go +++ b/tests/integration/clientv3/connectivity/server_shutdown_test.go @@ -22,9 +22,9 @@ import ( "time" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" integration2 "go.etcd.io/etcd/tests/v3/framework/integration" - "go.etcd.io/etcd/tests/v3/integration/clientv3" + clientv3test "go.etcd.io/etcd/tests/v3/integration/clientv3" ) // TestBalancerUnderServerShutdownWatch expects that watch client diff --git a/tests/integration/clientv3/examples/example_auth_test.go b/tests/integration/clientv3/examples/example_auth_test.go index 29ed4b61c8b..b062d799cc0 100644 --- a/tests/integration/clientv3/examples/example_auth_test.go +++ b/tests/integration/clientv3/examples/example_auth_test.go @@ -19,7 +19,7 @@ import ( "fmt" "log" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" ) func mockAuth() { diff --git a/tests/integration/clientv3/examples/example_cluster_test.go b/tests/integration/clientv3/examples/example_cluster_test.go index 933e7fc5a45..1d2da78c777 100644 --- a/tests/integration/clientv3/examples/example_cluster_test.go +++ b/tests/integration/clientv3/examples/example_cluster_test.go @@ -19,7 +19,7 @@ import ( "fmt" "log" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" ) func mockCluster_memberList() { diff --git a/tests/integration/clientv3/examples/example_kv_test.go b/tests/integration/clientv3/examples/example_kv_test.go index 6fa6b23ddbe..6bfb2428055 100644 --- a/tests/integration/clientv3/examples/example_kv_test.go +++ b/tests/integration/clientv3/examples/example_kv_test.go @@ -20,7 +20,7 @@ import ( "log" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" ) func mockKV_put() {} diff --git a/tests/integration/clientv3/examples/example_lease_test.go b/tests/integration/clientv3/examples/example_lease_test.go index 7fe7949b802..beca3692bfa 100644 --- a/tests/integration/clientv3/examples/example_lease_test.go +++ b/tests/integration/clientv3/examples/example_lease_test.go @@ -19,7 +19,7 @@ import ( "fmt" "log" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" ) func mockLease_grant() { diff --git a/tests/integration/clientv3/examples/example_maintenance_test.go b/tests/integration/clientv3/examples/example_maintenance_test.go index 0426ea553fd..ff545e8de7d 100644 --- a/tests/integration/clientv3/examples/example_maintenance_test.go +++ b/tests/integration/clientv3/examples/example_maintenance_test.go @@ -18,7 +18,7 @@ import ( "context" "log" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" ) func mockMaintenance_status() {} diff --git a/tests/integration/clientv3/examples/example_metrics_test.go b/tests/integration/clientv3/examples/example_metrics_test.go index f701348ed20..d21c6d393e2 100644 --- a/tests/integration/clientv3/examples/example_metrics_test.go +++ b/tests/integration/clientv3/examples/example_metrics_test.go @@ -23,10 +23,9 @@ import ( "net/http" "strings" - "go.etcd.io/etcd/client/v3" - grpcprom "github.com/grpc-ecosystem/go-grpc-prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" + clientv3 "go.etcd.io/etcd/client/v3" "google.golang.org/grpc" ) diff --git a/tests/integration/clientv3/examples/example_test.go b/tests/integration/clientv3/examples/example_test.go index d01c3676f5b..b9b8be461e7 100644 --- a/tests/integration/clientv3/examples/example_test.go +++ b/tests/integration/clientv3/examples/example_test.go @@ -19,7 +19,7 @@ import ( "log" "go.etcd.io/etcd/client/pkg/v3/transport" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" ) func mockConfig_insecure() {} diff --git a/tests/integration/clientv3/examples/example_watch_test.go b/tests/integration/clientv3/examples/example_watch_test.go index b5c9e808a80..ac44f8ca38d 100644 --- a/tests/integration/clientv3/examples/example_watch_test.go +++ b/tests/integration/clientv3/examples/example_watch_test.go @@ -20,7 +20,7 @@ import ( "log" "time" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" ) func mockWatcher_watch() { diff --git a/tests/integration/clientv3/experimental/recipes/v3_barrier_test.go b/tests/integration/clientv3/experimental/recipes/v3_barrier_test.go index e20885614cc..36ed38e55cc 100644 --- a/tests/integration/clientv3/experimental/recipes/v3_barrier_test.go +++ b/tests/integration/clientv3/experimental/recipes/v3_barrier_test.go @@ -18,7 +18,7 @@ import ( "testing" "time" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" recipe "go.etcd.io/etcd/client/v3/experimental/recipes" integration2 "go.etcd.io/etcd/tests/v3/framework/integration" ) diff --git a/tests/integration/clientv3/namespace_test.go b/tests/integration/clientv3/namespace_test.go index c214a17dcb5..2aad010f987 100644 --- a/tests/integration/clientv3/namespace_test.go +++ b/tests/integration/clientv3/namespace_test.go @@ -20,7 +20,7 @@ import ( "testing" "go.etcd.io/etcd/api/v3/mvccpb" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/client/v3/namespace" integration2 "go.etcd.io/etcd/tests/v3/framework/integration" ) diff --git a/tests/integration/clientv3/ordering_kv_test.go b/tests/integration/clientv3/ordering_kv_test.go index 93b409303e3..935bbaacf0b 100644 --- a/tests/integration/clientv3/ordering_kv_test.go +++ b/tests/integration/clientv3/ordering_kv_test.go @@ -21,7 +21,7 @@ import ( "time" "github.com/stretchr/testify/assert" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/client/v3/ordering" integration2 "go.etcd.io/etcd/tests/v3/framework/integration" ) diff --git a/tests/integration/clientv3/ordering_util_test.go b/tests/integration/clientv3/ordering_util_test.go index 9e2f5ae6d02..56e34762089 100644 --- a/tests/integration/clientv3/ordering_util_test.go +++ b/tests/integration/clientv3/ordering_util_test.go @@ -19,7 +19,7 @@ import ( "testing" "time" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/client/v3/ordering" integration2 "go.etcd.io/etcd/tests/v3/framework/integration" ) diff --git a/tests/integration/clientv3/txn_test.go b/tests/integration/clientv3/txn_test.go index b2fa2d99767..84a56146d99 100644 --- a/tests/integration/clientv3/txn_test.go +++ b/tests/integration/clientv3/txn_test.go @@ -21,7 +21,7 @@ import ( "time" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/server/v3/embed" integration2 "go.etcd.io/etcd/tests/v3/framework/integration" ) diff --git a/tests/integration/clientv3/user_test.go b/tests/integration/clientv3/user_test.go index 1cd700fdef0..d3cb3c6272b 100644 --- a/tests/integration/clientv3/user_test.go +++ b/tests/integration/clientv3/user_test.go @@ -20,7 +20,7 @@ import ( "time" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" integration2 "go.etcd.io/etcd/tests/v3/framework/integration" "google.golang.org/grpc" ) diff --git a/tests/integration/clientv3/watch_fragment_test.go b/tests/integration/clientv3/watch_fragment_test.go index 51418d82ffb..3c9f63627e0 100644 --- a/tests/integration/clientv3/watch_fragment_test.go +++ b/tests/integration/clientv3/watch_fragment_test.go @@ -25,7 +25,7 @@ import ( "time" "go.etcd.io/etcd/client/pkg/v3/testutil" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" integration2 "go.etcd.io/etcd/tests/v3/framework/integration" ) diff --git a/tests/integration/proxy/grpcproxy/cluster_test.go b/tests/integration/proxy/grpcproxy/cluster_test.go index e78d2db662e..42b7e06639f 100644 --- a/tests/integration/proxy/grpcproxy/cluster_test.go +++ b/tests/integration/proxy/grpcproxy/cluster_test.go @@ -21,7 +21,7 @@ import ( "time" pb "go.etcd.io/etcd/api/v3/etcdserverpb" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/server/v3/proxy/grpcproxy" integration2 "go.etcd.io/etcd/tests/v3/framework/integration" "go.uber.org/zap/zaptest" diff --git a/tests/integration/proxy/grpcproxy/kv_test.go b/tests/integration/proxy/grpcproxy/kv_test.go index a1aacd8cbb7..619bba7f07d 100644 --- a/tests/integration/proxy/grpcproxy/kv_test.go +++ b/tests/integration/proxy/grpcproxy/kv_test.go @@ -21,7 +21,7 @@ import ( "time" pb "go.etcd.io/etcd/api/v3/etcdserverpb" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/server/v3/proxy/grpcproxy" integration2 "go.etcd.io/etcd/tests/v3/framework/integration" "google.golang.org/grpc" diff --git a/tests/integration/snapshot/member_test.go b/tests/integration/snapshot/member_test.go index a55c9396072..6c66ff2df80 100644 --- a/tests/integration/snapshot/member_test.go +++ b/tests/integration/snapshot/member_test.go @@ -21,7 +21,7 @@ import ( "time" "go.etcd.io/etcd/client/pkg/v3/testutil" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/server/v3/embed" "go.etcd.io/etcd/server/v3/etcdserver" integration2 "go.etcd.io/etcd/tests/v3/framework/integration" diff --git a/tests/integration/snapshot/v3_snapshot_test.go b/tests/integration/snapshot/v3_snapshot_test.go index 2198b8f57c3..4c1d258c6eb 100644 --- a/tests/integration/snapshot/v3_snapshot_test.go +++ b/tests/integration/snapshot/v3_snapshot_test.go @@ -25,7 +25,7 @@ import ( "time" "go.etcd.io/etcd/client/pkg/v3/testutil" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/etcdutl/v3/snapshot" "go.etcd.io/etcd/server/v3/embed" integration2 "go.etcd.io/etcd/tests/v3/framework/integration" diff --git a/tests/integration/v3_auth_test.go b/tests/integration/v3_auth_test.go index d1c96dcabe5..b0d3fb09d4e 100644 --- a/tests/integration/v3_auth_test.go +++ b/tests/integration/v3_auth_test.go @@ -25,7 +25,7 @@ import ( pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/client/pkg/v3/testutil" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/tests/v3/framework/integration" ) diff --git a/tests/integration/v3_kv_test.go b/tests/integration/v3_kv_test.go index d47cc75a20d..2cf8acf7ab9 100644 --- a/tests/integration/v3_kv_test.go +++ b/tests/integration/v3_kv_test.go @@ -18,7 +18,7 @@ import ( "context" "testing" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/client/v3/namespace" "go.etcd.io/etcd/tests/v3/framework/integration" ) diff --git a/tests/integration/v3_tls_test.go b/tests/integration/v3_tls_test.go index 793d3d5a046..a96e888b297 100644 --- a/tests/integration/v3_tls_test.go +++ b/tests/integration/v3_tls_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/tests/v3/framework/integration" "google.golang.org/grpc" )