From e3cdd3ae9c91dc6ec09d1b6e3ec1810a570fa15a Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Tue, 28 May 2019 14:57:27 -0700 Subject: [PATCH 1/8] travis: fix GO111MODULE, import paths Signed-off-by: Gyuho Lee --- .travis.yml | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6f34f24f2d8..8d31a93e506 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,12 @@ language: go -go_import_path: go.etcd.io/etcd/v3 +go_import_path: go.etcd.io/etcd sudo: required services: docker go: -- 1.11.4 +- 1.12.5 - tip notifications: @@ -14,8 +14,6 @@ notifications: on_failure: never env: - global: - - GO111MODULE=on matrix: - TARGET=linux-amd64-fmt - TARGET=linux-amd64-integration-1-cpu @@ -32,13 +30,13 @@ env: matrix: fast_finish: true allow_failures: - - go: 1.11.4 + - go: 1.12.5 env: TARGET=linux-amd64-grpcproxy - - go: 1.11.4 + - go: 1.12.5 env: TARGET=linux-amd64-coverage - go: tip env: TARGET=linux-amd64-fmt-unit-go-tip - - go: 1.11.4 + - go: 1.12.5 env: TARGET=linux-386-unit exclude: - go: tip @@ -59,7 +57,7 @@ matrix: env: TARGET=linux-amd64-grpcproxy - go: tip env: TARGET=linux-amd64-coverage - - go: 1.11.4 + - go: 1.12.5 env: TARGET=linux-amd64-fmt-unit-go-tip - go: tip env: TARGET=linux-386-unit @@ -67,45 +65,45 @@ matrix: before_install: - if [[ $TRAVIS_GO_VERSION == 1.* ]]; then docker pull gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION}; fi -install: true - +install: +- go get -t -v -d ./... script: - echo "TRAVIS_GO_VERSION=${TRAVIS_GO_VERSION}" - > case "${TARGET}" in linux-amd64-fmt) - docker run --rm -e GO111MODULE \ + docker run --rm \ --volume=`pwd`:/go/src/go.etcd.io/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \ /bin/bash -c "GOARCH=amd64 PASSES='fmt bom dep' ./test" ;; linux-amd64-integration-1-cpu) - docker run --rm -e GO111MODULE \ + docker run --rm \ --volume=`pwd`:/go/src/go.etcd.io/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \ /bin/bash -c "GOARCH=amd64 CPU=1 PASSES='integration' ./test" ;; linux-amd64-integration-2-cpu) - docker run --rm -e GO111MODULE \ + docker run --rm \ --volume=`pwd`:/go/src/go.etcd.io/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \ /bin/bash -c "GOARCH=amd64 CPU=2 PASSES='integration' ./test" ;; linux-amd64-integration-4-cpu) - docker run --rm -e GO111MODULE \ + docker run --rm \ --volume=`pwd`:/go/src/go.etcd.io/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \ /bin/bash -c "GOARCH=amd64 CPU=4 PASSES='integration' ./test" ;; linux-amd64-functional) - docker run --rm -e GO111MODULE \ + docker run --rm \ --volume=`pwd`:/go/src/go.etcd.io/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \ /bin/bash -c "./build && GOARCH=amd64 PASSES='functional' ./test" ;; linux-amd64-unit) - docker run --rm -e GO111MODULE \ + docker run --rm \ --volume=`pwd`:/go/src/go.etcd.io/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \ /bin/bash -c "GOARCH=amd64 PASSES='unit' ./test" ;; all-build) - docker run --rm -e GO111MODULE \ + docker run --rm \ --volume=`pwd`:/go/src/go.etcd.io/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \ /bin/bash -c "GOARCH=amd64 PASSES='build' ./test \ && GOARCH=386 PASSES='build' ./test \ @@ -125,7 +123,7 @@ script: GOARCH=amd64 PASSES='fmt unit' ./test ;; linux-386-unit) - docker run --rm -e GO111MODULE \ + docker run --rm \ --volume=`pwd`:/go/src/go.etcd.io/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \ /bin/bash -c "GOARCH=386 PASSES='unit' ./test" ;; From 986f16e032439fda4c32da608d2e22a10032e9f9 Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Tue, 28 May 2019 14:57:56 -0700 Subject: [PATCH 2/8] CHANGELOG: remove import path change Signed-off-by: Gyuho Lee --- CHANGELOG-3.4.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/CHANGELOG-3.4.md b/CHANGELOG-3.4.md index ea7bd7805b0..216299632c9 100644 --- a/CHANGELOG-3.4.md +++ b/CHANGELOG-3.4.md @@ -62,8 +62,6 @@ See [code changes](https://github.com/etcd-io/etcd/compare/v3.3.0...v3.4.0) and - Move [`"github.com/coreos/etcd"`](https://github.com/etcd-io/etcd/issues/9965) to [`"github.com/etcd-io/etcd"`](https://github.com/etcd-io/etcd/issues/9965). - Change import path to `"go.etcd.io/etcd"`. - e.g. `import "go.etcd.io/etcd/raft"`. - - Updated [module path to comply with Go module specification](https://github.com/etcd-io/etcd/pull/10640). - - e.g. `import "go.etcd.io/etcd/mvcc/backend"` is now `import "go.etcd.io/etcd/v3/mvcc/backend"`. - Make [`ETCDCTL_API=3 etcdctl` default](https://github.com/etcd-io/etcd/issues/9600). - Now, `etcdctl set foo bar` must be `ETCDCTL_API=2 etcdctl set foo bar`. - Now, `ETCDCTL_API=3 etcdctl put foo bar` could be just `etcdctl put foo bar`. From 75e440b1053841a9ff2b5f365aa78cb8dfb26eae Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Tue, 28 May 2019 14:58:09 -0700 Subject: [PATCH 3/8] build: fix import path Signed-off-by: Gyuho Lee --- build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build b/build index be8de43f130..2d2ee5cf16c 100755 --- a/build +++ b/build @@ -2,7 +2,7 @@ # set some environment variables ORG_PATH="go.etcd.io" -REPO_PATH="${ORG_PATH}/etcd/v3" +REPO_PATH="${ORG_PATH}/etcd" GIT_SHA=$(git rev-parse --short HEAD || echo "GitNotFound") if [[ -n "$FAILPOINTS" ]]; then From 05378f0d5d386378d75fa1c6a118e8f6f544da0b Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Tue, 28 May 2019 14:58:22 -0700 Subject: [PATCH 4/8] Makefile: upgrade default Go version Signed-off-by: Gyuho Lee --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 21ba4860038..4f5fb4e09e5 100644 --- a/Makefile +++ b/Makefile @@ -51,7 +51,7 @@ docker-remove: -GO_VERSION ?= 1.11.4 +GO_VERSION ?= 1.12.5 ETCD_VERSION ?= $(shell git rev-parse --short HEAD || echo "GitNotFound") TEST_SUFFIX = $(shell date +%s | base64 | head -c 15) From c8ffa36d9e473a9cb2d570f9176c9109b066df68 Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Tue, 28 May 2019 14:58:43 -0700 Subject: [PATCH 5/8] scripts/genproto: bump up protoc 3.7.1 Signed-off-by: Gyuho Lee --- scripts/genproto.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/genproto.sh b/scripts/genproto.sh index 3ec9c77c23a..99b57ba5368 100755 --- a/scripts/genproto.sh +++ b/scripts/genproto.sh @@ -10,8 +10,8 @@ if ! [[ "$0" =~ scripts/genproto.sh ]]; then exit 255 fi -if [[ $(protoc --version | cut -f2 -d' ') != "3.6.1" ]]; then - echo "could not find protoc 3.6.1, is it installed + in PATH?" +if [[ $(protoc --version | cut -f2 -d' ') != "3.7.1" ]]; then + echo "could not find protoc 3.7.1, is it installed + in PATH?" exit 255 fi From 34bd797e6754911ee540e8c87f708f88ffe89f37 Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Tue, 28 May 2019 14:59:02 -0700 Subject: [PATCH 6/8] *: revert module import paths Signed-off-by: Gyuho Lee --- .../dev-guide/api_concurrency_reference_v3.md | 4 +- Documentation/dev-guide/api_reference_v3.md | 4 +- auth/range_perm_cache.go | 6 +-- auth/range_perm_cache_test.go | 4 +- auth/store.go | 8 +-- auth/store_test.go | 8 +-- client/client.go | 2 +- client/client_test.go | 4 +- client/discover.go | 2 +- client/doc.go | 2 +- client/example_keys_test.go | 2 +- client/integration/client_test.go | 6 +-- client/integration/main_test.go | 2 +- client/keys.go | 2 +- client/main_test.go | 6 +-- client/members.go | 2 +- client/members_test.go | 2 +- clientv3/auth.go | 4 +- clientv3/balancer/balancer.go | 2 +- clientv3/balancer/balancer_test.go | 8 +-- clientv3/balancer/config.go | 2 +- clientv3/balancer/grpc1.7-health_test.go | 4 +- clientv3/client.go | 10 ++-- clientv3/client_test.go | 4 +- clientv3/clientv3util/example_key_test.go | 4 +- clientv3/clientv3util/util.go | 2 +- clientv3/cluster.go | 4 +- clientv3/compact_op.go | 2 +- clientv3/compact_op_test.go | 2 +- clientv3/compare.go | 2 +- clientv3/concurrency/election.go | 6 +-- clientv3/concurrency/election_test.go | 4 +- clientv3/concurrency/example_election_test.go | 4 +- clientv3/concurrency/example_mutex_test.go | 4 +- clientv3/concurrency/example_stm_test.go | 4 +- clientv3/concurrency/key.go | 6 +-- clientv3/concurrency/main_test.go | 4 +- clientv3/concurrency/mutex.go | 4 +- clientv3/concurrency/session.go | 2 +- clientv3/concurrency/stm.go | 2 +- clientv3/example_auth_test.go | 2 +- clientv3/example_cluster_test.go | 2 +- clientv3/example_kv_test.go | 4 +- clientv3/example_lease_test.go | 2 +- clientv3/example_maintenance_test.go | 2 +- clientv3/example_metrics_test.go | 2 +- clientv3/example_test.go | 4 +- clientv3/example_watch_test.go | 2 +- clientv3/integration/black_hole_test.go | 8 +-- clientv3/integration/cluster_test.go | 6 +-- clientv3/integration/dial_test.go | 10 ++-- clientv3/integration/kv_test.go | 10 ++-- clientv3/integration/lease_test.go | 10 ++-- clientv3/integration/leasing_test.go | 10 ++-- clientv3/integration/logger_test.go | 2 +- clientv3/integration/main_test.go | 2 +- clientv3/integration/maintenance_test.go | 14 ++--- clientv3/integration/metrics_test.go | 8 +-- clientv3/integration/mirror_test.go | 8 +-- clientv3/integration/namespace_test.go | 10 ++-- .../integration/network_partition_test.go | 10 ++-- clientv3/integration/role_test.go | 6 +-- clientv3/integration/server_shutdown_test.go | 8 +-- clientv3/integration/txn_test.go | 10 ++-- clientv3/integration/user_test.go | 8 +-- clientv3/integration/util.go | 2 +- clientv3/integration/watch_fragment_test.go | 6 +-- clientv3/integration/watch_test.go | 12 ++--- clientv3/kv.go | 2 +- clientv3/lease.go | 4 +- clientv3/leasing/cache.go | 6 +-- clientv3/leasing/kv.go | 10 ++-- clientv3/leasing/txn.go | 4 +- clientv3/leasing/util.go | 4 +- clientv3/logger.go | 2 +- clientv3/main_test.go | 4 +- clientv3/maintenance.go | 2 +- clientv3/mirror/syncer.go | 2 +- clientv3/namespace/kv.go | 6 +-- clientv3/namespace/lease.go | 2 +- clientv3/namespace/watch.go | 2 +- clientv3/naming/doc.go | 4 +- clientv3/naming/grpc.go | 2 +- clientv3/naming/grpc_test.go | 6 +-- clientv3/op.go | 2 +- clientv3/op_test.go | 2 +- clientv3/ordering/kv.go | 2 +- clientv3/ordering/kv_test.go | 8 +-- clientv3/ordering/logger_test.go | 2 +- clientv3/ordering/util.go | 2 +- clientv3/ordering/util_test.go | 6 +-- clientv3/retry.go | 4 +- clientv3/retry_interceptor.go | 2 +- clientv3/snapshot/member_test.go | 8 +-- clientv3/snapshot/v3_snapshot.go | 30 +++++------ clientv3/snapshot/v3_snapshot_test.go | 8 +-- clientv3/txn.go | 2 +- clientv3/txn_test.go | 2 +- clientv3/watch.go | 6 +-- clientv3/watch_test.go | 2 +- clientv3/yaml/config.go | 4 +- contrib/raftexample/httpapi.go | 2 +- contrib/raftexample/kvstore.go | 2 +- contrib/raftexample/main.go | 2 +- contrib/raftexample/raft.go | 18 +++---- contrib/raftexample/raftexample_test.go | 2 +- contrib/recipes/barrier.go | 4 +- contrib/recipes/client.go | 4 +- contrib/recipes/double_barrier.go | 6 +-- contrib/recipes/key.go | 4 +- contrib/recipes/priority_queue.go | 4 +- contrib/recipes/queue.go | 4 +- contrib/recipes/rwmutex.go | 6 +-- contrib/recipes/watch.go | 4 +- embed/config.go | 16 +++--- embed/config_logging.go | 2 +- embed/config_logging_journal_unix.go | 2 +- embed/config_test.go | 2 +- embed/doc.go | 2 +- embed/etcd.go | 24 ++++----- embed/serve.go | 26 ++++----- embed/serve_test.go | 2 +- embed/util.go | 2 +- etcdctl/ctlv2/command/auth_commands.go | 2 +- etcdctl/ctlv2/command/backup_command.go | 18 +++---- etcdctl/ctlv2/command/cluster_health.go | 2 +- etcdctl/ctlv2/command/error.go | 2 +- etcdctl/ctlv2/command/exec_watch_command.go | 2 +- etcdctl/ctlv2/command/format.go | 2 +- etcdctl/ctlv2/command/get_command.go | 2 +- etcdctl/ctlv2/command/ls_command.go | 2 +- etcdctl/ctlv2/command/mk_command.go | 2 +- etcdctl/ctlv2/command/mkdir_command.go | 2 +- etcdctl/ctlv2/command/rm_command.go | 2 +- etcdctl/ctlv2/command/rmdir_command.go | 2 +- etcdctl/ctlv2/command/role_commands.go | 4 +- etcdctl/ctlv2/command/set_command.go | 2 +- etcdctl/ctlv2/command/set_dir_command.go | 2 +- etcdctl/ctlv2/command/update_command.go | 2 +- etcdctl/ctlv2/command/update_dir_command.go | 2 +- etcdctl/ctlv2/command/user_commands.go | 2 +- etcdctl/ctlv2/command/util.go | 4 +- etcdctl/ctlv2/command/watch_command.go | 2 +- etcdctl/ctlv2/ctl.go | 4 +- etcdctl/ctlv3/command/alarm_command.go | 2 +- etcdctl/ctlv3/command/auth_command.go | 2 +- etcdctl/ctlv3/command/check.go | 4 +- etcdctl/ctlv3/command/compaction_command.go | 2 +- etcdctl/ctlv3/command/defrag_command.go | 2 +- etcdctl/ctlv3/command/del_command.go | 2 +- etcdctl/ctlv3/command/elect_command.go | 4 +- etcdctl/ctlv3/command/ep_command.go | 6 +-- etcdctl/ctlv3/command/error.go | 2 +- etcdctl/ctlv3/command/get_command.go | 2 +- etcdctl/ctlv3/command/global.go | 8 +-- etcdctl/ctlv3/command/lease_command.go | 2 +- etcdctl/ctlv3/command/lock_command.go | 4 +- etcdctl/ctlv3/command/make_mirror_command.go | 8 +-- etcdctl/ctlv3/command/member_command.go | 2 +- etcdctl/ctlv3/command/migrate_command.go | 32 +++++------ etcdctl/ctlv3/command/move_leader_command.go | 2 +- etcdctl/ctlv3/command/printer.go | 6 +-- etcdctl/ctlv3/command/printer_fields.go | 8 +-- etcdctl/ctlv3/command/printer_json.go | 2 +- etcdctl/ctlv3/command/printer_protobuf.go | 6 +-- etcdctl/ctlv3/command/printer_simple.go | 8 +-- etcdctl/ctlv3/command/printer_table.go | 4 +- etcdctl/ctlv3/command/put_command.go | 2 +- etcdctl/ctlv3/command/role_command.go | 2 +- etcdctl/ctlv3/command/snapshot_command.go | 2 +- etcdctl/ctlv3/command/txn_command.go | 4 +- etcdctl/ctlv3/command/util.go | 4 +- etcdctl/ctlv3/command/version_command.go | 2 +- etcdctl/ctlv3/command/watch_command.go | 2 +- etcdctl/ctlv3/ctl.go | 2 +- etcdctl/ctlv3/ctl_cov.go | 2 +- etcdctl/ctlv3/ctl_nocov.go | 2 +- etcdctl/ctlv3/help.go | 2 +- etcdctl/main.go | 4 +- etcdmain/config.go | 8 +-- etcdmain/config_test.go | 2 +- etcdmain/etcd.go | 22 ++++---- etcdmain/gateway.go | 2 +- etcdmain/grpc_proxy.go | 22 ++++---- etcdmain/help.go | 2 +- etcdmain/util.go | 4 +- etcdserver/api/capability.go | 2 +- etcdserver/api/cluster.go | 4 +- etcdserver/api/etcdhttp/base.go | 12 ++--- etcdserver/api/etcdhttp/metrics.go | 6 +-- etcdserver/api/etcdhttp/peer.go | 8 +-- etcdserver/api/etcdhttp/peer_test.go | 8 +-- etcdserver/api/etcdhttp/version_test.go | 2 +- etcdserver/api/membership/cluster.go | 14 ++--- etcdserver/api/membership/cluster_test.go | 10 ++-- etcdserver/api/membership/errors.go | 2 +- etcdserver/api/membership/member.go | 2 +- etcdserver/api/membership/member_test.go | 2 +- etcdserver/api/membership/store.go | 6 +-- etcdserver/api/rafthttp/coder.go | 2 +- etcdserver/api/rafthttp/functional_test.go | 8 +-- etcdserver/api/rafthttp/http.go | 10 ++-- etcdserver/api/rafthttp/http_test.go | 10 ++-- etcdserver/api/rafthttp/msg_codec.go | 4 +- etcdserver/api/rafthttp/msg_codec_test.go | 2 +- etcdserver/api/rafthttp/msgappv2_codec.go | 8 +-- .../api/rafthttp/msgappv2_codec_test.go | 6 +-- etcdserver/api/rafthttp/peer.go | 10 ++-- etcdserver/api/rafthttp/peer_status.go | 2 +- etcdserver/api/rafthttp/peer_test.go | 2 +- etcdserver/api/rafthttp/pipeline.go | 10 ++-- etcdserver/api/rafthttp/pipeline_test.go | 10 ++-- etcdserver/api/rafthttp/remote.go | 4 +- etcdserver/api/rafthttp/snapshot_sender.go | 10 ++-- etcdserver/api/rafthttp/snapshot_test.go | 6 +-- etcdserver/api/rafthttp/stream.go | 12 ++--- etcdserver/api/rafthttp/stream_test.go | 10 ++-- etcdserver/api/rafthttp/transport.go | 14 ++--- .../api/rafthttp/transport_bench_test.go | 8 +-- etcdserver/api/rafthttp/transport_test.go | 8 +-- etcdserver/api/rafthttp/urlpick.go | 2 +- etcdserver/api/rafthttp/urlpick_test.go | 2 +- etcdserver/api/rafthttp/util.go | 6 +-- etcdserver/api/rafthttp/util_test.go | 4 +- etcdserver/api/snap/db.go | 2 +- etcdserver/api/snap/message.go | 4 +- etcdserver/api/snap/snapshotter.go | 10 ++-- etcdserver/api/snap/snapshotter_test.go | 2 +- etcdserver/api/v2auth/auth.go | 8 +-- etcdserver/api/v2auth/auth_requests.go | 6 +-- etcdserver/api/v2auth/auth_test.go | 8 +-- etcdserver/api/v2discovery/discovery.go | 6 +-- etcdserver/api/v2discovery/discovery_test.go | 2 +- etcdserver/api/v2http/capability.go | 4 +- etcdserver/api/v2http/client.go | 22 ++++---- etcdserver/api/v2http/client_auth.go | 6 +-- etcdserver/api/v2http/client_auth_test.go | 4 +- etcdserver/api/v2http/client_test.go | 20 +++---- etcdserver/api/v2http/http.go | 8 +-- etcdserver/api/v2http/http_test.go | 12 ++--- etcdserver/api/v2http/httptypes/member.go | 2 +- .../api/v2http/httptypes/member_test.go | 2 +- etcdserver/api/v2http/metrics.go | 6 +-- etcdserver/api/v2stats/server.go | 2 +- etcdserver/api/v2store/event_history.go | 2 +- etcdserver/api/v2store/event_test.go | 2 +- etcdserver/api/v2store/node.go | 2 +- etcdserver/api/v2store/node_extern_test.go | 2 +- etcdserver/api/v2store/stats_test.go | 2 +- etcdserver/api/v2store/store.go | 4 +- etcdserver/api/v2store/store_test.go | 6 +-- etcdserver/api/v2store/store_ttl_test.go | 4 +- etcdserver/api/v2store/store_v2_test.go | 4 +- etcdserver/api/v2store/store_v2v3_test.go | 8 +-- etcdserver/api/v2store/watcher_hub.go | 2 +- etcdserver/api/v2v3/cluster.go | 4 +- etcdserver/api/v2v3/server.go | 12 ++--- etcdserver/api/v2v3/store.go | 10 ++-- etcdserver/api/v2v3/watcher.go | 6 +-- etcdserver/api/v3alarm/alarms.go | 6 +-- etcdserver/api/v3client/doc.go | 4 +- etcdserver/api/v3client/v3client.go | 8 +-- etcdserver/api/v3compactor/compactor.go | 2 +- etcdserver/api/v3compactor/compactor_test.go | 4 +- etcdserver/api/v3compactor/periodic.go | 4 +- etcdserver/api/v3compactor/periodic_test.go | 4 +- etcdserver/api/v3compactor/revision.go | 4 +- etcdserver/api/v3compactor/revision_test.go | 4 +- etcdserver/api/v3election/election.go | 6 +-- .../v3electionpb/gw/v3election.pb.gw.go | 2 +- .../v3election/v3electionpb/v3election.pb.go | 4 +- .../v3election/v3electionpb/v3election.proto | 4 +- etcdserver/api/v3lock/lock.go | 6 +-- .../api/v3lock/v3lockpb/gw/v3lock.pb.gw.go | 2 +- etcdserver/api/v3lock/v3lockpb/v3lock.pb.go | 2 +- etcdserver/api/v3lock/v3lockpb/v3lock.proto | 2 +- etcdserver/api/v3rpc/auth.go | 4 +- etcdserver/api/v3rpc/grpc.go | 4 +- etcdserver/api/v3rpc/header.go | 4 +- etcdserver/api/v3rpc/interceptor.go | 12 ++--- etcdserver/api/v3rpc/key.go | 8 +-- etcdserver/api/v3rpc/lease.go | 8 +-- etcdserver/api/v3rpc/maintenance.go | 16 +++--- etcdserver/api/v3rpc/member.go | 12 ++--- etcdserver/api/v3rpc/quota.go | 8 +-- etcdserver/api/v3rpc/util.go | 14 ++--- etcdserver/api/v3rpc/util_test.go | 4 +- etcdserver/api/v3rpc/watch.go | 12 ++--- etcdserver/api/v3rpc/watch_test.go | 4 +- etcdserver/apply.go | 12 ++--- etcdserver/apply_auth.go | 8 +-- etcdserver/apply_v2.go | 8 +-- etcdserver/backend.go | 10 ++-- etcdserver/cluster_util.go | 6 +-- etcdserver/cluster_util_test.go | 4 +- etcdserver/config.go | 6 +-- etcdserver/config_test.go | 2 +- etcdserver/corrupt.go | 10 ++-- etcdserver/etcdserverpb/gw/rpc.pb.gw.go | 2 +- etcdserver/etcdserverpb/rpc.pb.go | 4 +- etcdserver/etcdserverpb/rpc.proto | 4 +- etcdserver/metrics.go | 4 +- etcdserver/quota.go | 2 +- etcdserver/raft.go | 22 ++++---- etcdserver/raft_test.go | 12 ++--- etcdserver/server.go | 54 +++++++++---------- etcdserver/server_test.go | 38 ++++++------- etcdserver/snapshot_merge.go | 6 +-- etcdserver/storage.go | 14 ++--- etcdserver/util.go | 8 +-- etcdserver/util_test.go | 10 ++-- etcdserver/v2_server.go | 4 +- etcdserver/v3_server.go | 14 ++--- functional/agent/handler.go | 8 +-- functional/agent/server.go | 6 +-- functional/agent/utils.go | 2 +- functional/cmd/etcd-agent/main.go | 2 +- functional/cmd/etcd-proxy/main.go | 2 +- functional/cmd/etcd-runner/main.go | 2 +- functional/cmd/etcd-tester/main.go | 2 +- functional/rpcpb/etcd_config.go | 6 +-- functional/rpcpb/etcd_config_test.go | 4 +- functional/rpcpb/member.go | 8 +-- functional/runner/election_command.go | 2 +- functional/runner/error.go | 2 +- functional/runner/global.go | 2 +- functional/runner/help.go | 2 +- functional/runner/lease_renewer_command.go | 2 +- functional/runner/lock_racer_command.go | 2 +- functional/runner/watch_command.go | 4 +- functional/tester/case.go | 2 +- functional/tester/case_external.go | 2 +- functional/tester/case_failpoints.go | 2 +- functional/tester/case_network_blackhole.go | 2 +- functional/tester/case_network_delay.go | 2 +- functional/tester/case_no_fail.go | 2 +- functional/tester/case_sigquit_remove.go | 4 +- .../tester/case_sigquit_remove_quorum.go | 4 +- functional/tester/case_sigterm.go | 2 +- functional/tester/checker.go | 2 +- functional/tester/checker_kv_hash.go | 2 +- functional/tester/checker_lease_expire.go | 6 +-- functional/tester/checker_no_check.go | 2 +- functional/tester/checker_runner.go | 2 +- functional/tester/cluster.go | 6 +-- functional/tester/cluster_read_config.go | 2 +- functional/tester/cluster_run.go | 4 +- functional/tester/cluster_test.go | 2 +- functional/tester/stresser.go | 2 +- functional/tester/stresser_key.go | 10 ++-- functional/tester/stresser_lease.go | 6 +-- functional/tester/stresser_runner.go | 2 +- integration/bridge.go | 2 +- integration/cluster.go | 38 ++++++------- integration/cluster_direct.go | 8 +-- integration/cluster_proxy.go | 8 +-- integration/cluster_test.go | 6 +-- integration/embed_test.go | 4 +- integration/logger_test.go | 2 +- integration/main_test.go | 2 +- integration/member_test.go | 4 +- integration/metrics_test.go | 8 +-- integration/network_partition_test.go | 2 +- integration/util_test.go | 2 +- integration/v2_http_kv_test.go | 4 +- integration/v3_alarm_test.go | 10 ++-- integration/v3_auth_test.go | 10 ++-- integration/v3_barrier_test.go | 6 +-- integration/v3_double_barrier_test.go | 4 +- integration/v3_election_test.go | 4 +- integration/v3_grpc_inflight_test.go | 6 +-- integration/v3_grpc_test.go | 10 ++-- integration/v3_health_test.go | 2 +- integration/v3_leadership_test.go | 6 +-- integration/v3_lease_test.go | 8 +-- integration/v3_lock_test.go | 10 ++-- integration/v3_queue_test.go | 2 +- integration/v3_stm_test.go | 6 +-- integration/v3_tls_test.go | 4 +- integration/v3_watch_restore_test.go | 2 +- integration/v3_watch_test.go | 8 +-- integration/v3election_grpc_test.go | 6 +-- integration/v3lock_grpc_test.go | 6 +-- lease/leasehttp/http.go | 8 +-- lease/leasehttp/http_test.go | 4 +- lease/leasepb/lease.pb.go | 2 +- lease/leasepb/lease.proto | 2 +- lease/lessor.go | 6 +-- lease/lessor_bench_test.go | 2 +- lease/lessor_test.go | 4 +- main.go | 2 +- mvcc/kv.go | 6 +-- mvcc/kv_test.go | 8 +-- mvcc/kv_view.go | 2 +- mvcc/kvstore.go | 8 +-- mvcc/kvstore_bench_test.go | 4 +- mvcc/kvstore_compaction_test.go | 4 +- mvcc/kvstore_test.go | 10 ++-- mvcc/kvstore_txn.go | 6 +-- mvcc/metrics_txn.go | 2 +- mvcc/util.go | 4 +- mvcc/watchable_store.go | 6 +-- mvcc/watchable_store_bench_test.go | 4 +- mvcc/watchable_store_test.go | 6 +-- mvcc/watchable_store_txn.go | 2 +- mvcc/watcher.go | 2 +- mvcc/watcher_bench_test.go | 4 +- mvcc/watcher_group.go | 4 +- mvcc/watcher_test.go | 6 +-- pkg/adt/example_test.go | 2 +- pkg/flags/unique_urls.go | 2 +- pkg/flags/urls.go | 2 +- pkg/ioutil/util.go | 2 +- pkg/logutil/logger_test.go | 2 +- pkg/logutil/package_logger_test.go | 2 +- pkg/logutil/zap_journal.go | 2 +- pkg/logutil/zap_raft.go | 2 +- pkg/mock/mockserver/mockserver.go | 2 +- pkg/mock/mockstorage/storage_recorder.go | 6 +-- pkg/mock/mockstore/store_recorder.go | 4 +- pkg/mock/mockwait/wait_recorder.go | 4 +- pkg/netutil/netutil.go | 2 +- pkg/netutil/routes_linux.go | 2 +- pkg/proxy/server.go | 2 +- pkg/proxy/server_test.go | 2 +- pkg/srv/srv.go | 2 +- pkg/srv/srv_test.go | 2 +- pkg/testutil/leak.go | 6 +-- pkg/transport/listener.go | 2 +- pkg/types/urls_test.go | 2 +- pkg/types/urlsmap_test.go | 2 +- .../grpcproxy/adapter/auth_client_adapter.go | 2 +- .../adapter/cluster_client_adapter.go | 2 +- .../adapter/election_client_adapter.go | 2 +- proxy/grpcproxy/adapter/kv_client_adapter.go | 2 +- .../grpcproxy/adapter/lease_client_adapter.go | 2 +- .../grpcproxy/adapter/lock_client_adapter.go | 2 +- .../adapter/maintenance_client_adapter.go | 2 +- .../grpcproxy/adapter/watch_client_adapter.go | 2 +- proxy/grpcproxy/auth.go | 4 +- proxy/grpcproxy/cache/store.go | 6 +-- proxy/grpcproxy/cluster.go | 8 +-- proxy/grpcproxy/cluster_test.go | 8 +-- proxy/grpcproxy/election.go | 4 +- proxy/grpcproxy/health.go | 6 +-- proxy/grpcproxy/kv.go | 6 +-- proxy/grpcproxy/kv_test.go | 8 +-- proxy/grpcproxy/leader.go | 2 +- proxy/grpcproxy/lease.go | 6 +-- proxy/grpcproxy/lock.go | 4 +- proxy/grpcproxy/maintenance.go | 4 +- proxy/grpcproxy/metrics.go | 2 +- proxy/grpcproxy/register.go | 6 +-- proxy/grpcproxy/register_test.go | 8 +-- proxy/grpcproxy/util.go | 2 +- proxy/grpcproxy/watch.go | 8 +-- proxy/grpcproxy/watch_broadcast.go | 4 +- proxy/grpcproxy/watcher.go | 8 +-- proxy/httpproxy/reverse.go | 2 +- raft/example_test.go | 2 +- raft/log.go | 2 +- raft/log_test.go | 2 +- raft/log_unstable.go | 2 +- raft/log_unstable_test.go | 2 +- raft/node.go | 2 +- raft/node_test.go | 4 +- raft/raft.go | 2 +- raft/raft_flow_control_test.go | 2 +- raft/raft_paper_test.go | 2 +- raft/raft_snap_test.go | 2 +- raft/raft_test.go | 2 +- raft/rafttest/network.go | 2 +- raft/rafttest/network_test.go | 2 +- raft/rafttest/node.go | 4 +- raft/rafttest/node_bench_test.go | 2 +- raft/rafttest/node_test.go | 2 +- raft/rawnode.go | 2 +- raft/rawnode_test.go | 2 +- raft/read_only.go | 2 +- raft/status.go | 2 +- raft/storage.go | 2 +- raft/storage_test.go | 2 +- raft/util.go | 2 +- raft/util_test.go | 2 +- tests/e2e/cluster_proxy_test.go | 2 +- tests/e2e/cluster_test.go | 2 +- tests/e2e/ctl_v2_test.go | 4 +- tests/e2e/ctl_v3_alarm_test.go | 2 +- tests/e2e/ctl_v3_auth_test.go | 2 +- tests/e2e/ctl_v3_elect_test.go | 2 +- tests/e2e/ctl_v3_endpoint_test.go | 2 +- tests/e2e/ctl_v3_lock_test.go | 2 +- tests/e2e/ctl_v3_member_test.go | 2 +- tests/e2e/ctl_v3_migrate_test.go | 4 +- tests/e2e/ctl_v3_move_leader_test.go | 8 +-- tests/e2e/ctl_v3_snapshot_test.go | 6 +-- tests/e2e/ctl_v3_test.go | 6 +-- tests/e2e/etcd_config_test.go | 2 +- tests/e2e/etcd_corrupt_test.go | 4 +- tests/e2e/etcd_process.go | 4 +- tests/e2e/etcd_release_upgrade_test.go | 6 +-- tests/e2e/etcd_spawn_cov.go | 6 +-- tests/e2e/etcd_spawn_nocov.go | 2 +- tests/e2e/gateway_test.go | 2 +- tests/e2e/main_test.go | 2 +- tests/e2e/metrics_test.go | 2 +- tests/e2e/util.go | 2 +- tests/e2e/v2_curl_test.go | 2 +- tests/e2e/v3_cipher_suite_test.go | 2 +- tests/e2e/v3_curl_lease_test.go | 2 +- tests/e2e/v3_curl_test.go | 8 +-- tools/benchmark/cmd/lease.go | 4 +- tools/benchmark/cmd/mvcc-put.go | 4 +- tools/benchmark/cmd/mvcc.go | 6 +-- tools/benchmark/cmd/put.go | 4 +- tools/benchmark/cmd/range.go | 4 +- tools/benchmark/cmd/root.go | 2 +- tools/benchmark/cmd/stm.go | 8 +-- tools/benchmark/cmd/txn_put.go | 4 +- tools/benchmark/cmd/util.go | 4 +- tools/benchmark/cmd/watch.go | 4 +- tools/benchmark/cmd/watch_get.go | 4 +- tools/benchmark/cmd/watch_latency.go | 4 +- tools/benchmark/main.go | 2 +- tools/etcd-dump-db/backend.go | 8 +-- tools/etcd-dump-logs/etcd-dump-log_test.go | 12 ++--- tools/etcd-dump-logs/main.go | 14 ++--- tools/etcd-dump-metrics/etcd.go | 4 +- tools/etcd-dump-metrics/install_darwin.go | 2 +- tools/etcd-dump-metrics/install_linux.go | 2 +- tools/etcd-dump-metrics/main.go | 2 +- tools/etcd-dump-metrics/metrics.go | 2 +- wal/decoder.go | 8 +-- wal/encoder.go | 6 +-- wal/file_pipeline.go | 2 +- wal/record_test.go | 2 +- wal/repair.go | 4 +- wal/repair_test.go | 4 +- wal/util.go | 2 +- wal/wal.go | 10 ++-- wal/wal_bench_test.go | 2 +- wal/wal_test.go | 8 +-- 542 files changed, 1357 insertions(+), 1361 deletions(-) diff --git a/Documentation/dev-guide/api_concurrency_reference_v3.md b/Documentation/dev-guide/api_concurrency_reference_v3.md index 01059c7c1d8..a5ae7624c24 100644 --- a/Documentation/dev-guide/api_concurrency_reference_v3.md +++ b/Documentation/dev-guide/api_concurrency_reference_v3.md @@ -1,6 +1,4 @@ ---- -title: etcd concurrency API Reference ---- +### etcd concurrency API Reference This is a generated documentation. Please read the proto files for more. diff --git a/Documentation/dev-guide/api_reference_v3.md b/Documentation/dev-guide/api_reference_v3.md index e88906b0edc..207800f06ae 100644 --- a/Documentation/dev-guide/api_reference_v3.md +++ b/Documentation/dev-guide/api_reference_v3.md @@ -1,6 +1,4 @@ ---- -title: etcd API Reference ---- +### etcd API Reference This is a generated documentation. Please read the proto files for more. diff --git a/auth/range_perm_cache.go b/auth/range_perm_cache.go index 49e261f1fa5..8de2d175c25 100644 --- a/auth/range_perm_cache.go +++ b/auth/range_perm_cache.go @@ -15,9 +15,9 @@ package auth import ( - "go.etcd.io/etcd/v3/auth/authpb" - "go.etcd.io/etcd/v3/mvcc/backend" - "go.etcd.io/etcd/v3/pkg/adt" + "go.etcd.io/etcd/auth/authpb" + "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/pkg/adt" "go.uber.org/zap" ) diff --git a/auth/range_perm_cache_test.go b/auth/range_perm_cache_test.go index 5d0fde083eb..e5baa86b40c 100644 --- a/auth/range_perm_cache_test.go +++ b/auth/range_perm_cache_test.go @@ -17,8 +17,8 @@ package auth import ( "testing" - "go.etcd.io/etcd/v3/auth/authpb" - "go.etcd.io/etcd/v3/pkg/adt" + "go.etcd.io/etcd/auth/authpb" + "go.etcd.io/etcd/pkg/adt" "go.uber.org/zap" ) diff --git a/auth/store.go b/auth/store.go index 9cf477f9de9..2e95e0c165b 100644 --- a/auth/store.go +++ b/auth/store.go @@ -24,10 +24,10 @@ import ( "sync" "sync/atomic" - "go.etcd.io/etcd/v3/auth/authpb" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/auth/authpb" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/mvcc/backend" "github.com/coreos/pkg/capnslog" "go.uber.org/zap" diff --git a/auth/store_test.go b/auth/store_test.go index 488d4fcee58..67e50f23ff6 100644 --- a/auth/store_test.go +++ b/auth/store_test.go @@ -24,10 +24,10 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/auth/authpb" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/auth/authpb" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/mvcc/backend" "go.uber.org/zap" "golang.org/x/crypto/bcrypt" diff --git a/client/client.go b/client/client.go index 12f79fc8cc8..6f1270f8a2a 100644 --- a/client/client.go +++ b/client/client.go @@ -29,7 +29,7 @@ import ( "sync" "time" - "go.etcd.io/etcd/v3/version" + "go.etcd.io/etcd/version" ) var ( diff --git a/client/client_test.go b/client/client_test.go index d3dae820390..2b4ae4d82a9 100644 --- a/client/client_test.go +++ b/client/client_test.go @@ -29,8 +29,8 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/pkg/testutil" - "go.etcd.io/etcd/v3/version" + "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/version" ) type actionAssertingHTTPClient struct { diff --git a/client/discover.go b/client/discover.go index 7b9868b7fc0..580c25626c9 100644 --- a/client/discover.go +++ b/client/discover.go @@ -15,7 +15,7 @@ package client import ( - "go.etcd.io/etcd/v3/pkg/srv" + "go.etcd.io/etcd/pkg/srv" ) // Discoverer is an interface that wraps the Discover method. diff --git a/client/doc.go b/client/doc.go index 0337e701bd9..abe5199c319 100644 --- a/client/doc.go +++ b/client/doc.go @@ -21,7 +21,7 @@ Create a Config and exchange it for a Client: "net/http" "context" - "go.etcd.io/etcd/v3/client" + "go.etcd.io/etcd/client" ) cfg := client.Config{ diff --git a/client/example_keys_test.go b/client/example_keys_test.go index 2dd69a27f77..84cbbe791c1 100644 --- a/client/example_keys_test.go +++ b/client/example_keys_test.go @@ -20,7 +20,7 @@ import ( "log" "sort" - "go.etcd.io/etcd/v3/client" + "go.etcd.io/etcd/client" ) func ExampleKeysAPI_directory() { diff --git a/client/integration/client_test.go b/client/integration/client_test.go index a83258be2b4..546b28f24ab 100644 --- a/client/integration/client_test.go +++ b/client/integration/client_test.go @@ -24,9 +24,9 @@ import ( "sync/atomic" "testing" - "go.etcd.io/etcd/v3/client" - "go.etcd.io/etcd/v3/integration" - "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/client" + "go.etcd.io/etcd/integration" + "go.etcd.io/etcd/pkg/testutil" ) // TestV2NoRetryEOF tests destructive api calls won't retry on a disconnection. diff --git a/client/integration/main_test.go b/client/integration/main_test.go index 4dec98da4f8..c7362dde4fe 100644 --- a/client/integration/main_test.go +++ b/client/integration/main_test.go @@ -8,7 +8,7 @@ import ( "os" "testing" - "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/pkg/testutil" ) func TestMain(m *testing.M) { diff --git a/client/keys.go b/client/keys.go index 23aafdb19b1..d0350b8d2eb 100644 --- a/client/keys.go +++ b/client/keys.go @@ -19,7 +19,7 @@ import ( "encoding/json" "errors" "fmt" - "go.etcd.io/etcd/v3/pkg/pathutil" + "go.etcd.io/etcd/pkg/pathutil" "net/http" "net/url" "strconv" diff --git a/client/main_test.go b/client/main_test.go index af5cbcd17e4..1fec862e0f8 100644 --- a/client/main_test.go +++ b/client/main_test.go @@ -23,9 +23,9 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/integration" - "go.etcd.io/etcd/v3/pkg/testutil" - "go.etcd.io/etcd/v3/pkg/transport" + "go.etcd.io/etcd/integration" + "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/transport" ) var exampleEndpoints []string diff --git a/client/members.go b/client/members.go index 6a87b1a2949..657131ab0ce 100644 --- a/client/members.go +++ b/client/members.go @@ -23,7 +23,7 @@ import ( "net/url" "path" - "go.etcd.io/etcd/v3/pkg/types" + "go.etcd.io/etcd/pkg/types" ) var ( diff --git a/client/members_test.go b/client/members_test.go index c75e71d8f76..9be03ae544b 100644 --- a/client/members_test.go +++ b/client/members_test.go @@ -23,7 +23,7 @@ import ( "reflect" "testing" - "go.etcd.io/etcd/v3/pkg/types" + "go.etcd.io/etcd/pkg/types" ) func TestMembersAPIActionList(t *testing.T) { diff --git a/clientv3/auth.go b/clientv3/auth.go index 0b8dabb384a..921f50f5e26 100644 --- a/clientv3/auth.go +++ b/clientv3/auth.go @@ -19,8 +19,8 @@ import ( "fmt" "strings" - "go.etcd.io/etcd/v3/auth/authpb" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + "go.etcd.io/etcd/auth/authpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" "google.golang.org/grpc" ) diff --git a/clientv3/balancer/balancer.go b/clientv3/balancer/balancer.go index 0e926502f80..54c405b0a14 100644 --- a/clientv3/balancer/balancer.go +++ b/clientv3/balancer/balancer.go @@ -20,7 +20,7 @@ import ( "sync" "time" - "go.etcd.io/etcd/v3/clientv3/balancer/picker" + "go.etcd.io/etcd/clientv3/balancer/picker" "go.uber.org/zap" "google.golang.org/grpc/balancer" diff --git a/clientv3/balancer/balancer_test.go b/clientv3/balancer/balancer_test.go index 31f1fcbabe6..c31ddbe45a1 100644 --- a/clientv3/balancer/balancer_test.go +++ b/clientv3/balancer/balancer_test.go @@ -21,10 +21,10 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/clientv3/balancer/picker" - "go.etcd.io/etcd/v3/clientv3/balancer/resolver/endpoint" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/pkg/mock/mockserver" + "go.etcd.io/etcd/clientv3/balancer/picker" + "go.etcd.io/etcd/clientv3/balancer/resolver/endpoint" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/mock/mockserver" "go.uber.org/zap" "google.golang.org/grpc" diff --git a/clientv3/balancer/config.go b/clientv3/balancer/config.go index 1821ff4dd76..0339a84d08f 100644 --- a/clientv3/balancer/config.go +++ b/clientv3/balancer/config.go @@ -15,7 +15,7 @@ package balancer import ( - "go.etcd.io/etcd/v3/clientv3/balancer/picker" + "go.etcd.io/etcd/clientv3/balancer/picker" "go.uber.org/zap" ) diff --git a/clientv3/balancer/grpc1.7-health_test.go b/clientv3/balancer/grpc1.7-health_test.go index a104e4df8e5..186de7a36d6 100644 --- a/clientv3/balancer/grpc1.7-health_test.go +++ b/clientv3/balancer/grpc1.7-health_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/pkg/testutil" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/testutil" "google.golang.org/grpc" ) diff --git a/clientv3/client.go b/clientv3/client.go index 0f478068561..f078f6f8eeb 100644 --- a/clientv3/client.go +++ b/clientv3/client.go @@ -27,11 +27,11 @@ import ( "time" "github.com/google/uuid" - "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/etcdserver/api/v3rpc/rpctypes" - "go.etcd.io/etcd/v3/pkg/logutil" + "go.etcd.io/etcd/clientv3/balancer" + "go.etcd.io/etcd/clientv3/balancer/picker" + "go.etcd.io/etcd/clientv3/balancer/resolver/endpoint" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/pkg/logutil" "go.uber.org/zap" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/clientv3/client_test.go b/clientv3/client_test.go index 7a3c374e624..47544a0da6c 100644 --- a/clientv3/client_test.go +++ b/clientv3/client_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/pkg/testutil" "google.golang.org/grpc" ) diff --git a/clientv3/clientv3util/example_key_test.go b/clientv3/clientv3util/example_key_test.go index 7290b669859..a3506e90c54 100644 --- a/clientv3/clientv3util/example_key_test.go +++ b/clientv3/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/clientv3" + "go.etcd.io/etcd/clientv3/clientv3util" ) func ExampleKeyMissing() { diff --git a/clientv3/clientv3util/util.go b/clientv3/clientv3util/util.go index 984938614f3..8153f66f8c8 100644 --- a/clientv3/clientv3util/util.go +++ b/clientv3/clientv3util/util.go @@ -16,7 +16,7 @@ package clientv3util import ( - "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/clientv3" ) // KeyExists returns a comparison operation that evaluates to true iff the given diff --git a/clientv3/cluster.go b/clientv3/cluster.go index 855465b7eb0..ce97e5c85b8 100644 --- a/clientv3/cluster.go +++ b/clientv3/cluster.go @@ -17,8 +17,8 @@ package clientv3 import ( "context" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/pkg/types" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/types" "google.golang.org/grpc" ) diff --git a/clientv3/compact_op.go b/clientv3/compact_op.go index b1b09708acb..5779713d3dd 100644 --- a/clientv3/compact_op.go +++ b/clientv3/compact_op.go @@ -15,7 +15,7 @@ package clientv3 import ( - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" ) // CompactOp represents a compact operation. diff --git a/clientv3/compact_op_test.go b/clientv3/compact_op_test.go index c4ddfc89e08..991e47a154b 100644 --- a/clientv3/compact_op_test.go +++ b/clientv3/compact_op_test.go @@ -18,7 +18,7 @@ import ( "reflect" "testing" - "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + "go.etcd.io/etcd/etcdserver/etcdserverpb" ) func TestCompactOp(t *testing.T) { diff --git a/clientv3/compare.go b/clientv3/compare.go index 149ab789364..01ed68e942a 100644 --- a/clientv3/compare.go +++ b/clientv3/compare.go @@ -15,7 +15,7 @@ package clientv3 import ( - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" ) type CompareTarget int diff --git a/clientv3/concurrency/election.go b/clientv3/concurrency/election.go index 5dadb2e1bf1..2521db6ac04 100644 --- a/clientv3/concurrency/election.go +++ b/clientv3/concurrency/election.go @@ -19,9 +19,9 @@ import ( "errors" "fmt" - v3 "go.etcd.io/etcd/v3/clientv3" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/mvcc/mvccpb" + v3 "go.etcd.io/etcd/clientv3" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/mvcc/mvccpb" ) var ( diff --git a/clientv3/concurrency/election_test.go b/clientv3/concurrency/election_test.go index a6e03241979..0e45d91ed6a 100644 --- a/clientv3/concurrency/election_test.go +++ b/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/clientv3" + "go.etcd.io/etcd/clientv3/concurrency" ) func TestResumeElection(t *testing.T) { diff --git a/clientv3/concurrency/example_election_test.go b/clientv3/concurrency/example_election_test.go index e0a1c3e6e09..2514490fdf7 100644 --- a/clientv3/concurrency/example_election_test.go +++ b/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/clientv3" + "go.etcd.io/etcd/clientv3/concurrency" ) func ExampleElection_Campaign() { diff --git a/clientv3/concurrency/example_mutex_test.go b/clientv3/concurrency/example_mutex_test.go index 92ad1aff7e4..a0463d5b57f 100644 --- a/clientv3/concurrency/example_mutex_test.go +++ b/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/clientv3" + "go.etcd.io/etcd/clientv3/concurrency" ) func ExampleMutex_Lock() { diff --git a/clientv3/concurrency/example_stm_test.go b/clientv3/concurrency/example_stm_test.go index bdcfab4a13d..e0e946f1244 100644 --- a/clientv3/concurrency/example_stm_test.go +++ b/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/clientv3" + "go.etcd.io/etcd/clientv3/concurrency" ) // ExampleSTM_apply shows how to use STM with a transactional diff --git a/clientv3/concurrency/key.go b/clientv3/concurrency/key.go index 684019ac5ad..e4cf7751740 100644 --- a/clientv3/concurrency/key.go +++ b/clientv3/concurrency/key.go @@ -18,9 +18,9 @@ import ( "context" "fmt" - v3 "go.etcd.io/etcd/v3/clientv3" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/mvcc/mvccpb" + v3 "go.etcd.io/etcd/clientv3" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/mvcc/mvccpb" ) func waitDelete(ctx context.Context, client *v3.Client, key string, rev int64) error { diff --git a/clientv3/concurrency/main_test.go b/clientv3/concurrency/main_test.go index 6ffeefddf86..0d8b3a41f54 100644 --- a/clientv3/concurrency/main_test.go +++ b/clientv3/concurrency/main_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/integration" - "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/integration" + "go.etcd.io/etcd/pkg/testutil" ) var endpoints []string diff --git a/clientv3/concurrency/mutex.go b/clientv3/concurrency/mutex.go index 30d122cdc47..013534193ea 100644 --- a/clientv3/concurrency/mutex.go +++ b/clientv3/concurrency/mutex.go @@ -19,8 +19,8 @@ import ( "fmt" "sync" - v3 "go.etcd.io/etcd/v3/clientv3" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + v3 "go.etcd.io/etcd/clientv3" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" ) // Mutex implements the sync Locker interface with etcd diff --git a/clientv3/concurrency/session.go b/clientv3/concurrency/session.go index 04a34ed8acc..598ec0e4ffd 100644 --- a/clientv3/concurrency/session.go +++ b/clientv3/concurrency/session.go @@ -18,7 +18,7 @@ import ( "context" "time" - v3 "go.etcd.io/etcd/v3/clientv3" + v3 "go.etcd.io/etcd/clientv3" ) const defaultSessionTTL = 60 diff --git a/clientv3/concurrency/stm.go b/clientv3/concurrency/stm.go index 908a4bed334..ee1151079ab 100644 --- a/clientv3/concurrency/stm.go +++ b/clientv3/concurrency/stm.go @@ -18,7 +18,7 @@ import ( "context" "math" - v3 "go.etcd.io/etcd/v3/clientv3" + v3 "go.etcd.io/etcd/clientv3" ) // STM is an interface for software transactional memory. diff --git a/clientv3/example_auth_test.go b/clientv3/example_auth_test.go index 0ca4e693e3d..cabdeed60da 100644 --- a/clientv3/example_auth_test.go +++ b/clientv3/example_auth_test.go @@ -19,7 +19,7 @@ import ( "fmt" "log" - "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/clientv3" ) func ExampleAuth() { diff --git a/clientv3/example_cluster_test.go b/clientv3/example_cluster_test.go index bb180782378..6a9a7c2ac56 100644 --- a/clientv3/example_cluster_test.go +++ b/clientv3/example_cluster_test.go @@ -19,7 +19,7 @@ import ( "fmt" "log" - "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/clientv3" ) func ExampleCluster_memberList() { diff --git a/clientv3/example_kv_test.go b/clientv3/example_kv_test.go index 61e0b45aa4b..ae552583a97 100644 --- a/clientv3/example_kv_test.go +++ b/clientv3/example_kv_test.go @@ -19,8 +19,8 @@ import ( "fmt" "log" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" ) func ExampleKV_put() { diff --git a/clientv3/example_lease_test.go b/clientv3/example_lease_test.go index 5ddf5f6c3df..c065b7def20 100644 --- a/clientv3/example_lease_test.go +++ b/clientv3/example_lease_test.go @@ -19,7 +19,7 @@ import ( "fmt" "log" - "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/clientv3" ) func ExampleLease_grant() { diff --git a/clientv3/example_maintenance_test.go b/clientv3/example_maintenance_test.go index d345e3a7694..58b10d0b66c 100644 --- a/clientv3/example_maintenance_test.go +++ b/clientv3/example_maintenance_test.go @@ -19,7 +19,7 @@ import ( "fmt" "log" - "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/clientv3" ) func ExampleMaintenance_status() { diff --git a/clientv3/example_metrics_test.go b/clientv3/example_metrics_test.go index 007e66a2489..5bee0c200a5 100644 --- a/clientv3/example_metrics_test.go +++ b/clientv3/example_metrics_test.go @@ -23,7 +23,7 @@ import ( "net/http" "strings" - "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/clientv3" grpcprom "github.com/grpc-ecosystem/go-grpc-prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" diff --git a/clientv3/example_test.go b/clientv3/example_test.go index 0c6cb9a2179..453f8c91654 100644 --- a/clientv3/example_test.go +++ b/clientv3/example_test.go @@ -20,8 +20,8 @@ import ( "os" "time" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/pkg/transport" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/pkg/transport" "google.golang.org/grpc/grpclog" ) diff --git a/clientv3/example_watch_test.go b/clientv3/example_watch_test.go index eceaa6c64ac..313514fbd3f 100644 --- a/clientv3/example_watch_test.go +++ b/clientv3/example_watch_test.go @@ -19,7 +19,7 @@ import ( "fmt" "log" - "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/clientv3" ) func ExampleWatcher_watch() { diff --git a/clientv3/integration/black_hole_test.go b/clientv3/integration/black_hole_test.go index 26cf3a3a0e5..0ff3f73f14f 100644 --- a/clientv3/integration/black_hole_test.go +++ b/clientv3/integration/black_hole_test.go @@ -21,10 +21,10 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - "go.etcd.io/etcd/v3/integration" - "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/integration" + "go.etcd.io/etcd/pkg/testutil" "google.golang.org/grpc" ) diff --git a/clientv3/integration/cluster_test.go b/clientv3/integration/cluster_test.go index 489e0c9e413..6e01842bf6d 100644 --- a/clientv3/integration/cluster_test.go +++ b/clientv3/integration/cluster_test.go @@ -20,9 +20,9 @@ import ( "strings" "testing" - "go.etcd.io/etcd/v3/integration" - "go.etcd.io/etcd/v3/pkg/testutil" - "go.etcd.io/etcd/v3/pkg/types" + "go.etcd.io/etcd/integration" + "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/types" ) func TestMemberList(t *testing.T) { diff --git a/clientv3/integration/dial_test.go b/clientv3/integration/dial_test.go index ecf1a05dcb3..5814afbd0d4 100644 --- a/clientv3/integration/dial_test.go +++ b/clientv3/integration/dial_test.go @@ -21,11 +21,11 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/clientv3" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/integration" - "go.etcd.io/etcd/v3/pkg/testutil" - "go.etcd.io/etcd/v3/pkg/transport" + "go.etcd.io/etcd/clientv3" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/integration" + "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/transport" "google.golang.org/grpc" ) diff --git a/clientv3/integration/kv_test.go b/clientv3/integration/kv_test.go index 6f70a3ad87e..b71b98d0655 100644 --- a/clientv3/integration/kv_test.go +++ b/clientv3/integration/kv_test.go @@ -23,11 +23,11 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - "go.etcd.io/etcd/v3/integration" - "go.etcd.io/etcd/v3/mvcc/mvccpb" - "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/integration" + "go.etcd.io/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/pkg/testutil" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/clientv3/integration/lease_test.go b/clientv3/integration/lease_test.go index 0e43e74039b..6fd8f4306aa 100644 --- a/clientv3/integration/lease_test.go +++ b/clientv3/integration/lease_test.go @@ -22,11 +22,11 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/clientv3/concurrency" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - "go.etcd.io/etcd/v3/integration" - "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/concurrency" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/integration" + "go.etcd.io/etcd/pkg/testutil" "google.golang.org/grpc" ) diff --git a/clientv3/integration/leasing_test.go b/clientv3/integration/leasing_test.go index 12edff0f51b..5c4bab1cf4d 100644 --- a/clientv3/integration/leasing_test.go +++ b/clientv3/integration/leasing_test.go @@ -23,11 +23,11 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/clientv3/concurrency" - "go.etcd.io/etcd/v3/clientv3/leasing" - "go.etcd.io/etcd/v3/integration" - "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/concurrency" + "go.etcd.io/etcd/clientv3/leasing" + "go.etcd.io/etcd/integration" + "go.etcd.io/etcd/pkg/testutil" ) func TestLeasingPutGet(t *testing.T) { diff --git a/clientv3/integration/logger_test.go b/clientv3/integration/logger_test.go index 7fc4ed67f1a..f36664ec76c 100644 --- a/clientv3/integration/logger_test.go +++ b/clientv3/integration/logger_test.go @@ -17,7 +17,7 @@ package integration import ( "io/ioutil" - "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/clientv3" "google.golang.org/grpc/grpclog" ) diff --git a/clientv3/integration/main_test.go b/clientv3/integration/main_test.go index 4dec98da4f8..c7362dde4fe 100644 --- a/clientv3/integration/main_test.go +++ b/clientv3/integration/main_test.go @@ -8,7 +8,7 @@ import ( "os" "testing" - "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/pkg/testutil" ) func TestMain(m *testing.M) { diff --git a/clientv3/integration/maintenance_test.go b/clientv3/integration/maintenance_test.go index ed52c27cde1..4fecaf812f6 100644 --- a/clientv3/integration/maintenance_test.go +++ b/clientv3/integration/maintenance_test.go @@ -27,13 +27,13 @@ import ( "go.uber.org/zap" "google.golang.org/grpc" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - "go.etcd.io/etcd/v3/integration" - "go.etcd.io/etcd/v3/lease" - "go.etcd.io/etcd/v3/mvcc" - "go.etcd.io/etcd/v3/mvcc/backend" - "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/integration" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/mvcc" + "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/pkg/testutil" ) func TestMaintenanceHashKV(t *testing.T) { diff --git a/clientv3/integration/metrics_test.go b/clientv3/integration/metrics_test.go index c76bb2ce522..1b73af9d78d 100644 --- a/clientv3/integration/metrics_test.go +++ b/clientv3/integration/metrics_test.go @@ -25,10 +25,10 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/integration" - "go.etcd.io/etcd/v3/pkg/testutil" - "go.etcd.io/etcd/v3/pkg/transport" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/integration" + "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/transport" grpcprom "github.com/grpc-ecosystem/go-grpc-prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" diff --git a/clientv3/integration/mirror_test.go b/clientv3/integration/mirror_test.go index ae715510c0a..46b312ff9f5 100644 --- a/clientv3/integration/mirror_test.go +++ b/clientv3/integration/mirror_test.go @@ -22,10 +22,10 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/clientv3/mirror" - "go.etcd.io/etcd/v3/integration" - "go.etcd.io/etcd/v3/mvcc/mvccpb" - "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/clientv3/mirror" + "go.etcd.io/etcd/integration" + "go.etcd.io/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/pkg/testutil" ) func TestMirrorSync(t *testing.T) { diff --git a/clientv3/integration/namespace_test.go b/clientv3/integration/namespace_test.go index 959f419e8a8..3f4344d22a3 100644 --- a/clientv3/integration/namespace_test.go +++ b/clientv3/integration/namespace_test.go @@ -19,11 +19,11 @@ import ( "reflect" "testing" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/clientv3/namespace" - "go.etcd.io/etcd/v3/integration" - "go.etcd.io/etcd/v3/mvcc/mvccpb" - "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/namespace" + "go.etcd.io/etcd/integration" + "go.etcd.io/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/pkg/testutil" ) func TestNamespacePutGet(t *testing.T) { diff --git a/clientv3/integration/network_partition_test.go b/clientv3/integration/network_partition_test.go index 2787b4c542b..b006f6fe93d 100644 --- a/clientv3/integration/network_partition_test.go +++ b/clientv3/integration/network_partition_test.go @@ -22,11 +22,11 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/integration" - "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/integration" + "go.etcd.io/etcd/pkg/testutil" "google.golang.org/grpc" ) diff --git a/clientv3/integration/role_test.go b/clientv3/integration/role_test.go index f790738f1ae..cc779575a30 100644 --- a/clientv3/integration/role_test.go +++ b/clientv3/integration/role_test.go @@ -18,9 +18,9 @@ import ( "context" "testing" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - "go.etcd.io/etcd/v3/integration" - "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/integration" + "go.etcd.io/etcd/pkg/testutil" ) func TestRoleError(t *testing.T) { diff --git a/clientv3/integration/server_shutdown_test.go b/clientv3/integration/server_shutdown_test.go index 4ea1b4b76fb..f7ce58c3672 100644 --- a/clientv3/integration/server_shutdown_test.go +++ b/clientv3/integration/server_shutdown_test.go @@ -21,10 +21,10 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - "go.etcd.io/etcd/v3/integration" - "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/integration" + "go.etcd.io/etcd/pkg/testutil" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/clientv3/integration/txn_test.go b/clientv3/integration/txn_test.go index f26a635446e..af994adbe95 100644 --- a/clientv3/integration/txn_test.go +++ b/clientv3/integration/txn_test.go @@ -20,11 +20,11 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/embed" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - "go.etcd.io/etcd/v3/integration" - "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/embed" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/integration" + "go.etcd.io/etcd/pkg/testutil" ) func TestTxnError(t *testing.T) { diff --git a/clientv3/integration/user_test.go b/clientv3/integration/user_test.go index bda3c2475ac..cff6c58bf17 100644 --- a/clientv3/integration/user_test.go +++ b/clientv3/integration/user_test.go @@ -19,10 +19,10 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - "go.etcd.io/etcd/v3/integration" - "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/integration" + "go.etcd.io/etcd/pkg/testutil" "google.golang.org/grpc" ) diff --git a/clientv3/integration/util.go b/clientv3/integration/util.go index 12e0fd1e520..939c7884e17 100644 --- a/clientv3/integration/util.go +++ b/clientv3/integration/util.go @@ -19,7 +19,7 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/clientv3" ) // mustWaitPinReady waits up to 3-second until connection is up (pin endpoint). diff --git a/clientv3/integration/watch_fragment_test.go b/clientv3/integration/watch_fragment_test.go index 34ec3049b7a..e22540d9e16 100644 --- a/clientv3/integration/watch_fragment_test.go +++ b/clientv3/integration/watch_fragment_test.go @@ -23,9 +23,9 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/integration" - "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/integration" + "go.etcd.io/etcd/pkg/testutil" ) // TestWatchFragmentDisable ensures that large watch diff --git a/clientv3/integration/watch_test.go b/clientv3/integration/watch_test.go index 01ec2fa5e95..bf751d6793b 100644 --- a/clientv3/integration/watch_test.go +++ b/clientv3/integration/watch_test.go @@ -23,12 +23,12 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - "go.etcd.io/etcd/v3/integration" - mvccpb "go.etcd.io/etcd/v3/mvcc/mvccpb" - "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver/api/v3rpc" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/integration" + mvccpb "go.etcd.io/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/pkg/testutil" "google.golang.org/grpc/metadata" ) diff --git a/clientv3/kv.go b/clientv3/kv.go index 0628ed0f12c..2b7864ad8b0 100644 --- a/clientv3/kv.go +++ b/clientv3/kv.go @@ -17,7 +17,7 @@ package clientv3 import ( "context" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" "google.golang.org/grpc" ) diff --git a/clientv3/lease.go b/clientv3/lease.go index 5a26709c4c5..c2796fc969a 100644 --- a/clientv3/lease.go +++ b/clientv3/lease.go @@ -19,8 +19,8 @@ import ( "sync" "time" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" "go.uber.org/zap" "google.golang.org/grpc" diff --git a/clientv3/leasing/cache.go b/clientv3/leasing/cache.go index 541a43d1de2..f4870c1fb2f 100644 --- a/clientv3/leasing/cache.go +++ b/clientv3/leasing/cache.go @@ -20,9 +20,9 @@ import ( "sync" "time" - v3 "go.etcd.io/etcd/v3/clientv3" - v3pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/mvcc/mvccpb" + v3 "go.etcd.io/etcd/clientv3" + v3pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/mvcc/mvccpb" ) const revokeBackoff = 2 * time.Second diff --git a/clientv3/leasing/kv.go b/clientv3/leasing/kv.go index 804eeb2cf0d..ecfaedfc2de 100644 --- a/clientv3/leasing/kv.go +++ b/clientv3/leasing/kv.go @@ -20,11 +20,11 @@ import ( "sync" "time" - v3 "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/clientv3/concurrency" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/mvcc/mvccpb" + v3 "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/concurrency" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/mvcc/mvccpb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/clientv3/leasing/txn.go b/clientv3/leasing/txn.go index a9e4ed4a692..96703ecc6aa 100644 --- a/clientv3/leasing/txn.go +++ b/clientv3/leasing/txn.go @@ -18,8 +18,8 @@ import ( "context" "strings" - v3 "go.etcd.io/etcd/v3/clientv3" - v3pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + v3 "go.etcd.io/etcd/clientv3" + v3pb "go.etcd.io/etcd/etcdserver/etcdserverpb" ) type txnLeasing struct { diff --git a/clientv3/leasing/util.go b/clientv3/leasing/util.go index f72e1bcf464..f4f9a372e5d 100644 --- a/clientv3/leasing/util.go +++ b/clientv3/leasing/util.go @@ -17,8 +17,8 @@ package leasing import ( "bytes" - v3 "go.etcd.io/etcd/v3/clientv3" - v3pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + v3 "go.etcd.io/etcd/clientv3" + v3pb "go.etcd.io/etcd/etcdserver/etcdserverpb" ) func compareInt64(a, b int64) int { diff --git a/clientv3/logger.go b/clientv3/logger.go index 0e0bfc8aa4e..f5ae0109dad 100644 --- a/clientv3/logger.go +++ b/clientv3/logger.go @@ -18,7 +18,7 @@ import ( "io/ioutil" "sync" - "go.etcd.io/etcd/v3/pkg/logutil" + "go.etcd.io/etcd/pkg/logutil" "google.golang.org/grpc/grpclog" ) diff --git a/clientv3/main_test.go b/clientv3/main_test.go index 5b0f3923234..972abff1fb4 100644 --- a/clientv3/main_test.go +++ b/clientv3/main_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/integration" - "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/integration" + "go.etcd.io/etcd/pkg/testutil" ) // TestMain sets up an etcd cluster if running the examples. diff --git a/clientv3/maintenance.go b/clientv3/maintenance.go index 6164ef66a43..744455a3b36 100644 --- a/clientv3/maintenance.go +++ b/clientv3/maintenance.go @@ -19,7 +19,7 @@ import ( "fmt" "io" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" "google.golang.org/grpc" ) diff --git a/clientv3/mirror/syncer.go b/clientv3/mirror/syncer.go index 38d6838bb65..e00af70ee51 100644 --- a/clientv3/mirror/syncer.go +++ b/clientv3/mirror/syncer.go @@ -18,7 +18,7 @@ package mirror import ( "context" - "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/clientv3" ) const ( diff --git a/clientv3/namespace/kv.go b/clientv3/namespace/kv.go index 9899222a5a8..aadeb6fd7eb 100644 --- a/clientv3/namespace/kv.go +++ b/clientv3/namespace/kv.go @@ -17,9 +17,9 @@ package namespace import ( "context" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" ) type kvPrefix struct { diff --git a/clientv3/namespace/lease.go b/clientv3/namespace/lease.go index f7596d0aa02..fa210ee160c 100644 --- a/clientv3/namespace/lease.go +++ b/clientv3/namespace/lease.go @@ -18,7 +18,7 @@ import ( "bytes" "context" - "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/clientv3" ) type leasePrefix struct { diff --git a/clientv3/namespace/watch.go b/clientv3/namespace/watch.go index 8dc28380a1d..d5dfef54c7c 100644 --- a/clientv3/namespace/watch.go +++ b/clientv3/namespace/watch.go @@ -18,7 +18,7 @@ import ( "context" "sync" - "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/clientv3" ) type watcherPrefix struct { diff --git a/clientv3/naming/doc.go b/clientv3/naming/doc.go index 98987d8fd57..b55cc49ad38 100644 --- a/clientv3/naming/doc.go +++ b/clientv3/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/clientv3" +// etcdnaming "go.etcd.io/etcd/clientv3/naming" // // "google.golang.org/grpc" // "google.golang.org/grpc/naming" diff --git a/clientv3/naming/grpc.go b/clientv3/naming/grpc.go index b680274bb3b..7eed84bfb18 100644 --- a/clientv3/naming/grpc.go +++ b/clientv3/naming/grpc.go @@ -19,7 +19,7 @@ import ( "encoding/json" "fmt" - etcd "go.etcd.io/etcd/v3/clientv3" + etcd "go.etcd.io/etcd/clientv3" "google.golang.org/grpc/codes" "google.golang.org/grpc/naming" diff --git a/clientv3/naming/grpc_test.go b/clientv3/naming/grpc_test.go index 8f1a38c4632..66a1feae00b 100644 --- a/clientv3/naming/grpc_test.go +++ b/clientv3/naming/grpc_test.go @@ -20,9 +20,9 @@ import ( "reflect" "testing" - etcd "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/integration" - "go.etcd.io/etcd/v3/pkg/testutil" + etcd "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/integration" + "go.etcd.io/etcd/pkg/testutil" "google.golang.org/grpc/naming" ) diff --git a/clientv3/op.go b/clientv3/op.go index 1041af4dca0..085dd28ab44 100644 --- a/clientv3/op.go +++ b/clientv3/op.go @@ -14,7 +14,7 @@ package clientv3 -import pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" +import pb "go.etcd.io/etcd/etcdserver/etcdserverpb" type opType int diff --git a/clientv3/op_test.go b/clientv3/op_test.go index cb0feb59e6e..468893dd496 100644 --- a/clientv3/op_test.go +++ b/clientv3/op_test.go @@ -18,7 +18,7 @@ import ( "reflect" "testing" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" ) // TestOpWithSort tests if WithSort(ASCEND, KEY) and WithLimit are specified, diff --git a/clientv3/ordering/kv.go b/clientv3/ordering/kv.go index d62f2c8911c..951bd10ab91 100644 --- a/clientv3/ordering/kv.go +++ b/clientv3/ordering/kv.go @@ -18,7 +18,7 @@ import ( "context" "sync" - "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/clientv3" ) // kvOrdering ensures that serialized requests do not return diff --git a/clientv3/ordering/kv_test.go b/clientv3/ordering/kv_test.go index e10db96934d..01a80fc52d2 100644 --- a/clientv3/ordering/kv_test.go +++ b/clientv3/ordering/kv_test.go @@ -22,10 +22,10 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/clientv3" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/integration" - "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/clientv3" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/integration" + "go.etcd.io/etcd/pkg/testutil" ) func TestDetectKvOrderViolation(t *testing.T) { diff --git a/clientv3/ordering/logger_test.go b/clientv3/ordering/logger_test.go index ef857ce4e9a..6ee25f0044b 100644 --- a/clientv3/ordering/logger_test.go +++ b/clientv3/ordering/logger_test.go @@ -17,7 +17,7 @@ package ordering import ( "io/ioutil" - "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/clientv3" "google.golang.org/grpc/grpclog" ) diff --git a/clientv3/ordering/util.go b/clientv3/ordering/util.go index a321ede5505..f08740cb462 100644 --- a/clientv3/ordering/util.go +++ b/clientv3/ordering/util.go @@ -19,7 +19,7 @@ import ( "sync" "time" - "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/clientv3" ) type OrderViolationFunc func(op clientv3.Op, resp clientv3.OpResponse, prevRev int64) error diff --git a/clientv3/ordering/util_test.go b/clientv3/ordering/util_test.go index b75ad59005d..f903baae8b0 100644 --- a/clientv3/ordering/util_test.go +++ b/clientv3/ordering/util_test.go @@ -19,9 +19,9 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/integration" - "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/integration" + "go.etcd.io/etcd/pkg/testutil" ) func TestEndpointSwitchResolvesViolation(t *testing.T) { diff --git a/clientv3/retry.go b/clientv3/retry.go index df69e918d39..6da7abf475c 100644 --- a/clientv3/retry.go +++ b/clientv3/retry.go @@ -17,8 +17,8 @@ package clientv3 import ( "context" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/clientv3/retry_interceptor.go b/clientv3/retry_interceptor.go index ca6be773a8b..e48a00367c3 100644 --- a/clientv3/retry_interceptor.go +++ b/clientv3/retry_interceptor.go @@ -23,7 +23,7 @@ import ( "sync" "time" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" "go.uber.org/zap" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/clientv3/snapshot/member_test.go b/clientv3/snapshot/member_test.go index 1260eccdaa5..a42066a5637 100644 --- a/clientv3/snapshot/member_test.go +++ b/clientv3/snapshot/member_test.go @@ -22,10 +22,10 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/embed" - "go.etcd.io/etcd/v3/etcdserver" - "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/embed" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/pkg/testutil" ) // TestSnapshotV3RestoreMultiMemberAdd ensures that multiple members diff --git a/clientv3/snapshot/v3_snapshot.go b/clientv3/snapshot/v3_snapshot.go index 1617c17ce78..70f8c3a8d4a 100644 --- a/clientv3/snapshot/v3_snapshot.go +++ b/clientv3/snapshot/v3_snapshot.go @@ -28,21 +28,21 @@ import ( "strings" "time" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/etcdserver" - "go.etcd.io/etcd/v3/etcdserver/api/membership" - "go.etcd.io/etcd/v3/etcdserver/api/snap" - "go.etcd.io/etcd/v3/etcdserver/api/v2store" - "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/lease" - "go.etcd.io/etcd/v3/mvcc" - "go.etcd.io/etcd/v3/mvcc/backend" - "go.etcd.io/etcd/v3/pkg/fileutil" - "go.etcd.io/etcd/v3/pkg/types" - "go.etcd.io/etcd/v3/raft" - "go.etcd.io/etcd/v3/raft/raftpb" - "go.etcd.io/etcd/v3/wal" - "go.etcd.io/etcd/v3/wal/walpb" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api/membership" + "go.etcd.io/etcd/etcdserver/api/snap" + "go.etcd.io/etcd/etcdserver/api/v2store" + "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/mvcc" + "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/pkg/fileutil" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft" + "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/wal" + "go.etcd.io/etcd/wal/walpb" bolt "go.etcd.io/bbolt" "go.uber.org/zap" diff --git a/clientv3/snapshot/v3_snapshot_test.go b/clientv3/snapshot/v3_snapshot_test.go index b5495a0ec2b..8d2ee9d6aaa 100644 --- a/clientv3/snapshot/v3_snapshot_test.go +++ b/clientv3/snapshot/v3_snapshot_test.go @@ -25,10 +25,10 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/embed" - "go.etcd.io/etcd/v3/pkg/fileutil" - "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/embed" + "go.etcd.io/etcd/pkg/fileutil" + "go.etcd.io/etcd/pkg/testutil" "go.uber.org/zap" ) diff --git a/clientv3/txn.go b/clientv3/txn.go index e4cac1521c6..c19715da438 100644 --- a/clientv3/txn.go +++ b/clientv3/txn.go @@ -18,7 +18,7 @@ import ( "context" "sync" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" "google.golang.org/grpc" ) diff --git a/clientv3/txn_test.go b/clientv3/txn_test.go index 3028b52bfe0..46a4971ff90 100644 --- a/clientv3/txn_test.go +++ b/clientv3/txn_test.go @@ -18,7 +18,7 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/pkg/testutil" ) func TestTxnPanics(t *testing.T) { diff --git a/clientv3/watch.go b/clientv3/watch.go index f41aec5064c..d50acbca32c 100644 --- a/clientv3/watch.go +++ b/clientv3/watch.go @@ -21,9 +21,9 @@ import ( "sync" "time" - v3rpc "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - mvccpb "go.etcd.io/etcd/v3/mvcc/mvccpb" + v3rpc "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + mvccpb "go.etcd.io/etcd/mvcc/mvccpb" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/clientv3/watch_test.go b/clientv3/watch_test.go index 2efe810769c..a22858bc7ec 100644 --- a/clientv3/watch_test.go +++ b/clientv3/watch_test.go @@ -17,7 +17,7 @@ package clientv3 import ( "testing" - "go.etcd.io/etcd/v3/mvcc/mvccpb" + "go.etcd.io/etcd/mvcc/mvccpb" ) func TestEvent(t *testing.T) { diff --git a/clientv3/yaml/config.go b/clientv3/yaml/config.go index 17390f9cbda..dc3e246e277 100644 --- a/clientv3/yaml/config.go +++ b/clientv3/yaml/config.go @@ -22,8 +22,8 @@ import ( "sigs.k8s.io/yaml" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/pkg/tlsutil" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/pkg/tlsutil" ) type yamlConfig struct { diff --git a/contrib/raftexample/httpapi.go b/contrib/raftexample/httpapi.go index 3e1c585b5af..75f5d616fec 100644 --- a/contrib/raftexample/httpapi.go +++ b/contrib/raftexample/httpapi.go @@ -20,7 +20,7 @@ import ( "net/http" "strconv" - "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/raft/raftpb" ) // Handler for a http based key-value store backed by raft diff --git a/contrib/raftexample/kvstore.go b/contrib/raftexample/kvstore.go index 77e42594b54..b057501a40a 100644 --- a/contrib/raftexample/kvstore.go +++ b/contrib/raftexample/kvstore.go @@ -21,7 +21,7 @@ import ( "log" "sync" - "go.etcd.io/etcd/v3/etcdserver/api/snap" + "go.etcd.io/etcd/etcdserver/api/snap" ) // a key-value store backed by raft diff --git a/contrib/raftexample/main.go b/contrib/raftexample/main.go index 775ea7b99f7..6b6f064a34a 100644 --- a/contrib/raftexample/main.go +++ b/contrib/raftexample/main.go @@ -18,7 +18,7 @@ import ( "flag" "strings" - "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/raft/raftpb" ) func main() { diff --git a/contrib/raftexample/raft.go b/contrib/raftexample/raft.go index f2607cd6c66..ca290388bcd 100644 --- a/contrib/raftexample/raft.go +++ b/contrib/raftexample/raft.go @@ -24,15 +24,15 @@ import ( "strconv" "time" - "go.etcd.io/etcd/v3/etcdserver/api/rafthttp" - "go.etcd.io/etcd/v3/etcdserver/api/snap" - stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats" - "go.etcd.io/etcd/v3/pkg/fileutil" - "go.etcd.io/etcd/v3/pkg/types" - "go.etcd.io/etcd/v3/raft" - "go.etcd.io/etcd/v3/raft/raftpb" - "go.etcd.io/etcd/v3/wal" - "go.etcd.io/etcd/v3/wal/walpb" + "go.etcd.io/etcd/etcdserver/api/rafthttp" + "go.etcd.io/etcd/etcdserver/api/snap" + stats "go.etcd.io/etcd/etcdserver/api/v2stats" + "go.etcd.io/etcd/pkg/fileutil" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft" + "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/wal" + "go.etcd.io/etcd/wal/walpb" "go.uber.org/zap" ) diff --git a/contrib/raftexample/raftexample_test.go b/contrib/raftexample/raftexample_test.go index 7314289b029..91c1f34f03d 100644 --- a/contrib/raftexample/raftexample_test.go +++ b/contrib/raftexample/raftexample_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/raft/raftpb" ) type cluster struct { diff --git a/contrib/recipes/barrier.go b/contrib/recipes/barrier.go index 0f82b983361..5ab4817c718 100644 --- a/contrib/recipes/barrier.go +++ b/contrib/recipes/barrier.go @@ -17,8 +17,8 @@ package recipe import ( "context" - v3 "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/mvcc/mvccpb" + v3 "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/mvcc/mvccpb" ) // 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 d97d0303f98..e0c02e67d3d 100644 --- a/contrib/recipes/client.go +++ b/contrib/recipes/client.go @@ -18,8 +18,8 @@ import ( "context" "errors" - v3 "go.etcd.io/etcd/v3/clientv3" - spb "go.etcd.io/etcd/v3/mvcc/mvccpb" + v3 "go.etcd.io/etcd/clientv3" + spb "go.etcd.io/etcd/mvcc/mvccpb" ) var ( diff --git a/contrib/recipes/double_barrier.go b/contrib/recipes/double_barrier.go index 393b22a200e..90189ba7c9d 100644 --- a/contrib/recipes/double_barrier.go +++ b/contrib/recipes/double_barrier.go @@ -17,9 +17,9 @@ package recipe import ( "context" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/clientv3/concurrency" - "go.etcd.io/etcd/v3/mvcc/mvccpb" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/concurrency" + "go.etcd.io/etcd/mvcc/mvccpb" ) // DoubleBarrier blocks processes on Enter until an expected count enters, then diff --git a/contrib/recipes/key.go b/contrib/recipes/key.go index 3a634a3fbf5..891ff7d6949 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/clientv3" + "go.etcd.io/etcd/clientv3/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 cd7b9ecf097..4116a870269 100644 --- a/contrib/recipes/priority_queue.go +++ b/contrib/recipes/priority_queue.go @@ -18,8 +18,8 @@ import ( "context" "fmt" - v3 "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/mvcc/mvccpb" + v3 "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/mvcc/mvccpb" ) // PriorityQueue implements a multi-reader, multi-writer distributed queue. diff --git a/contrib/recipes/queue.go b/contrib/recipes/queue.go index ef609965b6e..e374f000d65 100644 --- a/contrib/recipes/queue.go +++ b/contrib/recipes/queue.go @@ -17,8 +17,8 @@ package recipe import ( "context" - v3 "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/mvcc/mvccpb" + v3 "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/mvcc/mvccpb" ) // Queue implements a multi-reader, multi-writer distributed queue. diff --git a/contrib/recipes/rwmutex.go b/contrib/recipes/rwmutex.go index 6b3a96473fc..97a24c7496e 100644 --- a/contrib/recipes/rwmutex.go +++ b/contrib/recipes/rwmutex.go @@ -17,9 +17,9 @@ package recipe import ( "context" - v3 "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/clientv3/concurrency" - "go.etcd.io/etcd/v3/mvcc/mvccpb" + v3 "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/concurrency" + "go.etcd.io/etcd/mvcc/mvccpb" ) type RWMutex struct { diff --git a/contrib/recipes/watch.go b/contrib/recipes/watch.go index 0ef394cd7ad..f8c2ab772da 100644 --- a/contrib/recipes/watch.go +++ b/contrib/recipes/watch.go @@ -17,8 +17,8 @@ package recipe import ( "context" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/mvcc/mvccpb" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/mvcc/mvccpb" ) // WaitEvents waits on a key until it observes the given events and returns the final one. diff --git a/embed/config.go b/embed/config.go index 7af64a39f98..0480acae3a3 100644 --- a/embed/config.go +++ b/embed/config.go @@ -27,14 +27,14 @@ import ( "sync" "time" - "go.etcd.io/etcd/v3/etcdserver" - "go.etcd.io/etcd/v3/etcdserver/api/v3compactor" - "go.etcd.io/etcd/v3/pkg/flags" - "go.etcd.io/etcd/v3/pkg/netutil" - "go.etcd.io/etcd/v3/pkg/srv" - "go.etcd.io/etcd/v3/pkg/tlsutil" - "go.etcd.io/etcd/v3/pkg/transport" - "go.etcd.io/etcd/v3/pkg/types" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api/v3compactor" + "go.etcd.io/etcd/pkg/flags" + "go.etcd.io/etcd/pkg/netutil" + "go.etcd.io/etcd/pkg/srv" + "go.etcd.io/etcd/pkg/tlsutil" + "go.etcd.io/etcd/pkg/transport" + "go.etcd.io/etcd/pkg/types" bolt "go.etcd.io/bbolt" "go.uber.org/zap" diff --git a/embed/config_logging.go b/embed/config_logging.go index 391f0599a49..bddaacabe5d 100644 --- a/embed/config_logging.go +++ b/embed/config_logging.go @@ -23,7 +23,7 @@ import ( "reflect" "sync" - "go.etcd.io/etcd/v3/pkg/logutil" + "go.etcd.io/etcd/pkg/logutil" "github.com/coreos/pkg/capnslog" "go.uber.org/zap" diff --git a/embed/config_logging_journal_unix.go b/embed/config_logging_journal_unix.go index db70ab9d4b8..44a51d67708 100644 --- a/embed/config_logging_journal_unix.go +++ b/embed/config_logging_journal_unix.go @@ -20,7 +20,7 @@ import ( "fmt" "os" - "go.etcd.io/etcd/v3/pkg/logutil" + "go.etcd.io/etcd/pkg/logutil" "go.uber.org/zap/zapcore" ) diff --git a/embed/config_test.go b/embed/config_test.go index 6482486467c..eacf181ba34 100644 --- a/embed/config_test.go +++ b/embed/config_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/pkg/transport" + "go.etcd.io/etcd/pkg/transport" "sigs.k8s.io/yaml" ) diff --git a/embed/doc.go b/embed/doc.go index d8aaf33f635..4811bb63430 100644 --- a/embed/doc.go +++ b/embed/doc.go @@ -21,7 +21,7 @@ Launch an embedded etcd server using the configuration defaults: "log" "time" - "go.etcd.io/etcd/v3/embed" + "go.etcd.io/etcd/embed" ) func main() { diff --git a/embed/etcd.go b/embed/etcd.go index 71f48cbe58d..d32adbd1543 100644 --- a/embed/etcd.go +++ b/embed/etcd.go @@ -29,18 +29,18 @@ import ( "sync" "time" - "go.etcd.io/etcd/v3/etcdserver" - "go.etcd.io/etcd/v3/etcdserver/api/etcdhttp" - "go.etcd.io/etcd/v3/etcdserver/api/rafthttp" - "go.etcd.io/etcd/v3/etcdserver/api/v2http" - "go.etcd.io/etcd/v3/etcdserver/api/v2v3" - "go.etcd.io/etcd/v3/etcdserver/api/v3client" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc" - "go.etcd.io/etcd/v3/pkg/debugutil" - runtimeutil "go.etcd.io/etcd/v3/pkg/runtime" - "go.etcd.io/etcd/v3/pkg/transport" - "go.etcd.io/etcd/v3/pkg/types" - "go.etcd.io/etcd/v3/version" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api/etcdhttp" + "go.etcd.io/etcd/etcdserver/api/rafthttp" + "go.etcd.io/etcd/etcdserver/api/v2http" + "go.etcd.io/etcd/etcdserver/api/v2v3" + "go.etcd.io/etcd/etcdserver/api/v3client" + "go.etcd.io/etcd/etcdserver/api/v3rpc" + "go.etcd.io/etcd/pkg/debugutil" + runtimeutil "go.etcd.io/etcd/pkg/runtime" + "go.etcd.io/etcd/pkg/transport" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/version" "github.com/coreos/pkg/capnslog" grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" diff --git a/embed/serve.go b/embed/serve.go index df66808bd20..8e6e7b769a2 100644 --- a/embed/serve.go +++ b/embed/serve.go @@ -23,19 +23,19 @@ import ( "net/http" "strings" - "go.etcd.io/etcd/v3/etcdserver" - "go.etcd.io/etcd/v3/etcdserver/api/v3client" - "go.etcd.io/etcd/v3/etcdserver/api/v3election" - "go.etcd.io/etcd/v3/etcdserver/api/v3election/v3electionpb" - v3electiongw "go.etcd.io/etcd/v3/etcdserver/api/v3election/v3electionpb/gw" - "go.etcd.io/etcd/v3/etcdserver/api/v3lock" - "go.etcd.io/etcd/v3/etcdserver/api/v3lock/v3lockpb" - v3lockgw "go.etcd.io/etcd/v3/etcdserver/api/v3lock/v3lockpb/gw" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc" - etcdservergw "go.etcd.io/etcd/v3/etcdserver/etcdserverpb/gw" - "go.etcd.io/etcd/v3/pkg/debugutil" - "go.etcd.io/etcd/v3/pkg/httputil" - "go.etcd.io/etcd/v3/pkg/transport" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api/v3client" + "go.etcd.io/etcd/etcdserver/api/v3election" + "go.etcd.io/etcd/etcdserver/api/v3election/v3electionpb" + v3electiongw "go.etcd.io/etcd/etcdserver/api/v3election/v3electionpb/gw" + "go.etcd.io/etcd/etcdserver/api/v3lock" + "go.etcd.io/etcd/etcdserver/api/v3lock/v3lockpb" + v3lockgw "go.etcd.io/etcd/etcdserver/api/v3lock/v3lockpb/gw" + "go.etcd.io/etcd/etcdserver/api/v3rpc" + etcdservergw "go.etcd.io/etcd/etcdserver/etcdserverpb/gw" + "go.etcd.io/etcd/pkg/debugutil" + "go.etcd.io/etcd/pkg/httputil" + "go.etcd.io/etcd/pkg/transport" gw "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/soheilhy/cmux" diff --git a/embed/serve_test.go b/embed/serve_test.go index d2a909d791a..38856456792 100644 --- a/embed/serve_test.go +++ b/embed/serve_test.go @@ -19,7 +19,7 @@ import ( "os" "testing" - "go.etcd.io/etcd/v3/auth" + "go.etcd.io/etcd/auth" ) // TestStartEtcdWrongToken ensures that StartEtcd with wrong configs returns with error. diff --git a/embed/util.go b/embed/util.go index 4d81640937b..40f3ce9d595 100644 --- a/embed/util.go +++ b/embed/util.go @@ -17,7 +17,7 @@ package embed import ( "path/filepath" - "go.etcd.io/etcd/v3/wal" + "go.etcd.io/etcd/wal" ) func isMemberInitialized(cfg *Config) bool { diff --git a/etcdctl/ctlv2/command/auth_commands.go b/etcdctl/ctlv2/command/auth_commands.go index 25ea55838a2..75823b203d3 100644 --- a/etcdctl/ctlv2/command/auth_commands.go +++ b/etcdctl/ctlv2/command/auth_commands.go @@ -20,7 +20,7 @@ import ( "strings" "github.com/urfave/cli" - "go.etcd.io/etcd/v3/client" + "go.etcd.io/etcd/client" ) func NewAuthCommands() cli.Command { diff --git a/etcdctl/ctlv2/command/backup_command.go b/etcdctl/ctlv2/command/backup_command.go index 3b6e0c5763c..c6efa271178 100644 --- a/etcdctl/ctlv2/command/backup_command.go +++ b/etcdctl/ctlv2/command/backup_command.go @@ -23,15 +23,15 @@ import ( "regexp" "time" - "go.etcd.io/etcd/v3/etcdserver/api/membership" - "go.etcd.io/etcd/v3/etcdserver/api/snap" - "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/pkg/fileutil" - "go.etcd.io/etcd/v3/pkg/idutil" - "go.etcd.io/etcd/v3/pkg/pbutil" - "go.etcd.io/etcd/v3/raft/raftpb" - "go.etcd.io/etcd/v3/wal" - "go.etcd.io/etcd/v3/wal/walpb" + "go.etcd.io/etcd/etcdserver/api/membership" + "go.etcd.io/etcd/etcdserver/api/snap" + "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/fileutil" + "go.etcd.io/etcd/pkg/idutil" + "go.etcd.io/etcd/pkg/pbutil" + "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/wal" + "go.etcd.io/etcd/wal/walpb" "github.com/urfave/cli" bolt "go.etcd.io/bbolt" diff --git a/etcdctl/ctlv2/command/cluster_health.go b/etcdctl/ctlv2/command/cluster_health.go index d4e2b382b93..bfe8d698f67 100644 --- a/etcdctl/ctlv2/command/cluster_health.go +++ b/etcdctl/ctlv2/command/cluster_health.go @@ -24,7 +24,7 @@ import ( "os/signal" "time" - "go.etcd.io/etcd/v3/client" + "go.etcd.io/etcd/client" "github.com/urfave/cli" ) diff --git a/etcdctl/ctlv2/command/error.go b/etcdctl/ctlv2/command/error.go index 1035518ce35..ca4f1e9b8be 100644 --- a/etcdctl/ctlv2/command/error.go +++ b/etcdctl/ctlv2/command/error.go @@ -20,7 +20,7 @@ import ( "os" "github.com/urfave/cli" - "go.etcd.io/etcd/v3/client" + "go.etcd.io/etcd/client" ) const ( diff --git a/etcdctl/ctlv2/command/exec_watch_command.go b/etcdctl/ctlv2/command/exec_watch_command.go index 8dae2164721..4cc859820b3 100644 --- a/etcdctl/ctlv2/command/exec_watch_command.go +++ b/etcdctl/ctlv2/command/exec_watch_command.go @@ -22,7 +22,7 @@ import ( "os/exec" "os/signal" - "go.etcd.io/etcd/v3/client" + "go.etcd.io/etcd/client" "github.com/urfave/cli" ) diff --git a/etcdctl/ctlv2/command/format.go b/etcdctl/ctlv2/command/format.go index b75fa256230..5e15554a172 100644 --- a/etcdctl/ctlv2/command/format.go +++ b/etcdctl/ctlv2/command/format.go @@ -19,7 +19,7 @@ import ( "fmt" "os" - "go.etcd.io/etcd/v3/client" + "go.etcd.io/etcd/client" ) // printResponseKey only supports to print key correctly. diff --git a/etcdctl/ctlv2/command/get_command.go b/etcdctl/ctlv2/command/get_command.go index 19420d41103..fa87498ce6e 100644 --- a/etcdctl/ctlv2/command/get_command.go +++ b/etcdctl/ctlv2/command/get_command.go @@ -20,7 +20,7 @@ import ( "os" "github.com/urfave/cli" - "go.etcd.io/etcd/v3/client" + "go.etcd.io/etcd/client" ) // NewGetCommand returns the CLI command for "get". diff --git a/etcdctl/ctlv2/command/ls_command.go b/etcdctl/ctlv2/command/ls_command.go index 0b2047c716b..f81bcbf8a46 100644 --- a/etcdctl/ctlv2/command/ls_command.go +++ b/etcdctl/ctlv2/command/ls_command.go @@ -18,7 +18,7 @@ import ( "fmt" "github.com/urfave/cli" - "go.etcd.io/etcd/v3/client" + "go.etcd.io/etcd/client" ) func NewLsCommand() cli.Command { diff --git a/etcdctl/ctlv2/command/mk_command.go b/etcdctl/ctlv2/command/mk_command.go index b0df56b1bf1..74d21c9f704 100644 --- a/etcdctl/ctlv2/command/mk_command.go +++ b/etcdctl/ctlv2/command/mk_command.go @@ -20,7 +20,7 @@ import ( "time" "github.com/urfave/cli" - "go.etcd.io/etcd/v3/client" + "go.etcd.io/etcd/client" ) // NewMakeCommand returns the CLI command for "mk". diff --git a/etcdctl/ctlv2/command/mkdir_command.go b/etcdctl/ctlv2/command/mkdir_command.go index 7ebeb59c32a..04178a025a0 100644 --- a/etcdctl/ctlv2/command/mkdir_command.go +++ b/etcdctl/ctlv2/command/mkdir_command.go @@ -19,7 +19,7 @@ import ( "time" "github.com/urfave/cli" - "go.etcd.io/etcd/v3/client" + "go.etcd.io/etcd/client" ) // NewMakeDirCommand returns the CLI command for "mkdir". diff --git a/etcdctl/ctlv2/command/rm_command.go b/etcdctl/ctlv2/command/rm_command.go index 9cae4808e94..86ade29f08e 100644 --- a/etcdctl/ctlv2/command/rm_command.go +++ b/etcdctl/ctlv2/command/rm_command.go @@ -18,7 +18,7 @@ import ( "errors" "github.com/urfave/cli" - "go.etcd.io/etcd/v3/client" + "go.etcd.io/etcd/client" ) // NewRemoveCommand returns the CLI command for "rm". diff --git a/etcdctl/ctlv2/command/rmdir_command.go b/etcdctl/ctlv2/command/rmdir_command.go index b46036d315c..5565bf1fe4d 100644 --- a/etcdctl/ctlv2/command/rmdir_command.go +++ b/etcdctl/ctlv2/command/rmdir_command.go @@ -18,7 +18,7 @@ import ( "errors" "github.com/urfave/cli" - "go.etcd.io/etcd/v3/client" + "go.etcd.io/etcd/client" ) // NewRemoveDirCommand returns the CLI command for "rmdir". diff --git a/etcdctl/ctlv2/command/role_commands.go b/etcdctl/ctlv2/command/role_commands.go index 6a5213d43f1..0a008a9e59c 100644 --- a/etcdctl/ctlv2/command/role_commands.go +++ b/etcdctl/ctlv2/command/role_commands.go @@ -21,8 +21,8 @@ import ( "strings" "github.com/urfave/cli" - "go.etcd.io/etcd/v3/client" - "go.etcd.io/etcd/v3/pkg/pathutil" + "go.etcd.io/etcd/client" + "go.etcd.io/etcd/pkg/pathutil" ) func NewRoleCommands() cli.Command { diff --git a/etcdctl/ctlv2/command/set_command.go b/etcdctl/ctlv2/command/set_command.go index 3ce9c481bf6..7eb5ae6a507 100644 --- a/etcdctl/ctlv2/command/set_command.go +++ b/etcdctl/ctlv2/command/set_command.go @@ -20,7 +20,7 @@ import ( "time" "github.com/urfave/cli" - "go.etcd.io/etcd/v3/client" + "go.etcd.io/etcd/client" ) // NewSetCommand returns the CLI command for "set". diff --git a/etcdctl/ctlv2/command/set_dir_command.go b/etcdctl/ctlv2/command/set_dir_command.go index fc463133cca..a65f9223077 100644 --- a/etcdctl/ctlv2/command/set_dir_command.go +++ b/etcdctl/ctlv2/command/set_dir_command.go @@ -16,7 +16,7 @@ package command import ( "github.com/urfave/cli" - "go.etcd.io/etcd/v3/client" + "go.etcd.io/etcd/client" ) // NewSetDirCommand returns the CLI command for "setDir". diff --git a/etcdctl/ctlv2/command/update_command.go b/etcdctl/ctlv2/command/update_command.go index d5aa3026a6b..7c20fcb88b1 100644 --- a/etcdctl/ctlv2/command/update_command.go +++ b/etcdctl/ctlv2/command/update_command.go @@ -20,7 +20,7 @@ import ( "time" "github.com/urfave/cli" - "go.etcd.io/etcd/v3/client" + "go.etcd.io/etcd/client" ) // NewUpdateCommand returns the CLI command for "update". diff --git a/etcdctl/ctlv2/command/update_dir_command.go b/etcdctl/ctlv2/command/update_dir_command.go index e5ed1b8e2a9..3783d919d80 100644 --- a/etcdctl/ctlv2/command/update_dir_command.go +++ b/etcdctl/ctlv2/command/update_dir_command.go @@ -19,7 +19,7 @@ import ( "time" "github.com/urfave/cli" - "go.etcd.io/etcd/v3/client" + "go.etcd.io/etcd/client" ) // NewUpdateDirCommand returns the CLI command for "updatedir". diff --git a/etcdctl/ctlv2/command/user_commands.go b/etcdctl/ctlv2/command/user_commands.go index f509ec3c435..73ebb4d5045 100644 --- a/etcdctl/ctlv2/command/user_commands.go +++ b/etcdctl/ctlv2/command/user_commands.go @@ -21,7 +21,7 @@ import ( "github.com/bgentry/speakeasy" "github.com/urfave/cli" - "go.etcd.io/etcd/v3/client" + "go.etcd.io/etcd/client" ) func NewUserCommands() cli.Command { diff --git a/etcdctl/ctlv2/command/util.go b/etcdctl/ctlv2/command/util.go index 498c9df3bc5..c178abd9da2 100644 --- a/etcdctl/ctlv2/command/util.go +++ b/etcdctl/ctlv2/command/util.go @@ -28,8 +28,8 @@ import ( "syscall" "time" - "go.etcd.io/etcd/v3/client" - "go.etcd.io/etcd/v3/pkg/transport" + "go.etcd.io/etcd/client" + "go.etcd.io/etcd/pkg/transport" "github.com/bgentry/speakeasy" "github.com/urfave/cli" diff --git a/etcdctl/ctlv2/command/watch_command.go b/etcdctl/ctlv2/command/watch_command.go index 147c56c5340..dc0fe2d1149 100644 --- a/etcdctl/ctlv2/command/watch_command.go +++ b/etcdctl/ctlv2/command/watch_command.go @@ -21,7 +21,7 @@ import ( "os" "os/signal" - "go.etcd.io/etcd/v3/client" + "go.etcd.io/etcd/client" "github.com/urfave/cli" ) diff --git a/etcdctl/ctlv2/ctl.go b/etcdctl/ctlv2/ctl.go index 06adec2ab88..9cbf0c55acc 100644 --- a/etcdctl/ctlv2/ctl.go +++ b/etcdctl/ctlv2/ctl.go @@ -20,8 +20,8 @@ import ( "os" "time" - "go.etcd.io/etcd/v3/etcdctl/ctlv2/command" - "go.etcd.io/etcd/v3/version" + "go.etcd.io/etcd/etcdctl/ctlv2/command" + "go.etcd.io/etcd/version" "github.com/urfave/cli" ) diff --git a/etcdctl/ctlv3/command/alarm_command.go b/etcdctl/ctlv3/command/alarm_command.go index 2a82127f021..42b85bb2945 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/clientv3" ) // NewAlarmCommand returns the cobra command for "alarm". diff --git a/etcdctl/ctlv3/command/auth_command.go b/etcdctl/ctlv3/command/auth_command.go index e99d76a0563..9255f175bb1 100644 --- a/etcdctl/ctlv3/command/auth_command.go +++ b/etcdctl/ctlv3/command/auth_command.go @@ -18,7 +18,7 @@ import ( "fmt" "github.com/spf13/cobra" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" ) // NewAuthCommand returns the cobra command for "auth". diff --git a/etcdctl/ctlv3/command/check.go b/etcdctl/ctlv3/command/check.go index ec748a256ee..d13953d993e 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/v3/clientv3" - "go.etcd.io/etcd/v3/pkg/report" + v3 "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/pkg/report" "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 33820b6e877..4262056ae27 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/clientv3" ) var compactPhysical bool diff --git a/etcdctl/ctlv3/command/defrag_command.go b/etcdctl/ctlv3/command/defrag_command.go index 141071912fd..5bbb39dd74a 100644 --- a/etcdctl/ctlv3/command/defrag_command.go +++ b/etcdctl/ctlv3/command/defrag_command.go @@ -21,7 +21,7 @@ import ( "time" "github.com/spf13/cobra" - "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/mvcc/backend" ) var ( diff --git a/etcdctl/ctlv3/command/del_command.go b/etcdctl/ctlv3/command/del_command.go index 391f48eb9de..1c28868ee2c 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/clientv3" ) var ( diff --git a/etcdctl/ctlv3/command/elect_command.go b/etcdctl/ctlv3/command/elect_command.go index 819a632018e..cd67a07b9d2 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/clientv3" + "go.etcd.io/etcd/clientv3/concurrency" "github.com/spf13/cobra" ) diff --git a/etcdctl/ctlv3/command/ep_command.go b/etcdctl/ctlv3/command/ep_command.go index 99ae1a75659..b04285927b0 100644 --- a/etcdctl/ctlv3/command/ep_command.go +++ b/etcdctl/ctlv3/command/ep_command.go @@ -20,9 +20,9 @@ import ( "sync" "time" - v3 "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - "go.etcd.io/etcd/v3/pkg/flags" + v3 "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/pkg/flags" "github.com/spf13/cobra" ) diff --git a/etcdctl/ctlv3/command/error.go b/etcdctl/ctlv3/command/error.go index 86d343773b3..220d50b6d82 100644 --- a/etcdctl/ctlv3/command/error.go +++ b/etcdctl/ctlv3/command/error.go @@ -18,7 +18,7 @@ import ( "fmt" "os" - "go.etcd.io/etcd/v3/client" + "go.etcd.io/etcd/client" ) const ( diff --git a/etcdctl/ctlv3/command/get_command.go b/etcdctl/ctlv3/command/get_command.go index 6bd1027996d..753d75ba799 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/clientv3" ) var ( diff --git a/etcdctl/ctlv3/command/global.go b/etcdctl/ctlv3/command/global.go index c448a78ce05..49a22037983 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/v3/clientv3" - "go.etcd.io/etcd/v3/pkg/flags" - "go.etcd.io/etcd/v3/pkg/srv" - "go.etcd.io/etcd/v3/pkg/transport" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/pkg/flags" + "go.etcd.io/etcd/pkg/srv" + "go.etcd.io/etcd/pkg/transport" "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 b15cee8d67e..ab13b460050 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/clientv3" "github.com/spf13/cobra" ) diff --git a/etcdctl/ctlv3/command/lock_command.go b/etcdctl/ctlv3/command/lock_command.go index 6eef22caf3f..9b117b1751f 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/clientv3" + "go.etcd.io/etcd/clientv3/concurrency" "github.com/spf13/cobra" ) diff --git a/etcdctl/ctlv3/command/make_mirror_command.go b/etcdctl/ctlv3/command/make_mirror_command.go index 5e813673825..243aacea4c0 100644 --- a/etcdctl/ctlv3/command/make_mirror_command.go +++ b/etcdctl/ctlv3/command/make_mirror_command.go @@ -22,10 +22,10 @@ import ( "sync/atomic" "time" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/clientv3/mirror" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - "go.etcd.io/etcd/v3/mvcc/mvccpb" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/mirror" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/mvcc/mvccpb" "github.com/spf13/cobra" ) diff --git a/etcdctl/ctlv3/command/member_command.go b/etcdctl/ctlv3/command/member_command.go index 8a2c0527830..182ff8ef722 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/clientv3" ) var ( diff --git a/etcdctl/ctlv3/command/migrate_command.go b/etcdctl/ctlv3/command/migrate_command.go index 12620d13697..bef384fbfc6 100644 --- a/etcdctl/ctlv3/command/migrate_command.go +++ b/etcdctl/ctlv3/command/migrate_command.go @@ -24,22 +24,22 @@ import ( "path/filepath" "time" - "go.etcd.io/etcd/v3/client" - "go.etcd.io/etcd/v3/etcdserver" - "go.etcd.io/etcd/v3/etcdserver/api" - "go.etcd.io/etcd/v3/etcdserver/api/membership" - "go.etcd.io/etcd/v3/etcdserver/api/snap" - "go.etcd.io/etcd/v3/etcdserver/api/v2error" - "go.etcd.io/etcd/v3/etcdserver/api/v2store" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/mvcc" - "go.etcd.io/etcd/v3/mvcc/backend" - "go.etcd.io/etcd/v3/mvcc/mvccpb" - "go.etcd.io/etcd/v3/pkg/pbutil" - "go.etcd.io/etcd/v3/pkg/types" - "go.etcd.io/etcd/v3/raft/raftpb" - "go.etcd.io/etcd/v3/wal" - "go.etcd.io/etcd/v3/wal/walpb" + "go.etcd.io/etcd/client" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api" + "go.etcd.io/etcd/etcdserver/api/membership" + "go.etcd.io/etcd/etcdserver/api/snap" + "go.etcd.io/etcd/etcdserver/api/v2error" + "go.etcd.io/etcd/etcdserver/api/v2store" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/mvcc" + "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/pkg/pbutil" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/wal" + "go.etcd.io/etcd/wal/walpb" "github.com/gogo/protobuf/proto" "github.com/spf13/cobra" diff --git a/etcdctl/ctlv3/command/move_leader_command.go b/etcdctl/ctlv3/command/move_leader_command.go index 0df8668f2b2..7c8010c962b 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/clientv3" ) // NewMoveLeaderCommand returns the cobra command for "move-leader". diff --git a/etcdctl/ctlv3/command/printer.go b/etcdctl/ctlv3/command/printer.go index 5e844f15016..2793c5fa4b8 100644 --- a/etcdctl/ctlv3/command/printer.go +++ b/etcdctl/ctlv3/command/printer.go @@ -19,9 +19,9 @@ import ( "fmt" "strings" - v3 "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/clientv3/snapshot" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + v3 "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/snapshot" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" "github.com/dustin/go-humanize" ) diff --git a/etcdctl/ctlv3/command/printer_fields.go b/etcdctl/ctlv3/command/printer_fields.go index 38f5c7d93d2..d0c69998053 100644 --- a/etcdctl/ctlv3/command/printer_fields.go +++ b/etcdctl/ctlv3/command/printer_fields.go @@ -17,10 +17,10 @@ package command import ( "fmt" - v3 "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/clientv3/snapshot" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - spb "go.etcd.io/etcd/v3/mvcc/mvccpb" + v3 "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/snapshot" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + spb "go.etcd.io/etcd/mvcc/mvccpb" ) type fieldsPrinter struct{ printer } diff --git a/etcdctl/ctlv3/command/printer_json.go b/etcdctl/ctlv3/command/printer_json.go index 2a6ea9f21e1..95b2a7f4e28 100644 --- a/etcdctl/ctlv3/command/printer_json.go +++ b/etcdctl/ctlv3/command/printer_json.go @@ -19,7 +19,7 @@ import ( "fmt" "os" - "go.etcd.io/etcd/v3/clientv3/snapshot" + "go.etcd.io/etcd/clientv3/snapshot" ) type jsonPrinter struct{ printer } diff --git a/etcdctl/ctlv3/command/printer_protobuf.go b/etcdctl/ctlv3/command/printer_protobuf.go index 9c2446c8482..909fffe587f 100644 --- a/etcdctl/ctlv3/command/printer_protobuf.go +++ b/etcdctl/ctlv3/command/printer_protobuf.go @@ -18,9 +18,9 @@ import ( "fmt" "os" - v3 "go.etcd.io/etcd/v3/clientv3" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - mvccpb "go.etcd.io/etcd/v3/mvcc/mvccpb" + v3 "go.etcd.io/etcd/clientv3" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + mvccpb "go.etcd.io/etcd/mvcc/mvccpb" ) type pbPrinter struct{ printer } diff --git a/etcdctl/ctlv3/command/printer_simple.go b/etcdctl/ctlv3/command/printer_simple.go index 8223e87da65..b321f850b57 100644 --- a/etcdctl/ctlv3/command/printer_simple.go +++ b/etcdctl/ctlv3/command/printer_simple.go @@ -19,10 +19,10 @@ import ( "os" "strings" - v3 "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/clientv3/snapshot" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/pkg/types" + v3 "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/snapshot" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/types" ) type simplePrinter struct { diff --git a/etcdctl/ctlv3/command/printer_table.go b/etcdctl/ctlv3/command/printer_table.go index c58024393e4..4a84b74721c 100644 --- a/etcdctl/ctlv3/command/printer_table.go +++ b/etcdctl/ctlv3/command/printer_table.go @@ -17,8 +17,8 @@ package command import ( "os" - v3 "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/clientv3/snapshot" + v3 "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/snapshot" "github.com/olekukonko/tablewriter" ) diff --git a/etcdctl/ctlv3/command/put_command.go b/etcdctl/ctlv3/command/put_command.go index 41d1016751b..0839cadc0d7 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/clientv3" ) var ( diff --git a/etcdctl/ctlv3/command/role_command.go b/etcdctl/ctlv3/command/role_command.go index ad6883246e9..682b3bf19d4 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/clientv3" ) var ( diff --git a/etcdctl/ctlv3/command/snapshot_command.go b/etcdctl/ctlv3/command/snapshot_command.go index 06eb33112b6..32bcd7a61ed 100644 --- a/etcdctl/ctlv3/command/snapshot_command.go +++ b/etcdctl/ctlv3/command/snapshot_command.go @@ -20,7 +20,7 @@ import ( "path/filepath" "strings" - "go.etcd.io/etcd/v3/clientv3/snapshot" + "go.etcd.io/etcd/clientv3/snapshot" "github.com/spf13/cobra" "go.uber.org/zap" diff --git a/etcdctl/ctlv3/command/txn_command.go b/etcdctl/ctlv3/command/txn_command.go index a04a06f7ec1..67f6d181842 100644 --- a/etcdctl/ctlv3/command/txn_command.go +++ b/etcdctl/ctlv3/command/txn_command.go @@ -22,8 +22,8 @@ import ( "strconv" "strings" - "go.etcd.io/etcd/v3/clientv3" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + "go.etcd.io/etcd/clientv3" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" "github.com/spf13/cobra" ) diff --git a/etcdctl/ctlv3/command/util.go b/etcdctl/ctlv3/command/util.go index f256ef01b2c..2a90ed9276a 100644 --- a/etcdctl/ctlv3/command/util.go +++ b/etcdctl/ctlv3/command/util.go @@ -25,8 +25,8 @@ import ( "strings" "time" - v3 "go.etcd.io/etcd/v3/clientv3" - pb "go.etcd.io/etcd/v3/mvcc/mvccpb" + v3 "go.etcd.io/etcd/clientv3" + pb "go.etcd.io/etcd/mvcc/mvccpb" "github.com/spf13/cobra" ) diff --git a/etcdctl/ctlv3/command/version_command.go b/etcdctl/ctlv3/command/version_command.go index e59c64ca0d4..77c21fecb9a 100644 --- a/etcdctl/ctlv3/command/version_command.go +++ b/etcdctl/ctlv3/command/version_command.go @@ -17,7 +17,7 @@ package command import ( "fmt" - "go.etcd.io/etcd/v3/version" + "go.etcd.io/etcd/version" "github.com/spf13/cobra" ) diff --git a/etcdctl/ctlv3/command/watch_command.go b/etcdctl/ctlv3/command/watch_command.go index ab96644ba44..ce8425cbe58 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/clientv3" "github.com/spf13/cobra" ) diff --git a/etcdctl/ctlv3/ctl.go b/etcdctl/ctlv3/ctl.go index 7d25744c78f..40154a5da33 100644 --- a/etcdctl/ctlv3/ctl.go +++ b/etcdctl/ctlv3/ctl.go @@ -18,7 +18,7 @@ package ctlv3 import ( "time" - "go.etcd.io/etcd/v3/etcdctl/ctlv3/command" + "go.etcd.io/etcd/etcdctl/ctlv3/command" "github.com/spf13/cobra" ) diff --git a/etcdctl/ctlv3/ctl_cov.go b/etcdctl/ctlv3/ctl_cov.go index 5ca7a513be6..b5b0c42c3a2 100644 --- a/etcdctl/ctlv3/ctl_cov.go +++ b/etcdctl/ctlv3/ctl_cov.go @@ -20,7 +20,7 @@ import ( "os" "strings" - "go.etcd.io/etcd/v3/etcdctl/ctlv3/command" + "go.etcd.io/etcd/etcdctl/ctlv3/command" ) func Start() { diff --git a/etcdctl/ctlv3/ctl_nocov.go b/etcdctl/ctlv3/ctl_nocov.go index 2d6e04808f0..e9567a39899 100644 --- a/etcdctl/ctlv3/ctl_nocov.go +++ b/etcdctl/ctlv3/ctl_nocov.go @@ -16,7 +16,7 @@ package ctlv3 -import "go.etcd.io/etcd/v3/etcdctl/ctlv3/command" +import "go.etcd.io/etcd/etcdctl/ctlv3/command" func Start() { rootCmd.SetUsageFunc(usageFunc) diff --git a/etcdctl/ctlv3/help.go b/etcdctl/ctlv3/help.go index 229d0209218..3b9691150a2 100644 --- a/etcdctl/ctlv3/help.go +++ b/etcdctl/ctlv3/help.go @@ -25,7 +25,7 @@ import ( "text/tabwriter" "text/template" - "go.etcd.io/etcd/v3/version" + "go.etcd.io/etcd/version" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/etcdctl/main.go b/etcdctl/main.go index 1ae3ee8e4ee..8bb4fc096f9 100644 --- a/etcdctl/main.go +++ b/etcdctl/main.go @@ -19,8 +19,8 @@ import ( "fmt" "os" - "go.etcd.io/etcd/v3/etcdctl/ctlv2" - "go.etcd.io/etcd/v3/etcdctl/ctlv3" + "go.etcd.io/etcd/etcdctl/ctlv2" + "go.etcd.io/etcd/etcdctl/ctlv3" ) const ( diff --git a/etcdmain/config.go b/etcdmain/config.go index e70f7df1b9c..814aa39516a 100644 --- a/etcdmain/config.go +++ b/etcdmain/config.go @@ -26,10 +26,10 @@ import ( "runtime" "strings" - "go.etcd.io/etcd/v3/embed" - "go.etcd.io/etcd/v3/pkg/flags" - "go.etcd.io/etcd/v3/pkg/types" - "go.etcd.io/etcd/v3/version" + "go.etcd.io/etcd/embed" + "go.etcd.io/etcd/pkg/flags" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/version" "go.uber.org/zap" "sigs.k8s.io/yaml" diff --git a/etcdmain/config_test.go b/etcdmain/config_test.go index bfe28c3c47c..de646e37027 100644 --- a/etcdmain/config_test.go +++ b/etcdmain/config_test.go @@ -23,7 +23,7 @@ import ( "strings" "testing" - "go.etcd.io/etcd/v3/embed" + "go.etcd.io/etcd/embed" "sigs.k8s.io/yaml" ) diff --git a/etcdmain/etcd.go b/etcdmain/etcd.go index d13ac0df5cd..7d1c6337c0c 100644 --- a/etcdmain/etcd.go +++ b/etcdmain/etcd.go @@ -26,17 +26,17 @@ import ( "strings" "time" - "go.etcd.io/etcd/v3/embed" - "go.etcd.io/etcd/v3/etcdserver" - "go.etcd.io/etcd/v3/etcdserver/api/etcdhttp" - "go.etcd.io/etcd/v3/etcdserver/api/v2discovery" - "go.etcd.io/etcd/v3/pkg/fileutil" - pkgioutil "go.etcd.io/etcd/v3/pkg/ioutil" - "go.etcd.io/etcd/v3/pkg/osutil" - "go.etcd.io/etcd/v3/pkg/transport" - "go.etcd.io/etcd/v3/pkg/types" - "go.etcd.io/etcd/v3/proxy/httpproxy" - "go.etcd.io/etcd/v3/version" + "go.etcd.io/etcd/embed" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api/etcdhttp" + "go.etcd.io/etcd/etcdserver/api/v2discovery" + "go.etcd.io/etcd/pkg/fileutil" + pkgioutil "go.etcd.io/etcd/pkg/ioutil" + "go.etcd.io/etcd/pkg/osutil" + "go.etcd.io/etcd/pkg/transport" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/proxy/httpproxy" + "go.etcd.io/etcd/version" "github.com/coreos/pkg/capnslog" "go.uber.org/zap" diff --git a/etcdmain/gateway.go b/etcdmain/gateway.go index 8f45e716910..fece05f1cfe 100644 --- a/etcdmain/gateway.go +++ b/etcdmain/gateway.go @@ -21,7 +21,7 @@ import ( "os" "time" - "go.etcd.io/etcd/v3/proxy/tcpproxy" + "go.etcd.io/etcd/proxy/tcpproxy" "github.com/spf13/cobra" "go.uber.org/zap" diff --git a/etcdmain/grpc_proxy.go b/etcdmain/grpc_proxy.go index 37617a01add..eb18ec33749 100644 --- a/etcdmain/grpc_proxy.go +++ b/etcdmain/grpc_proxy.go @@ -29,17 +29,17 @@ import ( "path/filepath" "time" - "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/etcdserver/api/v3election/v3electionpb" - "go.etcd.io/etcd/v3/etcdserver/api/v3lock/v3lockpb" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/pkg/debugutil" - "go.etcd.io/etcd/v3/pkg/logutil" - "go.etcd.io/etcd/v3/pkg/transport" - "go.etcd.io/etcd/v3/proxy/grpcproxy" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/leasing" + "go.etcd.io/etcd/clientv3/namespace" + "go.etcd.io/etcd/clientv3/ordering" + "go.etcd.io/etcd/etcdserver/api/v3election/v3electionpb" + "go.etcd.io/etcd/etcdserver/api/v3lock/v3lockpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/debugutil" + "go.etcd.io/etcd/pkg/logutil" + "go.etcd.io/etcd/pkg/transport" + "go.etcd.io/etcd/proxy/grpcproxy" grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" "github.com/soheilhy/cmux" diff --git a/etcdmain/help.go b/etcdmain/help.go index 2b55f72da0c..8ef6c457a18 100644 --- a/etcdmain/help.go +++ b/etcdmain/help.go @@ -18,7 +18,7 @@ import ( "fmt" "strconv" - "go.etcd.io/etcd/v3/embed" + "go.etcd.io/etcd/embed" "golang.org/x/crypto/bcrypt" ) diff --git a/etcdmain/util.go b/etcdmain/util.go index 3df12dcb069..463ada65b9a 100644 --- a/etcdmain/util.go +++ b/etcdmain/util.go @@ -18,8 +18,8 @@ import ( "fmt" "os" - "go.etcd.io/etcd/v3/pkg/srv" - "go.etcd.io/etcd/v3/pkg/transport" + "go.etcd.io/etcd/pkg/srv" + "go.etcd.io/etcd/pkg/transport" "go.uber.org/zap" ) diff --git a/etcdserver/api/capability.go b/etcdserver/api/capability.go index b134a4726eb..ec0d600e881 100644 --- a/etcdserver/api/capability.go +++ b/etcdserver/api/capability.go @@ -17,7 +17,7 @@ package api import ( "sync" - "go.etcd.io/etcd/v3/version" + "go.etcd.io/etcd/version" "go.uber.org/zap" "github.com/coreos/go-semver/semver" diff --git a/etcdserver/api/cluster.go b/etcdserver/api/cluster.go index d8109272aab..901be9d85ca 100644 --- a/etcdserver/api/cluster.go +++ b/etcdserver/api/cluster.go @@ -15,8 +15,8 @@ package api import ( - "go.etcd.io/etcd/v3/etcdserver/api/membership" - "go.etcd.io/etcd/v3/pkg/types" + "go.etcd.io/etcd/etcdserver/api/membership" + "go.etcd.io/etcd/pkg/types" "github.com/coreos/go-semver/semver" ) diff --git a/etcdserver/api/etcdhttp/base.go b/etcdserver/api/etcdhttp/base.go index 1e244eed657..c9df62ea8e6 100644 --- a/etcdserver/api/etcdhttp/base.go +++ b/etcdserver/api/etcdhttp/base.go @@ -21,12 +21,12 @@ import ( "net/http" "strings" - "go.etcd.io/etcd/v3/etcdserver" - "go.etcd.io/etcd/v3/etcdserver/api" - "go.etcd.io/etcd/v3/etcdserver/api/v2error" - "go.etcd.io/etcd/v3/etcdserver/api/v2http/httptypes" - "go.etcd.io/etcd/v3/pkg/logutil" - "go.etcd.io/etcd/v3/version" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api" + "go.etcd.io/etcd/etcdserver/api/v2error" + "go.etcd.io/etcd/etcdserver/api/v2http/httptypes" + "go.etcd.io/etcd/pkg/logutil" + "go.etcd.io/etcd/version" "github.com/coreos/pkg/capnslog" "go.uber.org/zap" diff --git a/etcdserver/api/etcdhttp/metrics.go b/etcdserver/api/etcdhttp/metrics.go index 539a7ddfbf8..f455e40a740 100644 --- a/etcdserver/api/etcdhttp/metrics.go +++ b/etcdserver/api/etcdhttp/metrics.go @@ -20,9 +20,9 @@ import ( "net/http" "time" - "go.etcd.io/etcd/v3/etcdserver" - "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/raft" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/raft" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" diff --git a/etcdserver/api/etcdhttp/peer.go b/etcdserver/api/etcdhttp/peer.go index 34890eb49a6..9f3eac352ef 100644 --- a/etcdserver/api/etcdhttp/peer.go +++ b/etcdserver/api/etcdhttp/peer.go @@ -18,10 +18,10 @@ import ( "encoding/json" "net/http" - "go.etcd.io/etcd/v3/etcdserver" - "go.etcd.io/etcd/v3/etcdserver/api" - "go.etcd.io/etcd/v3/etcdserver/api/rafthttp" - "go.etcd.io/etcd/v3/lease/leasehttp" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api" + "go.etcd.io/etcd/etcdserver/api/rafthttp" + "go.etcd.io/etcd/lease/leasehttp" "go.uber.org/zap" ) diff --git a/etcdserver/api/etcdhttp/peer_test.go b/etcdserver/api/etcdhttp/peer_test.go index ac60fe6bd8c..095aa5da849 100644 --- a/etcdserver/api/etcdhttp/peer_test.go +++ b/etcdserver/api/etcdhttp/peer_test.go @@ -26,10 +26,10 @@ import ( "go.uber.org/zap" "github.com/coreos/go-semver/semver" - "go.etcd.io/etcd/v3/etcdserver/api/membership" - "go.etcd.io/etcd/v3/etcdserver/api/rafthttp" - "go.etcd.io/etcd/v3/pkg/testutil" - "go.etcd.io/etcd/v3/pkg/types" + "go.etcd.io/etcd/etcdserver/api/membership" + "go.etcd.io/etcd/etcdserver/api/rafthttp" + "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/types" ) type fakeCluster struct { diff --git a/etcdserver/api/etcdhttp/version_test.go b/etcdserver/api/etcdhttp/version_test.go index 63271c704d2..c6090707224 100644 --- a/etcdserver/api/etcdhttp/version_test.go +++ b/etcdserver/api/etcdhttp/version_test.go @@ -20,7 +20,7 @@ import ( "net/http/httptest" "testing" - "go.etcd.io/etcd/v3/version" + "go.etcd.io/etcd/version" ) func TestServeVersion(t *testing.T) { diff --git a/etcdserver/api/membership/cluster.go b/etcdserver/api/membership/cluster.go index d5019f7f0e1..6250d9b092f 100644 --- a/etcdserver/api/membership/cluster.go +++ b/etcdserver/api/membership/cluster.go @@ -27,13 +27,13 @@ import ( "sync" "time" - "go.etcd.io/etcd/v3/etcdserver/api/v2store" - "go.etcd.io/etcd/v3/mvcc/backend" - "go.etcd.io/etcd/v3/pkg/netutil" - "go.etcd.io/etcd/v3/pkg/types" - "go.etcd.io/etcd/v3/raft" - "go.etcd.io/etcd/v3/raft/raftpb" - "go.etcd.io/etcd/v3/version" + "go.etcd.io/etcd/etcdserver/api/v2store" + "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/pkg/netutil" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft" + "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/version" "github.com/coreos/go-semver/semver" "github.com/prometheus/client_golang/prometheus" diff --git a/etcdserver/api/membership/cluster_test.go b/etcdserver/api/membership/cluster_test.go index d501d40e560..558738b6f98 100644 --- a/etcdserver/api/membership/cluster_test.go +++ b/etcdserver/api/membership/cluster_test.go @@ -21,11 +21,11 @@ import ( "reflect" "testing" - "go.etcd.io/etcd/v3/etcdserver/api/v2store" - "go.etcd.io/etcd/v3/pkg/mock/mockstore" - "go.etcd.io/etcd/v3/pkg/testutil" - "go.etcd.io/etcd/v3/pkg/types" - "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/etcdserver/api/v2store" + "go.etcd.io/etcd/pkg/mock/mockstore" + "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft/raftpb" "go.uber.org/zap" ) diff --git a/etcdserver/api/membership/errors.go b/etcdserver/api/membership/errors.go index c682ad5fddd..6c8b033ca74 100644 --- a/etcdserver/api/membership/errors.go +++ b/etcdserver/api/membership/errors.go @@ -17,7 +17,7 @@ package membership import ( "errors" - "go.etcd.io/etcd/v3/etcdserver/api/v2error" + "go.etcd.io/etcd/etcdserver/api/v2error" ) var ( diff --git a/etcdserver/api/membership/member.go b/etcdserver/api/membership/member.go index 8e45d80421f..896cb36aa45 100644 --- a/etcdserver/api/membership/member.go +++ b/etcdserver/api/membership/member.go @@ -23,7 +23,7 @@ import ( "time" "github.com/coreos/pkg/capnslog" - "go.etcd.io/etcd/v3/pkg/types" + "go.etcd.io/etcd/pkg/types" ) var ( diff --git a/etcdserver/api/membership/member_test.go b/etcdserver/api/membership/member_test.go index c67eb0a6dad..e9de530eedf 100644 --- a/etcdserver/api/membership/member_test.go +++ b/etcdserver/api/membership/member_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/pkg/types" + "go.etcd.io/etcd/pkg/types" ) func timeParse(value string) *time.Time { diff --git a/etcdserver/api/membership/store.go b/etcdserver/api/membership/store.go index ef057b57bfe..14ab1190ed9 100644 --- a/etcdserver/api/membership/store.go +++ b/etcdserver/api/membership/store.go @@ -19,9 +19,9 @@ import ( "fmt" "path" - "go.etcd.io/etcd/v3/etcdserver/api/v2store" - "go.etcd.io/etcd/v3/mvcc/backend" - "go.etcd.io/etcd/v3/pkg/types" + "go.etcd.io/etcd/etcdserver/api/v2store" + "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/pkg/types" "github.com/coreos/go-semver/semver" ) diff --git a/etcdserver/api/rafthttp/coder.go b/etcdserver/api/rafthttp/coder.go index f06f070b3bf..12c3e44242c 100644 --- a/etcdserver/api/rafthttp/coder.go +++ b/etcdserver/api/rafthttp/coder.go @@ -14,7 +14,7 @@ package rafthttp -import "go.etcd.io/etcd/v3/raft/raftpb" +import "go.etcd.io/etcd/raft/raftpb" type encoder interface { // encode encodes the given message to an output stream. diff --git a/etcdserver/api/rafthttp/functional_test.go b/etcdserver/api/rafthttp/functional_test.go index 796f44982ee..83de44478c6 100644 --- a/etcdserver/api/rafthttp/functional_test.go +++ b/etcdserver/api/rafthttp/functional_test.go @@ -21,10 +21,10 @@ import ( "testing" "time" - stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats" - "go.etcd.io/etcd/v3/pkg/types" - "go.etcd.io/etcd/v3/raft" - "go.etcd.io/etcd/v3/raft/raftpb" + stats "go.etcd.io/etcd/etcdserver/api/v2stats" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft" + "go.etcd.io/etcd/raft/raftpb" ) func TestSendMessage(t *testing.T) { diff --git a/etcdserver/api/rafthttp/http.go b/etcdserver/api/rafthttp/http.go index 5f637508b3d..18e9c53f24c 100644 --- a/etcdserver/api/rafthttp/http.go +++ b/etcdserver/api/rafthttp/http.go @@ -24,11 +24,11 @@ import ( "strings" "time" - "go.etcd.io/etcd/v3/etcdserver/api/snap" - pioutil "go.etcd.io/etcd/v3/pkg/ioutil" - "go.etcd.io/etcd/v3/pkg/types" - "go.etcd.io/etcd/v3/raft/raftpb" - "go.etcd.io/etcd/v3/version" + "go.etcd.io/etcd/etcdserver/api/snap" + pioutil "go.etcd.io/etcd/pkg/ioutil" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/version" humanize "github.com/dustin/go-humanize" "go.uber.org/zap" diff --git a/etcdserver/api/rafthttp/http_test.go b/etcdserver/api/rafthttp/http_test.go index 5cb248c6506..fd5e2456319 100644 --- a/etcdserver/api/rafthttp/http_test.go +++ b/etcdserver/api/rafthttp/http_test.go @@ -26,11 +26,11 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/etcdserver/api/snap" - "go.etcd.io/etcd/v3/pkg/pbutil" - "go.etcd.io/etcd/v3/pkg/types" - "go.etcd.io/etcd/v3/raft/raftpb" - "go.etcd.io/etcd/v3/version" + "go.etcd.io/etcd/etcdserver/api/snap" + "go.etcd.io/etcd/pkg/pbutil" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/version" "go.uber.org/zap" ) diff --git a/etcdserver/api/rafthttp/msg_codec.go b/etcdserver/api/rafthttp/msg_codec.go index bf522c273f5..2417d222e58 100644 --- a/etcdserver/api/rafthttp/msg_codec.go +++ b/etcdserver/api/rafthttp/msg_codec.go @@ -19,8 +19,8 @@ import ( "errors" "io" - "go.etcd.io/etcd/v3/pkg/pbutil" - "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/pkg/pbutil" + "go.etcd.io/etcd/raft/raftpb" ) // messageEncoder is a encoder that can encode all kinds of messages. diff --git a/etcdserver/api/rafthttp/msg_codec_test.go b/etcdserver/api/rafthttp/msg_codec_test.go index d2ea66fb4df..883fc8ef863 100644 --- a/etcdserver/api/rafthttp/msg_codec_test.go +++ b/etcdserver/api/rafthttp/msg_codec_test.go @@ -19,7 +19,7 @@ import ( "reflect" "testing" - "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/raft/raftpb" ) func TestMessage(t *testing.T) { diff --git a/etcdserver/api/rafthttp/msgappv2_codec.go b/etcdserver/api/rafthttp/msgappv2_codec.go index 5e7149d9640..1fa36deb394 100644 --- a/etcdserver/api/rafthttp/msgappv2_codec.go +++ b/etcdserver/api/rafthttp/msgappv2_codec.go @@ -20,10 +20,10 @@ import ( "io" "time" - stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats" - "go.etcd.io/etcd/v3/pkg/pbutil" - "go.etcd.io/etcd/v3/pkg/types" - "go.etcd.io/etcd/v3/raft/raftpb" + stats "go.etcd.io/etcd/etcdserver/api/v2stats" + "go.etcd.io/etcd/pkg/pbutil" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft/raftpb" ) const ( diff --git a/etcdserver/api/rafthttp/msgappv2_codec_test.go b/etcdserver/api/rafthttp/msgappv2_codec_test.go index 4f4804e16e3..48fd28992f6 100644 --- a/etcdserver/api/rafthttp/msgappv2_codec_test.go +++ b/etcdserver/api/rafthttp/msgappv2_codec_test.go @@ -19,9 +19,9 @@ import ( "reflect" "testing" - stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats" - "go.etcd.io/etcd/v3/pkg/types" - "go.etcd.io/etcd/v3/raft/raftpb" + stats "go.etcd.io/etcd/etcdserver/api/v2stats" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft/raftpb" ) func TestMsgAppV2(t *testing.T) { diff --git a/etcdserver/api/rafthttp/peer.go b/etcdserver/api/rafthttp/peer.go index cf45e9d96ee..8130c4a96b2 100644 --- a/etcdserver/api/rafthttp/peer.go +++ b/etcdserver/api/rafthttp/peer.go @@ -19,11 +19,11 @@ import ( "sync" "time" - "go.etcd.io/etcd/v3/etcdserver/api/snap" - stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats" - "go.etcd.io/etcd/v3/pkg/types" - "go.etcd.io/etcd/v3/raft" - "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/etcdserver/api/snap" + stats "go.etcd.io/etcd/etcdserver/api/v2stats" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft" + "go.etcd.io/etcd/raft/raftpb" "go.uber.org/zap" "golang.org/x/time/rate" diff --git a/etcdserver/api/rafthttp/peer_status.go b/etcdserver/api/rafthttp/peer_status.go index adfdf03dc7e..66149ff67d2 100644 --- a/etcdserver/api/rafthttp/peer_status.go +++ b/etcdserver/api/rafthttp/peer_status.go @@ -20,7 +20,7 @@ import ( "sync" "time" - "go.etcd.io/etcd/v3/pkg/types" + "go.etcd.io/etcd/pkg/types" "go.uber.org/zap" ) diff --git a/etcdserver/api/rafthttp/peer_test.go b/etcdserver/api/rafthttp/peer_test.go index a0b29dad3f8..29ef70fc6a9 100644 --- a/etcdserver/api/rafthttp/peer_test.go +++ b/etcdserver/api/rafthttp/peer_test.go @@ -17,7 +17,7 @@ package rafthttp import ( "testing" - "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/raft/raftpb" ) func TestPeerPick(t *testing.T) { diff --git a/etcdserver/api/rafthttp/pipeline.go b/etcdserver/api/rafthttp/pipeline.go index 8916d4c2049..70f92575d13 100644 --- a/etcdserver/api/rafthttp/pipeline.go +++ b/etcdserver/api/rafthttp/pipeline.go @@ -22,11 +22,11 @@ import ( "sync" "time" - stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats" - "go.etcd.io/etcd/v3/pkg/pbutil" - "go.etcd.io/etcd/v3/pkg/types" - "go.etcd.io/etcd/v3/raft" - "go.etcd.io/etcd/v3/raft/raftpb" + stats "go.etcd.io/etcd/etcdserver/api/v2stats" + "go.etcd.io/etcd/pkg/pbutil" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft" + "go.etcd.io/etcd/raft/raftpb" "go.uber.org/zap" ) diff --git a/etcdserver/api/rafthttp/pipeline_test.go b/etcdserver/api/rafthttp/pipeline_test.go index 0f8388ce8c5..231c768db14 100644 --- a/etcdserver/api/rafthttp/pipeline_test.go +++ b/etcdserver/api/rafthttp/pipeline_test.go @@ -24,11 +24,11 @@ import ( "testing" "time" - stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats" - "go.etcd.io/etcd/v3/pkg/testutil" - "go.etcd.io/etcd/v3/pkg/types" - "go.etcd.io/etcd/v3/raft/raftpb" - "go.etcd.io/etcd/v3/version" + stats "go.etcd.io/etcd/etcdserver/api/v2stats" + "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/version" "go.uber.org/zap" ) diff --git a/etcdserver/api/rafthttp/remote.go b/etcdserver/api/rafthttp/remote.go index 1c1e04e1f69..1ef2493ed45 100644 --- a/etcdserver/api/rafthttp/remote.go +++ b/etcdserver/api/rafthttp/remote.go @@ -15,8 +15,8 @@ package rafthttp import ( - "go.etcd.io/etcd/v3/pkg/types" - "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft/raftpb" "go.uber.org/zap" ) diff --git a/etcdserver/api/rafthttp/snapshot_sender.go b/etcdserver/api/rafthttp/snapshot_sender.go index 793ac3fd043..85abaeaa4d1 100644 --- a/etcdserver/api/rafthttp/snapshot_sender.go +++ b/etcdserver/api/rafthttp/snapshot_sender.go @@ -22,11 +22,11 @@ import ( "net/http" "time" - "go.etcd.io/etcd/v3/etcdserver/api/snap" - "go.etcd.io/etcd/v3/pkg/httputil" - pioutil "go.etcd.io/etcd/v3/pkg/ioutil" - "go.etcd.io/etcd/v3/pkg/types" - "go.etcd.io/etcd/v3/raft" + "go.etcd.io/etcd/etcdserver/api/snap" + "go.etcd.io/etcd/pkg/httputil" + pioutil "go.etcd.io/etcd/pkg/ioutil" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft" "github.com/dustin/go-humanize" "go.uber.org/zap" diff --git a/etcdserver/api/rafthttp/snapshot_test.go b/etcdserver/api/rafthttp/snapshot_test.go index 03ee21d811c..504a8ff6466 100644 --- a/etcdserver/api/rafthttp/snapshot_test.go +++ b/etcdserver/api/rafthttp/snapshot_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/etcdserver/api/snap" - "go.etcd.io/etcd/v3/pkg/types" - "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/etcdserver/api/snap" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft/raftpb" "go.uber.org/zap" ) diff --git a/etcdserver/api/rafthttp/stream.go b/etcdserver/api/rafthttp/stream.go index 8c0d246d374..dcb2223ca59 100644 --- a/etcdserver/api/rafthttp/stream.go +++ b/etcdserver/api/rafthttp/stream.go @@ -25,12 +25,12 @@ import ( "sync" "time" - stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats" - "go.etcd.io/etcd/v3/pkg/httputil" - "go.etcd.io/etcd/v3/pkg/transport" - "go.etcd.io/etcd/v3/pkg/types" - "go.etcd.io/etcd/v3/raft/raftpb" - "go.etcd.io/etcd/v3/version" + stats "go.etcd.io/etcd/etcdserver/api/v2stats" + "go.etcd.io/etcd/pkg/httputil" + "go.etcd.io/etcd/pkg/transport" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/version" "github.com/coreos/go-semver/semver" "go.uber.org/zap" diff --git a/etcdserver/api/rafthttp/stream_test.go b/etcdserver/api/rafthttp/stream_test.go index 483852a97d0..56b3e7fe073 100644 --- a/etcdserver/api/rafthttp/stream_test.go +++ b/etcdserver/api/rafthttp/stream_test.go @@ -26,11 +26,11 @@ import ( "testing" "time" - stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats" - "go.etcd.io/etcd/v3/pkg/testutil" - "go.etcd.io/etcd/v3/pkg/types" - "go.etcd.io/etcd/v3/raft/raftpb" - "go.etcd.io/etcd/v3/version" + stats "go.etcd.io/etcd/etcdserver/api/v2stats" + "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/version" "github.com/coreos/go-semver/semver" "go.uber.org/zap" diff --git a/etcdserver/api/rafthttp/transport.go b/etcdserver/api/rafthttp/transport.go index 353758f3a6f..d6e55091c33 100644 --- a/etcdserver/api/rafthttp/transport.go +++ b/etcdserver/api/rafthttp/transport.go @@ -20,13 +20,13 @@ import ( "sync" "time" - "go.etcd.io/etcd/v3/etcdserver/api/snap" - stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats" - "go.etcd.io/etcd/v3/pkg/logutil" - "go.etcd.io/etcd/v3/pkg/transport" - "go.etcd.io/etcd/v3/pkg/types" - "go.etcd.io/etcd/v3/raft" - "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/etcdserver/api/snap" + stats "go.etcd.io/etcd/etcdserver/api/v2stats" + "go.etcd.io/etcd/pkg/logutil" + "go.etcd.io/etcd/pkg/transport" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft" + "go.etcd.io/etcd/raft/raftpb" "github.com/coreos/pkg/capnslog" "github.com/xiang90/probing" diff --git a/etcdserver/api/rafthttp/transport_bench_test.go b/etcdserver/api/rafthttp/transport_bench_test.go index e2db71282be..9e6aabd4fd4 100644 --- a/etcdserver/api/rafthttp/transport_bench_test.go +++ b/etcdserver/api/rafthttp/transport_bench_test.go @@ -21,10 +21,10 @@ import ( "testing" "time" - stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats" - "go.etcd.io/etcd/v3/pkg/types" - "go.etcd.io/etcd/v3/raft" - "go.etcd.io/etcd/v3/raft/raftpb" + stats "go.etcd.io/etcd/etcdserver/api/v2stats" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft" + "go.etcd.io/etcd/raft/raftpb" ) func BenchmarkSendingMsgApp(b *testing.B) { diff --git a/etcdserver/api/rafthttp/transport_test.go b/etcdserver/api/rafthttp/transport_test.go index 72da65a8183..7c8641fec4f 100644 --- a/etcdserver/api/rafthttp/transport_test.go +++ b/etcdserver/api/rafthttp/transport_test.go @@ -20,10 +20,10 @@ import ( "testing" "time" - stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats" - "go.etcd.io/etcd/v3/pkg/testutil" - "go.etcd.io/etcd/v3/pkg/types" - "go.etcd.io/etcd/v3/raft/raftpb" + stats "go.etcd.io/etcd/etcdserver/api/v2stats" + "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft/raftpb" "github.com/xiang90/probing" ) diff --git a/etcdserver/api/rafthttp/urlpick.go b/etcdserver/api/rafthttp/urlpick.go index 33eb7e96fe7..61ef468649a 100644 --- a/etcdserver/api/rafthttp/urlpick.go +++ b/etcdserver/api/rafthttp/urlpick.go @@ -18,7 +18,7 @@ import ( "net/url" "sync" - "go.etcd.io/etcd/v3/pkg/types" + "go.etcd.io/etcd/pkg/types" ) type urlPicker struct { diff --git a/etcdserver/api/rafthttp/urlpick_test.go b/etcdserver/api/rafthttp/urlpick_test.go index 730b4f3fc1b..230730de59c 100644 --- a/etcdserver/api/rafthttp/urlpick_test.go +++ b/etcdserver/api/rafthttp/urlpick_test.go @@ -18,7 +18,7 @@ import ( "net/url" "testing" - "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/pkg/testutil" ) // TestURLPickerPickTwice tests that pick returns a possible url, diff --git a/etcdserver/api/rafthttp/util.go b/etcdserver/api/rafthttp/util.go index 314d3c9d55f..20938647c7a 100644 --- a/etcdserver/api/rafthttp/util.go +++ b/etcdserver/api/rafthttp/util.go @@ -23,9 +23,9 @@ import ( "strings" "time" - "go.etcd.io/etcd/v3/pkg/transport" - "go.etcd.io/etcd/v3/pkg/types" - "go.etcd.io/etcd/v3/version" + "go.etcd.io/etcd/pkg/transport" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/version" "github.com/coreos/go-semver/semver" ) diff --git a/etcdserver/api/rafthttp/util_test.go b/etcdserver/api/rafthttp/util_test.go index 41e1256c66a..17a385ed152 100644 --- a/etcdserver/api/rafthttp/util_test.go +++ b/etcdserver/api/rafthttp/util_test.go @@ -22,8 +22,8 @@ import ( "reflect" "testing" - "go.etcd.io/etcd/v3/raft/raftpb" - "go.etcd.io/etcd/v3/version" + "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/version" "github.com/coreos/go-semver/semver" ) diff --git a/etcdserver/api/snap/db.go b/etcdserver/api/snap/db.go index 67747eea20e..3002ccdccea 100644 --- a/etcdserver/api/snap/db.go +++ b/etcdserver/api/snap/db.go @@ -23,7 +23,7 @@ import ( "path/filepath" "time" - "go.etcd.io/etcd/v3/pkg/fileutil" + "go.etcd.io/etcd/pkg/fileutil" humanize "github.com/dustin/go-humanize" "go.uber.org/zap" diff --git a/etcdserver/api/snap/message.go b/etcdserver/api/snap/message.go index 9e626eb07fd..c1151e27eb1 100644 --- a/etcdserver/api/snap/message.go +++ b/etcdserver/api/snap/message.go @@ -17,8 +17,8 @@ package snap import ( "io" - "go.etcd.io/etcd/v3/pkg/ioutil" - "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/pkg/ioutil" + "go.etcd.io/etcd/raft/raftpb" ) // Message is a struct that contains a raft Message and a ReadCloser. The type diff --git a/etcdserver/api/snap/snapshotter.go b/etcdserver/api/snap/snapshotter.go index c458d51e0f5..7e7933374c9 100644 --- a/etcdserver/api/snap/snapshotter.go +++ b/etcdserver/api/snap/snapshotter.go @@ -25,11 +25,11 @@ import ( "strings" "time" - "go.etcd.io/etcd/v3/etcdserver/api/snap/snappb" - pioutil "go.etcd.io/etcd/v3/pkg/ioutil" - "go.etcd.io/etcd/v3/pkg/pbutil" - "go.etcd.io/etcd/v3/raft" - "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/etcdserver/api/snap/snappb" + pioutil "go.etcd.io/etcd/pkg/ioutil" + "go.etcd.io/etcd/pkg/pbutil" + "go.etcd.io/etcd/raft" + "go.etcd.io/etcd/raft/raftpb" "github.com/coreos/pkg/capnslog" "go.uber.org/zap" diff --git a/etcdserver/api/snap/snapshotter_test.go b/etcdserver/api/snap/snapshotter_test.go index c44de6ae861..00e3e21dc3c 100644 --- a/etcdserver/api/snap/snapshotter_test.go +++ b/etcdserver/api/snap/snapshotter_test.go @@ -23,7 +23,7 @@ import ( "reflect" "testing" - "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/raft/raftpb" "go.uber.org/zap" ) diff --git a/etcdserver/api/v2auth/auth.go b/etcdserver/api/v2auth/auth.go index 23820aa1207..b438074a449 100644 --- a/etcdserver/api/v2auth/auth.go +++ b/etcdserver/api/v2auth/auth.go @@ -26,10 +26,10 @@ import ( "strings" "time" - "go.etcd.io/etcd/v3/etcdserver" - "go.etcd.io/etcd/v3/etcdserver/api/v2error" - "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/pkg/types" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api/v2error" + "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/types" "github.com/coreos/pkg/capnslog" "go.uber.org/zap" diff --git a/etcdserver/api/v2auth/auth_requests.go b/etcdserver/api/v2auth/auth_requests.go index 5f13bd62096..d6574ecca63 100644 --- a/etcdserver/api/v2auth/auth_requests.go +++ b/etcdserver/api/v2auth/auth_requests.go @@ -19,9 +19,9 @@ import ( "encoding/json" "path" - "go.etcd.io/etcd/v3/etcdserver" - "go.etcd.io/etcd/v3/etcdserver/api/v2error" - "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api/v2error" + "go.etcd.io/etcd/etcdserver/etcdserverpb" "go.uber.org/zap" ) diff --git a/etcdserver/api/v2auth/auth_test.go b/etcdserver/api/v2auth/auth_test.go index 6fdac203d7d..5c1564b25c9 100644 --- a/etcdserver/api/v2auth/auth_test.go +++ b/etcdserver/api/v2auth/auth_test.go @@ -20,10 +20,10 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/etcdserver" - "go.etcd.io/etcd/v3/etcdserver/api/v2error" - "go.etcd.io/etcd/v3/etcdserver/api/v2store" - "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api/v2error" + "go.etcd.io/etcd/etcdserver/api/v2store" + "go.etcd.io/etcd/etcdserver/etcdserverpb" "go.uber.org/zap" ) diff --git a/etcdserver/api/v2discovery/discovery.go b/etcdserver/api/v2discovery/discovery.go index 7807b322850..cf770b37859 100644 --- a/etcdserver/api/v2discovery/discovery.go +++ b/etcdserver/api/v2discovery/discovery.go @@ -29,9 +29,9 @@ import ( "strings" "time" - "go.etcd.io/etcd/v3/client" - "go.etcd.io/etcd/v3/pkg/transport" - "go.etcd.io/etcd/v3/pkg/types" + "go.etcd.io/etcd/client" + "go.etcd.io/etcd/pkg/transport" + "go.etcd.io/etcd/pkg/types" "github.com/coreos/pkg/capnslog" "github.com/jonboulle/clockwork" diff --git a/etcdserver/api/v2discovery/discovery_test.go b/etcdserver/api/v2discovery/discovery_test.go index 1443f5fff8c..c1eff88235c 100644 --- a/etcdserver/api/v2discovery/discovery_test.go +++ b/etcdserver/api/v2discovery/discovery_test.go @@ -28,7 +28,7 @@ import ( "go.uber.org/zap" - "go.etcd.io/etcd/v3/client" + "go.etcd.io/etcd/client" "github.com/jonboulle/clockwork" ) diff --git a/etcdserver/api/v2http/capability.go b/etcdserver/api/v2http/capability.go index 9da24fb4645..ed6c456d0b6 100644 --- a/etcdserver/api/v2http/capability.go +++ b/etcdserver/api/v2http/capability.go @@ -18,8 +18,8 @@ import ( "fmt" "net/http" - "go.etcd.io/etcd/v3/etcdserver/api" - "go.etcd.io/etcd/v3/etcdserver/api/v2http/httptypes" + "go.etcd.io/etcd/etcdserver/api" + "go.etcd.io/etcd/etcdserver/api/v2http/httptypes" ) func authCapabilityHandler(fn func(http.ResponseWriter, *http.Request)) http.HandlerFunc { diff --git a/etcdserver/api/v2http/client.go b/etcdserver/api/v2http/client.go index 4b6fa9f8644..1d1e592b25d 100644 --- a/etcdserver/api/v2http/client.go +++ b/etcdserver/api/v2http/client.go @@ -27,17 +27,17 @@ import ( "strings" "time" - "go.etcd.io/etcd/v3/etcdserver" - "go.etcd.io/etcd/v3/etcdserver/api" - "go.etcd.io/etcd/v3/etcdserver/api/etcdhttp" - "go.etcd.io/etcd/v3/etcdserver/api/membership" - "go.etcd.io/etcd/v3/etcdserver/api/v2auth" - "go.etcd.io/etcd/v3/etcdserver/api/v2error" - "go.etcd.io/etcd/v3/etcdserver/api/v2http/httptypes" - stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats" - "go.etcd.io/etcd/v3/etcdserver/api/v2store" - "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/pkg/types" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api" + "go.etcd.io/etcd/etcdserver/api/etcdhttp" + "go.etcd.io/etcd/etcdserver/api/membership" + "go.etcd.io/etcd/etcdserver/api/v2auth" + "go.etcd.io/etcd/etcdserver/api/v2error" + "go.etcd.io/etcd/etcdserver/api/v2http/httptypes" + stats "go.etcd.io/etcd/etcdserver/api/v2stats" + "go.etcd.io/etcd/etcdserver/api/v2store" + "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/types" "github.com/jonboulle/clockwork" "go.uber.org/zap" diff --git a/etcdserver/api/v2http/client_auth.go b/etcdserver/api/v2http/client_auth.go index 15c928a13dc..d8d6a883a93 100644 --- a/etcdserver/api/v2http/client_auth.go +++ b/etcdserver/api/v2http/client_auth.go @@ -20,9 +20,9 @@ import ( "path" "strings" - "go.etcd.io/etcd/v3/etcdserver/api" - "go.etcd.io/etcd/v3/etcdserver/api/v2auth" - "go.etcd.io/etcd/v3/etcdserver/api/v2http/httptypes" + "go.etcd.io/etcd/etcdserver/api" + "go.etcd.io/etcd/etcdserver/api/v2auth" + "go.etcd.io/etcd/etcdserver/api/v2http/httptypes" "go.uber.org/zap" ) diff --git a/etcdserver/api/v2http/client_auth_test.go b/etcdserver/api/v2http/client_auth_test.go index 2350eb87eea..22dfafa8f54 100644 --- a/etcdserver/api/v2http/client_auth_test.go +++ b/etcdserver/api/v2http/client_auth_test.go @@ -30,8 +30,8 @@ import ( "strings" "testing" - "go.etcd.io/etcd/v3/etcdserver/api" - "go.etcd.io/etcd/v3/etcdserver/api/v2auth" + "go.etcd.io/etcd/etcdserver/api" + "go.etcd.io/etcd/etcdserver/api/v2auth" "go.uber.org/zap" ) diff --git a/etcdserver/api/v2http/client_test.go b/etcdserver/api/v2http/client_test.go index 89407097c29..5bab6c45fa9 100644 --- a/etcdserver/api/v2http/client_test.go +++ b/etcdserver/api/v2http/client_test.go @@ -29,16 +29,16 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/etcdserver" - "go.etcd.io/etcd/v3/etcdserver/api" - "go.etcd.io/etcd/v3/etcdserver/api/membership" - "go.etcd.io/etcd/v3/etcdserver/api/v2error" - "go.etcd.io/etcd/v3/etcdserver/api/v2http/httptypes" - "go.etcd.io/etcd/v3/etcdserver/api/v2store" - "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/pkg/testutil" - "go.etcd.io/etcd/v3/pkg/types" - "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api" + "go.etcd.io/etcd/etcdserver/api/membership" + "go.etcd.io/etcd/etcdserver/api/v2error" + "go.etcd.io/etcd/etcdserver/api/v2http/httptypes" + "go.etcd.io/etcd/etcdserver/api/v2store" + "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft/raftpb" "github.com/coreos/go-semver/semver" "github.com/jonboulle/clockwork" diff --git a/etcdserver/api/v2http/http.go b/etcdserver/api/v2http/http.go index 5df1afe1a59..c6956893e14 100644 --- a/etcdserver/api/v2http/http.go +++ b/etcdserver/api/v2http/http.go @@ -20,10 +20,10 @@ import ( "strings" "time" - "go.etcd.io/etcd/v3/etcdserver/api/etcdhttp" - "go.etcd.io/etcd/v3/etcdserver/api/v2auth" - "go.etcd.io/etcd/v3/etcdserver/api/v2http/httptypes" - "go.etcd.io/etcd/v3/pkg/logutil" + "go.etcd.io/etcd/etcdserver/api/etcdhttp" + "go.etcd.io/etcd/etcdserver/api/v2auth" + "go.etcd.io/etcd/etcdserver/api/v2http/httptypes" + "go.etcd.io/etcd/pkg/logutil" "github.com/coreos/pkg/capnslog" "go.uber.org/zap" diff --git a/etcdserver/api/v2http/http_test.go b/etcdserver/api/v2http/http_test.go index a5cdbcad43f..f93071048d0 100644 --- a/etcdserver/api/v2http/http_test.go +++ b/etcdserver/api/v2http/http_test.go @@ -22,12 +22,12 @@ import ( "sort" "testing" - "go.etcd.io/etcd/v3/etcdserver" - "go.etcd.io/etcd/v3/etcdserver/api/membership" - "go.etcd.io/etcd/v3/etcdserver/api/v2error" - "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/pkg/types" - "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api/membership" + "go.etcd.io/etcd/etcdserver/api/v2error" + "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft/raftpb" "github.com/coreos/go-semver/semver" "go.uber.org/zap" diff --git a/etcdserver/api/v2http/httptypes/member.go b/etcdserver/api/v2http/httptypes/member.go index fefe6a02029..95fd443ffdc 100644 --- a/etcdserver/api/v2http/httptypes/member.go +++ b/etcdserver/api/v2http/httptypes/member.go @@ -19,7 +19,7 @@ package httptypes import ( "encoding/json" - "go.etcd.io/etcd/v3/pkg/types" + "go.etcd.io/etcd/pkg/types" ) type Member struct { diff --git a/etcdserver/api/v2http/httptypes/member_test.go b/etcdserver/api/v2http/httptypes/member_test.go index ea95550b2fc..a13efbc1425 100644 --- a/etcdserver/api/v2http/httptypes/member_test.go +++ b/etcdserver/api/v2http/httptypes/member_test.go @@ -20,7 +20,7 @@ import ( "reflect" "testing" - "go.etcd.io/etcd/v3/pkg/types" + "go.etcd.io/etcd/pkg/types" ) func TestMemberUnmarshal(t *testing.T) { diff --git a/etcdserver/api/v2http/metrics.go b/etcdserver/api/v2http/metrics.go index 03ca58b9629..14f7da0fea7 100644 --- a/etcdserver/api/v2http/metrics.go +++ b/etcdserver/api/v2http/metrics.go @@ -20,9 +20,9 @@ import ( "net/http" - "go.etcd.io/etcd/v3/etcdserver/api/v2error" - "go.etcd.io/etcd/v3/etcdserver/api/v2http/httptypes" - "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + "go.etcd.io/etcd/etcdserver/api/v2error" + "go.etcd.io/etcd/etcdserver/api/v2http/httptypes" + "go.etcd.io/etcd/etcdserver/etcdserverpb" "github.com/prometheus/client_golang/prometheus" ) diff --git a/etcdserver/api/v2stats/server.go b/etcdserver/api/v2stats/server.go index 21987d2b6a6..c4accc73519 100644 --- a/etcdserver/api/v2stats/server.go +++ b/etcdserver/api/v2stats/server.go @@ -20,7 +20,7 @@ import ( "sync" "time" - "go.etcd.io/etcd/v3/raft" + "go.etcd.io/etcd/raft" ) // ServerStats encapsulates various statistics about an EtcdServer and its diff --git a/etcdserver/api/v2store/event_history.go b/etcdserver/api/v2store/event_history.go index 18aa8a17f1d..e4a969f3728 100644 --- a/etcdserver/api/v2store/event_history.go +++ b/etcdserver/api/v2store/event_history.go @@ -20,7 +20,7 @@ import ( "strings" "sync" - "go.etcd.io/etcd/v3/etcdserver/api/v2error" + "go.etcd.io/etcd/etcdserver/api/v2error" ) type EventHistory struct { diff --git a/etcdserver/api/v2store/event_test.go b/etcdserver/api/v2store/event_test.go index b37e0ad336d..7de87035ce2 100644 --- a/etcdserver/api/v2store/event_test.go +++ b/etcdserver/api/v2store/event_test.go @@ -17,7 +17,7 @@ package v2store import ( "testing" - "go.etcd.io/etcd/v3/etcdserver/api/v2error" + "go.etcd.io/etcd/etcdserver/api/v2error" ) // TestEventQueue tests a queue with capacity = 100 diff --git a/etcdserver/api/v2store/node.go b/etcdserver/api/v2store/node.go index 50316ec4cf2..38a6984fb6a 100644 --- a/etcdserver/api/v2store/node.go +++ b/etcdserver/api/v2store/node.go @@ -19,7 +19,7 @@ import ( "sort" "time" - "go.etcd.io/etcd/v3/etcdserver/api/v2error" + "go.etcd.io/etcd/etcdserver/api/v2error" "github.com/jonboulle/clockwork" ) diff --git a/etcdserver/api/v2store/node_extern_test.go b/etcdserver/api/v2store/node_extern_test.go index 0a99048f8d8..df7e725f31d 100644 --- a/etcdserver/api/v2store/node_extern_test.go +++ b/etcdserver/api/v2store/node_extern_test.go @@ -20,7 +20,7 @@ import ( "time" "unsafe" - "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/pkg/testutil" ) func TestNodeExternClone(t *testing.T) { diff --git a/etcdserver/api/v2store/stats_test.go b/etcdserver/api/v2store/stats_test.go index 3793d8f6dce..65dbf3622a3 100644 --- a/etcdserver/api/v2store/stats_test.go +++ b/etcdserver/api/v2store/stats_test.go @@ -18,7 +18,7 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/pkg/testutil" ) // Ensure that a successful Get is recorded in the stats. diff --git a/etcdserver/api/v2store/store.go b/etcdserver/api/v2store/store.go index 8a912dbdfb4..ce940436eb7 100644 --- a/etcdserver/api/v2store/store.go +++ b/etcdserver/api/v2store/store.go @@ -23,8 +23,8 @@ import ( "sync" "time" - "go.etcd.io/etcd/v3/etcdserver/api/v2error" - "go.etcd.io/etcd/v3/pkg/types" + "go.etcd.io/etcd/etcdserver/api/v2error" + "go.etcd.io/etcd/pkg/types" "github.com/jonboulle/clockwork" ) diff --git a/etcdserver/api/v2store/store_test.go b/etcdserver/api/v2store/store_test.go index 76ec02d4e8d..451d9bec6c3 100644 --- a/etcdserver/api/v2store/store_test.go +++ b/etcdserver/api/v2store/store_test.go @@ -18,9 +18,9 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/etcdserver/api/v2error" - "go.etcd.io/etcd/v3/etcdserver/api/v2store" - "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/etcdserver/api/v2error" + "go.etcd.io/etcd/etcdserver/api/v2store" + "go.etcd.io/etcd/pkg/testutil" ) type StoreCloser interface { diff --git a/etcdserver/api/v2store/store_ttl_test.go b/etcdserver/api/v2store/store_ttl_test.go index 792f6165a65..94c7493f003 100644 --- a/etcdserver/api/v2store/store_ttl_test.go +++ b/etcdserver/api/v2store/store_ttl_test.go @@ -18,8 +18,8 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/etcdserver/api/v2error" - "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/etcdserver/api/v2error" + "go.etcd.io/etcd/pkg/testutil" "github.com/jonboulle/clockwork" ) diff --git a/etcdserver/api/v2store/store_v2_test.go b/etcdserver/api/v2store/store_v2_test.go index e165094db52..d327fd32db3 100644 --- a/etcdserver/api/v2store/store_v2_test.go +++ b/etcdserver/api/v2store/store_v2_test.go @@ -19,8 +19,8 @@ package v2store_test import ( "testing" - "go.etcd.io/etcd/v3/etcdserver/api/v2store" - "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/etcdserver/api/v2store" + "go.etcd.io/etcd/pkg/testutil" ) type v2TestStore struct { diff --git a/etcdserver/api/v2store/store_v2v3_test.go b/etcdserver/api/v2store/store_v2v3_test.go index b7d4b26c9a2..d0350393a2e 100644 --- a/etcdserver/api/v2store/store_v2v3_test.go +++ b/etcdserver/api/v2store/store_v2v3_test.go @@ -20,10 +20,10 @@ import ( "io/ioutil" "testing" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/etcdserver/api/v2store" - "go.etcd.io/etcd/v3/etcdserver/api/v2v3" - "go.etcd.io/etcd/v3/integration" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver/api/v2store" + "go.etcd.io/etcd/etcdserver/api/v2v3" + "go.etcd.io/etcd/integration" "google.golang.org/grpc/grpclog" ) diff --git a/etcdserver/api/v2store/watcher_hub.go b/etcdserver/api/v2store/watcher_hub.go index 3b3e7f103b4..a452e7e951f 100644 --- a/etcdserver/api/v2store/watcher_hub.go +++ b/etcdserver/api/v2store/watcher_hub.go @@ -21,7 +21,7 @@ import ( "sync" "sync/atomic" - "go.etcd.io/etcd/v3/etcdserver/api/v2error" + "go.etcd.io/etcd/etcdserver/api/v2error" ) // A watcherHub contains all subscribed watchers diff --git a/etcdserver/api/v2v3/cluster.go b/etcdserver/api/v2v3/cluster.go index 51e2b65345a..a22e4afad15 100644 --- a/etcdserver/api/v2v3/cluster.go +++ b/etcdserver/api/v2v3/cluster.go @@ -15,8 +15,8 @@ package v2v3 import ( - "go.etcd.io/etcd/v3/etcdserver/api/membership" - "go.etcd.io/etcd/v3/pkg/types" + "go.etcd.io/etcd/etcdserver/api/membership" + "go.etcd.io/etcd/pkg/types" "github.com/coreos/go-semver/semver" ) diff --git a/etcdserver/api/v2v3/server.go b/etcdserver/api/v2v3/server.go index 0093f6e0a93..5ff9b96c0c4 100644 --- a/etcdserver/api/v2v3/server.go +++ b/etcdserver/api/v2v3/server.go @@ -19,12 +19,12 @@ import ( "net/http" "time" - "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" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/pkg/types" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api" + "go.etcd.io/etcd/etcdserver/api/membership" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/types" "github.com/coreos/go-semver/semver" "go.uber.org/zap" diff --git a/etcdserver/api/v2v3/store.go b/etcdserver/api/v2v3/store.go index e446ceda179..f1c7ab3784d 100644 --- a/etcdserver/api/v2v3/store.go +++ b/etcdserver/api/v2v3/store.go @@ -22,11 +22,11 @@ import ( "strings" "time" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/clientv3/concurrency" - "go.etcd.io/etcd/v3/etcdserver/api/v2error" - "go.etcd.io/etcd/v3/etcdserver/api/v2store" - "go.etcd.io/etcd/v3/mvcc/mvccpb" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/concurrency" + "go.etcd.io/etcd/etcdserver/api/v2error" + "go.etcd.io/etcd/etcdserver/api/v2store" + "go.etcd.io/etcd/mvcc/mvccpb" ) // store implements the Store interface for V2 using diff --git a/etcdserver/api/v2v3/watcher.go b/etcdserver/api/v2v3/watcher.go index b17ffa42783..e8a3557c1e9 100644 --- a/etcdserver/api/v2v3/watcher.go +++ b/etcdserver/api/v2v3/watcher.go @@ -18,9 +18,9 @@ import ( "context" "strings" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/etcdserver/api/v2error" - "go.etcd.io/etcd/v3/etcdserver/api/v2store" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver/api/v2error" + "go.etcd.io/etcd/etcdserver/api/v2store" ) func (s *v2v3Store) Watch(prefix string, recursive, stream bool, sinceIndex uint64) (v2store.Watcher, error) { diff --git a/etcdserver/api/v3alarm/alarms.go b/etcdserver/api/v3alarm/alarms.go index c9b50b984e1..2b085a8e718 100644 --- a/etcdserver/api/v3alarm/alarms.go +++ b/etcdserver/api/v3alarm/alarms.go @@ -18,9 +18,9 @@ package v3alarm import ( "sync" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/mvcc/backend" - "go.etcd.io/etcd/v3/pkg/types" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/pkg/types" "github.com/coreos/pkg/capnslog" ) diff --git a/etcdserver/api/v3client/doc.go b/etcdserver/api/v3client/doc.go index 7adbec97b0f..47922c43316 100644 --- a/etcdserver/api/v3client/doc.go +++ b/etcdserver/api/v3client/doc.go @@ -19,8 +19,8 @@ // import ( // "context" // -// "go.etcd.io/etcd/v3/embed" -// "go.etcd.io/etcd/v3/etcdserver/api/v3client" +// "go.etcd.io/etcd/embed" +// "go.etcd.io/etcd/etcdserver/api/v3client" // ) // // ... diff --git a/etcdserver/api/v3client/v3client.go b/etcdserver/api/v3client/v3client.go index f2a401224a8..d2031213cfb 100644 --- a/etcdserver/api/v3client/v3client.go +++ b/etcdserver/api/v3client/v3client.go @@ -18,10 +18,10 @@ import ( "context" "time" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/etcdserver" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc" - "go.etcd.io/etcd/v3/proxy/grpcproxy/adapter" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api/v3rpc" + "go.etcd.io/etcd/proxy/grpcproxy/adapter" ) // New creates a clientv3 client that wraps an in-process EtcdServer. Instead diff --git a/etcdserver/api/v3compactor/compactor.go b/etcdserver/api/v3compactor/compactor.go index c41c7276f51..73a96842d1c 100644 --- a/etcdserver/api/v3compactor/compactor.go +++ b/etcdserver/api/v3compactor/compactor.go @@ -19,7 +19,7 @@ import ( "fmt" "time" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" "github.com/coreos/pkg/capnslog" "github.com/jonboulle/clockwork" diff --git a/etcdserver/api/v3compactor/compactor_test.go b/etcdserver/api/v3compactor/compactor_test.go index c10a398581c..76a11aeaf8f 100644 --- a/etcdserver/api/v3compactor/compactor_test.go +++ b/etcdserver/api/v3compactor/compactor_test.go @@ -18,8 +18,8 @@ import ( "context" "sync/atomic" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/pkg/testutil" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/testutil" ) type fakeCompactable struct { diff --git a/etcdserver/api/v3compactor/periodic.go b/etcdserver/api/v3compactor/periodic.go index fee0c79dd21..ab64cb70619 100644 --- a/etcdserver/api/v3compactor/periodic.go +++ b/etcdserver/api/v3compactor/periodic.go @@ -19,8 +19,8 @@ import ( "sync" "time" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/mvcc" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/mvcc" "github.com/jonboulle/clockwork" "go.uber.org/zap" diff --git a/etcdserver/api/v3compactor/periodic_test.go b/etcdserver/api/v3compactor/periodic_test.go index c876ab408b9..b9d49afa605 100644 --- a/etcdserver/api/v3compactor/periodic_test.go +++ b/etcdserver/api/v3compactor/periodic_test.go @@ -19,8 +19,8 @@ import ( "testing" "time" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/pkg/testutil" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/testutil" "github.com/jonboulle/clockwork" "go.uber.org/zap" diff --git a/etcdserver/api/v3compactor/revision.go b/etcdserver/api/v3compactor/revision.go index be31eefac37..cf8ac430105 100644 --- a/etcdserver/api/v3compactor/revision.go +++ b/etcdserver/api/v3compactor/revision.go @@ -19,8 +19,8 @@ import ( "sync" "time" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/mvcc" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/mvcc" "github.com/jonboulle/clockwork" "go.uber.org/zap" diff --git a/etcdserver/api/v3compactor/revision_test.go b/etcdserver/api/v3compactor/revision_test.go index 80c714d066d..fcd01066fbf 100644 --- a/etcdserver/api/v3compactor/revision_test.go +++ b/etcdserver/api/v3compactor/revision_test.go @@ -19,8 +19,8 @@ import ( "testing" "time" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/pkg/testutil" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/testutil" "github.com/jonboulle/clockwork" "go.uber.org/zap" diff --git a/etcdserver/api/v3election/election.go b/etcdserver/api/v3election/election.go index 7a2058b0613..f5a3be3b239 100644 --- a/etcdserver/api/v3election/election.go +++ b/etcdserver/api/v3election/election.go @@ -18,9 +18,9 @@ import ( "context" "errors" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/clientv3/concurrency" - epb "go.etcd.io/etcd/v3/etcdserver/api/v3election/v3electionpb" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/concurrency" + epb "go.etcd.io/etcd/etcdserver/api/v3election/v3electionpb" ) // ErrMissingLeaderKey is returned when election API request diff --git a/etcdserver/api/v3election/v3electionpb/gw/v3election.pb.gw.go b/etcdserver/api/v3election/v3electionpb/gw/v3election.pb.gw.go index b66a1cfbf70..23551b54b60 100644 --- a/etcdserver/api/v3election/v3electionpb/gw/v3election.pb.gw.go +++ b/etcdserver/api/v3election/v3electionpb/gw/v3election.pb.gw.go @@ -9,7 +9,7 @@ It translates gRPC into RESTful JSON APIs. package gw import ( - "go.etcd.io/etcd/v3/etcdserver/api/v3election/v3electionpb" + "go.etcd.io/etcd/etcdserver/api/v3election/v3electionpb" "io" "net/http" diff --git a/etcdserver/api/v3election/v3electionpb/v3election.pb.go b/etcdserver/api/v3election/v3electionpb/v3election.pb.go index 05e62fc5008..1fc1bce442f 100644 --- a/etcdserver/api/v3election/v3electionpb/v3election.pb.go +++ b/etcdserver/api/v3election/v3electionpb/v3election.pb.go @@ -29,9 +29,9 @@ import ( _ "github.com/gogo/protobuf/gogoproto" - etcdserverpb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + etcdserverpb "go.etcd.io/etcd/etcdserver/etcdserverpb" - mvccpb "go.etcd.io/etcd/v3/mvcc/mvccpb" + mvccpb "go.etcd.io/etcd/mvcc/mvccpb" context "golang.org/x/net/context" diff --git a/etcdserver/api/v3election/v3electionpb/v3election.proto b/etcdserver/api/v3election/v3electionpb/v3election.proto index 3f87db4eeaf..918f39fa853 100644 --- a/etcdserver/api/v3election/v3electionpb/v3election.proto +++ b/etcdserver/api/v3election/v3electionpb/v3election.proto @@ -2,8 +2,8 @@ syntax = "proto3"; package v3electionpb; import "gogoproto/gogo.proto"; -import "etcd/v3/etcdserver/etcdserverpb/rpc.proto"; -import "etcd/v3/mvcc/mvccpb/kv.proto"; +import "etcd/etcdserver/etcdserverpb/rpc.proto"; +import "etcd/mvcc/mvccpb/kv.proto"; // for grpc-gateway import "google/api/annotations.proto"; diff --git a/etcdserver/api/v3lock/lock.go b/etcdserver/api/v3lock/lock.go index ec3fb407edf..5a17c86fc2b 100644 --- a/etcdserver/api/v3lock/lock.go +++ b/etcdserver/api/v3lock/lock.go @@ -17,9 +17,9 @@ package v3lock import ( "context" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/clientv3/concurrency" - "go.etcd.io/etcd/v3/etcdserver/api/v3lock/v3lockpb" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/concurrency" + "go.etcd.io/etcd/etcdserver/api/v3lock/v3lockpb" ) type lockServer struct { diff --git a/etcdserver/api/v3lock/v3lockpb/gw/v3lock.pb.gw.go b/etcdserver/api/v3lock/v3lockpb/gw/v3lock.pb.gw.go index 09405e1cd3f..1eeeff1853f 100644 --- a/etcdserver/api/v3lock/v3lockpb/gw/v3lock.pb.gw.go +++ b/etcdserver/api/v3lock/v3lockpb/gw/v3lock.pb.gw.go @@ -9,7 +9,7 @@ It translates gRPC into RESTful JSON APIs. package gw import ( - "go.etcd.io/etcd/v3/etcdserver/api/v3lock/v3lockpb" + "go.etcd.io/etcd/etcdserver/api/v3lock/v3lockpb" "io" "net/http" diff --git a/etcdserver/api/v3lock/v3lockpb/v3lock.pb.go b/etcdserver/api/v3lock/v3lockpb/v3lock.pb.go index ad139c1c8aa..36ebdd90f4a 100644 --- a/etcdserver/api/v3lock/v3lockpb/v3lock.pb.go +++ b/etcdserver/api/v3lock/v3lockpb/v3lock.pb.go @@ -24,7 +24,7 @@ import ( _ "github.com/gogo/protobuf/gogoproto" - etcdserverpb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + etcdserverpb "go.etcd.io/etcd/etcdserver/etcdserverpb" context "golang.org/x/net/context" diff --git a/etcdserver/api/v3lock/v3lockpb/v3lock.proto b/etcdserver/api/v3lock/v3lockpb/v3lock.proto index 14a79ddbf24..7220c7f0a19 100644 --- a/etcdserver/api/v3lock/v3lockpb/v3lock.proto +++ b/etcdserver/api/v3lock/v3lockpb/v3lock.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v3lockpb; import "gogoproto/gogo.proto"; -import "etcd/v3/etcdserver/etcdserverpb/rpc.proto"; +import "etcd/etcdserver/etcdserverpb/rpc.proto"; // for grpc-gateway import "google/api/annotations.proto"; diff --git a/etcdserver/api/v3rpc/auth.go b/etcdserver/api/v3rpc/auth.go index 71f068b6262..62ce757beaa 100644 --- a/etcdserver/api/v3rpc/auth.go +++ b/etcdserver/api/v3rpc/auth.go @@ -17,8 +17,8 @@ package v3rpc import ( "context" - "go.etcd.io/etcd/v3/etcdserver" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + "go.etcd.io/etcd/etcdserver" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" ) type AuthServer struct { diff --git a/etcdserver/api/v3rpc/grpc.go b/etcdserver/api/v3rpc/grpc.go index ecb11ca00c3..957c8189573 100644 --- a/etcdserver/api/v3rpc/grpc.go +++ b/etcdserver/api/v3rpc/grpc.go @@ -18,8 +18,8 @@ import ( "crypto/tls" "math" - "go.etcd.io/etcd/v3/etcdserver" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + "go.etcd.io/etcd/etcdserver" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" "github.com/grpc-ecosystem/go-grpc-middleware" "github.com/grpc-ecosystem/go-grpc-prometheus" diff --git a/etcdserver/api/v3rpc/header.go b/etcdserver/api/v3rpc/header.go index 9a359fced75..f23b6a73856 100644 --- a/etcdserver/api/v3rpc/header.go +++ b/etcdserver/api/v3rpc/header.go @@ -15,8 +15,8 @@ package v3rpc import ( - "go.etcd.io/etcd/v3/etcdserver" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + "go.etcd.io/etcd/etcdserver" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" ) type header struct { diff --git a/etcdserver/api/v3rpc/interceptor.go b/etcdserver/api/v3rpc/interceptor.go index 8d20207fbee..e6fe0a7f06f 100644 --- a/etcdserver/api/v3rpc/interceptor.go +++ b/etcdserver/api/v3rpc/interceptor.go @@ -19,14 +19,14 @@ import ( "sync" "time" - "go.etcd.io/etcd/v3/etcdserver" - "go.etcd.io/etcd/v3/etcdserver/api" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - "go.etcd.io/etcd/v3/pkg/types" - "go.etcd.io/etcd/v3/raft" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft" "github.com/coreos/pkg/capnslog" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" "go.uber.org/zap" "google.golang.org/grpc" "google.golang.org/grpc/metadata" diff --git a/etcdserver/api/v3rpc/key.go b/etcdserver/api/v3rpc/key.go index 6fd1b381dbc..fdb002e0dd8 100644 --- a/etcdserver/api/v3rpc/key.go +++ b/etcdserver/api/v3rpc/key.go @@ -18,10 +18,10 @@ package v3rpc import ( "context" - "go.etcd.io/etcd/v3/etcdserver" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/pkg/adt" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/adt" "github.com/coreos/pkg/capnslog" ) diff --git a/etcdserver/api/v3rpc/lease.go b/etcdserver/api/v3rpc/lease.go index c6e7da6b8eb..7441beedf15 100644 --- a/etcdserver/api/v3rpc/lease.go +++ b/etcdserver/api/v3rpc/lease.go @@ -18,10 +18,10 @@ import ( "context" "io" - "go.etcd.io/etcd/v3/etcdserver" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/lease" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/lease" "go.uber.org/zap" ) diff --git a/etcdserver/api/v3rpc/maintenance.go b/etcdserver/api/v3rpc/maintenance.go index bc5453f70e7..c51271ac0fe 100644 --- a/etcdserver/api/v3rpc/maintenance.go +++ b/etcdserver/api/v3rpc/maintenance.go @@ -19,14 +19,14 @@ import ( "crypto/sha256" "io" - "go.etcd.io/etcd/v3/auth" - "go.etcd.io/etcd/v3/etcdserver" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/mvcc" - "go.etcd.io/etcd/v3/mvcc/backend" - "go.etcd.io/etcd/v3/raft" - "go.etcd.io/etcd/v3/version" + "go.etcd.io/etcd/auth" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/mvcc" + "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/raft" + "go.etcd.io/etcd/version" "go.uber.org/zap" ) diff --git a/etcdserver/api/v3rpc/member.go b/etcdserver/api/v3rpc/member.go index d749f47db1a..b2ebc989840 100644 --- a/etcdserver/api/v3rpc/member.go +++ b/etcdserver/api/v3rpc/member.go @@ -18,12 +18,12 @@ import ( "context" "time" - "go.etcd.io/etcd/v3/etcdserver" - "go.etcd.io/etcd/v3/etcdserver/api" - "go.etcd.io/etcd/v3/etcdserver/api/membership" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/pkg/types" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api" + "go.etcd.io/etcd/etcdserver/api/membership" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/types" ) type ClusterServer struct { diff --git a/etcdserver/api/v3rpc/quota.go b/etcdserver/api/v3rpc/quota.go index b40edbdfc03..a145b8b0911 100644 --- a/etcdserver/api/v3rpc/quota.go +++ b/etcdserver/api/v3rpc/quota.go @@ -17,10 +17,10 @@ package v3rpc import ( "context" - "go.etcd.io/etcd/v3/etcdserver" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/pkg/types" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/types" ) type quotaKVServer struct { diff --git a/etcdserver/api/v3rpc/util.go b/etcdserver/api/v3rpc/util.go index 446d02bc5ca..b6d8c43c9a7 100644 --- a/etcdserver/api/v3rpc/util.go +++ b/etcdserver/api/v3rpc/util.go @@ -18,13 +18,13 @@ import ( "context" "strings" - "go.etcd.io/etcd/v3/auth" - "go.etcd.io/etcd/v3/etcdserver" - "go.etcd.io/etcd/v3/etcdserver/api/membership" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/lease" - "go.etcd.io/etcd/v3/mvcc" + "go.etcd.io/etcd/auth" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api/membership" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/mvcc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/etcdserver/api/v3rpc/util_test.go b/etcdserver/api/v3rpc/util_test.go index b84a267d557..e83144b961b 100644 --- a/etcdserver/api/v3rpc/util_test.go +++ b/etcdserver/api/v3rpc/util_test.go @@ -19,8 +19,8 @@ import ( "errors" "testing" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - "go.etcd.io/etcd/v3/mvcc" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/mvcc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/etcdserver/api/v3rpc/watch.go b/etcdserver/api/v3rpc/watch.go index 1679f13a9a7..7848cdd04a2 100644 --- a/etcdserver/api/v3rpc/watch.go +++ b/etcdserver/api/v3rpc/watch.go @@ -21,12 +21,12 @@ import ( "sync" "time" - "go.etcd.io/etcd/v3/auth" - "go.etcd.io/etcd/v3/etcdserver" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/mvcc" - "go.etcd.io/etcd/v3/mvcc/mvccpb" + "go.etcd.io/etcd/auth" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/mvcc" + "go.etcd.io/etcd/mvcc/mvccpb" "go.uber.org/zap" ) diff --git a/etcdserver/api/v3rpc/watch_test.go b/etcdserver/api/v3rpc/watch_test.go index f507f5eabd8..66f584a0647 100644 --- a/etcdserver/api/v3rpc/watch_test.go +++ b/etcdserver/api/v3rpc/watch_test.go @@ -19,8 +19,8 @@ import ( "math" "testing" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/mvcc/mvccpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/mvcc/mvccpb" ) func TestSendFragment(t *testing.T) { diff --git a/etcdserver/apply.go b/etcdserver/apply.go index ac5a8dcf25a..1f06ad0dd67 100644 --- a/etcdserver/apply.go +++ b/etcdserver/apply.go @@ -21,12 +21,12 @@ import ( "sort" "time" - "go.etcd.io/etcd/v3/auth" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/lease" - "go.etcd.io/etcd/v3/mvcc" - "go.etcd.io/etcd/v3/mvcc/mvccpb" - "go.etcd.io/etcd/v3/pkg/types" + "go.etcd.io/etcd/auth" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/mvcc" + "go.etcd.io/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/pkg/types" "github.com/gogo/protobuf/proto" "go.uber.org/zap" diff --git a/etcdserver/apply_auth.go b/etcdserver/apply_auth.go index 8761dbac3ca..4b094ad5d8d 100644 --- a/etcdserver/apply_auth.go +++ b/etcdserver/apply_auth.go @@ -17,10 +17,10 @@ package etcdserver import ( "sync" - "go.etcd.io/etcd/v3/auth" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/lease" - "go.etcd.io/etcd/v3/mvcc" + "go.etcd.io/etcd/auth" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/mvcc" ) type authApplierV3 struct { diff --git a/etcdserver/apply_v2.go b/etcdserver/apply_v2.go index 30c396c507f..c77df197061 100644 --- a/etcdserver/apply_v2.go +++ b/etcdserver/apply_v2.go @@ -19,10 +19,10 @@ import ( "path" "time" - "go.etcd.io/etcd/v3/etcdserver/api" - "go.etcd.io/etcd/v3/etcdserver/api/membership" - "go.etcd.io/etcd/v3/etcdserver/api/v2store" - "go.etcd.io/etcd/v3/pkg/pbutil" + "go.etcd.io/etcd/etcdserver/api" + "go.etcd.io/etcd/etcdserver/api/membership" + "go.etcd.io/etcd/etcdserver/api/v2store" + "go.etcd.io/etcd/pkg/pbutil" "github.com/coreos/go-semver/semver" "go.uber.org/zap" diff --git a/etcdserver/backend.go b/etcdserver/backend.go index af95da98e97..7fd8d17b560 100644 --- a/etcdserver/backend.go +++ b/etcdserver/backend.go @@ -19,11 +19,11 @@ import ( "os" "time" - "go.etcd.io/etcd/v3/etcdserver/api/snap" - "go.etcd.io/etcd/v3/lease" - "go.etcd.io/etcd/v3/mvcc" - "go.etcd.io/etcd/v3/mvcc/backend" - "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/etcdserver/api/snap" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/mvcc" + "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/raft/raftpb" "go.uber.org/zap" ) diff --git a/etcdserver/cluster_util.go b/etcdserver/cluster_util.go index bc01cf60a2b..eecb890e6dd 100644 --- a/etcdserver/cluster_util.go +++ b/etcdserver/cluster_util.go @@ -22,9 +22,9 @@ import ( "sort" "time" - "go.etcd.io/etcd/v3/etcdserver/api/membership" - "go.etcd.io/etcd/v3/pkg/types" - "go.etcd.io/etcd/v3/version" + "go.etcd.io/etcd/etcdserver/api/membership" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/version" "github.com/coreos/go-semver/semver" "go.uber.org/zap" diff --git a/etcdserver/cluster_util_test.go b/etcdserver/cluster_util_test.go index de90d60396f..8a36a548b6e 100644 --- a/etcdserver/cluster_util_test.go +++ b/etcdserver/cluster_util_test.go @@ -18,8 +18,8 @@ import ( "reflect" "testing" - "go.etcd.io/etcd/v3/pkg/types" - "go.etcd.io/etcd/v3/version" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/version" "github.com/coreos/go-semver/semver" "go.uber.org/zap" diff --git a/etcdserver/config.go b/etcdserver/config.go index 88d4c7e7705..b0eaf18e7b9 100644 --- a/etcdserver/config.go +++ b/etcdserver/config.go @@ -22,9 +22,9 @@ import ( "strings" "time" - "go.etcd.io/etcd/v3/pkg/netutil" - "go.etcd.io/etcd/v3/pkg/transport" - "go.etcd.io/etcd/v3/pkg/types" + "go.etcd.io/etcd/pkg/netutil" + "go.etcd.io/etcd/pkg/transport" + "go.etcd.io/etcd/pkg/types" bolt "go.etcd.io/bbolt" "go.uber.org/zap" diff --git a/etcdserver/config_test.go b/etcdserver/config_test.go index e91b5fe3b90..1d4157dc4cb 100644 --- a/etcdserver/config_test.go +++ b/etcdserver/config_test.go @@ -18,7 +18,7 @@ import ( "net/url" "testing" - "go.etcd.io/etcd/v3/pkg/types" + "go.etcd.io/etcd/pkg/types" "go.uber.org/zap" ) diff --git a/etcdserver/corrupt.go b/etcdserver/corrupt.go index b170b376ec9..32678a7c512 100644 --- a/etcdserver/corrupt.go +++ b/etcdserver/corrupt.go @@ -19,11 +19,11 @@ import ( "fmt" "time" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/mvcc" - "go.etcd.io/etcd/v3/pkg/types" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/mvcc" + "go.etcd.io/etcd/pkg/types" "go.uber.org/zap" ) diff --git a/etcdserver/etcdserverpb/gw/rpc.pb.gw.go b/etcdserver/etcdserverpb/gw/rpc.pb.gw.go index a6a4768b25f..904c32187fb 100644 --- a/etcdserver/etcdserverpb/gw/rpc.pb.gw.go +++ b/etcdserver/etcdserverpb/gw/rpc.pb.gw.go @@ -9,7 +9,7 @@ It translates gRPC into RESTful JSON APIs. package gw import ( - "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + "go.etcd.io/etcd/etcdserver/etcdserverpb" "io" "net/http" diff --git a/etcdserver/etcdserverpb/rpc.pb.go b/etcdserver/etcdserverpb/rpc.pb.go index 9f6fac9e5ad..6d728a59c81 100644 --- a/etcdserver/etcdserverpb/rpc.pb.go +++ b/etcdserver/etcdserverpb/rpc.pb.go @@ -12,9 +12,9 @@ import ( _ "github.com/gogo/protobuf/gogoproto" - mvccpb "go.etcd.io/etcd/v3/mvcc/mvccpb" + mvccpb "go.etcd.io/etcd/mvcc/mvccpb" - authpb "go.etcd.io/etcd/v3/auth/authpb" + authpb "go.etcd.io/etcd/auth/authpb" context "golang.org/x/net/context" diff --git a/etcdserver/etcdserverpb/rpc.proto b/etcdserver/etcdserverpb/rpc.proto index 78ecd48ade5..6fbf08d3cb1 100644 --- a/etcdserver/etcdserverpb/rpc.proto +++ b/etcdserver/etcdserverpb/rpc.proto @@ -2,8 +2,8 @@ syntax = "proto3"; package etcdserverpb; import "gogoproto/gogo.proto"; -import "etcd/v3/mvcc/mvccpb/kv.proto"; -import "etcd/v3/auth/authpb/auth.proto"; +import "etcd/mvcc/mvccpb/kv.proto"; +import "etcd/auth/authpb/auth.proto"; // for grpc-gateway import "google/api/annotations.proto"; diff --git a/etcdserver/metrics.go b/etcdserver/metrics.go index a3b20981a54..748e7edb5da 100644 --- a/etcdserver/metrics.go +++ b/etcdserver/metrics.go @@ -18,8 +18,8 @@ import ( goruntime "runtime" "time" - "go.etcd.io/etcd/v3/pkg/runtime" - "go.etcd.io/etcd/v3/version" + "go.etcd.io/etcd/pkg/runtime" + "go.etcd.io/etcd/version" "github.com/prometheus/client_golang/prometheus" "go.uber.org/zap" diff --git a/etcdserver/quota.go b/etcdserver/quota.go index 63f5c7bd669..6d70430e73c 100644 --- a/etcdserver/quota.go +++ b/etcdserver/quota.go @@ -17,7 +17,7 @@ package etcdserver import ( "sync" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" humanize "github.com/dustin/go-humanize" "go.uber.org/zap" diff --git a/etcdserver/raft.go b/etcdserver/raft.go index 219be44cd0b..c03d2a7b8d1 100644 --- a/etcdserver/raft.go +++ b/etcdserver/raft.go @@ -23,17 +23,17 @@ import ( "sync" "time" - "go.etcd.io/etcd/v3/etcdserver/api/membership" - "go.etcd.io/etcd/v3/etcdserver/api/rafthttp" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/pkg/contention" - "go.etcd.io/etcd/v3/pkg/logutil" - "go.etcd.io/etcd/v3/pkg/pbutil" - "go.etcd.io/etcd/v3/pkg/types" - "go.etcd.io/etcd/v3/raft" - "go.etcd.io/etcd/v3/raft/raftpb" - "go.etcd.io/etcd/v3/wal" - "go.etcd.io/etcd/v3/wal/walpb" + "go.etcd.io/etcd/etcdserver/api/membership" + "go.etcd.io/etcd/etcdserver/api/rafthttp" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/contention" + "go.etcd.io/etcd/pkg/logutil" + "go.etcd.io/etcd/pkg/pbutil" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft" + "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/wal" + "go.etcd.io/etcd/wal/walpb" "go.uber.org/zap" ) diff --git a/etcdserver/raft_test.go b/etcdserver/raft_test.go index 1ca7971d73a..9d731c688e1 100644 --- a/etcdserver/raft_test.go +++ b/etcdserver/raft_test.go @@ -21,12 +21,12 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/etcdserver/api/membership" - "go.etcd.io/etcd/v3/pkg/mock/mockstorage" - "go.etcd.io/etcd/v3/pkg/pbutil" - "go.etcd.io/etcd/v3/pkg/types" - "go.etcd.io/etcd/v3/raft" - "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/etcdserver/api/membership" + "go.etcd.io/etcd/pkg/mock/mockstorage" + "go.etcd.io/etcd/pkg/pbutil" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft" + "go.etcd.io/etcd/raft/raftpb" "go.uber.org/zap" ) diff --git a/etcdserver/server.go b/etcdserver/server.go index 6e9a9cdb466..fd6c6ca0095 100644 --- a/etcdserver/server.go +++ b/etcdserver/server.go @@ -29,33 +29,33 @@ import ( "sync/atomic" "time" - "go.etcd.io/etcd/v3/auth" - "go.etcd.io/etcd/v3/etcdserver/api" - "go.etcd.io/etcd/v3/etcdserver/api/membership" - "go.etcd.io/etcd/v3/etcdserver/api/rafthttp" - "go.etcd.io/etcd/v3/etcdserver/api/snap" - "go.etcd.io/etcd/v3/etcdserver/api/v2discovery" - "go.etcd.io/etcd/v3/etcdserver/api/v2http/httptypes" - stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats" - "go.etcd.io/etcd/v3/etcdserver/api/v2store" - "go.etcd.io/etcd/v3/etcdserver/api/v3alarm" - "go.etcd.io/etcd/v3/etcdserver/api/v3compactor" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/lease" - "go.etcd.io/etcd/v3/lease/leasehttp" - "go.etcd.io/etcd/v3/mvcc" - "go.etcd.io/etcd/v3/mvcc/backend" - "go.etcd.io/etcd/v3/pkg/fileutil" - "go.etcd.io/etcd/v3/pkg/idutil" - "go.etcd.io/etcd/v3/pkg/pbutil" - "go.etcd.io/etcd/v3/pkg/runtime" - "go.etcd.io/etcd/v3/pkg/schedule" - "go.etcd.io/etcd/v3/pkg/types" - "go.etcd.io/etcd/v3/pkg/wait" - "go.etcd.io/etcd/v3/raft" - "go.etcd.io/etcd/v3/raft/raftpb" - "go.etcd.io/etcd/v3/version" - "go.etcd.io/etcd/v3/wal" + "go.etcd.io/etcd/auth" + "go.etcd.io/etcd/etcdserver/api" + "go.etcd.io/etcd/etcdserver/api/membership" + "go.etcd.io/etcd/etcdserver/api/rafthttp" + "go.etcd.io/etcd/etcdserver/api/snap" + "go.etcd.io/etcd/etcdserver/api/v2discovery" + "go.etcd.io/etcd/etcdserver/api/v2http/httptypes" + stats "go.etcd.io/etcd/etcdserver/api/v2stats" + "go.etcd.io/etcd/etcdserver/api/v2store" + "go.etcd.io/etcd/etcdserver/api/v3alarm" + "go.etcd.io/etcd/etcdserver/api/v3compactor" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/lease/leasehttp" + "go.etcd.io/etcd/mvcc" + "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/pkg/fileutil" + "go.etcd.io/etcd/pkg/idutil" + "go.etcd.io/etcd/pkg/pbutil" + "go.etcd.io/etcd/pkg/runtime" + "go.etcd.io/etcd/pkg/schedule" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/pkg/wait" + "go.etcd.io/etcd/raft" + "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/version" + "go.etcd.io/etcd/wal" "github.com/coreos/go-semver/semver" "github.com/coreos/pkg/capnslog" diff --git a/etcdserver/server_test.go b/etcdserver/server_test.go index 0ba62e0764a..5122a8ade40 100644 --- a/etcdserver/server_test.go +++ b/etcdserver/server_test.go @@ -30,25 +30,25 @@ import ( "go.uber.org/zap" - "go.etcd.io/etcd/v3/etcdserver/api/membership" - "go.etcd.io/etcd/v3/etcdserver/api/rafthttp" - "go.etcd.io/etcd/v3/etcdserver/api/snap" - "go.etcd.io/etcd/v3/etcdserver/api/v2store" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/lease" - "go.etcd.io/etcd/v3/mvcc" - "go.etcd.io/etcd/v3/mvcc/backend" - "go.etcd.io/etcd/v3/pkg/fileutil" - "go.etcd.io/etcd/v3/pkg/idutil" - "go.etcd.io/etcd/v3/pkg/mock/mockstorage" - "go.etcd.io/etcd/v3/pkg/mock/mockstore" - "go.etcd.io/etcd/v3/pkg/mock/mockwait" - "go.etcd.io/etcd/v3/pkg/pbutil" - "go.etcd.io/etcd/v3/pkg/testutil" - "go.etcd.io/etcd/v3/pkg/types" - "go.etcd.io/etcd/v3/pkg/wait" - "go.etcd.io/etcd/v3/raft" - "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/etcdserver/api/membership" + "go.etcd.io/etcd/etcdserver/api/rafthttp" + "go.etcd.io/etcd/etcdserver/api/snap" + "go.etcd.io/etcd/etcdserver/api/v2store" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/mvcc" + "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/pkg/fileutil" + "go.etcd.io/etcd/pkg/idutil" + "go.etcd.io/etcd/pkg/mock/mockstorage" + "go.etcd.io/etcd/pkg/mock/mockstore" + "go.etcd.io/etcd/pkg/mock/mockwait" + "go.etcd.io/etcd/pkg/pbutil" + "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/pkg/wait" + "go.etcd.io/etcd/raft" + "go.etcd.io/etcd/raft/raftpb" ) // TestDoLocalAction tests requests which do not need to go through raft to be applied, diff --git a/etcdserver/snapshot_merge.go b/etcdserver/snapshot_merge.go index f901f5fe9c7..41777681321 100644 --- a/etcdserver/snapshot_merge.go +++ b/etcdserver/snapshot_merge.go @@ -17,9 +17,9 @@ package etcdserver import ( "io" - "go.etcd.io/etcd/v3/etcdserver/api/snap" - "go.etcd.io/etcd/v3/mvcc/backend" - "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/etcdserver/api/snap" + "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/raft/raftpb" humanize "github.com/dustin/go-humanize" "go.uber.org/zap" diff --git a/etcdserver/storage.go b/etcdserver/storage.go index 6701442c191..d57b6f9a58d 100644 --- a/etcdserver/storage.go +++ b/etcdserver/storage.go @@ -17,13 +17,13 @@ package etcdserver import ( "io" - "go.etcd.io/etcd/v3/etcdserver/api/snap" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/pkg/pbutil" - "go.etcd.io/etcd/v3/pkg/types" - "go.etcd.io/etcd/v3/raft/raftpb" - "go.etcd.io/etcd/v3/wal" - "go.etcd.io/etcd/v3/wal/walpb" + "go.etcd.io/etcd/etcdserver/api/snap" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/pbutil" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/wal" + "go.etcd.io/etcd/wal/walpb" "go.uber.org/zap" ) diff --git a/etcdserver/util.go b/etcdserver/util.go index ffb36c7a667..fe5024ef00d 100644 --- a/etcdserver/util.go +++ b/etcdserver/util.go @@ -21,10 +21,10 @@ import ( "time" "github.com/golang/protobuf/proto" - "go.etcd.io/etcd/v3/etcdserver/api/membership" - "go.etcd.io/etcd/v3/etcdserver/api/rafthttp" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/pkg/types" + "go.etcd.io/etcd/etcdserver/api/membership" + "go.etcd.io/etcd/etcdserver/api/rafthttp" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/types" "go.uber.org/zap" ) diff --git a/etcdserver/util_test.go b/etcdserver/util_test.go index 3c4ee7ee94d..6ec87bc89b3 100644 --- a/etcdserver/util_test.go +++ b/etcdserver/util_test.go @@ -21,11 +21,11 @@ import ( "go.uber.org/zap" - "go.etcd.io/etcd/v3/etcdserver/api/membership" - "go.etcd.io/etcd/v3/etcdserver/api/rafthttp" - "go.etcd.io/etcd/v3/etcdserver/api/snap" - "go.etcd.io/etcd/v3/pkg/types" - "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/etcdserver/api/membership" + "go.etcd.io/etcd/etcdserver/api/rafthttp" + "go.etcd.io/etcd/etcdserver/api/snap" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft/raftpb" ) func TestLongestConnected(t *testing.T) { diff --git a/etcdserver/v2_server.go b/etcdserver/v2_server.go index cf6bc05d602..9238b2dc580 100644 --- a/etcdserver/v2_server.go +++ b/etcdserver/v2_server.go @@ -18,8 +18,8 @@ import ( "context" "time" - "go.etcd.io/etcd/v3/etcdserver/api/v2store" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + "go.etcd.io/etcd/etcdserver/api/v2store" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" ) type RequestV2 pb.Request diff --git a/etcdserver/v3_server.go b/etcdserver/v3_server.go index bd406a9564c..74d98096144 100644 --- a/etcdserver/v3_server.go +++ b/etcdserver/v3_server.go @@ -20,13 +20,13 @@ import ( "encoding/binary" "time" - "go.etcd.io/etcd/v3/auth" - "go.etcd.io/etcd/v3/etcdserver/api/membership" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/lease" - "go.etcd.io/etcd/v3/lease/leasehttp" - "go.etcd.io/etcd/v3/mvcc" - "go.etcd.io/etcd/v3/raft" + "go.etcd.io/etcd/auth" + "go.etcd.io/etcd/etcdserver/api/membership" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/lease/leasehttp" + "go.etcd.io/etcd/mvcc" + "go.etcd.io/etcd/raft" "github.com/gogo/protobuf/proto" "go.uber.org/zap" diff --git a/functional/agent/handler.go b/functional/agent/handler.go index cd7c4c361be..f1000624b00 100644 --- a/functional/agent/handler.go +++ b/functional/agent/handler.go @@ -25,10 +25,10 @@ import ( "syscall" "time" - "go.etcd.io/etcd/v3/embed" - "go.etcd.io/etcd/v3/functional/rpcpb" - "go.etcd.io/etcd/v3/pkg/fileutil" - "go.etcd.io/etcd/v3/pkg/proxy" + "go.etcd.io/etcd/embed" + "go.etcd.io/etcd/functional/rpcpb" + "go.etcd.io/etcd/pkg/fileutil" + "go.etcd.io/etcd/pkg/proxy" "go.uber.org/zap" ) diff --git a/functional/agent/server.go b/functional/agent/server.go index 49aa71d5f94..a39f28e764c 100644 --- a/functional/agent/server.go +++ b/functional/agent/server.go @@ -21,9 +21,9 @@ import ( "os/exec" "strings" - "go.etcd.io/etcd/v3/embed" - "go.etcd.io/etcd/v3/functional/rpcpb" - "go.etcd.io/etcd/v3/pkg/proxy" + "go.etcd.io/etcd/embed" + "go.etcd.io/etcd/functional/rpcpb" + "go.etcd.io/etcd/pkg/proxy" "go.uber.org/zap" "google.golang.org/grpc" diff --git a/functional/agent/utils.go b/functional/agent/utils.go index 683df6e6c66..c0dd92fc52e 100644 --- a/functional/agent/utils.go +++ b/functional/agent/utils.go @@ -23,7 +23,7 @@ import ( "strconv" "time" - "go.etcd.io/etcd/v3/pkg/fileutil" + "go.etcd.io/etcd/pkg/fileutil" ) // TODO: support separate WAL directory diff --git a/functional/cmd/etcd-agent/main.go b/functional/cmd/etcd-agent/main.go index 2ccdcaa073d..87ab6ee7d76 100644 --- a/functional/cmd/etcd-agent/main.go +++ b/functional/cmd/etcd-agent/main.go @@ -18,7 +18,7 @@ package main import ( "flag" - "go.etcd.io/etcd/v3/functional/agent" + "go.etcd.io/etcd/functional/agent" "go.uber.org/zap" ) diff --git a/functional/cmd/etcd-proxy/main.go b/functional/cmd/etcd-proxy/main.go index 5695e91b89f..56ca78eefb7 100644 --- a/functional/cmd/etcd-proxy/main.go +++ b/functional/cmd/etcd-proxy/main.go @@ -28,7 +28,7 @@ import ( "syscall" "time" - "go.etcd.io/etcd/v3/pkg/proxy" + "go.etcd.io/etcd/pkg/proxy" "go.uber.org/zap" ) diff --git a/functional/cmd/etcd-runner/main.go b/functional/cmd/etcd-runner/main.go index d776bd01df9..f9e82766d3f 100644 --- a/functional/cmd/etcd-runner/main.go +++ b/functional/cmd/etcd-runner/main.go @@ -16,7 +16,7 @@ // against a fault injected cluster. package main -import "go.etcd.io/etcd/v3/functional/runner" +import "go.etcd.io/etcd/functional/runner" func main() { runner.Start() diff --git a/functional/cmd/etcd-tester/main.go b/functional/cmd/etcd-tester/main.go index 0d3116e37d7..fdf391fe8e1 100644 --- a/functional/cmd/etcd-tester/main.go +++ b/functional/cmd/etcd-tester/main.go @@ -18,7 +18,7 @@ package main import ( "flag" - "go.etcd.io/etcd/v3/functional/tester" + "go.etcd.io/etcd/functional/tester" "go.uber.org/zap" ) diff --git a/functional/rpcpb/etcd_config.go b/functional/rpcpb/etcd_config.go index b6cfe22f5c3..feec424a867 100644 --- a/functional/rpcpb/etcd_config.go +++ b/functional/rpcpb/etcd_config.go @@ -19,9 +19,9 @@ import ( "reflect" "strings" - "go.etcd.io/etcd/v3/embed" - "go.etcd.io/etcd/v3/pkg/transport" - "go.etcd.io/etcd/v3/pkg/types" + "go.etcd.io/etcd/embed" + "go.etcd.io/etcd/pkg/transport" + "go.etcd.io/etcd/pkg/types" ) var etcdFields = []string{ diff --git a/functional/rpcpb/etcd_config_test.go b/functional/rpcpb/etcd_config_test.go index c87a03be428..a96b81f3474 100644 --- a/functional/rpcpb/etcd_config_test.go +++ b/functional/rpcpb/etcd_config_test.go @@ -18,8 +18,8 @@ import ( "reflect" "testing" - "go.etcd.io/etcd/v3/embed" - "go.etcd.io/etcd/v3/pkg/types" + "go.etcd.io/etcd/embed" + "go.etcd.io/etcd/pkg/types" ) func TestEtcd(t *testing.T) { diff --git a/functional/rpcpb/member.go b/functional/rpcpb/member.go index c9a88e7010a..5b400bdc936 100644 --- a/functional/rpcpb/member.go +++ b/functional/rpcpb/member.go @@ -22,10 +22,10 @@ import ( "os" "time" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/clientv3/snapshot" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/pkg/transport" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/snapshot" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/transport" "github.com/dustin/go-humanize" "go.uber.org/zap" diff --git a/functional/runner/election_command.go b/functional/runner/election_command.go index 1cec694e2d9..0ced375461e 100644 --- a/functional/runner/election_command.go +++ b/functional/runner/election_command.go @@ -19,7 +19,7 @@ import ( "errors" "fmt" - "go.etcd.io/etcd/v3/clientv3/concurrency" + "go.etcd.io/etcd/clientv3/concurrency" "github.com/spf13/cobra" ) diff --git a/functional/runner/error.go b/functional/runner/error.go index 39b325a8aae..403990539d6 100644 --- a/functional/runner/error.go +++ b/functional/runner/error.go @@ -18,7 +18,7 @@ import ( "fmt" "os" - "go.etcd.io/etcd/v3/client" + "go.etcd.io/etcd/client" ) const ( diff --git a/functional/runner/global.go b/functional/runner/global.go index b99466cafc2..f2f0dacea21 100644 --- a/functional/runner/global.go +++ b/functional/runner/global.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/clientv3" "github.com/spf13/cobra" "golang.org/x/time/rate" diff --git a/functional/runner/help.go b/functional/runner/help.go index 06196a89e3d..394cec8403d 100644 --- a/functional/runner/help.go +++ b/functional/runner/help.go @@ -25,7 +25,7 @@ import ( "text/tabwriter" "text/template" - "go.etcd.io/etcd/v3/version" + "go.etcd.io/etcd/version" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/functional/runner/lease_renewer_command.go b/functional/runner/lease_renewer_command.go index 6418ef0db48..78a65729d55 100644 --- a/functional/runner/lease_renewer_command.go +++ b/functional/runner/lease_renewer_command.go @@ -21,7 +21,7 @@ import ( "log" "time" - "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/clientv3" "github.com/spf13/cobra" "google.golang.org/grpc/codes" diff --git a/functional/runner/lock_racer_command.go b/functional/runner/lock_racer_command.go index ffde9f5f48e..cb98668cc23 100644 --- a/functional/runner/lock_racer_command.go +++ b/functional/runner/lock_racer_command.go @@ -20,7 +20,7 @@ import ( "fmt" "sync" - "go.etcd.io/etcd/v3/clientv3/concurrency" + "go.etcd.io/etcd/clientv3/concurrency" "github.com/spf13/cobra" ) diff --git a/functional/runner/watch_command.go b/functional/runner/watch_command.go index c9e36dc00f5..cd3f202af20 100644 --- a/functional/runner/watch_command.go +++ b/functional/runner/watch_command.go @@ -22,8 +22,8 @@ import ( "sync" "time" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/pkg/stringutil" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/pkg/stringutil" "github.com/spf13/cobra" "golang.org/x/time/rate" diff --git a/functional/tester/case.go b/functional/tester/case.go index 7397497759f..ce3e00f1243 100644 --- a/functional/tester/case.go +++ b/functional/tester/case.go @@ -19,7 +19,7 @@ import ( "math/rand" "time" - "go.etcd.io/etcd/v3/functional/rpcpb" + "go.etcd.io/etcd/functional/rpcpb" "go.uber.org/zap" ) diff --git a/functional/tester/case_external.go b/functional/tester/case_external.go index a4e1c8846e5..8b22197adc4 100644 --- a/functional/tester/case_external.go +++ b/functional/tester/case_external.go @@ -18,7 +18,7 @@ import ( "fmt" "os/exec" - "go.etcd.io/etcd/v3/functional/rpcpb" + "go.etcd.io/etcd/functional/rpcpb" ) type caseExternal struct { diff --git a/functional/tester/case_failpoints.go b/functional/tester/case_failpoints.go index 9c3deb4a37d..08463084045 100644 --- a/functional/tester/case_failpoints.go +++ b/functional/tester/case_failpoints.go @@ -21,7 +21,7 @@ import ( "strings" "sync" - "go.etcd.io/etcd/v3/functional/rpcpb" + "go.etcd.io/etcd/functional/rpcpb" ) type failpointStats struct { diff --git a/functional/tester/case_network_blackhole.go b/functional/tester/case_network_blackhole.go index d9f05629104..feee3b27a77 100644 --- a/functional/tester/case_network_blackhole.go +++ b/functional/tester/case_network_blackhole.go @@ -14,7 +14,7 @@ package tester -import "go.etcd.io/etcd/v3/functional/rpcpb" +import "go.etcd.io/etcd/functional/rpcpb" func inject_BLACKHOLE_PEER_PORT_TX_RX(clus *Cluster, idx int) error { return clus.sendOp(idx, rpcpb.Operation_BLACKHOLE_PEER_PORT_TX_RX) diff --git a/functional/tester/case_network_delay.go b/functional/tester/case_network_delay.go index 0eabe1621ba..60da43378ba 100644 --- a/functional/tester/case_network_delay.go +++ b/functional/tester/case_network_delay.go @@ -17,7 +17,7 @@ package tester import ( "time" - "go.etcd.io/etcd/v3/functional/rpcpb" + "go.etcd.io/etcd/functional/rpcpb" "go.uber.org/zap" ) diff --git a/functional/tester/case_no_fail.go b/functional/tester/case_no_fail.go index 726a6a33534..f78fee85aab 100644 --- a/functional/tester/case_no_fail.go +++ b/functional/tester/case_no_fail.go @@ -17,7 +17,7 @@ package tester import ( "time" - "go.etcd.io/etcd/v3/functional/rpcpb" + "go.etcd.io/etcd/functional/rpcpb" "go.uber.org/zap" ) diff --git a/functional/tester/case_sigquit_remove.go b/functional/tester/case_sigquit_remove.go index c201cc2dc20..6c3a795153b 100644 --- a/functional/tester/case_sigquit_remove.go +++ b/functional/tester/case_sigquit_remove.go @@ -21,8 +21,8 @@ import ( "strings" "time" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/functional/rpcpb" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/functional/rpcpb" "go.uber.org/zap" ) diff --git a/functional/tester/case_sigquit_remove_quorum.go b/functional/tester/case_sigquit_remove_quorum.go index 47117902c99..5fc78cdd3a4 100644 --- a/functional/tester/case_sigquit_remove_quorum.go +++ b/functional/tester/case_sigquit_remove_quorum.go @@ -20,8 +20,8 @@ import ( "strings" "time" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/functional/rpcpb" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/functional/rpcpb" "go.uber.org/zap" ) diff --git a/functional/tester/case_sigterm.go b/functional/tester/case_sigterm.go index 5c96a46087c..a8c99bc8599 100644 --- a/functional/tester/case_sigterm.go +++ b/functional/tester/case_sigterm.go @@ -14,7 +14,7 @@ package tester -import "go.etcd.io/etcd/v3/functional/rpcpb" +import "go.etcd.io/etcd/functional/rpcpb" func inject_SIGTERM_ETCD(clus *Cluster, idx int) error { return clus.sendOp(idx, rpcpb.Operation_SIGTERM_ETCD) diff --git a/functional/tester/checker.go b/functional/tester/checker.go index 3ee78f935bb..7515bc93a0d 100644 --- a/functional/tester/checker.go +++ b/functional/tester/checker.go @@ -14,7 +14,7 @@ package tester -import "go.etcd.io/etcd/v3/functional/rpcpb" +import "go.etcd.io/etcd/functional/rpcpb" // Checker checks cluster consistency. type Checker interface { diff --git a/functional/tester/checker_kv_hash.go b/functional/tester/checker_kv_hash.go index 534f90fa976..698367d2529 100644 --- a/functional/tester/checker_kv_hash.go +++ b/functional/tester/checker_kv_hash.go @@ -18,7 +18,7 @@ import ( "fmt" "time" - "go.etcd.io/etcd/v3/functional/rpcpb" + "go.etcd.io/etcd/functional/rpcpb" "go.uber.org/zap" ) diff --git a/functional/tester/checker_lease_expire.go b/functional/tester/checker_lease_expire.go index 668ee41dc4f..9a19e327b44 100644 --- a/functional/tester/checker_lease_expire.go +++ b/functional/tester/checker_lease_expire.go @@ -19,9 +19,9 @@ import ( "fmt" "time" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - "go.etcd.io/etcd/v3/functional/rpcpb" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/functional/rpcpb" "go.uber.org/zap" "google.golang.org/grpc" diff --git a/functional/tester/checker_no_check.go b/functional/tester/checker_no_check.go index 7697aac850e..aa0a4dcb8da 100644 --- a/functional/tester/checker_no_check.go +++ b/functional/tester/checker_no_check.go @@ -14,7 +14,7 @@ package tester -import "go.etcd.io/etcd/v3/functional/rpcpb" +import "go.etcd.io/etcd/functional/rpcpb" type noCheck struct{} diff --git a/functional/tester/checker_runner.go b/functional/tester/checker_runner.go index 42f6160a001..ea966540c97 100644 --- a/functional/tester/checker_runner.go +++ b/functional/tester/checker_runner.go @@ -14,7 +14,7 @@ package tester -import "go.etcd.io/etcd/v3/functional/rpcpb" +import "go.etcd.io/etcd/functional/rpcpb" type runnerChecker struct { ctype rpcpb.Checker diff --git a/functional/tester/cluster.go b/functional/tester/cluster.go index f9d0e27c927..6dfb3085bbb 100644 --- a/functional/tester/cluster.go +++ b/functional/tester/cluster.go @@ -29,9 +29,9 @@ import ( "sync" "time" - "go.etcd.io/etcd/v3/functional/rpcpb" - "go.etcd.io/etcd/v3/pkg/debugutil" - "go.etcd.io/etcd/v3/pkg/fileutil" + "go.etcd.io/etcd/functional/rpcpb" + "go.etcd.io/etcd/pkg/debugutil" + "go.etcd.io/etcd/pkg/fileutil" "github.com/prometheus/client_golang/prometheus/promhttp" "go.uber.org/zap" diff --git a/functional/tester/cluster_read_config.go b/functional/tester/cluster_read_config.go index 7fc3b330f83..4ce9d076e67 100644 --- a/functional/tester/cluster_read_config.go +++ b/functional/tester/cluster_read_config.go @@ -22,7 +22,7 @@ import ( "path/filepath" "strings" - "go.etcd.io/etcd/v3/functional/rpcpb" + "go.etcd.io/etcd/functional/rpcpb" "go.uber.org/zap" yaml "gopkg.in/yaml.v2" diff --git a/functional/tester/cluster_run.go b/functional/tester/cluster_run.go index 64fb19a2676..f4091e0d844 100644 --- a/functional/tester/cluster_run.go +++ b/functional/tester/cluster_run.go @@ -19,8 +19,8 @@ import ( "os" "time" - "go.etcd.io/etcd/v3/functional/rpcpb" - "go.etcd.io/etcd/v3/pkg/fileutil" + "go.etcd.io/etcd/functional/rpcpb" + "go.etcd.io/etcd/pkg/fileutil" "go.uber.org/zap" ) diff --git a/functional/tester/cluster_test.go b/functional/tester/cluster_test.go index 3f04f7d474c..7c7b25f2ad2 100644 --- a/functional/tester/cluster_test.go +++ b/functional/tester/cluster_test.go @@ -19,7 +19,7 @@ import ( "sort" "testing" - "go.etcd.io/etcd/v3/functional/rpcpb" + "go.etcd.io/etcd/functional/rpcpb" "go.uber.org/zap" ) diff --git a/functional/tester/stresser.go b/functional/tester/stresser.go index 79e6687f4aa..9a65eaa8bc9 100644 --- a/functional/tester/stresser.go +++ b/functional/tester/stresser.go @@ -18,7 +18,7 @@ import ( "fmt" "time" - "go.etcd.io/etcd/v3/functional/rpcpb" + "go.etcd.io/etcd/functional/rpcpb" "go.uber.org/zap" ) diff --git a/functional/tester/stresser_key.go b/functional/tester/stresser_key.go index 3d8c2dcf1d1..7feec463732 100644 --- a/functional/tester/stresser_key.go +++ b/functional/tester/stresser_key.go @@ -23,11 +23,11 @@ import ( "sync/atomic" "time" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/etcdserver" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - "go.etcd.io/etcd/v3/functional/rpcpb" - "go.etcd.io/etcd/v3/raft" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/functional/rpcpb" + "go.etcd.io/etcd/raft" "go.uber.org/zap" "golang.org/x/time/rate" diff --git a/functional/tester/stresser_lease.go b/functional/tester/stresser_lease.go index a727d4faf74..e54d9f5f1b2 100644 --- a/functional/tester/stresser_lease.go +++ b/functional/tester/stresser_lease.go @@ -22,9 +22,9 @@ import ( "sync/atomic" "time" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - "go.etcd.io/etcd/v3/functional/rpcpb" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/functional/rpcpb" "go.uber.org/zap" "golang.org/x/time/rate" diff --git a/functional/tester/stresser_runner.go b/functional/tester/stresser_runner.go index 55f791ddb37..e8e2bd1f888 100644 --- a/functional/tester/stresser_runner.go +++ b/functional/tester/stresser_runner.go @@ -20,7 +20,7 @@ import ( "os/exec" "syscall" - "go.etcd.io/etcd/v3/functional/rpcpb" + "go.etcd.io/etcd/functional/rpcpb" "go.uber.org/zap" "golang.org/x/time/rate" diff --git a/integration/bridge.go b/integration/bridge.go index cedd16d3553..483ee58296d 100644 --- a/integration/bridge.go +++ b/integration/bridge.go @@ -21,7 +21,7 @@ import ( "net" "sync" - "go.etcd.io/etcd/v3/pkg/transport" + "go.etcd.io/etcd/pkg/transport" ) // bridge creates a unix socket bridge to another unix socket, making it possible diff --git a/integration/cluster.go b/integration/cluster.go index 5973903eb2f..9a3c8d46a60 100644 --- a/integration/cluster.go +++ b/integration/cluster.go @@ -33,25 +33,25 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/client" - "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" - "go.etcd.io/etcd/v3/etcdserver/api/rafthttp" - "go.etcd.io/etcd/v3/etcdserver/api/v2http" - "go.etcd.io/etcd/v3/etcdserver/api/v3client" - "go.etcd.io/etcd/v3/etcdserver/api/v3election" - epb "go.etcd.io/etcd/v3/etcdserver/api/v3election/v3electionpb" - "go.etcd.io/etcd/v3/etcdserver/api/v3lock" - lockpb "go.etcd.io/etcd/v3/etcdserver/api/v3lock/v3lockpb" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/pkg/logutil" - "go.etcd.io/etcd/v3/pkg/testutil" - "go.etcd.io/etcd/v3/pkg/tlsutil" - "go.etcd.io/etcd/v3/pkg/transport" - "go.etcd.io/etcd/v3/pkg/types" + "go.etcd.io/etcd/client" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/embed" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api/etcdhttp" + "go.etcd.io/etcd/etcdserver/api/rafthttp" + "go.etcd.io/etcd/etcdserver/api/v2http" + "go.etcd.io/etcd/etcdserver/api/v3client" + "go.etcd.io/etcd/etcdserver/api/v3election" + epb "go.etcd.io/etcd/etcdserver/api/v3election/v3electionpb" + "go.etcd.io/etcd/etcdserver/api/v3lock" + lockpb "go.etcd.io/etcd/etcdserver/api/v3lock/v3lockpb" + "go.etcd.io/etcd/etcdserver/api/v3rpc" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/logutil" + "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/tlsutil" + "go.etcd.io/etcd/pkg/transport" + "go.etcd.io/etcd/pkg/types" "github.com/soheilhy/cmux" "go.uber.org/zap" diff --git a/integration/cluster_direct.go b/integration/cluster_direct.go index 600cabe3032..8dd4d037077 100644 --- a/integration/cluster_direct.go +++ b/integration/cluster_direct.go @@ -17,10 +17,10 @@ package integration import ( - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/etcdserver/api/v3election/v3electionpb" - "go.etcd.io/etcd/v3/etcdserver/api/v3lock/v3lockpb" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver/api/v3election/v3electionpb" + "go.etcd.io/etcd/etcdserver/api/v3lock/v3lockpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" ) func toGRPC(c *clientv3.Client) grpcAPI { diff --git a/integration/cluster_proxy.go b/integration/cluster_proxy.go index 3c13bb4b916..055a7388301 100644 --- a/integration/cluster_proxy.go +++ b/integration/cluster_proxy.go @@ -19,10 +19,10 @@ package integration import ( "sync" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/clientv3/namespace" - "go.etcd.io/etcd/v3/proxy/grpcproxy" - "go.etcd.io/etcd/v3/proxy/grpcproxy/adapter" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/namespace" + "go.etcd.io/etcd/proxy/grpcproxy" + "go.etcd.io/etcd/proxy/grpcproxy/adapter" ) var ( diff --git a/integration/cluster_test.go b/integration/cluster_test.go index c305d6faa80..c1681da69ec 100644 --- a/integration/cluster_test.go +++ b/integration/cluster_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/client" - "go.etcd.io/etcd/v3/etcdserver" - "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/client" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/pkg/testutil" ) func init() { diff --git a/integration/embed_test.go b/integration/embed_test.go index a792681ac0d..c95d78d3567 100644 --- a/integration/embed_test.go +++ b/integration/embed_test.go @@ -28,8 +28,8 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/embed" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/embed" ) func TestEmbedEtcd(t *testing.T) { diff --git a/integration/logger_test.go b/integration/logger_test.go index 7fc4ed67f1a..f36664ec76c 100644 --- a/integration/logger_test.go +++ b/integration/logger_test.go @@ -17,7 +17,7 @@ package integration import ( "io/ioutil" - "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/clientv3" "google.golang.org/grpc/grpclog" ) diff --git a/integration/main_test.go b/integration/main_test.go index 4dec98da4f8..c7362dde4fe 100644 --- a/integration/main_test.go +++ b/integration/main_test.go @@ -8,7 +8,7 @@ import ( "os" "testing" - "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/pkg/testutil" ) func TestMain(m *testing.M) { diff --git a/integration/member_test.go b/integration/member_test.go index dbffedb4aa4..87a70dda0e3 100644 --- a/integration/member_test.go +++ b/integration/member_test.go @@ -22,8 +22,8 @@ import ( "reflect" "testing" - "go.etcd.io/etcd/v3/client" - "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/client" + "go.etcd.io/etcd/pkg/testutil" ) func TestPauseMember(t *testing.T) { diff --git a/integration/metrics_test.go b/integration/metrics_test.go index 313991a0dbe..19547102bfa 100644 --- a/integration/metrics_test.go +++ b/integration/metrics_test.go @@ -21,10 +21,10 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/etcdserver" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/pkg/testutil" - "go.etcd.io/etcd/v3/pkg/transport" + "go.etcd.io/etcd/etcdserver" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/transport" ) // TestMetricDbSizeBoot checks that the db size metric is set on boot. diff --git a/integration/network_partition_test.go b/integration/network_partition_test.go index b9786c60af6..e815d6842a2 100644 --- a/integration/network_partition_test.go +++ b/integration/network_partition_test.go @@ -19,7 +19,7 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/pkg/testutil" ) func TestNetworkPartition5MembersLeaderInMinority(t *testing.T) { diff --git a/integration/util_test.go b/integration/util_test.go index 399c25db299..616988e5e3f 100644 --- a/integration/util_test.go +++ b/integration/util_test.go @@ -19,7 +19,7 @@ import ( "os" "path/filepath" - "go.etcd.io/etcd/v3/pkg/transport" + "go.etcd.io/etcd/pkg/transport" ) // copyTLSFiles clones certs files to dst directory. diff --git a/integration/v2_http_kv_test.go b/integration/v2_http_kv_test.go index 9e40e657640..c42e5a87395 100644 --- a/integration/v2_http_kv_test.go +++ b/integration/v2_http_kv_test.go @@ -26,8 +26,8 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/pkg/testutil" - "go.etcd.io/etcd/v3/pkg/transport" + "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/transport" ) func TestV2Set(t *testing.T) { diff --git a/integration/v3_alarm_test.go b/integration/v3_alarm_test.go index f06a86e7a66..7d9adf956d7 100644 --- a/integration/v3_alarm_test.go +++ b/integration/v3_alarm_test.go @@ -22,11 +22,11 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/mvcc" - "go.etcd.io/etcd/v3/mvcc/backend" - "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/mvcc" + "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/pkg/testutil" "go.uber.org/zap" ) diff --git a/integration/v3_auth_test.go b/integration/v3_auth_test.go index 7c4342a9ea6..76c73b0ec1c 100644 --- a/integration/v3_auth_test.go +++ b/integration/v3_auth_test.go @@ -21,11 +21,11 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/auth/authpb" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/auth/authpb" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/testutil" ) // TestV3AuthEmptyUserGet ensures that a get with an empty user will return an empty user error. diff --git a/integration/v3_barrier_test.go b/integration/v3_barrier_test.go index ef409cb5b1a..54fa3be665e 100644 --- a/integration/v3_barrier_test.go +++ b/integration/v3_barrier_test.go @@ -18,9 +18,9 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/contrib/recipes" - "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/contrib/recipes" + "go.etcd.io/etcd/pkg/testutil" ) func TestBarrierSingleNode(t *testing.T) { diff --git a/integration/v3_double_barrier_test.go b/integration/v3_double_barrier_test.go index 9284de5310d..dc5acd84ca4 100644 --- a/integration/v3_double_barrier_test.go +++ b/integration/v3_double_barrier_test.go @@ -18,8 +18,8 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/clientv3/concurrency" - "go.etcd.io/etcd/v3/contrib/recipes" + "go.etcd.io/etcd/clientv3/concurrency" + "go.etcd.io/etcd/contrib/recipes" ) func TestDoubleBarrier(t *testing.T) { diff --git a/integration/v3_election_test.go b/integration/v3_election_test.go index 4e74a404d7a..4598448001b 100644 --- a/integration/v3_election_test.go +++ b/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/clientv3" + "go.etcd.io/etcd/clientv3/concurrency" ) // TestElectionWait tests if followers can correctly wait for elections. diff --git a/integration/v3_grpc_inflight_test.go b/integration/v3_grpc_inflight_test.go index 4671ef733ca..1a0a11a8e1b 100644 --- a/integration/v3_grpc_inflight_test.go +++ b/integration/v3_grpc_inflight_test.go @@ -20,9 +20,9 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/testutil" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/integration/v3_grpc_test.go b/integration/v3_grpc_test.go index 0915be6ae98..331f2bc6054 100644 --- a/integration/v3_grpc_test.go +++ b/integration/v3_grpc_test.go @@ -25,11 +25,11 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/pkg/testutil" - "go.etcd.io/etcd/v3/pkg/transport" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/transport" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/integration/v3_health_test.go b/integration/v3_health_test.go index 6ec98b9d445..c5788fd12fc 100644 --- a/integration/v3_health_test.go +++ b/integration/v3_health_test.go @@ -18,7 +18,7 @@ import ( "context" "testing" - "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/pkg/testutil" healthpb "google.golang.org/grpc/health/grpc_health_v1" ) diff --git a/integration/v3_leadership_test.go b/integration/v3_leadership_test.go index d3bc03b167c..29818113a14 100644 --- a/integration/v3_leadership_test.go +++ b/integration/v3_leadership_test.go @@ -20,9 +20,9 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/testutil" ) func TestMoveLeader(t *testing.T) { testMoveLeader(t, true) } diff --git a/integration/v3_lease_test.go b/integration/v3_lease_test.go index e8f44a2e6b7..7b378f0c92f 100644 --- a/integration/v3_lease_test.go +++ b/integration/v3_lease_test.go @@ -20,10 +20,10 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/mvcc/mvccpb" - "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/pkg/testutil" "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" diff --git a/integration/v3_lock_test.go b/integration/v3_lock_test.go index 1524ed1616e..10b501eafab 100644 --- a/integration/v3_lock_test.go +++ b/integration/v3_lock_test.go @@ -21,11 +21,11 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/clientv3/concurrency" - "go.etcd.io/etcd/v3/contrib/recipes" - "go.etcd.io/etcd/v3/mvcc/mvccpb" - "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/concurrency" + "go.etcd.io/etcd/contrib/recipes" + "go.etcd.io/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/pkg/testutil" ) func TestMutexSingleNode(t *testing.T) { diff --git a/integration/v3_queue_test.go b/integration/v3_queue_test.go index 0f85f9a74e4..c7349fd8410 100644 --- a/integration/v3_queue_test.go +++ b/integration/v3_queue_test.go @@ -20,7 +20,7 @@ import ( "sync/atomic" "testing" - "go.etcd.io/etcd/v3/contrib/recipes" + "go.etcd.io/etcd/contrib/recipes" ) const ( diff --git a/integration/v3_stm_test.go b/integration/v3_stm_test.go index e62f8f7cb00..25a1fd6c6d3 100644 --- a/integration/v3_stm_test.go +++ b/integration/v3_stm_test.go @@ -21,9 +21,9 @@ import ( "strconv" "testing" - v3 "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/clientv3/concurrency" - "go.etcd.io/etcd/v3/pkg/testutil" + v3 "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/concurrency" + "go.etcd.io/etcd/pkg/testutil" ) // TestSTMConflict tests that conflicts are retried. diff --git a/integration/v3_tls_test.go b/integration/v3_tls_test.go index 2c78eaddf4c..324ce49df52 100644 --- a/integration/v3_tls_test.go +++ b/integration/v3_tls_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/pkg/testutil" "google.golang.org/grpc" ) diff --git a/integration/v3_watch_restore_test.go b/integration/v3_watch_restore_test.go index fd5ff26b699..c5dcb12c152 100644 --- a/integration/v3_watch_restore_test.go +++ b/integration/v3_watch_restore_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" ) // TestV3WatchRestoreSnapshotUnsync tests whether slow follower can restore diff --git a/integration/v3_watch_test.go b/integration/v3_watch_test.go index 22a3ea76364..da255d569e5 100644 --- a/integration/v3_watch_test.go +++ b/integration/v3_watch_test.go @@ -24,10 +24,10 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/mvcc/mvccpb" - "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/etcdserver/api/v3rpc" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/pkg/testutil" ) // TestV3WatchFromCurrentRevision tests Watch APIs from current revision. diff --git a/integration/v3election_grpc_test.go b/integration/v3election_grpc_test.go index 6231725829e..d49ad24fcb4 100644 --- a/integration/v3election_grpc_test.go +++ b/integration/v3election_grpc_test.go @@ -20,9 +20,9 @@ import ( "testing" "time" - epb "go.etcd.io/etcd/v3/etcdserver/api/v3election/v3electionpb" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/pkg/testutil" + epb "go.etcd.io/etcd/etcdserver/api/v3election/v3electionpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/testutil" ) // TestV3ElectionCampaign checks that Campaign will not give diff --git a/integration/v3lock_grpc_test.go b/integration/v3lock_grpc_test.go index 6ccc3ccafee..05276669f3a 100644 --- a/integration/v3lock_grpc_test.go +++ b/integration/v3lock_grpc_test.go @@ -19,9 +19,9 @@ import ( "testing" "time" - lockpb "go.etcd.io/etcd/v3/etcdserver/api/v3lock/v3lockpb" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/pkg/testutil" + lockpb "go.etcd.io/etcd/etcdserver/api/v3lock/v3lockpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/testutil" ) // TestV3LockLockWaiter tests that a client will wait for a lock, then acquire it diff --git a/lease/leasehttp/http.go b/lease/leasehttp/http.go index 27f042bb414..67e916dba9e 100644 --- a/lease/leasehttp/http.go +++ b/lease/leasehttp/http.go @@ -23,10 +23,10 @@ import ( "net/http" "time" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/lease" - "go.etcd.io/etcd/v3/lease/leasepb" - "go.etcd.io/etcd/v3/pkg/httputil" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/lease/leasepb" + "go.etcd.io/etcd/pkg/httputil" ) var ( diff --git a/lease/leasehttp/http_test.go b/lease/leasehttp/http_test.go index b57409541aa..0802515d510 100644 --- a/lease/leasehttp/http_test.go +++ b/lease/leasehttp/http_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/lease" - "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/mvcc/backend" "go.uber.org/zap" ) diff --git a/lease/leasepb/lease.pb.go b/lease/leasepb/lease.pb.go index 5253d1f0d0d..16637ee7e95 100644 --- a/lease/leasepb/lease.pb.go +++ b/lease/leasepb/lease.pb.go @@ -23,7 +23,7 @@ import ( _ "github.com/gogo/protobuf/gogoproto" - etcdserverpb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + etcdserverpb "go.etcd.io/etcd/etcdserver/etcdserverpb" io "io" ) diff --git a/lease/leasepb/lease.proto b/lease/leasepb/lease.proto index 698a88eb860..1169d9f10a9 100644 --- a/lease/leasepb/lease.proto +++ b/lease/leasepb/lease.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package leasepb; import "gogoproto/gogo.proto"; -import "etcd/v3/etcdserver/etcdserverpb/rpc.proto"; +import "etcd/etcdserver/etcdserverpb/rpc.proto"; option (gogoproto.marshaler_all) = true; option (gogoproto.sizer_all) = true; diff --git a/lease/lessor.go b/lease/lessor.go index 702f6ab99ae..a208c82ea30 100644 --- a/lease/lessor.go +++ b/lease/lessor.go @@ -24,9 +24,9 @@ import ( "sync" "time" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/lease/leasepb" - "go.etcd.io/etcd/v3/mvcc/backend" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/lease/leasepb" + "go.etcd.io/etcd/mvcc/backend" "go.uber.org/zap" ) diff --git a/lease/lessor_bench_test.go b/lease/lessor_bench_test.go index 821032314db..4f14654a56d 100644 --- a/lease/lessor_bench_test.go +++ b/lease/lessor_bench_test.go @@ -18,7 +18,7 @@ import ( "os" "testing" - "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/mvcc/backend" "go.uber.org/zap" ) diff --git a/lease/lessor_test.go b/lease/lessor_test.go index 14b0fecab8e..f1330ed7ebb 100644 --- a/lease/lessor_test.go +++ b/lease/lessor_test.go @@ -26,8 +26,8 @@ import ( "testing" "time" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/mvcc/backend" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/mvcc/backend" "go.uber.org/zap" ) diff --git a/main.go b/main.go index 2284ebdcb42..c03c49d1ee0 100644 --- a/main.go +++ b/main.go @@ -22,7 +22,7 @@ // package main -import "go.etcd.io/etcd/v3/etcdmain" +import "go.etcd.io/etcd/etcdmain" func main() { etcdmain.Main() diff --git a/mvcc/kv.go b/mvcc/kv.go index ba8b94f5d13..8e898a5ad3d 100644 --- a/mvcc/kv.go +++ b/mvcc/kv.go @@ -15,9 +15,9 @@ package mvcc import ( - "go.etcd.io/etcd/v3/lease" - "go.etcd.io/etcd/v3/mvcc/backend" - "go.etcd.io/etcd/v3/mvcc/mvccpb" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/mvcc/mvccpb" ) type RangeOptions struct { diff --git a/mvcc/kv_test.go b/mvcc/kv_test.go index 803562e0fc4..2c02ec089e5 100644 --- a/mvcc/kv_test.go +++ b/mvcc/kv_test.go @@ -21,10 +21,10 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/lease" - "go.etcd.io/etcd/v3/mvcc/backend" - "go.etcd.io/etcd/v3/mvcc/mvccpb" - "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/pkg/testutil" "github.com/prometheus/client_golang/prometheus" dto "github.com/prometheus/client_model/go" diff --git a/mvcc/kv_view.go b/mvcc/kv_view.go index cab130591b0..bd2e77729ff 100644 --- a/mvcc/kv_view.go +++ b/mvcc/kv_view.go @@ -14,7 +14,7 @@ package mvcc -import "go.etcd.io/etcd/v3/lease" +import "go.etcd.io/etcd/lease" type readView struct{ kv KV } diff --git a/mvcc/kvstore.go b/mvcc/kvstore.go index 5e105cb218c..187f94029b7 100644 --- a/mvcc/kvstore.go +++ b/mvcc/kvstore.go @@ -25,10 +25,10 @@ import ( "sync/atomic" "time" - "go.etcd.io/etcd/v3/lease" - "go.etcd.io/etcd/v3/mvcc/backend" - "go.etcd.io/etcd/v3/mvcc/mvccpb" - "go.etcd.io/etcd/v3/pkg/schedule" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/pkg/schedule" "github.com/coreos/pkg/capnslog" "go.uber.org/zap" diff --git a/mvcc/kvstore_bench_test.go b/mvcc/kvstore_bench_test.go index 71012ca72d6..0467ee7b17d 100644 --- a/mvcc/kvstore_bench_test.go +++ b/mvcc/kvstore_bench_test.go @@ -18,8 +18,8 @@ import ( "sync/atomic" "testing" - "go.etcd.io/etcd/v3/lease" - "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/mvcc/backend" "go.uber.org/zap" ) diff --git a/mvcc/kvstore_compaction_test.go b/mvcc/kvstore_compaction_test.go index aed92b140bb..dde51db8ac7 100644 --- a/mvcc/kvstore_compaction_test.go +++ b/mvcc/kvstore_compaction_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/lease" - "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/mvcc/backend" "go.uber.org/zap" ) diff --git a/mvcc/kvstore_test.go b/mvcc/kvstore_test.go index f83014cfb61..91183969901 100644 --- a/mvcc/kvstore_test.go +++ b/mvcc/kvstore_test.go @@ -26,11 +26,11 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/lease" - "go.etcd.io/etcd/v3/mvcc/backend" - "go.etcd.io/etcd/v3/mvcc/mvccpb" - "go.etcd.io/etcd/v3/pkg/schedule" - "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/pkg/schedule" + "go.etcd.io/etcd/pkg/testutil" "go.uber.org/zap" ) diff --git a/mvcc/kvstore_txn.go b/mvcc/kvstore_txn.go index 4f51fbe45fd..088ea734141 100644 --- a/mvcc/kvstore_txn.go +++ b/mvcc/kvstore_txn.go @@ -15,9 +15,9 @@ package mvcc import ( - "go.etcd.io/etcd/v3/lease" - "go.etcd.io/etcd/v3/mvcc/backend" - "go.etcd.io/etcd/v3/mvcc/mvccpb" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/mvcc/mvccpb" "go.uber.org/zap" ) diff --git a/mvcc/metrics_txn.go b/mvcc/metrics_txn.go index 4a43bdb974a..b4a29bc9523 100644 --- a/mvcc/metrics_txn.go +++ b/mvcc/metrics_txn.go @@ -14,7 +14,7 @@ package mvcc -import "go.etcd.io/etcd/v3/lease" +import "go.etcd.io/etcd/lease" type metricsTxnWrite struct { TxnWrite diff --git a/mvcc/util.go b/mvcc/util.go index 86d4805feb1..032621aedd9 100644 --- a/mvcc/util.go +++ b/mvcc/util.go @@ -18,8 +18,8 @@ import ( "encoding/binary" "fmt" - "go.etcd.io/etcd/v3/mvcc/backend" - "go.etcd.io/etcd/v3/mvcc/mvccpb" + "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/mvcc/mvccpb" ) func UpdateConsistentIndex(be backend.Backend, index uint64) { diff --git a/mvcc/watchable_store.go b/mvcc/watchable_store.go index 960bc358a2d..46a9af5ed7e 100644 --- a/mvcc/watchable_store.go +++ b/mvcc/watchable_store.go @@ -18,9 +18,9 @@ import ( "sync" "time" - "go.etcd.io/etcd/v3/lease" - "go.etcd.io/etcd/v3/mvcc/backend" - "go.etcd.io/etcd/v3/mvcc/mvccpb" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/mvcc/mvccpb" "go.uber.org/zap" ) diff --git a/mvcc/watchable_store_bench_test.go b/mvcc/watchable_store_bench_test.go index 05cc2bc3047..07b8f351a4d 100644 --- a/mvcc/watchable_store_bench_test.go +++ b/mvcc/watchable_store_bench_test.go @@ -19,8 +19,8 @@ import ( "os" "testing" - "go.etcd.io/etcd/v3/lease" - "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/mvcc/backend" "go.uber.org/zap" ) diff --git a/mvcc/watchable_store_test.go b/mvcc/watchable_store_test.go index 54176c4f1f7..167315f1c49 100644 --- a/mvcc/watchable_store_test.go +++ b/mvcc/watchable_store_test.go @@ -23,9 +23,9 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/lease" - "go.etcd.io/etcd/v3/mvcc/backend" - "go.etcd.io/etcd/v3/mvcc/mvccpb" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/mvcc/mvccpb" "go.uber.org/zap" ) diff --git a/mvcc/watchable_store_txn.go b/mvcc/watchable_store_txn.go index fcfd7cd8432..3bcfa4d7566 100644 --- a/mvcc/watchable_store_txn.go +++ b/mvcc/watchable_store_txn.go @@ -14,7 +14,7 @@ package mvcc -import "go.etcd.io/etcd/v3/mvcc/mvccpb" +import "go.etcd.io/etcd/mvcc/mvccpb" func (tw *watchableStoreTxnWrite) End() { changes := tw.Changes() diff --git a/mvcc/watcher.go b/mvcc/watcher.go index 2a3cb4adaa6..2846d62a5d4 100644 --- a/mvcc/watcher.go +++ b/mvcc/watcher.go @@ -19,7 +19,7 @@ import ( "errors" "sync" - "go.etcd.io/etcd/v3/mvcc/mvccpb" + "go.etcd.io/etcd/mvcc/mvccpb" ) // AutoWatchID is the watcher ID passed in WatchStream.Watch when no diff --git a/mvcc/watcher_bench_test.go b/mvcc/watcher_bench_test.go index 3fe3bc9d511..8a2ba61df95 100644 --- a/mvcc/watcher_bench_test.go +++ b/mvcc/watcher_bench_test.go @@ -18,8 +18,8 @@ import ( "fmt" "testing" - "go.etcd.io/etcd/v3/lease" - "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/mvcc/backend" "go.uber.org/zap" ) diff --git a/mvcc/watcher_group.go b/mvcc/watcher_group.go index 2dcb69e5c8e..07029335a85 100644 --- a/mvcc/watcher_group.go +++ b/mvcc/watcher_group.go @@ -18,8 +18,8 @@ import ( "fmt" "math" - "go.etcd.io/etcd/v3/mvcc/mvccpb" - "go.etcd.io/etcd/v3/pkg/adt" + "go.etcd.io/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/pkg/adt" ) var ( diff --git a/mvcc/watcher_test.go b/mvcc/watcher_test.go index 12fa4779842..cb4e13b1863 100644 --- a/mvcc/watcher_test.go +++ b/mvcc/watcher_test.go @@ -22,9 +22,9 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/lease" - "go.etcd.io/etcd/v3/mvcc/backend" - "go.etcd.io/etcd/v3/mvcc/mvccpb" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/mvcc/mvccpb" "go.uber.org/zap" ) diff --git a/pkg/adt/example_test.go b/pkg/adt/example_test.go index 7a7f98d71f6..e3edf225c46 100644 --- a/pkg/adt/example_test.go +++ b/pkg/adt/example_test.go @@ -17,7 +17,7 @@ package adt_test import ( "fmt" - "go.etcd.io/etcd/v3/pkg/adt" + "go.etcd.io/etcd/pkg/adt" ) func Example() { diff --git a/pkg/flags/unique_urls.go b/pkg/flags/unique_urls.go index 6eea99f0e72..9b4178c3a14 100644 --- a/pkg/flags/unique_urls.go +++ b/pkg/flags/unique_urls.go @@ -20,7 +20,7 @@ import ( "sort" "strings" - "go.etcd.io/etcd/v3/pkg/types" + "go.etcd.io/etcd/pkg/types" ) // UniqueURLs contains unique URLs diff --git a/pkg/flags/urls.go b/pkg/flags/urls.go index 48aef30bf67..ca90970c2b9 100644 --- a/pkg/flags/urls.go +++ b/pkg/flags/urls.go @@ -19,7 +19,7 @@ import ( "net/url" "strings" - "go.etcd.io/etcd/v3/pkg/types" + "go.etcd.io/etcd/pkg/types" ) // URLsValue wraps "types.URLs". diff --git a/pkg/ioutil/util.go b/pkg/ioutil/util.go index cf0b360af71..6a6746e0b56 100644 --- a/pkg/ioutil/util.go +++ b/pkg/ioutil/util.go @@ -18,7 +18,7 @@ import ( "io" "os" - "go.etcd.io/etcd/v3/pkg/fileutil" + "go.etcd.io/etcd/pkg/fileutil" ) // WriteAndSyncFile behaves just like ioutil.WriteFile in the standard library, diff --git a/pkg/logutil/logger_test.go b/pkg/logutil/logger_test.go index 9ec21da8849..3120665009e 100644 --- a/pkg/logutil/logger_test.go +++ b/pkg/logutil/logger_test.go @@ -20,7 +20,7 @@ import ( "strings" "testing" - "go.etcd.io/etcd/v3/pkg/logutil" + "go.etcd.io/etcd/pkg/logutil" "google.golang.org/grpc/grpclog" ) diff --git a/pkg/logutil/package_logger_test.go b/pkg/logutil/package_logger_test.go index 3a8f1b81872..fa9887126b8 100644 --- a/pkg/logutil/package_logger_test.go +++ b/pkg/logutil/package_logger_test.go @@ -20,7 +20,7 @@ import ( "strings" "testing" - "go.etcd.io/etcd/v3/pkg/logutil" + "go.etcd.io/etcd/pkg/logutil" "github.com/coreos/pkg/capnslog" ) diff --git a/pkg/logutil/zap_journal.go b/pkg/logutil/zap_journal.go index 11b50911507..fcd39038107 100644 --- a/pkg/logutil/zap_journal.go +++ b/pkg/logutil/zap_journal.go @@ -24,7 +24,7 @@ import ( "os" "path/filepath" - "go.etcd.io/etcd/v3/pkg/systemd" + "go.etcd.io/etcd/pkg/systemd" "github.com/coreos/go-systemd/journal" "go.uber.org/zap/zapcore" diff --git a/pkg/logutil/zap_raft.go b/pkg/logutil/zap_raft.go index 85f270fdcdb..e92cba04cbf 100644 --- a/pkg/logutil/zap_raft.go +++ b/pkg/logutil/zap_raft.go @@ -17,7 +17,7 @@ package logutil import ( "errors" - "go.etcd.io/etcd/v3/raft" + "go.etcd.io/etcd/raft" "go.uber.org/zap" "go.uber.org/zap/zapcore" diff --git a/pkg/mock/mockserver/mockserver.go b/pkg/mock/mockserver/mockserver.go index c68cb3c2cd2..59c543eafe8 100644 --- a/pkg/mock/mockserver/mockserver.go +++ b/pkg/mock/mockserver/mockserver.go @@ -22,7 +22,7 @@ import ( "os" "sync" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" "google.golang.org/grpc" "google.golang.org/grpc/resolver" diff --git a/pkg/mock/mockstorage/storage_recorder.go b/pkg/mock/mockstorage/storage_recorder.go index e1fa7f9fdb5..d05413e62a7 100644 --- a/pkg/mock/mockstorage/storage_recorder.go +++ b/pkg/mock/mockstorage/storage_recorder.go @@ -15,9 +15,9 @@ package mockstorage import ( - "go.etcd.io/etcd/v3/pkg/testutil" - "go.etcd.io/etcd/v3/raft" - "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/raft" + "go.etcd.io/etcd/raft/raftpb" ) type storageRecorder struct { diff --git a/pkg/mock/mockstore/store_recorder.go b/pkg/mock/mockstore/store_recorder.go index 386b266bf51..2f4bf45dbe2 100644 --- a/pkg/mock/mockstore/store_recorder.go +++ b/pkg/mock/mockstore/store_recorder.go @@ -17,8 +17,8 @@ package mockstore import ( "time" - "go.etcd.io/etcd/v3/etcdserver/api/v2store" - "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/etcdserver/api/v2store" + "go.etcd.io/etcd/pkg/testutil" ) // StoreRecorder provides a Store interface with a testutil.Recorder diff --git a/pkg/mock/mockwait/wait_recorder.go b/pkg/mock/mockwait/wait_recorder.go index f6bd657d40e..eff1a476605 100644 --- a/pkg/mock/mockwait/wait_recorder.go +++ b/pkg/mock/mockwait/wait_recorder.go @@ -15,8 +15,8 @@ package mockwait import ( - "go.etcd.io/etcd/v3/pkg/testutil" - "go.etcd.io/etcd/v3/pkg/wait" + "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/wait" ) type WaitRecorder struct { diff --git a/pkg/netutil/netutil.go b/pkg/netutil/netutil.go index f18bbe0c763..faef6466eeb 100644 --- a/pkg/netutil/netutil.go +++ b/pkg/netutil/netutil.go @@ -23,7 +23,7 @@ import ( "sort" "time" - "go.etcd.io/etcd/v3/pkg/types" + "go.etcd.io/etcd/pkg/types" "go.uber.org/zap" ) diff --git a/pkg/netutil/routes_linux.go b/pkg/netutil/routes_linux.go index b87ef9d0537..5118d3dacd2 100644 --- a/pkg/netutil/routes_linux.go +++ b/pkg/netutil/routes_linux.go @@ -24,7 +24,7 @@ import ( "sort" "syscall" - "go.etcd.io/etcd/v3/pkg/cpuutil" + "go.etcd.io/etcd/pkg/cpuutil" ) var errNoDefaultRoute = fmt.Errorf("could not find default route") diff --git a/pkg/proxy/server.go b/pkg/proxy/server.go index ef22ea2fffc..6e037ec5d18 100644 --- a/pkg/proxy/server.go +++ b/pkg/proxy/server.go @@ -26,7 +26,7 @@ import ( "sync" "time" - "go.etcd.io/etcd/v3/pkg/transport" + "go.etcd.io/etcd/pkg/transport" humanize "github.com/dustin/go-humanize" "go.uber.org/zap" diff --git a/pkg/proxy/server_test.go b/pkg/proxy/server_test.go index b82af8a3152..1ca0b6878c6 100644 --- a/pkg/proxy/server_test.go +++ b/pkg/proxy/server_test.go @@ -29,7 +29,7 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/pkg/transport" + "go.etcd.io/etcd/pkg/transport" "go.uber.org/zap" ) diff --git a/pkg/srv/srv.go b/pkg/srv/srv.go index 5e20f40993a..c3560026d48 100644 --- a/pkg/srv/srv.go +++ b/pkg/srv/srv.go @@ -21,7 +21,7 @@ import ( "net/url" "strings" - "go.etcd.io/etcd/v3/pkg/types" + "go.etcd.io/etcd/pkg/types" ) var ( diff --git a/pkg/srv/srv_test.go b/pkg/srv/srv_test.go index 26f2dddba3f..24a7cf22d5d 100644 --- a/pkg/srv/srv_test.go +++ b/pkg/srv/srv_test.go @@ -21,7 +21,7 @@ import ( "strings" "testing" - "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/pkg/testutil" ) func TestSRVGetCluster(t *testing.T) { diff --git a/pkg/testutil/leak.go b/pkg/testutil/leak.go index 74a0ebbe50c..27eaa36d232 100644 --- a/pkg/testutil/leak.go +++ b/pkg/testutil/leak.go @@ -21,7 +21,7 @@ CheckLeakedGoroutine verifies tests do not leave any leaky goroutines. It returns true when there are goroutines still running(leaking) after all tests. - import "go.etcd.io/etcd/v3/pkg/testutil" + import "go.etcd.io/etcd/pkg/testutil" func TestMain(m *testing.M) { v := m.Run() @@ -125,8 +125,8 @@ func interestingGoroutines() (gs []string) { strings.Contains(stack, "created by testing.RunTests") || strings.Contains(stack, "testing.Main(") || strings.Contains(stack, "runtime.goexit") || - strings.Contains(stack, "go.etcd.io/etcd/v3/pkg/testutil.interestingGoroutines") || - strings.Contains(stack, "go.etcd.io/etcd/v3/pkg/logutil.(*MergeLogger).outputLoop") || + strings.Contains(stack, "go.etcd.io/etcd/pkg/testutil.interestingGoroutines") || + strings.Contains(stack, "go.etcd.io/etcd/pkg/logutil.(*MergeLogger).outputLoop") || strings.Contains(stack, "github.com/golang/glog.(*loggingT).flushDaemon") || strings.Contains(stack, "created by runtime.gc") || strings.Contains(stack, "runtime.MHeap_Scavenger") { diff --git a/pkg/transport/listener.go b/pkg/transport/listener.go index 5cd9758fb70..0c593e8e2bf 100644 --- a/pkg/transport/listener.go +++ b/pkg/transport/listener.go @@ -31,7 +31,7 @@ import ( "strings" "time" - "go.etcd.io/etcd/v3/pkg/tlsutil" + "go.etcd.io/etcd/pkg/tlsutil" "go.uber.org/zap" ) diff --git a/pkg/types/urls_test.go b/pkg/types/urls_test.go index 98a698ff7e5..268cb8b1629 100644 --- a/pkg/types/urls_test.go +++ b/pkg/types/urls_test.go @@ -18,7 +18,7 @@ import ( "reflect" "testing" - "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/pkg/testutil" ) func TestNewURLs(t *testing.T) { diff --git a/pkg/types/urlsmap_test.go b/pkg/types/urlsmap_test.go index 8ffd0624018..35f34ab7c09 100644 --- a/pkg/types/urlsmap_test.go +++ b/pkg/types/urlsmap_test.go @@ -15,7 +15,7 @@ package types import ( - "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/pkg/testutil" "reflect" "testing" ) diff --git a/proxy/grpcproxy/adapter/auth_client_adapter.go b/proxy/grpcproxy/adapter/auth_client_adapter.go index 3bebc586dfc..59dbe6b0e88 100644 --- a/proxy/grpcproxy/adapter/auth_client_adapter.go +++ b/proxy/grpcproxy/adapter/auth_client_adapter.go @@ -17,7 +17,7 @@ package adapter import ( "context" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" grpc "google.golang.org/grpc" ) diff --git a/proxy/grpcproxy/adapter/cluster_client_adapter.go b/proxy/grpcproxy/adapter/cluster_client_adapter.go index b5dab26ca26..73a6fdfcba5 100644 --- a/proxy/grpcproxy/adapter/cluster_client_adapter.go +++ b/proxy/grpcproxy/adapter/cluster_client_adapter.go @@ -17,7 +17,7 @@ package adapter import ( "context" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" "google.golang.org/grpc" ) diff --git a/proxy/grpcproxy/adapter/election_client_adapter.go b/proxy/grpcproxy/adapter/election_client_adapter.go index 06ebcc9efc2..4722be04039 100644 --- a/proxy/grpcproxy/adapter/election_client_adapter.go +++ b/proxy/grpcproxy/adapter/election_client_adapter.go @@ -17,7 +17,7 @@ package adapter import ( "context" - "go.etcd.io/etcd/v3/etcdserver/api/v3election/v3electionpb" + "go.etcd.io/etcd/etcdserver/api/v3election/v3electionpb" "google.golang.org/grpc" ) diff --git a/proxy/grpcproxy/adapter/kv_client_adapter.go b/proxy/grpcproxy/adapter/kv_client_adapter.go index cc08e09d08f..b1a78209947 100644 --- a/proxy/grpcproxy/adapter/kv_client_adapter.go +++ b/proxy/grpcproxy/adapter/kv_client_adapter.go @@ -17,7 +17,7 @@ package adapter import ( "context" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" grpc "google.golang.org/grpc" ) diff --git a/proxy/grpcproxy/adapter/lease_client_adapter.go b/proxy/grpcproxy/adapter/lease_client_adapter.go index e2c9518c593..a58408f9f29 100644 --- a/proxy/grpcproxy/adapter/lease_client_adapter.go +++ b/proxy/grpcproxy/adapter/lease_client_adapter.go @@ -17,7 +17,7 @@ package adapter import ( "context" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" "google.golang.org/grpc" ) diff --git a/proxy/grpcproxy/adapter/lock_client_adapter.go b/proxy/grpcproxy/adapter/lock_client_adapter.go index eb2a3d64121..65b5641d34f 100644 --- a/proxy/grpcproxy/adapter/lock_client_adapter.go +++ b/proxy/grpcproxy/adapter/lock_client_adapter.go @@ -17,7 +17,7 @@ package adapter import ( "context" - "go.etcd.io/etcd/v3/etcdserver/api/v3lock/v3lockpb" + "go.etcd.io/etcd/etcdserver/api/v3lock/v3lockpb" "google.golang.org/grpc" ) diff --git a/proxy/grpcproxy/adapter/maintenance_client_adapter.go b/proxy/grpcproxy/adapter/maintenance_client_adapter.go index 76fb75ceaa2..4a8781b13ad 100644 --- a/proxy/grpcproxy/adapter/maintenance_client_adapter.go +++ b/proxy/grpcproxy/adapter/maintenance_client_adapter.go @@ -17,7 +17,7 @@ package adapter import ( "context" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" "google.golang.org/grpc" ) diff --git a/proxy/grpcproxy/adapter/watch_client_adapter.go b/proxy/grpcproxy/adapter/watch_client_adapter.go index 5bede2594a9..2f629cc1563 100644 --- a/proxy/grpcproxy/adapter/watch_client_adapter.go +++ b/proxy/grpcproxy/adapter/watch_client_adapter.go @@ -18,7 +18,7 @@ import ( "context" "errors" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" "google.golang.org/grpc" ) diff --git a/proxy/grpcproxy/auth.go b/proxy/grpcproxy/auth.go index 9d86d157c93..e2c7f8c4be3 100644 --- a/proxy/grpcproxy/auth.go +++ b/proxy/grpcproxy/auth.go @@ -17,8 +17,8 @@ package grpcproxy import ( "context" - "go.etcd.io/etcd/v3/clientv3" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + "go.etcd.io/etcd/clientv3" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" ) type AuthProxy struct { diff --git a/proxy/grpcproxy/cache/store.go b/proxy/grpcproxy/cache/store.go index 050a8b7205c..1f9688b895f 100644 --- a/proxy/grpcproxy/cache/store.go +++ b/proxy/grpcproxy/cache/store.go @@ -21,9 +21,9 @@ import ( "sync" "github.com/golang/groupcache/lru" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/pkg/adt" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/adt" ) var ( diff --git a/proxy/grpcproxy/cluster.go b/proxy/grpcproxy/cluster.go index b472181265f..7e5059cfb31 100644 --- a/proxy/grpcproxy/cluster.go +++ b/proxy/grpcproxy/cluster.go @@ -21,10 +21,10 @@ import ( "os" "sync" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/clientv3/naming" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/naming" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" "golang.org/x/time/rate" gnaming "google.golang.org/grpc/naming" diff --git a/proxy/grpcproxy/cluster_test.go b/proxy/grpcproxy/cluster_test.go index a0fa04465a1..7786817446c 100644 --- a/proxy/grpcproxy/cluster_test.go +++ b/proxy/grpcproxy/cluster_test.go @@ -20,10 +20,10 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/clientv3" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/integration" - "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/clientv3" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/integration" + "go.etcd.io/etcd/pkg/testutil" "google.golang.org/grpc" ) diff --git a/proxy/grpcproxy/election.go b/proxy/grpcproxy/election.go index 49421b6ea59..8a80809d222 100644 --- a/proxy/grpcproxy/election.go +++ b/proxy/grpcproxy/election.go @@ -17,8 +17,8 @@ package grpcproxy import ( "context" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/etcdserver/api/v3election/v3electionpb" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver/api/v3election/v3electionpb" ) type electionProxy struct { diff --git a/proxy/grpcproxy/health.go b/proxy/grpcproxy/health.go index 6f7e478eaa5..4756cff2ed4 100644 --- a/proxy/grpcproxy/health.go +++ b/proxy/grpcproxy/health.go @@ -19,9 +19,9 @@ import ( "net/http" "time" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/etcdserver/api/etcdhttp" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver/api/etcdhttp" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" ) // HandleHealth registers health handler on '/health'. diff --git a/proxy/grpcproxy/kv.go b/proxy/grpcproxy/kv.go index 7340326f53d..d3a350994b1 100644 --- a/proxy/grpcproxy/kv.go +++ b/proxy/grpcproxy/kv.go @@ -17,9 +17,9 @@ package grpcproxy import ( "context" - "go.etcd.io/etcd/v3/clientv3" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/proxy/grpcproxy/cache" + "go.etcd.io/etcd/clientv3" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/proxy/grpcproxy/cache" ) type kvProxy struct { diff --git a/proxy/grpcproxy/kv_test.go b/proxy/grpcproxy/kv_test.go index 49ee698637c..a1d29e179b6 100644 --- a/proxy/grpcproxy/kv_test.go +++ b/proxy/grpcproxy/kv_test.go @@ -20,10 +20,10 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/clientv3" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/integration" - "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/clientv3" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/integration" + "go.etcd.io/etcd/pkg/testutil" "google.golang.org/grpc" ) diff --git a/proxy/grpcproxy/leader.go b/proxy/grpcproxy/leader.go index ea0115c4efc..bba2b97036f 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/clientv3" "golang.org/x/time/rate" ) diff --git a/proxy/grpcproxy/lease.go b/proxy/grpcproxy/lease.go index 10b5e2ef339..a688d429a20 100644 --- a/proxy/grpcproxy/lease.go +++ b/proxy/grpcproxy/lease.go @@ -21,9 +21,9 @@ import ( "sync/atomic" "time" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" "google.golang.org/grpc" "google.golang.org/grpc/metadata" diff --git a/proxy/grpcproxy/lock.go b/proxy/grpcproxy/lock.go index 4a903b74300..9e1543d8309 100644 --- a/proxy/grpcproxy/lock.go +++ b/proxy/grpcproxy/lock.go @@ -17,8 +17,8 @@ package grpcproxy import ( "context" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/etcdserver/api/v3lock/v3lockpb" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver/api/v3lock/v3lockpb" ) type lockProxy struct { diff --git a/proxy/grpcproxy/maintenance.go b/proxy/grpcproxy/maintenance.go index ab35b47f1a3..5e1e7517626 100644 --- a/proxy/grpcproxy/maintenance.go +++ b/proxy/grpcproxy/maintenance.go @@ -18,8 +18,8 @@ import ( "context" "io" - "go.etcd.io/etcd/v3/clientv3" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + "go.etcd.io/etcd/clientv3" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" ) type maintenanceProxy struct { diff --git a/proxy/grpcproxy/metrics.go b/proxy/grpcproxy/metrics.go index 5992df78b55..fcab53d84e0 100644 --- a/proxy/grpcproxy/metrics.go +++ b/proxy/grpcproxy/metrics.go @@ -23,7 +23,7 @@ import ( "time" "github.com/prometheus/client_golang/prometheus" - "go.etcd.io/etcd/v3/etcdserver/api/etcdhttp" + "go.etcd.io/etcd/etcdserver/api/etcdhttp" ) var ( diff --git a/proxy/grpcproxy/register.go b/proxy/grpcproxy/register.go index 27595842d0d..ba628c3ebca 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/clientv3" + "go.etcd.io/etcd/clientv3/concurrency" + "go.etcd.io/etcd/clientv3/naming" "golang.org/x/time/rate" gnaming "google.golang.org/grpc/naming" diff --git a/proxy/grpcproxy/register_test.go b/proxy/grpcproxy/register_test.go index 2bca490f35c..33b01547c0e 100644 --- a/proxy/grpcproxy/register_test.go +++ b/proxy/grpcproxy/register_test.go @@ -18,10 +18,10 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/clientv3/naming" - "go.etcd.io/etcd/v3/integration" - "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/naming" + "go.etcd.io/etcd/integration" + "go.etcd.io/etcd/pkg/testutil" gnaming "google.golang.org/grpc/naming" ) diff --git a/proxy/grpcproxy/util.go b/proxy/grpcproxy/util.go index f33479c24a0..266ae7d723b 100644 --- a/proxy/grpcproxy/util.go +++ b/proxy/grpcproxy/util.go @@ -17,7 +17,7 @@ package grpcproxy import ( "context" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" "google.golang.org/grpc" "google.golang.org/grpc/metadata" diff --git a/proxy/grpcproxy/watch.go b/proxy/grpcproxy/watch.go index 91baf831f7b..639bf8e2d60 100644 --- a/proxy/grpcproxy/watch.go +++ b/proxy/grpcproxy/watch.go @@ -18,10 +18,10 @@ import ( "context" "sync" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver/api/v3rpc" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" "google.golang.org/grpc" "google.golang.org/grpc/metadata" diff --git a/proxy/grpcproxy/watch_broadcast.go b/proxy/grpcproxy/watch_broadcast.go index d43112ec89d..f9d2b148a2b 100644 --- a/proxy/grpcproxy/watch_broadcast.go +++ b/proxy/grpcproxy/watch_broadcast.go @@ -18,8 +18,8 @@ import ( "context" "sync" - "go.etcd.io/etcd/v3/clientv3" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + "go.etcd.io/etcd/clientv3" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" ) // watchBroadcast broadcasts a server watcher to many client watchers. diff --git a/proxy/grpcproxy/watcher.go b/proxy/grpcproxy/watcher.go index b994ec2f76c..0068a69e515 100644 --- a/proxy/grpcproxy/watcher.go +++ b/proxy/grpcproxy/watcher.go @@ -17,10 +17,10 @@ package grpcproxy import ( "time" - "go.etcd.io/etcd/v3/clientv3" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/mvcc" - "go.etcd.io/etcd/v3/mvcc/mvccpb" + "go.etcd.io/etcd/clientv3" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/mvcc" + "go.etcd.io/etcd/mvcc/mvccpb" ) type watchRange struct { diff --git a/proxy/httpproxy/reverse.go b/proxy/httpproxy/reverse.go index c74a837fe4b..edbeaaa9723 100644 --- a/proxy/httpproxy/reverse.go +++ b/proxy/httpproxy/reverse.go @@ -28,7 +28,7 @@ import ( "time" "github.com/coreos/pkg/capnslog" - "go.etcd.io/etcd/v3/etcdserver/api/v2http/httptypes" + "go.etcd.io/etcd/etcdserver/api/v2http/httptypes" ) var ( diff --git a/raft/example_test.go b/raft/example_test.go index 11934b23ca9..b56d2a28fa4 100644 --- a/raft/example_test.go +++ b/raft/example_test.go @@ -15,7 +15,7 @@ package raft import ( - pb "go.etcd.io/etcd/v3/raft/raftpb" + pb "go.etcd.io/etcd/raft/raftpb" ) func applyToStore(ents []pb.Entry) {} diff --git a/raft/log.go b/raft/log.go index f9ed4dc5d17..77eedfccbad 100644 --- a/raft/log.go +++ b/raft/log.go @@ -18,7 +18,7 @@ import ( "fmt" "log" - pb "go.etcd.io/etcd/v3/raft/raftpb" + pb "go.etcd.io/etcd/raft/raftpb" ) type raftLog struct { diff --git a/raft/log_test.go b/raft/log_test.go index 6db6f8d91a0..a9ee6ce066b 100644 --- a/raft/log_test.go +++ b/raft/log_test.go @@ -18,7 +18,7 @@ import ( "reflect" "testing" - pb "go.etcd.io/etcd/v3/raft/raftpb" + pb "go.etcd.io/etcd/raft/raftpb" ) func TestFindConflict(t *testing.T) { diff --git a/raft/log_unstable.go b/raft/log_unstable.go index 253c8efee76..1005bf65cc5 100644 --- a/raft/log_unstable.go +++ b/raft/log_unstable.go @@ -14,7 +14,7 @@ package raft -import pb "go.etcd.io/etcd/v3/raft/raftpb" +import pb "go.etcd.io/etcd/raft/raftpb" // unstable.entries[i] has raft log position i+unstable.offset. // Note that unstable.offset may be less than the highest log diff --git a/raft/log_unstable_test.go b/raft/log_unstable_test.go index 9393edc0c0a..2821a1e77b2 100644 --- a/raft/log_unstable_test.go +++ b/raft/log_unstable_test.go @@ -18,7 +18,7 @@ import ( "reflect" "testing" - pb "go.etcd.io/etcd/v3/raft/raftpb" + pb "go.etcd.io/etcd/raft/raftpb" ) func TestUnstableMaybeFirstIndex(t *testing.T) { diff --git a/raft/node.go b/raft/node.go index 5b2600fde26..396007df932 100644 --- a/raft/node.go +++ b/raft/node.go @@ -18,7 +18,7 @@ import ( "context" "errors" - pb "go.etcd.io/etcd/v3/raft/raftpb" + pb "go.etcd.io/etcd/raft/raftpb" ) type SnapshotStatus int diff --git a/raft/node_test.go b/raft/node_test.go index b873779e355..641a5ca2fb7 100644 --- a/raft/node_test.go +++ b/raft/node_test.go @@ -24,8 +24,8 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/pkg/testutil" - "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/raft/raftpb" ) // readyWithTimeout selects from n.Ready() with a 1-second timeout. It diff --git a/raft/raft.go b/raft/raft.go index 24a6c01784b..4619a53d06f 100644 --- a/raft/raft.go +++ b/raft/raft.go @@ -24,7 +24,7 @@ import ( "sync" "time" - pb "go.etcd.io/etcd/v3/raft/raftpb" + pb "go.etcd.io/etcd/raft/raftpb" ) // None is a placeholder node ID used when there is no leader. diff --git a/raft/raft_flow_control_test.go b/raft/raft_flow_control_test.go index 01d4dd7a66f..699bb5b0780 100644 --- a/raft/raft_flow_control_test.go +++ b/raft/raft_flow_control_test.go @@ -17,7 +17,7 @@ package raft import ( "testing" - pb "go.etcd.io/etcd/v3/raft/raftpb" + pb "go.etcd.io/etcd/raft/raftpb" ) // TestMsgAppFlowControlFull ensures: diff --git a/raft/raft_paper_test.go b/raft/raft_paper_test.go index 3b767b4fa0b..cf7b192f4c0 100644 --- a/raft/raft_paper_test.go +++ b/raft/raft_paper_test.go @@ -32,7 +32,7 @@ import ( "sort" "testing" - pb "go.etcd.io/etcd/v3/raft/raftpb" + pb "go.etcd.io/etcd/raft/raftpb" ) func TestFollowerUpdateTermFromMessage(t *testing.T) { diff --git a/raft/raft_snap_test.go b/raft/raft_snap_test.go index 358c85b8e29..145473824c6 100644 --- a/raft/raft_snap_test.go +++ b/raft/raft_snap_test.go @@ -17,7 +17,7 @@ package raft import ( "testing" - pb "go.etcd.io/etcd/v3/raft/raftpb" + pb "go.etcd.io/etcd/raft/raftpb" ) var ( diff --git a/raft/raft_test.go b/raft/raft_test.go index 93c61735cba..13a59f72800 100644 --- a/raft/raft_test.go +++ b/raft/raft_test.go @@ -23,7 +23,7 @@ import ( "strings" "testing" - pb "go.etcd.io/etcd/v3/raft/raftpb" + pb "go.etcd.io/etcd/raft/raftpb" ) // nextEnts returns the appliable entries and updates the applied index diff --git a/raft/rafttest/network.go b/raft/rafttest/network.go index 1a46c67de54..ee30fc0c426 100644 --- a/raft/rafttest/network.go +++ b/raft/rafttest/network.go @@ -19,7 +19,7 @@ import ( "sync" "time" - "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/raft/raftpb" ) // a network interface diff --git a/raft/rafttest/network_test.go b/raft/rafttest/network_test.go index a176c95fbbe..cbfae9605db 100644 --- a/raft/rafttest/network_test.go +++ b/raft/rafttest/network_test.go @@ -18,7 +18,7 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/raft/raftpb" ) func TestNetworkDrop(t *testing.T) { diff --git a/raft/rafttest/node.go b/raft/rafttest/node.go index d97522937b0..add21da0b56 100644 --- a/raft/rafttest/node.go +++ b/raft/rafttest/node.go @@ -20,8 +20,8 @@ import ( "sync" "time" - "go.etcd.io/etcd/v3/raft" - "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/raft" + "go.etcd.io/etcd/raft/raftpb" ) type node struct { diff --git a/raft/rafttest/node_bench_test.go b/raft/rafttest/node_bench_test.go index 2b505d8ef22..f28744ae89f 100644 --- a/raft/rafttest/node_bench_test.go +++ b/raft/rafttest/node_bench_test.go @@ -19,7 +19,7 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/raft" + "go.etcd.io/etcd/raft" ) func BenchmarkProposal3Nodes(b *testing.B) { diff --git a/raft/rafttest/node_test.go b/raft/rafttest/node_test.go index 3c466367b46..455f565914d 100644 --- a/raft/rafttest/node_test.go +++ b/raft/rafttest/node_test.go @@ -19,7 +19,7 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/raft" + "go.etcd.io/etcd/raft" ) func TestBasicProgress(t *testing.T) { diff --git a/raft/rawnode.go b/raft/rawnode.go index 139a084211c..d31de6e7d7a 100644 --- a/raft/rawnode.go +++ b/raft/rawnode.go @@ -17,7 +17,7 @@ package raft import ( "errors" - pb "go.etcd.io/etcd/v3/raft/raftpb" + pb "go.etcd.io/etcd/raft/raftpb" ) // ErrStepLocalMsg is returned when try to step a local raft message diff --git a/raft/rawnode_test.go b/raft/rawnode_test.go index 2752433f2bb..f44907dd9f8 100644 --- a/raft/rawnode_test.go +++ b/raft/rawnode_test.go @@ -20,7 +20,7 @@ import ( "reflect" "testing" - "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/raft/raftpb" ) // TestRawNodeStep ensures that RawNode.Step ignore local message. diff --git a/raft/read_only.go b/raft/read_only.go index 955fe798669..39eb2b06515 100644 --- a/raft/read_only.go +++ b/raft/read_only.go @@ -14,7 +14,7 @@ package raft -import pb "go.etcd.io/etcd/v3/raft/raftpb" +import pb "go.etcd.io/etcd/raft/raftpb" // ReadState provides state for read only query. // It's caller's responsibility to call ReadIndex first before getting diff --git a/raft/status.go b/raft/status.go index f894716e190..197a6820d84 100644 --- a/raft/status.go +++ b/raft/status.go @@ -17,7 +17,7 @@ package raft import ( "fmt" - pb "go.etcd.io/etcd/v3/raft/raftpb" + pb "go.etcd.io/etcd/raft/raftpb" ) type Status struct { diff --git a/raft/storage.go b/raft/storage.go index cb35ddff12f..14ad6860831 100644 --- a/raft/storage.go +++ b/raft/storage.go @@ -18,7 +18,7 @@ import ( "errors" "sync" - pb "go.etcd.io/etcd/v3/raft/raftpb" + pb "go.etcd.io/etcd/raft/raftpb" ) // ErrCompacted is returned by Storage.Entries/Compact when a requested diff --git a/raft/storage_test.go b/raft/storage_test.go index 4e7100b95b0..6d075eafd74 100644 --- a/raft/storage_test.go +++ b/raft/storage_test.go @@ -19,7 +19,7 @@ import ( "reflect" "testing" - pb "go.etcd.io/etcd/v3/raft/raftpb" + pb "go.etcd.io/etcd/raft/raftpb" ) func TestStorageTerm(t *testing.T) { diff --git a/raft/util.go b/raft/util.go index abc760f363a..c145d26dd7f 100644 --- a/raft/util.go +++ b/raft/util.go @@ -18,7 +18,7 @@ import ( "bytes" "fmt" - pb "go.etcd.io/etcd/v3/raft/raftpb" + pb "go.etcd.io/etcd/raft/raftpb" ) func (st StateType) MarshalJSON() ([]byte, error) { diff --git a/raft/util_test.go b/raft/util_test.go index 4c49a61ba71..52853892f5a 100644 --- a/raft/util_test.go +++ b/raft/util_test.go @@ -20,7 +20,7 @@ import ( "strings" "testing" - pb "go.etcd.io/etcd/v3/raft/raftpb" + pb "go.etcd.io/etcd/raft/raftpb" ) var testFormatter EntryFormatter = func(data []byte) string { diff --git a/tests/e2e/cluster_proxy_test.go b/tests/e2e/cluster_proxy_test.go index 078c93f4143..f9028ae2b5b 100644 --- a/tests/e2e/cluster_proxy_test.go +++ b/tests/e2e/cluster_proxy_test.go @@ -24,7 +24,7 @@ import ( "strconv" "strings" - "go.etcd.io/etcd/v3/pkg/expect" + "go.etcd.io/etcd/pkg/expect" ) type proxyEtcdProcess struct { diff --git a/tests/e2e/cluster_test.go b/tests/e2e/cluster_test.go index 38cc973de9c..57663f2c51b 100644 --- a/tests/e2e/cluster_test.go +++ b/tests/e2e/cluster_test.go @@ -21,7 +21,7 @@ import ( "os" "strings" - "go.etcd.io/etcd/v3/etcdserver" + "go.etcd.io/etcd/etcdserver" ) const etcdProcessBasePort = 20000 diff --git a/tests/e2e/ctl_v2_test.go b/tests/e2e/ctl_v2_test.go index 7ce9072c54e..cbea2a3d85f 100644 --- a/tests/e2e/ctl_v2_test.go +++ b/tests/e2e/ctl_v2_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/pkg/fileutil" - "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/pkg/fileutil" + "go.etcd.io/etcd/pkg/testutil" ) func TestCtlV2Set(t *testing.T) { testCtlV2Set(t, &configNoTLS, false) } diff --git a/tests/e2e/ctl_v3_alarm_test.go b/tests/e2e/ctl_v3_alarm_test.go index 4d3df2a93d2..a8bc38483d1 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/clientv3" ) func TestCtlV3Alarm(t *testing.T) { diff --git a/tests/e2e/ctl_v3_auth_test.go b/tests/e2e/ctl_v3_auth_test.go index 22832c71891..e47660ac8c5 100644 --- a/tests/e2e/ctl_v3_auth_test.go +++ b/tests/e2e/ctl_v3_auth_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/clientv3" ) func TestCtlV3AuthEnable(t *testing.T) { testCtl(t, authEnableTest) } diff --git a/tests/e2e/ctl_v3_elect_test.go b/tests/e2e/ctl_v3_elect_test.go index d0dc6fa4f4d..35495313898 100644 --- a/tests/e2e/ctl_v3_elect_test.go +++ b/tests/e2e/ctl_v3_elect_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/pkg/expect" + "go.etcd.io/etcd/pkg/expect" ) func TestCtlV3Elect(t *testing.T) { diff --git a/tests/e2e/ctl_v3_endpoint_test.go b/tests/e2e/ctl_v3_endpoint_test.go index 7d1416bdf03..23070ba88a7 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/clientv3" ) func TestCtlV3EndpointHealth(t *testing.T) { testCtl(t, endpointHealthTest, withQuorum()) } diff --git a/tests/e2e/ctl_v3_lock_test.go b/tests/e2e/ctl_v3_lock_test.go index 2d79bc2a3da..e27ccdea70c 100644 --- a/tests/e2e/ctl_v3_lock_test.go +++ b/tests/e2e/ctl_v3_lock_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/pkg/expect" + "go.etcd.io/etcd/pkg/expect" ) func TestCtlV3Lock(t *testing.T) { diff --git a/tests/e2e/ctl_v3_member_test.go b/tests/e2e/ctl_v3_member_test.go index 06da3b0f7c4..61961c9f672 100644 --- a/tests/e2e/ctl_v3_member_test.go +++ b/tests/e2e/ctl_v3_member_test.go @@ -21,7 +21,7 @@ import ( "strings" "testing" - "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + "go.etcd.io/etcd/etcdserver/etcdserverpb" ) func TestCtlV3MemberList(t *testing.T) { testCtl(t, memberListTest) } diff --git a/tests/e2e/ctl_v3_migrate_test.go b/tests/e2e/ctl_v3_migrate_test.go index 021e785b8b3..1ecffe58934 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/v3/clientv3" - "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/pkg/testutil" ) 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 521820eac3e..f603ad34ad7 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/v3/clientv3" - "go.etcd.io/etcd/v3/pkg/testutil" - "go.etcd.io/etcd/v3/pkg/transport" - "go.etcd.io/etcd/v3/pkg/types" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/transport" + "go.etcd.io/etcd/pkg/types" ) func TestCtlV3MoveLeaderSecure(t *testing.T) { diff --git a/tests/e2e/ctl_v3_snapshot_test.go b/tests/e2e/ctl_v3_snapshot_test.go index 9941cb1f00e..94929c089c7 100644 --- a/tests/e2e/ctl_v3_snapshot_test.go +++ b/tests/e2e/ctl_v3_snapshot_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/clientv3/snapshot" - "go.etcd.io/etcd/v3/pkg/expect" - "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/clientv3/snapshot" + "go.etcd.io/etcd/pkg/expect" + "go.etcd.io/etcd/pkg/testutil" ) func TestCtlV3Snapshot(t *testing.T) { testCtl(t, snapshotTest) } diff --git a/tests/e2e/ctl_v3_test.go b/tests/e2e/ctl_v3_test.go index 25735087cd9..04f5a6570bf 100644 --- a/tests/e2e/ctl_v3_test.go +++ b/tests/e2e/ctl_v3_test.go @@ -21,9 +21,9 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/pkg/flags" - "go.etcd.io/etcd/v3/pkg/testutil" - "go.etcd.io/etcd/v3/version" + "go.etcd.io/etcd/pkg/flags" + "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/version" ) func TestCtlV3Version(t *testing.T) { testCtl(t, versionTest) } diff --git a/tests/e2e/etcd_config_test.go b/tests/e2e/etcd_config_test.go index 8135dd6ba2b..7c660b03ee4 100644 --- a/tests/e2e/etcd_config_test.go +++ b/tests/e2e/etcd_config_test.go @@ -21,7 +21,7 @@ import ( "strings" "testing" - "go.etcd.io/etcd/v3/pkg/expect" + "go.etcd.io/etcd/pkg/expect" ) const exampleConfigFile = "../../etcd.conf.yml.sample" diff --git a/tests/e2e/etcd_corrupt_test.go b/tests/e2e/etcd_corrupt_test.go index f5aed150c23..5fb35557895 100644 --- a/tests/e2e/etcd_corrupt_test.go +++ b/tests/e2e/etcd_corrupt_test.go @@ -23,8 +23,8 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/mvcc/mvccpb" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/mvcc/mvccpb" bolt "go.etcd.io/bbolt" ) diff --git a/tests/e2e/etcd_process.go b/tests/e2e/etcd_process.go index c6a03ecefaa..3ff7022cfef 100644 --- a/tests/e2e/etcd_process.go +++ b/tests/e2e/etcd_process.go @@ -19,8 +19,8 @@ import ( "net/url" "os" - "go.etcd.io/etcd/v3/pkg/expect" - "go.etcd.io/etcd/v3/pkg/fileutil" + "go.etcd.io/etcd/pkg/expect" + "go.etcd.io/etcd/pkg/fileutil" ) var ( diff --git a/tests/e2e/etcd_release_upgrade_test.go b/tests/e2e/etcd_release_upgrade_test.go index e9abf480df4..6a8e5b13ac6 100644 --- a/tests/e2e/etcd_release_upgrade_test.go +++ b/tests/e2e/etcd_release_upgrade_test.go @@ -22,9 +22,9 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/pkg/fileutil" - "go.etcd.io/etcd/v3/pkg/testutil" - "go.etcd.io/etcd/v3/version" + "go.etcd.io/etcd/pkg/fileutil" + "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/version" ) // TestReleaseUpgrade ensures that changes to master branch does not affect diff --git a/tests/e2e/etcd_spawn_cov.go b/tests/e2e/etcd_spawn_cov.go index f845490d44f..cbdb2e66af8 100644 --- a/tests/e2e/etcd_spawn_cov.go +++ b/tests/e2e/etcd_spawn_cov.go @@ -24,9 +24,9 @@ import ( "syscall" "time" - "go.etcd.io/etcd/v3/pkg/expect" - "go.etcd.io/etcd/v3/pkg/fileutil" - "go.etcd.io/etcd/v3/pkg/flags" + "go.etcd.io/etcd/pkg/expect" + "go.etcd.io/etcd/pkg/fileutil" + "go.etcd.io/etcd/pkg/flags" ) const noOutputLineCount = 2 // cov-enabled binaries emit PASS and coverage count lines diff --git a/tests/e2e/etcd_spawn_nocov.go b/tests/e2e/etcd_spawn_nocov.go index 88e91733f13..33f49ffa455 100644 --- a/tests/e2e/etcd_spawn_nocov.go +++ b/tests/e2e/etcd_spawn_nocov.go @@ -19,7 +19,7 @@ package e2e import ( "os" - "go.etcd.io/etcd/v3/pkg/expect" + "go.etcd.io/etcd/pkg/expect" ) const noOutputLineCount = 0 // regular binaries emit no extra lines diff --git a/tests/e2e/gateway_test.go b/tests/e2e/gateway_test.go index fb0857a28cd..ee7c415b0a4 100644 --- a/tests/e2e/gateway_test.go +++ b/tests/e2e/gateway_test.go @@ -19,7 +19,7 @@ import ( "strings" "testing" - "go.etcd.io/etcd/v3/pkg/expect" + "go.etcd.io/etcd/pkg/expect" ) var ( diff --git a/tests/e2e/main_test.go b/tests/e2e/main_test.go index 59ad4e3f17b..6a608c6c942 100644 --- a/tests/e2e/main_test.go +++ b/tests/e2e/main_test.go @@ -10,7 +10,7 @@ import ( "runtime" "testing" - "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/pkg/testutil" ) var ( diff --git a/tests/e2e/metrics_test.go b/tests/e2e/metrics_test.go index db36bd5db66..7a32f003147 100644 --- a/tests/e2e/metrics_test.go +++ b/tests/e2e/metrics_test.go @@ -19,7 +19,7 @@ import ( "strings" "testing" - "go.etcd.io/etcd/v3/version" + "go.etcd.io/etcd/version" ) func TestV3MetricsSecure(t *testing.T) { diff --git a/tests/e2e/util.go b/tests/e2e/util.go index de73e511ab0..ce7289ae94d 100644 --- a/tests/e2e/util.go +++ b/tests/e2e/util.go @@ -21,7 +21,7 @@ import ( "strings" "time" - "go.etcd.io/etcd/v3/pkg/expect" + "go.etcd.io/etcd/pkg/expect" ) func waitReadyExpectProc(exproc *expect.ExpectProcess, readyStrs []string) error { diff --git a/tests/e2e/v2_curl_test.go b/tests/e2e/v2_curl_test.go index 7e710525e35..e1288066d1c 100644 --- a/tests/e2e/v2_curl_test.go +++ b/tests/e2e/v2_curl_test.go @@ -21,7 +21,7 @@ import ( "strings" "testing" - "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/pkg/testutil" ) func TestV2CurlNoTLS(t *testing.T) { testCurlPutGet(t, &configNoTLS) } diff --git a/tests/e2e/v3_cipher_suite_test.go b/tests/e2e/v3_cipher_suite_test.go index 9b05488781e..501dc28e183 100644 --- a/tests/e2e/v3_cipher_suite_test.go +++ b/tests/e2e/v3_cipher_suite_test.go @@ -20,7 +20,7 @@ import ( "fmt" "testing" - "go.etcd.io/etcd/v3/version" + "go.etcd.io/etcd/version" ) func TestV3CurlCipherSuitesValid(t *testing.T) { testV3CurlCipherSuites(t, true) } diff --git a/tests/e2e/v3_curl_lease_test.go b/tests/e2e/v3_curl_lease_test.go index 91e59243c22..47d150a7aad 100644 --- a/tests/e2e/v3_curl_lease_test.go +++ b/tests/e2e/v3_curl_lease_test.go @@ -18,7 +18,7 @@ import ( "fmt" "testing" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" ) func TestV3CurlLeaseGrantNoTLS(t *testing.T) { diff --git a/tests/e2e/v3_curl_test.go b/tests/e2e/v3_curl_test.go index 21f5e3d02ff..60f2baf1027 100644 --- a/tests/e2e/v3_curl_test.go +++ b/tests/e2e/v3_curl_test.go @@ -22,10 +22,10 @@ import ( "strconv" "testing" - epb "go.etcd.io/etcd/v3/etcdserver/api/v3election/v3electionpb" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/pkg/testutil" + epb "go.etcd.io/etcd/etcdserver/api/v3election/v3electionpb" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/testutil" "github.com/grpc-ecosystem/grpc-gateway/runtime" ) diff --git a/tools/benchmark/cmd/lease.go b/tools/benchmark/cmd/lease.go index c8ed1e43b32..8104390c99e 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/v3/clientv3" - "go.etcd.io/etcd/v3/pkg/report" + v3 "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/pkg/report" "github.com/spf13/cobra" "gopkg.in/cheggaaa/pb.v1" diff --git a/tools/benchmark/cmd/mvcc-put.go b/tools/benchmark/cmd/mvcc-put.go index 0507c71cca6..026693efe05 100644 --- a/tools/benchmark/cmd/mvcc-put.go +++ b/tools/benchmark/cmd/mvcc-put.go @@ -21,8 +21,8 @@ import ( "runtime/pprof" "time" - "go.etcd.io/etcd/v3/lease" - "go.etcd.io/etcd/v3/pkg/report" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/pkg/report" "github.com/spf13/cobra" ) diff --git a/tools/benchmark/cmd/mvcc.go b/tools/benchmark/cmd/mvcc.go index 797a92f1637..742ffe9cf6e 100644 --- a/tools/benchmark/cmd/mvcc.go +++ b/tools/benchmark/cmd/mvcc.go @@ -20,9 +20,9 @@ import ( "go.uber.org/zap" - "go.etcd.io/etcd/v3/lease" - "go.etcd.io/etcd/v3/mvcc" - "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/mvcc" + "go.etcd.io/etcd/mvcc/backend" "github.com/spf13/cobra" ) diff --git a/tools/benchmark/cmd/put.go b/tools/benchmark/cmd/put.go index dbbbf98db9f..4f99d5c5773 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/v3/clientv3" - "go.etcd.io/etcd/v3/pkg/report" + v3 "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/pkg/report" "github.com/dustin/go-humanize" "github.com/spf13/cobra" diff --git a/tools/benchmark/cmd/range.go b/tools/benchmark/cmd/range.go index c46b90d5ab2..a24cce31822 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/v3/clientv3" - "go.etcd.io/etcd/v3/pkg/report" + v3 "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/pkg/report" "github.com/spf13/cobra" "golang.org/x/time/rate" diff --git a/tools/benchmark/cmd/root.go b/tools/benchmark/cmd/root.go index 7ee50aad8dc..83d96f5d452 100644 --- a/tools/benchmark/cmd/root.go +++ b/tools/benchmark/cmd/root.go @@ -18,7 +18,7 @@ import ( "sync" "time" - "go.etcd.io/etcd/v3/pkg/transport" + "go.etcd.io/etcd/pkg/transport" "github.com/spf13/cobra" "gopkg.in/cheggaaa/pb.v1" diff --git a/tools/benchmark/cmd/stm.go b/tools/benchmark/cmd/stm.go index 0372d628b5e..f8df5398d29 100644 --- a/tools/benchmark/cmd/stm.go +++ b/tools/benchmark/cmd/stm.go @@ -23,10 +23,10 @@ import ( "os" "time" - v3 "go.etcd.io/etcd/v3/clientv3" - v3sync "go.etcd.io/etcd/v3/clientv3/concurrency" - "go.etcd.io/etcd/v3/etcdserver/api/v3lock/v3lockpb" - "go.etcd.io/etcd/v3/pkg/report" + v3 "go.etcd.io/etcd/clientv3" + v3sync "go.etcd.io/etcd/clientv3/concurrency" + "go.etcd.io/etcd/etcdserver/api/v3lock/v3lockpb" + "go.etcd.io/etcd/pkg/report" "github.com/spf13/cobra" "golang.org/x/time/rate" diff --git a/tools/benchmark/cmd/txn_put.go b/tools/benchmark/cmd/txn_put.go index 0b69eeb0608..e042aacf6cd 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/v3/clientv3" - "go.etcd.io/etcd/v3/pkg/report" + v3 "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/pkg/report" "github.com/spf13/cobra" "golang.org/x/time/rate" diff --git a/tools/benchmark/cmd/util.go b/tools/benchmark/cmd/util.go index 8d4783bdd4d..ba2c9a7ba62 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/v3/clientv3" - "go.etcd.io/etcd/v3/pkg/report" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/pkg/report" "google.golang.org/grpc/grpclog" ) diff --git a/tools/benchmark/cmd/watch.go b/tools/benchmark/cmd/watch.go index 9cea4884c14..d217a39c80d 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/v3/clientv3" - "go.etcd.io/etcd/v3/pkg/report" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/pkg/report" "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 3cc20fe7420..c6def95fb19 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/v3/clientv3" - "go.etcd.io/etcd/v3/pkg/report" + v3 "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/pkg/report" "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 9025f98fb7a..fc48ea2f351 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/v3/clientv3" - "go.etcd.io/etcd/v3/pkg/report" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/pkg/report" "github.com/spf13/cobra" "golang.org/x/time/rate" diff --git a/tools/benchmark/main.go b/tools/benchmark/main.go index 97c03141fa7..4e70b8125a2 100644 --- a/tools/benchmark/main.go +++ b/tools/benchmark/main.go @@ -18,7 +18,7 @@ import ( "fmt" "os" - "go.etcd.io/etcd/v3/tools/benchmark/cmd" + "go.etcd.io/etcd/tools/benchmark/cmd" ) func main() { diff --git a/tools/etcd-dump-db/backend.go b/tools/etcd-dump-db/backend.go index 6d719d8a649..4ad0aa5ddf2 100644 --- a/tools/etcd-dump-db/backend.go +++ b/tools/etcd-dump-db/backend.go @@ -19,10 +19,10 @@ import ( "fmt" "path/filepath" - "go.etcd.io/etcd/v3/lease/leasepb" - "go.etcd.io/etcd/v3/mvcc" - "go.etcd.io/etcd/v3/mvcc/backend" - "go.etcd.io/etcd/v3/mvcc/mvccpb" + "go.etcd.io/etcd/lease/leasepb" + "go.etcd.io/etcd/mvcc" + "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/mvcc/mvccpb" bolt "go.etcd.io/bbolt" ) diff --git a/tools/etcd-dump-logs/etcd-dump-log_test.go b/tools/etcd-dump-logs/etcd-dump-log_test.go index 9190f36b6c0..f1b6b631c88 100644 --- a/tools/etcd-dump-logs/etcd-dump-log_test.go +++ b/tools/etcd-dump-logs/etcd-dump-log_test.go @@ -24,12 +24,12 @@ import ( "strings" "testing" - "go.etcd.io/etcd/v3/auth/authpb" - "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/pkg/fileutil" - "go.etcd.io/etcd/v3/pkg/pbutil" - "go.etcd.io/etcd/v3/raft/raftpb" - "go.etcd.io/etcd/v3/wal" + "go.etcd.io/etcd/auth/authpb" + "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/fileutil" + "go.etcd.io/etcd/pkg/pbutil" + "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/wal" "go.uber.org/zap" ) diff --git a/tools/etcd-dump-logs/main.go b/tools/etcd-dump-logs/main.go index 506ea2a90e9..6bb58929687 100644 --- a/tools/etcd-dump-logs/main.go +++ b/tools/etcd-dump-logs/main.go @@ -28,13 +28,13 @@ import ( "strings" "time" - "go.etcd.io/etcd/v3/etcdserver/api/snap" - "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/pkg/pbutil" - "go.etcd.io/etcd/v3/pkg/types" - "go.etcd.io/etcd/v3/raft/raftpb" - "go.etcd.io/etcd/v3/wal" - "go.etcd.io/etcd/v3/wal/walpb" + "go.etcd.io/etcd/etcdserver/api/snap" + "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/pbutil" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/wal" + "go.etcd.io/etcd/wal/walpb" "go.uber.org/zap" ) diff --git a/tools/etcd-dump-metrics/etcd.go b/tools/etcd-dump-metrics/etcd.go index b0e4bbfb858..2939b60c201 100644 --- a/tools/etcd-dump-metrics/etcd.go +++ b/tools/etcd-dump-metrics/etcd.go @@ -23,8 +23,8 @@ import ( "strings" "time" - "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/embed" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/embed" "go.uber.org/zap" ) diff --git a/tools/etcd-dump-metrics/install_darwin.go b/tools/etcd-dump-metrics/install_darwin.go index dab3386768d..4d545b2405c 100644 --- a/tools/etcd-dump-metrics/install_darwin.go +++ b/tools/etcd-dump-metrics/install_darwin.go @@ -24,7 +24,7 @@ import ( "os/exec" "path/filepath" - "go.etcd.io/etcd/v3/pkg/fileutil" + "go.etcd.io/etcd/pkg/fileutil" ) const downloadURL = `https://storage.googleapis.com/etcd/%s/etcd-%s-darwin-amd64.zip` diff --git a/tools/etcd-dump-metrics/install_linux.go b/tools/etcd-dump-metrics/install_linux.go index 68adcaaea48..0c6fc970737 100644 --- a/tools/etcd-dump-metrics/install_linux.go +++ b/tools/etcd-dump-metrics/install_linux.go @@ -23,7 +23,7 @@ import ( "os/exec" "path/filepath" - "go.etcd.io/etcd/v3/pkg/fileutil" + "go.etcd.io/etcd/pkg/fileutil" ) const downloadURL = `https://storage.googleapis.com/etcd/%s/etcd-%s-linux-amd64.tar.gz` diff --git a/tools/etcd-dump-metrics/main.go b/tools/etcd-dump-metrics/main.go index ba2c843dce1..0648c8b2ba4 100644 --- a/tools/etcd-dump-metrics/main.go +++ b/tools/etcd-dump-metrics/main.go @@ -25,7 +25,7 @@ import ( "path/filepath" "time" - "go.etcd.io/etcd/v3/embed" + "go.etcd.io/etcd/embed" "go.uber.org/zap" ) diff --git a/tools/etcd-dump-metrics/metrics.go b/tools/etcd-dump-metrics/metrics.go index dfc66622a52..3840b20fb18 100644 --- a/tools/etcd-dump-metrics/metrics.go +++ b/tools/etcd-dump-metrics/metrics.go @@ -22,7 +22,7 @@ import ( "strings" "time" - "go.etcd.io/etcd/v3/pkg/transport" + "go.etcd.io/etcd/pkg/transport" "go.uber.org/zap" ) diff --git a/wal/decoder.go b/wal/decoder.go index 9d6c20253ae..f2f01fd881c 100644 --- a/wal/decoder.go +++ b/wal/decoder.go @@ -21,10 +21,10 @@ import ( "io" "sync" - "go.etcd.io/etcd/v3/pkg/crc" - "go.etcd.io/etcd/v3/pkg/pbutil" - "go.etcd.io/etcd/v3/raft/raftpb" - "go.etcd.io/etcd/v3/wal/walpb" + "go.etcd.io/etcd/pkg/crc" + "go.etcd.io/etcd/pkg/pbutil" + "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/wal/walpb" ) const minSectorSize = 512 diff --git a/wal/encoder.go b/wal/encoder.go index fb52182c472..d3877ed5c4e 100644 --- a/wal/encoder.go +++ b/wal/encoder.go @@ -21,9 +21,9 @@ import ( "os" "sync" - "go.etcd.io/etcd/v3/pkg/crc" - "go.etcd.io/etcd/v3/pkg/ioutil" - "go.etcd.io/etcd/v3/wal/walpb" + "go.etcd.io/etcd/pkg/crc" + "go.etcd.io/etcd/pkg/ioutil" + "go.etcd.io/etcd/wal/walpb" ) // walPageBytes is the alignment for flushing records to the backing Writer. diff --git a/wal/file_pipeline.go b/wal/file_pipeline.go index 1b60684f331..e1e1c557b8b 100644 --- a/wal/file_pipeline.go +++ b/wal/file_pipeline.go @@ -19,7 +19,7 @@ import ( "os" "path/filepath" - "go.etcd.io/etcd/v3/pkg/fileutil" + "go.etcd.io/etcd/pkg/fileutil" "go.uber.org/zap" ) diff --git a/wal/record_test.go b/wal/record_test.go index 428bd2532e1..b725151a5ea 100644 --- a/wal/record_test.go +++ b/wal/record_test.go @@ -22,7 +22,7 @@ import ( "reflect" "testing" - "go.etcd.io/etcd/v3/wal/walpb" + "go.etcd.io/etcd/wal/walpb" ) var ( diff --git a/wal/repair.go b/wal/repair.go index 6debd8b81bd..15afed01744 100644 --- a/wal/repair.go +++ b/wal/repair.go @@ -19,8 +19,8 @@ import ( "os" "path/filepath" - "go.etcd.io/etcd/v3/pkg/fileutil" - "go.etcd.io/etcd/v3/wal/walpb" + "go.etcd.io/etcd/pkg/fileutil" + "go.etcd.io/etcd/wal/walpb" "go.uber.org/zap" ) diff --git a/wal/repair_test.go b/wal/repair_test.go index ae6747b6bd5..b2a215bcabe 100644 --- a/wal/repair_test.go +++ b/wal/repair_test.go @@ -21,8 +21,8 @@ import ( "os" "testing" - "go.etcd.io/etcd/v3/raft/raftpb" - "go.etcd.io/etcd/v3/wal/walpb" + "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/wal/walpb" "go.uber.org/zap" ) diff --git a/wal/util.go b/wal/util.go index f035ef83f35..a3f314bb126 100644 --- a/wal/util.go +++ b/wal/util.go @@ -19,7 +19,7 @@ import ( "fmt" "strings" - "go.etcd.io/etcd/v3/pkg/fileutil" + "go.etcd.io/etcd/pkg/fileutil" "go.uber.org/zap" ) diff --git a/wal/wal.go b/wal/wal.go index c01e3696412..5f6f21e3a53 100644 --- a/wal/wal.go +++ b/wal/wal.go @@ -25,11 +25,11 @@ import ( "sync" "time" - "go.etcd.io/etcd/v3/pkg/fileutil" - "go.etcd.io/etcd/v3/pkg/pbutil" - "go.etcd.io/etcd/v3/raft" - "go.etcd.io/etcd/v3/raft/raftpb" - "go.etcd.io/etcd/v3/wal/walpb" + "go.etcd.io/etcd/pkg/fileutil" + "go.etcd.io/etcd/pkg/pbutil" + "go.etcd.io/etcd/raft" + "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/wal/walpb" "github.com/coreos/pkg/capnslog" "go.uber.org/zap" diff --git a/wal/wal_bench_test.go b/wal/wal_bench_test.go index 607d02afc79..20bed171db3 100644 --- a/wal/wal_bench_test.go +++ b/wal/wal_bench_test.go @@ -21,7 +21,7 @@ import ( "go.uber.org/zap" - "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/raft/raftpb" ) func BenchmarkWrite100EntryWithoutBatch(b *testing.B) { benchmarkWriteEntry(b, 100, 0) } diff --git a/wal/wal_test.go b/wal/wal_test.go index 6e79a03feb6..d2709d042c6 100644 --- a/wal/wal_test.go +++ b/wal/wal_test.go @@ -27,10 +27,10 @@ import ( "regexp" "testing" - "go.etcd.io/etcd/v3/pkg/fileutil" - "go.etcd.io/etcd/v3/pkg/pbutil" - "go.etcd.io/etcd/v3/raft/raftpb" - "go.etcd.io/etcd/v3/wal/walpb" + "go.etcd.io/etcd/pkg/fileutil" + "go.etcd.io/etcd/pkg/pbutil" + "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/wal/walpb" "go.uber.org/zap" ) From 8ff591440493c86827298d59a82cbb730499d8d2 Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Tue, 28 May 2019 15:00:12 -0700 Subject: [PATCH 7/8] tests: update semaphore upgrade tests Signed-off-by: Gyuho Lee --- tests/semaphore.test.bash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/semaphore.test.bash b/tests/semaphore.test.bash index f171d75633e..b04a1c5a6f3 100755 --- a/tests/semaphore.test.bash +++ b/tests/semaphore.test.bash @@ -8,10 +8,10 @@ fi < Date: Tue, 28 May 2019 16:19:11 -0700 Subject: [PATCH 8/8] main_test: skip test when invoked via go test Signed-off-by: Gyuho Lee --- main_test.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/main_test.go b/main_test.go index e581305a2ea..62cf5f1e98c 100644 --- a/main_test.go +++ b/main_test.go @@ -26,7 +26,10 @@ func TestMain(t *testing.T) { // don't launch etcd server when invoked via go test // Note: module name has /v3 now if strings.HasSuffix(os.Args[0], "v3.test") { - return + t.Skip("skip launching etcd server when invoked via go test") + } + if len(os.Args) > 1 && strings.HasPrefix(os.Args[1], "-test.") { + t.Skip("skip launching etcd server when invoked via go test") } notifier := make(chan os.Signal, 1)