From 8a7f15511cd3255726b854951330584f5512298f Mon Sep 17 00:00:00 2001 From: Piotr Tabor Date: Thu, 15 Oct 2020 22:27:53 +0200 Subject: [PATCH 1/3] clientv3: Move to client/v3 (just file move) Mechanical: % git mv clientv3 client/v3 % git mv client/mock client/v3/ --- {clientv3 => client/v3}/README.md | 0 {clientv3 => client/v3}/auth.go | 0 {clientv3 => client/v3}/balancer/balancer.go | 0 {clientv3 => client/v3}/balancer/balancer_test.go | 0 {clientv3 => client/v3}/balancer/connectivity/connectivity.go | 0 {clientv3 => client/v3}/balancer/picker/doc.go | 0 {clientv3 => client/v3}/balancer/picker/err.go | 0 {clientv3 => client/v3}/balancer/picker/picker.go | 0 {clientv3 => client/v3}/balancer/picker/roundrobin_balanced.go | 0 {clientv3 => client/v3}/balancer/resolver/endpoint/endpoint.go | 0 {clientv3 => client/v3}/balancer/utils.go | 0 {clientv3 => client/v3}/balancer/utils_test.go | 0 {clientv3 => client/v3}/client.go | 0 {clientv3 => client/v3}/client_test.go | 0 {clientv3 => client/v3}/clientv3util/example_key_test.go | 0 {clientv3 => client/v3}/clientv3util/util.go | 0 {clientv3 => client/v3}/cluster.go | 0 {clientv3 => client/v3}/compact_op.go | 0 {clientv3 => client/v3}/compact_op_test.go | 0 {clientv3 => client/v3}/compare.go | 0 {clientv3 => client/v3}/concurrency/doc.go | 0 {clientv3 => client/v3}/concurrency/election.go | 0 client/v3/concurrency/example_election_test.go | 1 + client/v3/concurrency/example_mutex_test.go | 1 + client/v3/concurrency/example_stm_test.go | 1 + {clientv3 => client/v3}/concurrency/key.go | 0 {clientv3 => client/v3}/concurrency/main_test.go | 0 {clientv3 => client/v3}/concurrency/mutex.go | 0 {clientv3 => client/v3}/concurrency/session.go | 0 {clientv3 => client/v3}/concurrency/stm.go | 0 {clientv3 => client/v3}/config.go | 0 {clientv3 => client/v3}/credentials/credentials.go | 0 {clientv3 => client/v3}/ctx.go | 0 {clientv3 => client/v3}/ctx_test.go | 0 {clientv3 => client/v3}/doc.go | 0 client/v3/example_auth_test.go | 1 + client/v3/example_cluster_test.go | 1 + client/v3/example_kv_test.go | 1 + client/v3/example_lease_test.go | 1 + client/v3/example_maintenance_test.go | 1 + client/v3/example_metrics_test.go | 1 + client/v3/example_test.go | 1 + client/v3/example_watch_test.go | 1 + {clientv3 => client/v3}/kv.go | 0 {clientv3 => client/v3}/lease.go | 0 {clientv3 => client/v3}/leasing/cache.go | 0 {clientv3 => client/v3}/leasing/doc.go | 0 {clientv3 => client/v3}/leasing/kv.go | 0 {clientv3 => client/v3}/leasing/txn.go | 0 {clientv3 => client/v3}/leasing/util.go | 0 {clientv3 => client/v3}/logger.go | 0 {clientv3 => client/v3}/main_test.go | 0 {clientv3 => client/v3}/maintenance.go | 0 {clientv3 => client/v3}/mirror/syncer.go | 0 client/{ => v3}/mock/mockserver/doc.go | 0 client/{ => v3}/mock/mockserver/mockserver.go | 0 {clientv3 => client/v3}/namespace/doc.go | 0 {clientv3 => client/v3}/namespace/kv.go | 0 {clientv3 => client/v3}/namespace/lease.go | 0 {clientv3 => client/v3}/namespace/util.go | 0 {clientv3 => client/v3}/namespace/util_test.go | 0 {clientv3 => client/v3}/namespace/watch.go | 0 {clientv3 => client/v3}/naming/doc.go | 0 {clientv3 => client/v3}/naming/grpc.go | 0 {clientv3 => client/v3}/op.go | 0 {clientv3 => client/v3}/op_test.go | 0 {clientv3 => client/v3}/options.go | 0 {clientv3 => client/v3}/ordering/doc.go | 0 {clientv3 => client/v3}/ordering/kv.go | 0 {clientv3 => client/v3}/ordering/kv_test.go | 0 {clientv3 => client/v3}/ordering/logger_test.go | 0 {clientv3 => client/v3}/ordering/util.go | 0 {clientv3 => client/v3}/retry.go | 0 {clientv3 => client/v3}/retry_interceptor.go | 0 {clientv3 => client/v3}/snapshot/doc.go | 0 {clientv3 => client/v3}/snapshot/v3_snapshot.go | 0 {clientv3 => client/v3}/sort.go | 0 {clientv3 => client/v3}/txn.go | 0 {clientv3 => client/v3}/txn_test.go | 0 {clientv3 => client/v3}/utils.go | 0 {clientv3 => client/v3}/watch.go | 0 {clientv3 => client/v3}/watch_test.go | 0 {clientv3 => client/v3}/yaml/config.go | 0 {clientv3 => client/v3}/yaml/config_test.go | 0 clientv3/concurrency/example_election_test.go | 1 - clientv3/concurrency/example_mutex_test.go | 1 - clientv3/concurrency/example_stm_test.go | 1 - clientv3/example_auth_test.go | 1 - clientv3/example_cluster_test.go | 1 - clientv3/example_kv_test.go | 1 - clientv3/example_lease_test.go | 1 - clientv3/example_maintenance_test.go | 1 - clientv3/example_metrics_test.go | 1 - clientv3/example_test.go | 1 - clientv3/example_watch_test.go | 1 - 95 files changed, 11 insertions(+), 11 deletions(-) rename {clientv3 => client/v3}/README.md (100%) rename {clientv3 => client/v3}/auth.go (100%) rename {clientv3 => client/v3}/balancer/balancer.go (100%) rename {clientv3 => client/v3}/balancer/balancer_test.go (100%) rename {clientv3 => client/v3}/balancer/connectivity/connectivity.go (100%) rename {clientv3 => client/v3}/balancer/picker/doc.go (100%) rename {clientv3 => client/v3}/balancer/picker/err.go (100%) rename {clientv3 => client/v3}/balancer/picker/picker.go (100%) rename {clientv3 => client/v3}/balancer/picker/roundrobin_balanced.go (100%) rename {clientv3 => client/v3}/balancer/resolver/endpoint/endpoint.go (100%) rename {clientv3 => client/v3}/balancer/utils.go (100%) rename {clientv3 => client/v3}/balancer/utils_test.go (100%) rename {clientv3 => client/v3}/client.go (100%) rename {clientv3 => client/v3}/client_test.go (100%) rename {clientv3 => client/v3}/clientv3util/example_key_test.go (100%) rename {clientv3 => client/v3}/clientv3util/util.go (100%) rename {clientv3 => client/v3}/cluster.go (100%) rename {clientv3 => client/v3}/compact_op.go (100%) rename {clientv3 => client/v3}/compact_op_test.go (100%) rename {clientv3 => client/v3}/compare.go (100%) rename {clientv3 => client/v3}/concurrency/doc.go (100%) rename {clientv3 => client/v3}/concurrency/election.go (100%) create mode 120000 client/v3/concurrency/example_election_test.go create mode 120000 client/v3/concurrency/example_mutex_test.go create mode 120000 client/v3/concurrency/example_stm_test.go rename {clientv3 => client/v3}/concurrency/key.go (100%) rename {clientv3 => client/v3}/concurrency/main_test.go (100%) rename {clientv3 => client/v3}/concurrency/mutex.go (100%) rename {clientv3 => client/v3}/concurrency/session.go (100%) rename {clientv3 => client/v3}/concurrency/stm.go (100%) rename {clientv3 => client/v3}/config.go (100%) rename {clientv3 => client/v3}/credentials/credentials.go (100%) rename {clientv3 => client/v3}/ctx.go (100%) rename {clientv3 => client/v3}/ctx_test.go (100%) rename {clientv3 => client/v3}/doc.go (100%) create mode 120000 client/v3/example_auth_test.go create mode 120000 client/v3/example_cluster_test.go create mode 120000 client/v3/example_kv_test.go create mode 120000 client/v3/example_lease_test.go create mode 120000 client/v3/example_maintenance_test.go create mode 120000 client/v3/example_metrics_test.go create mode 120000 client/v3/example_test.go create mode 120000 client/v3/example_watch_test.go rename {clientv3 => client/v3}/kv.go (100%) rename {clientv3 => client/v3}/lease.go (100%) rename {clientv3 => client/v3}/leasing/cache.go (100%) rename {clientv3 => client/v3}/leasing/doc.go (100%) rename {clientv3 => client/v3}/leasing/kv.go (100%) rename {clientv3 => client/v3}/leasing/txn.go (100%) rename {clientv3 => client/v3}/leasing/util.go (100%) rename {clientv3 => client/v3}/logger.go (100%) rename {clientv3 => client/v3}/main_test.go (100%) rename {clientv3 => client/v3}/maintenance.go (100%) rename {clientv3 => client/v3}/mirror/syncer.go (100%) rename client/{ => v3}/mock/mockserver/doc.go (100%) rename client/{ => v3}/mock/mockserver/mockserver.go (100%) rename {clientv3 => client/v3}/namespace/doc.go (100%) rename {clientv3 => client/v3}/namespace/kv.go (100%) rename {clientv3 => client/v3}/namespace/lease.go (100%) rename {clientv3 => client/v3}/namespace/util.go (100%) rename {clientv3 => client/v3}/namespace/util_test.go (100%) rename {clientv3 => client/v3}/namespace/watch.go (100%) rename {clientv3 => client/v3}/naming/doc.go (100%) rename {clientv3 => client/v3}/naming/grpc.go (100%) rename {clientv3 => client/v3}/op.go (100%) rename {clientv3 => client/v3}/op_test.go (100%) rename {clientv3 => client/v3}/options.go (100%) rename {clientv3 => client/v3}/ordering/doc.go (100%) rename {clientv3 => client/v3}/ordering/kv.go (100%) rename {clientv3 => client/v3}/ordering/kv_test.go (100%) rename {clientv3 => client/v3}/ordering/logger_test.go (100%) rename {clientv3 => client/v3}/ordering/util.go (100%) rename {clientv3 => client/v3}/retry.go (100%) rename {clientv3 => client/v3}/retry_interceptor.go (100%) rename {clientv3 => client/v3}/snapshot/doc.go (100%) rename {clientv3 => client/v3}/snapshot/v3_snapshot.go (100%) rename {clientv3 => client/v3}/sort.go (100%) rename {clientv3 => client/v3}/txn.go (100%) rename {clientv3 => client/v3}/txn_test.go (100%) rename {clientv3 => client/v3}/utils.go (100%) rename {clientv3 => client/v3}/watch.go (100%) rename {clientv3 => client/v3}/watch_test.go (100%) rename {clientv3 => client/v3}/yaml/config.go (100%) rename {clientv3 => client/v3}/yaml/config_test.go (100%) delete mode 120000 clientv3/concurrency/example_election_test.go delete mode 120000 clientv3/concurrency/example_mutex_test.go delete mode 120000 clientv3/concurrency/example_stm_test.go delete mode 120000 clientv3/example_auth_test.go delete mode 120000 clientv3/example_cluster_test.go delete mode 120000 clientv3/example_kv_test.go delete mode 120000 clientv3/example_lease_test.go delete mode 120000 clientv3/example_maintenance_test.go delete mode 120000 clientv3/example_metrics_test.go delete mode 120000 clientv3/example_test.go delete mode 120000 clientv3/example_watch_test.go diff --git a/clientv3/README.md b/client/v3/README.md similarity index 100% rename from clientv3/README.md rename to client/v3/README.md diff --git a/clientv3/auth.go b/client/v3/auth.go similarity index 100% rename from clientv3/auth.go rename to client/v3/auth.go diff --git a/clientv3/balancer/balancer.go b/client/v3/balancer/balancer.go similarity index 100% rename from clientv3/balancer/balancer.go rename to client/v3/balancer/balancer.go diff --git a/clientv3/balancer/balancer_test.go b/client/v3/balancer/balancer_test.go similarity index 100% rename from clientv3/balancer/balancer_test.go rename to client/v3/balancer/balancer_test.go diff --git a/clientv3/balancer/connectivity/connectivity.go b/client/v3/balancer/connectivity/connectivity.go similarity index 100% rename from clientv3/balancer/connectivity/connectivity.go rename to client/v3/balancer/connectivity/connectivity.go diff --git a/clientv3/balancer/picker/doc.go b/client/v3/balancer/picker/doc.go similarity index 100% rename from clientv3/balancer/picker/doc.go rename to client/v3/balancer/picker/doc.go diff --git a/clientv3/balancer/picker/err.go b/client/v3/balancer/picker/err.go similarity index 100% rename from clientv3/balancer/picker/err.go rename to client/v3/balancer/picker/err.go diff --git a/clientv3/balancer/picker/picker.go b/client/v3/balancer/picker/picker.go similarity index 100% rename from clientv3/balancer/picker/picker.go rename to client/v3/balancer/picker/picker.go diff --git a/clientv3/balancer/picker/roundrobin_balanced.go b/client/v3/balancer/picker/roundrobin_balanced.go similarity index 100% rename from clientv3/balancer/picker/roundrobin_balanced.go rename to client/v3/balancer/picker/roundrobin_balanced.go diff --git a/clientv3/balancer/resolver/endpoint/endpoint.go b/client/v3/balancer/resolver/endpoint/endpoint.go similarity index 100% rename from clientv3/balancer/resolver/endpoint/endpoint.go rename to client/v3/balancer/resolver/endpoint/endpoint.go diff --git a/clientv3/balancer/utils.go b/client/v3/balancer/utils.go similarity index 100% rename from clientv3/balancer/utils.go rename to client/v3/balancer/utils.go diff --git a/clientv3/balancer/utils_test.go b/client/v3/balancer/utils_test.go similarity index 100% rename from clientv3/balancer/utils_test.go rename to client/v3/balancer/utils_test.go diff --git a/clientv3/client.go b/client/v3/client.go similarity index 100% rename from clientv3/client.go rename to client/v3/client.go diff --git a/clientv3/client_test.go b/client/v3/client_test.go similarity index 100% rename from clientv3/client_test.go rename to client/v3/client_test.go diff --git a/clientv3/clientv3util/example_key_test.go b/client/v3/clientv3util/example_key_test.go similarity index 100% rename from clientv3/clientv3util/example_key_test.go rename to client/v3/clientv3util/example_key_test.go diff --git a/clientv3/clientv3util/util.go b/client/v3/clientv3util/util.go similarity index 100% rename from clientv3/clientv3util/util.go rename to client/v3/clientv3util/util.go diff --git a/clientv3/cluster.go b/client/v3/cluster.go similarity index 100% rename from clientv3/cluster.go rename to client/v3/cluster.go diff --git a/clientv3/compact_op.go b/client/v3/compact_op.go similarity index 100% rename from clientv3/compact_op.go rename to client/v3/compact_op.go diff --git a/clientv3/compact_op_test.go b/client/v3/compact_op_test.go similarity index 100% rename from clientv3/compact_op_test.go rename to client/v3/compact_op_test.go diff --git a/clientv3/compare.go b/client/v3/compare.go similarity index 100% rename from clientv3/compare.go rename to client/v3/compare.go diff --git a/clientv3/concurrency/doc.go b/client/v3/concurrency/doc.go similarity index 100% rename from clientv3/concurrency/doc.go rename to client/v3/concurrency/doc.go diff --git a/clientv3/concurrency/election.go b/client/v3/concurrency/election.go similarity index 100% rename from clientv3/concurrency/election.go rename to client/v3/concurrency/election.go diff --git a/client/v3/concurrency/example_election_test.go b/client/v3/concurrency/example_election_test.go new file mode 120000 index 000000000..a76f0a7f4 --- /dev/null +++ b/client/v3/concurrency/example_election_test.go @@ -0,0 +1 @@ +../../../tests/integration/clientv3/concurrency/example_election_test.go \ No newline at end of file diff --git a/client/v3/concurrency/example_mutex_test.go b/client/v3/concurrency/example_mutex_test.go new file mode 120000 index 000000000..053eb74ad --- /dev/null +++ b/client/v3/concurrency/example_mutex_test.go @@ -0,0 +1 @@ +../../../tests/integration/clientv3/concurrency/example_mutex_test.go \ No newline at end of file diff --git a/client/v3/concurrency/example_stm_test.go b/client/v3/concurrency/example_stm_test.go new file mode 120000 index 000000000..d63639ecc --- /dev/null +++ b/client/v3/concurrency/example_stm_test.go @@ -0,0 +1 @@ +../../../tests/integration/clientv3/concurrency/example_stm_test.go \ No newline at end of file diff --git a/clientv3/concurrency/key.go b/client/v3/concurrency/key.go similarity index 100% rename from clientv3/concurrency/key.go rename to client/v3/concurrency/key.go diff --git a/clientv3/concurrency/main_test.go b/client/v3/concurrency/main_test.go similarity index 100% rename from clientv3/concurrency/main_test.go rename to client/v3/concurrency/main_test.go diff --git a/clientv3/concurrency/mutex.go b/client/v3/concurrency/mutex.go similarity index 100% rename from clientv3/concurrency/mutex.go rename to client/v3/concurrency/mutex.go diff --git a/clientv3/concurrency/session.go b/client/v3/concurrency/session.go similarity index 100% rename from clientv3/concurrency/session.go rename to client/v3/concurrency/session.go diff --git a/clientv3/concurrency/stm.go b/client/v3/concurrency/stm.go similarity index 100% rename from clientv3/concurrency/stm.go rename to client/v3/concurrency/stm.go diff --git a/clientv3/config.go b/client/v3/config.go similarity index 100% rename from clientv3/config.go rename to client/v3/config.go diff --git a/clientv3/credentials/credentials.go b/client/v3/credentials/credentials.go similarity index 100% rename from clientv3/credentials/credentials.go rename to client/v3/credentials/credentials.go diff --git a/clientv3/ctx.go b/client/v3/ctx.go similarity index 100% rename from clientv3/ctx.go rename to client/v3/ctx.go diff --git a/clientv3/ctx_test.go b/client/v3/ctx_test.go similarity index 100% rename from clientv3/ctx_test.go rename to client/v3/ctx_test.go diff --git a/clientv3/doc.go b/client/v3/doc.go similarity index 100% rename from clientv3/doc.go rename to client/v3/doc.go diff --git a/client/v3/example_auth_test.go b/client/v3/example_auth_test.go new file mode 120000 index 000000000..7a25cc2a0 --- /dev/null +++ b/client/v3/example_auth_test.go @@ -0,0 +1 @@ +../../tests/integration/clientv3/examples/example_auth_test.go \ No newline at end of file diff --git a/client/v3/example_cluster_test.go b/client/v3/example_cluster_test.go new file mode 120000 index 000000000..302451f81 --- /dev/null +++ b/client/v3/example_cluster_test.go @@ -0,0 +1 @@ +../../tests/integration/clientv3/examples/example_cluster_test.go \ No newline at end of file diff --git a/client/v3/example_kv_test.go b/client/v3/example_kv_test.go new file mode 120000 index 000000000..0b3bd875e --- /dev/null +++ b/client/v3/example_kv_test.go @@ -0,0 +1 @@ +../../tests/integration/clientv3/examples/example_kv_test.go \ No newline at end of file diff --git a/client/v3/example_lease_test.go b/client/v3/example_lease_test.go new file mode 120000 index 000000000..d1cf744bb --- /dev/null +++ b/client/v3/example_lease_test.go @@ -0,0 +1 @@ +../../tests/integration/clientv3/examples/example_lease_test.go \ No newline at end of file diff --git a/client/v3/example_maintenance_test.go b/client/v3/example_maintenance_test.go new file mode 120000 index 000000000..d8bcb642a --- /dev/null +++ b/client/v3/example_maintenance_test.go @@ -0,0 +1 @@ +../../tests/integration/clientv3/examples/example_maintenance_test.go \ No newline at end of file diff --git a/client/v3/example_metrics_test.go b/client/v3/example_metrics_test.go new file mode 120000 index 000000000..a363c3c4f --- /dev/null +++ b/client/v3/example_metrics_test.go @@ -0,0 +1 @@ +../../tests/integration/clientv3/examples/example_metrics_test.go \ No newline at end of file diff --git a/client/v3/example_test.go b/client/v3/example_test.go new file mode 120000 index 000000000..ddacab0d6 --- /dev/null +++ b/client/v3/example_test.go @@ -0,0 +1 @@ +../../tests/integration/clientv3/examples/example_test.go \ No newline at end of file diff --git a/client/v3/example_watch_test.go b/client/v3/example_watch_test.go new file mode 120000 index 000000000..fb748bed5 --- /dev/null +++ b/client/v3/example_watch_test.go @@ -0,0 +1 @@ +../../tests/integration/clientv3/examples/example_watch_test.go \ No newline at end of file diff --git a/clientv3/kv.go b/client/v3/kv.go similarity index 100% rename from clientv3/kv.go rename to client/v3/kv.go diff --git a/clientv3/lease.go b/client/v3/lease.go similarity index 100% rename from clientv3/lease.go rename to client/v3/lease.go diff --git a/clientv3/leasing/cache.go b/client/v3/leasing/cache.go similarity index 100% rename from clientv3/leasing/cache.go rename to client/v3/leasing/cache.go diff --git a/clientv3/leasing/doc.go b/client/v3/leasing/doc.go similarity index 100% rename from clientv3/leasing/doc.go rename to client/v3/leasing/doc.go diff --git a/clientv3/leasing/kv.go b/client/v3/leasing/kv.go similarity index 100% rename from clientv3/leasing/kv.go rename to client/v3/leasing/kv.go diff --git a/clientv3/leasing/txn.go b/client/v3/leasing/txn.go similarity index 100% rename from clientv3/leasing/txn.go rename to client/v3/leasing/txn.go diff --git a/clientv3/leasing/util.go b/client/v3/leasing/util.go similarity index 100% rename from clientv3/leasing/util.go rename to client/v3/leasing/util.go diff --git a/clientv3/logger.go b/client/v3/logger.go similarity index 100% rename from clientv3/logger.go rename to client/v3/logger.go diff --git a/clientv3/main_test.go b/client/v3/main_test.go similarity index 100% rename from clientv3/main_test.go rename to client/v3/main_test.go diff --git a/clientv3/maintenance.go b/client/v3/maintenance.go similarity index 100% rename from clientv3/maintenance.go rename to client/v3/maintenance.go diff --git a/clientv3/mirror/syncer.go b/client/v3/mirror/syncer.go similarity index 100% rename from clientv3/mirror/syncer.go rename to client/v3/mirror/syncer.go diff --git a/client/mock/mockserver/doc.go b/client/v3/mock/mockserver/doc.go similarity index 100% rename from client/mock/mockserver/doc.go rename to client/v3/mock/mockserver/doc.go diff --git a/client/mock/mockserver/mockserver.go b/client/v3/mock/mockserver/mockserver.go similarity index 100% rename from client/mock/mockserver/mockserver.go rename to client/v3/mock/mockserver/mockserver.go diff --git a/clientv3/namespace/doc.go b/client/v3/namespace/doc.go similarity index 100% rename from clientv3/namespace/doc.go rename to client/v3/namespace/doc.go diff --git a/clientv3/namespace/kv.go b/client/v3/namespace/kv.go similarity index 100% rename from clientv3/namespace/kv.go rename to client/v3/namespace/kv.go diff --git a/clientv3/namespace/lease.go b/client/v3/namespace/lease.go similarity index 100% rename from clientv3/namespace/lease.go rename to client/v3/namespace/lease.go diff --git a/clientv3/namespace/util.go b/client/v3/namespace/util.go similarity index 100% rename from clientv3/namespace/util.go rename to client/v3/namespace/util.go diff --git a/clientv3/namespace/util_test.go b/client/v3/namespace/util_test.go similarity index 100% rename from clientv3/namespace/util_test.go rename to client/v3/namespace/util_test.go diff --git a/clientv3/namespace/watch.go b/client/v3/namespace/watch.go similarity index 100% rename from clientv3/namespace/watch.go rename to client/v3/namespace/watch.go diff --git a/clientv3/naming/doc.go b/client/v3/naming/doc.go similarity index 100% rename from clientv3/naming/doc.go rename to client/v3/naming/doc.go diff --git a/clientv3/naming/grpc.go b/client/v3/naming/grpc.go similarity index 100% rename from clientv3/naming/grpc.go rename to client/v3/naming/grpc.go diff --git a/clientv3/op.go b/client/v3/op.go similarity index 100% rename from clientv3/op.go rename to client/v3/op.go diff --git a/clientv3/op_test.go b/client/v3/op_test.go similarity index 100% rename from clientv3/op_test.go rename to client/v3/op_test.go diff --git a/clientv3/options.go b/client/v3/options.go similarity index 100% rename from clientv3/options.go rename to client/v3/options.go diff --git a/clientv3/ordering/doc.go b/client/v3/ordering/doc.go similarity index 100% rename from clientv3/ordering/doc.go rename to client/v3/ordering/doc.go diff --git a/clientv3/ordering/kv.go b/client/v3/ordering/kv.go similarity index 100% rename from clientv3/ordering/kv.go rename to client/v3/ordering/kv.go diff --git a/clientv3/ordering/kv_test.go b/client/v3/ordering/kv_test.go similarity index 100% rename from clientv3/ordering/kv_test.go rename to client/v3/ordering/kv_test.go diff --git a/clientv3/ordering/logger_test.go b/client/v3/ordering/logger_test.go similarity index 100% rename from clientv3/ordering/logger_test.go rename to client/v3/ordering/logger_test.go diff --git a/clientv3/ordering/util.go b/client/v3/ordering/util.go similarity index 100% rename from clientv3/ordering/util.go rename to client/v3/ordering/util.go diff --git a/clientv3/retry.go b/client/v3/retry.go similarity index 100% rename from clientv3/retry.go rename to client/v3/retry.go diff --git a/clientv3/retry_interceptor.go b/client/v3/retry_interceptor.go similarity index 100% rename from clientv3/retry_interceptor.go rename to client/v3/retry_interceptor.go diff --git a/clientv3/snapshot/doc.go b/client/v3/snapshot/doc.go similarity index 100% rename from clientv3/snapshot/doc.go rename to client/v3/snapshot/doc.go diff --git a/clientv3/snapshot/v3_snapshot.go b/client/v3/snapshot/v3_snapshot.go similarity index 100% rename from clientv3/snapshot/v3_snapshot.go rename to client/v3/snapshot/v3_snapshot.go diff --git a/clientv3/sort.go b/client/v3/sort.go similarity index 100% rename from clientv3/sort.go rename to client/v3/sort.go diff --git a/clientv3/txn.go b/client/v3/txn.go similarity index 100% rename from clientv3/txn.go rename to client/v3/txn.go diff --git a/clientv3/txn_test.go b/client/v3/txn_test.go similarity index 100% rename from clientv3/txn_test.go rename to client/v3/txn_test.go diff --git a/clientv3/utils.go b/client/v3/utils.go similarity index 100% rename from clientv3/utils.go rename to client/v3/utils.go diff --git a/clientv3/watch.go b/client/v3/watch.go similarity index 100% rename from clientv3/watch.go rename to client/v3/watch.go diff --git a/clientv3/watch_test.go b/client/v3/watch_test.go similarity index 100% rename from clientv3/watch_test.go rename to client/v3/watch_test.go diff --git a/clientv3/yaml/config.go b/client/v3/yaml/config.go similarity index 100% rename from clientv3/yaml/config.go rename to client/v3/yaml/config.go diff --git a/clientv3/yaml/config_test.go b/client/v3/yaml/config_test.go similarity index 100% rename from clientv3/yaml/config_test.go rename to client/v3/yaml/config_test.go diff --git a/clientv3/concurrency/example_election_test.go b/clientv3/concurrency/example_election_test.go deleted file mode 120000 index 6ae1dffe2..000000000 --- a/clientv3/concurrency/example_election_test.go +++ /dev/null @@ -1 +0,0 @@ -../../tests/integration/clientv3/concurrency/example_election_test.go \ No newline at end of file diff --git a/clientv3/concurrency/example_mutex_test.go b/clientv3/concurrency/example_mutex_test.go deleted file mode 120000 index 2968b42d4..000000000 --- a/clientv3/concurrency/example_mutex_test.go +++ /dev/null @@ -1 +0,0 @@ -../../tests/integration/clientv3/concurrency/example_mutex_test.go \ No newline at end of file diff --git a/clientv3/concurrency/example_stm_test.go b/clientv3/concurrency/example_stm_test.go deleted file mode 120000 index b1f22c258..000000000 --- a/clientv3/concurrency/example_stm_test.go +++ /dev/null @@ -1 +0,0 @@ -../../tests/integration/clientv3/concurrency/example_stm_test.go \ No newline at end of file diff --git a/clientv3/example_auth_test.go b/clientv3/example_auth_test.go deleted file mode 120000 index d01e01cbb..000000000 --- a/clientv3/example_auth_test.go +++ /dev/null @@ -1 +0,0 @@ -../tests/integration/clientv3/examples/example_auth_test.go \ No newline at end of file diff --git a/clientv3/example_cluster_test.go b/clientv3/example_cluster_test.go deleted file mode 120000 index 303ab5f09..000000000 --- a/clientv3/example_cluster_test.go +++ /dev/null @@ -1 +0,0 @@ -../tests/integration/clientv3/examples/example_cluster_test.go \ No newline at end of file diff --git a/clientv3/example_kv_test.go b/clientv3/example_kv_test.go deleted file mode 120000 index db886dbbd..000000000 --- a/clientv3/example_kv_test.go +++ /dev/null @@ -1 +0,0 @@ -../tests/integration/clientv3/examples/example_kv_test.go \ No newline at end of file diff --git a/clientv3/example_lease_test.go b/clientv3/example_lease_test.go deleted file mode 120000 index c7b6c90d2..000000000 --- a/clientv3/example_lease_test.go +++ /dev/null @@ -1 +0,0 @@ -../tests/integration/clientv3/examples/example_lease_test.go \ No newline at end of file diff --git a/clientv3/example_maintenance_test.go b/clientv3/example_maintenance_test.go deleted file mode 120000 index c2c4035c4..000000000 --- a/clientv3/example_maintenance_test.go +++ /dev/null @@ -1 +0,0 @@ -../tests/integration/clientv3/examples/example_maintenance_test.go \ No newline at end of file diff --git a/clientv3/example_metrics_test.go b/clientv3/example_metrics_test.go deleted file mode 120000 index 868acb33e..000000000 --- a/clientv3/example_metrics_test.go +++ /dev/null @@ -1 +0,0 @@ -../tests/integration/clientv3/examples/example_metrics_test.go \ No newline at end of file diff --git a/clientv3/example_test.go b/clientv3/example_test.go deleted file mode 120000 index 2c85ca955..000000000 --- a/clientv3/example_test.go +++ /dev/null @@ -1 +0,0 @@ -../tests/integration/clientv3/examples/example_test.go \ No newline at end of file diff --git a/clientv3/example_watch_test.go b/clientv3/example_watch_test.go deleted file mode 120000 index 662d28083..000000000 --- a/clientv3/example_watch_test.go +++ /dev/null @@ -1 +0,0 @@ -../tests/integration/clientv3/examples/example_watch_test.go \ No newline at end of file From cf795c0ae60af2e0454f8e5ca374cbe62800add9 Mon Sep 17 00:00:00 2001 From: Piotr Tabor Date: Tue, 20 Oct 2020 10:09:12 +0200 Subject: [PATCH 2/3] client/v3: Create and update go.mod --- bill-of-materials.json | 9 ++ client/v2/go.mod | 2 +- client/v2/go.sum | 2 - client/v3/LICENSE | 202 ++++++++++++++++++++++++++++++++++ client/v3/go.mod | 28 +++++ client/v3/go.sum | 202 ++++++++++++++++++++++++++++++++++ client/v3/yaml/config_test.go | 6 +- go.mod | 5 +- go.sum | 7 +- pkg/go.mod | 1 - pkg/go.sum | 7 +- scripts/test_lib.sh | 4 +- scripts/updatebom.sh | 3 + test | 8 +- tests/go.mod | 4 +- tests/go.sum | 7 +- 16 files changed, 467 insertions(+), 30 deletions(-) create mode 100644 client/v3/LICENSE create mode 100644 client/v3/go.mod create mode 100644 client/v3/go.sum diff --git a/bill-of-materials.json b/bill-of-materials.json index 468565cc5..61ad632b4 100644 --- a/bill-of-materials.json +++ b/bill-of-materials.json @@ -449,6 +449,15 @@ } ] }, + { + "project": "go.etcd.io/etcd/client/v3", + "licenses": [ + { + "type": "Apache License 2.0", + "confidence": 1 + } + ] + }, { "project": "go.etcd.io/etcd/pkg/v3", "licenses": [ diff --git a/client/v2/go.mod b/client/v2/go.mod index 33cd8301d..4c9a6ec95 100644 --- a/client/v2/go.mod +++ b/client/v2/go.mod @@ -5,7 +5,7 @@ go 1.15 require ( github.com/json-iterator/go v1.1.10 github.com/modern-go/reflect2 v1.0.1 - go.etcd.io/etcd/api/v3 v3.0.0-20201012212543-0b95e8cef14a + go.etcd.io/etcd/api/v3 v3.0.0-00010101000000-000000000000 go.etcd.io/etcd/pkg/v3 v3.0.0-00010101000000-000000000000 ) diff --git a/client/v2/go.sum b/client/v2/go.sum index 631698e6e..37950a5e2 100644 --- a/client/v2/go.sum +++ b/client/v2/go.sum @@ -56,9 +56,7 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= -go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= -go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= diff --git a/client/v3/LICENSE b/client/v3/LICENSE new file mode 100644 index 000000000..d64569567 --- /dev/null +++ b/client/v3/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/client/v3/go.mod b/client/v3/go.mod new file mode 100644 index 000000000..ffa8ec18f --- /dev/null +++ b/client/v3/go.mod @@ -0,0 +1,28 @@ +module go.etcd.io/etcd/client/v3 + +go 1.15 + +require ( + github.com/dustin/go-humanize v1.0.0 + github.com/google/uuid v1.1.2 + github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 + github.com/prometheus/client_golang v1.5.1 + go.etcd.io/etcd/api/v3 v3.0.0-00010101000000-000000000000 + go.etcd.io/etcd/pkg/v3 v3.0.0-00010101000000-000000000000 + go.uber.org/zap v1.16.0 + google.golang.org/grpc v1.29.1 + sigs.k8s.io/yaml v1.2.0 +) + +replace ( + go.etcd.io/etcd/api/v3 => ../../api + go.etcd.io/etcd/pkg/v3 => ../../pkg +) + +// Bad imports are sometimes causing attempts to pull that code. +// This makes the error more explicit. +replace ( + go.etcd.io/etcd => ./FORBIDDEN_DEPENDENCY + go.etcd.io/etcd/v3 => ./FORBIDDEN_DEPENDENCY + go.etcd.io/tests/v3 => ./FORBIDDEN_DEPENDENCY +) diff --git a/client/v3/go.sum b/client/v3/go.sum new file mode 100644 index 000000000..0ea2c384e --- /dev/null +++ b/client/v3/go.sum @@ -0,0 +1,202 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= +github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= +github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= +github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= +github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= +github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= +github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM= +github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-systemd/v22 v22.1.0 h1:kq/SbG2BCKLkDKkjQf5OWwKWUKj1lgs3lFI4PxnR5lg= +github.com/coreos/go-systemd/v22 v22.1.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk= +github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= +github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= +github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= +github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls= +github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.3.5 h1:F768QJ1E9tib+q5Sc8MkdJi1RxLTbRcTf8LJV56aRls= +github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y= +github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho= +github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= +github.com/grpc-ecosystem/grpc-gateway v1.14.6/go.mod h1:zdiPV4Yse/1gnckTHtghG4GkDEdKCRJduHpTxT3/jcw= +github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= +github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= +github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= +github.com/prometheus/client_golang v1.5.1 h1:bdHYieyGlH+6OLEk2YQha8THib30KP0/yD0YH9m6xcA= +github.com/prometheus/client_golang v1.5.1/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= +github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M= +github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.9.1 h1:KOMtN28tlbam3/7ZKEYKHhKoJZYYj3gMH4uc62x7X7U= +github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= +github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.0.8 h1:+fpWZdT24pJBiqJdAwYBjPSk+5YmQzYNPYzQsdzLkt8= +github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= +github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= +github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= +github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk= +go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= +go.uber.org/multierr v1.5.0 h1:KCa4XfM8CWFCpxXRGok+Q0SS/0XBhMDbHHGABQLvD2A= +go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= +go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee h1:0mgffUl7nfd+FpvXMVz4IDEaUSmT1ysygQC7qYo7sG4= +go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= +go.uber.org/zap v1.16.0 h1:uFRZXykJGK9lLY4HtgSw44DnIcAM+kRBP7x5m+NpAOM= +go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ= +golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190930215403-16217165b5de h1:5hukYrvBGR8/eNkX5mdUezrA6JiaEZDtJb9Ei+1LlBs= +golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191002035440-2ec189313ef0 h1:2mqDk8w/o6UmeUCu5Qiq2y7iMf6anbx+YA8d1JFoFrs= +golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634 h1:bNEHhJCnrwMKNMmOx3yAynp5vs5/gRy+XWFtZFu7NBM= +golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5 h1:hKsoRgsbwY1NafxrwTs+k64bikrLBkAgPir1TNCj3Zs= +golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884 h1:fiNLklpBwWK1mth30Hlwk+fcdBmIALlgF5iy77O37Ig= +google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= +google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.29.1 h1:EC2SB8S04d2r73uptxphDSUG+kTKVgjRPF+N3xpxRB4= +google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= +gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.1-2019.2.3 h1:3JgtbtFHMiCmsznwGVTUWbgGov+pVqnlf1dEJTNAXeM= +honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= +sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= +sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= diff --git a/client/v3/yaml/config_test.go b/client/v3/yaml/config_test.go index ab046f18b..e74a6a2d0 100644 --- a/client/v3/yaml/config_test.go +++ b/client/v3/yaml/config_test.go @@ -25,9 +25,9 @@ import ( ) var ( - certPath = "../../tests/fixtures/server.crt" - privateKeyPath = "../../tests/fixtures/server.key.insecure" - caPath = "../../tests/fixtures/ca.crt" + certPath = "../../../tests/fixtures/server.crt" + privateKeyPath = "../../../tests/fixtures/server.key.insecure" + caPath = "../../../tests/fixtures/ca.crt" ) func TestConfigFromFile(t *testing.T) { diff --git a/go.mod b/go.mod index acd9f4824..1b3fb20e4 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,6 @@ require ( github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e github.com/golang/protobuf v1.3.5 github.com/google/btree v1.0.0 - github.com/google/uuid v1.1.2 github.com/gorilla/websocket v1.4.2 // indirect github.com/grpc-ecosystem/go-grpc-middleware v1.2.2 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 @@ -36,8 +35,9 @@ require ( github.com/urfave/cli v1.22.1 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 go.etcd.io/bbolt v1.3.5 - go.etcd.io/etcd/api/v3 v3.0.0-20201012212543-0b95e8cef14a + go.etcd.io/etcd/api/v3 v3.0.0-00010101000000-000000000000 go.etcd.io/etcd/client/v2 v2.0.0-00010101000000-000000000000 + go.etcd.io/etcd/client/v3 v3.0.0-00010101000000-000000000000 go.etcd.io/etcd/pkg/v3 v3.0.0-00010101000000-000000000000 go.etcd.io/etcd/raft/v3 v3.0.0-00010101000000-000000000000 go.uber.org/zap v1.16.0 @@ -55,6 +55,7 @@ require ( replace ( go.etcd.io/etcd/api/v3 => ./api go.etcd.io/etcd/client/v2 => ./client/v2 + go.etcd.io/etcd/client/v3 => ./client/v3 go.etcd.io/etcd/pkg/v3 => ./pkg go.etcd.io/etcd/raft/v3 => ./raft ) diff --git a/go.sum b/go.sum index acb80a2cb..a25cc9bf8 100644 --- a/go.sum +++ b/go.sum @@ -227,13 +227,12 @@ go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0= go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk= go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= -go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= -go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= +go.uber.org/multierr v1.5.0 h1:KCa4XfM8CWFCpxXRGok+Q0SS/0XBhMDbHHGABQLvD2A= go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= -go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= -go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= +go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee h1:0mgffUl7nfd+FpvXMVz4IDEaUSmT1ysygQC7qYo7sG4= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.16.0 h1:uFRZXykJGK9lLY4HtgSw44DnIcAM+kRBP7x5m+NpAOM= diff --git a/pkg/go.mod b/pkg/go.mod index bd19601e1..eb7c79514 100644 --- a/pkg/go.mod +++ b/pkg/go.mod @@ -7,7 +7,6 @@ require ( github.com/creack/pty v1.1.11 github.com/dustin/go-humanize v1.0.0 github.com/spf13/pflag v1.0.5 - go.uber.org/multierr v1.6.0 // indirect go.uber.org/zap v1.16.0 golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634 google.golang.org/grpc v1.29.1 diff --git a/pkg/go.sum b/pkg/go.sum index c9049b76f..dfc6f2045 100644 --- a/pkg/go.sum +++ b/pkg/go.sum @@ -42,12 +42,11 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk= go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= -go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= -go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/multierr v1.5.0 h1:KCa4XfM8CWFCpxXRGok+Q0SS/0XBhMDbHHGABQLvD2A= go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= -go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= -go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= +go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee h1:0mgffUl7nfd+FpvXMVz4IDEaUSmT1ysygQC7qYo7sG4= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= go.uber.org/zap v1.16.0 h1:uFRZXykJGK9lLY4HtgSw44DnIcAM+kRBP7x5m+NpAOM= go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ= diff --git a/scripts/test_lib.sh b/scripts/test_lib.sh index 97554a869..20cc0dd60 100644 --- a/scripts/test_lib.sh +++ b/scripts/test_lib.sh @@ -109,6 +109,7 @@ function modules() { go.etcd.io/etcd/pkg/v3 go.etcd.io/etcd/raft/v3 go.etcd.io/etcd/client/v2 + go.etcd.io/etcd/client/v3 go.etcd.io/etcd/v3 go.etcd.io/etcd/tests/v3" } @@ -127,8 +128,9 @@ function run_for_modules { if [ -z "${USERMOD}" ]; then run_for_module "api" "$@" "${pkg}" || return "$?" run_for_module "pkg" "$@" "${pkg}" || return "$?" - run_for_module "client/v2" "$@" "${pkg}" || return "$?" run_for_module "raft" "$@" "${pkg}" || return "$?" + run_for_module "client/v2" "$@" "${pkg}" || return "$?" + run_for_module "client/v3" "$@" "${pkg}" || return "$?" run_for_module "." "$@" "${pkg}" || return "$?" run_for_module "tests" "$@" "${pkg}" || return "$?" else diff --git a/scripts/updatebom.sh b/scripts/updatebom.sh index ec2551f6e..7a3c6c69c 100755 --- a/scripts/updatebom.sh +++ b/scripts/updatebom.sh @@ -20,6 +20,9 @@ function bom_fixlet { log_success "bom refreshed" else log_error "FAIL: bom refreshing failed" + mv go.mod.tmp go.mod + mv go.sum.tmp go.sum + return 2 fi mv go.mod.tmp go.mod mv go.sum.tmp go.sum diff --git a/test b/test index 83cfcd868..57ce53724 100755 --- a/test +++ b/test @@ -450,15 +450,9 @@ function goword_for_package { fi } + function goword_pass { run_for_modules goword_for_package || return 255 - - # check some spelling - gowordRes=$(run_go_tool "github.com/chzchzchz/goword" -ignore-file=.words clientv3/{*,*/*}.go | grep spell | sort) - if [ -n "$gowordRes" ]; then - log_error -e "goword checking failed:\\n${gowordRes}" - return 255 - fi } function go_fmt_for_package { diff --git a/tests/go.mod b/tests/go.mod index a5d4537c7..f68c99c6a 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -5,6 +5,7 @@ go 1.15 replace ( go.etcd.io/etcd/api/v3 => ../api go.etcd.io/etcd/client/v2 => ../client/v2 + go.etcd.io/etcd/client/v3 => ../client/v3 go.etcd.io/etcd/pkg/v3 => ../pkg go.etcd.io/etcd/v3 => ../ ) @@ -23,8 +24,9 @@ require ( github.com/spf13/cobra v1.0.0 github.com/spf13/pflag v1.0.5 go.etcd.io/bbolt v1.3.5 - go.etcd.io/etcd/api/v3 v3.0.0-20201012212543-0b95e8cef14a + go.etcd.io/etcd/api/v3 v3.0.0-00010101000000-000000000000 go.etcd.io/etcd/client/v2 v2.0.0-00010101000000-000000000000 + go.etcd.io/etcd/client/v3 v3.0.0-00010101000000-000000000000 go.etcd.io/etcd/pkg/v3 v3.0.0-00010101000000-000000000000 go.etcd.io/etcd/raft/v3 v3.0.0-00010101000000-000000000000 go.etcd.io/etcd/v3 v3.0.0-00010101000000-000000000000 diff --git a/tests/go.sum b/tests/go.sum index 5eb79e298..91b8c0bfa 100644 --- a/tests/go.sum +++ b/tests/go.sum @@ -220,13 +220,12 @@ go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0= go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk= go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= -go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= -go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= +go.uber.org/multierr v1.5.0 h1:KCa4XfM8CWFCpxXRGok+Q0SS/0XBhMDbHHGABQLvD2A= go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= -go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= -go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= +go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee h1:0mgffUl7nfd+FpvXMVz4IDEaUSmT1ysygQC7qYo7sG4= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.16.0 h1:uFRZXykJGK9lLY4HtgSw44DnIcAM+kRBP7x5m+NpAOM= From e33c6dd9df9067003661a1661c5b98de1d292152 Mon Sep 17 00:00:00 2001 From: Piotr Tabor Date: Tue, 20 Oct 2020 10:10:25 +0200 Subject: [PATCH 3/3] client/v3: Rename of imports --- Documentation/learning/lock/client/client.go | 4 ++-- client/v3/balancer/balancer.go | 4 ++-- client/v3/balancer/balancer_test.go | 6 +++--- client/v3/client.go | 8 ++++---- client/v3/clientv3util/example_key_test.go | 4 ++-- client/v3/clientv3util/util.go | 2 +- client/v3/concurrency/election.go | 2 +- client/v3/concurrency/key.go | 2 +- client/v3/concurrency/mutex.go | 2 +- client/v3/concurrency/session.go | 2 +- client/v3/concurrency/stm.go | 2 +- client/v3/leasing/cache.go | 2 +- client/v3/leasing/kv.go | 4 ++-- client/v3/leasing/txn.go | 2 +- client/v3/leasing/util.go | 2 +- client/v3/mirror/syncer.go | 2 +- client/v3/namespace/kv.go | 2 +- client/v3/namespace/lease.go | 2 +- client/v3/namespace/watch.go | 2 +- client/v3/naming/doc.go | 4 ++-- client/v3/naming/grpc.go | 2 +- client/v3/ordering/kv.go | 2 +- client/v3/ordering/kv_test.go | 2 +- client/v3/ordering/logger_test.go | 2 +- client/v3/ordering/util.go | 2 +- client/v3/snapshot/v3_snapshot.go | 2 +- client/v3/yaml/config.go | 2 +- contrib/recipes/barrier.go | 2 +- contrib/recipes/client.go | 2 +- contrib/recipes/double_barrier.go | 4 ++-- contrib/recipes/key.go | 4 ++-- contrib/recipes/priority_queue.go | 2 +- contrib/recipes/queue.go | 2 +- contrib/recipes/rwmutex.go | 4 ++-- contrib/recipes/watch.go | 2 +- embed/serve.go | 2 +- etcdctl/ctlv3/command/alarm_command.go | 2 +- etcdctl/ctlv3/command/check.go | 2 +- etcdctl/ctlv3/command/compaction_command.go | 2 +- etcdctl/ctlv3/command/del_command.go | 2 +- etcdctl/ctlv3/command/elect_command.go | 4 ++-- etcdctl/ctlv3/command/ep_command.go | 2 +- etcdctl/ctlv3/command/get_command.go | 2 +- etcdctl/ctlv3/command/global.go | 2 +- etcdctl/ctlv3/command/lease_command.go | 2 +- etcdctl/ctlv3/command/lock_command.go | 4 ++-- etcdctl/ctlv3/command/make_mirror_command.go | 4 ++-- etcdctl/ctlv3/command/member_command.go | 2 +- etcdctl/ctlv3/command/move_leader_command.go | 2 +- etcdctl/ctlv3/command/printer.go | 2 +- etcdctl/ctlv3/command/printer_fields.go | 2 +- etcdctl/ctlv3/command/printer_json.go | 2 +- etcdctl/ctlv3/command/printer_protobuf.go | 2 +- etcdctl/ctlv3/command/printer_simple.go | 2 +- etcdctl/ctlv3/command/printer_table.go | 2 +- etcdctl/ctlv3/command/put_command.go | 2 +- etcdctl/ctlv3/command/role_command.go | 2 +- etcdctl/ctlv3/command/txn_command.go | 2 +- etcdctl/ctlv3/command/user_command.go | 2 +- etcdctl/ctlv3/command/util.go | 2 +- etcdctl/ctlv3/command/watch_command.go | 2 +- etcdctl/snapshot/v3_snapshot.go | 4 ++-- etcdmain/grpc_proxy.go | 8 ++++---- etcdserver/api/v2v3/server.go | 2 +- etcdserver/api/v2v3/store.go | 4 ++-- etcdserver/api/v2v3/watcher.go | 2 +- etcdserver/api/v3client/v3client.go | 2 +- etcdserver/api/v3election/election.go | 4 ++-- etcdserver/api/v3lock/lock.go | 4 ++-- etcdserver/api/v3rpc/grpc.go | 2 +- proxy/grpcproxy/auth.go | 2 +- proxy/grpcproxy/cluster.go | 4 ++-- proxy/grpcproxy/election.go | 2 +- proxy/grpcproxy/health.go | 2 +- proxy/grpcproxy/kv.go | 2 +- proxy/grpcproxy/leader.go | 2 +- proxy/grpcproxy/lease.go | 2 +- proxy/grpcproxy/lock.go | 2 +- proxy/grpcproxy/maintenance.go | 2 +- proxy/grpcproxy/register.go | 6 +++--- proxy/grpcproxy/watch.go | 2 +- proxy/grpcproxy/watch_broadcast.go | 2 +- proxy/grpcproxy/watcher.go | 2 +- raft/go.sum | 2 -- tests/e2e/ctl_v3_alarm_test.go | 2 +- tests/e2e/ctl_v3_auth_test.go | 2 +- tests/e2e/ctl_v3_endpoint_test.go | 2 +- tests/e2e/ctl_v3_migrate_test.go | 2 +- tests/e2e/ctl_v3_move_leader_test.go | 2 +- tests/e2e/etcd_corrupt_test.go | 2 +- tests/functional/rpcpb/member.go | 2 +- tests/functional/runner/election_command.go | 2 +- tests/functional/runner/global.go | 2 +- tests/functional/runner/lease_renewer_command.go | 2 +- tests/functional/runner/lock_racer_command.go | 2 +- tests/functional/runner/watch_command.go | 2 +- tests/functional/tester/case_sigquit_remove.go | 2 +- tests/functional/tester/case_sigquit_remove_quorum.go | 2 +- tests/functional/tester/checker_lease_expire.go | 2 +- tests/functional/tester/stresser_key.go | 2 +- tests/functional/tester/stresser_lease.go | 2 +- tests/integration/clientv3/black_hole_test.go | 2 +- tests/integration/clientv3/concurrency/election_test.go | 4 ++-- .../clientv3/concurrency/example_election_test.go | 4 ++-- .../clientv3/concurrency/example_mutex_test.go | 4 ++-- .../integration/clientv3/concurrency/example_stm_test.go | 4 ++-- tests/integration/clientv3/concurrency/mutex_test.go | 4 ++-- tests/integration/clientv3/dial_test.go | 2 +- tests/integration/clientv3/examples/example_auth_test.go | 2 +- .../integration/clientv3/examples/example_cluster_test.go | 2 +- tests/integration/clientv3/examples/example_kv_test.go | 2 +- tests/integration/clientv3/examples/example_lease_test.go | 2 +- .../clientv3/examples/example_maintenance_test.go | 2 +- .../integration/clientv3/examples/example_metrics_test.go | 2 +- tests/integration/clientv3/examples/example_test.go | 2 +- tests/integration/clientv3/examples/example_watch_test.go | 2 +- tests/integration/clientv3/grpc_test.go | 4 ++-- tests/integration/clientv3/kv_test.go | 2 +- tests/integration/clientv3/lease_test.go | 4 ++-- tests/integration/clientv3/leasing_test.go | 6 +++--- tests/integration/clientv3/logger_test.go | 2 +- tests/integration/clientv3/maintenance_test.go | 2 +- tests/integration/clientv3/metrics_test.go | 2 +- tests/integration/clientv3/mirror_test.go | 2 +- tests/integration/clientv3/namespace_test.go | 4 ++-- tests/integration/clientv3/network_partition_test.go | 2 +- tests/integration/clientv3/ordering_kv_test.go | 4 ++-- tests/integration/clientv3/ordering_util_test.go | 4 ++-- tests/integration/clientv3/server_shutdown_test.go | 2 +- tests/integration/clientv3/snapshot/v3_snapshot_test.go | 4 ++-- tests/integration/clientv3/txn_test.go | 2 +- tests/integration/clientv3/user_test.go | 2 +- tests/integration/clientv3/util.go | 2 +- tests/integration/clientv3/watch_fragment_test.go | 2 +- tests/integration/clientv3/watch_test.go | 2 +- tests/integration/cluster.go | 2 +- tests/integration/cluster_direct.go | 2 +- tests/integration/cluster_proxy.go | 4 ++-- tests/integration/embed/embed_test.go | 2 +- tests/integration/logger_test.go | 2 +- tests/integration/proxy/grpcproxy/cluster_test.go | 2 +- tests/integration/proxy/grpcproxy/kv_test.go | 2 +- tests/integration/proxy/grpcproxy/register_test.go | 4 ++-- tests/integration/snapshot/member_test.go | 2 +- tests/integration/snapshot/v3_snapshot_test.go | 2 +- tests/integration/v2store/store_tag_v2v3_test.go | 2 +- tests/integration/v2store/store_v2v3_test.go | 2 +- tests/integration/v3_auth_test.go | 2 +- tests/integration/v3_barrier_test.go | 2 +- tests/integration/v3_double_barrier_test.go | 2 +- tests/integration/v3_election_test.go | 4 ++-- tests/integration/v3_grpc_test.go | 2 +- tests/integration/v3_kv_test.go | 4 ++-- tests/integration/v3_lock_test.go | 4 ++-- tests/integration/v3_stm_test.go | 4 ++-- tests/integration/v3_tls_test.go | 2 +- tools/benchmark/cmd/lease.go | 2 +- tools/benchmark/cmd/put.go | 2 +- tools/benchmark/cmd/range.go | 2 +- tools/benchmark/cmd/stm.go | 4 ++-- tools/benchmark/cmd/txn_put.go | 2 +- tools/benchmark/cmd/util.go | 2 +- tools/benchmark/cmd/watch.go | 2 +- tools/benchmark/cmd/watch_get.go | 2 +- tools/benchmark/cmd/watch_latency.go | 2 +- tools/etcd-dump-metrics/etcd.go | 2 +- 166 files changed, 211 insertions(+), 213 deletions(-) diff --git a/Documentation/learning/lock/client/client.go b/Documentation/learning/lock/client/client.go index ab5a9649f..b5c42f0cb 100644 --- a/Documentation/learning/lock/client/client.go +++ b/Documentation/learning/lock/client/client.go @@ -26,8 +26,8 @@ import ( "bytes" "encoding/json" "fmt" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/clientv3/concurrency" + "go.etcd.io/etcd/client/v3" + "go.etcd.io/etcd/client/v3/concurrency" "io/ioutil" "net/http" "os" diff --git a/client/v3/balancer/balancer.go b/client/v3/balancer/balancer.go index 3eecb9d1d..3e63d6091 100644 --- a/client/v3/balancer/balancer.go +++ b/client/v3/balancer/balancer.go @@ -20,8 +20,8 @@ import ( "sync" "time" - "go.etcd.io/etcd/v3/clientv3/balancer/connectivity" - "go.etcd.io/etcd/v3/clientv3/balancer/picker" + "go.etcd.io/etcd/client/v3/balancer/connectivity" + "go.etcd.io/etcd/client/v3/balancer/picker" "go.uber.org/zap" "google.golang.org/grpc/balancer" diff --git a/client/v3/balancer/balancer_test.go b/client/v3/balancer/balancer_test.go index 0ccd2abaa..5a70b35c3 100644 --- a/client/v3/balancer/balancer_test.go +++ b/client/v3/balancer/balancer_test.go @@ -22,9 +22,9 @@ import ( "time" pb "go.etcd.io/etcd/api/v3/etcdserverpb" - "go.etcd.io/etcd/v3/client/mock/mockserver" - "go.etcd.io/etcd/v3/clientv3/balancer/picker" - "go.etcd.io/etcd/v3/clientv3/balancer/resolver/endpoint" + "go.etcd.io/etcd/client/v3/balancer/picker" + "go.etcd.io/etcd/client/v3/balancer/resolver/endpoint" + "go.etcd.io/etcd/client/v3/mock/mockserver" "go.uber.org/zap" "google.golang.org/grpc" diff --git a/client/v3/client.go b/client/v3/client.go index 123e35b3e..9a037d7b4 100644 --- a/client/v3/client.go +++ b/client/v3/client.go @@ -27,11 +27,11 @@ import ( "github.com/google/uuid" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" + "go.etcd.io/etcd/client/v3/balancer" + "go.etcd.io/etcd/client/v3/balancer/picker" + "go.etcd.io/etcd/client/v3/balancer/resolver/endpoint" + "go.etcd.io/etcd/client/v3/credentials" "go.etcd.io/etcd/pkg/v3/logutil" - "go.etcd.io/etcd/v3/clientv3/balancer" - "go.etcd.io/etcd/v3/clientv3/balancer/picker" - "go.etcd.io/etcd/v3/clientv3/balancer/resolver/endpoint" - "go.etcd.io/etcd/v3/clientv3/credentials" "go.uber.org/zap" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/client/v3/clientv3util/example_key_test.go b/client/v3/clientv3util/example_key_test.go index 7290b6698..0d7cd3d19 100644 --- a/client/v3/clientv3util/example_key_test.go +++ b/client/v3/clientv3util/example_key_test.go @@ -18,8 +18,8 @@ import ( "context" "log" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/clientv3/clientv3util" + "go.etcd.io/etcd/client/v3" + "go.etcd.io/etcd/client/v3/clientv3util" ) func ExampleKeyMissing() { diff --git a/client/v3/clientv3util/util.go b/client/v3/clientv3util/util.go index 984938614..c8d5098a5 100644 --- a/client/v3/clientv3util/util.go +++ b/client/v3/clientv3util/util.go @@ -16,7 +16,7 @@ package clientv3util import ( - "go.etcd.io/etcd/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/concurrency/election.go b/client/v3/concurrency/election.go index 7e7821579..31e93d242 100644 --- a/client/v3/concurrency/election.go +++ b/client/v3/concurrency/election.go @@ -21,7 +21,7 @@ import ( pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/api/v3/mvccpb" - v3 "go.etcd.io/etcd/v3/clientv3" + v3 "go.etcd.io/etcd/client/v3" ) var ( diff --git a/client/v3/concurrency/key.go b/client/v3/concurrency/key.go index 61f2abe5a..20825950f 100644 --- a/client/v3/concurrency/key.go +++ b/client/v3/concurrency/key.go @@ -20,7 +20,7 @@ import ( pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/api/v3/mvccpb" - v3 "go.etcd.io/etcd/v3/clientv3" + v3 "go.etcd.io/etcd/client/v3" ) func waitDelete(ctx context.Context, client *v3.Client, key string, rev int64) error { diff --git a/client/v3/concurrency/mutex.go b/client/v3/concurrency/mutex.go index 22ecf2d1f..c3800d628 100644 --- a/client/v3/concurrency/mutex.go +++ b/client/v3/concurrency/mutex.go @@ -21,7 +21,7 @@ import ( "sync" pb "go.etcd.io/etcd/api/v3/etcdserverpb" - v3 "go.etcd.io/etcd/v3/clientv3" + v3 "go.etcd.io/etcd/client/v3" ) // ErrLocked is returned by TryLock when Mutex is already locked by another session. diff --git a/client/v3/concurrency/session.go b/client/v3/concurrency/session.go index 7c747183a..7143cc474 100644 --- a/client/v3/concurrency/session.go +++ b/client/v3/concurrency/session.go @@ -18,7 +18,7 @@ import ( "context" "time" - v3 "go.etcd.io/etcd/v3/clientv3" + v3 "go.etcd.io/etcd/client/v3" ) const defaultSessionTTL = 60 diff --git a/client/v3/concurrency/stm.go b/client/v3/concurrency/stm.go index 908a4bed3..ba7303d09 100644 --- a/client/v3/concurrency/stm.go +++ b/client/v3/concurrency/stm.go @@ -18,7 +18,7 @@ import ( "context" "math" - v3 "go.etcd.io/etcd/v3/clientv3" + v3 "go.etcd.io/etcd/client/v3" ) // STM is an interface for software transactional memory. diff --git a/client/v3/leasing/cache.go b/client/v3/leasing/cache.go index d2683a549..214ee2fc1 100644 --- a/client/v3/leasing/cache.go +++ b/client/v3/leasing/cache.go @@ -22,7 +22,7 @@ import ( v3pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/api/v3/mvccpb" - v3 "go.etcd.io/etcd/v3/clientv3" + v3 "go.etcd.io/etcd/client/v3" ) const revokeBackoff = 2 * time.Second diff --git a/client/v3/leasing/kv.go b/client/v3/leasing/kv.go index d7bf95fe8..f0cded20f 100644 --- a/client/v3/leasing/kv.go +++ b/client/v3/leasing/kv.go @@ -23,8 +23,8 @@ import ( pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" - v3 "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/clientv3/concurrency" + v3 "go.etcd.io/etcd/client/v3" + "go.etcd.io/etcd/client/v3/concurrency" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/client/v3/leasing/txn.go b/client/v3/leasing/txn.go index db34e48cb..30c6aa2e4 100644 --- a/client/v3/leasing/txn.go +++ b/client/v3/leasing/txn.go @@ -19,7 +19,7 @@ import ( "strings" v3pb "go.etcd.io/etcd/api/v3/etcdserverpb" - v3 "go.etcd.io/etcd/v3/clientv3" + v3 "go.etcd.io/etcd/client/v3" ) type txnLeasing struct { diff --git a/client/v3/leasing/util.go b/client/v3/leasing/util.go index 5ab191d49..b6a520f03 100644 --- a/client/v3/leasing/util.go +++ b/client/v3/leasing/util.go @@ -18,7 +18,7 @@ import ( "bytes" v3pb "go.etcd.io/etcd/api/v3/etcdserverpb" - v3 "go.etcd.io/etcd/v3/clientv3" + v3 "go.etcd.io/etcd/client/v3" ) func compareInt64(a, b int64) int { diff --git a/client/v3/mirror/syncer.go b/client/v3/mirror/syncer.go index 86e03c106..c25ee9b0c 100644 --- a/client/v3/mirror/syncer.go +++ b/client/v3/mirror/syncer.go @@ -18,7 +18,7 @@ package mirror import ( "context" - "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/client/v3" ) const ( diff --git a/client/v3/namespace/kv.go b/client/v3/namespace/kv.go index 35fe5858a..f745225ca 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/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 f7596d0aa..f274de5e9 100644 --- a/client/v3/namespace/lease.go +++ b/client/v3/namespace/lease.go @@ -18,7 +18,7 @@ import ( "bytes" "context" - "go.etcd.io/etcd/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 8dc28380a..12362856d 100644 --- a/client/v3/namespace/watch.go +++ b/client/v3/namespace/watch.go @@ -18,7 +18,7 @@ import ( "context" "sync" - "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/client/v3" ) type watcherPrefix struct { diff --git a/client/v3/naming/doc.go b/client/v3/naming/doc.go index 98987d8fd..df141f41a 100644 --- a/client/v3/naming/doc.go +++ b/client/v3/naming/doc.go @@ -17,8 +17,8 @@ // To use, first import the packages: // // import ( -// "go.etcd.io/etcd/v3/clientv3" -// etcdnaming "go.etcd.io/etcd/v3/clientv3/naming" +// "go.etcd.io/etcd/client/v3" +// etcdnaming "go.etcd.io/etcd/client/v3/naming" // // "google.golang.org/grpc" // "google.golang.org/grpc/naming" diff --git a/client/v3/naming/grpc.go b/client/v3/naming/grpc.go index b680274bb..d12e7e2b8 100644 --- a/client/v3/naming/grpc.go +++ b/client/v3/naming/grpc.go @@ -19,7 +19,7 @@ import ( "encoding/json" "fmt" - etcd "go.etcd.io/etcd/v3/clientv3" + etcd "go.etcd.io/etcd/client/v3" "google.golang.org/grpc/codes" "google.golang.org/grpc/naming" diff --git a/client/v3/ordering/kv.go b/client/v3/ordering/kv.go index d62f2c891..7914fc4b9 100644 --- a/client/v3/ordering/kv.go +++ b/client/v3/ordering/kv.go @@ -18,7 +18,7 @@ import ( "context" "sync" - "go.etcd.io/etcd/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 a349f6019..9b5c8ab2c 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/v3/clientv3" + "go.etcd.io/etcd/client/v3" ) type mockKV struct { diff --git a/client/v3/ordering/logger_test.go b/client/v3/ordering/logger_test.go index ef857ce4e..8804ddb4a 100644 --- a/client/v3/ordering/logger_test.go +++ b/client/v3/ordering/logger_test.go @@ -17,7 +17,7 @@ package ordering import ( "io/ioutil" - "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/client/v3" "google.golang.org/grpc/grpclog" ) diff --git a/client/v3/ordering/util.go b/client/v3/ordering/util.go index a321ede55..bd9d31f5c 100644 --- a/client/v3/ordering/util.go +++ b/client/v3/ordering/util.go @@ -19,7 +19,7 @@ import ( "sync" "time" - "go.etcd.io/etcd/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 c5e931774..51139b5b8 100644 --- a/client/v3/snapshot/v3_snapshot.go +++ b/client/v3/snapshot/v3_snapshot.go @@ -23,8 +23,8 @@ import ( "time" "github.com/dustin/go-humanize" + "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/pkg/v3/fileutil" - "go.etcd.io/etcd/v3/clientv3" "go.uber.org/zap" ) diff --git a/client/v3/yaml/config.go b/client/v3/yaml/config.go index 858172802..015d06f35 100644 --- a/client/v3/yaml/config.go +++ b/client/v3/yaml/config.go @@ -22,8 +22,8 @@ import ( "sigs.k8s.io/yaml" + "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/pkg/v3/tlsutil" - "go.etcd.io/etcd/v3/clientv3" ) type yamlConfig struct { diff --git a/contrib/recipes/barrier.go b/contrib/recipes/barrier.go index 95d1ca866..7e950a3e3 100644 --- a/contrib/recipes/barrier.go +++ b/contrib/recipes/barrier.go @@ -18,7 +18,7 @@ import ( "context" "go.etcd.io/etcd/api/v3/mvccpb" - v3 "go.etcd.io/etcd/v3/clientv3" + v3 "go.etcd.io/etcd/client/v3" ) // Barrier creates a key in etcd to block processes, then deletes the key to diff --git a/contrib/recipes/client.go b/contrib/recipes/client.go index cdaf15553..6dd5b13a6 100644 --- a/contrib/recipes/client.go +++ b/contrib/recipes/client.go @@ -19,7 +19,7 @@ import ( "errors" spb "go.etcd.io/etcd/api/v3/mvccpb" - v3 "go.etcd.io/etcd/v3/clientv3" + v3 "go.etcd.io/etcd/client/v3" ) var ( diff --git a/contrib/recipes/double_barrier.go b/contrib/recipes/double_barrier.go index ba6cf3d29..eac5d4f7f 100644 --- a/contrib/recipes/double_barrier.go +++ b/contrib/recipes/double_barrier.go @@ -18,8 +18,8 @@ import ( "context" "go.etcd.io/etcd/api/v3/mvccpb" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/clientv3/concurrency" + "go.etcd.io/etcd/client/v3" + "go.etcd.io/etcd/client/v3/concurrency" ) // DoubleBarrier blocks processes on Enter until an expected count enters, then diff --git a/contrib/recipes/key.go b/contrib/recipes/key.go index 3a634a3fb..10362c18f 100644 --- a/contrib/recipes/key.go +++ b/contrib/recipes/key.go @@ -20,8 +20,8 @@ import ( "strings" "time" - v3 "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/clientv3/concurrency" + v3 "go.etcd.io/etcd/client/v3" + "go.etcd.io/etcd/client/v3/concurrency" ) // RemoteKV is a key/revision pair created by the client and stored on etcd diff --git a/contrib/recipes/priority_queue.go b/contrib/recipes/priority_queue.go index 2c4e916aa..1b2606746 100644 --- a/contrib/recipes/priority_queue.go +++ b/contrib/recipes/priority_queue.go @@ -19,7 +19,7 @@ import ( "fmt" "go.etcd.io/etcd/api/v3/mvccpb" - v3 "go.etcd.io/etcd/v3/clientv3" + v3 "go.etcd.io/etcd/client/v3" ) // PriorityQueue implements a multi-reader, multi-writer distributed queue. diff --git a/contrib/recipes/queue.go b/contrib/recipes/queue.go index b71ba1b0e..9c6b0378e 100644 --- a/contrib/recipes/queue.go +++ b/contrib/recipes/queue.go @@ -18,7 +18,7 @@ import ( "context" "go.etcd.io/etcd/api/v3/mvccpb" - v3 "go.etcd.io/etcd/v3/clientv3" + v3 "go.etcd.io/etcd/client/v3" ) // Queue implements a multi-reader, multi-writer distributed queue. diff --git a/contrib/recipes/rwmutex.go b/contrib/recipes/rwmutex.go index ce6ff2a82..9f520baf4 100644 --- a/contrib/recipes/rwmutex.go +++ b/contrib/recipes/rwmutex.go @@ -18,8 +18,8 @@ import ( "context" "go.etcd.io/etcd/api/v3/mvccpb" - v3 "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/clientv3/concurrency" + v3 "go.etcd.io/etcd/client/v3" + "go.etcd.io/etcd/client/v3/concurrency" ) type RWMutex struct { diff --git a/contrib/recipes/watch.go b/contrib/recipes/watch.go index 339fb2e0e..fd4a8717a 100644 --- a/contrib/recipes/watch.go +++ b/contrib/recipes/watch.go @@ -18,7 +18,7 @@ import ( "context" "go.etcd.io/etcd/api/v3/mvccpb" - "go.etcd.io/etcd/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/embed/serve.go b/embed/serve.go index 5818435a2..9086b8b04 100644 --- a/embed/serve.go +++ b/embed/serve.go @@ -24,10 +24,10 @@ import ( "strings" etcdservergw "go.etcd.io/etcd/api/v3/etcdserverpb/gw" + "go.etcd.io/etcd/client/v3/credentials" "go.etcd.io/etcd/pkg/v3/debugutil" "go.etcd.io/etcd/pkg/v3/httputil" "go.etcd.io/etcd/pkg/v3/transport" - "go.etcd.io/etcd/v3/clientv3/credentials" "go.etcd.io/etcd/v3/etcdserver" "go.etcd.io/etcd/v3/etcdserver/api/v3client" "go.etcd.io/etcd/v3/etcdserver/api/v3election" diff --git a/etcdctl/ctlv3/command/alarm_command.go b/etcdctl/ctlv3/command/alarm_command.go index 2a82127f0..454e76930 100644 --- a/etcdctl/ctlv3/command/alarm_command.go +++ b/etcdctl/ctlv3/command/alarm_command.go @@ -18,7 +18,7 @@ import ( "fmt" "github.com/spf13/cobra" - v3 "go.etcd.io/etcd/v3/clientv3" + v3 "go.etcd.io/etcd/client/v3" ) // NewAlarmCommand returns the cobra command for "alarm". diff --git a/etcdctl/ctlv3/command/check.go b/etcdctl/ctlv3/command/check.go index becd46b7a..bc2f6036b 100644 --- a/etcdctl/ctlv3/command/check.go +++ b/etcdctl/ctlv3/command/check.go @@ -25,8 +25,8 @@ import ( "sync" "time" + v3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/pkg/v3/report" - v3 "go.etcd.io/etcd/v3/clientv3" "github.com/spf13/cobra" "golang.org/x/time/rate" diff --git a/etcdctl/ctlv3/command/compaction_command.go b/etcdctl/ctlv3/command/compaction_command.go index 33820b6e8..9f1c1db0c 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/v3/clientv3" + "go.etcd.io/etcd/client/v3" ) var compactPhysical bool diff --git a/etcdctl/ctlv3/command/del_command.go b/etcdctl/ctlv3/command/del_command.go index 391f48eb9..644ea0463 100644 --- a/etcdctl/ctlv3/command/del_command.go +++ b/etcdctl/ctlv3/command/del_command.go @@ -18,7 +18,7 @@ import ( "fmt" "github.com/spf13/cobra" - "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/client/v3" ) var ( diff --git a/etcdctl/ctlv3/command/elect_command.go b/etcdctl/ctlv3/command/elect_command.go index 819a63201..e1445cfec 100644 --- a/etcdctl/ctlv3/command/elect_command.go +++ b/etcdctl/ctlv3/command/elect_command.go @@ -21,8 +21,8 @@ import ( "os/signal" "syscall" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/clientv3/concurrency" + "go.etcd.io/etcd/client/v3" + "go.etcd.io/etcd/client/v3/concurrency" "github.com/spf13/cobra" ) diff --git a/etcdctl/ctlv3/command/ep_command.go b/etcdctl/ctlv3/command/ep_command.go index 76d5be637..bc86b4aa6 100644 --- a/etcdctl/ctlv3/command/ep_command.go +++ b/etcdctl/ctlv3/command/ep_command.go @@ -21,8 +21,8 @@ import ( "time" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" + v3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/pkg/v3/flags" - v3 "go.etcd.io/etcd/v3/clientv3" "github.com/spf13/cobra" "go.uber.org/zap" diff --git a/etcdctl/ctlv3/command/get_command.go b/etcdctl/ctlv3/command/get_command.go index 4f1b2826b..d9ac7004a 100644 --- a/etcdctl/ctlv3/command/get_command.go +++ b/etcdctl/ctlv3/command/get_command.go @@ -19,7 +19,7 @@ import ( "strings" "github.com/spf13/cobra" - "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/client/v3" ) var ( diff --git a/etcdctl/ctlv3/command/global.go b/etcdctl/ctlv3/command/global.go index daf73c0c4..97889c688 100644 --- a/etcdctl/ctlv3/command/global.go +++ b/etcdctl/ctlv3/command/global.go @@ -25,10 +25,10 @@ import ( "time" "github.com/bgentry/speakeasy" + "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/pkg/v3/flags" "go.etcd.io/etcd/pkg/v3/srv" "go.etcd.io/etcd/pkg/v3/transport" - "go.etcd.io/etcd/v3/clientv3" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/etcdctl/ctlv3/command/lease_command.go b/etcdctl/ctlv3/command/lease_command.go index b15cee8d6..e9ee8714e 100644 --- a/etcdctl/ctlv3/command/lease_command.go +++ b/etcdctl/ctlv3/command/lease_command.go @@ -19,7 +19,7 @@ import ( "fmt" "strconv" - v3 "go.etcd.io/etcd/v3/clientv3" + v3 "go.etcd.io/etcd/client/v3" "github.com/spf13/cobra" ) diff --git a/etcdctl/ctlv3/command/lock_command.go b/etcdctl/ctlv3/command/lock_command.go index 6eef22caf..a78a8799b 100644 --- a/etcdctl/ctlv3/command/lock_command.go +++ b/etcdctl/ctlv3/command/lock_command.go @@ -23,8 +23,8 @@ import ( "os/signal" "syscall" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/clientv3/concurrency" + "go.etcd.io/etcd/client/v3" + "go.etcd.io/etcd/client/v3/concurrency" "github.com/spf13/cobra" ) diff --git a/etcdctl/ctlv3/command/make_mirror_command.go b/etcdctl/ctlv3/command/make_mirror_command.go index 9b69077bf..4f031d080 100644 --- a/etcdctl/ctlv3/command/make_mirror_command.go +++ b/etcdctl/ctlv3/command/make_mirror_command.go @@ -25,8 +25,8 @@ import ( "go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/clientv3/mirror" + "go.etcd.io/etcd/client/v3" + "go.etcd.io/etcd/client/v3/mirror" "github.com/spf13/cobra" ) diff --git a/etcdctl/ctlv3/command/member_command.go b/etcdctl/ctlv3/command/member_command.go index c621d361e..729af73a1 100644 --- a/etcdctl/ctlv3/command/member_command.go +++ b/etcdctl/ctlv3/command/member_command.go @@ -21,7 +21,7 @@ import ( "strings" "github.com/spf13/cobra" - "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/client/v3" ) var ( diff --git a/etcdctl/ctlv3/command/move_leader_command.go b/etcdctl/ctlv3/command/move_leader_command.go index 0df8668f2..1aee99b24 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/v3/clientv3" + "go.etcd.io/etcd/client/v3" ) // NewMoveLeaderCommand returns the cobra command for "move-leader". diff --git a/etcdctl/ctlv3/command/printer.go b/etcdctl/ctlv3/command/printer.go index fab26eb0d..fc703bafb 100644 --- a/etcdctl/ctlv3/command/printer.go +++ b/etcdctl/ctlv3/command/printer.go @@ -20,7 +20,7 @@ import ( "strings" pb "go.etcd.io/etcd/api/v3/etcdserverpb" - v3 "go.etcd.io/etcd/v3/clientv3" + v3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/v3/etcdctl/snapshot" "github.com/dustin/go-humanize" diff --git a/etcdctl/ctlv3/command/printer_fields.go b/etcdctl/ctlv3/command/printer_fields.go index c52e02982..abb873ae4 100644 --- a/etcdctl/ctlv3/command/printer_fields.go +++ b/etcdctl/ctlv3/command/printer_fields.go @@ -19,7 +19,7 @@ import ( pb "go.etcd.io/etcd/api/v3/etcdserverpb" spb "go.etcd.io/etcd/api/v3/mvccpb" - v3 "go.etcd.io/etcd/v3/clientv3" + v3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/v3/etcdctl/snapshot" ) diff --git a/etcdctl/ctlv3/command/printer_json.go b/etcdctl/ctlv3/command/printer_json.go index 560621375..93f365580 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/v3/clientv3" + "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/v3/etcdctl/snapshot" ) diff --git a/etcdctl/ctlv3/command/printer_protobuf.go b/etcdctl/ctlv3/command/printer_protobuf.go index 8dd04e39d..ee6c413ff 100644 --- a/etcdctl/ctlv3/command/printer_protobuf.go +++ b/etcdctl/ctlv3/command/printer_protobuf.go @@ -20,7 +20,7 @@ import ( pb "go.etcd.io/etcd/api/v3/etcdserverpb" mvccpb "go.etcd.io/etcd/api/v3/mvccpb" - v3 "go.etcd.io/etcd/v3/clientv3" + v3 "go.etcd.io/etcd/client/v3" ) type pbPrinter struct{ printer } diff --git a/etcdctl/ctlv3/command/printer_simple.go b/etcdctl/ctlv3/command/printer_simple.go index e9a529008..33d285c5f 100644 --- a/etcdctl/ctlv3/command/printer_simple.go +++ b/etcdctl/ctlv3/command/printer_simple.go @@ -20,8 +20,8 @@ import ( "strings" pb "go.etcd.io/etcd/api/v3/etcdserverpb" + v3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/pkg/v3/types" - v3 "go.etcd.io/etcd/v3/clientv3" "go.etcd.io/etcd/v3/etcdctl/snapshot" ) diff --git a/etcdctl/ctlv3/command/printer_table.go b/etcdctl/ctlv3/command/printer_table.go index 9478892ad..3fdaaf608 100644 --- a/etcdctl/ctlv3/command/printer_table.go +++ b/etcdctl/ctlv3/command/printer_table.go @@ -17,7 +17,7 @@ package command import ( "os" - v3 "go.etcd.io/etcd/v3/clientv3" + v3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/v3/etcdctl/snapshot" "github.com/olekukonko/tablewriter" diff --git a/etcdctl/ctlv3/command/put_command.go b/etcdctl/ctlv3/command/put_command.go index 41d101675..2877510c6 100644 --- a/etcdctl/ctlv3/command/put_command.go +++ b/etcdctl/ctlv3/command/put_command.go @@ -20,7 +20,7 @@ import ( "strconv" "github.com/spf13/cobra" - "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/client/v3" ) var ( diff --git a/etcdctl/ctlv3/command/role_command.go b/etcdctl/ctlv3/command/role_command.go index ad6883246..21b1031be 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/v3/clientv3" + "go.etcd.io/etcd/client/v3" ) var ( diff --git a/etcdctl/ctlv3/command/txn_command.go b/etcdctl/ctlv3/command/txn_command.go index a56ea00ee..82d7bd86e 100644 --- a/etcdctl/ctlv3/command/txn_command.go +++ b/etcdctl/ctlv3/command/txn_command.go @@ -23,7 +23,7 @@ import ( "strings" pb "go.etcd.io/etcd/api/v3/etcdserverpb" - "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/client/v3" "github.com/spf13/cobra" ) diff --git a/etcdctl/ctlv3/command/user_command.go b/etcdctl/ctlv3/command/user_command.go index 876c1010c..6a763395f 100644 --- a/etcdctl/ctlv3/command/user_command.go +++ b/etcdctl/ctlv3/command/user_command.go @@ -21,7 +21,7 @@ import ( "github.com/bgentry/speakeasy" "github.com/spf13/cobra" - "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/client/v3" ) var ( diff --git a/etcdctl/ctlv3/command/util.go b/etcdctl/ctlv3/command/util.go index 5c572f069..a05e8d669 100644 --- a/etcdctl/ctlv3/command/util.go +++ b/etcdctl/ctlv3/command/util.go @@ -26,7 +26,7 @@ import ( "time" pb "go.etcd.io/etcd/api/v3/mvccpb" - v3 "go.etcd.io/etcd/v3/clientv3" + v3 "go.etcd.io/etcd/client/v3" "github.com/spf13/cobra" ) diff --git a/etcdctl/ctlv3/command/watch_command.go b/etcdctl/ctlv3/command/watch_command.go index edfecd922..1697511f5 100644 --- a/etcdctl/ctlv3/command/watch_command.go +++ b/etcdctl/ctlv3/command/watch_command.go @@ -23,7 +23,7 @@ import ( "os/exec" "strings" - "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/client/v3" "github.com/spf13/cobra" ) diff --git a/etcdctl/snapshot/v3_snapshot.go b/etcdctl/snapshot/v3_snapshot.go index 411fc98d4..865a95d43 100644 --- a/etcdctl/snapshot/v3_snapshot.go +++ b/etcdctl/snapshot/v3_snapshot.go @@ -29,13 +29,13 @@ import ( bolt "go.etcd.io/bbolt" "go.etcd.io/etcd/api/v3/etcdserverpb" + "go.etcd.io/etcd/client/v3" + "go.etcd.io/etcd/client/v3/snapshot" "go.etcd.io/etcd/pkg/v3/fileutil" "go.etcd.io/etcd/pkg/v3/traceutil" "go.etcd.io/etcd/pkg/v3/types" "go.etcd.io/etcd/raft/v3" "go.etcd.io/etcd/raft/v3/raftpb" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/clientv3/snapshot" "go.etcd.io/etcd/v3/etcdserver" "go.etcd.io/etcd/v3/etcdserver/api/membership" "go.etcd.io/etcd/v3/etcdserver/api/snap" diff --git a/etcdmain/grpc_proxy.go b/etcdmain/grpc_proxy.go index c5dfe42f3..c8e927582 100644 --- a/etcdmain/grpc_proxy.go +++ b/etcdmain/grpc_proxy.go @@ -30,13 +30,13 @@ import ( "time" pb "go.etcd.io/etcd/api/v3/etcdserverpb" + "go.etcd.io/etcd/client/v3" + "go.etcd.io/etcd/client/v3/leasing" + "go.etcd.io/etcd/client/v3/namespace" + "go.etcd.io/etcd/client/v3/ordering" "go.etcd.io/etcd/pkg/v3/debugutil" "go.etcd.io/etcd/pkg/v3/logutil" "go.etcd.io/etcd/pkg/v3/transport" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/clientv3/leasing" - "go.etcd.io/etcd/v3/clientv3/namespace" - "go.etcd.io/etcd/v3/clientv3/ordering" "go.etcd.io/etcd/v3/embed" "go.etcd.io/etcd/v3/etcdserver/api/v3election/v3electionpb" "go.etcd.io/etcd/v3/etcdserver/api/v3lock/v3lockpb" diff --git a/etcdserver/api/v2v3/server.go b/etcdserver/api/v2v3/server.go index 19446affa..2b3471bcf 100644 --- a/etcdserver/api/v2v3/server.go +++ b/etcdserver/api/v2v3/server.go @@ -20,8 +20,8 @@ import ( "time" pb "go.etcd.io/etcd/api/v3/etcdserverpb" + "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/pkg/v3/types" - "go.etcd.io/etcd/v3/clientv3" "go.etcd.io/etcd/v3/etcdserver" "go.etcd.io/etcd/v3/etcdserver/api" "go.etcd.io/etcd/v3/etcdserver/api/membership" diff --git a/etcdserver/api/v2v3/store.go b/etcdserver/api/v2v3/store.go index d225181b4..65e4255a8 100644 --- a/etcdserver/api/v2v3/store.go +++ b/etcdserver/api/v2v3/store.go @@ -23,8 +23,8 @@ import ( "time" "go.etcd.io/etcd/api/v3/mvccpb" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/clientv3/concurrency" + "go.etcd.io/etcd/client/v3" + "go.etcd.io/etcd/client/v3/concurrency" "go.etcd.io/etcd/v3/etcdserver/api/v2error" "go.etcd.io/etcd/v3/etcdserver/api/v2store" ) diff --git a/etcdserver/api/v2v3/watcher.go b/etcdserver/api/v2v3/watcher.go index 201fb783e..b75b75fba 100644 --- a/etcdserver/api/v2v3/watcher.go +++ b/etcdserver/api/v2v3/watcher.go @@ -18,7 +18,7 @@ import ( "context" "strings" - "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/v3/etcdserver/api/v2error" "go.etcd.io/etcd/v3/etcdserver/api/v2store" ) diff --git a/etcdserver/api/v3client/v3client.go b/etcdserver/api/v3client/v3client.go index 5a8107b9f..1b269b4a2 100644 --- a/etcdserver/api/v3client/v3client.go +++ b/etcdserver/api/v3client/v3client.go @@ -18,7 +18,7 @@ import ( "context" "time" - "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/v3/etcdserver" "go.etcd.io/etcd/v3/etcdserver/api/v3rpc" "go.etcd.io/etcd/v3/proxy/grpcproxy/adapter" diff --git a/etcdserver/api/v3election/election.go b/etcdserver/api/v3election/election.go index 7a2058b06..edfebd3dc 100644 --- a/etcdserver/api/v3election/election.go +++ b/etcdserver/api/v3election/election.go @@ -18,8 +18,8 @@ import ( "context" "errors" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/clientv3/concurrency" + "go.etcd.io/etcd/client/v3" + "go.etcd.io/etcd/client/v3/concurrency" epb "go.etcd.io/etcd/v3/etcdserver/api/v3election/v3electionpb" ) diff --git a/etcdserver/api/v3lock/lock.go b/etcdserver/api/v3lock/lock.go index ec3fb407e..80cb6b573 100644 --- a/etcdserver/api/v3lock/lock.go +++ b/etcdserver/api/v3lock/lock.go @@ -17,8 +17,8 @@ package v3lock import ( "context" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/clientv3/concurrency" + "go.etcd.io/etcd/client/v3" + "go.etcd.io/etcd/client/v3/concurrency" "go.etcd.io/etcd/v3/etcdserver/api/v3lock/v3lockpb" ) diff --git a/etcdserver/api/v3rpc/grpc.go b/etcdserver/api/v3rpc/grpc.go index f3c973d7b..46a44b56d 100644 --- a/etcdserver/api/v3rpc/grpc.go +++ b/etcdserver/api/v3rpc/grpc.go @@ -23,7 +23,7 @@ import ( grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware" grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" - "go.etcd.io/etcd/v3/clientv3/credentials" + "go.etcd.io/etcd/client/v3/credentials" "google.golang.org/grpc" "google.golang.org/grpc/health" healthpb "google.golang.org/grpc/health/grpc_health_v1" diff --git a/proxy/grpcproxy/auth.go b/proxy/grpcproxy/auth.go index be699d9ca..0cabfc146 100644 --- a/proxy/grpcproxy/auth.go +++ b/proxy/grpcproxy/auth.go @@ -18,7 +18,7 @@ import ( "context" pb "go.etcd.io/etcd/api/v3/etcdserverpb" - "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/client/v3" ) type AuthProxy struct { diff --git a/proxy/grpcproxy/cluster.go b/proxy/grpcproxy/cluster.go index 5f3ab7658..58e1a9e4a 100644 --- a/proxy/grpcproxy/cluster.go +++ b/proxy/grpcproxy/cluster.go @@ -23,8 +23,8 @@ import ( pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/clientv3/naming" + "go.etcd.io/etcd/client/v3" + "go.etcd.io/etcd/client/v3/naming" "go.uber.org/zap" "golang.org/x/time/rate" diff --git a/proxy/grpcproxy/election.go b/proxy/grpcproxy/election.go index 49421b6ea..ba7387c8d 100644 --- a/proxy/grpcproxy/election.go +++ b/proxy/grpcproxy/election.go @@ -17,7 +17,7 @@ package grpcproxy import ( "context" - "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/v3/etcdserver/api/v3election/v3electionpb" ) diff --git a/proxy/grpcproxy/health.go b/proxy/grpcproxy/health.go index a546dadae..85c8659e1 100644 --- a/proxy/grpcproxy/health.go +++ b/proxy/grpcproxy/health.go @@ -21,7 +21,7 @@ import ( "time" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" - "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/v3/etcdserver/api/etcdhttp" "go.uber.org/zap" ) diff --git a/proxy/grpcproxy/kv.go b/proxy/grpcproxy/kv.go index 6fbbedf00..af5a0700e 100644 --- a/proxy/grpcproxy/kv.go +++ b/proxy/grpcproxy/kv.go @@ -18,7 +18,7 @@ import ( "context" pb "go.etcd.io/etcd/api/v3/etcdserverpb" - "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/v3/proxy/grpcproxy/cache" ) diff --git a/proxy/grpcproxy/leader.go b/proxy/grpcproxy/leader.go index ea0115c4e..c078c89bb 100644 --- a/proxy/grpcproxy/leader.go +++ b/proxy/grpcproxy/leader.go @@ -19,7 +19,7 @@ import ( "math" "sync" - "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/client/v3" "golang.org/x/time/rate" ) diff --git a/proxy/grpcproxy/lease.go b/proxy/grpcproxy/lease.go index 5fb3cad4a..1f3ef552f 100644 --- a/proxy/grpcproxy/lease.go +++ b/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/v3/clientv3" + "go.etcd.io/etcd/client/v3" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/proxy/grpcproxy/lock.go b/proxy/grpcproxy/lock.go index 4a903b743..ebadfba80 100644 --- a/proxy/grpcproxy/lock.go +++ b/proxy/grpcproxy/lock.go @@ -17,7 +17,7 @@ package grpcproxy import ( "context" - "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/v3/etcdserver/api/v3lock/v3lockpb" ) diff --git a/proxy/grpcproxy/maintenance.go b/proxy/grpcproxy/maintenance.go index 82cc53616..3e8165625 100644 --- a/proxy/grpcproxy/maintenance.go +++ b/proxy/grpcproxy/maintenance.go @@ -19,7 +19,7 @@ import ( "io" pb "go.etcd.io/etcd/api/v3/etcdserverpb" - "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/client/v3" ) type maintenanceProxy struct { diff --git a/proxy/grpcproxy/register.go b/proxy/grpcproxy/register.go index e74cd5ca9..dcd7d4d86 100644 --- a/proxy/grpcproxy/register.go +++ b/proxy/grpcproxy/register.go @@ -18,9 +18,9 @@ import ( "encoding/json" "os" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/clientv3/concurrency" - "go.etcd.io/etcd/v3/clientv3/naming" + "go.etcd.io/etcd/client/v3" + "go.etcd.io/etcd/client/v3/concurrency" + "go.etcd.io/etcd/client/v3/naming" "go.uber.org/zap" "golang.org/x/time/rate" diff --git a/proxy/grpcproxy/watch.go b/proxy/grpcproxy/watch.go index e884d9bd1..0ee6b5b96 100644 --- a/proxy/grpcproxy/watch.go +++ b/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/v3/clientv3" + "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/v3/etcdserver/api/v3rpc" "go.uber.org/zap" diff --git a/proxy/grpcproxy/watch_broadcast.go b/proxy/grpcproxy/watch_broadcast.go index e7d901e53..fb49fedf0 100644 --- a/proxy/grpcproxy/watch_broadcast.go +++ b/proxy/grpcproxy/watch_broadcast.go @@ -20,7 +20,7 @@ import ( "time" pb "go.etcd.io/etcd/api/v3/etcdserverpb" - "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/client/v3" "go.uber.org/zap" ) diff --git a/proxy/grpcproxy/watcher.go b/proxy/grpcproxy/watcher.go index 881fe030c..fcc2fc970 100644 --- a/proxy/grpcproxy/watcher.go +++ b/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/v3/clientv3" + "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/v3/mvcc" ) diff --git a/raft/go.sum b/raft/go.sum index eeb4cc223..efb3c59bd 100644 --- a/raft/go.sum +++ b/raft/go.sum @@ -52,9 +52,7 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= -go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= -go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= diff --git a/tests/e2e/ctl_v3_alarm_test.go b/tests/e2e/ctl_v3_alarm_test.go index a6ef5e398..e4f500604 100644 --- a/tests/e2e/ctl_v3_alarm_test.go +++ b/tests/e2e/ctl_v3_alarm_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/client/v3" ) func TestCtlV3Alarm(t *testing.T) { diff --git a/tests/e2e/ctl_v3_auth_test.go b/tests/e2e/ctl_v3_auth_test.go index e37ba96ad..c892b6d37 100644 --- a/tests/e2e/ctl_v3_auth_test.go +++ b/tests/e2e/ctl_v3_auth_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/client/v3" ) func TestCtlV3AuthEnable(t *testing.T) { testCtl(t, authEnableTest) } diff --git a/tests/e2e/ctl_v3_endpoint_test.go b/tests/e2e/ctl_v3_endpoint_test.go index 7d1416bdf..3c4e7d72b 100644 --- a/tests/e2e/ctl_v3_endpoint_test.go +++ b/tests/e2e/ctl_v3_endpoint_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/client/v3" ) func TestCtlV3EndpointHealth(t *testing.T) { testCtl(t, endpointHealthTest, withQuorum()) } diff --git a/tests/e2e/ctl_v3_migrate_test.go b/tests/e2e/ctl_v3_migrate_test.go index 07eeef135..a034c2625 100644 --- a/tests/e2e/ctl_v3_migrate_test.go +++ b/tests/e2e/ctl_v3_migrate_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" + "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/pkg/v3/testutil" - "go.etcd.io/etcd/v3/clientv3" ) func TestCtlV3Migrate(t *testing.T) { diff --git a/tests/e2e/ctl_v3_move_leader_test.go b/tests/e2e/ctl_v3_move_leader_test.go index 43a0b3ce4..adb0c7c0e 100644 --- a/tests/e2e/ctl_v3_move_leader_test.go +++ b/tests/e2e/ctl_v3_move_leader_test.go @@ -22,10 +22,10 @@ import ( "testing" "time" + "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/pkg/v3/testutil" "go.etcd.io/etcd/pkg/v3/transport" "go.etcd.io/etcd/pkg/v3/types" - "go.etcd.io/etcd/v3/clientv3" ) func TestCtlV3MoveLeaderSecure(t *testing.T) { diff --git a/tests/e2e/etcd_corrupt_test.go b/tests/e2e/etcd_corrupt_test.go index 78f448662..4a7dea9c5 100644 --- a/tests/e2e/etcd_corrupt_test.go +++ b/tests/e2e/etcd_corrupt_test.go @@ -24,7 +24,7 @@ import ( "time" "go.etcd.io/etcd/api/v3/mvccpb" - "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/client/v3" bolt "go.etcd.io/bbolt" ) diff --git a/tests/functional/rpcpb/member.go b/tests/functional/rpcpb/member.go index 6fbd44e14..68e23184c 100644 --- a/tests/functional/rpcpb/member.go +++ b/tests/functional/rpcpb/member.go @@ -23,9 +23,9 @@ import ( "time" pb "go.etcd.io/etcd/api/v3/etcdserverpb" + "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/pkg/v3/logutil" "go.etcd.io/etcd/pkg/v3/transport" - "go.etcd.io/etcd/v3/clientv3" "go.etcd.io/etcd/v3/etcdctl/snapshot" "github.com/dustin/go-humanize" diff --git a/tests/functional/runner/election_command.go b/tests/functional/runner/election_command.go index 1cec694e2..4a0d194bd 100644 --- a/tests/functional/runner/election_command.go +++ b/tests/functional/runner/election_command.go @@ -19,7 +19,7 @@ import ( "errors" "fmt" - "go.etcd.io/etcd/v3/clientv3/concurrency" + "go.etcd.io/etcd/client/v3/concurrency" "github.com/spf13/cobra" ) diff --git a/tests/functional/runner/global.go b/tests/functional/runner/global.go index b99466caf..902baac66 100644 --- a/tests/functional/runner/global.go +++ b/tests/functional/runner/global.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/client/v3" "github.com/spf13/cobra" "golang.org/x/time/rate" diff --git a/tests/functional/runner/lease_renewer_command.go b/tests/functional/runner/lease_renewer_command.go index 6418ef0db..e7b147d75 100644 --- a/tests/functional/runner/lease_renewer_command.go +++ b/tests/functional/runner/lease_renewer_command.go @@ -21,7 +21,7 @@ import ( "log" "time" - "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/client/v3" "github.com/spf13/cobra" "google.golang.org/grpc/codes" diff --git a/tests/functional/runner/lock_racer_command.go b/tests/functional/runner/lock_racer_command.go index ffde9f5f4..c6f1b9410 100644 --- a/tests/functional/runner/lock_racer_command.go +++ b/tests/functional/runner/lock_racer_command.go @@ -20,7 +20,7 @@ import ( "fmt" "sync" - "go.etcd.io/etcd/v3/clientv3/concurrency" + "go.etcd.io/etcd/client/v3/concurrency" "github.com/spf13/cobra" ) diff --git a/tests/functional/runner/watch_command.go b/tests/functional/runner/watch_command.go index 32f074bc3..d3a7e11e9 100644 --- a/tests/functional/runner/watch_command.go +++ b/tests/functional/runner/watch_command.go @@ -22,8 +22,8 @@ import ( "sync" "time" + "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/pkg/v3/stringutil" - "go.etcd.io/etcd/v3/clientv3" "github.com/spf13/cobra" "golang.org/x/time/rate" diff --git a/tests/functional/tester/case_sigquit_remove.go b/tests/functional/tester/case_sigquit_remove.go index e1cf5ca95..add3b572b 100644 --- a/tests/functional/tester/case_sigquit_remove.go +++ b/tests/functional/tester/case_sigquit_remove.go @@ -21,8 +21,8 @@ import ( "strings" "time" + "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/tests/v3/functional/rpcpb" - "go.etcd.io/etcd/v3/clientv3" "go.uber.org/zap" ) diff --git a/tests/functional/tester/case_sigquit_remove_quorum.go b/tests/functional/tester/case_sigquit_remove_quorum.go index 545be7f75..401cfbeca 100644 --- a/tests/functional/tester/case_sigquit_remove_quorum.go +++ b/tests/functional/tester/case_sigquit_remove_quorum.go @@ -20,8 +20,8 @@ import ( "strings" "time" + "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/tests/v3/functional/rpcpb" - "go.etcd.io/etcd/v3/clientv3" "go.uber.org/zap" ) diff --git a/tests/functional/tester/checker_lease_expire.go b/tests/functional/tester/checker_lease_expire.go index edd03bfe8..daed56024 100644 --- a/tests/functional/tester/checker_lease_expire.go +++ b/tests/functional/tester/checker_lease_expire.go @@ -20,8 +20,8 @@ import ( "time" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" + "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/tests/v3/functional/rpcpb" - "go.etcd.io/etcd/v3/clientv3" "go.uber.org/zap" "google.golang.org/grpc" diff --git a/tests/functional/tester/stresser_key.go b/tests/functional/tester/stresser_key.go index 4741fb989..df5c342ef 100644 --- a/tests/functional/tester/stresser_key.go +++ b/tests/functional/tester/stresser_key.go @@ -24,9 +24,9 @@ import ( "time" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" + "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/raft/v3" "go.etcd.io/etcd/tests/v3/functional/rpcpb" - "go.etcd.io/etcd/v3/clientv3" "go.etcd.io/etcd/v3/etcdserver" "go.uber.org/zap" diff --git a/tests/functional/tester/stresser_lease.go b/tests/functional/tester/stresser_lease.go index 9fca573c3..2ce2b6aa3 100644 --- a/tests/functional/tester/stresser_lease.go +++ b/tests/functional/tester/stresser_lease.go @@ -23,8 +23,8 @@ import ( "time" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" + "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/tests/v3/functional/rpcpb" - "go.etcd.io/etcd/v3/clientv3" "go.uber.org/zap" "golang.org/x/time/rate" diff --git a/tests/integration/clientv3/black_hole_test.go b/tests/integration/clientv3/black_hole_test.go index bcb8d7943..0e5d71c60 100644 --- a/tests/integration/clientv3/black_hole_test.go +++ b/tests/integration/clientv3/black_hole_test.go @@ -22,9 +22,9 @@ import ( "time" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" + "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/pkg/v3/testutil" "go.etcd.io/etcd/tests/v3/integration" - "go.etcd.io/etcd/v3/clientv3" "google.golang.org/grpc" ) diff --git a/tests/integration/clientv3/concurrency/election_test.go b/tests/integration/clientv3/concurrency/election_test.go index ab0cb6709..fd518e3b5 100644 --- a/tests/integration/clientv3/concurrency/election_test.go +++ b/tests/integration/clientv3/concurrency/election_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/clientv3/concurrency" + "go.etcd.io/etcd/client/v3" + "go.etcd.io/etcd/client/v3/concurrency" ) func TestResumeElection(t *testing.T) { diff --git a/tests/integration/clientv3/concurrency/example_election_test.go b/tests/integration/clientv3/concurrency/example_election_test.go index 1d6864cfb..7c9e968eb 100644 --- a/tests/integration/clientv3/concurrency/example_election_test.go +++ b/tests/integration/clientv3/concurrency/example_election_test.go @@ -21,8 +21,8 @@ import ( "sync" "time" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/clientv3/concurrency" + "go.etcd.io/etcd/client/v3" + "go.etcd.io/etcd/client/v3/concurrency" ) func mockElection_Campaign() { diff --git a/tests/integration/clientv3/concurrency/example_mutex_test.go b/tests/integration/clientv3/concurrency/example_mutex_test.go index 357806663..671f464d7 100644 --- a/tests/integration/clientv3/concurrency/example_mutex_test.go +++ b/tests/integration/clientv3/concurrency/example_mutex_test.go @@ -19,8 +19,8 @@ import ( "fmt" "log" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/clientv3/concurrency" + "go.etcd.io/etcd/client/v3" + "go.etcd.io/etcd/client/v3/concurrency" ) func mockMutex_TryLock() { diff --git a/tests/integration/clientv3/concurrency/example_stm_test.go b/tests/integration/clientv3/concurrency/example_stm_test.go index a66fbabe2..59dcf5357 100644 --- a/tests/integration/clientv3/concurrency/example_stm_test.go +++ b/tests/integration/clientv3/concurrency/example_stm_test.go @@ -21,8 +21,8 @@ import ( "math/rand" "sync" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/clientv3/concurrency" + "go.etcd.io/etcd/client/v3" + "go.etcd.io/etcd/client/v3/concurrency" ) func mockSTM_apply() { diff --git a/tests/integration/clientv3/concurrency/mutex_test.go b/tests/integration/clientv3/concurrency/mutex_test.go index e6b3c3466..7180b9ab8 100644 --- a/tests/integration/clientv3/concurrency/mutex_test.go +++ b/tests/integration/clientv3/concurrency/mutex_test.go @@ -18,8 +18,8 @@ import ( "context" "testing" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/clientv3/concurrency" + "go.etcd.io/etcd/client/v3" + "go.etcd.io/etcd/client/v3/concurrency" ) func TestMutexLockSessionExpired(t *testing.T) { diff --git a/tests/integration/clientv3/dial_test.go b/tests/integration/clientv3/dial_test.go index dd63442d5..dcb8c662c 100644 --- a/tests/integration/clientv3/dial_test.go +++ b/tests/integration/clientv3/dial_test.go @@ -22,10 +22,10 @@ import ( "time" pb "go.etcd.io/etcd/api/v3/etcdserverpb" + "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/pkg/v3/testutil" "go.etcd.io/etcd/pkg/v3/transport" "go.etcd.io/etcd/tests/v3/integration" - "go.etcd.io/etcd/v3/clientv3" "google.golang.org/grpc" ) diff --git a/tests/integration/clientv3/examples/example_auth_test.go b/tests/integration/clientv3/examples/example_auth_test.go index afb35736b..29ed4b61c 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/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 e7c4f22a8..933e7fc5a 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/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 23ba4a968..6fa6b23dd 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/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 63346762c..7fe7949b8 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/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 80759a37f..0426ea553 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/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 10d2e06b3..cdcd91854 100644 --- a/tests/integration/clientv3/examples/example_metrics_test.go +++ b/tests/integration/clientv3/examples/example_metrics_test.go @@ -23,7 +23,7 @@ import ( "net/http" "strings" - "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/client/v3" grpcprom "github.com/grpc-ecosystem/go-grpc-prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" diff --git a/tests/integration/clientv3/examples/example_test.go b/tests/integration/clientv3/examples/example_test.go index 41831c7fc..f93308acc 100644 --- a/tests/integration/clientv3/examples/example_test.go +++ b/tests/integration/clientv3/examples/example_test.go @@ -16,8 +16,8 @@ package clientv3_test import ( "context" + "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/pkg/v3/transport" - "go.etcd.io/etcd/v3/clientv3" "log" ) diff --git a/tests/integration/clientv3/examples/example_watch_test.go b/tests/integration/clientv3/examples/example_watch_test.go index f60286ede..b5c9e808a 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/v3/clientv3" + "go.etcd.io/etcd/client/v3" ) func mockWatcher_watch() { diff --git a/tests/integration/clientv3/grpc_test.go b/tests/integration/clientv3/grpc_test.go index b5ca13b3d..d2c13afab 100644 --- a/tests/integration/clientv3/grpc_test.go +++ b/tests/integration/clientv3/grpc_test.go @@ -20,10 +20,10 @@ import ( "reflect" "testing" + etcd "go.etcd.io/etcd/client/v3" + namingv3 "go.etcd.io/etcd/client/v3/naming" "go.etcd.io/etcd/pkg/v3/testutil" "go.etcd.io/etcd/tests/v3/integration" - etcd "go.etcd.io/etcd/v3/clientv3" - namingv3 "go.etcd.io/etcd/v3/clientv3/naming" "google.golang.org/grpc/naming" ) diff --git a/tests/integration/clientv3/kv_test.go b/tests/integration/clientv3/kv_test.go index 34a560644..1b87515ea 100644 --- a/tests/integration/clientv3/kv_test.go +++ b/tests/integration/clientv3/kv_test.go @@ -28,9 +28,9 @@ import ( "go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/api/v3/version" + "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/pkg/v3/testutil" "go.etcd.io/etcd/tests/v3/integration" - "go.etcd.io/etcd/v3/clientv3" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/tests/integration/clientv3/lease_test.go b/tests/integration/clientv3/lease_test.go index 411935a17..c86d63fa0 100644 --- a/tests/integration/clientv3/lease_test.go +++ b/tests/integration/clientv3/lease_test.go @@ -24,10 +24,10 @@ import ( "time" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" + "go.etcd.io/etcd/client/v3" + "go.etcd.io/etcd/client/v3/concurrency" "go.etcd.io/etcd/pkg/v3/testutil" "go.etcd.io/etcd/tests/v3/integration" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/clientv3/concurrency" ) func TestLeaseNotFoundError(t *testing.T) { diff --git a/tests/integration/clientv3/leasing_test.go b/tests/integration/clientv3/leasing_test.go index c75083b47..b0edc3be9 100644 --- a/tests/integration/clientv3/leasing_test.go +++ b/tests/integration/clientv3/leasing_test.go @@ -23,11 +23,11 @@ import ( "testing" "time" + "go.etcd.io/etcd/client/v3" + "go.etcd.io/etcd/client/v3/concurrency" + "go.etcd.io/etcd/client/v3/leasing" "go.etcd.io/etcd/pkg/v3/testutil" "go.etcd.io/etcd/tests/v3/integration" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/clientv3/concurrency" - "go.etcd.io/etcd/v3/clientv3/leasing" ) func TestLeasingPutGet(t *testing.T) { diff --git a/tests/integration/clientv3/logger_test.go b/tests/integration/clientv3/logger_test.go index 0d85287d2..f80968b47 100644 --- a/tests/integration/clientv3/logger_test.go +++ b/tests/integration/clientv3/logger_test.go @@ -17,7 +17,7 @@ package clientv3test import ( "io/ioutil" - "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/client/v3" "google.golang.org/grpc/grpclog" ) diff --git a/tests/integration/clientv3/maintenance_test.go b/tests/integration/clientv3/maintenance_test.go index bc19f9cc3..53f864830 100644 --- a/tests/integration/clientv3/maintenance_test.go +++ b/tests/integration/clientv3/maintenance_test.go @@ -29,9 +29,9 @@ import ( "google.golang.org/grpc" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" + "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/pkg/v3/testutil" "go.etcd.io/etcd/tests/v3/integration" - "go.etcd.io/etcd/v3/clientv3" "go.etcd.io/etcd/v3/lease" "go.etcd.io/etcd/v3/mvcc" "go.etcd.io/etcd/v3/mvcc/backend" diff --git a/tests/integration/clientv3/metrics_test.go b/tests/integration/clientv3/metrics_test.go index c89f03af7..c051a75b3 100644 --- a/tests/integration/clientv3/metrics_test.go +++ b/tests/integration/clientv3/metrics_test.go @@ -25,10 +25,10 @@ import ( "testing" "time" + "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/pkg/v3/testutil" "go.etcd.io/etcd/pkg/v3/transport" "go.etcd.io/etcd/tests/v3/integration" - "go.etcd.io/etcd/v3/clientv3" grpcprom "github.com/grpc-ecosystem/go-grpc-prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" diff --git a/tests/integration/clientv3/mirror_test.go b/tests/integration/clientv3/mirror_test.go index 782c02be0..bce951d1f 100644 --- a/tests/integration/clientv3/mirror_test.go +++ b/tests/integration/clientv3/mirror_test.go @@ -23,9 +23,9 @@ import ( "time" "go.etcd.io/etcd/api/v3/mvccpb" + "go.etcd.io/etcd/client/v3/mirror" "go.etcd.io/etcd/pkg/v3/testutil" "go.etcd.io/etcd/tests/v3/integration" - "go.etcd.io/etcd/v3/clientv3/mirror" ) func TestMirrorSync(t *testing.T) { diff --git a/tests/integration/clientv3/namespace_test.go b/tests/integration/clientv3/namespace_test.go index c1af9e131..3e46ff411 100644 --- a/tests/integration/clientv3/namespace_test.go +++ b/tests/integration/clientv3/namespace_test.go @@ -20,10 +20,10 @@ import ( "testing" "go.etcd.io/etcd/api/v3/mvccpb" + "go.etcd.io/etcd/client/v3" + "go.etcd.io/etcd/client/v3/namespace" "go.etcd.io/etcd/pkg/v3/testutil" "go.etcd.io/etcd/tests/v3/integration" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/clientv3/namespace" ) func TestNamespacePutGet(t *testing.T) { diff --git a/tests/integration/clientv3/network_partition_test.go b/tests/integration/clientv3/network_partition_test.go index 129057161..af2927b13 100644 --- a/tests/integration/clientv3/network_partition_test.go +++ b/tests/integration/clientv3/network_partition_test.go @@ -24,9 +24,9 @@ import ( pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" + "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/pkg/v3/testutil" "go.etcd.io/etcd/tests/v3/integration" - "go.etcd.io/etcd/v3/clientv3" "google.golang.org/grpc" ) diff --git a/tests/integration/clientv3/ordering_kv_test.go b/tests/integration/clientv3/ordering_kv_test.go index 8c8251826..5338313c9 100644 --- a/tests/integration/clientv3/ordering_kv_test.go +++ b/tests/integration/clientv3/ordering_kv_test.go @@ -20,10 +20,10 @@ import ( "testing" "time" + "go.etcd.io/etcd/client/v3" + "go.etcd.io/etcd/client/v3/ordering" "go.etcd.io/etcd/pkg/v3/testutil" "go.etcd.io/etcd/tests/v3/integration" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/clientv3/ordering" ) func TestDetectKvOrderViolation(t *testing.T) { diff --git a/tests/integration/clientv3/ordering_util_test.go b/tests/integration/clientv3/ordering_util_test.go index 780ecacad..efce2bb0d 100644 --- a/tests/integration/clientv3/ordering_util_test.go +++ b/tests/integration/clientv3/ordering_util_test.go @@ -19,10 +19,10 @@ import ( "testing" "time" + "go.etcd.io/etcd/client/v3" + "go.etcd.io/etcd/client/v3/ordering" "go.etcd.io/etcd/pkg/v3/testutil" "go.etcd.io/etcd/tests/v3/integration" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/clientv3/ordering" ) func TestEndpointSwitchResolvesViolation(t *testing.T) { diff --git a/tests/integration/clientv3/server_shutdown_test.go b/tests/integration/clientv3/server_shutdown_test.go index a3e7ceac4..32d6bb877 100644 --- a/tests/integration/clientv3/server_shutdown_test.go +++ b/tests/integration/clientv3/server_shutdown_test.go @@ -22,9 +22,9 @@ import ( "time" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" + "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/pkg/v3/testutil" "go.etcd.io/etcd/tests/v3/integration" - "go.etcd.io/etcd/v3/clientv3" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/tests/integration/clientv3/snapshot/v3_snapshot_test.go b/tests/integration/clientv3/snapshot/v3_snapshot_test.go index 8f8382615..e42cf608d 100644 --- a/tests/integration/clientv3/snapshot/v3_snapshot_test.go +++ b/tests/integration/clientv3/snapshot/v3_snapshot_test.go @@ -24,10 +24,10 @@ import ( "testing" "time" + "go.etcd.io/etcd/client/v3" + "go.etcd.io/etcd/client/v3/snapshot" "go.etcd.io/etcd/pkg/v3/fileutil" "go.etcd.io/etcd/pkg/v3/testutil" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/clientv3/snapshot" "go.etcd.io/etcd/v3/embed" "go.uber.org/zap" diff --git a/tests/integration/clientv3/txn_test.go b/tests/integration/clientv3/txn_test.go index 9d32c62ba..50802064b 100644 --- a/tests/integration/clientv3/txn_test.go +++ b/tests/integration/clientv3/txn_test.go @@ -21,9 +21,9 @@ import ( "time" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" + "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/pkg/v3/testutil" "go.etcd.io/etcd/tests/v3/integration" - "go.etcd.io/etcd/v3/clientv3" "go.etcd.io/etcd/v3/embed" ) diff --git a/tests/integration/clientv3/user_test.go b/tests/integration/clientv3/user_test.go index 12910e90e..b775b5959 100644 --- a/tests/integration/clientv3/user_test.go +++ b/tests/integration/clientv3/user_test.go @@ -20,9 +20,9 @@ import ( "time" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" + "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/pkg/v3/testutil" "go.etcd.io/etcd/tests/v3/integration" - "go.etcd.io/etcd/v3/clientv3" "google.golang.org/grpc" ) diff --git a/tests/integration/clientv3/util.go b/tests/integration/clientv3/util.go index 9be209a8d..10df3b872 100644 --- a/tests/integration/clientv3/util.go +++ b/tests/integration/clientv3/util.go @@ -19,7 +19,7 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/client/v3" ) // mustWaitPinReady waits up to 3-second until connection is up (pin endpoint). diff --git a/tests/integration/clientv3/watch_fragment_test.go b/tests/integration/clientv3/watch_fragment_test.go index 8804ce00d..483a5d7cd 100644 --- a/tests/integration/clientv3/watch_fragment_test.go +++ b/tests/integration/clientv3/watch_fragment_test.go @@ -23,9 +23,9 @@ import ( "testing" "time" + "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/pkg/v3/testutil" "go.etcd.io/etcd/tests/v3/integration" - "go.etcd.io/etcd/v3/clientv3" ) // TestWatchFragmentDisable ensures that large watch diff --git a/tests/integration/clientv3/watch_test.go b/tests/integration/clientv3/watch_test.go index 30e4a590f..2418b7119 100644 --- a/tests/integration/clientv3/watch_test.go +++ b/tests/integration/clientv3/watch_test.go @@ -27,9 +27,9 @@ import ( mvccpb "go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/api/v3/version" + "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/pkg/v3/testutil" "go.etcd.io/etcd/tests/v3/integration" - "go.etcd.io/etcd/v3/clientv3" "go.etcd.io/etcd/v3/etcdserver/api/v3rpc" "google.golang.org/grpc/metadata" diff --git a/tests/integration/cluster.go b/tests/integration/cluster.go index 5885eb4ac..55e46de28 100644 --- a/tests/integration/cluster.go +++ b/tests/integration/cluster.go @@ -35,12 +35,12 @@ import ( pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/client/v2" + "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/pkg/v3/logutil" "go.etcd.io/etcd/pkg/v3/testutil" "go.etcd.io/etcd/pkg/v3/tlsutil" "go.etcd.io/etcd/pkg/v3/transport" "go.etcd.io/etcd/pkg/v3/types" - "go.etcd.io/etcd/v3/clientv3" "go.etcd.io/etcd/v3/embed" "go.etcd.io/etcd/v3/etcdserver" "go.etcd.io/etcd/v3/etcdserver/api/etcdhttp" diff --git a/tests/integration/cluster_direct.go b/tests/integration/cluster_direct.go index c0b15908b..b5dc397fe 100644 --- a/tests/integration/cluster_direct.go +++ b/tests/integration/cluster_direct.go @@ -18,7 +18,7 @@ package integration import ( pb "go.etcd.io/etcd/api/v3/etcdserverpb" - "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/v3/etcdserver/api/v3election/v3electionpb" "go.etcd.io/etcd/v3/etcdserver/api/v3lock/v3lockpb" ) diff --git a/tests/integration/cluster_proxy.go b/tests/integration/cluster_proxy.go index 5d439b29a..7a5a9236f 100644 --- a/tests/integration/cluster_proxy.go +++ b/tests/integration/cluster_proxy.go @@ -20,8 +20,8 @@ import ( "context" "sync" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/clientv3/namespace" + "go.etcd.io/etcd/client/v3" + "go.etcd.io/etcd/client/v3/namespace" "go.etcd.io/etcd/v3/proxy/grpcproxy" "go.etcd.io/etcd/v3/proxy/grpcproxy/adapter" diff --git a/tests/integration/embed/embed_test.go b/tests/integration/embed/embed_test.go index 8c6a3887a..a8b11859c 100644 --- a/tests/integration/embed/embed_test.go +++ b/tests/integration/embed/embed_test.go @@ -29,9 +29,9 @@ import ( "testing" "time" + "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/pkg/v3/testutil" "go.etcd.io/etcd/pkg/v3/transport" - "go.etcd.io/etcd/v3/clientv3" "go.etcd.io/etcd/v3/embed" ) diff --git a/tests/integration/logger_test.go b/tests/integration/logger_test.go index 7fc4ed67f..a9fd53b26 100644 --- a/tests/integration/logger_test.go +++ b/tests/integration/logger_test.go @@ -17,7 +17,7 @@ package integration import ( "io/ioutil" - "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/client/v3" "google.golang.org/grpc/grpclog" ) diff --git a/tests/integration/proxy/grpcproxy/cluster_test.go b/tests/integration/proxy/grpcproxy/cluster_test.go index c6311152b..6632f9926 100644 --- a/tests/integration/proxy/grpcproxy/cluster_test.go +++ b/tests/integration/proxy/grpcproxy/cluster_test.go @@ -21,9 +21,9 @@ import ( "time" pb "go.etcd.io/etcd/api/v3/etcdserverpb" + "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/pkg/v3/testutil" "go.etcd.io/etcd/tests/v3/integration" - "go.etcd.io/etcd/v3/clientv3" "go.etcd.io/etcd/v3/proxy/grpcproxy" "go.uber.org/zap" diff --git a/tests/integration/proxy/grpcproxy/kv_test.go b/tests/integration/proxy/grpcproxy/kv_test.go index 50d8943a2..fc1f94f1a 100644 --- a/tests/integration/proxy/grpcproxy/kv_test.go +++ b/tests/integration/proxy/grpcproxy/kv_test.go @@ -21,9 +21,9 @@ import ( "time" pb "go.etcd.io/etcd/api/v3/etcdserverpb" + "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/pkg/v3/testutil" "go.etcd.io/etcd/tests/v3/integration" - "go.etcd.io/etcd/v3/clientv3" "go.etcd.io/etcd/v3/proxy/grpcproxy" "google.golang.org/grpc" diff --git a/tests/integration/proxy/grpcproxy/register_test.go b/tests/integration/proxy/grpcproxy/register_test.go index fe76d0585..84473dc79 100644 --- a/tests/integration/proxy/grpcproxy/register_test.go +++ b/tests/integration/proxy/grpcproxy/register_test.go @@ -18,10 +18,10 @@ import ( "testing" "time" + "go.etcd.io/etcd/client/v3" + "go.etcd.io/etcd/client/v3/naming" "go.etcd.io/etcd/pkg/v3/testutil" "go.etcd.io/etcd/tests/v3/integration" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/clientv3/naming" "go.etcd.io/etcd/v3/proxy/grpcproxy" "go.uber.org/zap" diff --git a/tests/integration/snapshot/member_test.go b/tests/integration/snapshot/member_test.go index e2c609ad5..eaa107f86 100644 --- a/tests/integration/snapshot/member_test.go +++ b/tests/integration/snapshot/member_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" + "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/pkg/v3/testutil" - "go.etcd.io/etcd/v3/clientv3" "go.etcd.io/etcd/v3/embed" "go.etcd.io/etcd/v3/etcdserver" ) diff --git a/tests/integration/snapshot/v3_snapshot_test.go b/tests/integration/snapshot/v3_snapshot_test.go index b37bf5dc2..40a4e32db 100644 --- a/tests/integration/snapshot/v3_snapshot_test.go +++ b/tests/integration/snapshot/v3_snapshot_test.go @@ -25,8 +25,8 @@ import ( "testing" "time" + "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/pkg/v3/testutil" - "go.etcd.io/etcd/v3/clientv3" "go.etcd.io/etcd/v3/embed" "go.etcd.io/etcd/v3/etcdctl/snapshot" diff --git a/tests/integration/v2store/store_tag_v2v3_test.go b/tests/integration/v2store/store_tag_v2v3_test.go index b0c05b0bc..0ea609315 100644 --- a/tests/integration/v2store/store_tag_v2v3_test.go +++ b/tests/integration/v2store/store_tag_v2v3_test.go @@ -20,8 +20,8 @@ import ( "io/ioutil" "testing" + "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/tests/v3/integration" - "go.etcd.io/etcd/v3/clientv3" "go.etcd.io/etcd/v3/etcdserver/api/v2store" "go.etcd.io/etcd/v3/etcdserver/api/v2v3" diff --git a/tests/integration/v2store/store_v2v3_test.go b/tests/integration/v2store/store_v2v3_test.go index 6d6269360..bf125ccf5 100644 --- a/tests/integration/v2store/store_v2v3_test.go +++ b/tests/integration/v2store/store_v2v3_test.go @@ -18,7 +18,7 @@ import ( "strings" "testing" - "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/v3/etcdserver/api/v2store" "go.etcd.io/etcd/v3/etcdserver/api/v2v3" ) diff --git a/tests/integration/v3_auth_test.go b/tests/integration/v3_auth_test.go index 39103b653..dc186824d 100644 --- a/tests/integration/v3_auth_test.go +++ b/tests/integration/v3_auth_test.go @@ -24,8 +24,8 @@ import ( "go.etcd.io/etcd/api/v3/authpb" pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" + "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/pkg/v3/testutil" - "go.etcd.io/etcd/v3/clientv3" ) // TestV3AuthEmptyUserGet ensures that a get with an empty user will return an empty user error. diff --git a/tests/integration/v3_barrier_test.go b/tests/integration/v3_barrier_test.go index c209cdae7..bba58633b 100644 --- a/tests/integration/v3_barrier_test.go +++ b/tests/integration/v3_barrier_test.go @@ -18,8 +18,8 @@ import ( "testing" "time" + "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/pkg/v3/testutil" - "go.etcd.io/etcd/v3/clientv3" recipe "go.etcd.io/etcd/v3/contrib/recipes" ) diff --git a/tests/integration/v3_double_barrier_test.go b/tests/integration/v3_double_barrier_test.go index 77f12f2e6..da234d595 100644 --- a/tests/integration/v3_double_barrier_test.go +++ b/tests/integration/v3_double_barrier_test.go @@ -18,7 +18,7 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/clientv3/concurrency" + "go.etcd.io/etcd/client/v3/concurrency" recipe "go.etcd.io/etcd/v3/contrib/recipes" ) diff --git a/tests/integration/v3_election_test.go b/tests/integration/v3_election_test.go index 31c867a8f..cef981e45 100644 --- a/tests/integration/v3_election_test.go +++ b/tests/integration/v3_election_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/clientv3/concurrency" + "go.etcd.io/etcd/client/v3" + "go.etcd.io/etcd/client/v3/concurrency" ) // TestElectionWait tests if followers can correctly wait for elections. diff --git a/tests/integration/v3_grpc_test.go b/tests/integration/v3_grpc_test.go index c42ba8b89..3cd94c70e 100644 --- a/tests/integration/v3_grpc_test.go +++ b/tests/integration/v3_grpc_test.go @@ -27,9 +27,9 @@ import ( pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" + "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/pkg/v3/testutil" "go.etcd.io/etcd/pkg/v3/transport" - "go.etcd.io/etcd/v3/clientv3" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/tests/integration/v3_kv_test.go b/tests/integration/v3_kv_test.go index f989e84f4..68bdeaf95 100644 --- a/tests/integration/v3_kv_test.go +++ b/tests/integration/v3_kv_test.go @@ -2,9 +2,9 @@ package integration import ( "context" + "go.etcd.io/etcd/client/v3" + "go.etcd.io/etcd/client/v3/namespace" "go.etcd.io/etcd/pkg/v3/testutil" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/clientv3/namespace" "go.etcd.io/etcd/v3/embed" "go.etcd.io/etcd/v3/etcdserver/api/v3client" "io/ioutil" diff --git a/tests/integration/v3_lock_test.go b/tests/integration/v3_lock_test.go index 89614332c..89a219d68 100644 --- a/tests/integration/v3_lock_test.go +++ b/tests/integration/v3_lock_test.go @@ -22,9 +22,9 @@ import ( "time" "go.etcd.io/etcd/api/v3/mvccpb" + "go.etcd.io/etcd/client/v3" + "go.etcd.io/etcd/client/v3/concurrency" "go.etcd.io/etcd/pkg/v3/testutil" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/clientv3/concurrency" recipe "go.etcd.io/etcd/v3/contrib/recipes" ) diff --git a/tests/integration/v3_stm_test.go b/tests/integration/v3_stm_test.go index 0d6a21a1c..dc3085b83 100644 --- a/tests/integration/v3_stm_test.go +++ b/tests/integration/v3_stm_test.go @@ -21,9 +21,9 @@ import ( "strconv" "testing" + v3 "go.etcd.io/etcd/client/v3" + "go.etcd.io/etcd/client/v3/concurrency" "go.etcd.io/etcd/pkg/v3/testutil" - v3 "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/clientv3/concurrency" ) // TestSTMConflict tests that conflicts are retried. diff --git a/tests/integration/v3_tls_test.go b/tests/integration/v3_tls_test.go index 0c22f0425..7a050964a 100644 --- a/tests/integration/v3_tls_test.go +++ b/tests/integration/v3_tls_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" + "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/pkg/v3/testutil" - "go.etcd.io/etcd/v3/clientv3" "google.golang.org/grpc" ) diff --git a/tools/benchmark/cmd/lease.go b/tools/benchmark/cmd/lease.go index 5350b08bb..a5de62b45 100644 --- a/tools/benchmark/cmd/lease.go +++ b/tools/benchmark/cmd/lease.go @@ -19,8 +19,8 @@ import ( "fmt" "time" + v3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/pkg/v3/report" - v3 "go.etcd.io/etcd/v3/clientv3" "github.com/spf13/cobra" "gopkg.in/cheggaaa/pb.v1" diff --git a/tools/benchmark/cmd/put.go b/tools/benchmark/cmd/put.go index 1b0f1447f..a83d57081 100644 --- a/tools/benchmark/cmd/put.go +++ b/tools/benchmark/cmd/put.go @@ -24,8 +24,8 @@ import ( "strings" "time" + v3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/pkg/v3/report" - v3 "go.etcd.io/etcd/v3/clientv3" "github.com/dustin/go-humanize" "github.com/spf13/cobra" diff --git a/tools/benchmark/cmd/range.go b/tools/benchmark/cmd/range.go index b8279bb80..fc503b71b 100644 --- a/tools/benchmark/cmd/range.go +++ b/tools/benchmark/cmd/range.go @@ -21,8 +21,8 @@ import ( "os" "time" + v3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/pkg/v3/report" - v3 "go.etcd.io/etcd/v3/clientv3" "github.com/spf13/cobra" "golang.org/x/time/rate" diff --git a/tools/benchmark/cmd/stm.go b/tools/benchmark/cmd/stm.go index 6ebb80984..b20c3910a 100644 --- a/tools/benchmark/cmd/stm.go +++ b/tools/benchmark/cmd/stm.go @@ -23,9 +23,9 @@ import ( "os" "time" + v3 "go.etcd.io/etcd/client/v3" + v3sync "go.etcd.io/etcd/client/v3/concurrency" "go.etcd.io/etcd/pkg/v3/report" - v3 "go.etcd.io/etcd/v3/clientv3" - v3sync "go.etcd.io/etcd/v3/clientv3/concurrency" "go.etcd.io/etcd/v3/etcdserver/api/v3lock/v3lockpb" "github.com/spf13/cobra" diff --git a/tools/benchmark/cmd/txn_put.go b/tools/benchmark/cmd/txn_put.go index 33a95026b..7558054c5 100644 --- a/tools/benchmark/cmd/txn_put.go +++ b/tools/benchmark/cmd/txn_put.go @@ -22,8 +22,8 @@ import ( "os" "time" + v3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/pkg/v3/report" - v3 "go.etcd.io/etcd/v3/clientv3" "github.com/spf13/cobra" "golang.org/x/time/rate" diff --git a/tools/benchmark/cmd/util.go b/tools/benchmark/cmd/util.go index 45bf017ca..725975983 100644 --- a/tools/benchmark/cmd/util.go +++ b/tools/benchmark/cmd/util.go @@ -22,8 +22,8 @@ import ( "strings" "github.com/bgentry/speakeasy" + "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/pkg/v3/report" - "go.etcd.io/etcd/v3/clientv3" "google.golang.org/grpc/grpclog" ) diff --git a/tools/benchmark/cmd/watch.go b/tools/benchmark/cmd/watch.go index e7570b542..e25ee41ec 100644 --- a/tools/benchmark/cmd/watch.go +++ b/tools/benchmark/cmd/watch.go @@ -23,8 +23,8 @@ import ( "sync/atomic" "time" + "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/pkg/v3/report" - "go.etcd.io/etcd/v3/clientv3" "github.com/spf13/cobra" "golang.org/x/time/rate" diff --git a/tools/benchmark/cmd/watch_get.go b/tools/benchmark/cmd/watch_get.go index 3b42c37fe..31ada8a7c 100644 --- a/tools/benchmark/cmd/watch_get.go +++ b/tools/benchmark/cmd/watch_get.go @@ -20,8 +20,8 @@ import ( "sync" "time" + v3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/pkg/v3/report" - v3 "go.etcd.io/etcd/v3/clientv3" "github.com/spf13/cobra" "gopkg.in/cheggaaa/pb.v1" diff --git a/tools/benchmark/cmd/watch_latency.go b/tools/benchmark/cmd/watch_latency.go index 0593f9849..ed46c065d 100644 --- a/tools/benchmark/cmd/watch_latency.go +++ b/tools/benchmark/cmd/watch_latency.go @@ -21,8 +21,8 @@ import ( "sync" "time" + "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/pkg/v3/report" - "go.etcd.io/etcd/v3/clientv3" "github.com/spf13/cobra" "golang.org/x/time/rate" diff --git a/tools/etcd-dump-metrics/etcd.go b/tools/etcd-dump-metrics/etcd.go index 4b47757e1..6d4dd6cbf 100644 --- a/tools/etcd-dump-metrics/etcd.go +++ b/tools/etcd-dump-metrics/etcd.go @@ -23,7 +23,7 @@ import ( "strings" "time" - "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/v3/embed" "go.uber.org/zap"