From 96cce208c2cb9e70ac3573b3f76eed7c84d262d1 Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Sun, 26 Apr 2020 21:03:37 +0000 Subject: [PATCH 1/8] go.mod: use go.etcd.io/etcd/v3 versioning This change makes the etcd package compatible with the existing Go ecosystem for module versioning. Used this tool to update package imports: https://github.com/KSubedi/gomove --- Documentation/learning/lock/client/client.go | 4 +- auth/range_perm_cache.go | 6 +- auth/range_perm_cache_test.go | 4 +- auth/store.go | 10 ++-- auth/store_test.go | 8 +-- client/client.go | 2 +- client/client_test.go | 4 +- client/discover.go | 2 +- client/doc.go | 2 +- client/example_keys_test.go | 2 +- client/integration/client_test.go | 6 +- client/integration/main_test.go | 2 +- client/keys.go | 2 +- client/main_test.go | 6 +- client/members.go | 2 +- client/members_test.go | 2 +- clientv3/auth.go | 4 +- clientv3/balancer/balancer.go | 4 +- clientv3/balancer/balancer_test.go | 8 +-- clientv3/client.go | 12 ++-- clientv3/client_test.go | 4 +- clientv3/clientv3util/example_key_test.go | 4 +- clientv3/clientv3util/util.go | 2 +- clientv3/cluster.go | 4 +- clientv3/compact_op.go | 2 +- clientv3/compact_op_test.go | 2 +- clientv3/compare.go | 2 +- clientv3/concurrency/election.go | 6 +- clientv3/concurrency/election_test.go | 4 +- clientv3/concurrency/example_election_test.go | 4 +- clientv3/concurrency/example_mutex_test.go | 4 +- clientv3/concurrency/example_stm_test.go | 4 +- clientv3/concurrency/key.go | 6 +- clientv3/concurrency/main_test.go | 4 +- clientv3/concurrency/mutex.go | 4 +- clientv3/concurrency/mutex_test.go | 4 +- clientv3/concurrency/session.go | 2 +- clientv3/concurrency/stm.go | 2 +- clientv3/credentials/credentials.go | 2 +- clientv3/ctx.go | 4 +- clientv3/ctx_test.go | 4 +- clientv3/example_auth_test.go | 2 +- clientv3/example_cluster_test.go | 2 +- clientv3/example_kv_test.go | 4 +- clientv3/example_lease_test.go | 2 +- clientv3/example_maintenance_test.go | 2 +- clientv3/example_metrics_test.go | 2 +- clientv3/example_test.go | 4 +- clientv3/example_watch_test.go | 2 +- clientv3/integration/black_hole_test.go | 8 +-- clientv3/integration/cluster_test.go | 6 +- clientv3/integration/dial_test.go | 10 ++-- clientv3/integration/kv_test.go | 12 ++-- clientv3/integration/lease_test.go | 10 ++-- clientv3/integration/leasing_test.go | 10 ++-- clientv3/integration/logger_test.go | 2 +- clientv3/integration/main_test.go | 2 +- clientv3/integration/maintenance_test.go | 14 ++--- clientv3/integration/metrics_test.go | 8 +-- clientv3/integration/mirror_test.go | 8 +-- clientv3/integration/namespace_test.go | 10 ++-- .../integration/network_partition_test.go | 10 ++-- clientv3/integration/role_test.go | 6 +- clientv3/integration/server_shutdown_test.go | 8 +-- clientv3/integration/txn_test.go | 10 ++-- clientv3/integration/user_test.go | 8 +-- clientv3/integration/util.go | 2 +- clientv3/integration/watch_fragment_test.go | 6 +- clientv3/integration/watch_test.go | 14 ++--- clientv3/kv.go | 2 +- clientv3/lease.go | 4 +- clientv3/leasing/cache.go | 6 +- clientv3/leasing/kv.go | 10 ++-- clientv3/leasing/txn.go | 4 +- clientv3/leasing/util.go | 4 +- clientv3/logger.go | 2 +- clientv3/main_test.go | 4 +- clientv3/maintenance.go | 2 +- clientv3/mirror/syncer.go | 2 +- clientv3/namespace/kv.go | 6 +- clientv3/namespace/lease.go | 2 +- clientv3/namespace/watch.go | 2 +- clientv3/naming/doc.go | 4 +- clientv3/naming/grpc.go | 2 +- clientv3/naming/grpc_test.go | 6 +- clientv3/op_test.go | 2 +- clientv3/ordering/kv.go | 2 +- clientv3/ordering/kv_test.go | 8 +-- clientv3/ordering/logger_test.go | 2 +- clientv3/ordering/util.go | 2 +- clientv3/ordering/util_test.go | 6 +- clientv3/retry.go | 4 +- clientv3/retry_interceptor.go | 2 +- clientv3/snapshot/member_test.go | 8 +-- clientv3/snapshot/v3_snapshot.go | 34 +++++------ clientv3/snapshot/v3_snapshot_test.go | 8 +-- clientv3/txn.go | 2 +- clientv3/txn_test.go | 2 +- clientv3/watch.go | 6 +- clientv3/watch_test.go | 2 +- clientv3/yaml/config.go | 4 +- contrib/raftexample/httpapi.go | 2 +- contrib/raftexample/kvstore.go | 2 +- contrib/raftexample/main.go | 2 +- contrib/raftexample/raft.go | 18 +++--- contrib/raftexample/raftexample_test.go | 2 +- contrib/recipes/barrier.go | 4 +- contrib/recipes/client.go | 4 +- contrib/recipes/double_barrier.go | 6 +- contrib/recipes/key.go | 4 +- contrib/recipes/priority_queue.go | 4 +- contrib/recipes/queue.go | 4 +- contrib/recipes/rwmutex.go | 6 +- contrib/recipes/watch.go | 4 +- embed/config.go | 18 +++--- embed/config_logging.go | 2 +- embed/config_logging_journal_unix.go | 2 +- embed/config_test.go | 2 +- embed/doc.go | 2 +- embed/etcd.go | 24 ++++---- embed/serve.go | 28 ++++----- embed/serve_test.go | 2 +- embed/util.go | 2 +- etcdctl/ctlv2/command/auth_commands.go | 2 +- etcdctl/ctlv2/command/backup_command.go | 18 +++--- etcdctl/ctlv2/command/cluster_health.go | 2 +- etcdctl/ctlv2/command/error.go | 2 +- etcdctl/ctlv2/command/exec_watch_command.go | 2 +- etcdctl/ctlv2/command/format.go | 2 +- etcdctl/ctlv2/command/get_command.go | 2 +- etcdctl/ctlv2/command/ls_command.go | 2 +- etcdctl/ctlv2/command/mk_command.go | 2 +- etcdctl/ctlv2/command/mkdir_command.go | 2 +- etcdctl/ctlv2/command/rm_command.go | 2 +- etcdctl/ctlv2/command/rmdir_command.go | 2 +- etcdctl/ctlv2/command/role_commands.go | 4 +- etcdctl/ctlv2/command/set_command.go | 2 +- etcdctl/ctlv2/command/set_dir_command.go | 2 +- etcdctl/ctlv2/command/update_command.go | 2 +- etcdctl/ctlv2/command/update_dir_command.go | 2 +- etcdctl/ctlv2/command/user_commands.go | 2 +- etcdctl/ctlv2/command/util.go | 4 +- etcdctl/ctlv2/command/watch_command.go | 2 +- etcdctl/ctlv2/ctl.go | 4 +- etcdctl/ctlv3/command/alarm_command.go | 2 +- etcdctl/ctlv3/command/auth_command.go | 2 +- etcdctl/ctlv3/command/check.go | 4 +- etcdctl/ctlv3/command/compaction_command.go | 2 +- etcdctl/ctlv3/command/defrag_command.go | 2 +- etcdctl/ctlv3/command/del_command.go | 2 +- etcdctl/ctlv3/command/elect_command.go | 4 +- etcdctl/ctlv3/command/ep_command.go | 6 +- etcdctl/ctlv3/command/error.go | 2 +- etcdctl/ctlv3/command/get_command.go | 2 +- etcdctl/ctlv3/command/global.go | 8 +-- etcdctl/ctlv3/command/lease_command.go | 2 +- etcdctl/ctlv3/command/lock_command.go | 4 +- etcdctl/ctlv3/command/make_mirror_command.go | 8 +-- etcdctl/ctlv3/command/member_command.go | 2 +- etcdctl/ctlv3/command/migrate_command.go | 32 +++++----- etcdctl/ctlv3/command/move_leader_command.go | 2 +- etcdctl/ctlv3/command/printer.go | 6 +- etcdctl/ctlv3/command/printer_fields.go | 8 +-- etcdctl/ctlv3/command/printer_json.go | 2 +- etcdctl/ctlv3/command/printer_protobuf.go | 6 +- etcdctl/ctlv3/command/printer_simple.go | 8 +-- etcdctl/ctlv3/command/printer_table.go | 4 +- etcdctl/ctlv3/command/put_command.go | 2 +- etcdctl/ctlv3/command/role_command.go | 2 +- etcdctl/ctlv3/command/snapshot_command.go | 2 +- etcdctl/ctlv3/command/txn_command.go | 4 +- etcdctl/ctlv3/command/user_command.go | 2 +- etcdctl/ctlv3/command/util.go | 4 +- etcdctl/ctlv3/command/version_command.go | 2 +- etcdctl/ctlv3/command/watch_command.go | 2 +- etcdctl/ctlv3/ctl.go | 2 +- etcdctl/ctlv3/ctl_cov.go | 2 +- etcdctl/ctlv3/ctl_nocov.go | 2 +- etcdctl/ctlv3/help.go | 2 +- etcdctl/main.go | 4 +- etcdmain/config.go | 8 +-- etcdmain/config_test.go | 2 +- etcdmain/etcd.go | 20 +++---- etcdmain/gateway.go | 2 +- etcdmain/grpc_proxy.go | 24 ++++---- etcdmain/help.go | 2 +- etcdmain/util.go | 4 +- etcdserver/api/capability.go | 2 +- etcdserver/api/cluster.go | 4 +- etcdserver/api/etcdhttp/base.go | 10 ++-- etcdserver/api/etcdhttp/metrics.go | 6 +- etcdserver/api/etcdhttp/peer.go | 12 ++-- etcdserver/api/etcdhttp/peer_test.go | 12 ++-- etcdserver/api/etcdhttp/version_test.go | 2 +- etcdserver/api/membership/cluster.go | 14 ++--- etcdserver/api/membership/cluster_test.go | 10 ++-- etcdserver/api/membership/errors.go | 2 +- etcdserver/api/membership/member.go | 2 +- etcdserver/api/membership/member_test.go | 2 +- etcdserver/api/membership/store.go | 6 +- etcdserver/api/rafthttp/coder.go | 2 +- etcdserver/api/rafthttp/functional_test.go | 8 +-- etcdserver/api/rafthttp/http.go | 10 ++-- etcdserver/api/rafthttp/http_test.go | 10 ++-- etcdserver/api/rafthttp/msg_codec.go | 4 +- etcdserver/api/rafthttp/msg_codec_test.go | 2 +- etcdserver/api/rafthttp/msgappv2_codec.go | 8 +-- .../api/rafthttp/msgappv2_codec_test.go | 6 +- etcdserver/api/rafthttp/peer.go | 10 ++-- etcdserver/api/rafthttp/peer_status.go | 2 +- etcdserver/api/rafthttp/peer_test.go | 2 +- etcdserver/api/rafthttp/pipeline.go | 10 ++-- etcdserver/api/rafthttp/pipeline_test.go | 10 ++-- etcdserver/api/rafthttp/remote.go | 4 +- etcdserver/api/rafthttp/snapshot_sender.go | 10 ++-- etcdserver/api/rafthttp/snapshot_test.go | 6 +- etcdserver/api/rafthttp/stream.go | 12 ++-- etcdserver/api/rafthttp/stream_test.go | 10 ++-- etcdserver/api/rafthttp/transport.go | 12 ++-- .../api/rafthttp/transport_bench_test.go | 8 +-- etcdserver/api/rafthttp/transport_test.go | 8 +-- etcdserver/api/rafthttp/urlpick.go | 2 +- etcdserver/api/rafthttp/urlpick_test.go | 2 +- etcdserver/api/rafthttp/util.go | 6 +- etcdserver/api/rafthttp/util_test.go | 4 +- etcdserver/api/snap/db.go | 2 +- etcdserver/api/snap/message.go | 4 +- etcdserver/api/snap/snapshotter.go | 10 ++-- etcdserver/api/snap/snapshotter_test.go | 2 +- etcdserver/api/v2auth/auth.go | 8 +-- etcdserver/api/v2auth/auth_requests.go | 6 +- etcdserver/api/v2auth/auth_test.go | 8 +-- etcdserver/api/v2discovery/discovery.go | 6 +- etcdserver/api/v2discovery/discovery_test.go | 4 +- etcdserver/api/v2http/capability.go | 4 +- etcdserver/api/v2http/client.go | 22 +++---- etcdserver/api/v2http/client_auth.go | 6 +- etcdserver/api/v2http/client_auth_test.go | 4 +- etcdserver/api/v2http/client_test.go | 20 +++---- etcdserver/api/v2http/http.go | 6 +- etcdserver/api/v2http/http_test.go | 12 ++-- etcdserver/api/v2http/httptypes/member.go | 2 +- .../api/v2http/httptypes/member_test.go | 2 +- etcdserver/api/v2http/metrics.go | 6 +- etcdserver/api/v2stats/server.go | 2 +- etcdserver/api/v2store/event_history.go | 2 +- etcdserver/api/v2store/event_test.go | 2 +- etcdserver/api/v2store/node.go | 2 +- etcdserver/api/v2store/node_extern_test.go | 2 +- etcdserver/api/v2store/stats_test.go | 2 +- etcdserver/api/v2store/store.go | 4 +- etcdserver/api/v2store/store_test.go | 6 +- etcdserver/api/v2store/store_ttl_test.go | 4 +- etcdserver/api/v2store/store_v2_test.go | 4 +- etcdserver/api/v2store/store_v2v3_test.go | 8 +-- etcdserver/api/v2store/watcher_hub.go | 2 +- etcdserver/api/v2v3/cluster.go | 4 +- etcdserver/api/v2v3/main_test.go | 4 +- etcdserver/api/v2v3/server.go | 12 ++-- etcdserver/api/v2v3/store.go | 10 ++-- etcdserver/api/v2v3/store_test.go | 6 +- etcdserver/api/v2v3/watcher.go | 6 +- etcdserver/api/v3alarm/alarms.go | 6 +- etcdserver/api/v3client/doc.go | 4 +- etcdserver/api/v3client/v3client.go | 8 +-- etcdserver/api/v3compactor/compactor.go | 2 +- etcdserver/api/v3compactor/compactor_test.go | 4 +- etcdserver/api/v3compactor/periodic.go | 4 +- etcdserver/api/v3compactor/periodic_test.go | 4 +- etcdserver/api/v3compactor/revision.go | 4 +- etcdserver/api/v3compactor/revision_test.go | 4 +- etcdserver/api/v3election/election.go | 6 +- .../v3electionpb/gw/v3election.pb.gw.go | 2 +- .../v3election/v3electionpb/v3election.pb.go | 4 +- etcdserver/api/v3lock/lock.go | 6 +- .../api/v3lock/v3lockpb/gw/v3lock.pb.gw.go | 2 +- etcdserver/api/v3lock/v3lockpb/v3lock.pb.go | 2 +- etcdserver/api/v3rpc/auth.go | 4 +- etcdserver/api/v3rpc/grpc.go | 6 +- etcdserver/api/v3rpc/header.go | 4 +- etcdserver/api/v3rpc/interceptor.go | 12 ++-- etcdserver/api/v3rpc/key.go | 8 +-- etcdserver/api/v3rpc/lease.go | 8 +-- etcdserver/api/v3rpc/maintenance.go | 16 ++--- etcdserver/api/v3rpc/member.go | 12 ++-- etcdserver/api/v3rpc/quota.go | 8 +-- etcdserver/api/v3rpc/util.go | 14 ++--- etcdserver/api/v3rpc/util_test.go | 4 +- etcdserver/api/v3rpc/watch.go | 12 ++-- etcdserver/api/v3rpc/watch_test.go | 4 +- etcdserver/apply.go | 20 +++---- etcdserver/apply_auth.go | 10 ++-- etcdserver/apply_v2.go | 6 +- etcdserver/backend.go | 8 +-- etcdserver/cindex/cindex.go | 2 +- etcdserver/cindex/cindex_test.go | 2 +- etcdserver/cluster_util.go | 6 +- etcdserver/cluster_util_test.go | 4 +- etcdserver/config.go | 6 +- etcdserver/config_test.go | 2 +- etcdserver/corrupt.go | 10 ++-- etcdserver/etcdserverpb/gw/rpc.pb.gw.go | 2 +- etcdserver/etcdserverpb/raft_internal.pb.go | 2 +- etcdserver/etcdserverpb/rpc.pb.go | 4 +- etcdserver/metrics.go | 4 +- etcdserver/quota.go | 2 +- etcdserver/raft.go | 22 +++---- etcdserver/raft_test.go | 12 ++-- etcdserver/server.go | 60 +++++++++---------- etcdserver/server_test.go | 40 ++++++------- etcdserver/snapshot_merge.go | 6 +- etcdserver/storage.go | 14 ++--- etcdserver/util.go | 8 +-- etcdserver/util_test.go | 10 ++-- etcdserver/v2_server.go | 4 +- etcdserver/v3_server.go | 16 ++--- functional/agent/handler.go | 6 +- functional/agent/server.go | 6 +- functional/agent/utils.go | 2 +- functional/cmd/etcd-agent/main.go | 2 +- functional/cmd/etcd-proxy/main.go | 2 +- functional/cmd/etcd-runner/main.go | 2 +- functional/cmd/etcd-tester/main.go | 2 +- functional/rpcpb/member.go | 10 ++-- functional/runner/election_command.go | 2 +- functional/runner/error.go | 2 +- functional/runner/global.go | 2 +- functional/runner/help.go | 2 +- functional/runner/lease_renewer_command.go | 2 +- functional/runner/lock_racer_command.go | 2 +- functional/runner/watch_command.go | 4 +- functional/tester/case.go | 2 +- functional/tester/case_external.go | 2 +- functional/tester/case_failpoints.go | 2 +- functional/tester/case_network_blackhole.go | 2 +- functional/tester/case_network_delay.go | 2 +- functional/tester/case_no_fail.go | 2 +- functional/tester/case_sigquit_remove.go | 4 +- .../tester/case_sigquit_remove_quorum.go | 4 +- functional/tester/case_sigterm.go | 2 +- functional/tester/checker.go | 2 +- functional/tester/checker_kv_hash.go | 2 +- functional/tester/checker_lease_expire.go | 6 +- functional/tester/checker_no_check.go | 2 +- functional/tester/checker_runner.go | 2 +- functional/tester/cluster.go | 6 +- functional/tester/cluster_read_config.go | 2 +- functional/tester/cluster_run.go | 4 +- functional/tester/cluster_test.go | 2 +- functional/tester/stresser.go | 2 +- functional/tester/stresser_key.go | 10 ++-- functional/tester/stresser_lease.go | 6 +- functional/tester/stresser_runner.go | 2 +- go.mod | 2 +- go.sum | 41 +++++++++++++ integration/bridge.go | 2 +- integration/cluster.go | 38 ++++++------ integration/cluster_direct.go | 8 +-- integration/cluster_proxy.go | 8 +-- integration/cluster_test.go | 6 +- integration/embed_test.go | 4 +- integration/logger_test.go | 2 +- integration/main_test.go | 2 +- integration/member_test.go | 4 +- integration/metrics_test.go | 8 +-- integration/network_partition_test.go | 2 +- integration/util_test.go | 2 +- integration/v2_http_kv_test.go | 4 +- integration/v3_alarm_test.go | 14 ++--- integration/v3_auth_test.go | 10 ++-- integration/v3_barrier_test.go | 6 +- integration/v3_double_barrier_test.go | 4 +- integration/v3_election_test.go | 4 +- integration/v3_grpc_inflight_test.go | 6 +- integration/v3_grpc_test.go | 10 ++-- integration/v3_health_test.go | 2 +- integration/v3_leadership_test.go | 6 +- integration/v3_lease_test.go | 8 +-- integration/v3_lock_test.go | 10 ++-- integration/v3_queue_test.go | 2 +- integration/v3_stm_test.go | 6 +- integration/v3_tls_test.go | 4 +- integration/v3_watch_restore_test.go | 2 +- integration/v3_watch_test.go | 8 +-- integration/v3election_grpc_test.go | 6 +- integration/v3lock_grpc_test.go | 6 +- lease/leasehttp/http.go | 8 +-- lease/leasehttp/http_test.go | 4 +- lease/leasepb/lease.pb.go | 2 +- lease/lessor.go | 6 +- lease/lessor_bench_test.go | 2 +- lease/lessor_test.go | 4 +- main.go | 2 +- mvcc/kv.go | 8 +-- mvcc/kv_test.go | 10 ++-- mvcc/kv_view.go | 4 +- mvcc/kvstore.go | 12 ++-- mvcc/kvstore_bench_test.go | 8 +-- mvcc/kvstore_compaction_test.go | 6 +- mvcc/kvstore_test.go | 12 ++-- mvcc/kvstore_txn.go | 8 +-- mvcc/metrics_txn.go | 2 +- mvcc/util.go | 4 +- mvcc/watchable_store.go | 10 ++-- mvcc/watchable_store_bench_test.go | 8 +-- mvcc/watchable_store_test.go | 10 ++-- mvcc/watchable_store_txn.go | 4 +- mvcc/watcher.go | 2 +- mvcc/watcher_bench_test.go | 4 +- mvcc/watcher_group.go | 4 +- mvcc/watcher_test.go | 6 +- pkg/adt/example_test.go | 2 +- pkg/flags/unique_urls.go | 2 +- pkg/flags/urls.go | 2 +- pkg/ioutil/util.go | 2 +- pkg/logutil/logger_test.go | 2 +- pkg/logutil/zap_journal.go | 2 +- pkg/logutil/zap_raft.go | 2 +- pkg/mock/mockserver/mockserver.go | 2 +- pkg/mock/mockstorage/storage_recorder.go | 6 +- pkg/mock/mockstore/store_recorder.go | 4 +- pkg/mock/mockwait/wait_recorder.go | 4 +- pkg/netutil/netutil.go | 2 +- pkg/netutil/routes_linux.go | 2 +- pkg/proxy/server.go | 2 +- pkg/proxy/server_test.go | 2 +- pkg/srv/srv.go | 2 +- pkg/srv/srv_test.go | 2 +- pkg/testutil/leak.go | 2 +- pkg/transport/listener.go | 4 +- pkg/types/urls_test.go | 2 +- pkg/types/urlsmap_test.go | 2 +- .../grpcproxy/adapter/auth_client_adapter.go | 2 +- .../adapter/cluster_client_adapter.go | 2 +- .../adapter/election_client_adapter.go | 2 +- proxy/grpcproxy/adapter/kv_client_adapter.go | 2 +- .../grpcproxy/adapter/lease_client_adapter.go | 2 +- .../grpcproxy/adapter/lock_client_adapter.go | 2 +- .../adapter/maintenance_client_adapter.go | 2 +- .../grpcproxy/adapter/watch_client_adapter.go | 2 +- proxy/grpcproxy/auth.go | 4 +- proxy/grpcproxy/cache/store.go | 6 +- proxy/grpcproxy/cluster.go | 8 +-- proxy/grpcproxy/cluster_test.go | 8 +-- proxy/grpcproxy/election.go | 4 +- proxy/grpcproxy/health.go | 6 +- proxy/grpcproxy/kv.go | 6 +- proxy/grpcproxy/kv_test.go | 8 +-- proxy/grpcproxy/leader.go | 2 +- proxy/grpcproxy/lease.go | 6 +- proxy/grpcproxy/lock.go | 4 +- proxy/grpcproxy/maintenance.go | 4 +- proxy/grpcproxy/metrics.go | 2 +- proxy/grpcproxy/register.go | 6 +- proxy/grpcproxy/register_test.go | 8 +-- proxy/grpcproxy/util.go | 2 +- proxy/grpcproxy/watch.go | 8 +-- proxy/grpcproxy/watch_broadcast.go | 4 +- proxy/grpcproxy/watcher.go | 8 +-- proxy/httpproxy/reverse.go | 2 +- raft/bootstrap.go | 2 +- raft/confchange/confchange.go | 6 +- raft/confchange/datadriven_test.go | 4 +- raft/confchange/quick_test.go | 4 +- raft/confchange/restore.go | 4 +- raft/confchange/restore_test.go | 4 +- raft/example_test.go | 2 +- raft/interaction_test.go | 2 +- raft/log.go | 2 +- raft/log_test.go | 2 +- raft/log_unstable_test.go | 2 +- raft/node.go | 2 +- raft/node_test.go | 4 +- raft/raft.go | 8 +-- raft/raft_flow_control_test.go | 2 +- raft/raft_paper_test.go | 2 +- raft/raft_snap_test.go | 2 +- raft/raft_test.go | 4 +- raft/rafttest/interaction_env.go | 4 +- .../interaction_env_handler_add_nodes.go | 4 +- .../interaction_env_handler_deliver_msgs.go | 4 +- .../interaction_env_handler_process_ready.go | 4 +- ...raction_env_handler_propose_conf_change.go | 2 +- .../interaction_env_handler_raft_log.go | 2 +- .../interaction_env_handler_stabilize.go | 2 +- .../interaction_env_handler_status.go | 2 +- raft/rafttest/interaction_env_logger.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 | 4 +- raft/rawnode_test.go | 6 +- raft/status.go | 4 +- raft/storage.go | 2 +- raft/storage_test.go | 2 +- raft/tracker/tracker.go | 4 +- raft/util.go | 2 +- raft/util_test.go | 2 +- tests/e2e/cluster_proxy_test.go | 2 +- tests/e2e/cluster_test.go | 2 +- tests/e2e/ctl_v2_test.go | 4 +- tests/e2e/ctl_v3_alarm_test.go | 2 +- tests/e2e/ctl_v3_auth_test.go | 2 +- tests/e2e/ctl_v3_elect_test.go | 2 +- tests/e2e/ctl_v3_endpoint_test.go | 2 +- tests/e2e/ctl_v3_lock_test.go | 2 +- tests/e2e/ctl_v3_member_test.go | 2 +- tests/e2e/ctl_v3_migrate_test.go | 4 +- tests/e2e/ctl_v3_move_leader_test.go | 8 +-- tests/e2e/ctl_v3_snapshot_test.go | 6 +- tests/e2e/ctl_v3_test.go | 8 +-- tests/e2e/etcd_config_test.go | 2 +- tests/e2e/etcd_corrupt_test.go | 4 +- tests/e2e/etcd_process.go | 4 +- tests/e2e/etcd_release_upgrade_test.go | 6 +- tests/e2e/etcd_spawn_cov.go | 6 +- tests/e2e/etcd_spawn_nocov.go | 2 +- tests/e2e/gateway_test.go | 2 +- tests/e2e/main_test.go | 2 +- tests/e2e/metrics_test.go | 2 +- tests/e2e/util.go | 2 +- tests/e2e/v2_curl_test.go | 2 +- tests/e2e/v3_cipher_suite_test.go | 2 +- tests/e2e/v3_curl_lease_test.go | 2 +- tests/e2e/v3_curl_test.go | 10 ++-- tools/benchmark/cmd/lease.go | 4 +- tools/benchmark/cmd/mvcc-put.go | 6 +- tools/benchmark/cmd/mvcc.go | 6 +- tools/benchmark/cmd/put.go | 4 +- tools/benchmark/cmd/range.go | 4 +- tools/benchmark/cmd/root.go | 2 +- tools/benchmark/cmd/stm.go | 8 +-- tools/benchmark/cmd/txn_put.go | 4 +- tools/benchmark/cmd/util.go | 4 +- tools/benchmark/cmd/watch.go | 4 +- tools/benchmark/cmd/watch_get.go | 4 +- tools/benchmark/cmd/watch_latency.go | 4 +- tools/benchmark/main.go | 2 +- tools/etcd-dump-db/backend.go | 10 ++-- tools/etcd-dump-logs/etcd-dump-log_test.go | 12 ++-- tools/etcd-dump-logs/main.go | 14 ++--- tools/etcd-dump-metrics/etcd.go | 4 +- tools/etcd-dump-metrics/install_darwin.go | 2 +- tools/etcd-dump-metrics/install_linux.go | 2 +- tools/etcd-dump-metrics/main.go | 2 +- tools/etcd-dump-metrics/metrics.go | 2 +- wal/decoder.go | 8 +-- wal/encoder.go | 6 +- wal/file_pipeline.go | 2 +- wal/record_test.go | 2 +- wal/repair.go | 4 +- wal/repair_test.go | 4 +- wal/util.go | 2 +- wal/wal.go | 10 ++-- wal/wal_bench_test.go | 2 +- wal/wal_test.go | 8 +-- 558 files changed, 1475 insertions(+), 1434 deletions(-) diff --git a/Documentation/learning/lock/client/client.go b/Documentation/learning/lock/client/client.go index 857f1a8081a..183fa359b28 100644 --- a/Documentation/learning/lock/client/client.go +++ b/Documentation/learning/lock/client/client.go @@ -26,8 +26,8 @@ import ( "bytes" "encoding/json" "fmt" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/clientv3/concurrency" + "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/clientv3/concurrency" "io/ioutil" "net/http" "os" diff --git a/auth/range_perm_cache.go b/auth/range_perm_cache.go index 5c6a5e60789..9e33c053507 100644 --- a/auth/range_perm_cache.go +++ b/auth/range_perm_cache.go @@ -15,9 +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 fae488b6c5b..5e697d1b213 100644 --- a/auth/range_perm_cache_test.go +++ b/auth/range_perm_cache_test.go @@ -17,8 +17,8 @@ package auth import ( "testing" - "go.etcd.io/etcd/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 4785706e99c..56326dca4d4 100644 --- a/auth/store.go +++ b/auth/store.go @@ -24,11 +24,11 @@ import ( "sync" "sync/atomic" - "go.etcd.io/etcd/auth/authpb" - "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" - "go.etcd.io/etcd/etcdserver/cindex" - 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" + "go.etcd.io/etcd/v3/etcdserver/cindex" + pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + "go.etcd.io/etcd/v3/mvcc/backend" "go.uber.org/zap" "golang.org/x/crypto/bcrypt" diff --git a/auth/store_test.go b/auth/store_test.go index aacc5aa2588..994d448f8ee 100644 --- a/auth/store_test.go +++ b/auth/store_test.go @@ -24,10 +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" diff --git a/client/client.go b/client/client.go index de9ab798e48..197b90247a6 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 d2d62e96ad6..8691db2dfdf 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 ec53830c7f0..bc55c09c188 100644 --- a/client/keys.go +++ b/client/keys.go @@ -19,7 +19,7 @@ import ( "encoding/json" "errors" "fmt" - "go.etcd.io/etcd/pkg/pathutil" + "go.etcd.io/etcd/v3/pkg/pathutil" "net/http" "net/url" "strconv" 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 4d487eba8b9..ad97410eeef 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 d02a7eec7c3..3eecb9d1d27 100644 --- a/clientv3/balancer/balancer.go +++ b/clientv3/balancer/balancer.go @@ -20,8 +20,8 @@ import ( "sync" "time" - "go.etcd.io/etcd/clientv3/balancer/connectivity" - "go.etcd.io/etcd/clientv3/balancer/picker" + "go.etcd.io/etcd/v3/clientv3/balancer/connectivity" + "go.etcd.io/etcd/v3/clientv3/balancer/picker" "go.uber.org/zap" "google.golang.org/grpc/balancer" diff --git a/clientv3/balancer/balancer_test.go b/clientv3/balancer/balancer_test.go index c31ddbe45a1..31f1fcbabe6 100644 --- a/clientv3/balancer/balancer_test.go +++ b/clientv3/balancer/balancer_test.go @@ -21,10 +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" diff --git a/clientv3/client.go b/clientv3/client.go index 3a4341b22ed..2fab7af78a8 100644 --- a/clientv3/client.go +++ b/clientv3/client.go @@ -26,12 +26,12 @@ 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/clientv3/credentials" - "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/clientv3/credentials" + "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 c085300f1e7..1c9783b18ad 100644 --- a/clientv3/client_test.go +++ b/clientv3/client_test.go @@ -21,8 +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 d9cc48db82d..58721c4e0f9 100644 --- a/clientv3/cluster.go +++ b/clientv3/cluster.go @@ -17,8 +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 d2c2cea809f..a4cf19f2c70 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_TryLock() { 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 50a87d8a9a9..8a1ef3fb98c 100644 --- a/clientv3/concurrency/mutex.go +++ b/clientv3/concurrency/mutex.go @@ -20,8 +20,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" ) // ErrLocked is returned by TryLock when Mutex is already locked by another session. diff --git a/clientv3/concurrency/mutex_test.go b/clientv3/concurrency/mutex_test.go index 545469fe69a..b9f7e416050 100644 --- a/clientv3/concurrency/mutex_test.go +++ b/clientv3/concurrency/mutex_test.go @@ -18,8 +18,8 @@ import ( "context" "testing" - "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 TestMutexLockSessionExpired(t *testing.T) { diff --git a/clientv3/concurrency/session.go b/clientv3/concurrency/session.go index 97eb7631067..7c747183a56 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/credentials/credentials.go b/clientv3/credentials/credentials.go index 44238dd3527..eb3c81aaa5a 100644 --- a/clientv3/credentials/credentials.go +++ b/clientv3/credentials/credentials.go @@ -22,7 +22,7 @@ import ( "net" "sync" - "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" grpccredentials "google.golang.org/grpc/credentials" ) diff --git a/clientv3/ctx.go b/clientv3/ctx.go index 012eefbdc0c..a937f94e014 100644 --- a/clientv3/ctx.go +++ b/clientv3/ctx.go @@ -17,8 +17,8 @@ package clientv3 import ( "context" - "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" - "go.etcd.io/etcd/version" + "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/v3/version" "google.golang.org/grpc/metadata" ) diff --git a/clientv3/ctx_test.go b/clientv3/ctx_test.go index 89d966643e9..74deed61b38 100644 --- a/clientv3/ctx_test.go +++ b/clientv3/ctx_test.go @@ -19,8 +19,8 @@ import ( "reflect" "testing" - "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" - "go.etcd.io/etcd/version" + "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/v3/version" "google.golang.org/grpc/metadata" ) 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 c3f348b3e36..f5cbd7921e9 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..007e66a2489 100644 --- a/clientv3/example_metrics_test.go +++ b/clientv3/example_metrics_test.go @@ -23,7 +23,7 @@ import ( "net/http" "strings" - "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/v3/clientv3" grpcprom "github.com/grpc-ecosystem/go-grpc-prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" diff --git a/clientv3/example_test.go b/clientv3/example_test.go index 453f8c91654..0c6cb9a2179 100644 --- a/clientv3/example_test.go +++ b/clientv3/example_test.go @@ -20,8 +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 68aa3c5980d..950e0dae5f2 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 0961c55d7a2..cbb51cadd99 100644 --- a/clientv3/integration/cluster_test.go +++ b/clientv3/integration/cluster_test.go @@ -22,9 +22,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 af8d1cad715..168e64a2087 100644 --- a/clientv3/integration/kv_test.go +++ b/clientv3/integration/kv_test.go @@ -25,12 +25,12 @@ 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/version" + "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/v3/integration" + "go.etcd.io/etcd/v3/mvcc/mvccpb" + "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/v3/version" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/clientv3/integration/lease_test.go b/clientv3/integration/lease_test.go index e0b48c6ac1c..51b0cd05e8f 100644 --- a/clientv3/integration/lease_test.go +++ b/clientv3/integration/lease_test.go @@ -23,11 +23,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" ) func TestLeaseNotFoundError(t *testing.T) { diff --git a/clientv3/integration/leasing_test.go b/clientv3/integration/leasing_test.go index 2f79e656b7f..ed1a2df7bb7 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..7fc4ed67f1a 100644 --- a/clientv3/integration/logger_test.go +++ b/clientv3/integration/logger_test.go @@ -17,7 +17,7 @@ package integration import ( "io/ioutil" - "go.etcd.io/etcd/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 ddd52abdc4b..db160d21266 100644 --- a/clientv3/integration/maintenance_test.go +++ b/clientv3/integration/maintenance_test.go @@ -28,13 +28,13 @@ import ( "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" + "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" ) func TestMaintenanceHashKV(t *testing.T) { diff --git a/clientv3/integration/metrics_test.go b/clientv3/integration/metrics_test.go index c7dbc04882e..1065a1ced2a 100644 --- a/clientv3/integration/metrics_test.go +++ b/clientv3/integration/metrics_test.go @@ -25,10 +25,10 @@ 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" + "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" grpcprom "github.com/grpc-ecosystem/go-grpc-prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" diff --git a/clientv3/integration/mirror_test.go b/clientv3/integration/mirror_test.go index a82678e3632..2d62d77176a 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 55f96b8aa4b..61f2db6a261 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 e7cfeae9d33..d3cef6c181e 100644 --- a/clientv3/integration/server_shutdown_test.go +++ b/clientv3/integration/server_shutdown_test.go @@ -21,10 +21,10 @@ import ( "testing" "time" - "go.etcd.io/etcd/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 d9e6b8d5a53..9c4a4fd6fe4 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 59137b36096..b27b0131d93 100644 --- a/clientv3/integration/watch_test.go +++ b/clientv3/integration/watch_test.go @@ -24,13 +24,13 @@ 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/version" + "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/etcdserver/api/v3rpc" + "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/v3/integration" + mvccpb "go.etcd.io/etcd/v3/mvcc/mvccpb" + "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/v3/version" "google.golang.org/grpc/metadata" ) diff --git a/clientv3/kv.go b/clientv3/kv.go index 2b7864ad8b0..0628ed0f12c 100644 --- a/clientv3/kv.go +++ b/clientv3/kv.go @@ -17,7 +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..5a26709c4c5 100644 --- a/clientv3/lease.go +++ b/clientv3/lease.go @@ -19,8 +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" diff --git a/clientv3/leasing/cache.go b/clientv3/leasing/cache.go index 26f8a057873..377a487c7d5 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..804eeb2cf0d 100644 --- a/clientv3/leasing/kv.go +++ b/clientv3/leasing/kv.go @@ -20,11 +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..0e0bfc8aa4e 100644 --- a/clientv3/logger.go +++ b/clientv3/logger.go @@ -18,7 +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..6164ef66a43 100644 --- a/clientv3/maintenance.go +++ b/clientv3/maintenance.go @@ -19,7 +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 a984105fe74..86e03c106f3 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..b680274bb3b 100644 --- a/clientv3/naming/grpc.go +++ b/clientv3/naming/grpc.go @@ -19,7 +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" diff --git a/clientv3/naming/grpc_test.go b/clientv3/naming/grpc_test.go index 66a1feae00b..8f1a38c4632 100644 --- a/clientv3/naming/grpc_test.go +++ b/clientv3/naming/grpc_test.go @@ -20,9 +20,9 @@ import ( "reflect" "testing" - etcd "go.etcd.io/etcd/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_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..ef857ce4e9a 100644 --- a/clientv3/ordering/logger_test.go +++ b/clientv3/ordering/logger_test.go @@ -17,7 +17,7 @@ package ordering import ( "io/ioutil" - "go.etcd.io/etcd/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 7a66ac81994..c4e84030308 100644 --- a/clientv3/retry.go +++ b/clientv3/retry.go @@ -17,8 +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" diff --git a/clientv3/retry_interceptor.go b/clientv3/retry_interceptor.go index 2c266e55bec..c0fda84397b 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 04c9a2da108..e6fefdcdb43 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 5c11bf8ee78..28cd4b5f7e3 100644 --- a/clientv3/snapshot/v3_snapshot.go +++ b/clientv3/snapshot/v3_snapshot.go @@ -29,23 +29,23 @@ import ( "time" bolt "go.etcd.io/bbolt" - "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/cindex" - "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/traceutil" - "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/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/cindex" + "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/traceutil" + "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 36eeac5bd7a..d001d7eb18f 100644 --- a/clientv3/snapshot/v3_snapshot_test.go +++ b/clientv3/snapshot/v3_snapshot_test.go @@ -25,10 +25,10 @@ import ( "testing" "time" - "go.etcd.io/etcd/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..e4cac1521c6 100644 --- a/clientv3/txn.go +++ b/clientv3/txn.go @@ -18,7 +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 2529ac8123a..8fabca02200 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 06df3de2a2c..e2f11ad263c 100644 --- a/clientv3/watch.go +++ b/clientv3/watch.go @@ -21,9 +21,9 @@ import ( "sync" "time" - v3rpc "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" - "go.etcd.io/etcd/mvcc/mvccpb" + v3rpc "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.uber.org/zap" "google.golang.org/grpc" 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..17390f9cbda 100644 --- a/clientv3/yaml/config.go +++ b/clientv3/yaml/config.go @@ -22,8 +22,8 @@ import ( "sigs.k8s.io/yaml" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/pkg/tlsutil" + "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/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 19831fe7139..26bdafb978a 100644 --- a/contrib/raftexample/raft.go +++ b/contrib/raftexample/raft.go @@ -24,15 +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 e6c56cee166..d03e3f043db 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 f13aee14e30..5952e5a4013 100644 --- a/embed/config.go +++ b/embed/config.go @@ -26,15 +26,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/logutil" - "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" + "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/logutil" + "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" bolt "go.etcd.io/bbolt" "go.uber.org/zap" diff --git a/embed/config_logging.go b/embed/config_logging.go index cdde4112d1c..b0201615b14 100644 --- a/embed/config_logging.go +++ b/embed/config_logging.go @@ -19,7 +19,7 @@ import ( "fmt" "sync" - "go.etcd.io/etcd/pkg/logutil" + "go.etcd.io/etcd/v3/pkg/logutil" "go.uber.org/zap" "go.uber.org/zap/zapcore" diff --git a/embed/config_logging_journal_unix.go b/embed/config_logging_journal_unix.go index 44a51d67708..db70ab9d4b8 100644 --- a/embed/config_logging_journal_unix.go +++ b/embed/config_logging_journal_unix.go @@ -20,7 +20,7 @@ import ( "fmt" "os" - "go.etcd.io/etcd/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 f6f5f1c87a3..874ec92231d 100644 --- a/embed/config_test.go +++ b/embed/config_test.go @@ -22,7 +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 0766a07eb9f..b8e53e295e1 100644 --- a/embed/etcd.go +++ b/embed/etcd.go @@ -29,18 +29,18 @@ 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" + "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" grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" "github.com/soheilhy/cmux" diff --git a/embed/serve.go b/embed/serve.go index 14e4810825c..7bcccba9082 100644 --- a/embed/serve.go +++ b/embed/serve.go @@ -23,20 +23,20 @@ import ( "net/http" "strings" - "go.etcd.io/etcd/clientv3/credentials" - "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" + "go.etcd.io/etcd/v3/clientv3/credentials" + "go.etcd.io/etcd/v3/etcdserver" + "go.etcd.io/etcd/v3/etcdserver/api/v3client" + "go.etcd.io/etcd/v3/etcdserver/api/v3election" + "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" gw "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/soheilhy/cmux" diff --git a/embed/serve_test.go b/embed/serve_test.go index 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..3b6e0c5763c 100644 --- a/etcdctl/ctlv2/command/backup_command.go +++ b/etcdctl/ctlv2/command/backup_command.go @@ -23,15 +23,15 @@ import ( "regexp" "time" - "go.etcd.io/etcd/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" + "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" "github.com/urfave/cli" bolt "go.etcd.io/bbolt" diff --git a/etcdctl/ctlv2/command/cluster_health.go b/etcdctl/ctlv2/command/cluster_health.go index bfe8d698f67..d4e2b382b93 100644 --- a/etcdctl/ctlv2/command/cluster_health.go +++ b/etcdctl/ctlv2/command/cluster_health.go @@ -24,7 +24,7 @@ import ( "os/signal" "time" - "go.etcd.io/etcd/client" + "go.etcd.io/etcd/v3/client" "github.com/urfave/cli" ) 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 3661f61ef0a..f3d1f8ca298 100644 --- a/etcdctl/ctlv2/command/exec_watch_command.go +++ b/etcdctl/ctlv2/command/exec_watch_command.go @@ -22,7 +22,7 @@ import ( "os/exec" "os/signal" - "go.etcd.io/etcd/client" + "go.etcd.io/etcd/v3/client" "github.com/urfave/cli" ) 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..498c9df3bc5 100644 --- a/etcdctl/ctlv2/command/util.go +++ b/etcdctl/ctlv2/command/util.go @@ -28,8 +28,8 @@ import ( "syscall" "time" - "go.etcd.io/etcd/client" - "go.etcd.io/etcd/pkg/transport" + "go.etcd.io/etcd/v3/client" + "go.etcd.io/etcd/v3/pkg/transport" "github.com/bgentry/speakeasy" "github.com/urfave/cli" diff --git a/etcdctl/ctlv2/command/watch_command.go b/etcdctl/ctlv2/command/watch_command.go index dc0fe2d1149..147c56c5340 100644 --- a/etcdctl/ctlv2/command/watch_command.go +++ b/etcdctl/ctlv2/command/watch_command.go @@ -21,7 +21,7 @@ import ( "os" "os/signal" - "go.etcd.io/etcd/client" + "go.etcd.io/etcd/v3/client" "github.com/urfave/cli" ) diff --git a/etcdctl/ctlv2/ctl.go b/etcdctl/ctlv2/ctl.go index 9cbf0c55acc..06adec2ab88 100644 --- a/etcdctl/ctlv2/ctl.go +++ b/etcdctl/ctlv2/ctl.go @@ -20,8 +20,8 @@ import ( "os" "time" - "go.etcd.io/etcd/etcdctl/ctlv2/command" - "go.etcd.io/etcd/version" + "go.etcd.io/etcd/v3/etcdctl/ctlv2/command" + "go.etcd.io/etcd/v3/version" "github.com/urfave/cli" ) 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 76dd1cdf348..3ec7cb2b406 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..ec748a256ee 100644 --- a/etcdctl/ctlv3/command/check.go +++ b/etcdctl/ctlv3/command/check.go @@ -25,8 +25,8 @@ import ( "sync" "time" - v3 "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/pkg/report" + v3 "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/pkg/report" "github.com/spf13/cobra" "golang.org/x/time/rate" diff --git a/etcdctl/ctlv3/command/compaction_command.go b/etcdctl/ctlv3/command/compaction_command.go index 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..819a632018e 100644 --- a/etcdctl/ctlv3/command/elect_command.go +++ b/etcdctl/ctlv3/command/elect_command.go @@ -21,8 +21,8 @@ import ( "os/signal" "syscall" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/clientv3/concurrency" + "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/clientv3/concurrency" "github.com/spf13/cobra" ) diff --git a/etcdctl/ctlv3/command/ep_command.go b/etcdctl/ctlv3/command/ep_command.go index 5ff9d212611..7cb6bb1491f 100644 --- a/etcdctl/ctlv3/command/ep_command.go +++ b/etcdctl/ctlv3/command/ep_command.go @@ -20,9 +20,9 @@ import ( "sync" "time" - v3 "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" - "go.etcd.io/etcd/pkg/flags" + v3 "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/v3/pkg/flags" "github.com/spf13/cobra" "go.uber.org/zap" 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 bb7347051f6..4f1b2826bc4 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 b3ad325c850..aafc154bacc 100644 --- a/etcdctl/ctlv3/command/global.go +++ b/etcdctl/ctlv3/command/global.go @@ -25,10 +25,10 @@ import ( "time" "github.com/bgentry/speakeasy" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/pkg/flags" - "go.etcd.io/etcd/pkg/srv" - "go.etcd.io/etcd/pkg/transport" + "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" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/etcdctl/ctlv3/command/lease_command.go b/etcdctl/ctlv3/command/lease_command.go index ab13b460050..b15cee8d67e 100644 --- a/etcdctl/ctlv3/command/lease_command.go +++ b/etcdctl/ctlv3/command/lease_command.go @@ -19,7 +19,7 @@ import ( "fmt" "strconv" - v3 "go.etcd.io/etcd/clientv3" + v3 "go.etcd.io/etcd/v3/clientv3" "github.com/spf13/cobra" ) diff --git a/etcdctl/ctlv3/command/lock_command.go b/etcdctl/ctlv3/command/lock_command.go index 9b117b1751f..6eef22caf3f 100644 --- a/etcdctl/ctlv3/command/lock_command.go +++ b/etcdctl/ctlv3/command/lock_command.go @@ -23,8 +23,8 @@ import ( "os/signal" "syscall" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/clientv3/concurrency" + "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/clientv3/concurrency" "github.com/spf13/cobra" ) diff --git a/etcdctl/ctlv3/command/make_mirror_command.go b/etcdctl/ctlv3/command/make_mirror_command.go index e5d09146337..eea33e17963 100644 --- a/etcdctl/ctlv3/command/make_mirror_command.go +++ b/etcdctl/ctlv3/command/make_mirror_command.go @@ -23,10 +23,10 @@ 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" + "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" "github.com/spf13/cobra" ) diff --git a/etcdctl/ctlv3/command/member_command.go b/etcdctl/ctlv3/command/member_command.go index bdeff639a29..c621d361e3a 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..12620d13697 100644 --- a/etcdctl/ctlv3/command/migrate_command.go +++ b/etcdctl/ctlv3/command/migrate_command.go @@ -24,22 +24,22 @@ import ( "path/filepath" "time" - "go.etcd.io/etcd/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" + "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" "github.com/gogo/protobuf/proto" "github.com/spf13/cobra" diff --git a/etcdctl/ctlv3/command/move_leader_command.go b/etcdctl/ctlv3/command/move_leader_command.go index 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 f4e27aebdae..686c4997516 100644 --- a/etcdctl/ctlv3/command/printer.go +++ b/etcdctl/ctlv3/command/printer.go @@ -19,9 +19,9 @@ import ( "fmt" "strings" - v3 "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/clientv3/snapshot" - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + v3 "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/clientv3/snapshot" + pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "github.com/dustin/go-humanize" ) 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 252b64e0bb4..1ed5c21daba 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..c58024393e4 100644 --- a/etcdctl/ctlv3/command/printer_table.go +++ b/etcdctl/ctlv3/command/printer_table.go @@ -17,8 +17,8 @@ package command import ( "os" - v3 "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/clientv3/snapshot" + v3 "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/clientv3/snapshot" "github.com/olekukonko/tablewriter" ) 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..06eb33112b6 100644 --- a/etcdctl/ctlv3/command/snapshot_command.go +++ b/etcdctl/ctlv3/command/snapshot_command.go @@ -20,7 +20,7 @@ import ( "path/filepath" "strings" - "go.etcd.io/etcd/clientv3/snapshot" + "go.etcd.io/etcd/v3/clientv3/snapshot" "github.com/spf13/cobra" "go.uber.org/zap" diff --git a/etcdctl/ctlv3/command/txn_command.go b/etcdctl/ctlv3/command/txn_command.go index 67f6d181842..a04a06f7ec1 100644 --- a/etcdctl/ctlv3/command/txn_command.go +++ b/etcdctl/ctlv3/command/txn_command.go @@ -22,8 +22,8 @@ import ( "strconv" "strings" - "go.etcd.io/etcd/clientv3" - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/v3/clientv3" + pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "github.com/spf13/cobra" ) diff --git a/etcdctl/ctlv3/command/user_command.go b/etcdctl/ctlv3/command/user_command.go index 7b324261eb2..876c1010c80 100644 --- a/etcdctl/ctlv3/command/user_command.go +++ b/etcdctl/ctlv3/command/user_command.go @@ -21,7 +21,7 @@ import ( "github.com/bgentry/speakeasy" "github.com/spf13/cobra" - "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/v3/clientv3" ) var ( diff --git a/etcdctl/ctlv3/command/util.go b/etcdctl/ctlv3/command/util.go index 2a90ed9276a..f256ef01b2c 100644 --- a/etcdctl/ctlv3/command/util.go +++ b/etcdctl/ctlv3/command/util.go @@ -25,8 +25,8 @@ import ( "strings" "time" - v3 "go.etcd.io/etcd/clientv3" - pb "go.etcd.io/etcd/mvcc/mvccpb" + v3 "go.etcd.io/etcd/v3/clientv3" + pb "go.etcd.io/etcd/v3/mvcc/mvccpb" "github.com/spf13/cobra" ) diff --git a/etcdctl/ctlv3/command/version_command.go b/etcdctl/ctlv3/command/version_command.go index 77c21fecb9a..e59c64ca0d4 100644 --- a/etcdctl/ctlv3/command/version_command.go +++ b/etcdctl/ctlv3/command/version_command.go @@ -17,7 +17,7 @@ package command import ( "fmt" - "go.etcd.io/etcd/version" + "go.etcd.io/etcd/v3/version" "github.com/spf13/cobra" ) diff --git a/etcdctl/ctlv3/command/watch_command.go b/etcdctl/ctlv3/command/watch_command.go index c75ce20f006..edfecd922b5 100644 --- a/etcdctl/ctlv3/command/watch_command.go +++ b/etcdctl/ctlv3/command/watch_command.go @@ -23,7 +23,7 @@ import ( "os/exec" "strings" - "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/v3/clientv3" "github.com/spf13/cobra" ) diff --git a/etcdctl/ctlv3/ctl.go b/etcdctl/ctlv3/ctl.go index 40154a5da33..7d25744c78f 100644 --- a/etcdctl/ctlv3/ctl.go +++ b/etcdctl/ctlv3/ctl.go @@ -18,7 +18,7 @@ package ctlv3 import ( "time" - "go.etcd.io/etcd/etcdctl/ctlv3/command" + "go.etcd.io/etcd/v3/etcdctl/ctlv3/command" "github.com/spf13/cobra" ) 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..229d0209218 100644 --- a/etcdctl/ctlv3/help.go +++ b/etcdctl/ctlv3/help.go @@ -25,7 +25,7 @@ import ( "text/tabwriter" "text/template" - "go.etcd.io/etcd/version" + "go.etcd.io/etcd/v3/version" "github.com/spf13/cobra" "github.com/spf13/pflag" 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 2282568dc87..e3111076adc 100644 --- a/etcdmain/config.go +++ b/etcdmain/config.go @@ -24,10 +24,10 @@ import ( "os" "runtime" - "go.etcd.io/etcd/embed" - "go.etcd.io/etcd/pkg/flags" - "go.etcd.io/etcd/pkg/logutil" - "go.etcd.io/etcd/version" + "go.etcd.io/etcd/v3/embed" + "go.etcd.io/etcd/v3/pkg/flags" + "go.etcd.io/etcd/v3/pkg/logutil" + "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 5d6c2f635d4..bfbd8cf7091 100644 --- a/etcdmain/etcd.go +++ b/etcdmain/etcd.go @@ -26,16 +26,16 @@ 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/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.uber.org/zap" "google.golang.org/grpc" diff --git a/etcdmain/gateway.go b/etcdmain/gateway.go index a990a45997c..5cd6285d356 100644 --- a/etcdmain/gateway.go +++ b/etcdmain/gateway.go @@ -21,7 +21,7 @@ import ( "os" "time" - "go.etcd.io/etcd/proxy/tcpproxy" + "go.etcd.io/etcd/v3/proxy/tcpproxy" "github.com/spf13/cobra" "go.uber.org/zap" diff --git a/etcdmain/grpc_proxy.go b/etcdmain/grpc_proxy.go index ad51d8fe174..a4287589cf9 100644 --- a/etcdmain/grpc_proxy.go +++ b/etcdmain/grpc_proxy.go @@ -29,18 +29,18 @@ 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/embed" - "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" + "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/clientv3/leasing" + "go.etcd.io/etcd/v3/clientv3/namespace" + "go.etcd.io/etcd/v3/clientv3/ordering" + "go.etcd.io/etcd/v3/embed" + "go.etcd.io/etcd/v3/etcdserver/api/v3election/v3electionpb" + "go.etcd.io/etcd/v3/etcdserver/api/v3lock/v3lockpb" + 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" grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" "github.com/soheilhy/cmux" diff --git a/etcdmain/help.go b/etcdmain/help.go index 73874cb36f5..7dfaeec95d0 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 d9e926a85ca..af84321bab1 100644 --- a/etcdmain/util.go +++ b/etcdmain/util.go @@ -18,8 +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 1e0ed196c32..c97d6e1aff4 100644 --- a/etcdserver/api/capability.go +++ b/etcdserver/api/capability.go @@ -17,7 +17,7 @@ package api import ( "sync" - "go.etcd.io/etcd/version" + "go.etcd.io/etcd/v3/version" "go.uber.org/zap" "github.com/coreos/go-semver/semver" diff --git a/etcdserver/api/cluster.go b/etcdserver/api/cluster.go index 901be9d85ca..d8109272aab 100644 --- a/etcdserver/api/cluster.go +++ b/etcdserver/api/cluster.go @@ -15,8 +15,8 @@ package api import ( - "go.etcd.io/etcd/etcdserver/api/membership" - "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/v3/etcdserver/api/membership" + "go.etcd.io/etcd/v3/pkg/types" "github.com/coreos/go-semver/semver" ) diff --git a/etcdserver/api/etcdhttp/base.go b/etcdserver/api/etcdhttp/base.go index d0c22e97e11..991e759f5ee 100644 --- a/etcdserver/api/etcdhttp/base.go +++ b/etcdserver/api/etcdhttp/base.go @@ -20,11 +20,11 @@ import ( "fmt" "net/http" - "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/version" + "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/version" "go.uber.org/zap" ) diff --git a/etcdserver/api/etcdhttp/metrics.go b/etcdserver/api/etcdhttp/metrics.go index 8fd813dcb18..e6365a8c96e 100644 --- a/etcdserver/api/etcdhttp/metrics.go +++ b/etcdserver/api/etcdhttp/metrics.go @@ -22,9 +22,9 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" - "go.etcd.io/etcd/etcdserver" - "go.etcd.io/etcd/etcdserver/etcdserverpb" - "go.etcd.io/etcd/raft" + "go.etcd.io/etcd/v3/etcdserver" + "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + "go.etcd.io/etcd/v3/raft" "go.uber.org/zap" ) diff --git a/etcdserver/api/etcdhttp/peer.go b/etcdserver/api/etcdhttp/peer.go index e9dae3aaea9..0b97c05fbe7 100644 --- a/etcdserver/api/etcdhttp/peer.go +++ b/etcdserver/api/etcdhttp/peer.go @@ -21,12 +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 8a5a8c8c855..bc2f206ebf7 100644 --- a/etcdserver/api/etcdhttp/peer_test.go +++ b/etcdserver/api/etcdhttp/peer_test.go @@ -29,12 +29,12 @@ import ( "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" ) 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 cdb506411da..f5e668bf966 100644 --- a/etcdserver/api/membership/cluster.go +++ b/etcdserver/api/membership/cluster.go @@ -27,13 +27,13 @@ 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" + "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" "github.com/coreos/go-semver/semver" "github.com/prometheus/client_golang/prometheus" diff --git a/etcdserver/api/membership/cluster_test.go b/etcdserver/api/membership/cluster_test.go index 761da0fbf73..2a1e8b8d499 100644 --- a/etcdserver/api/membership/cluster_test.go +++ b/etcdserver/api/membership/cluster_test.go @@ -21,11 +21,11 @@ import ( "reflect" "testing" - "go.etcd.io/etcd/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 5ab43950e42..33012e020d8 100644 --- a/etcdserver/api/membership/member.go +++ b/etcdserver/api/membership/member.go @@ -22,7 +22,7 @@ import ( "sort" "time" - "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/v3/pkg/types" ) // RaftAttributes represents the raft related attributes of an etcd member. 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 c793a3cf565..8525fe1e2b2 100644 --- a/etcdserver/api/membership/store.go +++ b/etcdserver/api/membership/store.go @@ -19,9 +19,9 @@ import ( "fmt" "path" - "go.etcd.io/etcd/etcdserver/api/v2store" - "go.etcd.io/etcd/mvcc/backend" - "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/v3/etcdserver/api/v2store" + "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/v3/pkg/types" "github.com/coreos/go-semver/semver" "go.uber.org/zap" 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 ed6e97574a2..7b8ce9b8c72 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" "go.uber.org/zap" ) diff --git a/etcdserver/api/rafthttp/http.go b/etcdserver/api/rafthttp/http.go index 30a329f96aa..8fe1299f25e 100644 --- a/etcdserver/api/rafthttp/http.go +++ b/etcdserver/api/rafthttp/http.go @@ -24,11 +24,11 @@ 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" + "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" humanize "github.com/dustin/go-humanize" "go.uber.org/zap" diff --git a/etcdserver/api/rafthttp/http_test.go b/etcdserver/api/rafthttp/http_test.go index fd5e2456319..5cb248c6506 100644 --- a/etcdserver/api/rafthttp/http_test.go +++ b/etcdserver/api/rafthttp/http_test.go @@ -26,11 +26,11 @@ import ( "testing" "time" - "go.etcd.io/etcd/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 d6783c5d6e4..6b82f7f8367 100644 --- a/etcdserver/api/rafthttp/peer.go +++ b/etcdserver/api/rafthttp/peer.go @@ -19,11 +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 78e59ac7691..470f0e7dc63 100644 --- a/etcdserver/api/rafthttp/peer_status.go +++ b/etcdserver/api/rafthttp/peer_status.go @@ -20,7 +20,7 @@ import ( "sync" "time" - "go.etcd.io/etcd/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 05d8c67256d..fe78ddeedbc 100644 --- a/etcdserver/api/rafthttp/pipeline.go +++ b/etcdserver/api/rafthttp/pipeline.go @@ -22,11 +22,11 @@ import ( "sync" "time" - stats "go.etcd.io/etcd/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..0f8388ce8c5 100644 --- a/etcdserver/api/rafthttp/pipeline_test.go +++ b/etcdserver/api/rafthttp/pipeline_test.go @@ -24,11 +24,11 @@ import ( "testing" "time" - stats "go.etcd.io/etcd/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 92b29b96c3d..b2f8a08066f 100644 --- a/etcdserver/api/rafthttp/remote.go +++ b/etcdserver/api/rafthttp/remote.go @@ -15,8 +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 99d27f91af9..2e152fd4854 100644 --- a/etcdserver/api/rafthttp/snapshot_sender.go +++ b/etcdserver/api/rafthttp/snapshot_sender.go @@ -22,11 +22,11 @@ import ( "net/http" "time" - "go.etcd.io/etcd/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" + "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" "github.com/dustin/go-humanize" "go.uber.org/zap" diff --git a/etcdserver/api/rafthttp/snapshot_test.go b/etcdserver/api/rafthttp/snapshot_test.go index 504a8ff6466..03ee21d811c 100644 --- a/etcdserver/api/rafthttp/snapshot_test.go +++ b/etcdserver/api/rafthttp/snapshot_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" - "go.etcd.io/etcd/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 f49d47d427f..4ee5ed74901 100644 --- a/etcdserver/api/rafthttp/stream.go +++ b/etcdserver/api/rafthttp/stream.go @@ -25,12 +25,12 @@ import ( "sync" "time" - stats "go.etcd.io/etcd/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" + 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" "github.com/coreos/go-semver/semver" "go.uber.org/zap" diff --git a/etcdserver/api/rafthttp/stream_test.go b/etcdserver/api/rafthttp/stream_test.go index b7fca99238b..d6bf5c153f8 100644 --- a/etcdserver/api/rafthttp/stream_test.go +++ b/etcdserver/api/rafthttp/stream_test.go @@ -26,11 +26,11 @@ import ( "testing" "time" - stats "go.etcd.io/etcd/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" "github.com/coreos/go-semver/semver" "go.uber.org/zap" diff --git a/etcdserver/api/rafthttp/transport.go b/etcdserver/api/rafthttp/transport.go index 4de6a677283..b4ada235d36 100644 --- a/etcdserver/api/rafthttp/transport.go +++ b/etcdserver/api/rafthttp/transport.go @@ -20,12 +20,12 @@ import ( "sync" "time" - "go.etcd.io/etcd/etcdserver/api/snap" - stats "go.etcd.io/etcd/etcdserver/api/v2stats" - "go.etcd.io/etcd/pkg/transport" - "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/transport" + "go.etcd.io/etcd/v3/pkg/types" + "go.etcd.io/etcd/v3/raft" + "go.etcd.io/etcd/v3/raft/raftpb" "github.com/xiang90/probing" "go.uber.org/zap" diff --git a/etcdserver/api/rafthttp/transport_bench_test.go b/etcdserver/api/rafthttp/transport_bench_test.go index 64c9acc7d4b..ab6d06f195f 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" "go.uber.org/zap" ) diff --git a/etcdserver/api/rafthttp/transport_test.go b/etcdserver/api/rafthttp/transport_test.go index e48b4c62b80..32dad24c3d6 100644 --- a/etcdserver/api/rafthttp/transport_test.go +++ b/etcdserver/api/rafthttp/transport_test.go @@ -20,10 +20,10 @@ import ( "testing" "time" - stats "go.etcd.io/etcd/etcdserver/api/v2stats" - "go.etcd.io/etcd/pkg/testutil" - "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/testutil" + "go.etcd.io/etcd/v3/pkg/types" + "go.etcd.io/etcd/v3/raft/raftpb" "github.com/xiang90/probing" "go.uber.org/zap" 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 d63f9e2ba67..204f028f1cf 100644 --- a/etcdserver/api/rafthttp/util.go +++ b/etcdserver/api/rafthttp/util.go @@ -23,9 +23,9 @@ import ( "strings" "time" - "go.etcd.io/etcd/pkg/transport" - "go.etcd.io/etcd/pkg/types" - "go.etcd.io/etcd/version" + "go.etcd.io/etcd/v3/pkg/transport" + "go.etcd.io/etcd/v3/pkg/types" + "go.etcd.io/etcd/v3/version" "github.com/coreos/go-semver/semver" "go.uber.org/zap" diff --git a/etcdserver/api/rafthttp/util_test.go b/etcdserver/api/rafthttp/util_test.go index 17a385ed152..41e1256c66a 100644 --- a/etcdserver/api/rafthttp/util_test.go +++ b/etcdserver/api/rafthttp/util_test.go @@ -22,8 +22,8 @@ import ( "reflect" "testing" - "go.etcd.io/etcd/raft/raftpb" - "go.etcd.io/etcd/version" + "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/v3/version" "github.com/coreos/go-semver/semver" ) diff --git a/etcdserver/api/snap/db.go b/etcdserver/api/snap/db.go index 121e7a8c1aa..abf219c0786 100644 --- a/etcdserver/api/snap/db.go +++ b/etcdserver/api/snap/db.go @@ -23,7 +23,7 @@ import ( "path/filepath" "time" - "go.etcd.io/etcd/pkg/fileutil" + "go.etcd.io/etcd/v3/pkg/fileutil" humanize "github.com/dustin/go-humanize" "go.uber.org/zap" diff --git a/etcdserver/api/snap/message.go b/etcdserver/api/snap/message.go index 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 ff1725644ce..eb96650f37d 100644 --- a/etcdserver/api/snap/snapshotter.go +++ b/etcdserver/api/snap/snapshotter.go @@ -25,11 +25,11 @@ 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" + "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 2f45bb48f66..7f7ac7c7e31 100644 --- a/etcdserver/api/snap/snapshotter_test.go +++ b/etcdserver/api/snap/snapshotter_test.go @@ -23,7 +23,7 @@ import ( "reflect" "testing" - "go.etcd.io/etcd/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 a511501ed54..dfefc354585 100644 --- a/etcdserver/api/v2auth/auth.go +++ b/etcdserver/api/v2auth/auth.go @@ -26,10 +26,10 @@ 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" + "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 7de52b4aa6c..a6cbfe7e5c3 100644 --- a/etcdserver/api/v2auth/auth_requests.go +++ b/etcdserver/api/v2auth/auth_requests.go @@ -19,9 +19,9 @@ import ( "encoding/json" "path" - "go.etcd.io/etcd/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..6fdac203d7d 100644 --- a/etcdserver/api/v2auth/auth_test.go +++ b/etcdserver/api/v2auth/auth_test.go @@ -20,10 +20,10 @@ import ( "testing" "time" - "go.etcd.io/etcd/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 58e6f8d5599..634a40c2320 100644 --- a/etcdserver/api/v2discovery/discovery.go +++ b/etcdserver/api/v2discovery/discovery.go @@ -29,9 +29,9 @@ import ( "strings" "time" - "go.etcd.io/etcd/client" - "go.etcd.io/etcd/pkg/transport" - "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/v3/client" + "go.etcd.io/etcd/v3/pkg/transport" + "go.etcd.io/etcd/v3/pkg/types" "github.com/jonboulle/clockwork" "go.uber.org/zap" diff --git a/etcdserver/api/v2discovery/discovery_test.go b/etcdserver/api/v2discovery/discovery_test.go index 84ec4951e42..c84088978ff 100644 --- a/etcdserver/api/v2discovery/discovery_test.go +++ b/etcdserver/api/v2discovery/discovery_test.go @@ -27,8 +27,8 @@ import ( "testing" "time" - "go.etcd.io/etcd/client" - "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/v3/client" + "go.etcd.io/etcd/v3/pkg/types" "github.com/jonboulle/clockwork" "go.uber.org/zap" diff --git a/etcdserver/api/v2http/capability.go b/etcdserver/api/v2http/capability.go index deb5d4a90ca..49f6af4c6a2 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 a256894d6b5..5eabab9068b 100644 --- a/etcdserver/api/v2http/client.go +++ b/etcdserver/api/v2http/client.go @@ -27,17 +27,17 @@ 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" + "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" "github.com/jonboulle/clockwork" "go.uber.org/zap" diff --git a/etcdserver/api/v2http/client_auth.go b/etcdserver/api/v2http/client_auth.go index 25857f7caab..144b8ef4f6b 100644 --- a/etcdserver/api/v2http/client_auth.go +++ b/etcdserver/api/v2http/client_auth.go @@ -20,9 +20,9 @@ import ( "path" "strings" - "go.etcd.io/etcd/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..2350eb87eea 100644 --- a/etcdserver/api/v2http/client_auth_test.go +++ b/etcdserver/api/v2http/client_auth_test.go @@ -30,8 +30,8 @@ import ( "strings" "testing" - "go.etcd.io/etcd/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 1ac78924f4e..fbf1fae38e2 100644 --- a/etcdserver/api/v2http/client_test.go +++ b/etcdserver/api/v2http/client_test.go @@ -29,16 +29,16 @@ import ( "testing" "time" - "go.etcd.io/etcd/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" + "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" "github.com/coreos/go-semver/semver" "github.com/jonboulle/clockwork" diff --git a/etcdserver/api/v2http/http.go b/etcdserver/api/v2http/http.go index b46708128f1..753826325c7 100644 --- a/etcdserver/api/v2http/http.go +++ b/etcdserver/api/v2http/http.go @@ -20,9 +20,9 @@ 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/v3/etcdserver/api/etcdhttp" + "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/http_test.go b/etcdserver/api/v2http/http_test.go index f93071048d0..a5cdbcad43f 100644 --- a/etcdserver/api/v2http/http_test.go +++ b/etcdserver/api/v2http/http_test.go @@ -22,12 +22,12 @@ import ( "sort" "testing" - "go.etcd.io/etcd/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" + "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" "github.com/coreos/go-semver/semver" "go.uber.org/zap" diff --git a/etcdserver/api/v2http/httptypes/member.go b/etcdserver/api/v2http/httptypes/member.go index 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..03ca58b9629 100644 --- a/etcdserver/api/v2http/metrics.go +++ b/etcdserver/api/v2http/metrics.go @@ -20,9 +20,9 @@ import ( "net/http" - "go.etcd.io/etcd/etcdserver/api/v2error" - "go.etcd.io/etcd/etcdserver/api/v2http/httptypes" - "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/v3/etcdserver/api/v2error" + "go.etcd.io/etcd/v3/etcdserver/api/v2http/httptypes" + "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "github.com/prometheus/client_golang/prometheus" ) 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..50316ec4cf2 100644 --- a/etcdserver/api/v2store/node.go +++ b/etcdserver/api/v2store/node.go @@ -19,7 +19,7 @@ import ( "sort" "time" - "go.etcd.io/etcd/etcdserver/api/v2error" + "go.etcd.io/etcd/v3/etcdserver/api/v2error" "github.com/jonboulle/clockwork" ) diff --git a/etcdserver/api/v2store/node_extern_test.go b/etcdserver/api/v2store/node_extern_test.go index 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 01e7e1ed53f..9812ebd41ad 100644 --- a/etcdserver/api/v2store/store.go +++ b/etcdserver/api/v2store/store.go @@ -23,8 +23,8 @@ import ( "sync" "time" - "go.etcd.io/etcd/etcdserver/api/v2error" - "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/v3/etcdserver/api/v2error" + "go.etcd.io/etcd/v3/pkg/types" "github.com/jonboulle/clockwork" ) 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..792f6165a65 100644 --- a/etcdserver/api/v2store/store_ttl_test.go +++ b/etcdserver/api/v2store/store_ttl_test.go @@ -18,8 +18,8 @@ import ( "testing" "time" - "go.etcd.io/etcd/etcdserver/api/v2error" - "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/v3/etcdserver/api/v2error" + "go.etcd.io/etcd/v3/pkg/testutil" "github.com/jonboulle/clockwork" ) diff --git a/etcdserver/api/v2store/store_v2_test.go b/etcdserver/api/v2store/store_v2_test.go index 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..b7d4b26c9a2 100644 --- a/etcdserver/api/v2store/store_v2v3_test.go +++ b/etcdserver/api/v2store/store_v2v3_test.go @@ -20,10 +20,10 @@ import ( "io/ioutil" "testing" - "go.etcd.io/etcd/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..51e2b65345a 100644 --- a/etcdserver/api/v2v3/cluster.go +++ b/etcdserver/api/v2v3/cluster.go @@ -15,8 +15,8 @@ package v2v3 import ( - "go.etcd.io/etcd/etcdserver/api/membership" - "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/v3/etcdserver/api/membership" + "go.etcd.io/etcd/v3/pkg/types" "github.com/coreos/go-semver/semver" ) diff --git a/etcdserver/api/v2v3/main_test.go b/etcdserver/api/v2v3/main_test.go index 0e85086858a..a69cb9c0a60 100644 --- a/etcdserver/api/v2v3/main_test.go +++ b/etcdserver/api/v2v3/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/etcdserver/api/v2v3/server.go b/etcdserver/api/v2v3/server.go index 5ff9b96c0c4..0093f6e0a93 100644 --- a/etcdserver/api/v2v3/server.go +++ b/etcdserver/api/v2v3/server.go @@ -19,12 +19,12 @@ import ( "net/http" "time" - "go.etcd.io/etcd/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" + "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" "github.com/coreos/go-semver/semver" "go.uber.org/zap" diff --git a/etcdserver/api/v2v3/store.go b/etcdserver/api/v2v3/store.go index 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/store_test.go b/etcdserver/api/v2v3/store_test.go index 55d40647e01..deb91292e65 100644 --- a/etcdserver/api/v2v3/store_test.go +++ b/etcdserver/api/v2v3/store_test.go @@ -18,9 +18,9 @@ import ( "strings" "testing" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/etcdserver/api/v2store" - "go.etcd.io/etcd/etcdserver/api/v2v3" + "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/etcdserver/api/v2store" + "go.etcd.io/etcd/v3/etcdserver/api/v2v3" ) // TODO: fix tests 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 8b31801f5b3..0a46f735b25 100644 --- a/etcdserver/api/v3alarm/alarms.go +++ b/etcdserver/api/v3alarm/alarms.go @@ -18,9 +18,9 @@ package v3alarm import ( "sync" - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" - "go.etcd.io/etcd/mvcc/backend" - "go.etcd.io/etcd/pkg/types" + pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/v3/pkg/types" "go.uber.org/zap" ) 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 fa0e9f03672..7a05f0693a2 100644 --- a/etcdserver/api/v3compactor/compactor.go +++ b/etcdserver/api/v3compactor/compactor.go @@ -19,7 +19,7 @@ import ( "fmt" "time" - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "github.com/jonboulle/clockwork" "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 82ace9b7aeb..206325fee3b 100644 --- a/etcdserver/api/v3compactor/periodic.go +++ b/etcdserver/api/v3compactor/periodic.go @@ -19,8 +19,8 @@ import ( "sync" "time" - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" - "go.etcd.io/etcd/mvcc" + pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + "go.etcd.io/etcd/v3/mvcc" "github.com/jonboulle/clockwork" "go.uber.org/zap" diff --git a/etcdserver/api/v3compactor/periodic_test.go b/etcdserver/api/v3compactor/periodic_test.go index b9d49afa605..c876ab408b9 100644 --- a/etcdserver/api/v3compactor/periodic_test.go +++ b/etcdserver/api/v3compactor/periodic_test.go @@ -19,8 +19,8 @@ import ( "testing" "time" - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" - "go.etcd.io/etcd/pkg/testutil" + pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + "go.etcd.io/etcd/v3/pkg/testutil" "github.com/jonboulle/clockwork" "go.uber.org/zap" diff --git a/etcdserver/api/v3compactor/revision.go b/etcdserver/api/v3compactor/revision.go index a368e34b481..a4d6d3c527f 100644 --- a/etcdserver/api/v3compactor/revision.go +++ b/etcdserver/api/v3compactor/revision.go @@ -19,8 +19,8 @@ import ( "sync" "time" - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" - "go.etcd.io/etcd/mvcc" + pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + "go.etcd.io/etcd/v3/mvcc" "github.com/jonboulle/clockwork" "go.uber.org/zap" diff --git a/etcdserver/api/v3compactor/revision_test.go b/etcdserver/api/v3compactor/revision_test.go index fcd01066fbf..80c714d066d 100644 --- a/etcdserver/api/v3compactor/revision_test.go +++ b/etcdserver/api/v3compactor/revision_test.go @@ -19,8 +19,8 @@ import ( "testing" "time" - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" - "go.etcd.io/etcd/pkg/testutil" + pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + "go.etcd.io/etcd/v3/pkg/testutil" "github.com/jonboulle/clockwork" "go.uber.org/zap" diff --git a/etcdserver/api/v3election/election.go b/etcdserver/api/v3election/election.go index 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..b66a1cfbf70 100644 --- a/etcdserver/api/v3election/v3electionpb/gw/v3election.pb.gw.go +++ b/etcdserver/api/v3election/v3electionpb/gw/v3election.pb.gw.go @@ -9,7 +9,7 @@ It translates gRPC into RESTful JSON APIs. package gw import ( - "go.etcd.io/etcd/etcdserver/api/v3election/v3electionpb" + "go.etcd.io/etcd/v3/etcdserver/api/v3election/v3electionpb" "io" "net/http" diff --git a/etcdserver/api/v3election/v3electionpb/v3election.pb.go b/etcdserver/api/v3election/v3electionpb/v3election.pb.go index 1fc1bce442f..05e62fc5008 100644 --- a/etcdserver/api/v3election/v3electionpb/v3election.pb.go +++ b/etcdserver/api/v3election/v3electionpb/v3election.pb.go @@ -29,9 +29,9 @@ import ( _ "github.com/gogo/protobuf/gogoproto" - etcdserverpb "go.etcd.io/etcd/etcdserver/etcdserverpb" + etcdserverpb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - mvccpb "go.etcd.io/etcd/mvcc/mvccpb" + mvccpb "go.etcd.io/etcd/v3/mvcc/mvccpb" context "golang.org/x/net/context" 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..09405e1cd3f 100644 --- a/etcdserver/api/v3lock/v3lockpb/gw/v3lock.pb.gw.go +++ b/etcdserver/api/v3lock/v3lockpb/gw/v3lock.pb.gw.go @@ -9,7 +9,7 @@ It translates gRPC into RESTful JSON APIs. package gw import ( - "go.etcd.io/etcd/etcdserver/api/v3lock/v3lockpb" + "go.etcd.io/etcd/v3/etcdserver/api/v3lock/v3lockpb" "io" "net/http" diff --git a/etcdserver/api/v3lock/v3lockpb/v3lock.pb.go b/etcdserver/api/v3lock/v3lockpb/v3lock.pb.go index 36ebdd90f4a..ad139c1c8aa 100644 --- a/etcdserver/api/v3lock/v3lockpb/v3lock.pb.go +++ b/etcdserver/api/v3lock/v3lockpb/v3lock.pb.go @@ -24,7 +24,7 @@ import ( _ "github.com/gogo/protobuf/gogoproto" - etcdserverpb "go.etcd.io/etcd/etcdserver/etcdserverpb" + etcdserverpb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" context "golang.org/x/net/context" diff --git a/etcdserver/api/v3rpc/auth.go b/etcdserver/api/v3rpc/auth.go index 8b5115411c8..97129aa03b7 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 3332016617d..2e991074665 100644 --- a/etcdserver/api/v3rpc/grpc.go +++ b/etcdserver/api/v3rpc/grpc.go @@ -18,12 +18,12 @@ import ( "crypto/tls" "math" - "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" grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware" grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" - "go.etcd.io/etcd/clientv3/credentials" + "go.etcd.io/etcd/v3/clientv3/credentials" "google.golang.org/grpc" "google.golang.org/grpc/health" healthpb "google.golang.org/grpc/health/grpc_health_v1" diff --git a/etcdserver/api/v3rpc/header.go b/etcdserver/api/v3rpc/header.go index bbaac90ee40..04c5f57140c 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 bd102490e75..5bae935df50 100644 --- a/etcdserver/api/v3rpc/interceptor.go +++ b/etcdserver/api/v3rpc/interceptor.go @@ -19,13 +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" + "go.etcd.io/etcd/v3/etcdserver" + "go.etcd.io/etcd/v3/etcdserver/api" + "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/v3/pkg/types" + "go.etcd.io/etcd/v3/raft" - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "go.uber.org/zap" "google.golang.org/grpc" "google.golang.org/grpc/metadata" diff --git a/etcdserver/api/v3rpc/key.go b/etcdserver/api/v3rpc/key.go index 71519914a15..19a0320cf87 100644 --- a/etcdserver/api/v3rpc/key.go +++ b/etcdserver/api/v3rpc/key.go @@ -18,10 +18,10 @@ package v3rpc import ( "context" - "go.etcd.io/etcd/etcdserver" - "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" + "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + "go.etcd.io/etcd/v3/pkg/adt" ) type kvServer struct { diff --git a/etcdserver/api/v3rpc/lease.go b/etcdserver/api/v3rpc/lease.go index a0967ab64fc..8bbcebad3fb 100644 --- a/etcdserver/api/v3rpc/lease.go +++ b/etcdserver/api/v3rpc/lease.go @@ -18,10 +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 8f9f6e2d9eb..da004320605 100644 --- a/etcdserver/api/v3rpc/maintenance.go +++ b/etcdserver/api/v3rpc/maintenance.go @@ -19,14 +19,14 @@ import ( "crypto/sha256" "io" - "go.etcd.io/etcd/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 4b36fb25522..5cf3feaf769 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 281ddc7a0db..6027724b251 100644 --- a/etcdserver/api/v3rpc/util.go +++ b/etcdserver/api/v3rpc/util.go @@ -18,13 +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..b84a267d557 100644 --- a/etcdserver/api/v3rpc/util_test.go +++ b/etcdserver/api/v3rpc/util_test.go @@ -19,8 +19,8 @@ import ( "errors" "testing" - "go.etcd.io/etcd/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 394dfc6c399..c623d3d946d 100644 --- a/etcdserver/api/v3rpc/watch.go +++ b/etcdserver/api/v3rpc/watch.go @@ -21,12 +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 d548fac9172..b85dd50d654 100644 --- a/etcdserver/apply.go +++ b/etcdserver/apply.go @@ -22,16 +22,16 @@ import ( "time" "github.com/coreos/go-semver/semver" - "go.etcd.io/etcd/auth" - "go.etcd.io/etcd/etcdserver/api" - "go.etcd.io/etcd/etcdserver/api/membership" - "go.etcd.io/etcd/etcdserver/api/membership/membershippb" - 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/traceutil" - "go.etcd.io/etcd/pkg/types" + "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/membership/membershippb" + 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/traceutil" + "go.etcd.io/etcd/v3/pkg/types" "github.com/gogo/protobuf/proto" "go.uber.org/zap" diff --git a/etcdserver/apply_auth.go b/etcdserver/apply_auth.go index 5741a9cae1e..40ed7bde56e 100644 --- a/etcdserver/apply_auth.go +++ b/etcdserver/apply_auth.go @@ -18,11 +18,11 @@ import ( "context" "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/pkg/traceutil" + "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/pkg/traceutil" ) type authApplierV3 struct { diff --git a/etcdserver/apply_v2.go b/etcdserver/apply_v2.go index ac65fe91700..ad88f4657e8 100644 --- a/etcdserver/apply_v2.go +++ b/etcdserver/apply_v2.go @@ -19,9 +19,9 @@ import ( "path" "time" - "go.etcd.io/etcd/etcdserver/api/membership" - "go.etcd.io/etcd/etcdserver/api/v2store" - "go.etcd.io/etcd/pkg/pbutil" + "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 50ed9bea773..39da71e848d 100644 --- a/etcdserver/backend.go +++ b/etcdserver/backend.go @@ -19,10 +19,10 @@ import ( "os" "time" - "go.etcd.io/etcd/etcdserver/api/snap" - "go.etcd.io/etcd/etcdserver/cindex" - "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/etcdserver/cindex" + "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/v3/raft/raftpb" "go.uber.org/zap" ) diff --git a/etcdserver/cindex/cindex.go b/etcdserver/cindex/cindex.go index 6a83326aedf..c0d7c048e37 100644 --- a/etcdserver/cindex/cindex.go +++ b/etcdserver/cindex/cindex.go @@ -19,7 +19,7 @@ import ( "sync" "sync/atomic" - "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/v3/mvcc/backend" ) var ( diff --git a/etcdserver/cindex/cindex_test.go b/etcdserver/cindex/cindex_test.go index 9d458157366..7f3a5ba7ccc 100644 --- a/etcdserver/cindex/cindex_test.go +++ b/etcdserver/cindex/cindex_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/v3/mvcc/backend" ) // TestConsistentIndex ensures that LoadConsistentIndex/Save/ConsistentIndex and backend.BatchTx can work well together. diff --git a/etcdserver/cluster_util.go b/etcdserver/cluster_util.go index 7b7c43eae13..37351519c59 100644 --- a/etcdserver/cluster_util.go +++ b/etcdserver/cluster_util.go @@ -24,9 +24,9 @@ import ( "strings" "time" - "go.etcd.io/etcd/etcdserver/api/membership" - "go.etcd.io/etcd/pkg/types" - "go.etcd.io/etcd/version" + "go.etcd.io/etcd/v3/etcdserver/api/membership" + "go.etcd.io/etcd/v3/pkg/types" + "go.etcd.io/etcd/v3/version" "github.com/coreos/go-semver/semver" "go.uber.org/zap" diff --git a/etcdserver/cluster_util_test.go b/etcdserver/cluster_util_test.go index 8a36a548b6e..de90d60396f 100644 --- a/etcdserver/cluster_util_test.go +++ b/etcdserver/cluster_util_test.go @@ -18,8 +18,8 @@ import ( "reflect" "testing" - "go.etcd.io/etcd/pkg/types" - "go.etcd.io/etcd/version" + "go.etcd.io/etcd/v3/pkg/types" + "go.etcd.io/etcd/v3/version" "github.com/coreos/go-semver/semver" "go.uber.org/zap" diff --git a/etcdserver/config.go b/etcdserver/config.go index 426059b459d..e1fb2fa267a 100644 --- a/etcdserver/config.go +++ b/etcdserver/config.go @@ -22,9 +22,9 @@ import ( "strings" "time" - "go.etcd.io/etcd/pkg/netutil" - "go.etcd.io/etcd/pkg/transport" - "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/v3/pkg/netutil" + "go.etcd.io/etcd/v3/pkg/transport" + "go.etcd.io/etcd/v3/pkg/types" bolt "go.etcd.io/bbolt" "go.uber.org/zap" diff --git a/etcdserver/config_test.go b/etcdserver/config_test.go index 1d4157dc4cb..e91b5fe3b90 100644 --- a/etcdserver/config_test.go +++ b/etcdserver/config_test.go @@ -18,7 +18,7 @@ import ( "net/url" "testing" - "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/v3/pkg/types" "go.uber.org/zap" ) diff --git a/etcdserver/corrupt.go b/etcdserver/corrupt.go index 5435757d386..45aa4535713 100644 --- a/etcdserver/corrupt.go +++ b/etcdserver/corrupt.go @@ -24,11 +24,11 @@ import ( "strings" "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/pkg/traceutil" - "go.etcd.io/etcd/pkg/types" + "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/traceutil" + "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 c61108772eb..5b1f7eba277 100644 --- a/etcdserver/etcdserverpb/gw/rpc.pb.gw.go +++ b/etcdserver/etcdserverpb/gw/rpc.pb.gw.go @@ -9,7 +9,7 @@ It translates gRPC into RESTful JSON APIs. package gw import ( - "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "io" "net/http" diff --git a/etcdserver/etcdserverpb/raft_internal.pb.go b/etcdserver/etcdserverpb/raft_internal.pb.go index d5bad7e4769..c8dad53a0cb 100644 --- a/etcdserver/etcdserverpb/raft_internal.pb.go +++ b/etcdserver/etcdserverpb/raft_internal.pb.go @@ -12,7 +12,7 @@ import ( _ "github.com/gogo/protobuf/gogoproto" - membershippb "go.etcd.io/etcd/etcdserver/api/membership/membershippb" + membershippb "go.etcd.io/etcd/v3/etcdserver/api/membership/membershippb" io "io" ) diff --git a/etcdserver/etcdserverpb/rpc.pb.go b/etcdserver/etcdserverpb/rpc.pb.go index 8d1fd0a52da..dddab02acd5 100644 --- a/etcdserver/etcdserverpb/rpc.pb.go +++ b/etcdserver/etcdserverpb/rpc.pb.go @@ -12,9 +12,9 @@ import ( _ "github.com/gogo/protobuf/gogoproto" - mvccpb "go.etcd.io/etcd/mvcc/mvccpb" + mvccpb "go.etcd.io/etcd/v3/mvcc/mvccpb" - authpb "go.etcd.io/etcd/auth/authpb" + authpb "go.etcd.io/etcd/v3/auth/authpb" context "golang.org/x/net/context" diff --git a/etcdserver/metrics.go b/etcdserver/metrics.go index cde5e7ebcf4..a77ebfdddd3 100644 --- a/etcdserver/metrics.go +++ b/etcdserver/metrics.go @@ -18,8 +18,8 @@ import ( goruntime "runtime" "time" - "go.etcd.io/etcd/pkg/runtime" - "go.etcd.io/etcd/version" + "go.etcd.io/etcd/v3/pkg/runtime" + "go.etcd.io/etcd/v3/version" "github.com/prometheus/client_golang/prometheus" "go.uber.org/zap" diff --git a/etcdserver/quota.go b/etcdserver/quota.go index a3536a13824..4727ac14a12 100644 --- a/etcdserver/quota.go +++ b/etcdserver/quota.go @@ -17,7 +17,7 @@ package etcdserver import ( "sync" - pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" humanize "github.com/dustin/go-humanize" "go.uber.org/zap" diff --git a/etcdserver/raft.go b/etcdserver/raft.go index 754df17a2ee..872015dfb07 100644 --- a/etcdserver/raft.go +++ b/etcdserver/raft.go @@ -23,17 +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 6c5164d48ff..8bddcd05109 100644 --- a/etcdserver/raft_test.go +++ b/etcdserver/raft_test.go @@ -21,12 +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 bae7797b2e5..33f7db068fb 100644 --- a/etcdserver/server.go +++ b/etcdserver/server.go @@ -29,36 +29,36 @@ 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/membership/membershippb" - "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" - "go.etcd.io/etcd/etcdserver/cindex" - 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/traceutil" - "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" + "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/membership/membershippb" + "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" + "go.etcd.io/etcd/v3/etcdserver/cindex" + 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/traceutil" + "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" "github.com/coreos/go-semver/semver" humanize "github.com/dustin/go-humanize" diff --git a/etcdserver/server_test.go b/etcdserver/server_test.go index 4b30b098b05..85e474a698c 100644 --- a/etcdserver/server_test.go +++ b/etcdserver/server_test.go @@ -27,26 +27,26 @@ import ( "testing" "time" - "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" - "go.etcd.io/etcd/etcdserver/cindex" - 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" + "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" + "go.etcd.io/etcd/v3/etcdserver/cindex" + 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" ) diff --git a/etcdserver/snapshot_merge.go b/etcdserver/snapshot_merge.go index 605138a2506..a7b16add507 100644 --- a/etcdserver/snapshot_merge.go +++ b/etcdserver/snapshot_merge.go @@ -17,9 +17,9 @@ package etcdserver import ( "io" - "go.etcd.io/etcd/etcdserver/api/snap" - "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/mvcc/backend" + "go.etcd.io/etcd/v3/raft/raftpb" humanize "github.com/dustin/go-humanize" "go.uber.org/zap" diff --git a/etcdserver/storage.go b/etcdserver/storage.go index 1b4a5214eed..f05070d5b25 100644 --- a/etcdserver/storage.go +++ b/etcdserver/storage.go @@ -17,13 +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 883e14f0fb5..6dfa5fd4516 100644 --- a/etcdserver/util.go +++ b/etcdserver/util.go @@ -21,10 +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..3c4ee7ee94d 100644 --- a/etcdserver/util_test.go +++ b/etcdserver/util_test.go @@ -21,11 +21,11 @@ import ( "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" + "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" ) 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 3f80afb60bf..4fb2902305f 100644 --- a/etcdserver/v3_server.go +++ b/etcdserver/v3_server.go @@ -20,14 +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/pkg/traceutil" - "go.etcd.io/etcd/raft" + "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/pkg/traceutil" + "go.etcd.io/etcd/v3/raft" "github.com/gogo/protobuf/proto" "go.uber.org/zap" diff --git a/functional/agent/handler.go b/functional/agent/handler.go index dedfa33b41d..ef97abcdb6b 100644 --- a/functional/agent/handler.go +++ b/functional/agent/handler.go @@ -25,9 +25,9 @@ import ( "syscall" "time" - "go.etcd.io/etcd/functional/rpcpb" - "go.etcd.io/etcd/pkg/fileutil" - "go.etcd.io/etcd/pkg/proxy" + "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 ea704933cfa..26e86195ae9 100644 --- a/functional/agent/server.go +++ b/functional/agent/server.go @@ -21,9 +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 e741d11fd6b..d0f44b4af41 100644 --- a/functional/agent/utils.go +++ b/functional/agent/utils.go @@ -24,7 +24,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..2ccdcaa073d 100644 --- a/functional/cmd/etcd-agent/main.go +++ b/functional/cmd/etcd-agent/main.go @@ -18,7 +18,7 @@ package main import ( "flag" - "go.etcd.io/etcd/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..5695e91b89f 100644 --- a/functional/cmd/etcd-proxy/main.go +++ b/functional/cmd/etcd-proxy/main.go @@ -28,7 +28,7 @@ import ( "syscall" "time" - "go.etcd.io/etcd/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..0d3116e37d7 100644 --- a/functional/cmd/etcd-tester/main.go +++ b/functional/cmd/etcd-tester/main.go @@ -18,7 +18,7 @@ package main import ( "flag" - "go.etcd.io/etcd/functional/tester" + "go.etcd.io/etcd/v3/functional/tester" "go.uber.org/zap" ) diff --git a/functional/rpcpb/member.go b/functional/rpcpb/member.go index 930c371c7d1..f9ea5528b8e 100644 --- a/functional/rpcpb/member.go +++ b/functional/rpcpb/member.go @@ -22,11 +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/logutil" - "go.etcd.io/etcd/pkg/transport" + "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/logutil" + "go.etcd.io/etcd/v3/pkg/transport" "github.com/dustin/go-humanize" "go.uber.org/zap" diff --git a/functional/runner/election_command.go b/functional/runner/election_command.go index 0ced375461e..1cec694e2d9 100644 --- a/functional/runner/election_command.go +++ b/functional/runner/election_command.go @@ -19,7 +19,7 @@ import ( "errors" "fmt" - "go.etcd.io/etcd/clientv3/concurrency" + "go.etcd.io/etcd/v3/clientv3/concurrency" "github.com/spf13/cobra" ) 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..b99466cafc2 100644 --- a/functional/runner/global.go +++ b/functional/runner/global.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/v3/clientv3" "github.com/spf13/cobra" "golang.org/x/time/rate" diff --git a/functional/runner/help.go b/functional/runner/help.go index 394cec8403d..06196a89e3d 100644 --- a/functional/runner/help.go +++ b/functional/runner/help.go @@ -25,7 +25,7 @@ import ( "text/tabwriter" "text/template" - "go.etcd.io/etcd/version" + "go.etcd.io/etcd/v3/version" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/functional/runner/lease_renewer_command.go b/functional/runner/lease_renewer_command.go index 78a65729d55..6418ef0db48 100644 --- a/functional/runner/lease_renewer_command.go +++ b/functional/runner/lease_renewer_command.go @@ -21,7 +21,7 @@ import ( "log" "time" - "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/v3/clientv3" "github.com/spf13/cobra" "google.golang.org/grpc/codes" diff --git a/functional/runner/lock_racer_command.go b/functional/runner/lock_racer_command.go index cb98668cc23..ffde9f5f48e 100644 --- a/functional/runner/lock_racer_command.go +++ b/functional/runner/lock_racer_command.go @@ -20,7 +20,7 @@ import ( "fmt" "sync" - "go.etcd.io/etcd/clientv3/concurrency" + "go.etcd.io/etcd/v3/clientv3/concurrency" "github.com/spf13/cobra" ) diff --git a/functional/runner/watch_command.go b/functional/runner/watch_command.go index cd3f202af20..c9e36dc00f5 100644 --- a/functional/runner/watch_command.go +++ b/functional/runner/watch_command.go @@ -22,8 +22,8 @@ import ( "sync" "time" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/pkg/stringutil" + "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/pkg/stringutil" "github.com/spf13/cobra" "golang.org/x/time/rate" diff --git a/functional/tester/case.go b/functional/tester/case.go index ce3e00f1243..7397497759f 100644 --- a/functional/tester/case.go +++ b/functional/tester/case.go @@ -19,7 +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..0eabe1621ba 100644 --- a/functional/tester/case_network_delay.go +++ b/functional/tester/case_network_delay.go @@ -17,7 +17,7 @@ package tester import ( "time" - "go.etcd.io/etcd/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..726a6a33534 100644 --- a/functional/tester/case_no_fail.go +++ b/functional/tester/case_no_fail.go @@ -17,7 +17,7 @@ package tester import ( "time" - "go.etcd.io/etcd/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..c201cc2dc20 100644 --- a/functional/tester/case_sigquit_remove.go +++ b/functional/tester/case_sigquit_remove.go @@ -21,8 +21,8 @@ import ( "strings" "time" - "go.etcd.io/etcd/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..47117902c99 100644 --- a/functional/tester/case_sigquit_remove_quorum.go +++ b/functional/tester/case_sigquit_remove_quorum.go @@ -20,8 +20,8 @@ import ( "strings" "time" - "go.etcd.io/etcd/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..534f90fa976 100644 --- a/functional/tester/checker_kv_hash.go +++ b/functional/tester/checker_kv_hash.go @@ -18,7 +18,7 @@ import ( "fmt" "time" - "go.etcd.io/etcd/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..668ee41dc4f 100644 --- a/functional/tester/checker_lease_expire.go +++ b/functional/tester/checker_lease_expire.go @@ -19,9 +19,9 @@ import ( "fmt" "time" - "go.etcd.io/etcd/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..f9d0e27c927 100644 --- a/functional/tester/cluster.go +++ b/functional/tester/cluster.go @@ -29,9 +29,9 @@ import ( "sync" "time" - "go.etcd.io/etcd/functional/rpcpb" - "go.etcd.io/etcd/pkg/debugutil" - "go.etcd.io/etcd/pkg/fileutil" + "go.etcd.io/etcd/v3/functional/rpcpb" + "go.etcd.io/etcd/v3/pkg/debugutil" + "go.etcd.io/etcd/v3/pkg/fileutil" "github.com/prometheus/client_golang/prometheus/promhttp" "go.uber.org/zap" diff --git a/functional/tester/cluster_read_config.go b/functional/tester/cluster_read_config.go index df0dc667a10..bd181a38646 100644 --- a/functional/tester/cluster_read_config.go +++ b/functional/tester/cluster_read_config.go @@ -22,7 +22,7 @@ import ( "path/filepath" "strings" - "go.etcd.io/etcd/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 0578c132350..ccbf14ecfb7 100644 --- a/functional/tester/cluster_run.go +++ b/functional/tester/cluster_run.go @@ -19,8 +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 2948c00e7f4..c11c8ba20a7 100644 --- a/functional/tester/cluster_test.go +++ b/functional/tester/cluster_test.go @@ -19,7 +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..79e6687f4aa 100644 --- a/functional/tester/stresser.go +++ b/functional/tester/stresser.go @@ -18,7 +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 c31b5b21175..ca3d50ecf81 100644 --- a/functional/tester/stresser_key.go +++ b/functional/tester/stresser_key.go @@ -23,11 +23,11 @@ import ( "sync/atomic" "time" - "go.etcd.io/etcd/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" diff --git a/functional/tester/stresser_lease.go b/functional/tester/stresser_lease.go index 8e0458dc907..45671154e7f 100644 --- a/functional/tester/stresser_lease.go +++ b/functional/tester/stresser_lease.go @@ -22,9 +22,9 @@ import ( "sync/atomic" "time" - "go.etcd.io/etcd/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" diff --git a/functional/tester/stresser_runner.go b/functional/tester/stresser_runner.go index e8e2bd1f888..55f791ddb37 100644 --- a/functional/tester/stresser_runner.go +++ b/functional/tester/stresser_runner.go @@ -20,7 +20,7 @@ import ( "os/exec" "syscall" - "go.etcd.io/etcd/functional/rpcpb" + "go.etcd.io/etcd/v3/functional/rpcpb" "go.uber.org/zap" "golang.org/x/time/rate" diff --git a/go.mod b/go.mod index 378df8403f7..4b3c15e7657 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module go.etcd.io/etcd +module go.etcd.io/etcd/v3 go 1.14 diff --git a/go.sum b/go.sum index 013b06ed369..7824397bb8c 100644 --- a/go.sum +++ b/go.sum @@ -17,6 +17,10 @@ github.com/coreos/go-semver v0.2.0 h1:3Jm3tLmsgAYcjC+4Up7hJrFBPr+n7rAqYeSw/SZazu github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd/v22 v22.0.0 h1:XJIw/+VlJ+87J+doOxznsAWIdmWuViOVhkQamW5YV28= github.com/coreos/go-systemd/v22 v22.0.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk= +github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY= +github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/cpuguy83/go-md2man/v2 v2.0.0 h1:EoUDS0afbrsXAZ9YQ9jdu/mZ2sXgT1/2yyNng4PGlyM= +github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/creack/pty v1.1.7 h1:6pwm8kMQKCmgUg0ZHTm5+/YvRK0s3THD/28+T6/kk4A= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -85,14 +89,26 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/ksubedi/gomove v0.0.0-20200106182546-e1fa47256217 h1:CYk3GRunz2nSWbGNXpDxlr5uU/YTkBf1p9zorauMvvc= +github.com/ksubedi/gomove v0.0.0-20200106182546-e1fa47256217/go.mod h1:yq7Mn2Ip7t9irYr+JskEuBYdF3tKnikTKG49Qn5aDuY= github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-colorable v0.1.4 h1:snbPLB8fVfU9iwbbo30TPtbLRzwWu6aJS6Xh4eaaviA= +github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= +github.com/mattn/go-colorable v0.1.6 h1:6Su7aK7lXmJ/U79bYtBjLNaha4Fs1Rg9plHpcH+vvnE= +github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-isatty v0.0.4 h1:bnP0vzxcAdeI1zdubAl5PjU6zsERjGZb7raWodagDYs= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/mattn/go-isatty v0.0.8 h1:HLtExJ+uU2HOZ+wI0Tt5DtUDrx8yhUqDcp7fYERX4CE= +github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= +github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-runewidth v0.0.2 h1:UnlwIPBGaTZfPQ6T1IGzPI0EkYAQmT9fAEJ/poFC63o= github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b h1:j7+1HpAFS1zy5+Q4qx1fWh90gTKwiN4QCGoY9TWyyO4= +github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -123,6 +139,10 @@ github.com/prometheus/procfs v0.0.2 h1:6LJUbpNm42llc4HRCuvApCSWB/WfhuNo9K98Q9sNG github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q= +github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo= +github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.2.0 h1:juTguoYk5qI21pwyTXY3B3Y5cOTH3ZUyZCg1v/mihuo= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4= @@ -145,8 +165,13 @@ github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8 h1:ndzgwN github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/urfave/cli v1.20.0 h1:fDqGv3UG/4jbVl/QkFwEdddtEDjh/5Ov6X+0B/3bPaw= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= +github.com/urfave/cli v1.22.2 h1:gsqYFH8bb9ekPA12kRo0hfjngWQjkJPlN9R0N78BoUo= +github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= +github.com/urfave/cli v1.22.4 h1:u7tSpNPPswAFymm8IehJhy4uJMlUuU/GmqSkvJ1InXA= +github.com/urfave/cli v1.22.4/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5Qo6v2eYzo7kUS51QINcR5jNpbZS8= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= +github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.etcd.io/bbolt v1.3.4 h1:hi1bXHMVrlQh6WwxAy+qZCV/SYIlqo+Ushwdpa4tAKg= go.etcd.io/bbolt v1.3.4/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk= @@ -164,6 +189,7 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc h1:c0o/qxkaO2LF5t6fQrT4b5hzyggAkLLlCUjqfRxd8Q4= golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= @@ -171,6 +197,7 @@ golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHl golang.org/x/lint v0.0.0-20190930215403-16217165b5de h1:5hukYrvBGR8/eNkX5mdUezrA6JiaEZDtJb9Ei+1LlBs= golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= +golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a h1:gOpx8G595UYyvj8UK4+OFyY4rx037g3fmfhe5SasG3U= @@ -183,11 +210,13 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7 h1:fHDIZ2oxGnUZRN6WgWFCbYBjH9uqVPRCUVUDhs0wnbA= golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -195,10 +224,15 @@ golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5 h1:mzjBh+S5frKOsOBobWIMAbXav golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5 h1:LfCXLvNmTYH9kEmVgqbnsWfruoXZIrh4YBgqVHtDvw0= golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f h1:gWF768j/LaZugp8dyS4UwsslYCYz9XgFxvlgsn0n9H8= +golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2 h1:+DCIGbF/swA92ohVg0//6X2IVY3KZs6p9mix0ziNYJM= @@ -212,7 +246,14 @@ golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgw golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5 h1:hKsoRgsbwY1NafxrwTs+k64bikrLBkAgPir1TNCj3Zs= golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191204214957-d79e56da46fe h1:vkJyJzXSoRU0cEXFVuc2EPZ78LTXlR8iK1r41XbRopc= +golang.org/x/tools v0.0.0-20191204214957-d79e56da46fe/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20200426102838-f3a5411a4c3b h1:zSzQJAznWxAh9fZxiPy2FZo+ZZEYoYFYYDYdOrU7AaM= +golang.org/x/tools v0.0.0-20200426102838-f3a5411a4c3b/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8 h1:Nw54tB0rB7hY/N0NQvRW8DG4Yk3Q6T9cu9RcFQDu1tc= 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 50af3c2b9ec..0d198fd31c3 100644 --- a/integration/cluster.go +++ b/integration/cluster.go @@ -33,25 +33,25 @@ 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" + "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" "github.com/soheilhy/cmux" "go.uber.org/zap" 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 da77c95e650..8ad7f6910c0 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" "go.uber.org/zap" ) 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 2bc5f44d729..3ca09611302 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..7fc4ed67f1a 100644 --- a/integration/logger_test.go +++ b/integration/logger_test.go @@ -17,7 +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 d5dc710031e..288d5c2a04b 100644 --- a/integration/metrics_test.go +++ b/integration/metrics_test.go @@ -22,10 +22,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 62ee92bfc46..daaac25dbee 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 ee02531d4b2..02fa128ca0f 100644 --- a/integration/v3_alarm_test.go +++ b/integration/v3_alarm_test.go @@ -22,13 +22,13 @@ import ( "testing" "time" - "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" - "go.etcd.io/etcd/etcdserver/cindex" - 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/pkg/traceutil" + "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/v3/etcdserver/cindex" + pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + "go.etcd.io/etcd/v3/mvcc" + "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/v3/pkg/traceutil" "go.uber.org/zap" ) diff --git a/integration/v3_auth_test.go b/integration/v3_auth_test.go index ee386ffa0c9..93764d2fc42 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 838f45c5998..a91d2299d2b 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" + "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 c4bf4ac684e..cafaa01ed41 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" + "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 b90d5f2a117..31c867a8f8b 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 6fd95a66175..4b7ccea028a 100644 --- a/integration/v3_grpc_inflight_test.go +++ b/integration/v3_grpc_inflight_test.go @@ -20,9 +20,9 @@ import ( "testing" "time" - "go.etcd.io/etcd/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" diff --git a/integration/v3_grpc_test.go b/integration/v3_grpc_test.go index 70f12af7d85..b27f9957221 100644 --- a/integration/v3_grpc_test.go +++ b/integration/v3_grpc_test.go @@ -25,11 +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" diff --git a/integration/v3_health_test.go b/integration/v3_health_test.go index c5788fd12fc..6ec98b9d445 100644 --- a/integration/v3_health_test.go +++ b/integration/v3_health_test.go @@ -18,7 +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 17368e19f12..5b51dab86f2 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 35e705ce1bf..4f88995eebe 100644 --- a/integration/v3_lease_test.go +++ b/integration/v3_lease_test.go @@ -20,10 +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" diff --git a/integration/v3_lock_test.go b/integration/v3_lock_test.go index b122ff5de5b..bafaf9d0377 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" - recipe "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 TestMutexLockSingleNode(t *testing.T) { diff --git a/integration/v3_queue_test.go b/integration/v3_queue_test.go index d64571996ad..74ed0b012d9 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" + "go.etcd.io/etcd/v3/contrib/recipes" ) const ( diff --git a/integration/v3_stm_test.go b/integration/v3_stm_test.go index 4ef82bacf7f..94d7f2e6fe2 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..2c78eaddf4c 100644 --- a/integration/v3_tls_test.go +++ b/integration/v3_tls_test.go @@ -20,8 +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 b2835a2b5f3..16b1f906b4d 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 d5a52e790d6..c19c1fb5e81 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 41a9df441e0..2e13a7c0d9f 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 0888704bc9c..3ecb7e2a118 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..5253d1f0d0d 100644 --- a/lease/leasepb/lease.pb.go +++ b/lease/leasepb/lease.pb.go @@ -23,7 +23,7 @@ import ( _ "github.com/gogo/protobuf/gogoproto" - etcdserverpb "go.etcd.io/etcd/etcdserver/etcdserverpb" + etcdserverpb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" io "io" ) diff --git a/lease/lessor.go b/lease/lessor.go index 4a244a97810..bcc8eb0fccc 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 2dee41dd969..cb8f3e0d7b2 100644 --- a/lease/lessor_bench_test.go +++ b/lease/lessor_bench_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - "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 508daa6608c..defe4951781 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 c057f926118..e26d8a63791 100644 --- a/mvcc/kv.go +++ b/mvcc/kv.go @@ -15,10 +15,10 @@ package mvcc import ( - "go.etcd.io/etcd/lease" - "go.etcd.io/etcd/mvcc/backend" - "go.etcd.io/etcd/mvcc/mvccpb" - "go.etcd.io/etcd/pkg/traceutil" + "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/traceutil" ) type RangeOptions struct { diff --git a/mvcc/kv_test.go b/mvcc/kv_test.go index 466040790ff..1641afb5032 100644 --- a/mvcc/kv_test.go +++ b/mvcc/kv_test.go @@ -21,11 +21,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/testutil" - "go.etcd.io/etcd/pkg/traceutil" + "go.etcd.io/etcd/v3/lease" + "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/v3/mvcc/mvccpb" + "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/v3/pkg/traceutil" "github.com/prometheus/client_golang/prometheus" dto "github.com/prometheus/client_model/go" diff --git a/mvcc/kv_view.go b/mvcc/kv_view.go index d4f0ca6880a..795316a2825 100644 --- a/mvcc/kv_view.go +++ b/mvcc/kv_view.go @@ -15,8 +15,8 @@ package mvcc import ( - "go.etcd.io/etcd/lease" - "go.etcd.io/etcd/pkg/traceutil" + "go.etcd.io/etcd/v3/lease" + "go.etcd.io/etcd/v3/pkg/traceutil" ) type readView struct{ kv KV } diff --git a/mvcc/kvstore.go b/mvcc/kvstore.go index 79b7c686c8f..ebf7c0afbae 100644 --- a/mvcc/kvstore.go +++ b/mvcc/kvstore.go @@ -23,12 +23,12 @@ import ( "sync" "time" - "go.etcd.io/etcd/etcdserver/cindex" - "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/traceutil" + "go.etcd.io/etcd/v3/etcdserver/cindex" + "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/traceutil" "go.uber.org/zap" ) diff --git a/mvcc/kvstore_bench_test.go b/mvcc/kvstore_bench_test.go index e8777c14a9a..3f85cfa3cad 100644 --- a/mvcc/kvstore_bench_test.go +++ b/mvcc/kvstore_bench_test.go @@ -17,10 +17,10 @@ package mvcc import ( "testing" - "go.etcd.io/etcd/etcdserver/cindex" - "go.etcd.io/etcd/lease" - "go.etcd.io/etcd/mvcc/backend" - "go.etcd.io/etcd/pkg/traceutil" + "go.etcd.io/etcd/v3/etcdserver/cindex" + "go.etcd.io/etcd/v3/lease" + "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/v3/pkg/traceutil" "go.uber.org/zap" ) diff --git a/mvcc/kvstore_compaction_test.go b/mvcc/kvstore_compaction_test.go index d1e576dcb70..6eec26d3dc9 100644 --- a/mvcc/kvstore_compaction_test.go +++ b/mvcc/kvstore_compaction_test.go @@ -20,9 +20,9 @@ import ( "testing" "time" - "go.etcd.io/etcd/lease" - "go.etcd.io/etcd/mvcc/backend" - "go.etcd.io/etcd/pkg/traceutil" + "go.etcd.io/etcd/v3/lease" + "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/v3/pkg/traceutil" "go.uber.org/zap" ) diff --git a/mvcc/kvstore_test.go b/mvcc/kvstore_test.go index ff858fc7c58..4478be9516e 100644 --- a/mvcc/kvstore_test.go +++ b/mvcc/kvstore_test.go @@ -29,12 +29,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/schedule" - "go.etcd.io/etcd/pkg/testutil" - "go.etcd.io/etcd/pkg/traceutil" + "go.etcd.io/etcd/v3/lease" + "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/v3/mvcc/mvccpb" + "go.etcd.io/etcd/v3/pkg/schedule" + "go.etcd.io/etcd/v3/pkg/testutil" + "go.etcd.io/etcd/v3/pkg/traceutil" "go.uber.org/zap" ) diff --git a/mvcc/kvstore_txn.go b/mvcc/kvstore_txn.go index 2b89dd50b74..de94e4d246a 100644 --- a/mvcc/kvstore_txn.go +++ b/mvcc/kvstore_txn.go @@ -15,10 +15,10 @@ package mvcc import ( - "go.etcd.io/etcd/lease" - "go.etcd.io/etcd/mvcc/backend" - "go.etcd.io/etcd/mvcc/mvccpb" - "go.etcd.io/etcd/pkg/traceutil" + "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/traceutil" "go.uber.org/zap" ) diff --git a/mvcc/metrics_txn.go b/mvcc/metrics_txn.go index 17f1b31caf7..89f9297ec43 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 62619167815..15e2c55f5c2 100644 --- a/mvcc/watchable_store.go +++ b/mvcc/watchable_store.go @@ -18,11 +18,11 @@ import ( "sync" "time" - "go.etcd.io/etcd/etcdserver/cindex" - "go.etcd.io/etcd/lease" - "go.etcd.io/etcd/mvcc/backend" - "go.etcd.io/etcd/mvcc/mvccpb" - "go.etcd.io/etcd/pkg/traceutil" + "go.etcd.io/etcd/v3/etcdserver/cindex" + "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/traceutil" "go.uber.org/zap" ) diff --git a/mvcc/watchable_store_bench_test.go b/mvcc/watchable_store_bench_test.go index 60455166c53..53480f86ae1 100644 --- a/mvcc/watchable_store_bench_test.go +++ b/mvcc/watchable_store_bench_test.go @@ -19,10 +19,10 @@ import ( "os" "testing" - "go.etcd.io/etcd/etcdserver/cindex" - "go.etcd.io/etcd/lease" - "go.etcd.io/etcd/mvcc/backend" - "go.etcd.io/etcd/pkg/traceutil" + "go.etcd.io/etcd/v3/etcdserver/cindex" + "go.etcd.io/etcd/v3/lease" + "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/v3/pkg/traceutil" "go.uber.org/zap" ) diff --git a/mvcc/watchable_store_test.go b/mvcc/watchable_store_test.go index b0623e251e9..7f2a720d3d5 100644 --- a/mvcc/watchable_store_test.go +++ b/mvcc/watchable_store_test.go @@ -23,11 +23,11 @@ import ( "testing" "time" - "go.etcd.io/etcd/etcdserver/cindex" - "go.etcd.io/etcd/lease" - "go.etcd.io/etcd/mvcc/backend" - "go.etcd.io/etcd/mvcc/mvccpb" - "go.etcd.io/etcd/pkg/traceutil" + "go.etcd.io/etcd/v3/etcdserver/cindex" + "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/traceutil" "go.uber.org/zap" ) diff --git a/mvcc/watchable_store_txn.go b/mvcc/watchable_store_txn.go index 70b12983d97..7bf6cdb7f65 100644 --- a/mvcc/watchable_store_txn.go +++ b/mvcc/watchable_store_txn.go @@ -15,8 +15,8 @@ package mvcc import ( - "go.etcd.io/etcd/mvcc/mvccpb" - "go.etcd.io/etcd/pkg/traceutil" + "go.etcd.io/etcd/v3/mvcc/mvccpb" + "go.etcd.io/etcd/v3/pkg/traceutil" ) func (tw *watchableStoreTxnWrite) End() { 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 901a1ec0d83..c4fb8671eab 100644 --- a/mvcc/watcher_bench_test.go +++ b/mvcc/watcher_bench_test.go @@ -18,8 +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 151f0de7185..310220360e9 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 679ab441d19..b4b426edb80 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 60af1b128b8..89dd5860b3e 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 fde01d2753e..2f9b206e6c1 100644 --- a/pkg/flags/unique_urls.go +++ b/pkg/flags/unique_urls.go @@ -21,7 +21,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 6627d8a235c..47b39c6621b 100644 --- a/pkg/flags/urls.go +++ b/pkg/flags/urls.go @@ -20,7 +20,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..9ec21da8849 100644 --- a/pkg/logutil/logger_test.go +++ b/pkg/logutil/logger_test.go @@ -20,7 +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/zap_journal.go b/pkg/logutil/zap_journal.go index d7e02bbd826..96250de429f 100644 --- a/pkg/logutil/zap_journal.go +++ b/pkg/logutil/zap_journal.go @@ -24,7 +24,7 @@ import ( "os" "path/filepath" - "go.etcd.io/etcd/pkg/systemd" + "go.etcd.io/etcd/v3/pkg/systemd" "github.com/coreos/go-systemd/v22/journal" "go.uber.org/zap/zapcore" diff --git a/pkg/logutil/zap_raft.go b/pkg/logutil/zap_raft.go index f016b3054e3..f0772a17c2e 100644 --- a/pkg/logutil/zap_raft.go +++ b/pkg/logutil/zap_raft.go @@ -17,7 +17,7 @@ package logutil import ( "errors" - "go.etcd.io/etcd/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..c68cb3c2cd2 100644 --- a/pkg/mock/mockserver/mockserver.go +++ b/pkg/mock/mockserver/mockserver.go @@ -22,7 +22,7 @@ import ( "os" "sync" - pb "go.etcd.io/etcd/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..f18bbe0c763 100644 --- a/pkg/netutil/netutil.go +++ b/pkg/netutil/netutil.go @@ -23,7 +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..ef22ea2fffc 100644 --- a/pkg/proxy/server.go +++ b/pkg/proxy/server.go @@ -26,7 +26,7 @@ import ( "sync" "time" - "go.etcd.io/etcd/pkg/transport" + "go.etcd.io/etcd/v3/pkg/transport" humanize "github.com/dustin/go-humanize" "go.uber.org/zap" diff --git a/pkg/proxy/server_test.go b/pkg/proxy/server_test.go index 550de5a1658..17d3513b974 100644 --- a/pkg/proxy/server_test.go +++ b/pkg/proxy/server_test.go @@ -29,7 +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 9cf614f8017..f7b7b1ab72f 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..fad08657231 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() diff --git a/pkg/transport/listener.go b/pkg/transport/listener.go index 7ab72d1ebe0..eb6332b60d9 100644 --- a/pkg/transport/listener.go +++ b/pkg/transport/listener.go @@ -31,8 +31,8 @@ import ( "strings" "time" - "go.etcd.io/etcd/pkg/fileutil" - "go.etcd.io/etcd/pkg/tlsutil" + "go.etcd.io/etcd/v3/pkg/fileutil" + "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..8ffd0624018 100644 --- a/pkg/types/urlsmap_test.go +++ b/pkg/types/urlsmap_test.go @@ -15,7 +15,7 @@ package types import ( - "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/v3/pkg/testutil" "reflect" "testing" ) diff --git a/proxy/grpcproxy/adapter/auth_client_adapter.go b/proxy/grpcproxy/adapter/auth_client_adapter.go index a58922c5062..ffdb3449fae 100644 --- a/proxy/grpcproxy/adapter/auth_client_adapter.go +++ b/proxy/grpcproxy/adapter/auth_client_adapter.go @@ -17,7 +17,7 @@ package adapter import ( "context" - pb "go.etcd.io/etcd/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..b5dab26ca26 100644 --- a/proxy/grpcproxy/adapter/cluster_client_adapter.go +++ b/proxy/grpcproxy/adapter/cluster_client_adapter.go @@ -17,7 +17,7 @@ package adapter import ( "context" - pb "go.etcd.io/etcd/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..06ebcc9efc2 100644 --- a/proxy/grpcproxy/adapter/election_client_adapter.go +++ b/proxy/grpcproxy/adapter/election_client_adapter.go @@ -17,7 +17,7 @@ package adapter import ( "context" - "go.etcd.io/etcd/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..cc08e09d08f 100644 --- a/proxy/grpcproxy/adapter/kv_client_adapter.go +++ b/proxy/grpcproxy/adapter/kv_client_adapter.go @@ -17,7 +17,7 @@ package adapter import ( "context" - pb "go.etcd.io/etcd/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..e2c9518c593 100644 --- a/proxy/grpcproxy/adapter/lease_client_adapter.go +++ b/proxy/grpcproxy/adapter/lease_client_adapter.go @@ -17,7 +17,7 @@ package adapter import ( "context" - pb "go.etcd.io/etcd/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..eb2a3d64121 100644 --- a/proxy/grpcproxy/adapter/lock_client_adapter.go +++ b/proxy/grpcproxy/adapter/lock_client_adapter.go @@ -17,7 +17,7 @@ package adapter import ( "context" - "go.etcd.io/etcd/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 4c7d2269942..ca5b0c86cc4 100644 --- a/proxy/grpcproxy/adapter/maintenance_client_adapter.go +++ b/proxy/grpcproxy/adapter/maintenance_client_adapter.go @@ -17,7 +17,7 @@ package adapter import ( "context" - pb "go.etcd.io/etcd/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 55bb3932c07..f5c652ed716 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 19a36046c8c..bfbae268290 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 8c0cd78bb5f..d91d0c847d4 100644 --- a/proxy/grpcproxy/cluster.go +++ b/proxy/grpcproxy/cluster.go @@ -21,10 +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" "go.uber.org/zap" "golang.org/x/time/rate" diff --git a/proxy/grpcproxy/cluster_test.go b/proxy/grpcproxy/cluster_test.go index 2f3a0c4a7c8..3d63180a9aa 100644 --- a/proxy/grpcproxy/cluster_test.go +++ b/proxy/grpcproxy/cluster_test.go @@ -20,10 +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" "go.uber.org/zap" "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 9418502c0fe..c7a10904d35 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" "go.uber.org/zap" ) 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..49ee698637c 100644 --- a/proxy/grpcproxy/kv_test.go +++ b/proxy/grpcproxy/kv_test.go @@ -20,10 +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..ea0115c4efc 100644 --- a/proxy/grpcproxy/leader.go +++ b/proxy/grpcproxy/leader.go @@ -19,7 +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 a6e5515ae1a..48bcd663378 100644 --- a/proxy/grpcproxy/lease.go +++ b/proxy/grpcproxy/lease.go @@ -21,9 +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/codes" 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 ab32cdbfa53..ca6c0b638ee 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 cab29c529e7..40e56ad5c56 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 4ab2f226ab5..e74cd5ca902 100644 --- a/proxy/grpcproxy/register.go +++ b/proxy/grpcproxy/register.go @@ -18,9 +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" "go.uber.org/zap" "golang.org/x/time/rate" diff --git a/proxy/grpcproxy/register_test.go b/proxy/grpcproxy/register_test.go index ba870e7dab6..7107254e721 100644 --- a/proxy/grpcproxy/register_test.go +++ b/proxy/grpcproxy/register_test.go @@ -18,10 +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" "go.uber.org/zap" gnaming "google.golang.org/grpc/naming" diff --git a/proxy/grpcproxy/util.go b/proxy/grpcproxy/util.go index 266ae7d723b..f33479c24a0 100644 --- a/proxy/grpcproxy/util.go +++ b/proxy/grpcproxy/util.go @@ -17,7 +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 179859a8489..417b559dbf3 100644 --- a/proxy/grpcproxy/watch.go +++ b/proxy/grpcproxy/watch.go @@ -18,10 +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/codes" "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 5d51a08e4b1..701ed021bca 100644 --- a/proxy/httpproxy/reverse.go +++ b/proxy/httpproxy/reverse.go @@ -27,7 +27,7 @@ import ( "sync/atomic" "time" - "go.etcd.io/etcd/etcdserver/api/v2http/httptypes" + "go.etcd.io/etcd/v3/etcdserver/api/v2http/httptypes" "go.uber.org/zap" ) diff --git a/raft/bootstrap.go b/raft/bootstrap.go index bd82b2041af..9a827df93ea 100644 --- a/raft/bootstrap.go +++ b/raft/bootstrap.go @@ -17,7 +17,7 @@ package raft import ( "errors" - pb "go.etcd.io/etcd/raft/raftpb" + pb "go.etcd.io/etcd/v3/raft/raftpb" ) // Bootstrap initializes the RawNode for first use by appending configuration diff --git a/raft/confchange/confchange.go b/raft/confchange/confchange.go index 741f811150c..2ad8554e7bf 100644 --- a/raft/confchange/confchange.go +++ b/raft/confchange/confchange.go @@ -19,9 +19,9 @@ import ( "fmt" "strings" - "go.etcd.io/etcd/raft/quorum" - pb "go.etcd.io/etcd/raft/raftpb" - "go.etcd.io/etcd/raft/tracker" + "go.etcd.io/etcd/v3/raft/quorum" + pb "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/v3/raft/tracker" ) // Changer facilitates configuration changes. It exposes methods to handle diff --git a/raft/confchange/datadriven_test.go b/raft/confchange/datadriven_test.go index 063d927dac8..086b9a0f5c9 100644 --- a/raft/confchange/datadriven_test.go +++ b/raft/confchange/datadriven_test.go @@ -22,8 +22,8 @@ import ( "testing" "github.com/cockroachdb/datadriven" - pb "go.etcd.io/etcd/raft/raftpb" - "go.etcd.io/etcd/raft/tracker" + pb "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/v3/raft/tracker" ) func TestConfChangeDataDriven(t *testing.T) { diff --git a/raft/confchange/quick_test.go b/raft/confchange/quick_test.go index 04a77b3ceb9..441990fac10 100644 --- a/raft/confchange/quick_test.go +++ b/raft/confchange/quick_test.go @@ -21,8 +21,8 @@ import ( "testing" "testing/quick" - pb "go.etcd.io/etcd/raft/raftpb" - "go.etcd.io/etcd/raft/tracker" + pb "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/v3/raft/tracker" ) // TestConfChangeQuick uses quickcheck to verify that simple and joint config diff --git a/raft/confchange/restore.go b/raft/confchange/restore.go index 343478def15..1692c050752 100644 --- a/raft/confchange/restore.go +++ b/raft/confchange/restore.go @@ -15,8 +15,8 @@ package confchange import ( - pb "go.etcd.io/etcd/raft/raftpb" - "go.etcd.io/etcd/raft/tracker" + pb "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/v3/raft/tracker" ) // toConfChangeSingle translates a conf state into 1) a slice of operations creating diff --git a/raft/confchange/restore_test.go b/raft/confchange/restore_test.go index 202cbf7b91b..84dd5193f11 100644 --- a/raft/confchange/restore_test.go +++ b/raft/confchange/restore_test.go @@ -21,8 +21,8 @@ import ( "testing" "testing/quick" - pb "go.etcd.io/etcd/raft/raftpb" - "go.etcd.io/etcd/raft/tracker" + pb "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/v3/raft/tracker" ) type rndConfChange pb.ConfState 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/interaction_test.go b/raft/interaction_test.go index c8b8cb00963..71f47b261b8 100644 --- a/raft/interaction_test.go +++ b/raft/interaction_test.go @@ -18,7 +18,7 @@ import ( "testing" "github.com/cockroachdb/datadriven" - "go.etcd.io/etcd/raft/rafttest" + "go.etcd.io/etcd/v3/raft/rafttest" ) func TestInteraction(t *testing.T) { 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 603ba6e50a7..de5830315e1 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_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 28579c9ca81..81758020f13 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 6095b1c55b7..cee61cf4966 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 e1fd749a8d0..25765cf78be 100644 --- a/raft/raft.go +++ b/raft/raft.go @@ -25,10 +25,10 @@ import ( "sync" "time" - "go.etcd.io/etcd/raft/confchange" - "go.etcd.io/etcd/raft/quorum" - pb "go.etcd.io/etcd/raft/raftpb" - "go.etcd.io/etcd/raft/tracker" + "go.etcd.io/etcd/v3/raft/confchange" + "go.etcd.io/etcd/v3/raft/quorum" + pb "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/v3/raft/tracker" ) // 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 dbfbac7db13..a48e5a44d56 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 0fa8de1ed14..f4199301cd9 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 070f3a2b9c0..b7f6f7df71c 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 9432bd0fc9a..e6558701beb 100644 --- a/raft/raft_test.go +++ b/raft/raft_test.go @@ -23,8 +23,8 @@ import ( "strings" "testing" - pb "go.etcd.io/etcd/raft/raftpb" - "go.etcd.io/etcd/raft/tracker" + pb "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/v3/raft/tracker" ) // nextEnts returns the appliable entries and updates the applied index diff --git a/raft/rafttest/interaction_env.go b/raft/rafttest/interaction_env.go index c0ec44f6fce..a88d60fa910 100644 --- a/raft/rafttest/interaction_env.go +++ b/raft/rafttest/interaction_env.go @@ -19,8 +19,8 @@ import ( "math" "strings" - "go.etcd.io/etcd/raft" - pb "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/v3/raft" + pb "go.etcd.io/etcd/v3/raft/raftpb" ) // InteractionOpts groups the options for an InteractionEnv. diff --git a/raft/rafttest/interaction_env_handler_add_nodes.go b/raft/rafttest/interaction_env_handler_add_nodes.go index a68a2cbddf0..f6efe95f86f 100644 --- a/raft/rafttest/interaction_env_handler_add_nodes.go +++ b/raft/rafttest/interaction_env_handler_add_nodes.go @@ -21,8 +21,8 @@ import ( "testing" "github.com/cockroachdb/datadriven" - "go.etcd.io/etcd/raft" - pb "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/v3/raft" + pb "go.etcd.io/etcd/v3/raft/raftpb" ) func (env *InteractionEnv) handleAddNodes(t *testing.T, d datadriven.TestData) error { diff --git a/raft/rafttest/interaction_env_handler_deliver_msgs.go b/raft/rafttest/interaction_env_handler_deliver_msgs.go index 82a5af36ddd..bd839e77a07 100644 --- a/raft/rafttest/interaction_env_handler_deliver_msgs.go +++ b/raft/rafttest/interaction_env_handler_deliver_msgs.go @@ -20,8 +20,8 @@ import ( "testing" "github.com/cockroachdb/datadriven" - "go.etcd.io/etcd/raft" - "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/v3/raft" + "go.etcd.io/etcd/v3/raft/raftpb" ) func (env *InteractionEnv) handleDeliverMsgs(t *testing.T, d datadriven.TestData) error { diff --git a/raft/rafttest/interaction_env_handler_process_ready.go b/raft/rafttest/interaction_env_handler_process_ready.go index 165c1f0d0fb..ccb312844f4 100644 --- a/raft/rafttest/interaction_env_handler_process_ready.go +++ b/raft/rafttest/interaction_env_handler_process_ready.go @@ -18,8 +18,8 @@ import ( "testing" "github.com/cockroachdb/datadriven" - "go.etcd.io/etcd/raft" - "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/v3/raft" + "go.etcd.io/etcd/v3/raft/raftpb" ) func (env *InteractionEnv) handleProcessReady(t *testing.T, d datadriven.TestData) error { diff --git a/raft/rafttest/interaction_env_handler_propose_conf_change.go b/raft/rafttest/interaction_env_handler_propose_conf_change.go index 2783396755d..17306593480 100644 --- a/raft/rafttest/interaction_env_handler_propose_conf_change.go +++ b/raft/rafttest/interaction_env_handler_propose_conf_change.go @@ -20,7 +20,7 @@ import ( "testing" "github.com/cockroachdb/datadriven" - "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/v3/raft/raftpb" ) func (env *InteractionEnv) handleProposeConfChange(t *testing.T, d datadriven.TestData) error { diff --git a/raft/rafttest/interaction_env_handler_raft_log.go b/raft/rafttest/interaction_env_handler_raft_log.go index de8e8ee4c82..59a816cc0a8 100644 --- a/raft/rafttest/interaction_env_handler_raft_log.go +++ b/raft/rafttest/interaction_env_handler_raft_log.go @@ -20,7 +20,7 @@ import ( "testing" "github.com/cockroachdb/datadriven" - "go.etcd.io/etcd/raft" + "go.etcd.io/etcd/v3/raft" ) func (env *InteractionEnv) handleRaftLog(t *testing.T, d datadriven.TestData) error { diff --git a/raft/rafttest/interaction_env_handler_stabilize.go b/raft/rafttest/interaction_env_handler_stabilize.go index 935d69c8c7d..40237334f34 100644 --- a/raft/rafttest/interaction_env_handler_stabilize.go +++ b/raft/rafttest/interaction_env_handler_stabilize.go @@ -21,7 +21,7 @@ import ( "testing" "github.com/cockroachdb/datadriven" - "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/v3/raft/raftpb" ) func (env *InteractionEnv) handleStabilize(t *testing.T, d datadriven.TestData) error { diff --git a/raft/rafttest/interaction_env_handler_status.go b/raft/rafttest/interaction_env_handler_status.go index 3a0c953e55f..55bc84089e5 100644 --- a/raft/rafttest/interaction_env_handler_status.go +++ b/raft/rafttest/interaction_env_handler_status.go @@ -19,7 +19,7 @@ import ( "testing" "github.com/cockroachdb/datadriven" - "go.etcd.io/etcd/raft/tracker" + "go.etcd.io/etcd/v3/raft/tracker" ) func (env *InteractionEnv) handleStatus(t *testing.T, d datadriven.TestData) error { diff --git a/raft/rafttest/interaction_env_logger.go b/raft/rafttest/interaction_env_logger.go index f71ee230c69..fcd5ba2364a 100644 --- a/raft/rafttest/interaction_env_logger.go +++ b/raft/rafttest/interaction_env_logger.go @@ -18,7 +18,7 @@ import ( "fmt" "strings" - "go.etcd.io/etcd/raft" + "go.etcd.io/etcd/v3/raft" ) type logLevels [6]string diff --git a/raft/rafttest/network.go b/raft/rafttest/network.go index 2ad4e5f5c63..f23bbb05b53 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 dfd376c73ed..bc3b47ab5cb 100644 --- a/raft/rafttest/node.go +++ b/raft/rafttest/node.go @@ -21,8 +21,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 3ee52e0bb04..2dffc066c69 100644 --- a/raft/rawnode.go +++ b/raft/rawnode.go @@ -17,8 +17,8 @@ package raft import ( "errors" - pb "go.etcd.io/etcd/raft/raftpb" - "go.etcd.io/etcd/raft/tracker" + pb "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/v3/raft/tracker" ) // ErrStepLocalMsg is returned when try to step a local raft message diff --git a/raft/rawnode_test.go b/raft/rawnode_test.go index 15e3090f48a..d44a17a42aa 100644 --- a/raft/rawnode_test.go +++ b/raft/rawnode_test.go @@ -22,9 +22,9 @@ import ( "reflect" "testing" - "go.etcd.io/etcd/raft/quorum" - pb "go.etcd.io/etcd/raft/raftpb" - "go.etcd.io/etcd/raft/tracker" + "go.etcd.io/etcd/v3/raft/quorum" + pb "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/v3/raft/tracker" ) // rawNodeAdapter is essentially a lint that makes sure that RawNode implements diff --git a/raft/status.go b/raft/status.go index adc60486d9c..9efa885e7f9 100644 --- a/raft/status.go +++ b/raft/status.go @@ -17,8 +17,8 @@ package raft import ( "fmt" - pb "go.etcd.io/etcd/raft/raftpb" - "go.etcd.io/etcd/raft/tracker" + pb "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/v3/raft/tracker" ) // Status contains information about this Raft peer and its view of the system. diff --git a/raft/storage.go b/raft/storage.go index 6be574590e0..7101eef020b 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 55637951594..d67d175bdd7 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/tracker/tracker.go b/raft/tracker/tracker.go index a4581143d1e..a6731d023c6 100644 --- a/raft/tracker/tracker.go +++ b/raft/tracker/tracker.go @@ -19,8 +19,8 @@ import ( "sort" "strings" - "go.etcd.io/etcd/raft/quorum" - pb "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/v3/raft/quorum" + pb "go.etcd.io/etcd/v3/raft/raftpb" ) // Config reflects the configuration tracked in a ProgressTracker. diff --git a/raft/util.go b/raft/util.go index 785cf735d5d..bb9c036c849 100644 --- a/raft/util.go +++ b/raft/util.go @@ -19,7 +19,7 @@ import ( "fmt" "strings" - 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 b13af13cba7..d7ae14915ed 100644 --- a/tests/e2e/cluster_test.go +++ b/tests/e2e/cluster_test.go @@ -22,7 +22,7 @@ import ( "strings" "time" - "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/v3/etcdserver" ) const etcdProcessBasePort = 20000 diff --git a/tests/e2e/ctl_v2_test.go b/tests/e2e/ctl_v2_test.go index ce1f36bcc1f..9af2fe01aea 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 2ebcd39ff18..2fba2b3d020 100644 --- a/tests/e2e/ctl_v3_auth_test.go +++ b/tests/e2e/ctl_v3_auth_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "go.etcd.io/etcd/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 6b57e94df9b..715ca36aa1e 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 0941e8652e9..849c48b19ef 100644 --- a/tests/e2e/ctl_v3_test.go +++ b/tests/e2e/ctl_v3_test.go @@ -21,10 +21,10 @@ import ( "testing" "time" - "go.etcd.io/etcd/pkg/fileutil" - "go.etcd.io/etcd/pkg/flags" - "go.etcd.io/etcd/pkg/testutil" - "go.etcd.io/etcd/version" + "go.etcd.io/etcd/v3/pkg/fileutil" + "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 8688cfc83bb..9e6b478c4b6 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..f5aed150c23 100644 --- a/tests/e2e/etcd_corrupt_test.go +++ b/tests/e2e/etcd_corrupt_test.go @@ -23,8 +23,8 @@ import ( "testing" "time" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/mvcc/mvccpb" bolt "go.etcd.io/bbolt" ) 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 e1735ba84ea..0ae2e40b9cc 100644 --- a/tests/e2e/etcd_release_upgrade_test.go +++ b/tests/e2e/etcd_release_upgrade_test.go @@ -21,9 +21,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 b515ac5b2bf..1ce401d9318 100644 --- a/tests/e2e/metrics_test.go +++ b/tests/e2e/metrics_test.go @@ -18,7 +18,7 @@ import ( "fmt" "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 90c6c22db80..7cfcbebd6bd 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 b2ddb7f0f6e..a19cb68d494 100644 --- a/tests/e2e/v3_curl_test.go +++ b/tests/e2e/v3_curl_test.go @@ -22,11 +22,11 @@ import ( "strconv" "testing" - "go.etcd.io/etcd/auth/authpb" - 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" + "go.etcd.io/etcd/v3/auth/authpb" + 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" "github.com/grpc-ecosystem/grpc-gateway/runtime" ) diff --git a/tools/benchmark/cmd/lease.go b/tools/benchmark/cmd/lease.go index 8104390c99e..c8ed1e43b32 100644 --- a/tools/benchmark/cmd/lease.go +++ b/tools/benchmark/cmd/lease.go @@ -19,8 +19,8 @@ import ( "fmt" "time" - v3 "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/pkg/report" + v3 "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/pkg/report" "github.com/spf13/cobra" "gopkg.in/cheggaaa/pb.v1" diff --git a/tools/benchmark/cmd/mvcc-put.go b/tools/benchmark/cmd/mvcc-put.go index 200db9f0292..3a94191f1fd 100644 --- a/tools/benchmark/cmd/mvcc-put.go +++ b/tools/benchmark/cmd/mvcc-put.go @@ -21,9 +21,9 @@ import ( "runtime/pprof" "time" - "go.etcd.io/etcd/lease" - "go.etcd.io/etcd/pkg/report" - "go.etcd.io/etcd/pkg/traceutil" + "go.etcd.io/etcd/v3/lease" + "go.etcd.io/etcd/v3/pkg/report" + "go.etcd.io/etcd/v3/pkg/traceutil" "github.com/spf13/cobra" ) diff --git a/tools/benchmark/cmd/mvcc.go b/tools/benchmark/cmd/mvcc.go index 4a2af5fa8b8..8a73799a6a7 100644 --- a/tools/benchmark/cmd/mvcc.go +++ b/tools/benchmark/cmd/mvcc.go @@ -20,9 +20,9 @@ import ( "go.uber.org/zap" - "go.etcd.io/etcd/lease" - "go.etcd.io/etcd/mvcc" - "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/v3/lease" + "go.etcd.io/etcd/v3/mvcc" + "go.etcd.io/etcd/v3/mvcc/backend" "github.com/spf13/cobra" ) diff --git a/tools/benchmark/cmd/put.go b/tools/benchmark/cmd/put.go index 45da8ee54a9..cc3b25c9446 100644 --- a/tools/benchmark/cmd/put.go +++ b/tools/benchmark/cmd/put.go @@ -24,8 +24,8 @@ import ( "strings" "time" - v3 "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/pkg/report" + v3 "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/pkg/report" "github.com/dustin/go-humanize" "github.com/spf13/cobra" diff --git a/tools/benchmark/cmd/range.go b/tools/benchmark/cmd/range.go index a24cce31822..c46b90d5ab2 100644 --- a/tools/benchmark/cmd/range.go +++ b/tools/benchmark/cmd/range.go @@ -21,8 +21,8 @@ import ( "os" "time" - v3 "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/pkg/report" + v3 "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/pkg/report" "github.com/spf13/cobra" "golang.org/x/time/rate" diff --git a/tools/benchmark/cmd/root.go b/tools/benchmark/cmd/root.go index 83d96f5d452..7ee50aad8dc 100644 --- a/tools/benchmark/cmd/root.go +++ b/tools/benchmark/cmd/root.go @@ -18,7 +18,7 @@ import ( "sync" "time" - "go.etcd.io/etcd/pkg/transport" + "go.etcd.io/etcd/v3/pkg/transport" "github.com/spf13/cobra" "gopkg.in/cheggaaa/pb.v1" diff --git a/tools/benchmark/cmd/stm.go b/tools/benchmark/cmd/stm.go index f8df5398d29..0372d628b5e 100644 --- a/tools/benchmark/cmd/stm.go +++ b/tools/benchmark/cmd/stm.go @@ -23,10 +23,10 @@ import ( "os" "time" - v3 "go.etcd.io/etcd/clientv3" - v3sync "go.etcd.io/etcd/clientv3/concurrency" - "go.etcd.io/etcd/etcdserver/api/v3lock/v3lockpb" - "go.etcd.io/etcd/pkg/report" + v3 "go.etcd.io/etcd/v3/clientv3" + v3sync "go.etcd.io/etcd/v3/clientv3/concurrency" + "go.etcd.io/etcd/v3/etcdserver/api/v3lock/v3lockpb" + "go.etcd.io/etcd/v3/pkg/report" "github.com/spf13/cobra" "golang.org/x/time/rate" diff --git a/tools/benchmark/cmd/txn_put.go b/tools/benchmark/cmd/txn_put.go index 3cb254032a0..a298a4c0a8f 100644 --- a/tools/benchmark/cmd/txn_put.go +++ b/tools/benchmark/cmd/txn_put.go @@ -22,8 +22,8 @@ import ( "os" "time" - v3 "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/pkg/report" + v3 "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/pkg/report" "github.com/spf13/cobra" "golang.org/x/time/rate" diff --git a/tools/benchmark/cmd/util.go b/tools/benchmark/cmd/util.go index 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..9cea4884c14 100644 --- a/tools/benchmark/cmd/watch.go +++ b/tools/benchmark/cmd/watch.go @@ -23,8 +23,8 @@ import ( "sync/atomic" "time" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/pkg/report" + "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/pkg/report" "github.com/spf13/cobra" "golang.org/x/time/rate" diff --git a/tools/benchmark/cmd/watch_get.go b/tools/benchmark/cmd/watch_get.go index c6def95fb19..3cc20fe7420 100644 --- a/tools/benchmark/cmd/watch_get.go +++ b/tools/benchmark/cmd/watch_get.go @@ -20,8 +20,8 @@ import ( "sync" "time" - v3 "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/pkg/report" + v3 "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/pkg/report" "github.com/spf13/cobra" "gopkg.in/cheggaaa/pb.v1" diff --git a/tools/benchmark/cmd/watch_latency.go b/tools/benchmark/cmd/watch_latency.go index fc48ea2f351..9025f98fb7a 100644 --- a/tools/benchmark/cmd/watch_latency.go +++ b/tools/benchmark/cmd/watch_latency.go @@ -21,8 +21,8 @@ import ( "sync" "time" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/pkg/report" + "go.etcd.io/etcd/v3/clientv3" + "go.etcd.io/etcd/v3/pkg/report" "github.com/spf13/cobra" "golang.org/x/time/rate" 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 aa2102c4159..44e30420981 100644 --- a/tools/etcd-dump-db/backend.go +++ b/tools/etcd-dump-db/backend.go @@ -17,13 +17,13 @@ package main import ( "encoding/binary" "fmt" - "go.etcd.io/etcd/auth/authpb" + "go.etcd.io/etcd/v3/auth/authpb" "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" + "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" bolt "go.etcd.io/bbolt" ) diff --git a/tools/etcd-dump-logs/etcd-dump-log_test.go b/tools/etcd-dump-logs/etcd-dump-log_test.go index 9c1d4fd40cf..f7c80234143 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 8161c8909c9..6d842b2aceb 100644 --- a/tools/etcd-dump-logs/main.go +++ b/tools/etcd-dump-logs/main.go @@ -28,13 +28,13 @@ import ( "strings" "time" - "go.etcd.io/etcd/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 638e342363f..4b47757e194 100644 --- a/tools/etcd-dump-metrics/etcd.go +++ b/tools/etcd-dump-metrics/etcd.go @@ -23,8 +23,8 @@ import ( "strings" "time" - "go.etcd.io/etcd/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..ba2c843dce1 100644 --- a/tools/etcd-dump-metrics/main.go +++ b/tools/etcd-dump-metrics/main.go @@ -25,7 +25,7 @@ import ( "path/filepath" "time" - "go.etcd.io/etcd/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..dfc66622a52 100644 --- a/tools/etcd-dump-metrics/metrics.go +++ b/tools/etcd-dump-metrics/metrics.go @@ -22,7 +22,7 @@ import ( "strings" "time" - "go.etcd.io/etcd/pkg/transport" + "go.etcd.io/etcd/v3/pkg/transport" "go.uber.org/zap" ) diff --git a/wal/decoder.go b/wal/decoder.go index d007fe1c748..47794c30a7a 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 4de853b69a9..b3530eb92da 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 20682e149ec..18eb80ea0c0 100644 --- a/wal/file_pipeline.go +++ b/wal/file_pipeline.go @@ -19,7 +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 293fcd09541..e15a68dba63 100644 --- a/wal/repair.go +++ b/wal/repair.go @@ -20,8 +20,8 @@ import ( "path/filepath" "time" - "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..ae6747b6bd5 100644 --- a/wal/repair_test.go +++ b/wal/repair_test.go @@ -21,8 +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 a92c38cca12..e48fe84340b 100644 --- a/wal/util.go +++ b/wal/util.go @@ -19,7 +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 604b6c9c83c..d2a6a449306 100644 --- a/wal/wal.go +++ b/wal/wal.go @@ -25,11 +25,11 @@ 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" + "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..607d02afc79 100644 --- a/wal/wal_bench_test.go +++ b/wal/wal_bench_test.go @@ -21,7 +21,7 @@ import ( "go.uber.org/zap" - "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/v3/raft/raftpb" ) func BenchmarkWrite100EntryWithoutBatch(b *testing.B) { benchmarkWriteEntry(b, 100, 0) } diff --git a/wal/wal_test.go b/wal/wal_test.go index 4acd6f8e99c..bc9fa1e6344 100644 --- a/wal/wal_test.go +++ b/wal/wal_test.go @@ -27,10 +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" ) From 7a5fefedcdb04639e3440d647238ff912455add4 Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Sun, 26 Apr 2020 22:28:02 +0000 Subject: [PATCH 2/8] *: fix imports missed by gomove --- clientv3/op.go | 2 +- raft/log_unstable.go | 2 +- raft/read_only.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/clientv3/op.go b/clientv3/op.go index 81ae31fd8f3..f0592ccf5a5 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/raft/log_unstable.go b/raft/log_unstable.go index 1bff5a7bdcb..56c4ba4d139 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/read_only.go b/raft/read_only.go index 6987f1bd7d7..19632e65977 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 From 2ea4d8829935161a1f6658f30a127f0a3db98fb8 Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Sun, 26 Apr 2020 21:24:35 +0000 Subject: [PATCH 3/8] *: use go.etcd.io/etcd/v3 where needed Found potential locations via ``` git grep 'go.etcd.io/etcd$' ``` --- .travis.yml | 2 +- build | 2 +- scripts/genproto.sh | 8 ++++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index ec055947cb9..9cfcf75317b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: go -go_import_path: go.etcd.io/etcd +go_import_path: go.etcd.io/etcd/v3 sudo: required diff --git a/build b/build index 2d2ee5cf16c..be8de43f130 100755 --- a/build +++ b/build @@ -2,7 +2,7 @@ # set some environment variables ORG_PATH="go.etcd.io" -REPO_PATH="${ORG_PATH}/etcd" +REPO_PATH="${ORG_PATH}/etcd/v3" GIT_SHA=$(git rev-parse --short HEAD || echo "GitNotFound") if [[ -n "$FAILPOINTS" ]]; then diff --git a/scripts/genproto.sh b/scripts/genproto.sh index 1e62c0fcd1e..dd3eccd7807 100755 --- a/scripts/genproto.sh +++ b/scripts/genproto.sh @@ -18,7 +18,7 @@ fi # directories containing protos to be built DIRS="./wal/walpb ./etcdserver/etcdserverpb ./etcdserver/api/snap/snappb ./raft/raftpb ./mvcc/mvccpb ./lease/leasepb ./auth/authpb ./etcdserver/api/v3lock/v3lockpb ./etcdserver/api/v3election/v3electionpb ./etcdserver/api/membership/membershippb" -# disable go mod +# disable go mod - this is for the go get/install invocations export GO111MODULE=off # exact version of packages to build @@ -81,6 +81,8 @@ for dir in ${DIRS}; do sed -i.bak -E 's/import _ \"go\.etcd\.io\/google\/api\"//g' ./*.pb.go # shellcheck disable=SC1117 sed -i.bak -E 's/import _ \"google\.golang\.org\/genproto\/googleapis\/api\/annotations\"//g' ./*.pb.go + # shellcheck disable=SC1117 + sed -i.bak -E "s/go.etcd.io\/etcd\//go.etcd.io\/etcd\/v3\//" ./*.pb.go rm -f ./*.bak goimports -w ./*.pb.go popd @@ -110,7 +112,9 @@ for pb in etcdserverpb/rpc api/v3lock/v3lockpb/v3lock api/v3election/v3electionp sed -i.bak -E "s/New[A-Za-z]*Client/${pkg}.&/" ${gwfile} # darwin doesn't like newlines in sed... # shellcheck disable=SC1117 - sed -i.bak -E "s|import \(|& \"go.etcd.io/etcd/${pkgpath}\"|" ${gwfile} + sed -i.bak -E "s|import \(|& \"go.etcd.io/etcd/v3/${pkgpath}\"|" ${gwfile} + # shellcheck disable=SC1117 + sed -i.bak -E "s/go.etcd.io\etcd\//go.etcd.io\/etcd\/v3/" ${gwfile} mkdir -p "${pkgpath}"/gw/ go fmt ${gwfile} mv ${gwfile} "${pkgpath}/gw/" From c066230bade8e9c507eeab61f36b3ed2e3a6c189 Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Mon, 27 Apr 2020 00:49:18 +0000 Subject: [PATCH 4/8] go.sum: cleanup after all the changes --- go.sum | 41 ----------------------------------------- 1 file changed, 41 deletions(-) diff --git a/go.sum b/go.sum index 7824397bb8c..013b06ed369 100644 --- a/go.sum +++ b/go.sum @@ -17,10 +17,6 @@ github.com/coreos/go-semver v0.2.0 h1:3Jm3tLmsgAYcjC+4Up7hJrFBPr+n7rAqYeSw/SZazu github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd/v22 v22.0.0 h1:XJIw/+VlJ+87J+doOxznsAWIdmWuViOVhkQamW5YV28= github.com/coreos/go-systemd/v22 v22.0.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk= -github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY= -github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -github.com/cpuguy83/go-md2man/v2 v2.0.0 h1:EoUDS0afbrsXAZ9YQ9jdu/mZ2sXgT1/2yyNng4PGlyM= -github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/creack/pty v1.1.7 h1:6pwm8kMQKCmgUg0ZHTm5+/YvRK0s3THD/28+T6/kk4A= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -89,26 +85,14 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/ksubedi/gomove v0.0.0-20200106182546-e1fa47256217 h1:CYk3GRunz2nSWbGNXpDxlr5uU/YTkBf1p9zorauMvvc= -github.com/ksubedi/gomove v0.0.0-20200106182546-e1fa47256217/go.mod h1:yq7Mn2Ip7t9irYr+JskEuBYdF3tKnikTKG49Qn5aDuY= github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= -github.com/mattn/go-colorable v0.1.4 h1:snbPLB8fVfU9iwbbo30TPtbLRzwWu6aJS6Xh4eaaviA= -github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= -github.com/mattn/go-colorable v0.1.6 h1:6Su7aK7lXmJ/U79bYtBjLNaha4Fs1Rg9plHpcH+vvnE= -github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-isatty v0.0.4 h1:bnP0vzxcAdeI1zdubAl5PjU6zsERjGZb7raWodagDYs= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/mattn/go-isatty v0.0.8 h1:HLtExJ+uU2HOZ+wI0Tt5DtUDrx8yhUqDcp7fYERX4CE= -github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= -github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-runewidth v0.0.2 h1:UnlwIPBGaTZfPQ6T1IGzPI0EkYAQmT9fAEJ/poFC63o= github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b h1:j7+1HpAFS1zy5+Q4qx1fWh90gTKwiN4QCGoY9TWyyO4= -github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -139,10 +123,6 @@ github.com/prometheus/procfs v0.0.2 h1:6LJUbpNm42llc4HRCuvApCSWB/WfhuNo9K98Q9sNG github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q= -github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo= -github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.2.0 h1:juTguoYk5qI21pwyTXY3B3Y5cOTH3ZUyZCg1v/mihuo= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4= @@ -165,13 +145,8 @@ github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8 h1:ndzgwN github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/urfave/cli v1.20.0 h1:fDqGv3UG/4jbVl/QkFwEdddtEDjh/5Ov6X+0B/3bPaw= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= -github.com/urfave/cli v1.22.2 h1:gsqYFH8bb9ekPA12kRo0hfjngWQjkJPlN9R0N78BoUo= -github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= -github.com/urfave/cli v1.22.4 h1:u7tSpNPPswAFymm8IehJhy4uJMlUuU/GmqSkvJ1InXA= -github.com/urfave/cli v1.22.4/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5Qo6v2eYzo7kUS51QINcR5jNpbZS8= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= -github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.etcd.io/bbolt v1.3.4 h1:hi1bXHMVrlQh6WwxAy+qZCV/SYIlqo+Ushwdpa4tAKg= go.etcd.io/bbolt v1.3.4/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk= @@ -189,7 +164,6 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc h1:c0o/qxkaO2LF5t6fQrT4b5hzyggAkLLlCUjqfRxd8Q4= golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= @@ -197,7 +171,6 @@ golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHl golang.org/x/lint v0.0.0-20190930215403-16217165b5de h1:5hukYrvBGR8/eNkX5mdUezrA6JiaEZDtJb9Ei+1LlBs= golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= -golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a h1:gOpx8G595UYyvj8UK4+OFyY4rx037g3fmfhe5SasG3U= @@ -210,13 +183,11 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7 h1:fHDIZ2oxGnUZRN6WgWFCbYBjH9uqVPRCUVUDhs0wnbA= golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -224,15 +195,10 @@ golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5 h1:mzjBh+S5frKOsOBobWIMAbXav golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5 h1:LfCXLvNmTYH9kEmVgqbnsWfruoXZIrh4YBgqVHtDvw0= golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f h1:gWF768j/LaZugp8dyS4UwsslYCYz9XgFxvlgsn0n9H8= -golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2 h1:+DCIGbF/swA92ohVg0//6X2IVY3KZs6p9mix0ziNYJM= @@ -246,14 +212,7 @@ golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgw golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5 h1:hKsoRgsbwY1NafxrwTs+k64bikrLBkAgPir1TNCj3Zs= golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191204214957-d79e56da46fe h1:vkJyJzXSoRU0cEXFVuc2EPZ78LTXlR8iK1r41XbRopc= -golang.org/x/tools v0.0.0-20191204214957-d79e56da46fe/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20200426102838-f3a5411a4c3b h1:zSzQJAznWxAh9fZxiPy2FZo+ZZEYoYFYYDYdOrU7AaM= -golang.org/x/tools v0.0.0-20200426102838-f3a5411a4c3b/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8 h1:Nw54tB0rB7hY/N0NQvRW8DG4Yk3Q6T9cu9RcFQDu1tc= From dd21e710e1b4c3ee60b2bccb1c4322b740b95a62 Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Mon, 27 Apr 2020 06:09:09 +0000 Subject: [PATCH 5/8] testutil: leak: fix path for go routine filter add go.etcd.io/etcd/v3 to existing filters --- pkg/testutil/leak.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/testutil/leak.go b/pkg/testutil/leak.go index fad08657231..74a0ebbe50c 100644 --- a/pkg/testutil/leak.go +++ b/pkg/testutil/leak.go @@ -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") { From 03248a90458f0179eff52d3e3a11ac43918d5b4e Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Mon, 27 Apr 2020 15:41:00 +0000 Subject: [PATCH 6/8] bill-of-materials: updates for /etcd/v3 packaging bill-of-materials: - update to new package names test/updatebom.sh scripts: - Update to the right package names - Don't add bom tool to go.mod --- bill-of-materials.json | 2 +- scripts/updatebom.sh | 4 +++- test | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/bill-of-materials.json b/bill-of-materials.json index 6b416684761..7a233d436de 100644 --- a/bill-of-materials.json +++ b/bill-of-materials.json @@ -315,7 +315,7 @@ ] }, { - "project": "go.etcd.io/etcd", + "project": "go.etcd.io/etcd/v3", "licenses": [ { "type": "Apache License 2.0", diff --git a/scripts/updatebom.sh b/scripts/updatebom.sh index 7602725d569..210e0e96098 100755 --- a/scripts/updatebom.sh +++ b/scripts/updatebom.sh @@ -7,12 +7,14 @@ if ! [[ "$0" =~ scripts/updatebom.sh ]]; then exit 255 fi +export GO111MODULE=off # Don't add BOM tool to etcd go.mod echo "installing 'bill-of-materials.json'" go get -v -u github.com/coreos/license-bill-of-materials +export GO111MODULE=on echo "generating bill-of-materials.json" license-bill-of-materials \ --override-file ./bill-of-materials.override.json \ - go.etcd.io/etcd go.etcd.io/etcd/etcdctl > bill-of-materials.json + go.etcd.io/etcd/v3 go.etcd.io/etcd/v3/etcdctl > bill-of-materials.json echo "generated bill-of-materials.json" diff --git a/test b/test index 4d4ea9be839..08bd3e398c3 100755 --- a/test +++ b/test @@ -640,7 +640,7 @@ function bom_pass { echo "Checking bill of materials..." license-bill-of-materials \ --override-file bill-of-materials.override.json \ - go.etcd.io/etcd go.etcd.io/etcd/etcdctl >bom-now.json || true + go.etcd.io/etcd/v3 go.etcd.io/etcd/v3/etcdctl >bom-now.json || true if ! diff bill-of-materials.json bom-now.json; then echo "vendored licenses do not match given bill of materials" exit 255 From c9cdefaeac4d58c241d407095c3d9acb90d56aab Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Mon, 27 Apr 2020 14:54:34 +0000 Subject: [PATCH 7/8] *: run gofmt and make fmt make test pass gofmt tests were failing, fix. --- integration/v3_watch_test.go | 8 +++++--- raft/rawnode_test.go | 6 ++++-- tests/e2e/ctl_v3_auth_test.go | 8 +++++--- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/integration/v3_watch_test.go b/integration/v3_watch_test.go index c19c1fb5e81..188b5883a47 100644 --- a/integration/v3_watch_test.go +++ b/integration/v3_watch_test.go @@ -791,9 +791,11 @@ func testV3WatchMultipleEventsTxn(t *testing.T, startRev int64) { type eventsSortByKey []*mvccpb.Event -func (evs eventsSortByKey) Len() int { return len(evs) } -func (evs eventsSortByKey) Swap(i, j int) { evs[i], evs[j] = evs[j], evs[i] } -func (evs eventsSortByKey) Less(i, j int) bool { return bytes.Compare(evs[i].Kv.Key, evs[j].Kv.Key) < 0 } +func (evs eventsSortByKey) Len() int { return len(evs) } +func (evs eventsSortByKey) Swap(i, j int) { evs[i], evs[j] = evs[j], evs[i] } +func (evs eventsSortByKey) Less(i, j int) bool { + return bytes.Compare(evs[i].Kv.Key, evs[j].Kv.Key) < 0 +} func TestV3WatchMultipleEventsPutUnsynced(t *testing.T) { defer testutil.AfterTest(t) diff --git a/raft/rawnode_test.go b/raft/rawnode_test.go index d44a17a42aa..c4dc56a8d04 100644 --- a/raft/rawnode_test.go +++ b/raft/rawnode_test.go @@ -62,8 +62,10 @@ func (a *rawNodeAdapter) ReadIndex(_ context.Context, rctx []byte) error { // RawNode swallowed the error in ReadIndex, it probably should not do that. return nil } -func (a *rawNodeAdapter) Step(_ context.Context, m pb.Message) error { return a.RawNode.Step(m) } -func (a *rawNodeAdapter) Propose(_ context.Context, data []byte) error { return a.RawNode.Propose(data) } +func (a *rawNodeAdapter) Step(_ context.Context, m pb.Message) error { return a.RawNode.Step(m) } +func (a *rawNodeAdapter) Propose(_ context.Context, data []byte) error { + return a.RawNode.Propose(data) +} func (a *rawNodeAdapter) ProposeConfChange(_ context.Context, cc pb.ConfChangeI) error { return a.RawNode.ProposeConfChange(cc) } diff --git a/tests/e2e/ctl_v3_auth_test.go b/tests/e2e/ctl_v3_auth_test.go index 2fba2b3d020..c4a6fdf8abb 100644 --- a/tests/e2e/ctl_v3_auth_test.go +++ b/tests/e2e/ctl_v3_auth_test.go @@ -47,9 +47,11 @@ func TestCtlV3AuthFromKeyPerm(t *testing.T) { testCtl(t, authTestFromKeyPer func TestCtlV3AuthAndWatch(t *testing.T) { testCtl(t, authTestWatch) } func TestCtlV3AuthAndWatchJWT(t *testing.T) { testCtl(t, authTestWatch, withCfg(configJWT)) } -func TestCtlV3AuthLeaseTestKeepAlive(t *testing.T) { testCtl(t, authLeaseTestKeepAlive) } -func TestCtlV3AuthLeaseTestTimeToLiveExpired(t *testing.T) { testCtl(t, authLeaseTestTimeToLiveExpired) } -func TestCtlV3AuthLeaseGrantLeases(t *testing.T) { testCtl(t, authLeaseTestLeaseGrantLeases) } +func TestCtlV3AuthLeaseTestKeepAlive(t *testing.T) { testCtl(t, authLeaseTestKeepAlive) } +func TestCtlV3AuthLeaseTestTimeToLiveExpired(t *testing.T) { + testCtl(t, authLeaseTestTimeToLiveExpired) +} +func TestCtlV3AuthLeaseGrantLeases(t *testing.T) { testCtl(t, authLeaseTestLeaseGrantLeases) } func TestCtlV3AuthLeaseGrantLeasesJWT(t *testing.T) { testCtl(t, authLeaseTestLeaseGrantLeases, withCfg(configJWT)) } From d88d765ba4bfd51c0b50b47d8f1315520bc8f9a5 Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Tue, 28 Apr 2020 22:02:19 +0000 Subject: [PATCH 8/8] Documentation, CHANGELOG: use new go.etcd.io/etcd/v3 pkg Use the new package path in the docs and announce it in the CHANGELOG --- CHANGELOG-3.5.md | 1 + Documentation/dev-guide/grpc_naming.md | 4 ++-- Documentation/dl-build.md | 4 ++-- client/README.md | 4 ++-- pkg/adt/README.md | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/CHANGELOG-3.5.md b/CHANGELOG-3.5.md index f944cb7b827..d39b38cb8c2 100644 --- a/CHANGELOG-3.5.md +++ b/CHANGELOG-3.5.md @@ -21,6 +21,7 @@ See [code changes](https://github.com/etcd-io/etcd/compare/v3.4.0...v3.5.0) and ### Breaking Changes +- `go.etcd.io/etcd` Go packages have moved to `go.etcd.io/etcd/v3` to follow the [Go modules](https://github.com/golang/go/wiki/Modules) conventions - Changed behavior of clienv3 API [MemberList](https://github.com/etcd-io/etcd/pull/11639). - Previously, it is directly served with server's local data, which could be stale. - Now, it is served with linearizable guarantee. If the server is disconnected from quorum, `MemberList` call will fail. diff --git a/Documentation/dev-guide/grpc_naming.md b/Documentation/dev-guide/grpc_naming.md index 77287c6e1c7..068b0b4b34c 100644 --- a/Documentation/dev-guide/grpc_naming.md +++ b/Documentation/dev-guide/grpc_naming.md @@ -10,8 +10,8 @@ The etcd client provides a gRPC resolver for resolving gRPC endpoints with an et ```go 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" ) diff --git a/Documentation/dl-build.md b/Documentation/dl-build.md index a8f652b1f94..7b79951fae6 100644 --- a/Documentation/dl-build.md +++ b/Documentation/dl-build.md @@ -28,8 +28,8 @@ To build a vendored `etcd` from the `master` branch via `go get`: # GOPATH should be set $ echo $GOPATH /Users/example/go -$ go get -v go.etcd.io/etcd -$ go get -v go.etcd.io/etcd/etcdctl +$ go get -v go.etcd.io/etcd/v3 +$ go get -v go.etcd.io/etcd/v3/etcdctl ``` ## Test the installation diff --git a/client/README.md b/client/README.md index 521d6c01207..5d8ecad11ac 100644 --- a/client/README.md +++ b/client/README.md @@ -9,7 +9,7 @@ For full compatibility, it is recommended to vendor builds using etcd's vendored ## Install ```bash -go get go.etcd.io/etcd/client +go get go.etcd.io/etcd/v3/client ``` ## Usage @@ -22,7 +22,7 @@ import ( "time" "context" - "go.etcd.io/etcd/client" + "go.etcd.io/etcd/v3/client" ) func main() { diff --git a/pkg/adt/README.md b/pkg/adt/README.md index a2089cd4b96..1b59327e8b7 100644 --- a/pkg/adt/README.md +++ b/pkg/adt/README.md @@ -16,7 +16,7 @@ For example, import ( "fmt" - "go.etcd.io/etcd/pkg/adt" + "go.etcd.io/etcd/v3/pkg/adt" ) func main() {