From 0ffee563897ed998b6e9575e2499e86198e4c2e2 Mon Sep 17 00:00:00 2001 From: Tobias Schottdorf Date: Fri, 31 May 2019 12:34:05 +0200 Subject: [PATCH] Fix import paths to include v3 for etcd The module name is go.etcd.io/etcd/v3, but many places were importing go.etcd.io/etcd which (to the best of my understanding) was the root cause for vendoring the latter and causing build problems. `./scripts/updatedep.sh` is a noop as of this commit.:x --- auth/range_perm_cache.go | 7 +-- auth/range_perm_cache_test.go | 5 +- auth/store.go | 9 ++- auth/store_test.go | 9 ++- 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 | 3 +- client/main_test.go | 6 +- client/members.go | 2 +- client/members_test.go | 2 +- clientv3/auth.go | 4 +- clientv3/balancer/balancer.go | 3 +- clientv3/balancer/balancer_test.go | 9 ++- clientv3/balancer/config.go | 3 +- clientv3/balancer/grpc1.7-health_test.go | 5 +- clientv3/client.go | 10 ++-- clientv3/client_test.go | 5 +- clientv3/clientv3util/example_key_test.go | 4 +- clientv3/clientv3util/util.go | 2 +- clientv3/cluster.go | 5 +- 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 | 3 +- clientv3/example_test.go | 5 +- 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 | 11 ++-- clientv3/integration/lease_test.go | 11 ++-- clientv3/integration/leasing_test.go | 10 ++-- clientv3/integration/logger_test.go | 3 +- clientv3/integration/main_test.go | 2 +- clientv3/integration/maintenance_test.go | 15 +++-- clientv3/integration/metrics_test.go | 9 ++- 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 | 9 ++- 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 | 13 ++--- clientv3/kv.go | 3 +- clientv3/lease.go | 5 +- clientv3/leasing/cache.go | 6 +- clientv3/leasing/kv.go | 11 ++-- clientv3/leasing/txn.go | 4 +- clientv3/leasing/util.go | 4 +- clientv3/logger.go | 3 +- clientv3/main_test.go | 4 +- clientv3/maintenance.go | 3 +- 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 | 3 +- clientv3/naming/grpc_test.go | 7 +-- 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 | 3 +- clientv3/ordering/util.go | 2 +- clientv3/ordering/util_test.go | 6 +- clientv3/retry.go | 5 +- clientv3/retry_interceptor.go | 2 +- clientv3/snapshot/member_test.go | 8 +-- clientv3/snapshot/v3_snapshot.go | 31 +++++------ clientv3/snapshot/v3_snapshot_test.go | 9 ++- clientv3/txn.go | 3 +- clientv3/txn_test.go | 2 +- clientv3/watch.go | 7 +-- clientv3/watch_test.go | 2 +- clientv3/yaml/config.go | 5 +- contrib/raftexample/httpapi.go | 2 +- contrib/raftexample/kvstore.go | 2 +- contrib/raftexample/main.go | 2 +- contrib/raftexample/raft.go | 19 +++---- 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 | 17 +++--- embed/config_logging.go | 3 +- embed/config_logging_journal_unix.go | 3 +- embed/config_test.go | 3 +- embed/doc.go | 2 +- embed/etcd.go | 25 ++++----- embed/serve.go | 27 +++++---- embed/serve_test.go | 2 +- embed/util.go | 2 +- etcdctl/ctlv2/command/auth_commands.go | 2 +- etcdctl/ctlv2/command/backup_command.go | 19 +++---- etcdctl/ctlv2/command/cluster_health.go | 3 +- etcdctl/ctlv2/command/error.go | 2 +- etcdctl/ctlv2/command/exec_watch_command.go | 3 +- 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 | 5 +- etcdctl/ctlv2/command/watch_command.go | 3 +- etcdctl/ctlv2/ctl.go | 5 +- etcdctl/ctlv3/command/alarm_command.go | 2 +- etcdctl/ctlv3/command/auth_command.go | 2 +- etcdctl/ctlv3/command/check.go | 5 +- 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 | 5 +- etcdctl/ctlv3/command/ep_command.go | 7 +-- etcdctl/ctlv3/command/error.go | 2 +- etcdctl/ctlv3/command/get_command.go | 2 +- etcdctl/ctlv3/command/global.go | 9 ++- etcdctl/ctlv3/command/lease_command.go | 3 +- etcdctl/ctlv3/command/lock_command.go | 5 +- etcdctl/ctlv3/command/make_mirror_command.go | 9 ++- etcdctl/ctlv3/command/member_command.go | 2 +- etcdctl/ctlv3/command/migrate_command.go | 33 ++++++----- etcdctl/ctlv3/command/move_leader_command.go | 2 +- etcdctl/ctlv3/command/printer.go | 7 +-- 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 | 5 +- etcdctl/ctlv3/command/put_command.go | 2 +- etcdctl/ctlv3/command/role_command.go | 2 +- etcdctl/ctlv3/command/snapshot_command.go | 3 +- etcdctl/ctlv3/command/txn_command.go | 5 +- etcdctl/ctlv3/command/util.go | 5 +- etcdctl/ctlv3/command/version_command.go | 3 +- etcdctl/ctlv3/command/watch_command.go | 3 +- etcdctl/ctlv3/ctl.go | 3 +- etcdctl/ctlv3/ctl_cov.go | 2 +- etcdctl/ctlv3/ctl_nocov.go | 2 +- etcdctl/ctlv3/help.go | 3 +- etcdctl/main.go | 4 +- etcdmain/config.go | 9 ++- etcdmain/config_test.go | 2 +- etcdmain/etcd.go | 23 ++++---- etcdmain/gateway.go | 3 +- etcdmain/grpc_proxy.go | 23 ++++---- etcdmain/help.go | 2 +- etcdmain/util.go | 5 +- etcdserver/api/capability.go | 5 +- etcdserver/api/cluster.go | 5 +- etcdserver/api/etcdhttp/base.go | 13 ++--- etcdserver/api/etcdhttp/metrics.go | 7 +-- etcdserver/api/etcdhttp/peer.go | 13 ++--- etcdserver/api/etcdhttp/peer_test.go | 15 +++-- etcdserver/api/etcdhttp/version_test.go | 2 +- etcdserver/api/membership/cluster.go | 15 +++-- etcdserver/api/membership/cluster_test.go | 11 ++-- etcdserver/api/membership/errors.go | 2 +- etcdserver/api/membership/member.go | 2 +- etcdserver/api/membership/member_test.go | 2 +- etcdserver/api/membership/store.go | 7 +-- etcdserver/api/rafthttp/coder.go | 2 +- etcdserver/api/rafthttp/functional_test.go | 8 +-- etcdserver/api/rafthttp/http.go | 11 ++-- etcdserver/api/rafthttp/http_test.go | 11 ++-- 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 | 11 ++-- etcdserver/api/rafthttp/peer_status.go | 3 +- etcdserver/api/rafthttp/peer_test.go | 2 +- etcdserver/api/rafthttp/pipeline.go | 11 ++-- etcdserver/api/rafthttp/pipeline_test.go | 11 ++-- etcdserver/api/rafthttp/remote.go | 5 +- etcdserver/api/rafthttp/snapshot_sender.go | 11 ++-- etcdserver/api/rafthttp/snapshot_test.go | 7 +-- etcdserver/api/rafthttp/stream.go | 13 ++--- etcdserver/api/rafthttp/stream_test.go | 11 ++-- etcdserver/api/rafthttp/transport.go | 15 +++-- .../api/rafthttp/transport_bench_test.go | 8 +-- etcdserver/api/rafthttp/transport_test.go | 9 ++- etcdserver/api/rafthttp/urlpick.go | 2 +- etcdserver/api/rafthttp/urlpick_test.go | 2 +- etcdserver/api/rafthttp/util.go | 7 +-- etcdserver/api/rafthttp/util_test.go | 5 +- etcdserver/api/snap/db.go | 3 +- etcdserver/api/snap/message.go | 4 +- etcdserver/api/snap/snapshotter.go | 11 ++-- etcdserver/api/snap/snapshotter_test.go | 3 +- etcdserver/api/v2auth/auth.go | 9 ++- etcdserver/api/v2auth/auth_requests.go | 7 +-- etcdserver/api/v2auth/auth_test.go | 9 ++- etcdserver/api/v2discovery/discovery.go | 7 +-- etcdserver/api/v2discovery/discovery_test.go | 6 +- etcdserver/api/v2http/capability.go | 4 +- etcdserver/api/v2http/client.go | 23 ++++---- etcdserver/api/v2http/client_auth.go | 7 +-- etcdserver/api/v2http/client_auth_test.go | 5 +- etcdserver/api/v2http/client_test.go | 21 ++++--- etcdserver/api/v2http/http.go | 9 ++- etcdserver/api/v2http/http_test.go | 13 ++--- etcdserver/api/v2http/httptypes/member.go | 2 +- .../api/v2http/httptypes/member_test.go | 2 +- etcdserver/api/v2http/metrics.go | 10 ++-- 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 | 3 +- etcdserver/api/v2store/node_extern_test.go | 2 +- etcdserver/api/v2store/stats_test.go | 2 +- etcdserver/api/v2store/store.go | 5 +- etcdserver/api/v2store/store_test.go | 6 +- etcdserver/api/v2store/store_ttl_test.go | 5 +- etcdserver/api/v2store/store_v2_test.go | 4 +- etcdserver/api/v2store/store_v2v3_test.go | 9 ++- etcdserver/api/v2store/watcher_hub.go | 2 +- etcdserver/api/v2v3/cluster.go | 5 +- etcdserver/api/v2v3/server.go | 13 ++--- etcdserver/api/v2v3/store.go | 10 ++-- etcdserver/api/v2v3/watcher.go | 6 +- etcdserver/api/v3alarm/alarms.go | 7 +-- etcdserver/api/v3client/doc.go | 4 +- etcdserver/api/v3client/v3client.go | 8 +-- etcdserver/api/v3compactor/compactor.go | 3 +- etcdserver/api/v3compactor/compactor_test.go | 4 +- etcdserver/api/v3compactor/periodic.go | 5 +- etcdserver/api/v3compactor/periodic_test.go | 5 +- etcdserver/api/v3compactor/revision.go | 5 +- etcdserver/api/v3compactor/revision_test.go | 5 +- etcdserver/api/v3election/election.go | 6 +- .../v3electionpb/gw/v3election.pb.gw.go | 2 +- .../v3election/v3electionpb/v3election.pb.go | 15 ++--- etcdserver/api/v3lock/lock.go | 6 +- .../api/v3lock/v3lockpb/gw/v3lock.pb.gw.go | 2 +- etcdserver/api/v3lock/v3lockpb/v3lock.pb.go | 12 +--- etcdserver/api/v3rpc/auth.go | 4 +- etcdserver/api/v3rpc/grpc.go | 5 +- etcdserver/api/v3rpc/header.go | 4 +- etcdserver/api/v3rpc/interceptor.go | 13 ++--- etcdserver/api/v3rpc/key.go | 9 ++- etcdserver/api/v3rpc/lease.go | 9 ++- etcdserver/api/v3rpc/maintenance.go | 17 +++--- etcdserver/api/v3rpc/member.go | 12 ++-- etcdserver/api/v3rpc/quota.go | 8 +-- etcdserver/api/v3rpc/util.go | 15 +++-- etcdserver/api/v3rpc/util_test.go | 5 +- etcdserver/api/v3rpc/watch.go | 13 ++--- etcdserver/api/v3rpc/watch_test.go | 4 +- etcdserver/apply.go | 13 ++--- etcdserver/apply_auth.go | 8 +-- etcdserver/apply_v2.go | 9 ++- etcdserver/backend.go | 11 ++-- etcdserver/cluster_util.go | 7 +-- etcdserver/cluster_util_test.go | 5 +- etcdserver/config.go | 7 +-- etcdserver/config_test.go | 7 +-- etcdserver/corrupt.go | 11 ++-- etcdserver/etcdserverpb/gw/rpc.pb.gw.go | 2 +- etcdserver/etcdserverpb/rpc.pb.go | 15 ++--- etcdserver/metrics.go | 5 +- etcdserver/quota.go | 3 +- etcdserver/raft.go | 23 ++++---- etcdserver/raft_test.go | 13 ++--- etcdserver/server.go | 55 +++++++++---------- etcdserver/server_test.go | 39 +++++++------ etcdserver/snapshot_merge.go | 7 +-- etcdserver/storage.go | 15 +++-- etcdserver/util.go | 9 ++- etcdserver/util_test.go | 11 ++-- etcdserver/v2_server.go | 4 +- etcdserver/v3_server.go | 15 +++-- functional/agent/handler.go | 9 ++- functional/agent/server.go | 7 +-- functional/agent/utils.go | 2 +- functional/cmd/etcd-agent/main.go | 3 +- functional/cmd/etcd-proxy/main.go | 3 +- functional/cmd/etcd-runner/main.go | 2 +- functional/cmd/etcd-tester/main.go | 3 +- functional/rpcpb/etcd_config.go | 6 +- functional/rpcpb/etcd_config_test.go | 4 +- functional/rpcpb/member.go | 9 ++- functional/runner/election_command.go | 3 +- functional/runner/error.go | 2 +- functional/runner/global.go | 3 +- functional/runner/help.go | 3 +- functional/runner/lease_renewer_command.go | 3 +- functional/runner/lock_racer_command.go | 3 +- functional/runner/watch_command.go | 5 +- functional/tester/case.go | 3 +- 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 | 3 +- functional/tester/case_no_fail.go | 3 +- functional/tester/case_sigquit_remove.go | 5 +- .../tester/case_sigquit_remove_quorum.go | 5 +- functional/tester/case_sigterm.go | 2 +- functional/tester/checker.go | 2 +- functional/tester/checker_kv_hash.go | 3 +- functional/tester/checker_lease_expire.go | 7 +-- functional/tester/checker_no_check.go | 2 +- functional/tester/checker_runner.go | 2 +- functional/tester/cluster.go | 7 +-- functional/tester/cluster_read_config.go | 3 +- functional/tester/cluster_run.go | 5 +- functional/tester/cluster_test.go | 3 +- functional/tester/stresser.go | 3 +- functional/tester/stresser_key.go | 11 ++-- functional/tester/stresser_lease.go | 7 +-- functional/tester/stresser_runner.go | 3 +- integration/bridge.go | 2 +- integration/cluster.go | 39 +++++++------ integration/cluster_direct.go | 8 +-- integration/cluster_proxy.go | 8 +-- integration/cluster_test.go | 6 +- integration/embed_test.go | 4 +- integration/logger_test.go | 3 +- 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 | 11 ++-- 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 | 7 +-- integration/v3_grpc_test.go | 11 ++-- integration/v3_health_test.go | 3 +- integration/v3_leadership_test.go | 6 +- integration/v3_lease_test.go | 9 ++- integration/v3_lock_test.go | 10 ++-- integration/v3_queue_test.go | 2 +- integration/v3_stm_test.go | 6 +- integration/v3_tls_test.go | 5 +- 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 | 10 +--- 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 | 9 ++- mvcc/kv_view.go | 2 +- mvcc/kvstore.go | 9 ++- mvcc/kvstore_bench_test.go | 5 +- mvcc/kvstore_compaction_test.go | 4 +- mvcc/kvstore_test.go | 11 ++-- 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 | 5 +- mvcc/watchable_store_test.go | 6 +- mvcc/watchable_store_txn.go | 2 +- mvcc/watcher.go | 2 +- mvcc/watcher_bench_test.go | 5 +- 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 | 3 +- pkg/logutil/package_logger_test.go | 3 +- pkg/logutil/zap_journal.go | 3 +- pkg/logutil/zap_raft.go | 3 +- pkg/mock/mockserver/mockserver.go | 3 +- 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 | 3 +- pkg/netutil/routes_linux.go | 2 +- pkg/proxy/server.go | 3 +- pkg/proxy/server_test.go | 3 +- pkg/srv/srv.go | 2 +- pkg/srv/srv_test.go | 2 +- pkg/testutil/leak.go | 6 +- pkg/transport/listener.go | 3 +- pkg/types/urls_test.go | 2 +- pkg/types/urlsmap_test.go | 3 +- .../grpcproxy/adapter/auth_client_adapter.go | 3 +- .../adapter/cluster_client_adapter.go | 3 +- .../adapter/election_client_adapter.go | 3 +- proxy/grpcproxy/adapter/kv_client_adapter.go | 3 +- .../grpcproxy/adapter/lease_client_adapter.go | 3 +- .../grpcproxy/adapter/lock_client_adapter.go | 3 +- .../adapter/maintenance_client_adapter.go | 3 +- .../grpcproxy/adapter/watch_client_adapter.go | 2 +- proxy/grpcproxy/auth.go | 4 +- proxy/grpcproxy/cache/store.go | 6 +- proxy/grpcproxy/cluster.go | 9 ++- proxy/grpcproxy/cluster_test.go | 9 ++- proxy/grpcproxy/election.go | 4 +- proxy/grpcproxy/health.go | 6 +- proxy/grpcproxy/kv.go | 6 +- proxy/grpcproxy/kv_test.go | 9 ++- proxy/grpcproxy/leader.go | 3 +- proxy/grpcproxy/lease.go | 7 +-- proxy/grpcproxy/lock.go | 4 +- proxy/grpcproxy/maintenance.go | 4 +- proxy/grpcproxy/metrics.go | 2 +- proxy/grpcproxy/register.go | 7 +-- proxy/grpcproxy/register_test.go | 9 ++- proxy/grpcproxy/util.go | 3 +- proxy/grpcproxy/watch.go | 9 ++- 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 | 4 +- 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 | 5 +- 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 | 9 ++- tools/benchmark/cmd/lease.go | 5 +- tools/benchmark/cmd/mvcc-put.go | 5 +- tools/benchmark/cmd/mvcc.go | 10 ++-- tools/benchmark/cmd/put.go | 5 +- tools/benchmark/cmd/range.go | 5 +- tools/benchmark/cmd/root.go | 3 +- tools/benchmark/cmd/stm.go | 9 ++- tools/benchmark/cmd/txn_put.go | 5 +- tools/benchmark/cmd/util.go | 4 +- tools/benchmark/cmd/watch.go | 5 +- tools/benchmark/cmd/watch_get.go | 5 +- tools/benchmark/cmd/watch_latency.go | 5 +- tools/benchmark/main.go | 2 +- tools/etcd-dump-db/backend.go | 9 ++- tools/etcd-dump-logs/etcd-dump-log_test.go | 12 ++-- tools/etcd-dump-logs/main.go | 15 +++-- tools/etcd-dump-metrics/etcd.go | 5 +- tools/etcd-dump-metrics/install_darwin.go | 2 +- tools/etcd-dump-metrics/install_linux.go | 2 +- tools/etcd-dump-metrics/main.go | 3 +- tools/etcd-dump-metrics/metrics.go | 3 +- wal/decoder.go | 8 +-- wal/encoder.go | 6 +- wal/file_pipeline.go | 3 +- wal/record_test.go | 2 +- wal/repair.go | 5 +- wal/repair_test.go | 5 +- wal/util.go | 3 +- wal/wal.go | 11 ++-- wal/wal_bench_test.go | 3 +- wal/wal_test.go | 9 ++- 536 files changed, 1371 insertions(+), 1633 deletions(-) diff --git a/auth/range_perm_cache.go b/auth/range_perm_cache.go index 8de2d175c25..d3630f52978 100644 --- a/auth/range_perm_cache.go +++ b/auth/range_perm_cache.go @@ -15,10 +15,9 @@ package auth import ( - "go.etcd.io/etcd/auth/authpb" - "go.etcd.io/etcd/mvcc/backend" - "go.etcd.io/etcd/pkg/adt" - + "go.etcd.io/etcd/v3/auth/authpb" + "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/v3/pkg/adt" "go.uber.org/zap" ) diff --git a/auth/range_perm_cache_test.go b/auth/range_perm_cache_test.go index e5baa86b40c..73ff5de3993 100644 --- a/auth/range_perm_cache_test.go +++ b/auth/range_perm_cache_test.go @@ -17,9 +17,8 @@ package auth import ( "testing" - "go.etcd.io/etcd/auth/authpb" - "go.etcd.io/etcd/pkg/adt" - + "go.etcd.io/etcd/v3/auth/authpb" + "go.etcd.io/etcd/v3/pkg/adt" "go.uber.org/zap" ) diff --git a/auth/store.go b/auth/store.go index 2e95e0c165b..1759f68abb5 100644 --- a/auth/store.go +++ b/auth/store.go @@ -24,12 +24,11 @@ import ( "sync" "sync/atomic" - "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.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.uber.org/zap" "golang.org/x/crypto/bcrypt" "google.golang.org/grpc/credentials" diff --git a/auth/store_test.go b/auth/store_test.go index 67e50f23ff6..8239b5020dc 100644 --- a/auth/store_test.go +++ b/auth/store_test.go @@ -24,11 +24,10 @@ import ( "testing" "time" - "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.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.uber.org/zap" "golang.org/x/crypto/bcrypt" "google.golang.org/grpc/metadata" diff --git a/client/client.go b/client/client.go index 6f1270f8a2a..12f79fc8cc8 100644 --- a/client/client.go +++ b/client/client.go @@ -29,7 +29,7 @@ import ( "sync" "time" - "go.etcd.io/etcd/version" + "go.etcd.io/etcd/v3/version" ) var ( diff --git a/client/client_test.go b/client/client_test.go index 2b4ae4d82a9..d3dae820390 100644 --- a/client/client_test.go +++ b/client/client_test.go @@ -29,8 +29,8 @@ import ( "testing" "time" - "go.etcd.io/etcd/pkg/testutil" - "go.etcd.io/etcd/version" + "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/v3/version" ) type actionAssertingHTTPClient struct { diff --git a/client/discover.go b/client/discover.go index 580c25626c9..7b9868b7fc0 100644 --- a/client/discover.go +++ b/client/discover.go @@ -15,7 +15,7 @@ package client import ( - "go.etcd.io/etcd/pkg/srv" + "go.etcd.io/etcd/v3/pkg/srv" ) // Discoverer is an interface that wraps the Discover method. diff --git a/client/doc.go b/client/doc.go index abe5199c319..0337e701bd9 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/client" + "go.etcd.io/etcd/v3/client" ) cfg := client.Config{ diff --git a/client/example_keys_test.go b/client/example_keys_test.go index 84cbbe791c1..2dd69a27f77 100644 --- a/client/example_keys_test.go +++ b/client/example_keys_test.go @@ -20,7 +20,7 @@ import ( "log" "sort" - "go.etcd.io/etcd/client" + "go.etcd.io/etcd/v3/client" ) func ExampleKeysAPI_directory() { diff --git a/client/integration/client_test.go b/client/integration/client_test.go index 546b28f24ab..a83258be2b4 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/client" - "go.etcd.io/etcd/integration" - "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/v3/client" + "go.etcd.io/etcd/v3/integration" + "go.etcd.io/etcd/v3/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 c7362dde4fe..4dec98da4f8 100644 --- a/client/integration/main_test.go +++ b/client/integration/main_test.go @@ -8,7 +8,7 @@ import ( "os" "testing" - "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/v3/pkg/testutil" ) func TestMain(m *testing.M) { diff --git a/client/keys.go b/client/keys.go index d0350b8d2eb..b42d4ff7f69 100644 --- a/client/keys.go +++ b/client/keys.go @@ -19,12 +19,13 @@ import ( "encoding/json" "errors" "fmt" - "go.etcd.io/etcd/pkg/pathutil" "net/http" "net/url" "strconv" "strings" "time" + + "go.etcd.io/etcd/v3/pkg/pathutil" ) const ( diff --git a/client/main_test.go b/client/main_test.go index 1fec862e0f8..af5cbcd17e4 100644 --- a/client/main_test.go +++ b/client/main_test.go @@ -23,9 +23,9 @@ import ( "testing" "time" - "go.etcd.io/etcd/integration" - "go.etcd.io/etcd/pkg/testutil" - "go.etcd.io/etcd/pkg/transport" + "go.etcd.io/etcd/v3/integration" + "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/v3/pkg/transport" ) var exampleEndpoints []string diff --git a/client/members.go b/client/members.go index 657131ab0ce..6a87b1a2949 100644 --- a/client/members.go +++ b/client/members.go @@ -23,7 +23,7 @@ import ( "net/url" "path" - "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/v3/pkg/types" ) var ( diff --git a/client/members_test.go b/client/members_test.go index 9be03ae544b..c75e71d8f76 100644 --- a/client/members_test.go +++ b/client/members_test.go @@ -23,7 +23,7 @@ import ( "reflect" "testing" - "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/v3/pkg/types" ) func TestMembersAPIActionList(t *testing.T) { diff --git a/clientv3/auth.go b/clientv3/auth.go index 921f50f5e26..0b8dabb384a 100644 --- a/clientv3/auth.go +++ b/clientv3/auth.go @@ -19,8 +19,8 @@ import ( "fmt" "strings" - "go.etcd.io/etcd/auth/authpb" - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/v3/auth/authpb" + pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "google.golang.org/grpc" ) diff --git a/clientv3/balancer/balancer.go b/clientv3/balancer/balancer.go index 54c405b0a14..80d14c7fb4c 100644 --- a/clientv3/balancer/balancer.go +++ b/clientv3/balancer/balancer.go @@ -20,8 +20,7 @@ import ( "sync" "time" - "go.etcd.io/etcd/clientv3/balancer/picker" - + "go.etcd.io/etcd/v3/clientv3/balancer/picker" "go.uber.org/zap" "google.golang.org/grpc/balancer" "google.golang.org/grpc/connectivity" diff --git a/clientv3/balancer/balancer_test.go b/clientv3/balancer/balancer_test.go index c31ddbe45a1..37ea9cbc23a 100644 --- a/clientv3/balancer/balancer_test.go +++ b/clientv3/balancer/balancer_test.go @@ -21,11 +21,10 @@ import ( "testing" "time" - "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.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.uber.org/zap" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/clientv3/balancer/config.go b/clientv3/balancer/config.go index 0339a84d08f..b331838f17d 100644 --- a/clientv3/balancer/config.go +++ b/clientv3/balancer/config.go @@ -15,8 +15,7 @@ package balancer import ( - "go.etcd.io/etcd/clientv3/balancer/picker" - + "go.etcd.io/etcd/v3/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 186de7a36d6..a8c52ad5e65 100644 --- a/clientv3/balancer/grpc1.7-health_test.go +++ b/clientv3/balancer/grpc1.7-health_test.go @@ -22,9 +22,8 @@ import ( "testing" "time" - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" - "go.etcd.io/etcd/pkg/testutil" - + pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + "go.etcd.io/etcd/v3/pkg/testutil" "google.golang.org/grpc" ) diff --git a/clientv3/client.go b/clientv3/client.go index f078f6f8eeb..0f478068561 100644 --- a/clientv3/client.go +++ b/clientv3/client.go @@ -27,11 +27,11 @@ import ( "time" "github.com/google/uuid" - "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.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.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 47544a0da6c..834cee5741c 100644 --- a/clientv3/client_test.go +++ b/clientv3/client_test.go @@ -21,9 +21,8 @@ import ( "testing" "time" - "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" - "go.etcd.io/etcd/pkg/testutil" - + "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/v3/pkg/testutil" "google.golang.org/grpc" ) diff --git a/clientv3/clientv3util/example_key_test.go b/clientv3/clientv3util/example_key_test.go index a3506e90c54..7290b669859 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/clientv3" - "go.etcd.io/etcd/clientv3/clientv3util" + "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/clientv3/clientv3util" ) func ExampleKeyMissing() { diff --git a/clientv3/clientv3util/util.go b/clientv3/clientv3util/util.go index 8153f66f8c8..984938614f3 100644 --- a/clientv3/clientv3util/util.go +++ b/clientv3/clientv3util/util.go @@ -16,7 +16,7 @@ package clientv3util import ( - "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/v3/clientv3" ) // KeyExists returns a comparison operation that evaluates to true iff the given diff --git a/clientv3/cluster.go b/clientv3/cluster.go index ce97e5c85b8..595f269278f 100644 --- a/clientv3/cluster.go +++ b/clientv3/cluster.go @@ -17,9 +17,8 @@ package clientv3 import ( "context" - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" - "go.etcd.io/etcd/pkg/types" - + pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + "go.etcd.io/etcd/v3/pkg/types" "google.golang.org/grpc" ) diff --git a/clientv3/compact_op.go b/clientv3/compact_op.go index 5779713d3dd..b1b09708acb 100644 --- a/clientv3/compact_op.go +++ b/clientv3/compact_op.go @@ -15,7 +15,7 @@ package clientv3 import ( - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" ) // CompactOp represents a compact operation. diff --git a/clientv3/compact_op_test.go b/clientv3/compact_op_test.go index 991e47a154b..c4ddfc89e08 100644 --- a/clientv3/compact_op_test.go +++ b/clientv3/compact_op_test.go @@ -18,7 +18,7 @@ import ( "reflect" "testing" - "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" ) func TestCompactOp(t *testing.T) { diff --git a/clientv3/compare.go b/clientv3/compare.go index 01ed68e942a..149ab789364 100644 --- a/clientv3/compare.go +++ b/clientv3/compare.go @@ -15,7 +15,7 @@ package clientv3 import ( - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" ) type CompareTarget int diff --git a/clientv3/concurrency/election.go b/clientv3/concurrency/election.go index 2521db6ac04..5dadb2e1bf1 100644 --- a/clientv3/concurrency/election.go +++ b/clientv3/concurrency/election.go @@ -19,9 +19,9 @@ import ( "errors" "fmt" - v3 "go.etcd.io/etcd/clientv3" - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" - "go.etcd.io/etcd/mvcc/mvccpb" + v3 "go.etcd.io/etcd/v3/clientv3" + pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + "go.etcd.io/etcd/v3/mvcc/mvccpb" ) var ( diff --git a/clientv3/concurrency/election_test.go b/clientv3/concurrency/election_test.go index 0e45d91ed6a..a6e03241979 100644 --- a/clientv3/concurrency/election_test.go +++ b/clientv3/concurrency/election_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/clientv3/concurrency" + "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/clientv3/concurrency" ) func TestResumeElection(t *testing.T) { diff --git a/clientv3/concurrency/example_election_test.go b/clientv3/concurrency/example_election_test.go index 2514490fdf7..e0a1c3e6e09 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/clientv3" - "go.etcd.io/etcd/clientv3/concurrency" + "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/clientv3/concurrency" ) func ExampleElection_Campaign() { diff --git a/clientv3/concurrency/example_mutex_test.go b/clientv3/concurrency/example_mutex_test.go index a0463d5b57f..92ad1aff7e4 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/clientv3" - "go.etcd.io/etcd/clientv3/concurrency" + "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/clientv3/concurrency" ) func ExampleMutex_Lock() { diff --git a/clientv3/concurrency/example_stm_test.go b/clientv3/concurrency/example_stm_test.go index e0e946f1244..bdcfab4a13d 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/clientv3" - "go.etcd.io/etcd/clientv3/concurrency" + "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/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 e4cf7751740..684019ac5ad 100644 --- a/clientv3/concurrency/key.go +++ b/clientv3/concurrency/key.go @@ -18,9 +18,9 @@ import ( "context" "fmt" - v3 "go.etcd.io/etcd/clientv3" - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" - "go.etcd.io/etcd/mvcc/mvccpb" + v3 "go.etcd.io/etcd/v3/clientv3" + pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + "go.etcd.io/etcd/v3/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 0d8b3a41f54..6ffeefddf86 100644 --- a/clientv3/concurrency/main_test.go +++ b/clientv3/concurrency/main_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" - "go.etcd.io/etcd/integration" - "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/v3/integration" + "go.etcd.io/etcd/v3/pkg/testutil" ) var endpoints []string diff --git a/clientv3/concurrency/mutex.go b/clientv3/concurrency/mutex.go index 013534193ea..30d122cdc47 100644 --- a/clientv3/concurrency/mutex.go +++ b/clientv3/concurrency/mutex.go @@ -19,8 +19,8 @@ import ( "fmt" "sync" - v3 "go.etcd.io/etcd/clientv3" - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + v3 "go.etcd.io/etcd/v3/clientv3" + pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" ) // Mutex implements the sync Locker interface with etcd diff --git a/clientv3/concurrency/session.go b/clientv3/concurrency/session.go index 598ec0e4ffd..04a34ed8acc 100644 --- a/clientv3/concurrency/session.go +++ b/clientv3/concurrency/session.go @@ -18,7 +18,7 @@ import ( "context" "time" - v3 "go.etcd.io/etcd/clientv3" + v3 "go.etcd.io/etcd/v3/clientv3" ) const defaultSessionTTL = 60 diff --git a/clientv3/concurrency/stm.go b/clientv3/concurrency/stm.go index ee1151079ab..908a4bed334 100644 --- a/clientv3/concurrency/stm.go +++ b/clientv3/concurrency/stm.go @@ -18,7 +18,7 @@ import ( "context" "math" - v3 "go.etcd.io/etcd/clientv3" + v3 "go.etcd.io/etcd/v3/clientv3" ) // STM is an interface for software transactional memory. diff --git a/clientv3/example_auth_test.go b/clientv3/example_auth_test.go index cabdeed60da..0ca4e693e3d 100644 --- a/clientv3/example_auth_test.go +++ b/clientv3/example_auth_test.go @@ -19,7 +19,7 @@ import ( "fmt" "log" - "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/v3/clientv3" ) func ExampleAuth() { diff --git a/clientv3/example_cluster_test.go b/clientv3/example_cluster_test.go index 6a9a7c2ac56..bb180782378 100644 --- a/clientv3/example_cluster_test.go +++ b/clientv3/example_cluster_test.go @@ -19,7 +19,7 @@ import ( "fmt" "log" - "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/v3/clientv3" ) func ExampleCluster_memberList() { diff --git a/clientv3/example_kv_test.go b/clientv3/example_kv_test.go index ae552583a97..61e0b45aa4b 100644 --- a/clientv3/example_kv_test.go +++ b/clientv3/example_kv_test.go @@ -19,8 +19,8 @@ import ( "fmt" "log" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" ) func ExampleKV_put() { diff --git a/clientv3/example_lease_test.go b/clientv3/example_lease_test.go index c065b7def20..5ddf5f6c3df 100644 --- a/clientv3/example_lease_test.go +++ b/clientv3/example_lease_test.go @@ -19,7 +19,7 @@ import ( "fmt" "log" - "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/v3/clientv3" ) func ExampleLease_grant() { diff --git a/clientv3/example_maintenance_test.go b/clientv3/example_maintenance_test.go index 58b10d0b66c..d345e3a7694 100644 --- a/clientv3/example_maintenance_test.go +++ b/clientv3/example_maintenance_test.go @@ -19,7 +19,7 @@ import ( "fmt" "log" - "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/v3/clientv3" ) func ExampleMaintenance_status() { diff --git a/clientv3/example_metrics_test.go b/clientv3/example_metrics_test.go index 5bee0c200a5..b7dc6b10c0e 100644 --- a/clientv3/example_metrics_test.go +++ b/clientv3/example_metrics_test.go @@ -23,10 +23,9 @@ import ( "net/http" "strings" - "go.etcd.io/etcd/clientv3" - grpcprom "github.com/grpc-ecosystem/go-grpc-prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" + "go.etcd.io/etcd/v3/clientv3" "google.golang.org/grpc" ) diff --git a/clientv3/example_test.go b/clientv3/example_test.go index 453f8c91654..f27114eccae 100644 --- a/clientv3/example_test.go +++ b/clientv3/example_test.go @@ -20,9 +20,8 @@ import ( "os" "time" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/pkg/transport" - + "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/pkg/transport" "google.golang.org/grpc/grpclog" ) diff --git a/clientv3/example_watch_test.go b/clientv3/example_watch_test.go index 313514fbd3f..eceaa6c64ac 100644 --- a/clientv3/example_watch_test.go +++ b/clientv3/example_watch_test.go @@ -19,7 +19,7 @@ import ( "fmt" "log" - "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/v3/clientv3" ) func ExampleWatcher_watch() { diff --git a/clientv3/integration/black_hole_test.go b/clientv3/integration/black_hole_test.go index 0ff3f73f14f..26cf3a3a0e5 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/clientv3" - "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" - "go.etcd.io/etcd/integration" - "go.etcd.io/etcd/pkg/testutil" + "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" "google.golang.org/grpc" ) diff --git a/clientv3/integration/cluster_test.go b/clientv3/integration/cluster_test.go index 9c02b7163d6..95825827000 100644 --- a/clientv3/integration/cluster_test.go +++ b/clientv3/integration/cluster_test.go @@ -21,9 +21,9 @@ import ( "testing" "time" - "go.etcd.io/etcd/integration" - "go.etcd.io/etcd/pkg/testutil" - "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/v3/integration" + "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/v3/pkg/types" ) func TestMemberList(t *testing.T) { diff --git a/clientv3/integration/dial_test.go b/clientv3/integration/dial_test.go index 5814afbd0d4..ecf1a05dcb3 100644 --- a/clientv3/integration/dial_test.go +++ b/clientv3/integration/dial_test.go @@ -21,11 +21,11 @@ import ( "testing" "time" - "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" + "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" "google.golang.org/grpc" ) diff --git a/clientv3/integration/kv_test.go b/clientv3/integration/kv_test.go index 3a461d6d8bd..c826924252a 100644 --- a/clientv3/integration/kv_test.go +++ b/clientv3/integration/kv_test.go @@ -23,12 +23,11 @@ import ( "testing" "time" - "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" - + "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" "google.golang.org/grpc" "google.golang.org/grpc/codes" ) diff --git a/clientv3/integration/lease_test.go b/clientv3/integration/lease_test.go index 6fd8f4306aa..c4bbaabb98f 100644 --- a/clientv3/integration/lease_test.go +++ b/clientv3/integration/lease_test.go @@ -22,12 +22,11 @@ import ( "testing" "time" - "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" - + "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" "google.golang.org/grpc" ) diff --git a/clientv3/integration/leasing_test.go b/clientv3/integration/leasing_test.go index 5c4bab1cf4d..12edff0f51b 100644 --- a/clientv3/integration/leasing_test.go +++ b/clientv3/integration/leasing_test.go @@ -23,11 +23,11 @@ import ( "testing" "time" - "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" + "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" ) func TestLeasingPutGet(t *testing.T) { diff --git a/clientv3/integration/logger_test.go b/clientv3/integration/logger_test.go index f36664ec76c..f9b2aeebd3b 100644 --- a/clientv3/integration/logger_test.go +++ b/clientv3/integration/logger_test.go @@ -17,8 +17,7 @@ package integration import ( "io/ioutil" - "go.etcd.io/etcd/clientv3" - + "go.etcd.io/etcd/v3/clientv3" "google.golang.org/grpc/grpclog" ) diff --git a/clientv3/integration/main_test.go b/clientv3/integration/main_test.go index c7362dde4fe..4dec98da4f8 100644 --- a/clientv3/integration/main_test.go +++ b/clientv3/integration/main_test.go @@ -8,7 +8,7 @@ import ( "os" "testing" - "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/v3/pkg/testutil" ) func TestMain(m *testing.M) { diff --git a/clientv3/integration/maintenance_test.go b/clientv3/integration/maintenance_test.go index 4fecaf812f6..da18c8264e3 100644 --- a/clientv3/integration/maintenance_test.go +++ b/clientv3/integration/maintenance_test.go @@ -24,16 +24,15 @@ 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/lease" + "go.etcd.io/etcd/v3/mvcc" + "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/v3/pkg/testutil" "go.uber.org/zap" "google.golang.org/grpc" - - "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 1b73af9d78d..e1f95971c29 100644 --- a/clientv3/integration/metrics_test.go +++ b/clientv3/integration/metrics_test.go @@ -25,13 +25,12 @@ import ( "testing" "time" - "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" + "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" "google.golang.org/grpc" ) diff --git a/clientv3/integration/mirror_test.go b/clientv3/integration/mirror_test.go index 46b312ff9f5..ae715510c0a 100644 --- a/clientv3/integration/mirror_test.go +++ b/clientv3/integration/mirror_test.go @@ -22,10 +22,10 @@ import ( "testing" "time" - "go.etcd.io/etcd/clientv3/mirror" - "go.etcd.io/etcd/integration" - "go.etcd.io/etcd/mvcc/mvccpb" - "go.etcd.io/etcd/pkg/testutil" + "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" ) func TestMirrorSync(t *testing.T) { diff --git a/clientv3/integration/namespace_test.go b/clientv3/integration/namespace_test.go index 3f4344d22a3..959f419e8a8 100644 --- a/clientv3/integration/namespace_test.go +++ b/clientv3/integration/namespace_test.go @@ -19,11 +19,11 @@ import ( "reflect" "testing" - "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" + "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" ) func TestNamespacePutGet(t *testing.T) { diff --git a/clientv3/integration/network_partition_test.go b/clientv3/integration/network_partition_test.go index b006f6fe93d..2787b4c542b 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/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" + "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" "google.golang.org/grpc" ) diff --git a/clientv3/integration/role_test.go b/clientv3/integration/role_test.go index cc779575a30..f790738f1ae 100644 --- a/clientv3/integration/role_test.go +++ b/clientv3/integration/role_test.go @@ -18,9 +18,9 @@ import ( "context" "testing" - "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" - "go.etcd.io/etcd/integration" - "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/v3/integration" + "go.etcd.io/etcd/v3/pkg/testutil" ) func TestRoleError(t *testing.T) { diff --git a/clientv3/integration/server_shutdown_test.go b/clientv3/integration/server_shutdown_test.go index f7ce58c3672..6605a782aef 100644 --- a/clientv3/integration/server_shutdown_test.go +++ b/clientv3/integration/server_shutdown_test.go @@ -21,11 +21,10 @@ import ( "testing" "time" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" - "go.etcd.io/etcd/integration" - "go.etcd.io/etcd/pkg/testutil" - + "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" "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 af994adbe95..f26a635446e 100644 --- a/clientv3/integration/txn_test.go +++ b/clientv3/integration/txn_test.go @@ -20,11 +20,11 @@ import ( "testing" "time" - "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" + "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" ) func TestTxnError(t *testing.T) { diff --git a/clientv3/integration/user_test.go b/clientv3/integration/user_test.go index cff6c58bf17..bda3c2475ac 100644 --- a/clientv3/integration/user_test.go +++ b/clientv3/integration/user_test.go @@ -19,10 +19,10 @@ import ( "testing" "time" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" - "go.etcd.io/etcd/integration" - "go.etcd.io/etcd/pkg/testutil" + "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" "google.golang.org/grpc" ) diff --git a/clientv3/integration/util.go b/clientv3/integration/util.go index 939c7884e17..12e0fd1e520 100644 --- a/clientv3/integration/util.go +++ b/clientv3/integration/util.go @@ -19,7 +19,7 @@ import ( "testing" "time" - "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/v3/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 e22540d9e16..34ec3049b7a 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/clientv3" - "go.etcd.io/etcd/integration" - "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/integration" + "go.etcd.io/etcd/v3/pkg/testutil" ) // TestWatchFragmentDisable ensures that large watch diff --git a/clientv3/integration/watch_test.go b/clientv3/integration/watch_test.go index bf751d6793b..658b12f617d 100644 --- a/clientv3/integration/watch_test.go +++ b/clientv3/integration/watch_test.go @@ -23,13 +23,12 @@ import ( "testing" "time" - "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" - + "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" "google.golang.org/grpc/metadata" ) diff --git a/clientv3/kv.go b/clientv3/kv.go index 2b7864ad8b0..42793911d46 100644 --- a/clientv3/kv.go +++ b/clientv3/kv.go @@ -17,8 +17,7 @@ package clientv3 import ( "context" - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" - + pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "google.golang.org/grpc" ) diff --git a/clientv3/lease.go b/clientv3/lease.go index c2796fc969a..b7db8433cf2 100644 --- a/clientv3/lease.go +++ b/clientv3/lease.go @@ -19,9 +19,8 @@ import ( "sync" "time" - "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" - + "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "go.uber.org/zap" "google.golang.org/grpc" "google.golang.org/grpc/metadata" diff --git a/clientv3/leasing/cache.go b/clientv3/leasing/cache.go index f4870c1fb2f..541a43d1de2 100644 --- a/clientv3/leasing/cache.go +++ b/clientv3/leasing/cache.go @@ -20,9 +20,9 @@ import ( "sync" "time" - v3 "go.etcd.io/etcd/clientv3" - v3pb "go.etcd.io/etcd/etcdserver/etcdserverpb" - "go.etcd.io/etcd/mvcc/mvccpb" + v3 "go.etcd.io/etcd/v3/clientv3" + v3pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + "go.etcd.io/etcd/v3/mvcc/mvccpb" ) const revokeBackoff = 2 * time.Second diff --git a/clientv3/leasing/kv.go b/clientv3/leasing/kv.go index ecfaedfc2de..738c4f62eda 100644 --- a/clientv3/leasing/kv.go +++ b/clientv3/leasing/kv.go @@ -20,12 +20,11 @@ import ( "sync" "time" - 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" - + 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" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/clientv3/leasing/txn.go b/clientv3/leasing/txn.go index 96703ecc6aa..a9e4ed4a692 100644 --- a/clientv3/leasing/txn.go +++ b/clientv3/leasing/txn.go @@ -18,8 +18,8 @@ import ( "context" "strings" - v3 "go.etcd.io/etcd/clientv3" - v3pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + v3 "go.etcd.io/etcd/v3/clientv3" + v3pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" ) type txnLeasing struct { diff --git a/clientv3/leasing/util.go b/clientv3/leasing/util.go index f4f9a372e5d..f72e1bcf464 100644 --- a/clientv3/leasing/util.go +++ b/clientv3/leasing/util.go @@ -17,8 +17,8 @@ package leasing import ( "bytes" - v3 "go.etcd.io/etcd/clientv3" - v3pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + v3 "go.etcd.io/etcd/v3/clientv3" + v3pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" ) func compareInt64(a, b int64) int { diff --git a/clientv3/logger.go b/clientv3/logger.go index f5ae0109dad..e6fda0b32a6 100644 --- a/clientv3/logger.go +++ b/clientv3/logger.go @@ -18,8 +18,7 @@ import ( "io/ioutil" "sync" - "go.etcd.io/etcd/pkg/logutil" - + "go.etcd.io/etcd/v3/pkg/logutil" "google.golang.org/grpc/grpclog" ) diff --git a/clientv3/main_test.go b/clientv3/main_test.go index 972abff1fb4..5b0f3923234 100644 --- a/clientv3/main_test.go +++ b/clientv3/main_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - "go.etcd.io/etcd/integration" - "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/v3/integration" + "go.etcd.io/etcd/v3/pkg/testutil" ) // TestMain sets up an etcd cluster if running the examples. diff --git a/clientv3/maintenance.go b/clientv3/maintenance.go index 744455a3b36..956cb8144d4 100644 --- a/clientv3/maintenance.go +++ b/clientv3/maintenance.go @@ -19,8 +19,7 @@ import ( "fmt" "io" - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" - + pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "google.golang.org/grpc" ) diff --git a/clientv3/mirror/syncer.go b/clientv3/mirror/syncer.go index e00af70ee51..38d6838bb65 100644 --- a/clientv3/mirror/syncer.go +++ b/clientv3/mirror/syncer.go @@ -18,7 +18,7 @@ package mirror import ( "context" - "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/v3/clientv3" ) const ( diff --git a/clientv3/namespace/kv.go b/clientv3/namespace/kv.go index aadeb6fd7eb..9899222a5a8 100644 --- a/clientv3/namespace/kv.go +++ b/clientv3/namespace/kv.go @@ -17,9 +17,9 @@ package namespace import ( "context" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" ) type kvPrefix struct { diff --git a/clientv3/namespace/lease.go b/clientv3/namespace/lease.go index fa210ee160c..f7596d0aa02 100644 --- a/clientv3/namespace/lease.go +++ b/clientv3/namespace/lease.go @@ -18,7 +18,7 @@ import ( "bytes" "context" - "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/v3/clientv3" ) type leasePrefix struct { diff --git a/clientv3/namespace/watch.go b/clientv3/namespace/watch.go index d5dfef54c7c..8dc28380a1d 100644 --- a/clientv3/namespace/watch.go +++ b/clientv3/namespace/watch.go @@ -18,7 +18,7 @@ import ( "context" "sync" - "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/v3/clientv3" ) type watcherPrefix struct { diff --git a/clientv3/naming/doc.go b/clientv3/naming/doc.go index b55cc49ad38..98987d8fd57 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/clientv3" -// etcdnaming "go.etcd.io/etcd/clientv3/naming" +// "go.etcd.io/etcd/v3/clientv3" +// etcdnaming "go.etcd.io/etcd/v3/clientv3/naming" // // "google.golang.org/grpc" // "google.golang.org/grpc/naming" diff --git a/clientv3/naming/grpc.go b/clientv3/naming/grpc.go index 7eed84bfb18..850b4527573 100644 --- a/clientv3/naming/grpc.go +++ b/clientv3/naming/grpc.go @@ -19,8 +19,7 @@ import ( "encoding/json" "fmt" - etcd "go.etcd.io/etcd/clientv3" - + etcd "go.etcd.io/etcd/v3/clientv3" "google.golang.org/grpc/codes" "google.golang.org/grpc/naming" "google.golang.org/grpc/status" diff --git a/clientv3/naming/grpc_test.go b/clientv3/naming/grpc_test.go index 66a1feae00b..c711b729493 100644 --- a/clientv3/naming/grpc_test.go +++ b/clientv3/naming/grpc_test.go @@ -20,10 +20,9 @@ import ( "reflect" "testing" - etcd "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/integration" - "go.etcd.io/etcd/pkg/testutil" - + etcd "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/integration" + "go.etcd.io/etcd/v3/pkg/testutil" "google.golang.org/grpc/naming" ) diff --git a/clientv3/op.go b/clientv3/op.go index 085dd28ab44..1041af4dca0 100644 --- a/clientv3/op.go +++ b/clientv3/op.go @@ -14,7 +14,7 @@ package clientv3 -import pb "go.etcd.io/etcd/etcdserver/etcdserverpb" +import pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" type opType int diff --git a/clientv3/op_test.go b/clientv3/op_test.go index 468893dd496..cb0feb59e6e 100644 --- a/clientv3/op_test.go +++ b/clientv3/op_test.go @@ -18,7 +18,7 @@ import ( "reflect" "testing" - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/v3/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 951bd10ab91..d62f2c8911c 100644 --- a/clientv3/ordering/kv.go +++ b/clientv3/ordering/kv.go @@ -18,7 +18,7 @@ import ( "context" "sync" - "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/v3/clientv3" ) // kvOrdering ensures that serialized requests do not return diff --git a/clientv3/ordering/kv_test.go b/clientv3/ordering/kv_test.go index 01a80fc52d2..e10db96934d 100644 --- a/clientv3/ordering/kv_test.go +++ b/clientv3/ordering/kv_test.go @@ -22,10 +22,10 @@ import ( "testing" "time" - "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/v3/clientv3" + pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + "go.etcd.io/etcd/v3/integration" + "go.etcd.io/etcd/v3/pkg/testutil" ) func TestDetectKvOrderViolation(t *testing.T) { diff --git a/clientv3/ordering/logger_test.go b/clientv3/ordering/logger_test.go index 6ee25f0044b..a4788768d3a 100644 --- a/clientv3/ordering/logger_test.go +++ b/clientv3/ordering/logger_test.go @@ -17,8 +17,7 @@ package ordering import ( "io/ioutil" - "go.etcd.io/etcd/clientv3" - + "go.etcd.io/etcd/v3/clientv3" "google.golang.org/grpc/grpclog" ) diff --git a/clientv3/ordering/util.go b/clientv3/ordering/util.go index f08740cb462..a321ede5505 100644 --- a/clientv3/ordering/util.go +++ b/clientv3/ordering/util.go @@ -19,7 +19,7 @@ import ( "sync" "time" - "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/v3/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 f903baae8b0..b75ad59005d 100644 --- a/clientv3/ordering/util_test.go +++ b/clientv3/ordering/util_test.go @@ -19,9 +19,9 @@ import ( "testing" "time" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/integration" - "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/integration" + "go.etcd.io/etcd/v3/pkg/testutil" ) func TestEndpointSwitchResolvesViolation(t *testing.T) { diff --git a/clientv3/retry.go b/clientv3/retry.go index 6da7abf475c..b83b2f2fe95 100644 --- a/clientv3/retry.go +++ b/clientv3/retry.go @@ -17,9 +17,8 @@ package clientv3 import ( "context" - "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" - + "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/clientv3/retry_interceptor.go b/clientv3/retry_interceptor.go index 65a518d09d3..cff367c9d61 100644 --- a/clientv3/retry_interceptor.go +++ b/clientv3/retry_interceptor.go @@ -23,7 +23,7 @@ import ( "sync" "time" - "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/v3/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 a42066a5637..1260eccdaa5 100644 --- a/clientv3/snapshot/member_test.go +++ b/clientv3/snapshot/member_test.go @@ -22,10 +22,10 @@ import ( "testing" "time" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/embed" - "go.etcd.io/etcd/etcdserver" - "go.etcd.io/etcd/pkg/testutil" + "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" ) // TestSnapshotV3RestoreMultiMemberAdd ensures that multiple members diff --git a/clientv3/snapshot/v3_snapshot.go b/clientv3/snapshot/v3_snapshot.go index 70f8c3a8d4a..c73e710f0b2 100644 --- a/clientv3/snapshot/v3_snapshot.go +++ b/clientv3/snapshot/v3_snapshot.go @@ -28,23 +28,22 @@ import ( "strings" "time" - "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.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.uber.org/zap" ) diff --git a/clientv3/snapshot/v3_snapshot_test.go b/clientv3/snapshot/v3_snapshot_test.go index 8d2ee9d6aaa..2955cdbb143 100644 --- a/clientv3/snapshot/v3_snapshot_test.go +++ b/clientv3/snapshot/v3_snapshot_test.go @@ -25,11 +25,10 @@ import ( "testing" "time" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/embed" - "go.etcd.io/etcd/pkg/fileutil" - "go.etcd.io/etcd/pkg/testutil" - + "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.uber.org/zap" ) diff --git a/clientv3/txn.go b/clientv3/txn.go index c19715da438..a4de75c822e 100644 --- a/clientv3/txn.go +++ b/clientv3/txn.go @@ -18,8 +18,7 @@ import ( "context" "sync" - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" - + pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "google.golang.org/grpc" ) diff --git a/clientv3/txn_test.go b/clientv3/txn_test.go index 46a4971ff90..3028b52bfe0 100644 --- a/clientv3/txn_test.go +++ b/clientv3/txn_test.go @@ -18,7 +18,7 @@ import ( "testing" "time" - "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/v3/pkg/testutil" ) func TestTxnPanics(t *testing.T) { diff --git a/clientv3/watch.go b/clientv3/watch.go index d50acbca32c..ab9f46a6779 100644 --- a/clientv3/watch.go +++ b/clientv3/watch.go @@ -21,10 +21,9 @@ import ( "sync" "time" - v3rpc "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" - mvccpb "go.etcd.io/etcd/mvcc/mvccpb" - + 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" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" diff --git a/clientv3/watch_test.go b/clientv3/watch_test.go index a22858bc7ec..2efe810769c 100644 --- a/clientv3/watch_test.go +++ b/clientv3/watch_test.go @@ -17,7 +17,7 @@ package clientv3 import ( "testing" - "go.etcd.io/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/v3/mvcc/mvccpb" ) func TestEvent(t *testing.T) { diff --git a/clientv3/yaml/config.go b/clientv3/yaml/config.go index dc3e246e277..040c62c8c89 100644 --- a/clientv3/yaml/config.go +++ b/clientv3/yaml/config.go @@ -20,10 +20,9 @@ import ( "crypto/x509" "io/ioutil" + "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/pkg/tlsutil" "sigs.k8s.io/yaml" - - "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 75f5d616fec..3e1c585b5af 100644 --- a/contrib/raftexample/httpapi.go +++ b/contrib/raftexample/httpapi.go @@ -20,7 +20,7 @@ import ( "net/http" "strconv" - "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/v3/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 b057501a40a..77e42594b54 100644 --- a/contrib/raftexample/kvstore.go +++ b/contrib/raftexample/kvstore.go @@ -21,7 +21,7 @@ import ( "log" "sync" - "go.etcd.io/etcd/etcdserver/api/snap" + "go.etcd.io/etcd/v3/etcdserver/api/snap" ) // a key-value store backed by raft diff --git a/contrib/raftexample/main.go b/contrib/raftexample/main.go index 6b6f064a34a..775ea7b99f7 100644 --- a/contrib/raftexample/main.go +++ b/contrib/raftexample/main.go @@ -18,7 +18,7 @@ import ( "flag" "strings" - "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/v3/raft/raftpb" ) func main() { diff --git a/contrib/raftexample/raft.go b/contrib/raftexample/raft.go index ca290388bcd..71e7ea70e03 100644 --- a/contrib/raftexample/raft.go +++ b/contrib/raftexample/raft.go @@ -24,16 +24,15 @@ import ( "strconv" "time" - "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.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.uber.org/zap" ) diff --git a/contrib/raftexample/raftexample_test.go b/contrib/raftexample/raftexample_test.go index 91c1f34f03d..7314289b029 100644 --- a/contrib/raftexample/raftexample_test.go +++ b/contrib/raftexample/raftexample_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/v3/raft/raftpb" ) type cluster struct { diff --git a/contrib/recipes/barrier.go b/contrib/recipes/barrier.go index 5ab4817c718..0f82b983361 100644 --- a/contrib/recipes/barrier.go +++ b/contrib/recipes/barrier.go @@ -17,8 +17,8 @@ package recipe import ( "context" - v3 "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/mvcc/mvccpb" + v3 "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/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 e0c02e67d3d..d97d0303f98 100644 --- a/contrib/recipes/client.go +++ b/contrib/recipes/client.go @@ -18,8 +18,8 @@ import ( "context" "errors" - v3 "go.etcd.io/etcd/clientv3" - spb "go.etcd.io/etcd/mvcc/mvccpb" + v3 "go.etcd.io/etcd/v3/clientv3" + spb "go.etcd.io/etcd/v3/mvcc/mvccpb" ) var ( diff --git a/contrib/recipes/double_barrier.go b/contrib/recipes/double_barrier.go index 90189ba7c9d..393b22a200e 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/clientv3" - "go.etcd.io/etcd/clientv3/concurrency" - "go.etcd.io/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/clientv3/concurrency" + "go.etcd.io/etcd/v3/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 891ff7d6949..3a634a3fbf5 100644 --- a/contrib/recipes/key.go +++ b/contrib/recipes/key.go @@ -20,8 +20,8 @@ import ( "strings" "time" - v3 "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/clientv3/concurrency" + v3 "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/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 4116a870269..cd7b9ecf097 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/clientv3" - "go.etcd.io/etcd/mvcc/mvccpb" + v3 "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/mvcc/mvccpb" ) // PriorityQueue implements a multi-reader, multi-writer distributed queue. diff --git a/contrib/recipes/queue.go b/contrib/recipes/queue.go index e374f000d65..ef609965b6e 100644 --- a/contrib/recipes/queue.go +++ b/contrib/recipes/queue.go @@ -17,8 +17,8 @@ package recipe import ( "context" - v3 "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/mvcc/mvccpb" + v3 "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/mvcc/mvccpb" ) // Queue implements a multi-reader, multi-writer distributed queue. diff --git a/contrib/recipes/rwmutex.go b/contrib/recipes/rwmutex.go index 97a24c7496e..6b3a96473fc 100644 --- a/contrib/recipes/rwmutex.go +++ b/contrib/recipes/rwmutex.go @@ -17,9 +17,9 @@ package recipe import ( "context" - v3 "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/clientv3/concurrency" - "go.etcd.io/etcd/mvcc/mvccpb" + v3 "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/clientv3/concurrency" + "go.etcd.io/etcd/v3/mvcc/mvccpb" ) type RWMutex struct { diff --git a/contrib/recipes/watch.go b/contrib/recipes/watch.go index f8c2ab772da..0ef394cd7ad 100644 --- a/contrib/recipes/watch.go +++ b/contrib/recipes/watch.go @@ -17,8 +17,8 @@ package recipe import ( "context" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/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 0480acae3a3..77e86e7333a 100644 --- a/embed/config.go +++ b/embed/config.go @@ -27,16 +27,15 @@ import ( "sync" "time" - "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.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.uber.org/zap" "go.uber.org/zap/zapcore" "golang.org/x/crypto/bcrypt" diff --git a/embed/config_logging.go b/embed/config_logging.go index bddaacabe5d..cacd3837682 100644 --- a/embed/config_logging.go +++ b/embed/config_logging.go @@ -23,9 +23,8 @@ import ( "reflect" "sync" - "go.etcd.io/etcd/pkg/logutil" - "github.com/coreos/pkg/capnslog" + "go.etcd.io/etcd/v3/pkg/logutil" "go.uber.org/zap" "go.uber.org/zap/zapcore" "google.golang.org/grpc" diff --git a/embed/config_logging_journal_unix.go b/embed/config_logging_journal_unix.go index 44a51d67708..2202817c49f 100644 --- a/embed/config_logging_journal_unix.go +++ b/embed/config_logging_journal_unix.go @@ -20,8 +20,7 @@ import ( "fmt" "os" - "go.etcd.io/etcd/pkg/logutil" - + "go.etcd.io/etcd/v3/pkg/logutil" "go.uber.org/zap/zapcore" ) diff --git a/embed/config_test.go b/embed/config_test.go index eacf181ba34..03247a380e5 100644 --- a/embed/config_test.go +++ b/embed/config_test.go @@ -22,8 +22,7 @@ import ( "testing" "time" - "go.etcd.io/etcd/pkg/transport" - + "go.etcd.io/etcd/v3/pkg/transport" "sigs.k8s.io/yaml" ) diff --git a/embed/doc.go b/embed/doc.go index 4811bb63430..d8aaf33f635 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/embed" + "go.etcd.io/etcd/v3/embed" ) func main() { diff --git a/embed/etcd.go b/embed/etcd.go index d32adbd1543..af77d4bca16 100644 --- a/embed/etcd.go +++ b/embed/etcd.go @@ -29,22 +29,21 @@ import ( "sync" "time" - "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" "github.com/soheilhy/cmux" + "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.uber.org/zap" "google.golang.org/grpc" "google.golang.org/grpc/keepalive" diff --git a/embed/serve.go b/embed/serve.go index 8e6e7b769a2..e842801b601 100644 --- a/embed/serve.go +++ b/embed/serve.go @@ -23,23 +23,22 @@ import ( "net/http" "strings" - "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" "github.com/tmc/grpc-websocket-proxy/wsproxy" + "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.uber.org/zap" "golang.org/x/net/trace" "google.golang.org/grpc" diff --git a/embed/serve_test.go b/embed/serve_test.go index 38856456792..d2a909d791a 100644 --- a/embed/serve_test.go +++ b/embed/serve_test.go @@ -19,7 +19,7 @@ import ( "os" "testing" - "go.etcd.io/etcd/auth" + "go.etcd.io/etcd/v3/auth" ) // TestStartEtcdWrongToken ensures that StartEtcd with wrong configs returns with error. diff --git a/embed/util.go b/embed/util.go index 40f3ce9d595..4d81640937b 100644 --- a/embed/util.go +++ b/embed/util.go @@ -17,7 +17,7 @@ package embed import ( "path/filepath" - "go.etcd.io/etcd/wal" + "go.etcd.io/etcd/v3/wal" ) func isMemberInitialized(cfg *Config) bool { diff --git a/etcdctl/ctlv2/command/auth_commands.go b/etcdctl/ctlv2/command/auth_commands.go index 75823b203d3..25ea55838a2 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/client" + "go.etcd.io/etcd/v3/client" ) func NewAuthCommands() cli.Command { diff --git a/etcdctl/ctlv2/command/backup_command.go b/etcdctl/ctlv2/command/backup_command.go index c6efa271178..d8cbe5275c6 100644 --- a/etcdctl/ctlv2/command/backup_command.go +++ b/etcdctl/ctlv2/command/backup_command.go @@ -23,18 +23,17 @@ import ( "regexp" "time" - "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" + "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.uber.org/zap" ) diff --git a/etcdctl/ctlv2/command/cluster_health.go b/etcdctl/ctlv2/command/cluster_health.go index bfe8d698f67..e0a21882153 100644 --- a/etcdctl/ctlv2/command/cluster_health.go +++ b/etcdctl/ctlv2/command/cluster_health.go @@ -24,9 +24,8 @@ import ( "os/signal" "time" - "go.etcd.io/etcd/client" - "github.com/urfave/cli" + "go.etcd.io/etcd/v3/client" ) func NewClusterHealthCommand() cli.Command { diff --git a/etcdctl/ctlv2/command/error.go b/etcdctl/ctlv2/command/error.go index ca4f1e9b8be..1035518ce35 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/client" + "go.etcd.io/etcd/v3/client" ) const ( diff --git a/etcdctl/ctlv2/command/exec_watch_command.go b/etcdctl/ctlv2/command/exec_watch_command.go index 4cc859820b3..697cd761566 100644 --- a/etcdctl/ctlv2/command/exec_watch_command.go +++ b/etcdctl/ctlv2/command/exec_watch_command.go @@ -22,9 +22,8 @@ import ( "os/exec" "os/signal" - "go.etcd.io/etcd/client" - "github.com/urfave/cli" + "go.etcd.io/etcd/v3/client" ) // NewExecWatchCommand returns the CLI command for "exec-watch". diff --git a/etcdctl/ctlv2/command/format.go b/etcdctl/ctlv2/command/format.go index 5e15554a172..b75fa256230 100644 --- a/etcdctl/ctlv2/command/format.go +++ b/etcdctl/ctlv2/command/format.go @@ -19,7 +19,7 @@ import ( "fmt" "os" - "go.etcd.io/etcd/client" + "go.etcd.io/etcd/v3/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 fa87498ce6e..19420d41103 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/client" + "go.etcd.io/etcd/v3/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 f81bcbf8a46..0b2047c716b 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/client" + "go.etcd.io/etcd/v3/client" ) func NewLsCommand() cli.Command { diff --git a/etcdctl/ctlv2/command/mk_command.go b/etcdctl/ctlv2/command/mk_command.go index 74d21c9f704..b0df56b1bf1 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/client" + "go.etcd.io/etcd/v3/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 04178a025a0..7ebeb59c32a 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/client" + "go.etcd.io/etcd/v3/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 86ade29f08e..9cae4808e94 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/client" + "go.etcd.io/etcd/v3/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 5565bf1fe4d..b46036d315c 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/client" + "go.etcd.io/etcd/v3/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 0a008a9e59c..6a5213d43f1 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/client" - "go.etcd.io/etcd/pkg/pathutil" + "go.etcd.io/etcd/v3/client" + "go.etcd.io/etcd/v3/pkg/pathutil" ) func NewRoleCommands() cli.Command { diff --git a/etcdctl/ctlv2/command/set_command.go b/etcdctl/ctlv2/command/set_command.go index 7eb5ae6a507..3ce9c481bf6 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/client" + "go.etcd.io/etcd/v3/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 a65f9223077..fc463133cca 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/client" + "go.etcd.io/etcd/v3/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 7c20fcb88b1..d5aa3026a6b 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/client" + "go.etcd.io/etcd/v3/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 3783d919d80..e5ed1b8e2a9 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/client" + "go.etcd.io/etcd/v3/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 73ebb4d5045..f509ec3c435 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/client" + "go.etcd.io/etcd/v3/client" ) func NewUserCommands() cli.Command { diff --git a/etcdctl/ctlv2/command/util.go b/etcdctl/ctlv2/command/util.go index c178abd9da2..8b994d8eb96 100644 --- a/etcdctl/ctlv2/command/util.go +++ b/etcdctl/ctlv2/command/util.go @@ -28,11 +28,10 @@ import ( "syscall" "time" - "go.etcd.io/etcd/client" - "go.etcd.io/etcd/pkg/transport" - "github.com/bgentry/speakeasy" "github.com/urfave/cli" + "go.etcd.io/etcd/v3/client" + "go.etcd.io/etcd/v3/pkg/transport" ) var ( diff --git a/etcdctl/ctlv2/command/watch_command.go b/etcdctl/ctlv2/command/watch_command.go index dc0fe2d1149..7df54d6613b 100644 --- a/etcdctl/ctlv2/command/watch_command.go +++ b/etcdctl/ctlv2/command/watch_command.go @@ -21,9 +21,8 @@ import ( "os" "os/signal" - "go.etcd.io/etcd/client" - "github.com/urfave/cli" + "go.etcd.io/etcd/v3/client" ) // NewWatchCommand returns the CLI command for "watch". diff --git a/etcdctl/ctlv2/ctl.go b/etcdctl/ctlv2/ctl.go index 9cbf0c55acc..34450de3865 100644 --- a/etcdctl/ctlv2/ctl.go +++ b/etcdctl/ctlv2/ctl.go @@ -20,10 +20,9 @@ import ( "os" "time" - "go.etcd.io/etcd/etcdctl/ctlv2/command" - "go.etcd.io/etcd/version" - "github.com/urfave/cli" + "go.etcd.io/etcd/v3/etcdctl/ctlv2/command" + "go.etcd.io/etcd/v3/version" ) func Start() { diff --git a/etcdctl/ctlv3/command/alarm_command.go b/etcdctl/ctlv3/command/alarm_command.go index 42b85bb2945..2a82127f021 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/clientv3" + v3 "go.etcd.io/etcd/v3/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 9255f175bb1..e99d76a0563 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/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/v3/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 d13953d993e..35097cd30c6 100644 --- a/etcdctl/ctlv3/command/check.go +++ b/etcdctl/ctlv3/command/check.go @@ -25,10 +25,9 @@ import ( "sync" "time" - v3 "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/pkg/report" - "github.com/spf13/cobra" + v3 "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/pkg/report" "golang.org/x/time/rate" "gopkg.in/cheggaaa/pb.v1" ) diff --git a/etcdctl/ctlv3/command/compaction_command.go b/etcdctl/ctlv3/command/compaction_command.go index 4262056ae27..33820b6e877 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/clientv3" + "go.etcd.io/etcd/v3/clientv3" ) var compactPhysical bool diff --git a/etcdctl/ctlv3/command/defrag_command.go b/etcdctl/ctlv3/command/defrag_command.go index 5bbb39dd74a..141071912fd 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/mvcc/backend" + "go.etcd.io/etcd/v3/mvcc/backend" ) var ( diff --git a/etcdctl/ctlv3/command/del_command.go b/etcdctl/ctlv3/command/del_command.go index 1c28868ee2c..391f48eb9de 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/clientv3" + "go.etcd.io/etcd/v3/clientv3" ) var ( diff --git a/etcdctl/ctlv3/command/elect_command.go b/etcdctl/ctlv3/command/elect_command.go index cd67a07b9d2..af2969eb194 100644 --- a/etcdctl/ctlv3/command/elect_command.go +++ b/etcdctl/ctlv3/command/elect_command.go @@ -21,10 +21,9 @@ import ( "os/signal" "syscall" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/clientv3/concurrency" - "github.com/spf13/cobra" + "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/clientv3/concurrency" ) var ( diff --git a/etcdctl/ctlv3/command/ep_command.go b/etcdctl/ctlv3/command/ep_command.go index b04285927b0..09e5847f1a9 100644 --- a/etcdctl/ctlv3/command/ep_command.go +++ b/etcdctl/ctlv3/command/ep_command.go @@ -20,11 +20,10 @@ import ( "sync" "time" - v3 "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" - "go.etcd.io/etcd/pkg/flags" - "github.com/spf13/cobra" + v3 "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/v3/pkg/flags" ) var epClusterEndpoints bool diff --git a/etcdctl/ctlv3/command/error.go b/etcdctl/ctlv3/command/error.go index 220d50b6d82..86d343773b3 100644 --- a/etcdctl/ctlv3/command/error.go +++ b/etcdctl/ctlv3/command/error.go @@ -18,7 +18,7 @@ import ( "fmt" "os" - "go.etcd.io/etcd/client" + "go.etcd.io/etcd/v3/client" ) const ( diff --git a/etcdctl/ctlv3/command/get_command.go b/etcdctl/ctlv3/command/get_command.go index 753d75ba799..6bd1027996d 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/clientv3" + "go.etcd.io/etcd/v3/clientv3" ) var ( diff --git a/etcdctl/ctlv3/command/global.go b/etcdctl/ctlv3/command/global.go index 49a22037983..922095f1938 100644 --- a/etcdctl/ctlv3/command/global.go +++ b/etcdctl/ctlv3/command/global.go @@ -25,13 +25,12 @@ import ( "time" "github.com/bgentry/speakeasy" - "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" + "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.uber.org/zap" "google.golang.org/grpc/grpclog" ) diff --git a/etcdctl/ctlv3/command/lease_command.go b/etcdctl/ctlv3/command/lease_command.go index ab13b460050..fbb013bdde2 100644 --- a/etcdctl/ctlv3/command/lease_command.go +++ b/etcdctl/ctlv3/command/lease_command.go @@ -19,9 +19,8 @@ import ( "fmt" "strconv" - v3 "go.etcd.io/etcd/clientv3" - "github.com/spf13/cobra" + v3 "go.etcd.io/etcd/v3/clientv3" ) // NewLeaseCommand returns the cobra command for "lease". diff --git a/etcdctl/ctlv3/command/lock_command.go b/etcdctl/ctlv3/command/lock_command.go index 9b117b1751f..74fe0824908 100644 --- a/etcdctl/ctlv3/command/lock_command.go +++ b/etcdctl/ctlv3/command/lock_command.go @@ -23,10 +23,9 @@ import ( "os/signal" "syscall" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/clientv3/concurrency" - "github.com/spf13/cobra" + "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/clientv3/concurrency" ) var lockTTL = 10 diff --git a/etcdctl/ctlv3/command/make_mirror_command.go b/etcdctl/ctlv3/command/make_mirror_command.go index 243aacea4c0..196bd704653 100644 --- a/etcdctl/ctlv3/command/make_mirror_command.go +++ b/etcdctl/ctlv3/command/make_mirror_command.go @@ -22,12 +22,11 @@ import ( "sync/atomic" "time" - "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" + "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" ) var ( diff --git a/etcdctl/ctlv3/command/member_command.go b/etcdctl/ctlv3/command/member_command.go index 182ff8ef722..8a2c0527830 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/clientv3" + "go.etcd.io/etcd/v3/clientv3" ) var ( diff --git a/etcdctl/ctlv3/command/migrate_command.go b/etcdctl/ctlv3/command/migrate_command.go index bef384fbfc6..09de138ad6e 100644 --- a/etcdctl/ctlv3/command/migrate_command.go +++ b/etcdctl/ctlv3/command/migrate_command.go @@ -24,25 +24,24 @@ import ( "path/filepath" "time" - "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" + "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.uber.org/zap" ) diff --git a/etcdctl/ctlv3/command/move_leader_command.go b/etcdctl/ctlv3/command/move_leader_command.go index 7c8010c962b..0df8668f2b2 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/clientv3" + "go.etcd.io/etcd/v3/clientv3" ) // NewMoveLeaderCommand returns the cobra command for "move-leader". diff --git a/etcdctl/ctlv3/command/printer.go b/etcdctl/ctlv3/command/printer.go index 2793c5fa4b8..1b85f6aebfc 100644 --- a/etcdctl/ctlv3/command/printer.go +++ b/etcdctl/ctlv3/command/printer.go @@ -19,11 +19,10 @@ import ( "fmt" "strings" - v3 "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/clientv3/snapshot" - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" - "github.com/dustin/go-humanize" + v3 "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/clientv3/snapshot" + pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" ) type printer interface { diff --git a/etcdctl/ctlv3/command/printer_fields.go b/etcdctl/ctlv3/command/printer_fields.go index d0c69998053..38f5c7d93d2 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/clientv3" - "go.etcd.io/etcd/clientv3/snapshot" - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" - spb "go.etcd.io/etcd/mvcc/mvccpb" + 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" ) type fieldsPrinter struct{ printer } diff --git a/etcdctl/ctlv3/command/printer_json.go b/etcdctl/ctlv3/command/printer_json.go index 95b2a7f4e28..2a6ea9f21e1 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/clientv3/snapshot" + "go.etcd.io/etcd/v3/clientv3/snapshot" ) type jsonPrinter struct{ printer } diff --git a/etcdctl/ctlv3/command/printer_protobuf.go b/etcdctl/ctlv3/command/printer_protobuf.go index 909fffe587f..9c2446c8482 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/clientv3" - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" - mvccpb "go.etcd.io/etcd/mvcc/mvccpb" + v3 "go.etcd.io/etcd/v3/clientv3" + pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + mvccpb "go.etcd.io/etcd/v3/mvcc/mvccpb" ) type pbPrinter struct{ printer } diff --git a/etcdctl/ctlv3/command/printer_simple.go b/etcdctl/ctlv3/command/printer_simple.go index b321f850b57..8223e87da65 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/clientv3" - "go.etcd.io/etcd/clientv3/snapshot" - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" - "go.etcd.io/etcd/pkg/types" + 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" ) type simplePrinter struct { diff --git a/etcdctl/ctlv3/command/printer_table.go b/etcdctl/ctlv3/command/printer_table.go index 4a84b74721c..136e0e09a74 100644 --- a/etcdctl/ctlv3/command/printer_table.go +++ b/etcdctl/ctlv3/command/printer_table.go @@ -17,10 +17,9 @@ package command import ( "os" - v3 "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/clientv3/snapshot" - "github.com/olekukonko/tablewriter" + v3 "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/clientv3/snapshot" ) type tablePrinter struct{ printer } diff --git a/etcdctl/ctlv3/command/put_command.go b/etcdctl/ctlv3/command/put_command.go index 0839cadc0d7..41d1016751b 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/clientv3" + "go.etcd.io/etcd/v3/clientv3" ) var ( diff --git a/etcdctl/ctlv3/command/role_command.go b/etcdctl/ctlv3/command/role_command.go index 682b3bf19d4..ad6883246e9 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/clientv3" + "go.etcd.io/etcd/v3/clientv3" ) var ( diff --git a/etcdctl/ctlv3/command/snapshot_command.go b/etcdctl/ctlv3/command/snapshot_command.go index 32bcd7a61ed..2c4417f67e9 100644 --- a/etcdctl/ctlv3/command/snapshot_command.go +++ b/etcdctl/ctlv3/command/snapshot_command.go @@ -20,9 +20,8 @@ import ( "path/filepath" "strings" - "go.etcd.io/etcd/clientv3/snapshot" - "github.com/spf13/cobra" + "go.etcd.io/etcd/v3/clientv3/snapshot" "go.uber.org/zap" ) diff --git a/etcdctl/ctlv3/command/txn_command.go b/etcdctl/ctlv3/command/txn_command.go index 67f6d181842..59845ece843 100644 --- a/etcdctl/ctlv3/command/txn_command.go +++ b/etcdctl/ctlv3/command/txn_command.go @@ -22,10 +22,9 @@ import ( "strconv" "strings" - "go.etcd.io/etcd/clientv3" - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" - "github.com/spf13/cobra" + "go.etcd.io/etcd/v3/clientv3" + pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" ) var txnInteractive bool diff --git a/etcdctl/ctlv3/command/util.go b/etcdctl/ctlv3/command/util.go index 2a90ed9276a..28b251217e8 100644 --- a/etcdctl/ctlv3/command/util.go +++ b/etcdctl/ctlv3/command/util.go @@ -25,10 +25,9 @@ import ( "strings" "time" - v3 "go.etcd.io/etcd/clientv3" - pb "go.etcd.io/etcd/mvcc/mvccpb" - "github.com/spf13/cobra" + v3 "go.etcd.io/etcd/v3/clientv3" + pb "go.etcd.io/etcd/v3/mvcc/mvccpb" ) func printKV(isHex bool, valueOnly bool, kv *pb.KeyValue) { diff --git a/etcdctl/ctlv3/command/version_command.go b/etcdctl/ctlv3/command/version_command.go index 77c21fecb9a..fb74131db97 100644 --- a/etcdctl/ctlv3/command/version_command.go +++ b/etcdctl/ctlv3/command/version_command.go @@ -17,9 +17,8 @@ package command import ( "fmt" - "go.etcd.io/etcd/version" - "github.com/spf13/cobra" + "go.etcd.io/etcd/v3/version" ) // NewVersionCommand prints out the version of etcd. diff --git a/etcdctl/ctlv3/command/watch_command.go b/etcdctl/ctlv3/command/watch_command.go index ce8425cbe58..2f18f7dc6ec 100644 --- a/etcdctl/ctlv3/command/watch_command.go +++ b/etcdctl/ctlv3/command/watch_command.go @@ -23,9 +23,8 @@ import ( "os/exec" "strings" - "go.etcd.io/etcd/clientv3" - "github.com/spf13/cobra" + "go.etcd.io/etcd/v3/clientv3" ) var ( diff --git a/etcdctl/ctlv3/ctl.go b/etcdctl/ctlv3/ctl.go index 40154a5da33..45acaf15194 100644 --- a/etcdctl/ctlv3/ctl.go +++ b/etcdctl/ctlv3/ctl.go @@ -18,9 +18,8 @@ package ctlv3 import ( "time" - "go.etcd.io/etcd/etcdctl/ctlv3/command" - "github.com/spf13/cobra" + "go.etcd.io/etcd/v3/etcdctl/ctlv3/command" ) const ( diff --git a/etcdctl/ctlv3/ctl_cov.go b/etcdctl/ctlv3/ctl_cov.go index b5b0c42c3a2..5ca7a513be6 100644 --- a/etcdctl/ctlv3/ctl_cov.go +++ b/etcdctl/ctlv3/ctl_cov.go @@ -20,7 +20,7 @@ import ( "os" "strings" - "go.etcd.io/etcd/etcdctl/ctlv3/command" + "go.etcd.io/etcd/v3/etcdctl/ctlv3/command" ) func Start() { diff --git a/etcdctl/ctlv3/ctl_nocov.go b/etcdctl/ctlv3/ctl_nocov.go index e9567a39899..2d6e04808f0 100644 --- a/etcdctl/ctlv3/ctl_nocov.go +++ b/etcdctl/ctlv3/ctl_nocov.go @@ -16,7 +16,7 @@ package ctlv3 -import "go.etcd.io/etcd/etcdctl/ctlv3/command" +import "go.etcd.io/etcd/v3/etcdctl/ctlv3/command" func Start() { rootCmd.SetUsageFunc(usageFunc) diff --git a/etcdctl/ctlv3/help.go b/etcdctl/ctlv3/help.go index 3b9691150a2..6e7eaf02488 100644 --- a/etcdctl/ctlv3/help.go +++ b/etcdctl/ctlv3/help.go @@ -25,10 +25,9 @@ import ( "text/tabwriter" "text/template" - "go.etcd.io/etcd/version" - "github.com/spf13/cobra" "github.com/spf13/pflag" + "go.etcd.io/etcd/v3/version" ) var ( diff --git a/etcdctl/main.go b/etcdctl/main.go index 8bb4fc096f9..1ae3ee8e4ee 100644 --- a/etcdctl/main.go +++ b/etcdctl/main.go @@ -19,8 +19,8 @@ import ( "fmt" "os" - "go.etcd.io/etcd/etcdctl/ctlv2" - "go.etcd.io/etcd/etcdctl/ctlv3" + "go.etcd.io/etcd/v3/etcdctl/ctlv2" + "go.etcd.io/etcd/v3/etcdctl/ctlv3" ) const ( diff --git a/etcdmain/config.go b/etcdmain/config.go index 37a23a56e29..087e0db88f9 100644 --- a/etcdmain/config.go +++ b/etcdmain/config.go @@ -26,11 +26,10 @@ import ( "runtime" "strings" - "go.etcd.io/etcd/embed" - "go.etcd.io/etcd/pkg/flags" - "go.etcd.io/etcd/pkg/types" - "go.etcd.io/etcd/version" - + "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.uber.org/zap" "sigs.k8s.io/yaml" ) diff --git a/etcdmain/config_test.go b/etcdmain/config_test.go index de646e37027..bfe28c3c47c 100644 --- a/etcdmain/config_test.go +++ b/etcdmain/config_test.go @@ -23,7 +23,7 @@ import ( "strings" "testing" - "go.etcd.io/etcd/embed" + "go.etcd.io/etcd/v3/embed" "sigs.k8s.io/yaml" ) diff --git a/etcdmain/etcd.go b/etcdmain/etcd.go index 7d1c6337c0c..b9c0e286ad6 100644 --- a/etcdmain/etcd.go +++ b/etcdmain/etcd.go @@ -26,19 +26,18 @@ import ( "strings" "time" - "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.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.uber.org/zap" "google.golang.org/grpc" ) diff --git a/etcdmain/gateway.go b/etcdmain/gateway.go index fece05f1cfe..29b394c813e 100644 --- a/etcdmain/gateway.go +++ b/etcdmain/gateway.go @@ -21,9 +21,8 @@ import ( "os" "time" - "go.etcd.io/etcd/proxy/tcpproxy" - "github.com/spf13/cobra" + "go.etcd.io/etcd/v3/proxy/tcpproxy" "go.uber.org/zap" ) diff --git a/etcdmain/grpc_proxy.go b/etcdmain/grpc_proxy.go index eb18ec33749..600692841ff 100644 --- a/etcdmain/grpc_proxy.go +++ b/etcdmain/grpc_proxy.go @@ -29,21 +29,20 @@ import ( "path/filepath" "time" - "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" "github.com/spf13/cobra" + "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.uber.org/zap" "google.golang.org/grpc" "google.golang.org/grpc/grpclog" diff --git a/etcdmain/help.go b/etcdmain/help.go index c8db7d34128..12eb5059f96 100644 --- a/etcdmain/help.go +++ b/etcdmain/help.go @@ -18,7 +18,7 @@ import ( "fmt" "strconv" - "go.etcd.io/etcd/embed" + "go.etcd.io/etcd/v3/embed" "golang.org/x/crypto/bcrypt" ) diff --git a/etcdmain/util.go b/etcdmain/util.go index 463ada65b9a..8fe0b313284 100644 --- a/etcdmain/util.go +++ b/etcdmain/util.go @@ -18,9 +18,8 @@ import ( "fmt" "os" - "go.etcd.io/etcd/pkg/srv" - "go.etcd.io/etcd/pkg/transport" - + "go.etcd.io/etcd/v3/pkg/srv" + "go.etcd.io/etcd/v3/pkg/transport" "go.uber.org/zap" ) diff --git a/etcdserver/api/capability.go b/etcdserver/api/capability.go index ec0d600e881..ffb9258b58d 100644 --- a/etcdserver/api/capability.go +++ b/etcdserver/api/capability.go @@ -17,11 +17,10 @@ package api import ( "sync" - "go.etcd.io/etcd/version" - "go.uber.org/zap" - "github.com/coreos/go-semver/semver" "github.com/coreos/pkg/capnslog" + "go.etcd.io/etcd/v3/version" + "go.uber.org/zap" ) type Capability string diff --git a/etcdserver/api/cluster.go b/etcdserver/api/cluster.go index 901be9d85ca..34a6654cc27 100644 --- a/etcdserver/api/cluster.go +++ b/etcdserver/api/cluster.go @@ -15,10 +15,9 @@ package api import ( - "go.etcd.io/etcd/etcdserver/api/membership" - "go.etcd.io/etcd/pkg/types" - "github.com/coreos/go-semver/semver" + "go.etcd.io/etcd/v3/etcdserver/api/membership" + "go.etcd.io/etcd/v3/pkg/types" ) // Cluster is an interface representing a collection of members in one etcd cluster. diff --git a/etcdserver/api/etcdhttp/base.go b/etcdserver/api/etcdhttp/base.go index c9df62ea8e6..a73e499bebe 100644 --- a/etcdserver/api/etcdhttp/base.go +++ b/etcdserver/api/etcdhttp/base.go @@ -21,14 +21,13 @@ import ( "net/http" "strings" - "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.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.uber.org/zap" ) diff --git a/etcdserver/api/etcdhttp/metrics.go b/etcdserver/api/etcdhttp/metrics.go index f455e40a740..8c163edbea4 100644 --- a/etcdserver/api/etcdhttp/metrics.go +++ b/etcdserver/api/etcdhttp/metrics.go @@ -20,12 +20,11 @@ import ( "net/http" "time" - "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" + "go.etcd.io/etcd/v3/etcdserver" + "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + "go.etcd.io/etcd/v3/raft" ) const ( diff --git a/etcdserver/api/etcdhttp/peer.go b/etcdserver/api/etcdhttp/peer.go index 6c61bf5d510..85137041af2 100644 --- a/etcdserver/api/etcdhttp/peer.go +++ b/etcdserver/api/etcdhttp/peer.go @@ -21,13 +21,12 @@ import ( "strconv" "strings" - "go.etcd.io/etcd/etcdserver" - "go.etcd.io/etcd/etcdserver/api" - "go.etcd.io/etcd/etcdserver/api/membership" - "go.etcd.io/etcd/etcdserver/api/rafthttp" - "go.etcd.io/etcd/lease/leasehttp" - "go.etcd.io/etcd/pkg/types" - + "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/rafthttp" + "go.etcd.io/etcd/v3/lease/leasehttp" + "go.etcd.io/etcd/v3/pkg/types" "go.uber.org/zap" ) diff --git a/etcdserver/api/etcdhttp/peer_test.go b/etcdserver/api/etcdhttp/peer_test.go index 8d890c0b585..902c638653f 100644 --- a/etcdserver/api/etcdhttp/peer_test.go +++ b/etcdserver/api/etcdhttp/peer_test.go @@ -26,15 +26,14 @@ import ( "strings" "testing" - "go.uber.org/zap" - "github.com/coreos/go-semver/semver" - "go.etcd.io/etcd/etcdserver/api" - "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/testutil" - "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/v3/etcdserver/api" + "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/testutil" + "go.etcd.io/etcd/v3/pkg/types" + "go.uber.org/zap" ) type fakeCluster struct { diff --git a/etcdserver/api/etcdhttp/version_test.go b/etcdserver/api/etcdhttp/version_test.go index c6090707224..63271c704d2 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/version" + "go.etcd.io/etcd/v3/version" ) func TestServeVersion(t *testing.T) { diff --git a/etcdserver/api/membership/cluster.go b/etcdserver/api/membership/cluster.go index 81f515d2f39..f64ac45d28d 100644 --- a/etcdserver/api/membership/cluster.go +++ b/etcdserver/api/membership/cluster.go @@ -27,16 +27,15 @@ import ( "sync" "time" - "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" + "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.uber.org/zap" ) diff --git a/etcdserver/api/membership/cluster_test.go b/etcdserver/api/membership/cluster_test.go index 55b72ee08c2..8d00154ecfc 100644 --- a/etcdserver/api/membership/cluster_test.go +++ b/etcdserver/api/membership/cluster_test.go @@ -21,12 +21,11 @@ import ( "reflect" "testing" - "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.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.uber.org/zap" ) diff --git a/etcdserver/api/membership/errors.go b/etcdserver/api/membership/errors.go index 8f6fe504e4b..ef50dea9993 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/etcdserver/api/v2error" + "go.etcd.io/etcd/v3/etcdserver/api/v2error" ) var ( diff --git a/etcdserver/api/membership/member.go b/etcdserver/api/membership/member.go index 896cb36aa45..8e45d80421f 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/pkg/types" + "go.etcd.io/etcd/v3/pkg/types" ) var ( diff --git a/etcdserver/api/membership/member_test.go b/etcdserver/api/membership/member_test.go index e9de530eedf..c67eb0a6dad 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/pkg/types" + "go.etcd.io/etcd/v3/pkg/types" ) func timeParse(value string) *time.Time { diff --git a/etcdserver/api/membership/store.go b/etcdserver/api/membership/store.go index 14ab1190ed9..b452cde4fda 100644 --- a/etcdserver/api/membership/store.go +++ b/etcdserver/api/membership/store.go @@ -19,11 +19,10 @@ import ( "fmt" "path" - "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" + "go.etcd.io/etcd/v3/etcdserver/api/v2store" + "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/v3/pkg/types" ) const ( diff --git a/etcdserver/api/rafthttp/coder.go b/etcdserver/api/rafthttp/coder.go index 12c3e44242c..f06f070b3bf 100644 --- a/etcdserver/api/rafthttp/coder.go +++ b/etcdserver/api/rafthttp/coder.go @@ -14,7 +14,7 @@ package rafthttp -import "go.etcd.io/etcd/raft/raftpb" +import "go.etcd.io/etcd/v3/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 83de44478c6..796f44982ee 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/etcdserver/api/v2stats" - "go.etcd.io/etcd/pkg/types" - "go.etcd.io/etcd/raft" - "go.etcd.io/etcd/raft/raftpb" + 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" ) func TestSendMessage(t *testing.T) { diff --git a/etcdserver/api/rafthttp/http.go b/etcdserver/api/rafthttp/http.go index 18e9c53f24c..a39cd59ee89 100644 --- a/etcdserver/api/rafthttp/http.go +++ b/etcdserver/api/rafthttp/http.go @@ -24,13 +24,12 @@ import ( "strings" "time" - "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.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.uber.org/zap" ) diff --git a/etcdserver/api/rafthttp/http_test.go b/etcdserver/api/rafthttp/http_test.go index fd5e2456319..33262d8ed5a 100644 --- a/etcdserver/api/rafthttp/http_test.go +++ b/etcdserver/api/rafthttp/http_test.go @@ -26,12 +26,11 @@ import ( "testing" "time" - "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.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.uber.org/zap" ) diff --git a/etcdserver/api/rafthttp/msg_codec.go b/etcdserver/api/rafthttp/msg_codec.go index 2417d222e58..bf522c273f5 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/pkg/pbutil" - "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/v3/pkg/pbutil" + "go.etcd.io/etcd/v3/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 883fc8ef863..d2ea66fb4df 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/raft/raftpb" + "go.etcd.io/etcd/v3/raft/raftpb" ) func TestMessage(t *testing.T) { diff --git a/etcdserver/api/rafthttp/msgappv2_codec.go b/etcdserver/api/rafthttp/msgappv2_codec.go index 1fa36deb394..5e7149d9640 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/etcdserver/api/v2stats" - "go.etcd.io/etcd/pkg/pbutil" - "go.etcd.io/etcd/pkg/types" - "go.etcd.io/etcd/raft/raftpb" + 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" ) const ( diff --git a/etcdserver/api/rafthttp/msgappv2_codec_test.go b/etcdserver/api/rafthttp/msgappv2_codec_test.go index 48fd28992f6..4f4804e16e3 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/etcdserver/api/v2stats" - "go.etcd.io/etcd/pkg/types" - "go.etcd.io/etcd/raft/raftpb" + stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats" + "go.etcd.io/etcd/v3/pkg/types" + "go.etcd.io/etcd/v3/raft/raftpb" ) func TestMsgAppV2(t *testing.T) { diff --git a/etcdserver/api/rafthttp/peer.go b/etcdserver/api/rafthttp/peer.go index 8130c4a96b2..038c8ecde36 100644 --- a/etcdserver/api/rafthttp/peer.go +++ b/etcdserver/api/rafthttp/peer.go @@ -19,12 +19,11 @@ import ( "sync" "time" - "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.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.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 66149ff67d2..25e6538cfcc 100644 --- a/etcdserver/api/rafthttp/peer_status.go +++ b/etcdserver/api/rafthttp/peer_status.go @@ -20,8 +20,7 @@ import ( "sync" "time" - "go.etcd.io/etcd/pkg/types" - + "go.etcd.io/etcd/v3/pkg/types" "go.uber.org/zap" ) diff --git a/etcdserver/api/rafthttp/peer_test.go b/etcdserver/api/rafthttp/peer_test.go index 29ef70fc6a9..a0b29dad3f8 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/raft/raftpb" + "go.etcd.io/etcd/v3/raft/raftpb" ) func TestPeerPick(t *testing.T) { diff --git a/etcdserver/api/rafthttp/pipeline.go b/etcdserver/api/rafthttp/pipeline.go index 70f92575d13..ab53fa25c09 100644 --- a/etcdserver/api/rafthttp/pipeline.go +++ b/etcdserver/api/rafthttp/pipeline.go @@ -22,12 +22,11 @@ import ( "sync" "time" - 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" - + 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" "go.uber.org/zap" ) diff --git a/etcdserver/api/rafthttp/pipeline_test.go b/etcdserver/api/rafthttp/pipeline_test.go index 231c768db14..0400b241893 100644 --- a/etcdserver/api/rafthttp/pipeline_test.go +++ b/etcdserver/api/rafthttp/pipeline_test.go @@ -24,12 +24,11 @@ import ( "testing" "time" - 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" - + 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" "go.uber.org/zap" ) diff --git a/etcdserver/api/rafthttp/remote.go b/etcdserver/api/rafthttp/remote.go index 1ef2493ed45..560e6e63c68 100644 --- a/etcdserver/api/rafthttp/remote.go +++ b/etcdserver/api/rafthttp/remote.go @@ -15,9 +15,8 @@ package rafthttp import ( - "go.etcd.io/etcd/pkg/types" - "go.etcd.io/etcd/raft/raftpb" - + "go.etcd.io/etcd/v3/pkg/types" + "go.etcd.io/etcd/v3/raft/raftpb" "go.uber.org/zap" ) diff --git a/etcdserver/api/rafthttp/snapshot_sender.go b/etcdserver/api/rafthttp/snapshot_sender.go index 85abaeaa4d1..79384c66ecd 100644 --- a/etcdserver/api/rafthttp/snapshot_sender.go +++ b/etcdserver/api/rafthttp/snapshot_sender.go @@ -22,13 +22,12 @@ import ( "net/http" "time" - "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.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.uber.org/zap" ) diff --git a/etcdserver/api/rafthttp/snapshot_test.go b/etcdserver/api/rafthttp/snapshot_test.go index 504a8ff6466..8163da0a13d 100644 --- a/etcdserver/api/rafthttp/snapshot_test.go +++ b/etcdserver/api/rafthttp/snapshot_test.go @@ -25,10 +25,9 @@ import ( "testing" "time" - "go.etcd.io/etcd/etcdserver/api/snap" - "go.etcd.io/etcd/pkg/types" - "go.etcd.io/etcd/raft/raftpb" - + "go.etcd.io/etcd/v3/etcdserver/api/snap" + "go.etcd.io/etcd/v3/pkg/types" + "go.etcd.io/etcd/v3/raft/raftpb" "go.uber.org/zap" ) diff --git a/etcdserver/api/rafthttp/stream.go b/etcdserver/api/rafthttp/stream.go index dcb2223ca59..dfe8ae30fbb 100644 --- a/etcdserver/api/rafthttp/stream.go +++ b/etcdserver/api/rafthttp/stream.go @@ -25,14 +25,13 @@ import ( "sync" "time" - 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" + 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" "go.uber.org/zap" "golang.org/x/time/rate" ) diff --git a/etcdserver/api/rafthttp/stream_test.go b/etcdserver/api/rafthttp/stream_test.go index 56b3e7fe073..95f4ba9816d 100644 --- a/etcdserver/api/rafthttp/stream_test.go +++ b/etcdserver/api/rafthttp/stream_test.go @@ -26,13 +26,12 @@ import ( "testing" "time" - 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" + 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" "go.uber.org/zap" "golang.org/x/time/rate" ) diff --git a/etcdserver/api/rafthttp/transport.go b/etcdserver/api/rafthttp/transport.go index d6e55091c33..d32dbe66eb9 100644 --- a/etcdserver/api/rafthttp/transport.go +++ b/etcdserver/api/rafthttp/transport.go @@ -20,16 +20,15 @@ import ( "sync" "time" - "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" + "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.uber.org/zap" "golang.org/x/time/rate" ) diff --git a/etcdserver/api/rafthttp/transport_bench_test.go b/etcdserver/api/rafthttp/transport_bench_test.go index 9e6aabd4fd4..e2db71282be 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/etcdserver/api/v2stats" - "go.etcd.io/etcd/pkg/types" - "go.etcd.io/etcd/raft" - "go.etcd.io/etcd/raft/raftpb" + 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" ) func BenchmarkSendingMsgApp(b *testing.B) { diff --git a/etcdserver/api/rafthttp/transport_test.go b/etcdserver/api/rafthttp/transport_test.go index 7c8641fec4f..04a36f2e3f0 100644 --- a/etcdserver/api/rafthttp/transport_test.go +++ b/etcdserver/api/rafthttp/transport_test.go @@ -20,12 +20,11 @@ import ( "testing" "time" - 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" + 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" ) // TestTransportSend tests that transport can send messages using correct diff --git a/etcdserver/api/rafthttp/urlpick.go b/etcdserver/api/rafthttp/urlpick.go index 61ef468649a..33eb7e96fe7 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/pkg/types" + "go.etcd.io/etcd/v3/pkg/types" ) type urlPicker struct { diff --git a/etcdserver/api/rafthttp/urlpick_test.go b/etcdserver/api/rafthttp/urlpick_test.go index 230730de59c..730b4f3fc1b 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/pkg/testutil" + "go.etcd.io/etcd/v3/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 20938647c7a..98539a8e153 100644 --- a/etcdserver/api/rafthttp/util.go +++ b/etcdserver/api/rafthttp/util.go @@ -23,11 +23,10 @@ import ( "strings" "time" - "go.etcd.io/etcd/pkg/transport" - "go.etcd.io/etcd/pkg/types" - "go.etcd.io/etcd/version" - "github.com/coreos/go-semver/semver" + "go.etcd.io/etcd/v3/pkg/transport" + "go.etcd.io/etcd/v3/pkg/types" + "go.etcd.io/etcd/v3/version" ) var ( diff --git a/etcdserver/api/rafthttp/util_test.go b/etcdserver/api/rafthttp/util_test.go index 17a385ed152..a422ceb7ff8 100644 --- a/etcdserver/api/rafthttp/util_test.go +++ b/etcdserver/api/rafthttp/util_test.go @@ -22,10 +22,9 @@ import ( "reflect" "testing" - "go.etcd.io/etcd/raft/raftpb" - "go.etcd.io/etcd/version" - "github.com/coreos/go-semver/semver" + "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/v3/version" ) func TestEntry(t *testing.T) { diff --git a/etcdserver/api/snap/db.go b/etcdserver/api/snap/db.go index 3002ccdccea..ecfc771a2ea 100644 --- a/etcdserver/api/snap/db.go +++ b/etcdserver/api/snap/db.go @@ -23,9 +23,8 @@ import ( "path/filepath" "time" - "go.etcd.io/etcd/pkg/fileutil" - humanize "github.com/dustin/go-humanize" + "go.etcd.io/etcd/v3/pkg/fileutil" "go.uber.org/zap" ) diff --git a/etcdserver/api/snap/message.go b/etcdserver/api/snap/message.go index c1151e27eb1..9e626eb07fd 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/pkg/ioutil" - "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/v3/pkg/ioutil" + "go.etcd.io/etcd/v3/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 7e7933374c9..d8be6c45c13 100644 --- a/etcdserver/api/snap/snapshotter.go +++ b/etcdserver/api/snap/snapshotter.go @@ -25,13 +25,12 @@ import ( "strings" "time" - "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.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.uber.org/zap" ) diff --git a/etcdserver/api/snap/snapshotter_test.go b/etcdserver/api/snap/snapshotter_test.go index 00e3e21dc3c..ee40a9f31b3 100644 --- a/etcdserver/api/snap/snapshotter_test.go +++ b/etcdserver/api/snap/snapshotter_test.go @@ -23,8 +23,7 @@ import ( "reflect" "testing" - "go.etcd.io/etcd/raft/raftpb" - + "go.etcd.io/etcd/v3/raft/raftpb" "go.uber.org/zap" ) diff --git a/etcdserver/api/v2auth/auth.go b/etcdserver/api/v2auth/auth.go index b438074a449..730a7b5ca74 100644 --- a/etcdserver/api/v2auth/auth.go +++ b/etcdserver/api/v2auth/auth.go @@ -26,12 +26,11 @@ import ( "strings" "time" - "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.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.uber.org/zap" "golang.org/x/crypto/bcrypt" ) diff --git a/etcdserver/api/v2auth/auth_requests.go b/etcdserver/api/v2auth/auth_requests.go index d6574ecca63..04232d4dcec 100644 --- a/etcdserver/api/v2auth/auth_requests.go +++ b/etcdserver/api/v2auth/auth_requests.go @@ -19,10 +19,9 @@ import ( "encoding/json" "path" - "go.etcd.io/etcd/etcdserver" - "go.etcd.io/etcd/etcdserver/api/v2error" - "go.etcd.io/etcd/etcdserver/etcdserverpb" - + "go.etcd.io/etcd/v3/etcdserver" + "go.etcd.io/etcd/v3/etcdserver/api/v2error" + "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "go.uber.org/zap" ) diff --git a/etcdserver/api/v2auth/auth_test.go b/etcdserver/api/v2auth/auth_test.go index 5c1564b25c9..a4589920fa0 100644 --- a/etcdserver/api/v2auth/auth_test.go +++ b/etcdserver/api/v2auth/auth_test.go @@ -20,11 +20,10 @@ import ( "testing" "time" - "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.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.uber.org/zap" ) diff --git a/etcdserver/api/v2discovery/discovery.go b/etcdserver/api/v2discovery/discovery.go index cf770b37859..cd85516dc64 100644 --- a/etcdserver/api/v2discovery/discovery.go +++ b/etcdserver/api/v2discovery/discovery.go @@ -29,12 +29,11 @@ import ( "strings" "time" - "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" + "go.etcd.io/etcd/v3/client" + "go.etcd.io/etcd/v3/pkg/transport" + "go.etcd.io/etcd/v3/pkg/types" "go.uber.org/zap" ) diff --git a/etcdserver/api/v2discovery/discovery_test.go b/etcdserver/api/v2discovery/discovery_test.go index c1eff88235c..88fb356ebb0 100644 --- a/etcdserver/api/v2discovery/discovery_test.go +++ b/etcdserver/api/v2discovery/discovery_test.go @@ -26,11 +26,9 @@ import ( "testing" "time" - "go.uber.org/zap" - - "go.etcd.io/etcd/client" - "github.com/jonboulle/clockwork" + "go.etcd.io/etcd/v3/client" + "go.uber.org/zap" ) const ( diff --git a/etcdserver/api/v2http/capability.go b/etcdserver/api/v2http/capability.go index ed6c456d0b6..9da24fb4645 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/etcdserver/api" - "go.etcd.io/etcd/etcdserver/api/v2http/httptypes" + "go.etcd.io/etcd/v3/etcdserver/api" + "go.etcd.io/etcd/v3/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 1d1e592b25d..811a55d4e9f 100644 --- a/etcdserver/api/v2http/client.go +++ b/etcdserver/api/v2http/client.go @@ -27,19 +27,18 @@ import ( "strings" "time" - "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.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.uber.org/zap" ) diff --git a/etcdserver/api/v2http/client_auth.go b/etcdserver/api/v2http/client_auth.go index d8d6a883a93..86868c33b2a 100644 --- a/etcdserver/api/v2http/client_auth.go +++ b/etcdserver/api/v2http/client_auth.go @@ -20,10 +20,9 @@ import ( "path" "strings" - "go.etcd.io/etcd/etcdserver/api" - "go.etcd.io/etcd/etcdserver/api/v2auth" - "go.etcd.io/etcd/etcdserver/api/v2http/httptypes" - + "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.uber.org/zap" ) diff --git a/etcdserver/api/v2http/client_auth_test.go b/etcdserver/api/v2http/client_auth_test.go index 22dfafa8f54..e736dc51d2c 100644 --- a/etcdserver/api/v2http/client_auth_test.go +++ b/etcdserver/api/v2http/client_auth_test.go @@ -30,9 +30,8 @@ import ( "strings" "testing" - "go.etcd.io/etcd/etcdserver/api" - "go.etcd.io/etcd/etcdserver/api/v2auth" - + "go.etcd.io/etcd/v3/etcdserver/api" + "go.etcd.io/etcd/v3/etcdserver/api/v2auth" "go.uber.org/zap" ) diff --git a/etcdserver/api/v2http/client_test.go b/etcdserver/api/v2http/client_test.go index 5bab6c45fa9..234e76ed4ac 100644 --- a/etcdserver/api/v2http/client_test.go +++ b/etcdserver/api/v2http/client_test.go @@ -29,19 +29,18 @@ import ( "testing" "time" - "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" + "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.uber.org/zap" ) diff --git a/etcdserver/api/v2http/http.go b/etcdserver/api/v2http/http.go index c6956893e14..25c8517d2ad 100644 --- a/etcdserver/api/v2http/http.go +++ b/etcdserver/api/v2http/http.go @@ -20,12 +20,11 @@ import ( "strings" "time" - "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.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.uber.org/zap" ) diff --git a/etcdserver/api/v2http/http_test.go b/etcdserver/api/v2http/http_test.go index f93071048d0..9de096bdf16 100644 --- a/etcdserver/api/v2http/http_test.go +++ b/etcdserver/api/v2http/http_test.go @@ -22,14 +22,13 @@ import ( "sort" "testing" - "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.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.uber.org/zap" ) diff --git a/etcdserver/api/v2http/httptypes/member.go b/etcdserver/api/v2http/httptypes/member.go index 95fd443ffdc..fefe6a02029 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/pkg/types" + "go.etcd.io/etcd/v3/pkg/types" ) type Member struct { diff --git a/etcdserver/api/v2http/httptypes/member_test.go b/etcdserver/api/v2http/httptypes/member_test.go index a13efbc1425..ea95550b2fc 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/pkg/types" + "go.etcd.io/etcd/v3/pkg/types" ) func TestMemberUnmarshal(t *testing.T) { diff --git a/etcdserver/api/v2http/metrics.go b/etcdserver/api/v2http/metrics.go index 14f7da0fea7..18239f14def 100644 --- a/etcdserver/api/v2http/metrics.go +++ b/etcdserver/api/v2http/metrics.go @@ -15,16 +15,14 @@ package v2http import ( + "net/http" "strconv" "time" - "net/http" - - "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" + "go.etcd.io/etcd/v3/etcdserver/api/v2error" + "go.etcd.io/etcd/v3/etcdserver/api/v2http/httptypes" + "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" ) var ( diff --git a/etcdserver/api/v2stats/server.go b/etcdserver/api/v2stats/server.go index c4accc73519..21987d2b6a6 100644 --- a/etcdserver/api/v2stats/server.go +++ b/etcdserver/api/v2stats/server.go @@ -20,7 +20,7 @@ import ( "sync" "time" - "go.etcd.io/etcd/raft" + "go.etcd.io/etcd/v3/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 e4a969f3728..18aa8a17f1d 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/etcdserver/api/v2error" + "go.etcd.io/etcd/v3/etcdserver/api/v2error" ) type EventHistory struct { diff --git a/etcdserver/api/v2store/event_test.go b/etcdserver/api/v2store/event_test.go index 7de87035ce2..b37e0ad336d 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/etcdserver/api/v2error" + "go.etcd.io/etcd/v3/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 38a6984fb6a..439c64133e3 100644 --- a/etcdserver/api/v2store/node.go +++ b/etcdserver/api/v2store/node.go @@ -19,9 +19,8 @@ import ( "sort" "time" - "go.etcd.io/etcd/etcdserver/api/v2error" - "github.com/jonboulle/clockwork" + "go.etcd.io/etcd/v3/etcdserver/api/v2error" ) // explanations of Compare function result diff --git a/etcdserver/api/v2store/node_extern_test.go b/etcdserver/api/v2store/node_extern_test.go index df7e725f31d..0a99048f8d8 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/pkg/testutil" + "go.etcd.io/etcd/v3/pkg/testutil" ) func TestNodeExternClone(t *testing.T) { diff --git a/etcdserver/api/v2store/stats_test.go b/etcdserver/api/v2store/stats_test.go index 65dbf3622a3..3793d8f6dce 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/pkg/testutil" + "go.etcd.io/etcd/v3/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 ce940436eb7..a2eed8866f7 100644 --- a/etcdserver/api/v2store/store.go +++ b/etcdserver/api/v2store/store.go @@ -23,10 +23,9 @@ import ( "sync" "time" - "go.etcd.io/etcd/etcdserver/api/v2error" - "go.etcd.io/etcd/pkg/types" - "github.com/jonboulle/clockwork" + "go.etcd.io/etcd/v3/etcdserver/api/v2error" + "go.etcd.io/etcd/v3/pkg/types" ) // The default version to set when the store is first initialized. diff --git a/etcdserver/api/v2store/store_test.go b/etcdserver/api/v2store/store_test.go index 451d9bec6c3..76ec02d4e8d 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/etcdserver/api/v2error" - "go.etcd.io/etcd/etcdserver/api/v2store" - "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/v3/etcdserver/api/v2error" + "go.etcd.io/etcd/v3/etcdserver/api/v2store" + "go.etcd.io/etcd/v3/pkg/testutil" ) type StoreCloser interface { diff --git a/etcdserver/api/v2store/store_ttl_test.go b/etcdserver/api/v2store/store_ttl_test.go index 94c7493f003..6c455a8e4e1 100644 --- a/etcdserver/api/v2store/store_ttl_test.go +++ b/etcdserver/api/v2store/store_ttl_test.go @@ -18,10 +18,9 @@ import ( "testing" "time" - "go.etcd.io/etcd/etcdserver/api/v2error" - "go.etcd.io/etcd/pkg/testutil" - "github.com/jonboulle/clockwork" + "go.etcd.io/etcd/v3/etcdserver/api/v2error" + "go.etcd.io/etcd/v3/pkg/testutil" ) // Ensure that any TTL <= minExpireTime becomes Permanent diff --git a/etcdserver/api/v2store/store_v2_test.go b/etcdserver/api/v2store/store_v2_test.go index d327fd32db3..e165094db52 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/etcdserver/api/v2store" - "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/v3/etcdserver/api/v2store" + "go.etcd.io/etcd/v3/pkg/testutil" ) type v2TestStore struct { diff --git a/etcdserver/api/v2store/store_v2v3_test.go b/etcdserver/api/v2store/store_v2v3_test.go index d0350393a2e..1a64e102aa7 100644 --- a/etcdserver/api/v2store/store_v2v3_test.go +++ b/etcdserver/api/v2store/store_v2v3_test.go @@ -20,11 +20,10 @@ import ( "io/ioutil" "testing" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/etcdserver/api/v2store" - "go.etcd.io/etcd/etcdserver/api/v2v3" - "go.etcd.io/etcd/integration" - + "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" "google.golang.org/grpc/grpclog" ) diff --git a/etcdserver/api/v2store/watcher_hub.go b/etcdserver/api/v2store/watcher_hub.go index a452e7e951f..3b3e7f103b4 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/etcdserver/api/v2error" + "go.etcd.io/etcd/v3/etcdserver/api/v2error" ) // A watcherHub contains all subscribed watchers diff --git a/etcdserver/api/v2v3/cluster.go b/etcdserver/api/v2v3/cluster.go index a22e4afad15..5e65e0a0a68 100644 --- a/etcdserver/api/v2v3/cluster.go +++ b/etcdserver/api/v2v3/cluster.go @@ -15,10 +15,9 @@ package v2v3 import ( - "go.etcd.io/etcd/etcdserver/api/membership" - "go.etcd.io/etcd/pkg/types" - "github.com/coreos/go-semver/semver" + "go.etcd.io/etcd/v3/etcdserver/api/membership" + "go.etcd.io/etcd/v3/pkg/types" ) func (s *v2v3Server) ID() types.ID { diff --git a/etcdserver/api/v2v3/server.go b/etcdserver/api/v2v3/server.go index 5ff9b96c0c4..50485dfb10c 100644 --- a/etcdserver/api/v2v3/server.go +++ b/etcdserver/api/v2v3/server.go @@ -19,14 +19,13 @@ import ( "net/http" "time" - "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.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.uber.org/zap" ) diff --git a/etcdserver/api/v2v3/store.go b/etcdserver/api/v2v3/store.go index f1c7ab3784d..e446ceda179 100644 --- a/etcdserver/api/v2v3/store.go +++ b/etcdserver/api/v2v3/store.go @@ -22,11 +22,11 @@ import ( "strings" "time" - "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" + "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" ) // store implements the Store interface for V2 using diff --git a/etcdserver/api/v2v3/watcher.go b/etcdserver/api/v2v3/watcher.go index e8a3557c1e9..b17ffa42783 100644 --- a/etcdserver/api/v2v3/watcher.go +++ b/etcdserver/api/v2v3/watcher.go @@ -18,9 +18,9 @@ import ( "context" "strings" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/etcdserver/api/v2error" - "go.etcd.io/etcd/etcdserver/api/v2store" + "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/etcdserver/api/v2error" + "go.etcd.io/etcd/v3/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 2b085a8e718..706780fd16b 100644 --- a/etcdserver/api/v3alarm/alarms.go +++ b/etcdserver/api/v3alarm/alarms.go @@ -18,11 +18,10 @@ package v3alarm import ( "sync" - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" - "go.etcd.io/etcd/mvcc/backend" - "go.etcd.io/etcd/pkg/types" - "github.com/coreos/pkg/capnslog" + pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/v3/pkg/types" ) var ( diff --git a/etcdserver/api/v3client/doc.go b/etcdserver/api/v3client/doc.go index 47922c43316..7adbec97b0f 100644 --- a/etcdserver/api/v3client/doc.go +++ b/etcdserver/api/v3client/doc.go @@ -19,8 +19,8 @@ // import ( // "context" // -// "go.etcd.io/etcd/embed" -// "go.etcd.io/etcd/etcdserver/api/v3client" +// "go.etcd.io/etcd/v3/embed" +// "go.etcd.io/etcd/v3/etcdserver/api/v3client" // ) // // ... diff --git a/etcdserver/api/v3client/v3client.go b/etcdserver/api/v3client/v3client.go index d2031213cfb..f2a401224a8 100644 --- a/etcdserver/api/v3client/v3client.go +++ b/etcdserver/api/v3client/v3client.go @@ -18,10 +18,10 @@ import ( "context" "time" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/etcdserver" - "go.etcd.io/etcd/etcdserver/api/v3rpc" - "go.etcd.io/etcd/proxy/grpcproxy/adapter" + "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" ) // 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 73a96842d1c..5135a301481 100644 --- a/etcdserver/api/v3compactor/compactor.go +++ b/etcdserver/api/v3compactor/compactor.go @@ -19,10 +19,9 @@ import ( "fmt" "time" - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" - "github.com/coreos/pkg/capnslog" "github.com/jonboulle/clockwork" + pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "go.uber.org/zap" ) diff --git a/etcdserver/api/v3compactor/compactor_test.go b/etcdserver/api/v3compactor/compactor_test.go index 76a11aeaf8f..c10a398581c 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/etcdserver/etcdserverpb" - "go.etcd.io/etcd/pkg/testutil" + pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + "go.etcd.io/etcd/v3/pkg/testutil" ) type fakeCompactable struct { diff --git a/etcdserver/api/v3compactor/periodic.go b/etcdserver/api/v3compactor/periodic.go index ab64cb70619..2c48c6f7a33 100644 --- a/etcdserver/api/v3compactor/periodic.go +++ b/etcdserver/api/v3compactor/periodic.go @@ -19,10 +19,9 @@ import ( "sync" "time" - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" - "go.etcd.io/etcd/mvcc" - "github.com/jonboulle/clockwork" + pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + "go.etcd.io/etcd/v3/mvcc" "go.uber.org/zap" ) diff --git a/etcdserver/api/v3compactor/periodic_test.go b/etcdserver/api/v3compactor/periodic_test.go index b9d49afa605..1f68fb1d51a 100644 --- a/etcdserver/api/v3compactor/periodic_test.go +++ b/etcdserver/api/v3compactor/periodic_test.go @@ -19,10 +19,9 @@ import ( "testing" "time" - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" - "go.etcd.io/etcd/pkg/testutil" - "github.com/jonboulle/clockwork" + pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + "go.etcd.io/etcd/v3/pkg/testutil" "go.uber.org/zap" ) diff --git a/etcdserver/api/v3compactor/revision.go b/etcdserver/api/v3compactor/revision.go index cf8ac430105..4d4ffed2af7 100644 --- a/etcdserver/api/v3compactor/revision.go +++ b/etcdserver/api/v3compactor/revision.go @@ -19,10 +19,9 @@ import ( "sync" "time" - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" - "go.etcd.io/etcd/mvcc" - "github.com/jonboulle/clockwork" + pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + "go.etcd.io/etcd/v3/mvcc" "go.uber.org/zap" ) diff --git a/etcdserver/api/v3compactor/revision_test.go b/etcdserver/api/v3compactor/revision_test.go index fcd01066fbf..ea3584b7736 100644 --- a/etcdserver/api/v3compactor/revision_test.go +++ b/etcdserver/api/v3compactor/revision_test.go @@ -19,10 +19,9 @@ import ( "testing" "time" - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" - "go.etcd.io/etcd/pkg/testutil" - "github.com/jonboulle/clockwork" + pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + "go.etcd.io/etcd/v3/pkg/testutil" "go.uber.org/zap" ) diff --git a/etcdserver/api/v3election/election.go b/etcdserver/api/v3election/election.go index f5a3be3b239..7a2058b0613 100644 --- a/etcdserver/api/v3election/election.go +++ b/etcdserver/api/v3election/election.go @@ -18,9 +18,9 @@ import ( "context" "errors" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/clientv3/concurrency" - epb "go.etcd.io/etcd/etcdserver/api/v3election/v3electionpb" + "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/clientv3/concurrency" + epb "go.etcd.io/etcd/v3/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 23551b54b60..d228ee56190 100644 --- a/etcdserver/api/v3election/v3electionpb/gw/v3election.pb.gw.go +++ b/etcdserver/api/v3election/v3electionpb/gw/v3election.pb.gw.go @@ -9,13 +9,13 @@ It translates gRPC into RESTful JSON APIs. package gw import ( - "go.etcd.io/etcd/etcdserver/api/v3election/v3electionpb" "io" "net/http" "github.com/golang/protobuf/proto" "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/grpc-ecosystem/grpc-gateway/utilities" + "go.etcd.io/etcd/v3/etcdserver/api/v3election/v3electionpb" "golang.org/x/net/context" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/etcdserver/api/v3election/v3electionpb/v3election.pb.go b/etcdserver/api/v3election/v3electionpb/v3election.pb.go index 1fc1bce442f..77f7361ff91 100644 --- a/etcdserver/api/v3election/v3electionpb/v3election.pb.go +++ b/etcdserver/api/v3election/v3electionpb/v3election.pb.go @@ -22,22 +22,15 @@ package v3electionpb import ( "fmt" - - proto "github.com/golang/protobuf/proto" - + io "io" math "math" _ "github.com/gogo/protobuf/gogoproto" - - etcdserverpb "go.etcd.io/etcd/etcdserver/etcdserverpb" - - mvccpb "go.etcd.io/etcd/mvcc/mvccpb" - + proto "github.com/golang/protobuf/proto" + etcdserverpb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + mvccpb "go.etcd.io/etcd/v3/mvcc/mvccpb" context "golang.org/x/net/context" - grpc "google.golang.org/grpc" - - io "io" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/etcdserver/api/v3lock/lock.go b/etcdserver/api/v3lock/lock.go index 5a17c86fc2b..ec3fb407edf 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/clientv3" - "go.etcd.io/etcd/clientv3/concurrency" - "go.etcd.io/etcd/etcdserver/api/v3lock/v3lockpb" + "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/clientv3/concurrency" + "go.etcd.io/etcd/v3/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 1eeeff1853f..bb2c415f463 100644 --- a/etcdserver/api/v3lock/v3lockpb/gw/v3lock.pb.gw.go +++ b/etcdserver/api/v3lock/v3lockpb/gw/v3lock.pb.gw.go @@ -9,13 +9,13 @@ It translates gRPC into RESTful JSON APIs. package gw import ( - "go.etcd.io/etcd/etcdserver/api/v3lock/v3lockpb" "io" "net/http" "github.com/golang/protobuf/proto" "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/grpc-ecosystem/grpc-gateway/utilities" + "go.etcd.io/etcd/v3/etcdserver/api/v3lock/v3lockpb" "golang.org/x/net/context" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/etcdserver/api/v3lock/v3lockpb/v3lock.pb.go b/etcdserver/api/v3lock/v3lockpb/v3lock.pb.go index 36ebdd90f4a..a35f5c3af55 100644 --- a/etcdserver/api/v3lock/v3lockpb/v3lock.pb.go +++ b/etcdserver/api/v3lock/v3lockpb/v3lock.pb.go @@ -17,20 +17,14 @@ package v3lockpb import ( "fmt" - - proto "github.com/golang/protobuf/proto" - + io "io" math "math" _ "github.com/gogo/protobuf/gogoproto" - - etcdserverpb "go.etcd.io/etcd/etcdserver/etcdserverpb" - + proto "github.com/golang/protobuf/proto" + etcdserverpb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" context "golang.org/x/net/context" - grpc "google.golang.org/grpc" - - io "io" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/etcdserver/api/v3rpc/auth.go b/etcdserver/api/v3rpc/auth.go index 62ce757beaa..71f068b6262 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/etcdserver" - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/v3/etcdserver" + pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" ) type AuthServer struct { diff --git a/etcdserver/api/v3rpc/grpc.go b/etcdserver/api/v3rpc/grpc.go index 957c8189573..9e195def3d2 100644 --- a/etcdserver/api/v3rpc/grpc.go +++ b/etcdserver/api/v3rpc/grpc.go @@ -18,11 +18,10 @@ import ( "crypto/tls" "math" - "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" + "go.etcd.io/etcd/v3/etcdserver" + pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "google.golang.org/grpc" "google.golang.org/grpc/credentials" "google.golang.org/grpc/health" diff --git a/etcdserver/api/v3rpc/header.go b/etcdserver/api/v3rpc/header.go index f23b6a73856..9a359fced75 100644 --- a/etcdserver/api/v3rpc/header.go +++ b/etcdserver/api/v3rpc/header.go @@ -15,8 +15,8 @@ package v3rpc import ( - "go.etcd.io/etcd/etcdserver" - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/v3/etcdserver" + pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" ) type header struct { diff --git a/etcdserver/api/v3rpc/interceptor.go b/etcdserver/api/v3rpc/interceptor.go index ce9047e80fd..7838b4d08a2 100644 --- a/etcdserver/api/v3rpc/interceptor.go +++ b/etcdserver/api/v3rpc/interceptor.go @@ -19,14 +19,13 @@ import ( "sync" "time" - "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/etcdserver/etcdserverpb" + "go.etcd.io/etcd/v3/etcdserver" + "go.etcd.io/etcd/v3/etcdserver/api" + "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/v3/raft" "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 fdb002e0dd8..bff8fee3533 100644 --- a/etcdserver/api/v3rpc/key.go +++ b/etcdserver/api/v3rpc/key.go @@ -18,12 +18,11 @@ package v3rpc import ( "context" - "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" + "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" ) var ( diff --git a/etcdserver/api/v3rpc/lease.go b/etcdserver/api/v3rpc/lease.go index 7441beedf15..39f65030a3e 100644 --- a/etcdserver/api/v3rpc/lease.go +++ b/etcdserver/api/v3rpc/lease.go @@ -18,11 +18,10 @@ import ( "context" "io" - "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.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.uber.org/zap" ) diff --git a/etcdserver/api/v3rpc/maintenance.go b/etcdserver/api/v3rpc/maintenance.go index c51271ac0fe..4d79d0e6139 100644 --- a/etcdserver/api/v3rpc/maintenance.go +++ b/etcdserver/api/v3rpc/maintenance.go @@ -19,15 +19,14 @@ import ( "crypto/sha256" "io" - "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.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.uber.org/zap" ) diff --git a/etcdserver/api/v3rpc/member.go b/etcdserver/api/v3rpc/member.go index b2ebc989840..d749f47db1a 100644 --- a/etcdserver/api/v3rpc/member.go +++ b/etcdserver/api/v3rpc/member.go @@ -18,12 +18,12 @@ import ( "context" "time" - "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" + "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" ) type ClusterServer struct { diff --git a/etcdserver/api/v3rpc/quota.go b/etcdserver/api/v3rpc/quota.go index a145b8b0911..b40edbdfc03 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/etcdserver" - "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" - "go.etcd.io/etcd/pkg/types" + "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" ) type quotaKVServer struct { diff --git a/etcdserver/api/v3rpc/util.go b/etcdserver/api/v3rpc/util.go index 748632b5e23..19f6e76c2be 100644 --- a/etcdserver/api/v3rpc/util.go +++ b/etcdserver/api/v3rpc/util.go @@ -18,14 +18,13 @@ import ( "context" "strings" - "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" - + "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" "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 e83144b961b..d4717f09d17 100644 --- a/etcdserver/api/v3rpc/util_test.go +++ b/etcdserver/api/v3rpc/util_test.go @@ -19,9 +19,8 @@ import ( "errors" "testing" - "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" - "go.etcd.io/etcd/mvcc" - + "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/v3/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 7848cdd04a2..3421d81ae50 100644 --- a/etcdserver/api/v3rpc/watch.go +++ b/etcdserver/api/v3rpc/watch.go @@ -21,13 +21,12 @@ import ( "sync" "time" - "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.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.uber.org/zap" ) diff --git a/etcdserver/api/v3rpc/watch_test.go b/etcdserver/api/v3rpc/watch_test.go index 66f584a0647..f507f5eabd8 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/etcdserver/etcdserverpb" - "go.etcd.io/etcd/mvcc/mvccpb" + pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + "go.etcd.io/etcd/v3/mvcc/mvccpb" ) func TestSendFragment(t *testing.T) { diff --git a/etcdserver/apply.go b/etcdserver/apply.go index 1f06ad0dd67..59d65d7f6cc 100644 --- a/etcdserver/apply.go +++ b/etcdserver/apply.go @@ -21,14 +21,13 @@ import ( "sort" "time" - "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.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.uber.org/zap" ) diff --git a/etcdserver/apply_auth.go b/etcdserver/apply_auth.go index 4b094ad5d8d..8761dbac3ca 100644 --- a/etcdserver/apply_auth.go +++ b/etcdserver/apply_auth.go @@ -17,10 +17,10 @@ package etcdserver import ( "sync" - "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/v3/auth" + pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + "go.etcd.io/etcd/v3/lease" + "go.etcd.io/etcd/v3/mvcc" ) type authApplierV3 struct { diff --git a/etcdserver/apply_v2.go b/etcdserver/apply_v2.go index c77df197061..20a12b8afe4 100644 --- a/etcdserver/apply_v2.go +++ b/etcdserver/apply_v2.go @@ -19,12 +19,11 @@ import ( "path" "time" - "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.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.uber.org/zap" ) diff --git a/etcdserver/backend.go b/etcdserver/backend.go index 7fd8d17b560..71186453982 100644 --- a/etcdserver/backend.go +++ b/etcdserver/backend.go @@ -19,12 +19,11 @@ import ( "os" "time" - "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.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.uber.org/zap" ) diff --git a/etcdserver/cluster_util.go b/etcdserver/cluster_util.go index f92706cb7a1..5d7b9c90c6e 100644 --- a/etcdserver/cluster_util.go +++ b/etcdserver/cluster_util.go @@ -24,11 +24,10 @@ import ( "strings" "time" - "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.etcd.io/etcd/v3/etcdserver/api/membership" + "go.etcd.io/etcd/v3/pkg/types" + "go.etcd.io/etcd/v3/version" "go.uber.org/zap" ) diff --git a/etcdserver/cluster_util_test.go b/etcdserver/cluster_util_test.go index 8a36a548b6e..243f6f7afdc 100644 --- a/etcdserver/cluster_util_test.go +++ b/etcdserver/cluster_util_test.go @@ -18,10 +18,9 @@ import ( "reflect" "testing" - "go.etcd.io/etcd/pkg/types" - "go.etcd.io/etcd/version" - "github.com/coreos/go-semver/semver" + "go.etcd.io/etcd/v3/pkg/types" + "go.etcd.io/etcd/v3/version" "go.uber.org/zap" ) diff --git a/etcdserver/config.go b/etcdserver/config.go index b0eaf18e7b9..c510f7eab4c 100644 --- a/etcdserver/config.go +++ b/etcdserver/config.go @@ -22,11 +22,10 @@ import ( "strings" "time" - "go.etcd.io/etcd/pkg/netutil" - "go.etcd.io/etcd/pkg/transport" - "go.etcd.io/etcd/pkg/types" - bolt "go.etcd.io/bbolt" + "go.etcd.io/etcd/v3/pkg/netutil" + "go.etcd.io/etcd/v3/pkg/transport" + "go.etcd.io/etcd/v3/pkg/types" "go.uber.org/zap" "go.uber.org/zap/zapcore" ) diff --git a/etcdserver/config_test.go b/etcdserver/config_test.go index 1d4157dc4cb..74f4ee9be8f 100644 --- a/etcdserver/config_test.go +++ b/etcdserver/config_test.go @@ -18,8 +18,7 @@ import ( "net/url" "testing" - "go.etcd.io/etcd/pkg/types" - + "go.etcd.io/etcd/v3/pkg/types" "go.uber.org/zap" ) @@ -196,8 +195,8 @@ func TestWALDir(t *testing.T) { func TestShouldDiscover(t *testing.T) { tests := map[string]bool{ - "": false, - "foo": true, + "": false, + "foo": true, "http://discovery.etcd.io/asdf": true, } for durl, w := range tests { diff --git a/etcdserver/corrupt.go b/etcdserver/corrupt.go index 32678a7c512..90f2ef92c7a 100644 --- a/etcdserver/corrupt.go +++ b/etcdserver/corrupt.go @@ -19,12 +19,11 @@ import ( "fmt" "time" - "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.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.uber.org/zap" ) diff --git a/etcdserver/etcdserverpb/gw/rpc.pb.gw.go b/etcdserver/etcdserverpb/gw/rpc.pb.gw.go index 904c32187fb..d09e3ad45d0 100644 --- a/etcdserver/etcdserverpb/gw/rpc.pb.gw.go +++ b/etcdserver/etcdserverpb/gw/rpc.pb.gw.go @@ -9,13 +9,13 @@ It translates gRPC into RESTful JSON APIs. package gw import ( - "go.etcd.io/etcd/etcdserver/etcdserverpb" "io" "net/http" "github.com/golang/protobuf/proto" "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/grpc-ecosystem/grpc-gateway/utilities" + "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "golang.org/x/net/context" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/etcdserver/etcdserverpb/rpc.pb.go b/etcdserver/etcdserverpb/rpc.pb.go index 6d728a59c81..288a1c5f362 100644 --- a/etcdserver/etcdserverpb/rpc.pb.go +++ b/etcdserver/etcdserverpb/rpc.pb.go @@ -5,22 +5,15 @@ package etcdserverpb import ( "fmt" - - proto "github.com/golang/protobuf/proto" - + io "io" math "math" _ "github.com/gogo/protobuf/gogoproto" - - mvccpb "go.etcd.io/etcd/mvcc/mvccpb" - - authpb "go.etcd.io/etcd/auth/authpb" - + proto "github.com/golang/protobuf/proto" + authpb "go.etcd.io/etcd/v3/auth/authpb" + mvccpb "go.etcd.io/etcd/v3/mvcc/mvccpb" context "golang.org/x/net/context" - grpc "google.golang.org/grpc" - - io "io" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/etcdserver/metrics.go b/etcdserver/metrics.go index 748e7edb5da..33141087bc1 100644 --- a/etcdserver/metrics.go +++ b/etcdserver/metrics.go @@ -18,10 +18,9 @@ import ( goruntime "runtime" "time" - "go.etcd.io/etcd/pkg/runtime" - "go.etcd.io/etcd/version" - "github.com/prometheus/client_golang/prometheus" + "go.etcd.io/etcd/v3/pkg/runtime" + "go.etcd.io/etcd/v3/version" "go.uber.org/zap" ) diff --git a/etcdserver/quota.go b/etcdserver/quota.go index 6d70430e73c..06394da658e 100644 --- a/etcdserver/quota.go +++ b/etcdserver/quota.go @@ -17,9 +17,8 @@ package etcdserver import ( "sync" - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" - humanize "github.com/dustin/go-humanize" + pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "go.uber.org/zap" ) diff --git a/etcdserver/raft.go b/etcdserver/raft.go index c03d2a7b8d1..2a8080db035 100644 --- a/etcdserver/raft.go +++ b/etcdserver/raft.go @@ -23,18 +23,17 @@ import ( "sync" "time" - "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.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.uber.org/zap" ) diff --git a/etcdserver/raft_test.go b/etcdserver/raft_test.go index 9d731c688e1..0d52eb6dacb 100644 --- a/etcdserver/raft_test.go +++ b/etcdserver/raft_test.go @@ -21,13 +21,12 @@ import ( "testing" "time" - "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.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.uber.org/zap" ) diff --git a/etcdserver/server.go b/etcdserver/server.go index 115ef8a90fb..bcc4ff60a4e 100644 --- a/etcdserver/server.go +++ b/etcdserver/server.go @@ -29,38 +29,37 @@ import ( "sync/atomic" "time" - "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" humanize "github.com/dustin/go-humanize" "github.com/prometheus/client_golang/prometheus" + "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.uber.org/zap" ) diff --git a/etcdserver/server_test.go b/etcdserver/server_test.go index 36550ba4c3d..d43296ed077 100644 --- a/etcdserver/server_test.go +++ b/etcdserver/server_test.go @@ -28,27 +28,26 @@ import ( "testing" "time" + "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.uber.org/zap" - - "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 41777681321..f095caf7d50 100644 --- a/etcdserver/snapshot_merge.go +++ b/etcdserver/snapshot_merge.go @@ -17,11 +17,10 @@ package etcdserver import ( "io" - "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.etcd.io/etcd/v3/etcdserver/api/snap" + "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/v3/raft/raftpb" "go.uber.org/zap" ) diff --git a/etcdserver/storage.go b/etcdserver/storage.go index d57b6f9a58d..b7169b06238 100644 --- a/etcdserver/storage.go +++ b/etcdserver/storage.go @@ -17,14 +17,13 @@ package etcdserver import ( "io" - "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.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.uber.org/zap" ) diff --git a/etcdserver/util.go b/etcdserver/util.go index fe5024ef00d..ffe7cfd7b10 100644 --- a/etcdserver/util.go +++ b/etcdserver/util.go @@ -21,11 +21,10 @@ import ( "time" "github.com/golang/protobuf/proto" - "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.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.uber.org/zap" ) diff --git a/etcdserver/util_test.go b/etcdserver/util_test.go index 6ec87bc89b3..e07eaf46600 100644 --- a/etcdserver/util_test.go +++ b/etcdserver/util_test.go @@ -19,13 +19,12 @@ import ( "testing" "time" + "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.uber.org/zap" - - "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 9238b2dc580..cf6bc05d602 100644 --- a/etcdserver/v2_server.go +++ b/etcdserver/v2_server.go @@ -18,8 +18,8 @@ import ( "context" "time" - "go.etcd.io/etcd/etcdserver/api/v2store" - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/v3/etcdserver/api/v2store" + pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" ) type RequestV2 pb.Request diff --git a/etcdserver/v3_server.go b/etcdserver/v3_server.go index b2084618b8a..2372905e727 100644 --- a/etcdserver/v3_server.go +++ b/etcdserver/v3_server.go @@ -20,15 +20,14 @@ import ( "encoding/binary" "time" - "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.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.uber.org/zap" ) diff --git a/functional/agent/handler.go b/functional/agent/handler.go index f1000624b00..dd3b273ea0d 100644 --- a/functional/agent/handler.go +++ b/functional/agent/handler.go @@ -25,11 +25,10 @@ import ( "syscall" "time" - "go.etcd.io/etcd/embed" - "go.etcd.io/etcd/functional/rpcpb" - "go.etcd.io/etcd/pkg/fileutil" - "go.etcd.io/etcd/pkg/proxy" - + "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.uber.org/zap" ) diff --git a/functional/agent/server.go b/functional/agent/server.go index a39f28e764c..fc907a7362f 100644 --- a/functional/agent/server.go +++ b/functional/agent/server.go @@ -21,10 +21,9 @@ import ( "os/exec" "strings" - "go.etcd.io/etcd/embed" - "go.etcd.io/etcd/functional/rpcpb" - "go.etcd.io/etcd/pkg/proxy" - + "go.etcd.io/etcd/v3/embed" + "go.etcd.io/etcd/v3/functional/rpcpb" + "go.etcd.io/etcd/v3/pkg/proxy" "go.uber.org/zap" "google.golang.org/grpc" ) diff --git a/functional/agent/utils.go b/functional/agent/utils.go index c0dd92fc52e..683df6e6c66 100644 --- a/functional/agent/utils.go +++ b/functional/agent/utils.go @@ -23,7 +23,7 @@ import ( "strconv" "time" - "go.etcd.io/etcd/pkg/fileutil" + "go.etcd.io/etcd/v3/pkg/fileutil" ) // TODO: support separate WAL directory diff --git a/functional/cmd/etcd-agent/main.go b/functional/cmd/etcd-agent/main.go index 87ab6ee7d76..7e323ce0a4a 100644 --- a/functional/cmd/etcd-agent/main.go +++ b/functional/cmd/etcd-agent/main.go @@ -18,8 +18,7 @@ package main import ( "flag" - "go.etcd.io/etcd/functional/agent" - + "go.etcd.io/etcd/v3/functional/agent" "go.uber.org/zap" ) diff --git a/functional/cmd/etcd-proxy/main.go b/functional/cmd/etcd-proxy/main.go index 56ca78eefb7..11894f06594 100644 --- a/functional/cmd/etcd-proxy/main.go +++ b/functional/cmd/etcd-proxy/main.go @@ -28,8 +28,7 @@ import ( "syscall" "time" - "go.etcd.io/etcd/pkg/proxy" - + "go.etcd.io/etcd/v3/pkg/proxy" "go.uber.org/zap" ) diff --git a/functional/cmd/etcd-runner/main.go b/functional/cmd/etcd-runner/main.go index f9e82766d3f..d776bd01df9 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/functional/runner" +import "go.etcd.io/etcd/v3/functional/runner" func main() { runner.Start() diff --git a/functional/cmd/etcd-tester/main.go b/functional/cmd/etcd-tester/main.go index fdf391fe8e1..4f436edc165 100644 --- a/functional/cmd/etcd-tester/main.go +++ b/functional/cmd/etcd-tester/main.go @@ -18,8 +18,7 @@ package main import ( "flag" - "go.etcd.io/etcd/functional/tester" - + "go.etcd.io/etcd/v3/functional/tester" "go.uber.org/zap" ) diff --git a/functional/rpcpb/etcd_config.go b/functional/rpcpb/etcd_config.go index feec424a867..b6cfe22f5c3 100644 --- a/functional/rpcpb/etcd_config.go +++ b/functional/rpcpb/etcd_config.go @@ -19,9 +19,9 @@ import ( "reflect" "strings" - "go.etcd.io/etcd/embed" - "go.etcd.io/etcd/pkg/transport" - "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/v3/embed" + "go.etcd.io/etcd/v3/pkg/transport" + "go.etcd.io/etcd/v3/pkg/types" ) var etcdFields = []string{ diff --git a/functional/rpcpb/etcd_config_test.go b/functional/rpcpb/etcd_config_test.go index a96b81f3474..c87a03be428 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/embed" - "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/v3/embed" + "go.etcd.io/etcd/v3/pkg/types" ) func TestEtcd(t *testing.T) { diff --git a/functional/rpcpb/member.go b/functional/rpcpb/member.go index 5b400bdc936..702eb44117d 100644 --- a/functional/rpcpb/member.go +++ b/functional/rpcpb/member.go @@ -22,12 +22,11 @@ import ( "os" "time" - "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.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.uber.org/zap" grpc "google.golang.org/grpc" "google.golang.org/grpc/credentials" diff --git a/functional/runner/election_command.go b/functional/runner/election_command.go index 0ced375461e..0f6241192c9 100644 --- a/functional/runner/election_command.go +++ b/functional/runner/election_command.go @@ -19,9 +19,8 @@ import ( "errors" "fmt" - "go.etcd.io/etcd/clientv3/concurrency" - "github.com/spf13/cobra" + "go.etcd.io/etcd/v3/clientv3/concurrency" ) // NewElectionCommand returns the cobra command for "election runner". diff --git a/functional/runner/error.go b/functional/runner/error.go index 403990539d6..39b325a8aae 100644 --- a/functional/runner/error.go +++ b/functional/runner/error.go @@ -18,7 +18,7 @@ import ( "fmt" "os" - "go.etcd.io/etcd/client" + "go.etcd.io/etcd/v3/client" ) const ( diff --git a/functional/runner/global.go b/functional/runner/global.go index f2f0dacea21..fd78355620b 100644 --- a/functional/runner/global.go +++ b/functional/runner/global.go @@ -21,9 +21,8 @@ import ( "sync" "time" - "go.etcd.io/etcd/clientv3" - "github.com/spf13/cobra" + "go.etcd.io/etcd/v3/clientv3" "golang.org/x/time/rate" ) diff --git a/functional/runner/help.go b/functional/runner/help.go index 394cec8403d..c8759b01f2f 100644 --- a/functional/runner/help.go +++ b/functional/runner/help.go @@ -25,10 +25,9 @@ import ( "text/tabwriter" "text/template" - "go.etcd.io/etcd/version" - "github.com/spf13/cobra" "github.com/spf13/pflag" + "go.etcd.io/etcd/v3/version" ) var ( diff --git a/functional/runner/lease_renewer_command.go b/functional/runner/lease_renewer_command.go index 78a65729d55..c0175350eb1 100644 --- a/functional/runner/lease_renewer_command.go +++ b/functional/runner/lease_renewer_command.go @@ -21,9 +21,8 @@ import ( "log" "time" - "go.etcd.io/etcd/clientv3" - "github.com/spf13/cobra" + "go.etcd.io/etcd/v3/clientv3" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/functional/runner/lock_racer_command.go b/functional/runner/lock_racer_command.go index cb98668cc23..07d6c6f7b50 100644 --- a/functional/runner/lock_racer_command.go +++ b/functional/runner/lock_racer_command.go @@ -20,9 +20,8 @@ import ( "fmt" "sync" - "go.etcd.io/etcd/clientv3/concurrency" - "github.com/spf13/cobra" + "go.etcd.io/etcd/v3/clientv3/concurrency" ) // NewLockRacerCommand returns the cobra command for "lock-racer runner". diff --git a/functional/runner/watch_command.go b/functional/runner/watch_command.go index cd3f202af20..b532f7cc13d 100644 --- a/functional/runner/watch_command.go +++ b/functional/runner/watch_command.go @@ -22,10 +22,9 @@ import ( "sync" "time" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/pkg/stringutil" - "github.com/spf13/cobra" + "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/pkg/stringutil" "golang.org/x/time/rate" ) diff --git a/functional/tester/case.go b/functional/tester/case.go index ce3e00f1243..08c323d7275 100644 --- a/functional/tester/case.go +++ b/functional/tester/case.go @@ -19,8 +19,7 @@ import ( "math/rand" "time" - "go.etcd.io/etcd/functional/rpcpb" - + "go.etcd.io/etcd/v3/functional/rpcpb" "go.uber.org/zap" ) diff --git a/functional/tester/case_external.go b/functional/tester/case_external.go index 8b22197adc4..a4e1c8846e5 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/functional/rpcpb" + "go.etcd.io/etcd/v3/functional/rpcpb" ) type caseExternal struct { diff --git a/functional/tester/case_failpoints.go b/functional/tester/case_failpoints.go index 08463084045..9c3deb4a37d 100644 --- a/functional/tester/case_failpoints.go +++ b/functional/tester/case_failpoints.go @@ -21,7 +21,7 @@ import ( "strings" "sync" - "go.etcd.io/etcd/functional/rpcpb" + "go.etcd.io/etcd/v3/functional/rpcpb" ) type failpointStats struct { diff --git a/functional/tester/case_network_blackhole.go b/functional/tester/case_network_blackhole.go index feee3b27a77..d9f05629104 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/functional/rpcpb" +import "go.etcd.io/etcd/v3/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 60da43378ba..59f125dc0a2 100644 --- a/functional/tester/case_network_delay.go +++ b/functional/tester/case_network_delay.go @@ -17,8 +17,7 @@ package tester import ( "time" - "go.etcd.io/etcd/functional/rpcpb" - + "go.etcd.io/etcd/v3/functional/rpcpb" "go.uber.org/zap" ) diff --git a/functional/tester/case_no_fail.go b/functional/tester/case_no_fail.go index f78fee85aab..3ea0a712784 100644 --- a/functional/tester/case_no_fail.go +++ b/functional/tester/case_no_fail.go @@ -17,8 +17,7 @@ package tester import ( "time" - "go.etcd.io/etcd/functional/rpcpb" - + "go.etcd.io/etcd/v3/functional/rpcpb" "go.uber.org/zap" ) diff --git a/functional/tester/case_sigquit_remove.go b/functional/tester/case_sigquit_remove.go index 6c3a795153b..50201f9567c 100644 --- a/functional/tester/case_sigquit_remove.go +++ b/functional/tester/case_sigquit_remove.go @@ -21,9 +21,8 @@ import ( "strings" "time" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/functional/rpcpb" - + "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/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 5fc78cdd3a4..60939b0302f 100644 --- a/functional/tester/case_sigquit_remove_quorum.go +++ b/functional/tester/case_sigquit_remove_quorum.go @@ -20,9 +20,8 @@ import ( "strings" "time" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/functional/rpcpb" - + "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/functional/rpcpb" "go.uber.org/zap" ) diff --git a/functional/tester/case_sigterm.go b/functional/tester/case_sigterm.go index a8c99bc8599..5c96a46087c 100644 --- a/functional/tester/case_sigterm.go +++ b/functional/tester/case_sigterm.go @@ -14,7 +14,7 @@ package tester -import "go.etcd.io/etcd/functional/rpcpb" +import "go.etcd.io/etcd/v3/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 7515bc93a0d..3ee78f935bb 100644 --- a/functional/tester/checker.go +++ b/functional/tester/checker.go @@ -14,7 +14,7 @@ package tester -import "go.etcd.io/etcd/functional/rpcpb" +import "go.etcd.io/etcd/v3/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 698367d2529..8b27ba22add 100644 --- a/functional/tester/checker_kv_hash.go +++ b/functional/tester/checker_kv_hash.go @@ -18,8 +18,7 @@ import ( "fmt" "time" - "go.etcd.io/etcd/functional/rpcpb" - + "go.etcd.io/etcd/v3/functional/rpcpb" "go.uber.org/zap" ) diff --git a/functional/tester/checker_lease_expire.go b/functional/tester/checker_lease_expire.go index 9a19e327b44..968a5e3b563 100644 --- a/functional/tester/checker_lease_expire.go +++ b/functional/tester/checker_lease_expire.go @@ -19,10 +19,9 @@ import ( "fmt" "time" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" - "go.etcd.io/etcd/functional/rpcpb" - + "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/v3/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 aa0a4dcb8da..7697aac850e 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/functional/rpcpb" +import "go.etcd.io/etcd/v3/functional/rpcpb" type noCheck struct{} diff --git a/functional/tester/checker_runner.go b/functional/tester/checker_runner.go index ea966540c97..42f6160a001 100644 --- a/functional/tester/checker_runner.go +++ b/functional/tester/checker_runner.go @@ -14,7 +14,7 @@ package tester -import "go.etcd.io/etcd/functional/rpcpb" +import "go.etcd.io/etcd/v3/functional/rpcpb" type runnerChecker struct { ctype rpcpb.Checker diff --git a/functional/tester/cluster.go b/functional/tester/cluster.go index 6dfb3085bbb..dda95b56fe3 100644 --- a/functional/tester/cluster.go +++ b/functional/tester/cluster.go @@ -29,11 +29,10 @@ import ( "sync" "time" - "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.etcd.io/etcd/v3/functional/rpcpb" + "go.etcd.io/etcd/v3/pkg/debugutil" + "go.etcd.io/etcd/v3/pkg/fileutil" "go.uber.org/zap" "golang.org/x/time/rate" "google.golang.org/grpc" diff --git a/functional/tester/cluster_read_config.go b/functional/tester/cluster_read_config.go index 4ce9d076e67..c22d27719b1 100644 --- a/functional/tester/cluster_read_config.go +++ b/functional/tester/cluster_read_config.go @@ -22,8 +22,7 @@ import ( "path/filepath" "strings" - "go.etcd.io/etcd/functional/rpcpb" - + "go.etcd.io/etcd/v3/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 f4091e0d844..014a5eca470 100644 --- a/functional/tester/cluster_run.go +++ b/functional/tester/cluster_run.go @@ -19,9 +19,8 @@ import ( "os" "time" - "go.etcd.io/etcd/functional/rpcpb" - "go.etcd.io/etcd/pkg/fileutil" - + "go.etcd.io/etcd/v3/functional/rpcpb" + "go.etcd.io/etcd/v3/pkg/fileutil" "go.uber.org/zap" ) diff --git a/functional/tester/cluster_test.go b/functional/tester/cluster_test.go index 7c7b25f2ad2..69dac2ea4d3 100644 --- a/functional/tester/cluster_test.go +++ b/functional/tester/cluster_test.go @@ -19,8 +19,7 @@ import ( "sort" "testing" - "go.etcd.io/etcd/functional/rpcpb" - + "go.etcd.io/etcd/v3/functional/rpcpb" "go.uber.org/zap" ) diff --git a/functional/tester/stresser.go b/functional/tester/stresser.go index 9a65eaa8bc9..0ef1c364318 100644 --- a/functional/tester/stresser.go +++ b/functional/tester/stresser.go @@ -18,8 +18,7 @@ import ( "fmt" "time" - "go.etcd.io/etcd/functional/rpcpb" - + "go.etcd.io/etcd/v3/functional/rpcpb" "go.uber.org/zap" ) diff --git a/functional/tester/stresser_key.go b/functional/tester/stresser_key.go index 7feec463732..8deb75d2e62 100644 --- a/functional/tester/stresser_key.go +++ b/functional/tester/stresser_key.go @@ -23,12 +23,11 @@ import ( "sync/atomic" "time" - "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.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.uber.org/zap" "golang.org/x/time/rate" "google.golang.org/grpc" diff --git a/functional/tester/stresser_lease.go b/functional/tester/stresser_lease.go index e54d9f5f1b2..c9c29656929 100644 --- a/functional/tester/stresser_lease.go +++ b/functional/tester/stresser_lease.go @@ -22,10 +22,9 @@ import ( "sync/atomic" "time" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" - "go.etcd.io/etcd/functional/rpcpb" - + "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/v3/functional/rpcpb" "go.uber.org/zap" "golang.org/x/time/rate" "google.golang.org/grpc" diff --git a/functional/tester/stresser_runner.go b/functional/tester/stresser_runner.go index e8e2bd1f888..294318afeba 100644 --- a/functional/tester/stresser_runner.go +++ b/functional/tester/stresser_runner.go @@ -20,8 +20,7 @@ import ( "os/exec" "syscall" - "go.etcd.io/etcd/functional/rpcpb" - + "go.etcd.io/etcd/v3/functional/rpcpb" "go.uber.org/zap" "golang.org/x/time/rate" ) diff --git a/integration/bridge.go b/integration/bridge.go index 483ee58296d..cedd16d3553 100644 --- a/integration/bridge.go +++ b/integration/bridge.go @@ -21,7 +21,7 @@ import ( "net" "sync" - "go.etcd.io/etcd/pkg/transport" + "go.etcd.io/etcd/v3/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 73b32cae1cc..faaf58cda95 100644 --- a/integration/cluster.go +++ b/integration/cluster.go @@ -33,27 +33,26 @@ import ( "testing" "time" - "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.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.uber.org/zap" "golang.org/x/crypto/bcrypt" "google.golang.org/grpc" diff --git a/integration/cluster_direct.go b/integration/cluster_direct.go index 8dd4d037077..600cabe3032 100644 --- a/integration/cluster_direct.go +++ b/integration/cluster_direct.go @@ -17,10 +17,10 @@ package integration import ( - "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" + "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" ) func toGRPC(c *clientv3.Client) grpcAPI { diff --git a/integration/cluster_proxy.go b/integration/cluster_proxy.go index 055a7388301..3c13bb4b916 100644 --- a/integration/cluster_proxy.go +++ b/integration/cluster_proxy.go @@ -19,10 +19,10 @@ package integration import ( "sync" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/clientv3/namespace" - "go.etcd.io/etcd/proxy/grpcproxy" - "go.etcd.io/etcd/proxy/grpcproxy/adapter" + "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" ) var ( diff --git a/integration/cluster_test.go b/integration/cluster_test.go index c1681da69ec..c305d6faa80 100644 --- a/integration/cluster_test.go +++ b/integration/cluster_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" - "go.etcd.io/etcd/client" - "go.etcd.io/etcd/etcdserver" - "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/v3/client" + "go.etcd.io/etcd/v3/etcdserver" + "go.etcd.io/etcd/v3/pkg/testutil" ) func init() { diff --git a/integration/embed_test.go b/integration/embed_test.go index c95d78d3567..a792681ac0d 100644 --- a/integration/embed_test.go +++ b/integration/embed_test.go @@ -28,8 +28,8 @@ import ( "testing" "time" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/embed" + "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/embed" ) func TestEmbedEtcd(t *testing.T) { diff --git a/integration/logger_test.go b/integration/logger_test.go index f36664ec76c..f9b2aeebd3b 100644 --- a/integration/logger_test.go +++ b/integration/logger_test.go @@ -17,8 +17,7 @@ package integration import ( "io/ioutil" - "go.etcd.io/etcd/clientv3" - + "go.etcd.io/etcd/v3/clientv3" "google.golang.org/grpc/grpclog" ) diff --git a/integration/main_test.go b/integration/main_test.go index c7362dde4fe..4dec98da4f8 100644 --- a/integration/main_test.go +++ b/integration/main_test.go @@ -8,7 +8,7 @@ import ( "os" "testing" - "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/v3/pkg/testutil" ) func TestMain(m *testing.M) { diff --git a/integration/member_test.go b/integration/member_test.go index 87a70dda0e3..dbffedb4aa4 100644 --- a/integration/member_test.go +++ b/integration/member_test.go @@ -22,8 +22,8 @@ import ( "reflect" "testing" - "go.etcd.io/etcd/client" - "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/v3/client" + "go.etcd.io/etcd/v3/pkg/testutil" ) func TestPauseMember(t *testing.T) { diff --git a/integration/metrics_test.go b/integration/metrics_test.go index 19547102bfa..313991a0dbe 100644 --- a/integration/metrics_test.go +++ b/integration/metrics_test.go @@ -21,10 +21,10 @@ import ( "testing" "time" - "go.etcd.io/etcd/etcdserver" - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" - "go.etcd.io/etcd/pkg/testutil" - "go.etcd.io/etcd/pkg/transport" + "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" ) // 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 e815d6842a2..b9786c60af6 100644 --- a/integration/network_partition_test.go +++ b/integration/network_partition_test.go @@ -19,7 +19,7 @@ import ( "testing" "time" - "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/v3/pkg/testutil" ) func TestNetworkPartition5MembersLeaderInMinority(t *testing.T) { diff --git a/integration/util_test.go b/integration/util_test.go index 616988e5e3f..399c25db299 100644 --- a/integration/util_test.go +++ b/integration/util_test.go @@ -19,7 +19,7 @@ import ( "os" "path/filepath" - "go.etcd.io/etcd/pkg/transport" + "go.etcd.io/etcd/v3/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 c42e5a87395..9e40e657640 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/pkg/testutil" - "go.etcd.io/etcd/pkg/transport" + "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/v3/pkg/transport" ) func TestV2Set(t *testing.T) { diff --git a/integration/v3_alarm_test.go b/integration/v3_alarm_test.go index 7d9adf956d7..1cfa5c4bc0d 100644 --- a/integration/v3_alarm_test.go +++ b/integration/v3_alarm_test.go @@ -22,12 +22,11 @@ import ( "testing" "time" - "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.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.uber.org/zap" ) diff --git a/integration/v3_auth_test.go b/integration/v3_auth_test.go index 76c73b0ec1c..7c4342a9ea6 100644 --- a/integration/v3_auth_test.go +++ b/integration/v3_auth_test.go @@ -21,11 +21,11 @@ import ( "testing" "time" - "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" + "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" ) // 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 54fa3be665e..891e959d041 100644 --- a/integration/v3_barrier_test.go +++ b/integration/v3_barrier_test.go @@ -18,9 +18,9 @@ import ( "testing" "time" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/contrib/recipes" - "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/v3/clientv3" + recipe "go.etcd.io/etcd/v3/contrib/recipes" + "go.etcd.io/etcd/v3/pkg/testutil" ) func TestBarrierSingleNode(t *testing.T) { diff --git a/integration/v3_double_barrier_test.go b/integration/v3_double_barrier_test.go index dc5acd84ca4..d1326ca5787 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/clientv3/concurrency" - "go.etcd.io/etcd/contrib/recipes" + "go.etcd.io/etcd/v3/clientv3/concurrency" + recipe "go.etcd.io/etcd/v3/contrib/recipes" ) func TestDoubleBarrier(t *testing.T) { diff --git a/integration/v3_election_test.go b/integration/v3_election_test.go index 4598448001b..4e74a404d7a 100644 --- a/integration/v3_election_test.go +++ b/integration/v3_election_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/clientv3/concurrency" + "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/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 1a0a11a8e1b..0bc7c773830 100644 --- a/integration/v3_grpc_inflight_test.go +++ b/integration/v3_grpc_inflight_test.go @@ -20,10 +20,9 @@ import ( "testing" "time" - "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/v3/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + "go.etcd.io/etcd/v3/pkg/testutil" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/integration/v3_grpc_test.go b/integration/v3_grpc_test.go index 331f2bc6054..72e3f039d2c 100644 --- a/integration/v3_grpc_test.go +++ b/integration/v3_grpc_test.go @@ -25,12 +25,11 @@ import ( "testing" "time" - "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" - + "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" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" diff --git a/integration/v3_health_test.go b/integration/v3_health_test.go index c5788fd12fc..e88b3c27afe 100644 --- a/integration/v3_health_test.go +++ b/integration/v3_health_test.go @@ -18,8 +18,7 @@ import ( "context" "testing" - "go.etcd.io/etcd/pkg/testutil" - + "go.etcd.io/etcd/v3/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 29818113a14..d3bc03b167c 100644 --- a/integration/v3_leadership_test.go +++ b/integration/v3_leadership_test.go @@ -20,9 +20,9 @@ import ( "testing" "time" - "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/v3/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + "go.etcd.io/etcd/v3/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 7b378f0c92f..949110017f8 100644 --- a/integration/v3_lease_test.go +++ b/integration/v3_lease_test.go @@ -20,11 +20,10 @@ import ( "testing" "time" - "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" - + "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" "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" diff --git a/integration/v3_lock_test.go b/integration/v3_lock_test.go index 10b501eafab..846bc6fec9b 100644 --- a/integration/v3_lock_test.go +++ b/integration/v3_lock_test.go @@ -21,11 +21,11 @@ import ( "testing" "time" - "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" + "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/clientv3/concurrency" + recipe "go.etcd.io/etcd/v3/contrib/recipes" + "go.etcd.io/etcd/v3/mvcc/mvccpb" + "go.etcd.io/etcd/v3/pkg/testutil" ) func TestMutexSingleNode(t *testing.T) { diff --git a/integration/v3_queue_test.go b/integration/v3_queue_test.go index c7349fd8410..ca94310b0c7 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/contrib/recipes" + recipe "go.etcd.io/etcd/v3/contrib/recipes" ) const ( diff --git a/integration/v3_stm_test.go b/integration/v3_stm_test.go index 25a1fd6c6d3..e62f8f7cb00 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/clientv3" - "go.etcd.io/etcd/clientv3/concurrency" - "go.etcd.io/etcd/pkg/testutil" + v3 "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/clientv3/concurrency" + "go.etcd.io/etcd/v3/pkg/testutil" ) // TestSTMConflict tests that conflicts are retried. diff --git a/integration/v3_tls_test.go b/integration/v3_tls_test.go index 324ce49df52..f3508f51ea6 100644 --- a/integration/v3_tls_test.go +++ b/integration/v3_tls_test.go @@ -20,9 +20,8 @@ import ( "testing" "time" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/pkg/testutil" - + "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/pkg/testutil" "google.golang.org/grpc" ) diff --git a/integration/v3_watch_restore_test.go b/integration/v3_watch_restore_test.go index c5dcb12c152..fd5ff26b699 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/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" ) // TestV3WatchRestoreSnapshotUnsync tests whether slow follower can restore diff --git a/integration/v3_watch_test.go b/integration/v3_watch_test.go index da255d569e5..22a3ea76364 100644 --- a/integration/v3_watch_test.go +++ b/integration/v3_watch_test.go @@ -24,10 +24,10 @@ import ( "testing" "time" - "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" + "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" ) // TestV3WatchFromCurrentRevision tests Watch APIs from current revision. diff --git a/integration/v3election_grpc_test.go b/integration/v3election_grpc_test.go index d49ad24fcb4..6231725829e 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/etcdserver/api/v3election/v3electionpb" - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" - "go.etcd.io/etcd/pkg/testutil" + 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" ) // TestV3ElectionCampaign checks that Campaign will not give diff --git a/integration/v3lock_grpc_test.go b/integration/v3lock_grpc_test.go index 05276669f3a..6ccc3ccafee 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/etcdserver/api/v3lock/v3lockpb" - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" - "go.etcd.io/etcd/pkg/testutil" + 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" ) // 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 67e916dba9e..27f042bb414 100644 --- a/lease/leasehttp/http.go +++ b/lease/leasehttp/http.go @@ -23,10 +23,10 @@ import ( "net/http" "time" - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" - "go.etcd.io/etcd/lease" - "go.etcd.io/etcd/lease/leasepb" - "go.etcd.io/etcd/pkg/httputil" + 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" ) var ( diff --git a/lease/leasehttp/http_test.go b/lease/leasehttp/http_test.go index 0802515d510..b57409541aa 100644 --- a/lease/leasehttp/http_test.go +++ b/lease/leasehttp/http_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - "go.etcd.io/etcd/lease" - "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/v3/lease" + "go.etcd.io/etcd/v3/mvcc/backend" "go.uber.org/zap" ) diff --git a/lease/leasepb/lease.pb.go b/lease/leasepb/lease.pb.go index 16637ee7e95..5b13980f751 100644 --- a/lease/leasepb/lease.pb.go +++ b/lease/leasepb/lease.pb.go @@ -16,16 +16,12 @@ package leasepb import ( "fmt" - - proto "github.com/golang/protobuf/proto" - + io "io" math "math" _ "github.com/gogo/protobuf/gogoproto" - - etcdserverpb "go.etcd.io/etcd/etcdserver/etcdserverpb" - - io "io" + proto "github.com/golang/protobuf/proto" + etcdserverpb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/lease/lessor.go b/lease/lessor.go index a208c82ea30..702f6ab99ae 100644 --- a/lease/lessor.go +++ b/lease/lessor.go @@ -24,9 +24,9 @@ import ( "sync" "time" - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" - "go.etcd.io/etcd/lease/leasepb" - "go.etcd.io/etcd/mvcc/backend" + pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + "go.etcd.io/etcd/v3/lease/leasepb" + "go.etcd.io/etcd/v3/mvcc/backend" "go.uber.org/zap" ) diff --git a/lease/lessor_bench_test.go b/lease/lessor_bench_test.go index 4f14654a56d..821032314db 100644 --- a/lease/lessor_bench_test.go +++ b/lease/lessor_bench_test.go @@ -18,7 +18,7 @@ import ( "os" "testing" - "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/v3/mvcc/backend" "go.uber.org/zap" ) diff --git a/lease/lessor_test.go b/lease/lessor_test.go index f1330ed7ebb..14b0fecab8e 100644 --- a/lease/lessor_test.go +++ b/lease/lessor_test.go @@ -26,8 +26,8 @@ import ( "testing" "time" - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" - "go.etcd.io/etcd/mvcc/backend" + pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + "go.etcd.io/etcd/v3/mvcc/backend" "go.uber.org/zap" ) diff --git a/main.go b/main.go index c03c49d1ee0..2284ebdcb42 100644 --- a/main.go +++ b/main.go @@ -22,7 +22,7 @@ // package main -import "go.etcd.io/etcd/etcdmain" +import "go.etcd.io/etcd/v3/etcdmain" func main() { etcdmain.Main() diff --git a/mvcc/kv.go b/mvcc/kv.go index 8e898a5ad3d..ba8b94f5d13 100644 --- a/mvcc/kv.go +++ b/mvcc/kv.go @@ -15,9 +15,9 @@ package mvcc import ( - "go.etcd.io/etcd/lease" - "go.etcd.io/etcd/mvcc/backend" - "go.etcd.io/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/v3/lease" + "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/v3/mvcc/mvccpb" ) type RangeOptions struct { diff --git a/mvcc/kv_test.go b/mvcc/kv_test.go index 2c02ec089e5..1c1a90da566 100644 --- a/mvcc/kv_test.go +++ b/mvcc/kv_test.go @@ -21,13 +21,12 @@ import ( "testing" "time" - "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" + "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.uber.org/zap" ) diff --git a/mvcc/kv_view.go b/mvcc/kv_view.go index bd2e77729ff..cab130591b0 100644 --- a/mvcc/kv_view.go +++ b/mvcc/kv_view.go @@ -14,7 +14,7 @@ package mvcc -import "go.etcd.io/etcd/lease" +import "go.etcd.io/etcd/v3/lease" type readView struct{ kv KV } diff --git a/mvcc/kvstore.go b/mvcc/kvstore.go index 187f94029b7..0642c3cd487 100644 --- a/mvcc/kvstore.go +++ b/mvcc/kvstore.go @@ -25,12 +25,11 @@ import ( "sync/atomic" "time" - "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.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.uber.org/zap" ) diff --git a/mvcc/kvstore_bench_test.go b/mvcc/kvstore_bench_test.go index 0467ee7b17d..62a4c52416d 100644 --- a/mvcc/kvstore_bench_test.go +++ b/mvcc/kvstore_bench_test.go @@ -18,9 +18,8 @@ import ( "sync/atomic" "testing" - "go.etcd.io/etcd/lease" - "go.etcd.io/etcd/mvcc/backend" - + "go.etcd.io/etcd/v3/lease" + "go.etcd.io/etcd/v3/mvcc/backend" "go.uber.org/zap" ) diff --git a/mvcc/kvstore_compaction_test.go b/mvcc/kvstore_compaction_test.go index dde51db8ac7..aed92b140bb 100644 --- a/mvcc/kvstore_compaction_test.go +++ b/mvcc/kvstore_compaction_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" - "go.etcd.io/etcd/lease" - "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/v3/lease" + "go.etcd.io/etcd/v3/mvcc/backend" "go.uber.org/zap" ) diff --git a/mvcc/kvstore_test.go b/mvcc/kvstore_test.go index 91183969901..810b5844af8 100644 --- a/mvcc/kvstore_test.go +++ b/mvcc/kvstore_test.go @@ -26,12 +26,11 @@ import ( "testing" "time" - "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.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.uber.org/zap" ) diff --git a/mvcc/kvstore_txn.go b/mvcc/kvstore_txn.go index 088ea734141..4f51fbe45fd 100644 --- a/mvcc/kvstore_txn.go +++ b/mvcc/kvstore_txn.go @@ -15,9 +15,9 @@ package mvcc import ( - "go.etcd.io/etcd/lease" - "go.etcd.io/etcd/mvcc/backend" - "go.etcd.io/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/v3/lease" + "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/v3/mvcc/mvccpb" "go.uber.org/zap" ) diff --git a/mvcc/metrics_txn.go b/mvcc/metrics_txn.go index b4a29bc9523..4a43bdb974a 100644 --- a/mvcc/metrics_txn.go +++ b/mvcc/metrics_txn.go @@ -14,7 +14,7 @@ package mvcc -import "go.etcd.io/etcd/lease" +import "go.etcd.io/etcd/v3/lease" type metricsTxnWrite struct { TxnWrite diff --git a/mvcc/util.go b/mvcc/util.go index 032621aedd9..86d4805feb1 100644 --- a/mvcc/util.go +++ b/mvcc/util.go @@ -18,8 +18,8 @@ import ( "encoding/binary" "fmt" - "go.etcd.io/etcd/mvcc/backend" - "go.etcd.io/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/v3/mvcc/mvccpb" ) func UpdateConsistentIndex(be backend.Backend, index uint64) { diff --git a/mvcc/watchable_store.go b/mvcc/watchable_store.go index 46a9af5ed7e..960bc358a2d 100644 --- a/mvcc/watchable_store.go +++ b/mvcc/watchable_store.go @@ -18,9 +18,9 @@ import ( "sync" "time" - "go.etcd.io/etcd/lease" - "go.etcd.io/etcd/mvcc/backend" - "go.etcd.io/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/v3/lease" + "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/v3/mvcc/mvccpb" "go.uber.org/zap" ) diff --git a/mvcc/watchable_store_bench_test.go b/mvcc/watchable_store_bench_test.go index 07b8f351a4d..d0f6a2117b7 100644 --- a/mvcc/watchable_store_bench_test.go +++ b/mvcc/watchable_store_bench_test.go @@ -19,9 +19,8 @@ import ( "os" "testing" - "go.etcd.io/etcd/lease" - "go.etcd.io/etcd/mvcc/backend" - + "go.etcd.io/etcd/v3/lease" + "go.etcd.io/etcd/v3/mvcc/backend" "go.uber.org/zap" ) diff --git a/mvcc/watchable_store_test.go b/mvcc/watchable_store_test.go index 167315f1c49..54176c4f1f7 100644 --- a/mvcc/watchable_store_test.go +++ b/mvcc/watchable_store_test.go @@ -23,9 +23,9 @@ import ( "testing" "time" - "go.etcd.io/etcd/lease" - "go.etcd.io/etcd/mvcc/backend" - "go.etcd.io/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/v3/lease" + "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/v3/mvcc/mvccpb" "go.uber.org/zap" ) diff --git a/mvcc/watchable_store_txn.go b/mvcc/watchable_store_txn.go index 3bcfa4d7566..fcfd7cd8432 100644 --- a/mvcc/watchable_store_txn.go +++ b/mvcc/watchable_store_txn.go @@ -14,7 +14,7 @@ package mvcc -import "go.etcd.io/etcd/mvcc/mvccpb" +import "go.etcd.io/etcd/v3/mvcc/mvccpb" func (tw *watchableStoreTxnWrite) End() { changes := tw.Changes() diff --git a/mvcc/watcher.go b/mvcc/watcher.go index 2846d62a5d4..2a3cb4adaa6 100644 --- a/mvcc/watcher.go +++ b/mvcc/watcher.go @@ -19,7 +19,7 @@ import ( "errors" "sync" - "go.etcd.io/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/v3/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 8a2ba61df95..947d170acbd 100644 --- a/mvcc/watcher_bench_test.go +++ b/mvcc/watcher_bench_test.go @@ -18,9 +18,8 @@ import ( "fmt" "testing" - "go.etcd.io/etcd/lease" - "go.etcd.io/etcd/mvcc/backend" - + "go.etcd.io/etcd/v3/lease" + "go.etcd.io/etcd/v3/mvcc/backend" "go.uber.org/zap" ) diff --git a/mvcc/watcher_group.go b/mvcc/watcher_group.go index 07029335a85..2dcb69e5c8e 100644 --- a/mvcc/watcher_group.go +++ b/mvcc/watcher_group.go @@ -18,8 +18,8 @@ import ( "fmt" "math" - "go.etcd.io/etcd/mvcc/mvccpb" - "go.etcd.io/etcd/pkg/adt" + "go.etcd.io/etcd/v3/mvcc/mvccpb" + "go.etcd.io/etcd/v3/pkg/adt" ) var ( diff --git a/mvcc/watcher_test.go b/mvcc/watcher_test.go index cb4e13b1863..12fa4779842 100644 --- a/mvcc/watcher_test.go +++ b/mvcc/watcher_test.go @@ -22,9 +22,9 @@ import ( "testing" "time" - "go.etcd.io/etcd/lease" - "go.etcd.io/etcd/mvcc/backend" - "go.etcd.io/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/v3/lease" + "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/v3/mvcc/mvccpb" "go.uber.org/zap" ) diff --git a/pkg/adt/example_test.go b/pkg/adt/example_test.go index e3edf225c46..7a7f98d71f6 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/pkg/adt" + "go.etcd.io/etcd/v3/pkg/adt" ) func Example() { diff --git a/pkg/flags/unique_urls.go b/pkg/flags/unique_urls.go index 9b4178c3a14..6eea99f0e72 100644 --- a/pkg/flags/unique_urls.go +++ b/pkg/flags/unique_urls.go @@ -20,7 +20,7 @@ import ( "sort" "strings" - "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/v3/pkg/types" ) // UniqueURLs contains unique URLs diff --git a/pkg/flags/urls.go b/pkg/flags/urls.go index ca90970c2b9..48aef30bf67 100644 --- a/pkg/flags/urls.go +++ b/pkg/flags/urls.go @@ -19,7 +19,7 @@ import ( "net/url" "strings" - "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/v3/pkg/types" ) // URLsValue wraps "types.URLs". diff --git a/pkg/ioutil/util.go b/pkg/ioutil/util.go index 6a6746e0b56..cf0b360af71 100644 --- a/pkg/ioutil/util.go +++ b/pkg/ioutil/util.go @@ -18,7 +18,7 @@ import ( "io" "os" - "go.etcd.io/etcd/pkg/fileutil" + "go.etcd.io/etcd/v3/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 3120665009e..a6245533d9c 100644 --- a/pkg/logutil/logger_test.go +++ b/pkg/logutil/logger_test.go @@ -20,8 +20,7 @@ import ( "strings" "testing" - "go.etcd.io/etcd/pkg/logutil" - + "go.etcd.io/etcd/v3/pkg/logutil" "google.golang.org/grpc/grpclog" ) diff --git a/pkg/logutil/package_logger_test.go b/pkg/logutil/package_logger_test.go index fa9887126b8..00df1a3e529 100644 --- a/pkg/logutil/package_logger_test.go +++ b/pkg/logutil/package_logger_test.go @@ -20,9 +20,8 @@ import ( "strings" "testing" - "go.etcd.io/etcd/pkg/logutil" - "github.com/coreos/pkg/capnslog" + "go.etcd.io/etcd/v3/pkg/logutil" ) func TestPackageLogger(t *testing.T) { diff --git a/pkg/logutil/zap_journal.go b/pkg/logutil/zap_journal.go index fcd39038107..4df89c66ba5 100644 --- a/pkg/logutil/zap_journal.go +++ b/pkg/logutil/zap_journal.go @@ -24,9 +24,8 @@ import ( "os" "path/filepath" - "go.etcd.io/etcd/pkg/systemd" - "github.com/coreos/go-systemd/journal" + "go.etcd.io/etcd/v3/pkg/systemd" "go.uber.org/zap/zapcore" ) diff --git a/pkg/logutil/zap_raft.go b/pkg/logutil/zap_raft.go index e92cba04cbf..67cc770bf4b 100644 --- a/pkg/logutil/zap_raft.go +++ b/pkg/logutil/zap_raft.go @@ -17,8 +17,7 @@ package logutil import ( "errors" - "go.etcd.io/etcd/raft" - + "go.etcd.io/etcd/v3/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 59c543eafe8..73b7952b605 100644 --- a/pkg/mock/mockserver/mockserver.go +++ b/pkg/mock/mockserver/mockserver.go @@ -22,8 +22,7 @@ import ( "os" "sync" - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" - + pb "go.etcd.io/etcd/v3/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 d05413e62a7..e1fa7f9fdb5 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/pkg/testutil" - "go.etcd.io/etcd/raft" - "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/v3/raft" + "go.etcd.io/etcd/v3/raft/raftpb" ) type storageRecorder struct { diff --git a/pkg/mock/mockstore/store_recorder.go b/pkg/mock/mockstore/store_recorder.go index 2f4bf45dbe2..386b266bf51 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/etcdserver/api/v2store" - "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/v3/etcdserver/api/v2store" + "go.etcd.io/etcd/v3/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 eff1a476605..f6bd657d40e 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/pkg/testutil" - "go.etcd.io/etcd/pkg/wait" + "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/v3/pkg/wait" ) type WaitRecorder struct { diff --git a/pkg/netutil/netutil.go b/pkg/netutil/netutil.go index faef6466eeb..68b1ea89ad6 100644 --- a/pkg/netutil/netutil.go +++ b/pkg/netutil/netutil.go @@ -23,8 +23,7 @@ import ( "sort" "time" - "go.etcd.io/etcd/pkg/types" - + "go.etcd.io/etcd/v3/pkg/types" "go.uber.org/zap" ) diff --git a/pkg/netutil/routes_linux.go b/pkg/netutil/routes_linux.go index 5118d3dacd2..b87ef9d0537 100644 --- a/pkg/netutil/routes_linux.go +++ b/pkg/netutil/routes_linux.go @@ -24,7 +24,7 @@ import ( "sort" "syscall" - "go.etcd.io/etcd/pkg/cpuutil" + "go.etcd.io/etcd/v3/pkg/cpuutil" ) var errNoDefaultRoute = fmt.Errorf("could not find default route") diff --git a/pkg/proxy/server.go b/pkg/proxy/server.go index 6e037ec5d18..b7b7ee88e46 100644 --- a/pkg/proxy/server.go +++ b/pkg/proxy/server.go @@ -26,9 +26,8 @@ import ( "sync" "time" - "go.etcd.io/etcd/pkg/transport" - humanize "github.com/dustin/go-humanize" + "go.etcd.io/etcd/v3/pkg/transport" "go.uber.org/zap" ) diff --git a/pkg/proxy/server_test.go b/pkg/proxy/server_test.go index 1ca0b6878c6..f1e8c9dc03a 100644 --- a/pkg/proxy/server_test.go +++ b/pkg/proxy/server_test.go @@ -29,8 +29,7 @@ import ( "testing" "time" - "go.etcd.io/etcd/pkg/transport" - + "go.etcd.io/etcd/v3/pkg/transport" "go.uber.org/zap" ) diff --git a/pkg/srv/srv.go b/pkg/srv/srv.go index c3560026d48..5e20f40993a 100644 --- a/pkg/srv/srv.go +++ b/pkg/srv/srv.go @@ -21,7 +21,7 @@ import ( "net/url" "strings" - "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/v3/pkg/types" ) var ( diff --git a/pkg/srv/srv_test.go b/pkg/srv/srv_test.go index 24a7cf22d5d..26f2dddba3f 100644 --- a/pkg/srv/srv_test.go +++ b/pkg/srv/srv_test.go @@ -21,7 +21,7 @@ import ( "strings" "testing" - "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/v3/pkg/testutil" ) func TestSRVGetCluster(t *testing.T) { diff --git a/pkg/testutil/leak.go b/pkg/testutil/leak.go index 27eaa36d232..74a0ebbe50c 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/pkg/testutil" + import "go.etcd.io/etcd/v3/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/pkg/testutil.interestingGoroutines") || - strings.Contains(stack, "go.etcd.io/etcd/pkg/logutil.(*MergeLogger).outputLoop") || + 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, "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 0c593e8e2bf..307b2841e07 100644 --- a/pkg/transport/listener.go +++ b/pkg/transport/listener.go @@ -31,8 +31,7 @@ import ( "strings" "time" - "go.etcd.io/etcd/pkg/tlsutil" - + "go.etcd.io/etcd/v3/pkg/tlsutil" "go.uber.org/zap" ) diff --git a/pkg/types/urls_test.go b/pkg/types/urls_test.go index 268cb8b1629..98a698ff7e5 100644 --- a/pkg/types/urls_test.go +++ b/pkg/types/urls_test.go @@ -18,7 +18,7 @@ import ( "reflect" "testing" - "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/v3/pkg/testutil" ) func TestNewURLs(t *testing.T) { diff --git a/pkg/types/urlsmap_test.go b/pkg/types/urlsmap_test.go index 35f34ab7c09..cdae85b1983 100644 --- a/pkg/types/urlsmap_test.go +++ b/pkg/types/urlsmap_test.go @@ -15,9 +15,10 @@ package types import ( - "go.etcd.io/etcd/pkg/testutil" "reflect" "testing" + + "go.etcd.io/etcd/v3/pkg/testutil" ) func TestParseInitialCluster(t *testing.T) { diff --git a/proxy/grpcproxy/adapter/auth_client_adapter.go b/proxy/grpcproxy/adapter/auth_client_adapter.go index 59dbe6b0e88..33473c92f3f 100644 --- a/proxy/grpcproxy/adapter/auth_client_adapter.go +++ b/proxy/grpcproxy/adapter/auth_client_adapter.go @@ -17,8 +17,7 @@ package adapter import ( "context" - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" - + pb "go.etcd.io/etcd/v3/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 73a6fdfcba5..cb6af1a6be1 100644 --- a/proxy/grpcproxy/adapter/cluster_client_adapter.go +++ b/proxy/grpcproxy/adapter/cluster_client_adapter.go @@ -17,8 +17,7 @@ package adapter import ( "context" - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" - + pb "go.etcd.io/etcd/v3/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 4722be04039..11c4198bdac 100644 --- a/proxy/grpcproxy/adapter/election_client_adapter.go +++ b/proxy/grpcproxy/adapter/election_client_adapter.go @@ -17,8 +17,7 @@ package adapter import ( "context" - "go.etcd.io/etcd/etcdserver/api/v3election/v3electionpb" - + "go.etcd.io/etcd/v3/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 b1a78209947..95acb714fa7 100644 --- a/proxy/grpcproxy/adapter/kv_client_adapter.go +++ b/proxy/grpcproxy/adapter/kv_client_adapter.go @@ -17,8 +17,7 @@ package adapter import ( "context" - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" - + pb "go.etcd.io/etcd/v3/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 a58408f9f29..603e88b5d9a 100644 --- a/proxy/grpcproxy/adapter/lease_client_adapter.go +++ b/proxy/grpcproxy/adapter/lease_client_adapter.go @@ -17,8 +17,7 @@ package adapter import ( "context" - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" - + pb "go.etcd.io/etcd/v3/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 65b5641d34f..daca55fe2d5 100644 --- a/proxy/grpcproxy/adapter/lock_client_adapter.go +++ b/proxy/grpcproxy/adapter/lock_client_adapter.go @@ -17,8 +17,7 @@ package adapter import ( "context" - "go.etcd.io/etcd/etcdserver/api/v3lock/v3lockpb" - + "go.etcd.io/etcd/v3/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 4a8781b13ad..e37321abf42 100644 --- a/proxy/grpcproxy/adapter/maintenance_client_adapter.go +++ b/proxy/grpcproxy/adapter/maintenance_client_adapter.go @@ -17,8 +17,7 @@ package adapter import ( "context" - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" - + pb "go.etcd.io/etcd/v3/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 2f629cc1563..5bede2594a9 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/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "google.golang.org/grpc" ) diff --git a/proxy/grpcproxy/auth.go b/proxy/grpcproxy/auth.go index e2c7f8c4be3..9d86d157c93 100644 --- a/proxy/grpcproxy/auth.go +++ b/proxy/grpcproxy/auth.go @@ -17,8 +17,8 @@ package grpcproxy import ( "context" - "go.etcd.io/etcd/clientv3" - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/v3/clientv3" + pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" ) type AuthProxy struct { diff --git a/proxy/grpcproxy/cache/store.go b/proxy/grpcproxy/cache/store.go index 1f9688b895f..050a8b7205c 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/etcdserver/api/v3rpc/rpctypes" - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" - "go.etcd.io/etcd/pkg/adt" + "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + "go.etcd.io/etcd/v3/pkg/adt" ) var ( diff --git a/proxy/grpcproxy/cluster.go b/proxy/grpcproxy/cluster.go index 7e5059cfb31..697f7017fda 100644 --- a/proxy/grpcproxy/cluster.go +++ b/proxy/grpcproxy/cluster.go @@ -21,11 +21,10 @@ import ( "os" "sync" - "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" - + "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" "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 7786817446c..de06bab432a 100644 --- a/proxy/grpcproxy/cluster_test.go +++ b/proxy/grpcproxy/cluster_test.go @@ -20,11 +20,10 @@ import ( "testing" "time" - "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/v3/clientv3" + pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + "go.etcd.io/etcd/v3/integration" + "go.etcd.io/etcd/v3/pkg/testutil" "google.golang.org/grpc" ) diff --git a/proxy/grpcproxy/election.go b/proxy/grpcproxy/election.go index 8a80809d222..49421b6ea59 100644 --- a/proxy/grpcproxy/election.go +++ b/proxy/grpcproxy/election.go @@ -17,8 +17,8 @@ package grpcproxy import ( "context" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/etcdserver/api/v3election/v3electionpb" + "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/etcdserver/api/v3election/v3electionpb" ) type electionProxy struct { diff --git a/proxy/grpcproxy/health.go b/proxy/grpcproxy/health.go index 4756cff2ed4..6f7e478eaa5 100644 --- a/proxy/grpcproxy/health.go +++ b/proxy/grpcproxy/health.go @@ -19,9 +19,9 @@ import ( "net/http" "time" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/etcdserver/api/etcdhttp" - "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/etcdserver/api/etcdhttp" + "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" ) // HandleHealth registers health handler on '/health'. diff --git a/proxy/grpcproxy/kv.go b/proxy/grpcproxy/kv.go index d3a350994b1..7340326f53d 100644 --- a/proxy/grpcproxy/kv.go +++ b/proxy/grpcproxy/kv.go @@ -17,9 +17,9 @@ package grpcproxy import ( "context" - "go.etcd.io/etcd/clientv3" - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" - "go.etcd.io/etcd/proxy/grpcproxy/cache" + "go.etcd.io/etcd/v3/clientv3" + pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + "go.etcd.io/etcd/v3/proxy/grpcproxy/cache" ) type kvProxy struct { diff --git a/proxy/grpcproxy/kv_test.go b/proxy/grpcproxy/kv_test.go index a1d29e179b6..0f9bf0827d4 100644 --- a/proxy/grpcproxy/kv_test.go +++ b/proxy/grpcproxy/kv_test.go @@ -20,11 +20,10 @@ import ( "testing" "time" - "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/v3/clientv3" + pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + "go.etcd.io/etcd/v3/integration" + "go.etcd.io/etcd/v3/pkg/testutil" "google.golang.org/grpc" ) diff --git a/proxy/grpcproxy/leader.go b/proxy/grpcproxy/leader.go index bba2b97036f..a01ac4574f7 100644 --- a/proxy/grpcproxy/leader.go +++ b/proxy/grpcproxy/leader.go @@ -19,8 +19,7 @@ import ( "math" "sync" - "go.etcd.io/etcd/clientv3" - + "go.etcd.io/etcd/v3/clientv3" "golang.org/x/time/rate" ) diff --git a/proxy/grpcproxy/lease.go b/proxy/grpcproxy/lease.go index a688d429a20..f627c398469 100644 --- a/proxy/grpcproxy/lease.go +++ b/proxy/grpcproxy/lease.go @@ -21,10 +21,9 @@ import ( "sync/atomic" "time" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" - + "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "google.golang.org/grpc" "google.golang.org/grpc/metadata" ) diff --git a/proxy/grpcproxy/lock.go b/proxy/grpcproxy/lock.go index 9e1543d8309..4a903b74300 100644 --- a/proxy/grpcproxy/lock.go +++ b/proxy/grpcproxy/lock.go @@ -17,8 +17,8 @@ package grpcproxy import ( "context" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/etcdserver/api/v3lock/v3lockpb" + "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/etcdserver/api/v3lock/v3lockpb" ) type lockProxy struct { diff --git a/proxy/grpcproxy/maintenance.go b/proxy/grpcproxy/maintenance.go index 5e1e7517626..ab35b47f1a3 100644 --- a/proxy/grpcproxy/maintenance.go +++ b/proxy/grpcproxy/maintenance.go @@ -18,8 +18,8 @@ import ( "context" "io" - "go.etcd.io/etcd/clientv3" - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/v3/clientv3" + pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" ) type maintenanceProxy struct { diff --git a/proxy/grpcproxy/metrics.go b/proxy/grpcproxy/metrics.go index fcab53d84e0..5992df78b55 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/etcdserver/api/etcdhttp" + "go.etcd.io/etcd/v3/etcdserver/api/etcdhttp" ) var ( diff --git a/proxy/grpcproxy/register.go b/proxy/grpcproxy/register.go index ba628c3ebca..eccc6799ff2 100644 --- a/proxy/grpcproxy/register.go +++ b/proxy/grpcproxy/register.go @@ -18,10 +18,9 @@ import ( "encoding/json" "os" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/clientv3/concurrency" - "go.etcd.io/etcd/clientv3/naming" - + "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/clientv3/concurrency" + "go.etcd.io/etcd/v3/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 33b01547c0e..3ded4cba00a 100644 --- a/proxy/grpcproxy/register_test.go +++ b/proxy/grpcproxy/register_test.go @@ -18,11 +18,10 @@ import ( "testing" "time" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/clientv3/naming" - "go.etcd.io/etcd/integration" - "go.etcd.io/etcd/pkg/testutil" - + "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" gnaming "google.golang.org/grpc/naming" ) diff --git a/proxy/grpcproxy/util.go b/proxy/grpcproxy/util.go index 266ae7d723b..125267c1c19 100644 --- a/proxy/grpcproxy/util.go +++ b/proxy/grpcproxy/util.go @@ -17,8 +17,7 @@ package grpcproxy import ( "context" - "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" - + "go.etcd.io/etcd/v3/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 639bf8e2d60..beb950571f2 100644 --- a/proxy/grpcproxy/watch.go +++ b/proxy/grpcproxy/watch.go @@ -18,11 +18,10 @@ import ( "context" "sync" - "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" - + "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" "google.golang.org/grpc" "google.golang.org/grpc/metadata" ) diff --git a/proxy/grpcproxy/watch_broadcast.go b/proxy/grpcproxy/watch_broadcast.go index f9d2b148a2b..d43112ec89d 100644 --- a/proxy/grpcproxy/watch_broadcast.go +++ b/proxy/grpcproxy/watch_broadcast.go @@ -18,8 +18,8 @@ import ( "context" "sync" - "go.etcd.io/etcd/clientv3" - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/v3/clientv3" + pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" ) // watchBroadcast broadcasts a server watcher to many client watchers. diff --git a/proxy/grpcproxy/watcher.go b/proxy/grpcproxy/watcher.go index 0068a69e515..b994ec2f76c 100644 --- a/proxy/grpcproxy/watcher.go +++ b/proxy/grpcproxy/watcher.go @@ -17,10 +17,10 @@ package grpcproxy import ( "time" - "go.etcd.io/etcd/clientv3" - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" - "go.etcd.io/etcd/mvcc" - "go.etcd.io/etcd/mvcc/mvccpb" + "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" ) type watchRange struct { diff --git a/proxy/httpproxy/reverse.go b/proxy/httpproxy/reverse.go index edbeaaa9723..c74a837fe4b 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/etcdserver/api/v2http/httptypes" + "go.etcd.io/etcd/v3/etcdserver/api/v2http/httptypes" ) var ( diff --git a/raft/example_test.go b/raft/example_test.go index b56d2a28fa4..11934b23ca9 100644 --- a/raft/example_test.go +++ b/raft/example_test.go @@ -15,7 +15,7 @@ package raft import ( - pb "go.etcd.io/etcd/raft/raftpb" + pb "go.etcd.io/etcd/v3/raft/raftpb" ) func applyToStore(ents []pb.Entry) {} diff --git a/raft/log.go b/raft/log.go index 77eedfccbad..f9ed4dc5d17 100644 --- a/raft/log.go +++ b/raft/log.go @@ -18,7 +18,7 @@ import ( "fmt" "log" - pb "go.etcd.io/etcd/raft/raftpb" + pb "go.etcd.io/etcd/v3/raft/raftpb" ) type raftLog struct { diff --git a/raft/log_test.go b/raft/log_test.go index a9ee6ce066b..6db6f8d91a0 100644 --- a/raft/log_test.go +++ b/raft/log_test.go @@ -18,7 +18,7 @@ import ( "reflect" "testing" - pb "go.etcd.io/etcd/raft/raftpb" + pb "go.etcd.io/etcd/v3/raft/raftpb" ) func TestFindConflict(t *testing.T) { diff --git a/raft/log_unstable.go b/raft/log_unstable.go index 1005bf65cc5..253c8efee76 100644 --- a/raft/log_unstable.go +++ b/raft/log_unstable.go @@ -14,7 +14,7 @@ package raft -import pb "go.etcd.io/etcd/raft/raftpb" +import pb "go.etcd.io/etcd/v3/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 2821a1e77b2..9393edc0c0a 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/raft/raftpb" + pb "go.etcd.io/etcd/v3/raft/raftpb" ) func TestUnstableMaybeFirstIndex(t *testing.T) { diff --git a/raft/node.go b/raft/node.go index 396007df932..5b2600fde26 100644 --- a/raft/node.go +++ b/raft/node.go @@ -18,7 +18,7 @@ import ( "context" "errors" - pb "go.etcd.io/etcd/raft/raftpb" + pb "go.etcd.io/etcd/v3/raft/raftpb" ) type SnapshotStatus int diff --git a/raft/node_test.go b/raft/node_test.go index 641a5ca2fb7..b873779e355 100644 --- a/raft/node_test.go +++ b/raft/node_test.go @@ -24,8 +24,8 @@ import ( "testing" "time" - "go.etcd.io/etcd/pkg/testutil" - "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/v3/raft/raftpb" ) // readyWithTimeout selects from n.Ready() with a 1-second timeout. It diff --git a/raft/raft.go b/raft/raft.go index 4619a53d06f..24a6c01784b 100644 --- a/raft/raft.go +++ b/raft/raft.go @@ -24,7 +24,7 @@ import ( "sync" "time" - pb "go.etcd.io/etcd/raft/raftpb" + pb "go.etcd.io/etcd/v3/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 699bb5b0780..01d4dd7a66f 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/raft/raftpb" + pb "go.etcd.io/etcd/v3/raft/raftpb" ) // TestMsgAppFlowControlFull ensures: diff --git a/raft/raft_paper_test.go b/raft/raft_paper_test.go index cf7b192f4c0..3b767b4fa0b 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/raft/raftpb" + pb "go.etcd.io/etcd/v3/raft/raftpb" ) func TestFollowerUpdateTermFromMessage(t *testing.T) { diff --git a/raft/raft_snap_test.go b/raft/raft_snap_test.go index 145473824c6..358c85b8e29 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/raft/raftpb" + pb "go.etcd.io/etcd/v3/raft/raftpb" ) var ( diff --git a/raft/raft_test.go b/raft/raft_test.go index 13a59f72800..93c61735cba 100644 --- a/raft/raft_test.go +++ b/raft/raft_test.go @@ -23,7 +23,7 @@ import ( "strings" "testing" - pb "go.etcd.io/etcd/raft/raftpb" + pb "go.etcd.io/etcd/v3/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 ee30fc0c426..1a46c67de54 100644 --- a/raft/rafttest/network.go +++ b/raft/rafttest/network.go @@ -19,7 +19,7 @@ import ( "sync" "time" - "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/v3/raft/raftpb" ) // a network interface diff --git a/raft/rafttest/network_test.go b/raft/rafttest/network_test.go index cbfae9605db..a176c95fbbe 100644 --- a/raft/rafttest/network_test.go +++ b/raft/rafttest/network_test.go @@ -18,7 +18,7 @@ import ( "testing" "time" - "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/v3/raft/raftpb" ) func TestNetworkDrop(t *testing.T) { diff --git a/raft/rafttest/node.go b/raft/rafttest/node.go index add21da0b56..d97522937b0 100644 --- a/raft/rafttest/node.go +++ b/raft/rafttest/node.go @@ -20,8 +20,8 @@ import ( "sync" "time" - "go.etcd.io/etcd/raft" - "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/v3/raft" + "go.etcd.io/etcd/v3/raft/raftpb" ) type node struct { diff --git a/raft/rafttest/node_bench_test.go b/raft/rafttest/node_bench_test.go index f28744ae89f..2b505d8ef22 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/raft" + "go.etcd.io/etcd/v3/raft" ) func BenchmarkProposal3Nodes(b *testing.B) { diff --git a/raft/rafttest/node_test.go b/raft/rafttest/node_test.go index 455f565914d..3c466367b46 100644 --- a/raft/rafttest/node_test.go +++ b/raft/rafttest/node_test.go @@ -19,7 +19,7 @@ import ( "testing" "time" - "go.etcd.io/etcd/raft" + "go.etcd.io/etcd/v3/raft" ) func TestBasicProgress(t *testing.T) { diff --git a/raft/rawnode.go b/raft/rawnode.go index d31de6e7d7a..139a084211c 100644 --- a/raft/rawnode.go +++ b/raft/rawnode.go @@ -17,7 +17,7 @@ package raft import ( "errors" - pb "go.etcd.io/etcd/raft/raftpb" + pb "go.etcd.io/etcd/v3/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 f44907dd9f8..2752433f2bb 100644 --- a/raft/rawnode_test.go +++ b/raft/rawnode_test.go @@ -20,7 +20,7 @@ import ( "reflect" "testing" - "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/v3/raft/raftpb" ) // TestRawNodeStep ensures that RawNode.Step ignore local message. diff --git a/raft/read_only.go b/raft/read_only.go index 39eb2b06515..955fe798669 100644 --- a/raft/read_only.go +++ b/raft/read_only.go @@ -14,7 +14,7 @@ package raft -import pb "go.etcd.io/etcd/raft/raftpb" +import pb "go.etcd.io/etcd/v3/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 197a6820d84..f894716e190 100644 --- a/raft/status.go +++ b/raft/status.go @@ -17,7 +17,7 @@ package raft import ( "fmt" - pb "go.etcd.io/etcd/raft/raftpb" + pb "go.etcd.io/etcd/v3/raft/raftpb" ) type Status struct { diff --git a/raft/storage.go b/raft/storage.go index 14ad6860831..cb35ddff12f 100644 --- a/raft/storage.go +++ b/raft/storage.go @@ -18,7 +18,7 @@ import ( "errors" "sync" - pb "go.etcd.io/etcd/raft/raftpb" + pb "go.etcd.io/etcd/v3/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 6d075eafd74..4e7100b95b0 100644 --- a/raft/storage_test.go +++ b/raft/storage_test.go @@ -19,7 +19,7 @@ import ( "reflect" "testing" - pb "go.etcd.io/etcd/raft/raftpb" + pb "go.etcd.io/etcd/v3/raft/raftpb" ) func TestStorageTerm(t *testing.T) { diff --git a/raft/util.go b/raft/util.go index c145d26dd7f..abc760f363a 100644 --- a/raft/util.go +++ b/raft/util.go @@ -18,7 +18,7 @@ import ( "bytes" "fmt" - pb "go.etcd.io/etcd/raft/raftpb" + pb "go.etcd.io/etcd/v3/raft/raftpb" ) func (st StateType) MarshalJSON() ([]byte, error) { diff --git a/raft/util_test.go b/raft/util_test.go index 52853892f5a..4c49a61ba71 100644 --- a/raft/util_test.go +++ b/raft/util_test.go @@ -20,7 +20,7 @@ import ( "strings" "testing" - pb "go.etcd.io/etcd/raft/raftpb" + pb "go.etcd.io/etcd/v3/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 f9028ae2b5b..078c93f4143 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/pkg/expect" + "go.etcd.io/etcd/v3/pkg/expect" ) type proxyEtcdProcess struct { diff --git a/tests/e2e/cluster_test.go b/tests/e2e/cluster_test.go index 57663f2c51b..d4e8f50e330 100644 --- a/tests/e2e/cluster_test.go +++ b/tests/e2e/cluster_test.go @@ -21,7 +21,7 @@ import ( "os" "strings" - "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/v3/etcdserver" ) const etcdProcessBasePort = 20000 @@ -83,7 +83,7 @@ var ( clientTLS: clientTLS, initialToken: "new", clientCertAuthEnabled: true, - noCN: true, + noCN: true, } configJWT = etcdProcessClusterConfig{ clusterSize: 1, diff --git a/tests/e2e/ctl_v2_test.go b/tests/e2e/ctl_v2_test.go index cbea2a3d85f..7ce9072c54e 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/pkg/fileutil" - "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/v3/pkg/fileutil" + "go.etcd.io/etcd/v3/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 a8bc38483d1..4d3df2a93d2 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/clientv3" + "go.etcd.io/etcd/v3/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 e47660ac8c5..22832c71891 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/clientv3" + "go.etcd.io/etcd/v3/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 35495313898..d0dc6fa4f4d 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/pkg/expect" + "go.etcd.io/etcd/v3/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 23070ba88a7..7d1416bdf03 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/clientv3" + "go.etcd.io/etcd/v3/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 e27ccdea70c..2d79bc2a3da 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/pkg/expect" + "go.etcd.io/etcd/v3/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 61961c9f672..06da3b0f7c4 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/etcdserver/etcdserverpb" + "go.etcd.io/etcd/v3/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 1ecffe58934..021e785b8b3 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/clientv3" - "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/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 f603ad34ad7..521820eac3e 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/clientv3" - "go.etcd.io/etcd/pkg/testutil" - "go.etcd.io/etcd/pkg/transport" - "go.etcd.io/etcd/pkg/types" + "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" ) func TestCtlV3MoveLeaderSecure(t *testing.T) { diff --git a/tests/e2e/ctl_v3_snapshot_test.go b/tests/e2e/ctl_v3_snapshot_test.go index 94929c089c7..9941cb1f00e 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/clientv3/snapshot" - "go.etcd.io/etcd/pkg/expect" - "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/v3/clientv3/snapshot" + "go.etcd.io/etcd/v3/pkg/expect" + "go.etcd.io/etcd/v3/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 04f5a6570bf..25735087cd9 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/pkg/flags" - "go.etcd.io/etcd/pkg/testutil" - "go.etcd.io/etcd/version" + "go.etcd.io/etcd/v3/pkg/flags" + "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/v3/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 7c660b03ee4..8135dd6ba2b 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/pkg/expect" + "go.etcd.io/etcd/v3/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 5fb35557895..03c5acc3732 100644 --- a/tests/e2e/etcd_corrupt_test.go +++ b/tests/e2e/etcd_corrupt_test.go @@ -23,10 +23,9 @@ import ( "testing" "time" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/mvcc/mvccpb" - bolt "go.etcd.io/bbolt" + "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/mvcc/mvccpb" ) // TODO: test with embedded etcd in integration package diff --git a/tests/e2e/etcd_process.go b/tests/e2e/etcd_process.go index 3ff7022cfef..c6a03ecefaa 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/pkg/expect" - "go.etcd.io/etcd/pkg/fileutil" + "go.etcd.io/etcd/v3/pkg/expect" + "go.etcd.io/etcd/v3/pkg/fileutil" ) var ( diff --git a/tests/e2e/etcd_release_upgrade_test.go b/tests/e2e/etcd_release_upgrade_test.go index 6a8e5b13ac6..e9abf480df4 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/pkg/fileutil" - "go.etcd.io/etcd/pkg/testutil" - "go.etcd.io/etcd/version" + "go.etcd.io/etcd/v3/pkg/fileutil" + "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/v3/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 cbdb2e66af8..f845490d44f 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/pkg/expect" - "go.etcd.io/etcd/pkg/fileutil" - "go.etcd.io/etcd/pkg/flags" + "go.etcd.io/etcd/v3/pkg/expect" + "go.etcd.io/etcd/v3/pkg/fileutil" + "go.etcd.io/etcd/v3/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 33f49ffa455..88e91733f13 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/pkg/expect" + "go.etcd.io/etcd/v3/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 ee7c415b0a4..fb0857a28cd 100644 --- a/tests/e2e/gateway_test.go +++ b/tests/e2e/gateway_test.go @@ -19,7 +19,7 @@ import ( "strings" "testing" - "go.etcd.io/etcd/pkg/expect" + "go.etcd.io/etcd/v3/pkg/expect" ) var ( diff --git a/tests/e2e/main_test.go b/tests/e2e/main_test.go index 6a608c6c942..59ad4e3f17b 100644 --- a/tests/e2e/main_test.go +++ b/tests/e2e/main_test.go @@ -10,7 +10,7 @@ import ( "runtime" "testing" - "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/v3/pkg/testutil" ) var ( diff --git a/tests/e2e/metrics_test.go b/tests/e2e/metrics_test.go index 7a32f003147..db36bd5db66 100644 --- a/tests/e2e/metrics_test.go +++ b/tests/e2e/metrics_test.go @@ -19,7 +19,7 @@ import ( "strings" "testing" - "go.etcd.io/etcd/version" + "go.etcd.io/etcd/v3/version" ) func TestV3MetricsSecure(t *testing.T) { diff --git a/tests/e2e/util.go b/tests/e2e/util.go index ce7289ae94d..de73e511ab0 100644 --- a/tests/e2e/util.go +++ b/tests/e2e/util.go @@ -21,7 +21,7 @@ import ( "strings" "time" - "go.etcd.io/etcd/pkg/expect" + "go.etcd.io/etcd/v3/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 e1288066d1c..7e710525e35 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/pkg/testutil" + "go.etcd.io/etcd/v3/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 501dc28e183..9b05488781e 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/version" + "go.etcd.io/etcd/v3/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 47d150a7aad..91e59243c22 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/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" ) func TestV3CurlLeaseGrantNoTLS(t *testing.T) { diff --git a/tests/e2e/v3_curl_test.go b/tests/e2e/v3_curl_test.go index 60f2baf1027..34b29857a6c 100644 --- a/tests/e2e/v3_curl_test.go +++ b/tests/e2e/v3_curl_test.go @@ -22,12 +22,11 @@ import ( "strconv" "testing" - 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" + 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" ) // TODO: remove /v3beta tests in 3.5 release diff --git a/tools/benchmark/cmd/lease.go b/tools/benchmark/cmd/lease.go index 8104390c99e..fe4d28f69ec 100644 --- a/tools/benchmark/cmd/lease.go +++ b/tools/benchmark/cmd/lease.go @@ -19,10 +19,9 @@ import ( "fmt" "time" - v3 "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/pkg/report" - "github.com/spf13/cobra" + v3 "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/pkg/report" "gopkg.in/cheggaaa/pb.v1" ) diff --git a/tools/benchmark/cmd/mvcc-put.go b/tools/benchmark/cmd/mvcc-put.go index 026693efe05..43d06ede027 100644 --- a/tools/benchmark/cmd/mvcc-put.go +++ b/tools/benchmark/cmd/mvcc-put.go @@ -21,10 +21,9 @@ import ( "runtime/pprof" "time" - "go.etcd.io/etcd/lease" - "go.etcd.io/etcd/pkg/report" - "github.com/spf13/cobra" + "go.etcd.io/etcd/v3/lease" + "go.etcd.io/etcd/v3/pkg/report" ) // mvccPutCmd represents a storage put performance benchmarking tool diff --git a/tools/benchmark/cmd/mvcc.go b/tools/benchmark/cmd/mvcc.go index 742ffe9cf6e..eeba9f9d5c6 100644 --- a/tools/benchmark/cmd/mvcc.go +++ b/tools/benchmark/cmd/mvcc.go @@ -18,13 +18,11 @@ import ( "os" "time" - "go.uber.org/zap" - - "go.etcd.io/etcd/lease" - "go.etcd.io/etcd/mvcc" - "go.etcd.io/etcd/mvcc/backend" - "github.com/spf13/cobra" + "go.etcd.io/etcd/v3/lease" + "go.etcd.io/etcd/v3/mvcc" + "go.etcd.io/etcd/v3/mvcc/backend" + "go.uber.org/zap" ) var ( diff --git a/tools/benchmark/cmd/put.go b/tools/benchmark/cmd/put.go index 4f99d5c5773..2fe225d99d2 100644 --- a/tools/benchmark/cmd/put.go +++ b/tools/benchmark/cmd/put.go @@ -24,11 +24,10 @@ import ( "strings" "time" - v3 "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/pkg/report" - "github.com/dustin/go-humanize" "github.com/spf13/cobra" + v3 "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/pkg/report" "golang.org/x/time/rate" "gopkg.in/cheggaaa/pb.v1" ) diff --git a/tools/benchmark/cmd/range.go b/tools/benchmark/cmd/range.go index a24cce31822..e1c0f72b44b 100644 --- a/tools/benchmark/cmd/range.go +++ b/tools/benchmark/cmd/range.go @@ -21,10 +21,9 @@ import ( "os" "time" - v3 "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/pkg/report" - "github.com/spf13/cobra" + v3 "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/pkg/report" "golang.org/x/time/rate" "gopkg.in/cheggaaa/pb.v1" ) diff --git a/tools/benchmark/cmd/root.go b/tools/benchmark/cmd/root.go index 83d96f5d452..9103569c038 100644 --- a/tools/benchmark/cmd/root.go +++ b/tools/benchmark/cmd/root.go @@ -18,9 +18,8 @@ import ( "sync" "time" - "go.etcd.io/etcd/pkg/transport" - "github.com/spf13/cobra" + "go.etcd.io/etcd/v3/pkg/transport" "gopkg.in/cheggaaa/pb.v1" ) diff --git a/tools/benchmark/cmd/stm.go b/tools/benchmark/cmd/stm.go index f8df5398d29..df18b3ef6f9 100644 --- a/tools/benchmark/cmd/stm.go +++ b/tools/benchmark/cmd/stm.go @@ -23,12 +23,11 @@ import ( "os" "time" - 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" + 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" "golang.org/x/time/rate" "gopkg.in/cheggaaa/pb.v1" ) diff --git a/tools/benchmark/cmd/txn_put.go b/tools/benchmark/cmd/txn_put.go index e042aacf6cd..1081b9686ef 100644 --- a/tools/benchmark/cmd/txn_put.go +++ b/tools/benchmark/cmd/txn_put.go @@ -22,10 +22,9 @@ import ( "os" "time" - v3 "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/pkg/report" - "github.com/spf13/cobra" + v3 "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/pkg/report" "golang.org/x/time/rate" "gopkg.in/cheggaaa/pb.v1" ) diff --git a/tools/benchmark/cmd/util.go b/tools/benchmark/cmd/util.go index ba2c9a7ba62..8d4783bdd4d 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/clientv3" - "go.etcd.io/etcd/pkg/report" + "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/pkg/report" "google.golang.org/grpc/grpclog" ) diff --git a/tools/benchmark/cmd/watch.go b/tools/benchmark/cmd/watch.go index d217a39c80d..a6dba74648c 100644 --- a/tools/benchmark/cmd/watch.go +++ b/tools/benchmark/cmd/watch.go @@ -23,10 +23,9 @@ import ( "sync/atomic" "time" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/pkg/report" - "github.com/spf13/cobra" + "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/pkg/report" "golang.org/x/time/rate" "gopkg.in/cheggaaa/pb.v1" ) diff --git a/tools/benchmark/cmd/watch_get.go b/tools/benchmark/cmd/watch_get.go index c6def95fb19..0e8cdede0a3 100644 --- a/tools/benchmark/cmd/watch_get.go +++ b/tools/benchmark/cmd/watch_get.go @@ -20,10 +20,9 @@ import ( "sync" "time" - v3 "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/pkg/report" - "github.com/spf13/cobra" + v3 "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/pkg/report" "gopkg.in/cheggaaa/pb.v1" ) diff --git a/tools/benchmark/cmd/watch_latency.go b/tools/benchmark/cmd/watch_latency.go index fc48ea2f351..9696e42af4f 100644 --- a/tools/benchmark/cmd/watch_latency.go +++ b/tools/benchmark/cmd/watch_latency.go @@ -21,10 +21,9 @@ import ( "sync" "time" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/pkg/report" - "github.com/spf13/cobra" + "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/pkg/report" "golang.org/x/time/rate" "gopkg.in/cheggaaa/pb.v1" ) diff --git a/tools/benchmark/main.go b/tools/benchmark/main.go index 4e70b8125a2..97c03141fa7 100644 --- a/tools/benchmark/main.go +++ b/tools/benchmark/main.go @@ -18,7 +18,7 @@ import ( "fmt" "os" - "go.etcd.io/etcd/tools/benchmark/cmd" + "go.etcd.io/etcd/v3/tools/benchmark/cmd" ) func main() { diff --git a/tools/etcd-dump-db/backend.go b/tools/etcd-dump-db/backend.go index 4ad0aa5ddf2..43db1f3923d 100644 --- a/tools/etcd-dump-db/backend.go +++ b/tools/etcd-dump-db/backend.go @@ -19,12 +19,11 @@ import ( "fmt" "path/filepath" - "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" + "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" ) func snapDir(dataDir string) string { diff --git a/tools/etcd-dump-logs/etcd-dump-log_test.go b/tools/etcd-dump-logs/etcd-dump-log_test.go index f1b6b631c88..9190f36b6c0 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/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.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.uber.org/zap" ) diff --git a/tools/etcd-dump-logs/main.go b/tools/etcd-dump-logs/main.go index 6bb58929687..22f36db3ef6 100644 --- a/tools/etcd-dump-logs/main.go +++ b/tools/etcd-dump-logs/main.go @@ -28,14 +28,13 @@ import ( "strings" "time" - "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.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.uber.org/zap" ) diff --git a/tools/etcd-dump-metrics/etcd.go b/tools/etcd-dump-metrics/etcd.go index 2939b60c201..062f0c01202 100644 --- a/tools/etcd-dump-metrics/etcd.go +++ b/tools/etcd-dump-metrics/etcd.go @@ -23,9 +23,8 @@ import ( "strings" "time" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/embed" - + "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/embed" "go.uber.org/zap" ) diff --git a/tools/etcd-dump-metrics/install_darwin.go b/tools/etcd-dump-metrics/install_darwin.go index 4d545b2405c..dab3386768d 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/pkg/fileutil" + "go.etcd.io/etcd/v3/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 0c6fc970737..68adcaaea48 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/pkg/fileutil" + "go.etcd.io/etcd/v3/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 0648c8b2ba4..138623fac25 100644 --- a/tools/etcd-dump-metrics/main.go +++ b/tools/etcd-dump-metrics/main.go @@ -25,8 +25,7 @@ import ( "path/filepath" "time" - "go.etcd.io/etcd/embed" - + "go.etcd.io/etcd/v3/embed" "go.uber.org/zap" ) diff --git a/tools/etcd-dump-metrics/metrics.go b/tools/etcd-dump-metrics/metrics.go index 3840b20fb18..d8f669b7408 100644 --- a/tools/etcd-dump-metrics/metrics.go +++ b/tools/etcd-dump-metrics/metrics.go @@ -22,8 +22,7 @@ import ( "strings" "time" - "go.etcd.io/etcd/pkg/transport" - + "go.etcd.io/etcd/v3/pkg/transport" "go.uber.org/zap" ) diff --git a/wal/decoder.go b/wal/decoder.go index f2f01fd881c..9d6c20253ae 100644 --- a/wal/decoder.go +++ b/wal/decoder.go @@ -21,10 +21,10 @@ import ( "io" "sync" - "go.etcd.io/etcd/pkg/crc" - "go.etcd.io/etcd/pkg/pbutil" - "go.etcd.io/etcd/raft/raftpb" - "go.etcd.io/etcd/wal/walpb" + "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" ) const minSectorSize = 512 diff --git a/wal/encoder.go b/wal/encoder.go index d3877ed5c4e..fb52182c472 100644 --- a/wal/encoder.go +++ b/wal/encoder.go @@ -21,9 +21,9 @@ import ( "os" "sync" - "go.etcd.io/etcd/pkg/crc" - "go.etcd.io/etcd/pkg/ioutil" - "go.etcd.io/etcd/wal/walpb" + "go.etcd.io/etcd/v3/pkg/crc" + "go.etcd.io/etcd/v3/pkg/ioutil" + "go.etcd.io/etcd/v3/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 e1e1c557b8b..255f985076d 100644 --- a/wal/file_pipeline.go +++ b/wal/file_pipeline.go @@ -19,8 +19,7 @@ import ( "os" "path/filepath" - "go.etcd.io/etcd/pkg/fileutil" - + "go.etcd.io/etcd/v3/pkg/fileutil" "go.uber.org/zap" ) diff --git a/wal/record_test.go b/wal/record_test.go index b725151a5ea..428bd2532e1 100644 --- a/wal/record_test.go +++ b/wal/record_test.go @@ -22,7 +22,7 @@ import ( "reflect" "testing" - "go.etcd.io/etcd/wal/walpb" + "go.etcd.io/etcd/v3/wal/walpb" ) var ( diff --git a/wal/repair.go b/wal/repair.go index 15afed01744..985371849dd 100644 --- a/wal/repair.go +++ b/wal/repair.go @@ -19,9 +19,8 @@ import ( "os" "path/filepath" - "go.etcd.io/etcd/pkg/fileutil" - "go.etcd.io/etcd/wal/walpb" - + "go.etcd.io/etcd/v3/pkg/fileutil" + "go.etcd.io/etcd/v3/wal/walpb" "go.uber.org/zap" ) diff --git a/wal/repair_test.go b/wal/repair_test.go index b2a215bcabe..33730e33f90 100644 --- a/wal/repair_test.go +++ b/wal/repair_test.go @@ -21,9 +21,8 @@ import ( "os" "testing" - "go.etcd.io/etcd/raft/raftpb" - "go.etcd.io/etcd/wal/walpb" - + "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/v3/wal/walpb" "go.uber.org/zap" ) diff --git a/wal/util.go b/wal/util.go index a3f314bb126..6ef35861bad 100644 --- a/wal/util.go +++ b/wal/util.go @@ -19,8 +19,7 @@ import ( "fmt" "strings" - "go.etcd.io/etcd/pkg/fileutil" - + "go.etcd.io/etcd/v3/pkg/fileutil" "go.uber.org/zap" ) diff --git a/wal/wal.go b/wal/wal.go index 5f6f21e3a53..6d7c38fdf48 100644 --- a/wal/wal.go +++ b/wal/wal.go @@ -25,13 +25,12 @@ import ( "sync" "time" - "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.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.uber.org/zap" ) diff --git a/wal/wal_bench_test.go b/wal/wal_bench_test.go index 20bed171db3..df5244d96f8 100644 --- a/wal/wal_bench_test.go +++ b/wal/wal_bench_test.go @@ -19,9 +19,8 @@ import ( "os" "testing" + "go.etcd.io/etcd/v3/raft/raftpb" "go.uber.org/zap" - - "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 d2709d042c6..1e8ed2c623c 100644 --- a/wal/wal_test.go +++ b/wal/wal_test.go @@ -27,11 +27,10 @@ import ( "regexp" "testing" - "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.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.uber.org/zap" )