From d37f1521b7efe96feb853c1de6252b89b8c77f20 Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Tue, 28 Aug 2018 17:13:25 -0700 Subject: [PATCH] *: update import paths to "go.etcd.io/etcd" Signed-off-by: Gyuho Lee --- 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 +- 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 | 20 +++++------ embed/config_logging.go | 4 +-- embed/config_logging_journal_unix.go | 2 +- embed/config_test.go | 2 +- embed/doc.go | 2 +- embed/etcd.go | 28 +++++++-------- embed/serve.go | 26 +++++++------- embed/serve_test.go | 2 +- embed/util.go | 2 +- etcdctl/ctlv2/command/auth_commands.go | 2 +- etcdctl/ctlv2/command/backup_command.go | 18 +++++----- etcdctl/ctlv2/command/cluster_health.go | 2 +- etcdctl/ctlv2/command/error.go | 2 +- etcdctl/ctlv2/command/exec_watch_command.go | 2 +- etcdctl/ctlv2/command/format.go | 2 +- etcdctl/ctlv2/command/get_command.go | 2 +- etcdctl/ctlv2/command/ls_command.go | 2 +- etcdctl/ctlv2/command/member_commands.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 | 10 +++--- 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/migrate_command.go | 32 ++++++++--------- etcdctl/ctlv3/command/move_leader_command.go | 2 +- etcdctl/ctlv3/command/printer.go | 6 ++-- etcdctl/ctlv3/command/printer_fields.go | 8 ++--- etcdctl/ctlv3/command/printer_json.go | 2 +- etcdctl/ctlv3/command/printer_protobuf.go | 6 ++-- etcdctl/ctlv3/command/printer_simple.go | 8 ++--- etcdctl/ctlv3/command/printer_table.go | 4 +-- etcdctl/ctlv3/command/put_command.go | 2 +- etcdctl/ctlv3/command/role_command.go | 2 +- etcdctl/ctlv3/command/snapshot_command.go | 2 +- etcdctl/ctlv3/command/txn_command.go | 4 +-- etcdctl/ctlv3/command/util.go | 4 +-- etcdctl/ctlv3/command/version_command.go | 2 +- etcdctl/ctlv3/command/watch_command.go | 2 +- etcdctl/ctlv3/ctl.go | 2 +- etcdctl/ctlv3/ctl_cov.go | 2 +- etcdctl/ctlv3/ctl_nocov.go | 2 +- etcdctl/ctlv3/help.go | 2 +- etcdctl/main.go | 4 +-- etcdmain/config.go | 8 ++--- etcdmain/config_test.go | 2 +- etcdmain/etcd.go | 24 ++++++------- etcdmain/gateway.go | 2 +- etcdmain/grpc_proxy.go | 24 ++++++------- etcdmain/help.go | 2 +- etcdmain/util.go | 4 +-- functional/agent/handler.go | 8 ++--- functional/agent/server.go | 6 ++-- functional/agent/utils.go | 2 +- functional/cmd/etcd-agent/main.go | 2 +- functional/cmd/etcd-proxy/main.go | 2 +- functional/cmd/etcd-runner/main.go | 2 +- functional/cmd/etcd-tester/main.go | 2 +- functional/rpcpb/etcd_config.go | 6 ++-- functional/rpcpb/etcd_config_test.go | 4 +-- functional/rpcpb/member.go | 8 ++--- functional/runner/election_command.go | 2 +- functional/runner/error.go | 2 +- functional/runner/global.go | 2 +- functional/runner/help.go | 2 +- functional/runner/lease_renewer_command.go | 2 +- functional/runner/lock_racer_command.go | 2 +- functional/runner/watch_command.go | 4 +-- functional/tester/case.go | 2 +- functional/tester/case_external.go | 2 +- functional/tester/case_failpoints.go | 2 +- functional/tester/case_network_blackhole.go | 2 +- functional/tester/case_network_delay.go | 4 +-- 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 | 8 ++--- functional/tester/cluster_read_config.go | 2 +- functional/tester/cluster_run.go | 4 +-- functional/tester/cluster_test.go | 2 +- functional/tester/stresser.go | 2 +- functional/tester/stresser_key.go | 10 +++--- functional/tester/stresser_lease.go | 6 ++-- functional/tester/stresser_runner.go | 2 +- integration/bridge.go | 2 +- integration/cluster.go | 36 +++++++++---------- integration/cluster_direct.go | 8 ++--- integration/cluster_proxy.go | 8 ++--- integration/cluster_test.go | 8 ++--- integration/embed_test.go | 4 +-- integration/logger_test.go | 2 +- integration/main_test.go | 2 +- integration/member_test.go | 4 +-- integration/metrics_test.go | 6 ++-- integration/network_partition_test.go | 2 +- integration/util_test.go | 2 +- integration/v2_http_kv_test.go | 4 +-- integration/v3_alarm_test.go | 10 +++--- integration/v3_auth_test.go | 10 +++--- integration/v3_barrier_test.go | 6 ++-- integration/v3_double_barrier_test.go | 4 +-- integration/v3_election_test.go | 6 ++-- integration/v3_grpc_inflight_test.go | 8 ++--- integration/v3_grpc_test.go | 10 +++--- integration/v3_health_test.go | 2 +- integration/v3_leadership_test.go | 6 ++-- integration/v3_lease_test.go | 14 ++++---- 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 | 8 ++--- pkg/adt/example_test.go | 2 +- pkg/fileutil/fileutil.go | 2 +- pkg/flags/flag.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/merge_logger_test.go | 2 +- pkg/logutil/package_logger.go | 2 +- pkg/logutil/package_logger_test.go | 6 ++-- 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/osutil/osutil.go | 2 +- pkg/pbutil/pbutil.go | 2 +- pkg/proxy/server.go | 6 ++-- pkg/proxy/server_test.go | 2 +- pkg/srv/srv.go | 2 +- pkg/srv/srv_test.go | 2 +- pkg/testutil/leak.go | 6 ++-- pkg/transport/listener.go | 2 +- pkg/types/urls_test.go | 2 +- pkg/types/urlsmap_test.go | 2 +- .../grpcproxy/adapter/auth_client_adapter.go | 2 +- .../adapter/cluster_client_adapter.go | 2 +- .../adapter/election_client_adapter.go | 2 +- proxy/grpcproxy/adapter/kv_client_adapter.go | 2 +- .../grpcproxy/adapter/lease_client_adapter.go | 2 +- .../grpcproxy/adapter/lock_client_adapter.go | 2 +- .../adapter/maintenance_client_adapter.go | 2 +- .../grpcproxy/adapter/watch_client_adapter.go | 2 +- proxy/grpcproxy/auth.go | 4 +-- proxy/grpcproxy/cache/store.go | 6 ++-- proxy/grpcproxy/cluster.go | 8 ++--- proxy/grpcproxy/cluster_test.go | 8 ++--- proxy/grpcproxy/election.go | 4 +-- proxy/grpcproxy/health.go | 6 ++-- proxy/grpcproxy/kv.go | 6 ++-- proxy/grpcproxy/kv_test.go | 8 ++--- proxy/grpcproxy/leader.go | 2 +- proxy/grpcproxy/lease.go | 6 ++-- proxy/grpcproxy/lock.go | 4 +-- proxy/grpcproxy/logger.go | 2 +- proxy/grpcproxy/maintenance.go | 4 +-- 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 | 4 +-- proxy/tcpproxy/userspace.go | 2 +- tests/e2e/cluster_proxy_test.go | 2 +- tests/e2e/cluster_test.go | 2 +- tests/e2e/ctl_v2_test.go | 4 +-- tests/e2e/ctl_v3_alarm_test.go | 2 +- tests/e2e/ctl_v3_auth_test.go | 2 +- tests/e2e/ctl_v3_elect_test.go | 2 +- tests/e2e/ctl_v3_endpoint_test.go | 2 +- tests/e2e/ctl_v3_lock_test.go | 2 +- tests/e2e/ctl_v3_member_test.go | 2 +- tests/e2e/ctl_v3_migrate_test.go | 4 +-- tests/e2e/ctl_v3_move_leader_test.go | 8 ++--- tests/e2e/ctl_v3_snapshot_test.go | 6 ++-- tests/e2e/ctl_v3_test.go | 6 ++-- tests/e2e/etcd_config_test.go | 2 +- tests/e2e/etcd_corrupt_test.go | 4 +-- tests/e2e/etcd_process.go | 4 +-- tests/e2e/etcd_release_upgrade_test.go | 6 ++-- tests/e2e/etcd_spawn_cov.go | 6 ++-- tests/e2e/etcd_spawn_nocov.go | 2 +- tests/e2e/gateway_test.go | 2 +- tests/e2e/main_test.go | 2 +- tests/e2e/metrics_test.go | 2 +- tests/e2e/util.go | 2 +- tests/e2e/v2_curl_test.go | 2 +- tests/e2e/v3_cipher_suite_test.go | 2 +- tests/e2e/v3_curl_lease_test.go | 2 +- tests/e2e/v3_curl_test.go | 8 ++--- tools/benchmark/cmd/lease.go | 4 +-- tools/benchmark/cmd/mvcc-put.go | 4 +-- tools/benchmark/cmd/mvcc.go | 6 ++-- tools/benchmark/cmd/put.go | 4 +-- tools/benchmark/cmd/range.go | 4 +-- tools/benchmark/cmd/root.go | 2 +- tools/benchmark/cmd/stm.go | 8 ++--- tools/benchmark/cmd/txn_put.go | 4 +-- tools/benchmark/cmd/util.go | 4 +-- tools/benchmark/cmd/watch.go | 14 ++++---- 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 | 18 +++++----- 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 +- 278 files changed, 623 insertions(+), 623 deletions(-) diff --git a/client/client.go b/client/client.go index e68745056..6f1270f8a 100644 --- a/client/client.go +++ b/client/client.go @@ -29,7 +29,7 @@ import ( "sync" "time" - "github.com/coreos/etcd/version" + "go.etcd.io/etcd/version" ) var ( diff --git a/client/client_test.go b/client/client_test.go index d8e14b0bd..c66d3b77b 100644 --- a/client/client_test.go +++ b/client/client_test.go @@ -29,8 +29,8 @@ import ( "testing" "time" - "github.com/coreos/etcd/pkg/testutil" - "github.com/coreos/etcd/version" + "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/version" ) type actionAssertingHTTPClient struct { diff --git a/client/discover.go b/client/discover.go index 442e35fe5..30473148b 100644 --- a/client/discover.go +++ b/client/discover.go @@ -15,7 +15,7 @@ package client import ( - "github.com/coreos/etcd/pkg/srv" + "go.etcd.io/etcd/pkg/srv" ) // Discoverer is an interface that wraps the Discover method. diff --git a/client/doc.go b/client/doc.go index ad4eca4e1..abe5199c3 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" - "github.com/coreos/etcd/client" + "go.etcd.io/etcd/client" ) cfg := client.Config{ diff --git a/client/example_keys_test.go b/client/example_keys_test.go index 66063571d..84cbbe791 100644 --- a/client/example_keys_test.go +++ b/client/example_keys_test.go @@ -20,7 +20,7 @@ import ( "log" "sort" - "github.com/coreos/etcd/client" + "go.etcd.io/etcd/client" ) func ExampleKeysAPI_directory() { diff --git a/client/integration/client_test.go b/client/integration/client_test.go index 19c9ede76..546b28f24 100644 --- a/client/integration/client_test.go +++ b/client/integration/client_test.go @@ -24,9 +24,9 @@ import ( "sync/atomic" "testing" - "github.com/coreos/etcd/client" - "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/client" + "go.etcd.io/etcd/integration" + "go.etcd.io/etcd/pkg/testutil" ) // TestV2NoRetryEOF tests destructive api calls won't retry on a disconnection. diff --git a/client/integration/main_test.go b/client/integration/main_test.go index 2913ce511..c7362dde4 100644 --- a/client/integration/main_test.go +++ b/client/integration/main_test.go @@ -8,7 +8,7 @@ import ( "os" "testing" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/testutil" ) func TestMain(m *testing.M) { diff --git a/client/keys.go b/client/keys.go index 8b9fd3f87..f88f5b559 100644 --- a/client/keys.go +++ b/client/keys.go @@ -27,7 +27,7 @@ import ( "strings" "time" - "github.com/coreos/etcd/pkg/pathutil" + "go.etcd.io/etcd/pkg/pathutil" "github.com/ugorji/go/codec" ) diff --git a/client/main_test.go b/client/main_test.go index 1f2f3f306..1fec862e0 100644 --- a/client/main_test.go +++ b/client/main_test.go @@ -23,9 +23,9 @@ import ( "testing" "time" - "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/pkg/testutil" - "github.com/coreos/etcd/pkg/transport" + "go.etcd.io/etcd/integration" + "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/transport" ) var exampleEndpoints []string diff --git a/client/members.go b/client/members.go index aafa3d1b8..657131ab0 100644 --- a/client/members.go +++ b/client/members.go @@ -23,7 +23,7 @@ import ( "net/url" "path" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/pkg/types" ) var ( diff --git a/client/members_test.go b/client/members_test.go index 706b6aeb8..9be03ae54 100644 --- a/client/members_test.go +++ b/client/members_test.go @@ -23,7 +23,7 @@ import ( "reflect" "testing" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/pkg/types" ) func TestMembersAPIActionList(t *testing.T) { diff --git a/contrib/raftexample/httpapi.go b/contrib/raftexample/httpapi.go index 10d3a5d9b..86d27d397 100644 --- a/contrib/raftexample/httpapi.go +++ b/contrib/raftexample/httpapi.go @@ -20,7 +20,7 @@ import ( "net/http" "strconv" - "github.com/coreos/etcd/raft/raftpb" + "go.etcd.io/etcd/raft/raftpb" ) // Handler for a http based key-value store backed by raft diff --git a/contrib/raftexample/kvstore.go b/contrib/raftexample/kvstore.go index 988e22935..f780acc59 100644 --- a/contrib/raftexample/kvstore.go +++ b/contrib/raftexample/kvstore.go @@ -21,7 +21,7 @@ import ( "log" "sync" - "github.com/coreos/etcd/etcdserver/api/snap" + "go.etcd.io/etcd/etcdserver/api/snap" ) // a key-value store backed by raft diff --git a/contrib/raftexample/main.go b/contrib/raftexample/main.go index 582692469..6b6f064a3 100644 --- a/contrib/raftexample/main.go +++ b/contrib/raftexample/main.go @@ -18,7 +18,7 @@ import ( "flag" "strings" - "github.com/coreos/etcd/raft/raftpb" + "go.etcd.io/etcd/raft/raftpb" ) func main() { diff --git a/contrib/raftexample/raft.go b/contrib/raftexample/raft.go index a57305746..9a270eac7 100644 --- a/contrib/raftexample/raft.go +++ b/contrib/raftexample/raft.go @@ -24,15 +24,15 @@ import ( "strconv" "time" - "github.com/coreos/etcd/etcdserver/api/rafthttp" - "github.com/coreos/etcd/etcdserver/api/snap" - stats "github.com/coreos/etcd/etcdserver/api/v2stats" - "github.com/coreos/etcd/pkg/fileutil" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft" - "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/wal" - "github.com/coreos/etcd/wal/walpb" + "go.etcd.io/etcd/etcdserver/api/rafthttp" + "go.etcd.io/etcd/etcdserver/api/snap" + stats "go.etcd.io/etcd/etcdserver/api/v2stats" + "go.etcd.io/etcd/pkg/fileutil" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft" + "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/wal" + "go.etcd.io/etcd/wal/walpb" "go.uber.org/zap" ) diff --git a/contrib/raftexample/raftexample_test.go b/contrib/raftexample/raftexample_test.go index 16b5a4e77..f452efae8 100644 --- a/contrib/raftexample/raftexample_test.go +++ b/contrib/raftexample/raftexample_test.go @@ -19,7 +19,7 @@ import ( "os" "testing" - "github.com/coreos/etcd/raft/raftpb" + "go.etcd.io/etcd/raft/raftpb" ) type cluster struct { diff --git a/contrib/recipes/barrier.go b/contrib/recipes/barrier.go index 666c7424c..5ab4817c7 100644 --- a/contrib/recipes/barrier.go +++ b/contrib/recipes/barrier.go @@ -17,8 +17,8 @@ package recipe import ( "context" - v3 "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/mvcc/mvccpb" + v3 "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/mvcc/mvccpb" ) // Barrier creates a key in etcd to block processes, then deletes the key to diff --git a/contrib/recipes/client.go b/contrib/recipes/client.go index 111b0b40c..e0c02e67d 100644 --- a/contrib/recipes/client.go +++ b/contrib/recipes/client.go @@ -18,8 +18,8 @@ import ( "context" "errors" - v3 "github.com/coreos/etcd/clientv3" - spb "github.com/coreos/etcd/mvcc/mvccpb" + v3 "go.etcd.io/etcd/clientv3" + spb "go.etcd.io/etcd/mvcc/mvccpb" ) var ( diff --git a/contrib/recipes/double_barrier.go b/contrib/recipes/double_barrier.go index 93cc61b4f..90189ba7c 100644 --- a/contrib/recipes/double_barrier.go +++ b/contrib/recipes/double_barrier.go @@ -17,9 +17,9 @@ package recipe import ( "context" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/concurrency" - "github.com/coreos/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/concurrency" + "go.etcd.io/etcd/mvcc/mvccpb" ) // DoubleBarrier blocks processes on Enter until an expected count enters, then diff --git a/contrib/recipes/key.go b/contrib/recipes/key.go index 2d5a32f84..891ff7d69 100644 --- a/contrib/recipes/key.go +++ b/contrib/recipes/key.go @@ -20,8 +20,8 @@ import ( "strings" "time" - v3 "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/concurrency" + v3 "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/concurrency" ) // RemoteKV is a key/revision pair created by the client and stored on etcd diff --git a/contrib/recipes/priority_queue.go b/contrib/recipes/priority_queue.go index 2378ce2f8..4116a8702 100644 --- a/contrib/recipes/priority_queue.go +++ b/contrib/recipes/priority_queue.go @@ -18,8 +18,8 @@ import ( "context" "fmt" - v3 "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/mvcc/mvccpb" + v3 "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/mvcc/mvccpb" ) // PriorityQueue implements a multi-reader, multi-writer distributed queue. diff --git a/contrib/recipes/queue.go b/contrib/recipes/queue.go index 5d0423a42..e374f000d 100644 --- a/contrib/recipes/queue.go +++ b/contrib/recipes/queue.go @@ -17,8 +17,8 @@ package recipe import ( "context" - v3 "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/mvcc/mvccpb" + v3 "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/mvcc/mvccpb" ) // Queue implements a multi-reader, multi-writer distributed queue. diff --git a/contrib/recipes/rwmutex.go b/contrib/recipes/rwmutex.go index 1213b7e42..97a24c749 100644 --- a/contrib/recipes/rwmutex.go +++ b/contrib/recipes/rwmutex.go @@ -17,9 +17,9 @@ package recipe import ( "context" - v3 "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/concurrency" - "github.com/coreos/etcd/mvcc/mvccpb" + v3 "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/concurrency" + "go.etcd.io/etcd/mvcc/mvccpb" ) type RWMutex struct { diff --git a/contrib/recipes/watch.go b/contrib/recipes/watch.go index 536787227..025d73c5a 100644 --- a/contrib/recipes/watch.go +++ b/contrib/recipes/watch.go @@ -17,8 +17,8 @@ package recipe import ( "context" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/mvcc/mvccpb" ) // WaitEvents waits on a key until it observes the given events and returns the final one. diff --git a/embed/config.go b/embed/config.go index 0fccc74bf..00e59ea18 100644 --- a/embed/config.go +++ b/embed/config.go @@ -27,14 +27,14 @@ import ( "sync" "time" - "github.com/coreos/etcd/etcdserver" - "github.com/coreos/etcd/etcdserver/api/v3compactor" - "github.com/coreos/etcd/pkg/flags" - "github.com/coreos/etcd/pkg/netutil" - "github.com/coreos/etcd/pkg/srv" - "github.com/coreos/etcd/pkg/tlsutil" - "github.com/coreos/etcd/pkg/transport" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api/v3compactor" + "go.etcd.io/etcd/pkg/flags" + "go.etcd.io/etcd/pkg/netutil" + "go.etcd.io/etcd/pkg/srv" + "go.etcd.io/etcd/pkg/tlsutil" + "go.etcd.io/etcd/pkg/transport" + "go.etcd.io/etcd/pkg/types" "github.com/ghodss/yaml" "go.uber.org/zap" @@ -162,7 +162,7 @@ type Config struct { // // If single-node, it advances ticks regardless. // - // See https://github.com/coreos/etcd/issues/9333 for more detail. + // See https://go.etcd.io/etcd/issues/9333 for more detail. InitialElectionTickAdvance bool `json:"initial-election-tick-advance"` QuotaBackendBytes int64 `json:"quota-backend-bytes"` @@ -246,7 +246,7 @@ type Config struct { // CVE-2018-5702 reference: // - https://bugs.chromium.org/p/project-zero/issues/detail?id=1447#c2 // - https://github.com/transmission/transmission/pull/468 - // - https://github.com/coreos/etcd/issues/9353 + // - https://go.etcd.io/etcd/issues/9353 HostWhitelist map[string]struct{} // UserHandlers is for registering users handlers and only used for diff --git a/embed/config_logging.go b/embed/config_logging.go index 3cd92ce6d..0c927743d 100644 --- a/embed/config_logging.go +++ b/embed/config_logging.go @@ -24,7 +24,7 @@ import ( "sort" "sync" - "github.com/coreos/etcd/pkg/logutil" + "go.etcd.io/etcd/pkg/logutil" "github.com/coreos/pkg/capnslog" "go.uber.org/zap" @@ -93,7 +93,7 @@ func (cfg *Config) setupLogging() error { // TODO: deprecate with "capnslog" if cfg.LogPkgLevels != "" { - repoLog := capnslog.MustRepoLogger("github.com/coreos/etcd") + repoLog := capnslog.MustRepoLogger("go.etcd.io/etcd") settings, err := repoLog.ParseLogLevelConfig(cfg.LogPkgLevels) if err != nil { plog.Warningf("couldn't parse log level string: %s, continuing with default levels", err.Error()) diff --git a/embed/config_logging_journal_unix.go b/embed/config_logging_journal_unix.go index ff9ddd055..44a51d677 100644 --- a/embed/config_logging_journal_unix.go +++ b/embed/config_logging_journal_unix.go @@ -20,7 +20,7 @@ import ( "fmt" "os" - "github.com/coreos/etcd/pkg/logutil" + "go.etcd.io/etcd/pkg/logutil" "go.uber.org/zap/zapcore" ) diff --git a/embed/config_test.go b/embed/config_test.go index 3202b2e63..3eb411b3a 100644 --- a/embed/config_test.go +++ b/embed/config_test.go @@ -21,7 +21,7 @@ import ( "os" "testing" - "github.com/coreos/etcd/pkg/transport" + "go.etcd.io/etcd/pkg/transport" "github.com/ghodss/yaml" ) diff --git a/embed/doc.go b/embed/doc.go index c555aa58e..4811bb634 100644 --- a/embed/doc.go +++ b/embed/doc.go @@ -21,7 +21,7 @@ Launch an embedded etcd server using the configuration defaults: "log" "time" - "github.com/coreos/etcd/embed" + "go.etcd.io/etcd/embed" ) func main() { diff --git a/embed/etcd.go b/embed/etcd.go index 5a79f0bee..88086d2ae 100644 --- a/embed/etcd.go +++ b/embed/etcd.go @@ -29,18 +29,18 @@ import ( "sync" "time" - "github.com/coreos/etcd/etcdserver" - "github.com/coreos/etcd/etcdserver/api/etcdhttp" - "github.com/coreos/etcd/etcdserver/api/rafthttp" - "github.com/coreos/etcd/etcdserver/api/v2http" - "github.com/coreos/etcd/etcdserver/api/v2v3" - "github.com/coreos/etcd/etcdserver/api/v3client" - "github.com/coreos/etcd/etcdserver/api/v3rpc" - "github.com/coreos/etcd/pkg/debugutil" - runtimeutil "github.com/coreos/etcd/pkg/runtime" - "github.com/coreos/etcd/pkg/transport" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/version" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api/etcdhttp" + "go.etcd.io/etcd/etcdserver/api/rafthttp" + "go.etcd.io/etcd/etcdserver/api/v2http" + "go.etcd.io/etcd/etcdserver/api/v2v3" + "go.etcd.io/etcd/etcdserver/api/v3client" + "go.etcd.io/etcd/etcdserver/api/v3rpc" + "go.etcd.io/etcd/pkg/debugutil" + runtimeutil "go.etcd.io/etcd/pkg/runtime" + "go.etcd.io/etcd/pkg/transport" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/version" "github.com/coreos/pkg/capnslog" "github.com/grpc-ecosystem/go-grpc-prometheus" @@ -50,7 +50,7 @@ import ( "google.golang.org/grpc/keepalive" ) -var plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "embed") +var plog = capnslog.NewPackageLogger("go.etcd.io/etcd", "embed") const ( // internal fd usage includes disk usage and transport usage. @@ -412,7 +412,7 @@ func stopServers(ctx context.Context, ss *servers) { // do not grpc.Server.GracefulStop with TLS enabled etcd server // See https://github.com/grpc/grpc-go/issues/1384#issuecomment-317124531 - // and https://github.com/coreos/etcd/issues/8916 + // and https://go.etcd.io/etcd/issues/8916 if ss.secure { shutdownNow() return diff --git a/embed/serve.go b/embed/serve.go index 4b283568d..1399a62f3 100644 --- a/embed/serve.go +++ b/embed/serve.go @@ -23,19 +23,19 @@ import ( "net/http" "strings" - "github.com/coreos/etcd/etcdserver" - "github.com/coreos/etcd/etcdserver/api/v3client" - "github.com/coreos/etcd/etcdserver/api/v3election" - "github.com/coreos/etcd/etcdserver/api/v3election/v3electionpb" - v3electiongw "github.com/coreos/etcd/etcdserver/api/v3election/v3electionpb/gw" - "github.com/coreos/etcd/etcdserver/api/v3lock" - "github.com/coreos/etcd/etcdserver/api/v3lock/v3lockpb" - v3lockgw "github.com/coreos/etcd/etcdserver/api/v3lock/v3lockpb/gw" - "github.com/coreos/etcd/etcdserver/api/v3rpc" - etcdservergw "github.com/coreos/etcd/etcdserver/etcdserverpb/gw" - "github.com/coreos/etcd/pkg/debugutil" - "github.com/coreos/etcd/pkg/httputil" - "github.com/coreos/etcd/pkg/transport" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api/v3client" + "go.etcd.io/etcd/etcdserver/api/v3election" + "go.etcd.io/etcd/etcdserver/api/v3election/v3electionpb" + v3electiongw "go.etcd.io/etcd/etcdserver/api/v3election/v3electionpb/gw" + "go.etcd.io/etcd/etcdserver/api/v3lock" + "go.etcd.io/etcd/etcdserver/api/v3lock/v3lockpb" + v3lockgw "go.etcd.io/etcd/etcdserver/api/v3lock/v3lockpb/gw" + "go.etcd.io/etcd/etcdserver/api/v3rpc" + etcdservergw "go.etcd.io/etcd/etcdserver/etcdserverpb/gw" + "go.etcd.io/etcd/pkg/debugutil" + "go.etcd.io/etcd/pkg/httputil" + "go.etcd.io/etcd/pkg/transport" gw "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/soheilhy/cmux" diff --git a/embed/serve_test.go b/embed/serve_test.go index d46631fcf..388564567 100644 --- a/embed/serve_test.go +++ b/embed/serve_test.go @@ -19,7 +19,7 @@ import ( "os" "testing" - "github.com/coreos/etcd/auth" + "go.etcd.io/etcd/auth" ) // TestStartEtcdWrongToken ensures that StartEtcd with wrong configs returns with error. diff --git a/embed/util.go b/embed/util.go index d76b596ee..40f3ce9d5 100644 --- a/embed/util.go +++ b/embed/util.go @@ -17,7 +17,7 @@ package embed import ( "path/filepath" - "github.com/coreos/etcd/wal" + "go.etcd.io/etcd/wal" ) func isMemberInitialized(cfg *Config) bool { diff --git a/etcdctl/ctlv2/command/auth_commands.go b/etcdctl/ctlv2/command/auth_commands.go index 96a17738f..6a2bc7bce 100644 --- a/etcdctl/ctlv2/command/auth_commands.go +++ b/etcdctl/ctlv2/command/auth_commands.go @@ -19,7 +19,7 @@ import ( "os" "strings" - "github.com/coreos/etcd/client" + "go.etcd.io/etcd/client" "github.com/urfave/cli" ) diff --git a/etcdctl/ctlv2/command/backup_command.go b/etcdctl/ctlv2/command/backup_command.go index 7e423fe82..fbedb40a3 100644 --- a/etcdctl/ctlv2/command/backup_command.go +++ b/etcdctl/ctlv2/command/backup_command.go @@ -23,15 +23,15 @@ import ( "regexp" "time" - "github.com/coreos/etcd/etcdserver/api/membership" - "github.com/coreos/etcd/etcdserver/api/snap" - "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/fileutil" - "github.com/coreos/etcd/pkg/idutil" - "github.com/coreos/etcd/pkg/pbutil" - "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/wal" - "github.com/coreos/etcd/wal/walpb" + "go.etcd.io/etcd/etcdserver/api/membership" + "go.etcd.io/etcd/etcdserver/api/snap" + "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/fileutil" + "go.etcd.io/etcd/pkg/idutil" + "go.etcd.io/etcd/pkg/pbutil" + "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/wal" + "go.etcd.io/etcd/wal/walpb" bolt "github.com/coreos/bbolt" "github.com/urfave/cli" diff --git a/etcdctl/ctlv2/command/cluster_health.go b/etcdctl/ctlv2/command/cluster_health.go index ec0bb241d..bfe8d698f 100644 --- a/etcdctl/ctlv2/command/cluster_health.go +++ b/etcdctl/ctlv2/command/cluster_health.go @@ -24,7 +24,7 @@ import ( "os/signal" "time" - "github.com/coreos/etcd/client" + "go.etcd.io/etcd/client" "github.com/urfave/cli" ) diff --git a/etcdctl/ctlv2/command/error.go b/etcdctl/ctlv2/command/error.go index e673fa39c..0a2f219d8 100644 --- a/etcdctl/ctlv2/command/error.go +++ b/etcdctl/ctlv2/command/error.go @@ -19,7 +19,7 @@ import ( "fmt" "os" - "github.com/coreos/etcd/client" + "go.etcd.io/etcd/client" "github.com/urfave/cli" ) diff --git a/etcdctl/ctlv2/command/exec_watch_command.go b/etcdctl/ctlv2/command/exec_watch_command.go index cc3478cc3..4cc859820 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" - "github.com/coreos/etcd/client" + "go.etcd.io/etcd/client" "github.com/urfave/cli" ) diff --git a/etcdctl/ctlv2/command/format.go b/etcdctl/ctlv2/command/format.go index 4a5d4a6a4..5e15554a1 100644 --- a/etcdctl/ctlv2/command/format.go +++ b/etcdctl/ctlv2/command/format.go @@ -19,7 +19,7 @@ import ( "fmt" "os" - "github.com/coreos/etcd/client" + "go.etcd.io/etcd/client" ) // printResponseKey only supports to print key correctly. diff --git a/etcdctl/ctlv2/command/get_command.go b/etcdctl/ctlv2/command/get_command.go index 7f1fc4db1..97d24e2d1 100644 --- a/etcdctl/ctlv2/command/get_command.go +++ b/etcdctl/ctlv2/command/get_command.go @@ -19,7 +19,7 @@ import ( "fmt" "os" - "github.com/coreos/etcd/client" + "go.etcd.io/etcd/client" "github.com/urfave/cli" ) diff --git a/etcdctl/ctlv2/command/ls_command.go b/etcdctl/ctlv2/command/ls_command.go index b2e94fb93..73ce94aea 100644 --- a/etcdctl/ctlv2/command/ls_command.go +++ b/etcdctl/ctlv2/command/ls_command.go @@ -17,7 +17,7 @@ package command import ( "fmt" - "github.com/coreos/etcd/client" + "go.etcd.io/etcd/client" "github.com/urfave/cli" ) diff --git a/etcdctl/ctlv2/command/member_commands.go b/etcdctl/ctlv2/command/member_commands.go index 84747873b..4ed78cc8d 100644 --- a/etcdctl/ctlv2/command/member_commands.go +++ b/etcdctl/ctlv2/command/member_commands.go @@ -164,7 +164,7 @@ func actionMemberRemove(c *cli.Context) error { if m.Name == removalID { // Note that, so long as it's not ambiguous, we *could* do the right thing by name here. fmt.Fprintf(os.Stderr, "Found a member named %s; if this is correct, please use its ID, eg:\n\tetcdctl member remove %s\n", m.Name, m.ID) - fmt.Fprintf(os.Stderr, "For more details, read the documentation at https://github.com/coreos/etcd/blob/master/Documentation/runtime-configuration.md#remove-a-member\n\n") + fmt.Fprintf(os.Stderr, "For more details, read the documentation at https://go.etcd.io/etcd/blob/master/Documentation/runtime-configuration.md#remove-a-member\n\n") } } if !foundID { diff --git a/etcdctl/ctlv2/command/mk_command.go b/etcdctl/ctlv2/command/mk_command.go index f62415350..b31fb59b1 100644 --- a/etcdctl/ctlv2/command/mk_command.go +++ b/etcdctl/ctlv2/command/mk_command.go @@ -19,7 +19,7 @@ import ( "os" "time" - "github.com/coreos/etcd/client" + "go.etcd.io/etcd/client" "github.com/urfave/cli" ) diff --git a/etcdctl/ctlv2/command/mkdir_command.go b/etcdctl/ctlv2/command/mkdir_command.go index 1d17b7b91..1839f2981 100644 --- a/etcdctl/ctlv2/command/mkdir_command.go +++ b/etcdctl/ctlv2/command/mkdir_command.go @@ -18,7 +18,7 @@ import ( "errors" "time" - "github.com/coreos/etcd/client" + "go.etcd.io/etcd/client" "github.com/urfave/cli" ) diff --git a/etcdctl/ctlv2/command/rm_command.go b/etcdctl/ctlv2/command/rm_command.go index c6f173be7..81c973c6f 100644 --- a/etcdctl/ctlv2/command/rm_command.go +++ b/etcdctl/ctlv2/command/rm_command.go @@ -17,7 +17,7 @@ package command import ( "errors" - "github.com/coreos/etcd/client" + "go.etcd.io/etcd/client" "github.com/urfave/cli" ) diff --git a/etcdctl/ctlv2/command/rmdir_command.go b/etcdctl/ctlv2/command/rmdir_command.go index cb3089548..5565bf1fe 100644 --- a/etcdctl/ctlv2/command/rmdir_command.go +++ b/etcdctl/ctlv2/command/rmdir_command.go @@ -17,8 +17,8 @@ package command import ( "errors" - "github.com/coreos/etcd/client" "github.com/urfave/cli" + "go.etcd.io/etcd/client" ) // NewRemoveDirCommand returns the CLI command for "rmdir". diff --git a/etcdctl/ctlv2/command/role_commands.go b/etcdctl/ctlv2/command/role_commands.go index 838b04062..765ecfeb3 100644 --- a/etcdctl/ctlv2/command/role_commands.go +++ b/etcdctl/ctlv2/command/role_commands.go @@ -20,8 +20,8 @@ import ( "reflect" "strings" - "github.com/coreos/etcd/client" - "github.com/coreos/etcd/pkg/pathutil" + "go.etcd.io/etcd/client" + "go.etcd.io/etcd/pkg/pathutil" "github.com/urfave/cli" ) diff --git a/etcdctl/ctlv2/command/set_command.go b/etcdctl/ctlv2/command/set_command.go index f7bb6bd53..7ee8e1ab2 100644 --- a/etcdctl/ctlv2/command/set_command.go +++ b/etcdctl/ctlv2/command/set_command.go @@ -19,7 +19,7 @@ import ( "os" "time" - "github.com/coreos/etcd/client" + "go.etcd.io/etcd/client" "github.com/urfave/cli" ) diff --git a/etcdctl/ctlv2/command/set_dir_command.go b/etcdctl/ctlv2/command/set_dir_command.go index aba66b089..a0e1758c0 100644 --- a/etcdctl/ctlv2/command/set_dir_command.go +++ b/etcdctl/ctlv2/command/set_dir_command.go @@ -15,7 +15,7 @@ package command import ( - "github.com/coreos/etcd/client" + "go.etcd.io/etcd/client" "github.com/urfave/cli" ) diff --git a/etcdctl/ctlv2/command/update_command.go b/etcdctl/ctlv2/command/update_command.go index ed4224892..5907576a9 100644 --- a/etcdctl/ctlv2/command/update_command.go +++ b/etcdctl/ctlv2/command/update_command.go @@ -19,7 +19,7 @@ import ( "os" "time" - "github.com/coreos/etcd/client" + "go.etcd.io/etcd/client" "github.com/urfave/cli" ) diff --git a/etcdctl/ctlv2/command/update_dir_command.go b/etcdctl/ctlv2/command/update_dir_command.go index 72411dfba..307fd1a04 100644 --- a/etcdctl/ctlv2/command/update_dir_command.go +++ b/etcdctl/ctlv2/command/update_dir_command.go @@ -18,7 +18,7 @@ import ( "errors" "time" - "github.com/coreos/etcd/client" + "go.etcd.io/etcd/client" "github.com/urfave/cli" ) diff --git a/etcdctl/ctlv2/command/user_commands.go b/etcdctl/ctlv2/command/user_commands.go index c0fb900b2..9e7577b32 100644 --- a/etcdctl/ctlv2/command/user_commands.go +++ b/etcdctl/ctlv2/command/user_commands.go @@ -20,7 +20,7 @@ import ( "strings" "github.com/bgentry/speakeasy" - "github.com/coreos/etcd/client" + "go.etcd.io/etcd/client" "github.com/urfave/cli" ) diff --git a/etcdctl/ctlv2/command/util.go b/etcdctl/ctlv2/command/util.go index 133b4000e..4ac8481e8 100644 --- a/etcdctl/ctlv2/command/util.go +++ b/etcdctl/ctlv2/command/util.go @@ -28,8 +28,8 @@ import ( "syscall" "time" - "github.com/coreos/etcd/client" - "github.com/coreos/etcd/pkg/transport" + "go.etcd.io/etcd/client" + "go.etcd.io/etcd/pkg/transport" "github.com/bgentry/speakeasy" "github.com/urfave/cli" diff --git a/etcdctl/ctlv2/command/watch_command.go b/etcdctl/ctlv2/command/watch_command.go index eac63b040..dc0fe2d11 100644 --- a/etcdctl/ctlv2/command/watch_command.go +++ b/etcdctl/ctlv2/command/watch_command.go @@ -21,7 +21,7 @@ import ( "os" "os/signal" - "github.com/coreos/etcd/client" + "go.etcd.io/etcd/client" "github.com/urfave/cli" ) diff --git a/etcdctl/ctlv2/ctl.go b/etcdctl/ctlv2/ctl.go index e99ba59e1..9cbf0c55a 100644 --- a/etcdctl/ctlv2/ctl.go +++ b/etcdctl/ctlv2/ctl.go @@ -20,8 +20,8 @@ import ( "os" "time" - "github.com/coreos/etcd/etcdctl/ctlv2/command" - "github.com/coreos/etcd/version" + "go.etcd.io/etcd/etcdctl/ctlv2/command" + "go.etcd.io/etcd/version" "github.com/urfave/cli" ) diff --git a/etcdctl/ctlv3/command/alarm_command.go b/etcdctl/ctlv3/command/alarm_command.go index 2befbc2aa..2d7cba1c7 100644 --- a/etcdctl/ctlv3/command/alarm_command.go +++ b/etcdctl/ctlv3/command/alarm_command.go @@ -17,7 +17,7 @@ package command import ( "fmt" - v3 "github.com/coreos/etcd/clientv3" + v3 "go.etcd.io/etcd/clientv3" "github.com/spf13/cobra" ) diff --git a/etcdctl/ctlv3/command/auth_command.go b/etcdctl/ctlv3/command/auth_command.go index f9a909049..31137e18f 100644 --- a/etcdctl/ctlv3/command/auth_command.go +++ b/etcdctl/ctlv3/command/auth_command.go @@ -17,7 +17,7 @@ package command import ( "fmt" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" "github.com/spf13/cobra" ) diff --git a/etcdctl/ctlv3/command/check.go b/etcdctl/ctlv3/command/check.go index c15914117..859311536 100644 --- a/etcdctl/ctlv3/command/check.go +++ b/etcdctl/ctlv3/command/check.go @@ -25,8 +25,8 @@ import ( "sync" "time" - v3 "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/pkg/report" + v3 "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/pkg/report" "github.com/spf13/cobra" "golang.org/x/time/rate" diff --git a/etcdctl/ctlv3/command/compaction_command.go b/etcdctl/ctlv3/command/compaction_command.go index 59e8990fb..83b12b680 100644 --- a/etcdctl/ctlv3/command/compaction_command.go +++ b/etcdctl/ctlv3/command/compaction_command.go @@ -18,8 +18,8 @@ import ( "fmt" "strconv" - "github.com/coreos/etcd/clientv3" "github.com/spf13/cobra" + "go.etcd.io/etcd/clientv3" ) var compactPhysical bool diff --git a/etcdctl/ctlv3/command/defrag_command.go b/etcdctl/ctlv3/command/defrag_command.go index d393afa74..cf59b0640 100644 --- a/etcdctl/ctlv3/command/defrag_command.go +++ b/etcdctl/ctlv3/command/defrag_command.go @@ -20,7 +20,7 @@ import ( "path/filepath" "time" - "github.com/coreos/etcd/mvcc/backend" + "go.etcd.io/etcd/mvcc/backend" "github.com/spf13/cobra" ) diff --git a/etcdctl/ctlv3/command/del_command.go b/etcdctl/ctlv3/command/del_command.go index 00c93bf5b..082cccc30 100644 --- a/etcdctl/ctlv3/command/del_command.go +++ b/etcdctl/ctlv3/command/del_command.go @@ -17,7 +17,7 @@ package command import ( "fmt" - "github.com/coreos/etcd/clientv3" + "go.etcd.io/etcd/clientv3" "github.com/spf13/cobra" ) diff --git a/etcdctl/ctlv3/command/elect_command.go b/etcdctl/ctlv3/command/elect_command.go index ace4f1197..db05c12e8 100644 --- a/etcdctl/ctlv3/command/elect_command.go +++ b/etcdctl/ctlv3/command/elect_command.go @@ -21,8 +21,8 @@ import ( "os/signal" "syscall" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/concurrency" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/concurrency" "github.com/spf13/cobra" ) diff --git a/etcdctl/ctlv3/command/ep_command.go b/etcdctl/ctlv3/command/ep_command.go index a45e24053..58c2c7e96 100644 --- a/etcdctl/ctlv3/command/ep_command.go +++ b/etcdctl/ctlv3/command/ep_command.go @@ -20,9 +20,9 @@ import ( "sync" "time" - v3 "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - "github.com/coreos/etcd/pkg/flags" + v3 "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/pkg/flags" "github.com/spf13/cobra" ) diff --git a/etcdctl/ctlv3/command/error.go b/etcdctl/ctlv3/command/error.go index 314b07f05..220d50b6d 100644 --- a/etcdctl/ctlv3/command/error.go +++ b/etcdctl/ctlv3/command/error.go @@ -18,7 +18,7 @@ import ( "fmt" "os" - "github.com/coreos/etcd/client" + "go.etcd.io/etcd/client" ) const ( diff --git a/etcdctl/ctlv3/command/get_command.go b/etcdctl/ctlv3/command/get_command.go index 6de38c5ff..63566bc39 100644 --- a/etcdctl/ctlv3/command/get_command.go +++ b/etcdctl/ctlv3/command/get_command.go @@ -18,7 +18,7 @@ import ( "fmt" "strings" - "github.com/coreos/etcd/clientv3" + "go.etcd.io/etcd/clientv3" "github.com/spf13/cobra" ) diff --git a/etcdctl/ctlv3/command/global.go b/etcdctl/ctlv3/command/global.go index 2eada07cd..4400420c1 100644 --- a/etcdctl/ctlv3/command/global.go +++ b/etcdctl/ctlv3/command/global.go @@ -25,10 +25,10 @@ import ( "time" "github.com/bgentry/speakeasy" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/pkg/flags" - "github.com/coreos/etcd/pkg/srv" - "github.com/coreos/etcd/pkg/transport" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/pkg/flags" + "go.etcd.io/etcd/pkg/srv" + "go.etcd.io/etcd/pkg/transport" "github.com/spf13/cobra" "github.com/spf13/pflag" @@ -133,7 +133,7 @@ func clientConfigFromCmd(cmd *cobra.Command) *clientConfig { // WARNING logs contain important information like TLS misconfirugation, but spams // too many routine connection disconnects to turn on by default. // - // See https://github.com/coreos/etcd/pull/9623 for background + // See https://go.etcd.io/etcd/pull/9623 for background clientv3.SetLogger(grpclog.NewLoggerV2(ioutil.Discard, ioutil.Discard, os.Stderr)) } diff --git a/etcdctl/ctlv3/command/lease_command.go b/etcdctl/ctlv3/command/lease_command.go index ecfe3a6fb..f20c06ada 100644 --- a/etcdctl/ctlv3/command/lease_command.go +++ b/etcdctl/ctlv3/command/lease_command.go @@ -19,7 +19,7 @@ import ( "fmt" "strconv" - v3 "github.com/coreos/etcd/clientv3" + v3 "go.etcd.io/etcd/clientv3" "github.com/spf13/cobra" ) diff --git a/etcdctl/ctlv3/command/lock_command.go b/etcdctl/ctlv3/command/lock_command.go index 74ebac81e..6f58d61f6 100644 --- a/etcdctl/ctlv3/command/lock_command.go +++ b/etcdctl/ctlv3/command/lock_command.go @@ -23,8 +23,8 @@ import ( "os/signal" "syscall" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/concurrency" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/concurrency" "github.com/spf13/cobra" ) diff --git a/etcdctl/ctlv3/command/make_mirror_command.go b/etcdctl/ctlv3/command/make_mirror_command.go index 8afa479d4..1e3231616 100644 --- a/etcdctl/ctlv3/command/make_mirror_command.go +++ b/etcdctl/ctlv3/command/make_mirror_command.go @@ -22,10 +22,10 @@ import ( "sync/atomic" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/mirror" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - "github.com/coreos/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/mirror" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/mvcc/mvccpb" "github.com/spf13/cobra" ) diff --git a/etcdctl/ctlv3/command/migrate_command.go b/etcdctl/ctlv3/command/migrate_command.go index d609a6ad2..bef384fbf 100644 --- a/etcdctl/ctlv3/command/migrate_command.go +++ b/etcdctl/ctlv3/command/migrate_command.go @@ -24,22 +24,22 @@ import ( "path/filepath" "time" - "github.com/coreos/etcd/client" - "github.com/coreos/etcd/etcdserver" - "github.com/coreos/etcd/etcdserver/api" - "github.com/coreos/etcd/etcdserver/api/membership" - "github.com/coreos/etcd/etcdserver/api/snap" - "github.com/coreos/etcd/etcdserver/api/v2error" - "github.com/coreos/etcd/etcdserver/api/v2store" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/mvcc" - "github.com/coreos/etcd/mvcc/backend" - "github.com/coreos/etcd/mvcc/mvccpb" - "github.com/coreos/etcd/pkg/pbutil" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/wal" - "github.com/coreos/etcd/wal/walpb" + "go.etcd.io/etcd/client" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api" + "go.etcd.io/etcd/etcdserver/api/membership" + "go.etcd.io/etcd/etcdserver/api/snap" + "go.etcd.io/etcd/etcdserver/api/v2error" + "go.etcd.io/etcd/etcdserver/api/v2store" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/mvcc" + "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/pkg/pbutil" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/wal" + "go.etcd.io/etcd/wal/walpb" "github.com/gogo/protobuf/proto" "github.com/spf13/cobra" diff --git a/etcdctl/ctlv3/command/move_leader_command.go b/etcdctl/ctlv3/command/move_leader_command.go index 5fdecf95a..a28448fe4 100644 --- a/etcdctl/ctlv3/command/move_leader_command.go +++ b/etcdctl/ctlv3/command/move_leader_command.go @@ -18,7 +18,7 @@ import ( "fmt" "strconv" - "github.com/coreos/etcd/clientv3" + "go.etcd.io/etcd/clientv3" "github.com/spf13/cobra" ) diff --git a/etcdctl/ctlv3/command/printer.go b/etcdctl/ctlv3/command/printer.go index 1579f249a..cd87811e4 100644 --- a/etcdctl/ctlv3/command/printer.go +++ b/etcdctl/ctlv3/command/printer.go @@ -19,9 +19,9 @@ import ( "fmt" "strings" - v3 "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/snapshot" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + v3 "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/snapshot" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" "github.com/dustin/go-humanize" ) diff --git a/etcdctl/ctlv3/command/printer_fields.go b/etcdctl/ctlv3/command/printer_fields.go index c21440334..7f2d4e589 100644 --- a/etcdctl/ctlv3/command/printer_fields.go +++ b/etcdctl/ctlv3/command/printer_fields.go @@ -17,10 +17,10 @@ package command import ( "fmt" - v3 "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/snapshot" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - spb "github.com/coreos/etcd/mvcc/mvccpb" + v3 "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/snapshot" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + spb "go.etcd.io/etcd/mvcc/mvccpb" ) type fieldsPrinter struct{ printer } diff --git a/etcdctl/ctlv3/command/printer_json.go b/etcdctl/ctlv3/command/printer_json.go index a6e46c63a..95b2a7f4e 100644 --- a/etcdctl/ctlv3/command/printer_json.go +++ b/etcdctl/ctlv3/command/printer_json.go @@ -19,7 +19,7 @@ import ( "fmt" "os" - "github.com/coreos/etcd/clientv3/snapshot" + "go.etcd.io/etcd/clientv3/snapshot" ) type jsonPrinter struct{ printer } diff --git a/etcdctl/ctlv3/command/printer_protobuf.go b/etcdctl/ctlv3/command/printer_protobuf.go index c5109c5c2..909fffe58 100644 --- a/etcdctl/ctlv3/command/printer_protobuf.go +++ b/etcdctl/ctlv3/command/printer_protobuf.go @@ -18,9 +18,9 @@ import ( "fmt" "os" - v3 "github.com/coreos/etcd/clientv3" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - mvccpb "github.com/coreos/etcd/mvcc/mvccpb" + v3 "go.etcd.io/etcd/clientv3" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + mvccpb "go.etcd.io/etcd/mvcc/mvccpb" ) type pbPrinter struct{ printer } diff --git a/etcdctl/ctlv3/command/printer_simple.go b/etcdctl/ctlv3/command/printer_simple.go index 5b749cc59..93aa79412 100644 --- a/etcdctl/ctlv3/command/printer_simple.go +++ b/etcdctl/ctlv3/command/printer_simple.go @@ -19,10 +19,10 @@ import ( "os" "strings" - v3 "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/snapshot" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/types" + v3 "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/snapshot" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/types" ) type simplePrinter struct { diff --git a/etcdctl/ctlv3/command/printer_table.go b/etcdctl/ctlv3/command/printer_table.go index bb7584f2a..4a84b7472 100644 --- a/etcdctl/ctlv3/command/printer_table.go +++ b/etcdctl/ctlv3/command/printer_table.go @@ -17,8 +17,8 @@ package command import ( "os" - v3 "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/snapshot" + v3 "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/snapshot" "github.com/olekukonko/tablewriter" ) diff --git a/etcdctl/ctlv3/command/put_command.go b/etcdctl/ctlv3/command/put_command.go index 21db69bda..09ba1d868 100644 --- a/etcdctl/ctlv3/command/put_command.go +++ b/etcdctl/ctlv3/command/put_command.go @@ -19,7 +19,7 @@ import ( "os" "strconv" - "github.com/coreos/etcd/clientv3" + "go.etcd.io/etcd/clientv3" "github.com/spf13/cobra" ) diff --git a/etcdctl/ctlv3/command/role_command.go b/etcdctl/ctlv3/command/role_command.go index 39c52d313..5f4a4a841 100644 --- a/etcdctl/ctlv3/command/role_command.go +++ b/etcdctl/ctlv3/command/role_command.go @@ -18,7 +18,7 @@ import ( "context" "fmt" - "github.com/coreos/etcd/clientv3" + "go.etcd.io/etcd/clientv3" "github.com/spf13/cobra" ) diff --git a/etcdctl/ctlv3/command/snapshot_command.go b/etcdctl/ctlv3/command/snapshot_command.go index e83bfcf73..175ada489 100644 --- a/etcdctl/ctlv3/command/snapshot_command.go +++ b/etcdctl/ctlv3/command/snapshot_command.go @@ -20,7 +20,7 @@ import ( "path/filepath" "strings" - "github.com/coreos/etcd/clientv3/snapshot" + "go.etcd.io/etcd/clientv3/snapshot" "github.com/spf13/cobra" "go.uber.org/zap" diff --git a/etcdctl/ctlv3/command/txn_command.go b/etcdctl/ctlv3/command/txn_command.go index e18a7e9bd..dcc504e58 100644 --- a/etcdctl/ctlv3/command/txn_command.go +++ b/etcdctl/ctlv3/command/txn_command.go @@ -22,8 +22,8 @@ import ( "strconv" "strings" - "github.com/coreos/etcd/clientv3" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/clientv3" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" "github.com/spf13/cobra" ) diff --git a/etcdctl/ctlv3/command/util.go b/etcdctl/ctlv3/command/util.go index 92256bd59..f536b2e5f 100644 --- a/etcdctl/ctlv3/command/util.go +++ b/etcdctl/ctlv3/command/util.go @@ -25,8 +25,8 @@ import ( "strings" "time" - v3 "github.com/coreos/etcd/clientv3" - pb "github.com/coreos/etcd/mvcc/mvccpb" + v3 "go.etcd.io/etcd/clientv3" + pb "go.etcd.io/etcd/mvcc/mvccpb" "github.com/spf13/cobra" ) diff --git a/etcdctl/ctlv3/command/version_command.go b/etcdctl/ctlv3/command/version_command.go index 89d82a39b..77c21fecb 100644 --- a/etcdctl/ctlv3/command/version_command.go +++ b/etcdctl/ctlv3/command/version_command.go @@ -17,7 +17,7 @@ package command import ( "fmt" - "github.com/coreos/etcd/version" + "go.etcd.io/etcd/version" "github.com/spf13/cobra" ) diff --git a/etcdctl/ctlv3/command/watch_command.go b/etcdctl/ctlv3/command/watch_command.go index 240f46b0f..cadfa0a80 100644 --- a/etcdctl/ctlv3/command/watch_command.go +++ b/etcdctl/ctlv3/command/watch_command.go @@ -23,7 +23,7 @@ import ( "os/exec" "strings" - "github.com/coreos/etcd/clientv3" + "go.etcd.io/etcd/clientv3" "github.com/spf13/cobra" ) diff --git a/etcdctl/ctlv3/ctl.go b/etcdctl/ctlv3/ctl.go index 4a9233b79..bf64f8b9e 100644 --- a/etcdctl/ctlv3/ctl.go +++ b/etcdctl/ctlv3/ctl.go @@ -18,7 +18,7 @@ package ctlv3 import ( "time" - "github.com/coreos/etcd/etcdctl/ctlv3/command" + "go.etcd.io/etcd/etcdctl/ctlv3/command" "github.com/spf13/cobra" ) diff --git a/etcdctl/ctlv3/ctl_cov.go b/etcdctl/ctlv3/ctl_cov.go index 6908113a7..b5b0c42c3 100644 --- a/etcdctl/ctlv3/ctl_cov.go +++ b/etcdctl/ctlv3/ctl_cov.go @@ -20,7 +20,7 @@ import ( "os" "strings" - "github.com/coreos/etcd/etcdctl/ctlv3/command" + "go.etcd.io/etcd/etcdctl/ctlv3/command" ) func Start() { diff --git a/etcdctl/ctlv3/ctl_nocov.go b/etcdctl/ctlv3/ctl_nocov.go index 52751feec..e9567a398 100644 --- a/etcdctl/ctlv3/ctl_nocov.go +++ b/etcdctl/ctlv3/ctl_nocov.go @@ -16,7 +16,7 @@ package ctlv3 -import "github.com/coreos/etcd/etcdctl/ctlv3/command" +import "go.etcd.io/etcd/etcdctl/ctlv3/command" func Start() { rootCmd.SetUsageFunc(usageFunc) diff --git a/etcdctl/ctlv3/help.go b/etcdctl/ctlv3/help.go index c91fd71de..3b9691150 100644 --- a/etcdctl/ctlv3/help.go +++ b/etcdctl/ctlv3/help.go @@ -25,7 +25,7 @@ import ( "text/tabwriter" "text/template" - "github.com/coreos/etcd/version" + "go.etcd.io/etcd/version" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/etcdctl/main.go b/etcdctl/main.go index bba065fbe..8bb4fc096 100644 --- a/etcdctl/main.go +++ b/etcdctl/main.go @@ -19,8 +19,8 @@ import ( "fmt" "os" - "github.com/coreos/etcd/etcdctl/ctlv2" - "github.com/coreos/etcd/etcdctl/ctlv3" + "go.etcd.io/etcd/etcdctl/ctlv2" + "go.etcd.io/etcd/etcdctl/ctlv3" ) const ( diff --git a/etcdmain/config.go b/etcdmain/config.go index dcbbbc994..6d86e5710 100644 --- a/etcdmain/config.go +++ b/etcdmain/config.go @@ -27,10 +27,10 @@ import ( "sort" "strings" - "github.com/coreos/etcd/embed" - "github.com/coreos/etcd/pkg/flags" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/version" + "go.etcd.io/etcd/embed" + "go.etcd.io/etcd/pkg/flags" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/version" "github.com/ghodss/yaml" "go.uber.org/zap" diff --git a/etcdmain/config_test.go b/etcdmain/config_test.go index 56d3f60dc..ce0e4786f 100644 --- a/etcdmain/config_test.go +++ b/etcdmain/config_test.go @@ -23,7 +23,7 @@ import ( "strings" "testing" - "github.com/coreos/etcd/embed" + "go.etcd.io/etcd/embed" "github.com/ghodss/yaml" ) diff --git a/etcdmain/etcd.go b/etcdmain/etcd.go index a5edc1b5c..0a2adee8e 100644 --- a/etcdmain/etcd.go +++ b/etcdmain/etcd.go @@ -26,17 +26,17 @@ import ( "strings" "time" - "github.com/coreos/etcd/embed" - "github.com/coreos/etcd/etcdserver" - "github.com/coreos/etcd/etcdserver/api/etcdhttp" - "github.com/coreos/etcd/etcdserver/api/v2discovery" - "github.com/coreos/etcd/pkg/fileutil" - pkgioutil "github.com/coreos/etcd/pkg/ioutil" - "github.com/coreos/etcd/pkg/osutil" - "github.com/coreos/etcd/pkg/transport" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/proxy/httpproxy" - "github.com/coreos/etcd/version" + "go.etcd.io/etcd/embed" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api/etcdhttp" + "go.etcd.io/etcd/etcdserver/api/v2discovery" + "go.etcd.io/etcd/pkg/fileutil" + pkgioutil "go.etcd.io/etcd/pkg/ioutil" + "go.etcd.io/etcd/pkg/osutil" + "go.etcd.io/etcd/pkg/transport" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/proxy/httpproxy" + "go.etcd.io/etcd/version" "github.com/coreos/pkg/capnslog" "go.uber.org/zap" @@ -45,7 +45,7 @@ import ( type dirType string -var plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "etcdmain") +var plog = capnslog.NewPackageLogger("go.etcd.io/etcd", "etcdmain") var ( dirMember = dirType("member") diff --git a/etcdmain/gateway.go b/etcdmain/gateway.go index e107476ff..201878081 100644 --- a/etcdmain/gateway.go +++ b/etcdmain/gateway.go @@ -21,7 +21,7 @@ import ( "os" "time" - "github.com/coreos/etcd/proxy/tcpproxy" + "go.etcd.io/etcd/proxy/tcpproxy" "github.com/spf13/cobra" "go.uber.org/zap" diff --git a/etcdmain/grpc_proxy.go b/etcdmain/grpc_proxy.go index bc0a5dbf9..588094bfe 100644 --- a/etcdmain/grpc_proxy.go +++ b/etcdmain/grpc_proxy.go @@ -27,18 +27,18 @@ import ( "path/filepath" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/leasing" - "github.com/coreos/etcd/clientv3/namespace" - "github.com/coreos/etcd/clientv3/ordering" - "github.com/coreos/etcd/etcdserver/api/etcdhttp" - "github.com/coreos/etcd/etcdserver/api/v3election/v3electionpb" - "github.com/coreos/etcd/etcdserver/api/v3lock/v3lockpb" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/debugutil" - "github.com/coreos/etcd/pkg/logutil" - "github.com/coreos/etcd/pkg/transport" - "github.com/coreos/etcd/proxy/grpcproxy" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/leasing" + "go.etcd.io/etcd/clientv3/namespace" + "go.etcd.io/etcd/clientv3/ordering" + "go.etcd.io/etcd/etcdserver/api/etcdhttp" + "go.etcd.io/etcd/etcdserver/api/v3election/v3electionpb" + "go.etcd.io/etcd/etcdserver/api/v3lock/v3lockpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/debugutil" + "go.etcd.io/etcd/pkg/logutil" + "go.etcd.io/etcd/pkg/transport" + "go.etcd.io/etcd/proxy/grpcproxy" grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" "github.com/soheilhy/cmux" diff --git a/etcdmain/help.go b/etcdmain/help.go index 3c4cb3fdc..6ce1f06e2 100644 --- a/etcdmain/help.go +++ b/etcdmain/help.go @@ -18,7 +18,7 @@ import ( "fmt" "strconv" - "github.com/coreos/etcd/embed" + "go.etcd.io/etcd/embed" "golang.org/x/crypto/bcrypt" ) diff --git a/etcdmain/util.go b/etcdmain/util.go index c8872ad46..15c686ab6 100644 --- a/etcdmain/util.go +++ b/etcdmain/util.go @@ -18,8 +18,8 @@ import ( "fmt" "os" - "github.com/coreos/etcd/pkg/srv" - "github.com/coreos/etcd/pkg/transport" + "go.etcd.io/etcd/pkg/srv" + "go.etcd.io/etcd/pkg/transport" "go.uber.org/zap" ) diff --git a/functional/agent/handler.go b/functional/agent/handler.go index 525c21006..f1000624b 100644 --- a/functional/agent/handler.go +++ b/functional/agent/handler.go @@ -25,10 +25,10 @@ import ( "syscall" "time" - "github.com/coreos/etcd/embed" - "github.com/coreos/etcd/functional/rpcpb" - "github.com/coreos/etcd/pkg/fileutil" - "github.com/coreos/etcd/pkg/proxy" + "go.etcd.io/etcd/embed" + "go.etcd.io/etcd/functional/rpcpb" + "go.etcd.io/etcd/pkg/fileutil" + "go.etcd.io/etcd/pkg/proxy" "go.uber.org/zap" ) diff --git a/functional/agent/server.go b/functional/agent/server.go index 7f8ec98b5..8bba63792 100644 --- a/functional/agent/server.go +++ b/functional/agent/server.go @@ -21,9 +21,9 @@ import ( "os/exec" "strings" - "github.com/coreos/etcd/embed" - "github.com/coreos/etcd/functional/rpcpb" - "github.com/coreos/etcd/pkg/proxy" + "go.etcd.io/etcd/embed" + "go.etcd.io/etcd/functional/rpcpb" + "go.etcd.io/etcd/pkg/proxy" "go.uber.org/zap" "google.golang.org/grpc" diff --git a/functional/agent/utils.go b/functional/agent/utils.go index 67a837ff3..c0dd92fc5 100644 --- a/functional/agent/utils.go +++ b/functional/agent/utils.go @@ -23,7 +23,7 @@ import ( "strconv" "time" - "github.com/coreos/etcd/pkg/fileutil" + "go.etcd.io/etcd/pkg/fileutil" ) // TODO: support separate WAL directory diff --git a/functional/cmd/etcd-agent/main.go b/functional/cmd/etcd-agent/main.go index e3f217693..87ab6ee7d 100644 --- a/functional/cmd/etcd-agent/main.go +++ b/functional/cmd/etcd-agent/main.go @@ -18,7 +18,7 @@ package main import ( "flag" - "github.com/coreos/etcd/functional/agent" + "go.etcd.io/etcd/functional/agent" "go.uber.org/zap" ) diff --git a/functional/cmd/etcd-proxy/main.go b/functional/cmd/etcd-proxy/main.go index 80074d7a4..56ca78eef 100644 --- a/functional/cmd/etcd-proxy/main.go +++ b/functional/cmd/etcd-proxy/main.go @@ -28,7 +28,7 @@ import ( "syscall" "time" - "github.com/coreos/etcd/pkg/proxy" + "go.etcd.io/etcd/pkg/proxy" "go.uber.org/zap" ) diff --git a/functional/cmd/etcd-runner/main.go b/functional/cmd/etcd-runner/main.go index 6e3cb16ce..f9e82766d 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 "github.com/coreos/etcd/functional/runner" +import "go.etcd.io/etcd/functional/runner" func main() { runner.Start() diff --git a/functional/cmd/etcd-tester/main.go b/functional/cmd/etcd-tester/main.go index a0e6eda68..fdf391fe8 100644 --- a/functional/cmd/etcd-tester/main.go +++ b/functional/cmd/etcd-tester/main.go @@ -18,7 +18,7 @@ package main import ( "flag" - "github.com/coreos/etcd/functional/tester" + "go.etcd.io/etcd/functional/tester" "go.uber.org/zap" ) diff --git a/functional/rpcpb/etcd_config.go b/functional/rpcpb/etcd_config.go index bc3f8b34b..feec424a8 100644 --- a/functional/rpcpb/etcd_config.go +++ b/functional/rpcpb/etcd_config.go @@ -19,9 +19,9 @@ import ( "reflect" "strings" - "github.com/coreos/etcd/embed" - "github.com/coreos/etcd/pkg/transport" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/embed" + "go.etcd.io/etcd/pkg/transport" + "go.etcd.io/etcd/pkg/types" ) var etcdFields = []string{ diff --git a/functional/rpcpb/etcd_config_test.go b/functional/rpcpb/etcd_config_test.go index 480098e41..a96b81f34 100644 --- a/functional/rpcpb/etcd_config_test.go +++ b/functional/rpcpb/etcd_config_test.go @@ -18,8 +18,8 @@ import ( "reflect" "testing" - "github.com/coreos/etcd/embed" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/embed" + "go.etcd.io/etcd/pkg/types" ) func TestEtcd(t *testing.T) { diff --git a/functional/rpcpb/member.go b/functional/rpcpb/member.go index 5d0ad32fc..5b400bdc9 100644 --- a/functional/rpcpb/member.go +++ b/functional/rpcpb/member.go @@ -22,10 +22,10 @@ import ( "os" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/snapshot" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/transport" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/snapshot" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/transport" "github.com/dustin/go-humanize" "go.uber.org/zap" diff --git a/functional/runner/election_command.go b/functional/runner/election_command.go index b2bc99a16..0ced37546 100644 --- a/functional/runner/election_command.go +++ b/functional/runner/election_command.go @@ -19,7 +19,7 @@ import ( "errors" "fmt" - "github.com/coreos/etcd/clientv3/concurrency" + "go.etcd.io/etcd/clientv3/concurrency" "github.com/spf13/cobra" ) diff --git a/functional/runner/error.go b/functional/runner/error.go index 335e85cb7..403990539 100644 --- a/functional/runner/error.go +++ b/functional/runner/error.go @@ -18,7 +18,7 @@ import ( "fmt" "os" - "github.com/coreos/etcd/client" + "go.etcd.io/etcd/client" ) const ( diff --git a/functional/runner/global.go b/functional/runner/global.go index 13f1906c3..f2f0dacea 100644 --- a/functional/runner/global.go +++ b/functional/runner/global.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/coreos/etcd/clientv3" + "go.etcd.io/etcd/clientv3" "github.com/spf13/cobra" "golang.org/x/time/rate" diff --git a/functional/runner/help.go b/functional/runner/help.go index 63e9815ab..394cec840 100644 --- a/functional/runner/help.go +++ b/functional/runner/help.go @@ -25,7 +25,7 @@ import ( "text/tabwriter" "text/template" - "github.com/coreos/etcd/version" + "go.etcd.io/etcd/version" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/functional/runner/lease_renewer_command.go b/functional/runner/lease_renewer_command.go index a57c53f27..78a65729d 100644 --- a/functional/runner/lease_renewer_command.go +++ b/functional/runner/lease_renewer_command.go @@ -21,7 +21,7 @@ import ( "log" "time" - "github.com/coreos/etcd/clientv3" + "go.etcd.io/etcd/clientv3" "github.com/spf13/cobra" "google.golang.org/grpc/codes" diff --git a/functional/runner/lock_racer_command.go b/functional/runner/lock_racer_command.go index 18b10e403..cb98668cc 100644 --- a/functional/runner/lock_racer_command.go +++ b/functional/runner/lock_racer_command.go @@ -20,7 +20,7 @@ import ( "fmt" "sync" - "github.com/coreos/etcd/clientv3/concurrency" + "go.etcd.io/etcd/clientv3/concurrency" "github.com/spf13/cobra" ) diff --git a/functional/runner/watch_command.go b/functional/runner/watch_command.go index 646092ad0..cd3f202af 100644 --- a/functional/runner/watch_command.go +++ b/functional/runner/watch_command.go @@ -22,8 +22,8 @@ import ( "sync" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/pkg/stringutil" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/pkg/stringutil" "github.com/spf13/cobra" "golang.org/x/time/rate" diff --git a/functional/tester/case.go b/functional/tester/case.go index d584541f7..ce3e00f12 100644 --- a/functional/tester/case.go +++ b/functional/tester/case.go @@ -19,7 +19,7 @@ import ( "math/rand" "time" - "github.com/coreos/etcd/functional/rpcpb" + "go.etcd.io/etcd/functional/rpcpb" "go.uber.org/zap" ) diff --git a/functional/tester/case_external.go b/functional/tester/case_external.go index 79d2a3717..8b22197ad 100644 --- a/functional/tester/case_external.go +++ b/functional/tester/case_external.go @@ -18,7 +18,7 @@ import ( "fmt" "os/exec" - "github.com/coreos/etcd/functional/rpcpb" + "go.etcd.io/etcd/functional/rpcpb" ) type caseExternal struct { diff --git a/functional/tester/case_failpoints.go b/functional/tester/case_failpoints.go index 4d26c8a8d..084630840 100644 --- a/functional/tester/case_failpoints.go +++ b/functional/tester/case_failpoints.go @@ -21,7 +21,7 @@ import ( "strings" "sync" - "github.com/coreos/etcd/functional/rpcpb" + "go.etcd.io/etcd/functional/rpcpb" ) type failpointStats struct { diff --git a/functional/tester/case_network_blackhole.go b/functional/tester/case_network_blackhole.go index 0d496eade..feee3b27a 100644 --- a/functional/tester/case_network_blackhole.go +++ b/functional/tester/case_network_blackhole.go @@ -14,7 +14,7 @@ package tester -import "github.com/coreos/etcd/functional/rpcpb" +import "go.etcd.io/etcd/functional/rpcpb" func inject_BLACKHOLE_PEER_PORT_TX_RX(clus *Cluster, idx int) error { return clus.sendOp(idx, rpcpb.Operation_BLACKHOLE_PEER_PORT_TX_RX) diff --git a/functional/tester/case_network_delay.go b/functional/tester/case_network_delay.go index 39a471702..ec4e9ccca 100644 --- a/functional/tester/case_network_delay.go +++ b/functional/tester/case_network_delay.go @@ -17,7 +17,7 @@ package tester import ( "time" - "github.com/coreos/etcd/functional/rpcpb" + "go.etcd.io/etcd/functional/rpcpb" "go.uber.org/zap" ) @@ -26,7 +26,7 @@ const ( // Wait more when it recovers from slow network, because network layer // needs extra time to propagate traffic control (tc command) change. // Otherwise, we get different hash values from the previous revision. - // For more detail, please see https://github.com/coreos/etcd/issues/5121. + // For more detail, please see https://go.etcd.io/etcd/issues/5121. waitRecover = 5 * time.Second ) diff --git a/functional/tester/case_no_fail.go b/functional/tester/case_no_fail.go index e85bef93c..f78fee85a 100644 --- a/functional/tester/case_no_fail.go +++ b/functional/tester/case_no_fail.go @@ -17,7 +17,7 @@ package tester import ( "time" - "github.com/coreos/etcd/functional/rpcpb" + "go.etcd.io/etcd/functional/rpcpb" "go.uber.org/zap" ) diff --git a/functional/tester/case_sigquit_remove.go b/functional/tester/case_sigquit_remove.go index 13fe68f4e..6c3a79515 100644 --- a/functional/tester/case_sigquit_remove.go +++ b/functional/tester/case_sigquit_remove.go @@ -21,8 +21,8 @@ import ( "strings" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/functional/rpcpb" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/functional/rpcpb" "go.uber.org/zap" ) diff --git a/functional/tester/case_sigquit_remove_quorum.go b/functional/tester/case_sigquit_remove_quorum.go index 9653de10d..5fc78cdd3 100644 --- a/functional/tester/case_sigquit_remove_quorum.go +++ b/functional/tester/case_sigquit_remove_quorum.go @@ -20,8 +20,8 @@ import ( "strings" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/functional/rpcpb" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/functional/rpcpb" "go.uber.org/zap" ) diff --git a/functional/tester/case_sigterm.go b/functional/tester/case_sigterm.go index f5d472afc..a8c99bc85 100644 --- a/functional/tester/case_sigterm.go +++ b/functional/tester/case_sigterm.go @@ -14,7 +14,7 @@ package tester -import "github.com/coreos/etcd/functional/rpcpb" +import "go.etcd.io/etcd/functional/rpcpb" func inject_SIGTERM_ETCD(clus *Cluster, idx int) error { return clus.sendOp(idx, rpcpb.Operation_SIGTERM_ETCD) diff --git a/functional/tester/checker.go b/functional/tester/checker.go index 48e98cb0d..7515bc93a 100644 --- a/functional/tester/checker.go +++ b/functional/tester/checker.go @@ -14,7 +14,7 @@ package tester -import "github.com/coreos/etcd/functional/rpcpb" +import "go.etcd.io/etcd/functional/rpcpb" // Checker checks cluster consistency. type Checker interface { diff --git a/functional/tester/checker_kv_hash.go b/functional/tester/checker_kv_hash.go index 586ad89bd..698367d25 100644 --- a/functional/tester/checker_kv_hash.go +++ b/functional/tester/checker_kv_hash.go @@ -18,7 +18,7 @@ import ( "fmt" "time" - "github.com/coreos/etcd/functional/rpcpb" + "go.etcd.io/etcd/functional/rpcpb" "go.uber.org/zap" ) diff --git a/functional/tester/checker_lease_expire.go b/functional/tester/checker_lease_expire.go index a89742128..9a19e327b 100644 --- a/functional/tester/checker_lease_expire.go +++ b/functional/tester/checker_lease_expire.go @@ -19,9 +19,9 @@ import ( "fmt" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - "github.com/coreos/etcd/functional/rpcpb" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/functional/rpcpb" "go.uber.org/zap" "google.golang.org/grpc" diff --git a/functional/tester/checker_no_check.go b/functional/tester/checker_no_check.go index d36702319..aa0a4dcb8 100644 --- a/functional/tester/checker_no_check.go +++ b/functional/tester/checker_no_check.go @@ -14,7 +14,7 @@ package tester -import "github.com/coreos/etcd/functional/rpcpb" +import "go.etcd.io/etcd/functional/rpcpb" type noCheck struct{} diff --git a/functional/tester/checker_runner.go b/functional/tester/checker_runner.go index a5b7ff4d1..ea966540c 100644 --- a/functional/tester/checker_runner.go +++ b/functional/tester/checker_runner.go @@ -14,7 +14,7 @@ package tester -import "github.com/coreos/etcd/functional/rpcpb" +import "go.etcd.io/etcd/functional/rpcpb" type runnerChecker struct { ctype rpcpb.Checker diff --git a/functional/tester/cluster.go b/functional/tester/cluster.go index f198be943..fe52e355d 100644 --- a/functional/tester/cluster.go +++ b/functional/tester/cluster.go @@ -29,9 +29,9 @@ import ( "sync" "time" - "github.com/coreos/etcd/functional/rpcpb" - "github.com/coreos/etcd/pkg/debugutil" - "github.com/coreos/etcd/pkg/fileutil" + "go.etcd.io/etcd/functional/rpcpb" + "go.etcd.io/etcd/pkg/debugutil" + "go.etcd.io/etcd/pkg/fileutil" "github.com/prometheus/client_golang/prometheus/promhttp" "go.uber.org/zap" @@ -593,7 +593,7 @@ func (clus *Cluster) WaitHealth() error { // wait 60s to check cluster health. // TODO: set it to a reasonable value. It is set that high because // follower may use long time to catch up the leader when reboot under - // reasonable workload (https://github.com/coreos/etcd/issues/2698) + // reasonable workload (https://go.etcd.io/etcd/issues/2698) for i := 0; i < 60; i++ { for _, m := range clus.Members { if err = m.WriteHealthKey(); err != nil { diff --git a/functional/tester/cluster_read_config.go b/functional/tester/cluster_read_config.go index 186278b22..4ce9d076e 100644 --- a/functional/tester/cluster_read_config.go +++ b/functional/tester/cluster_read_config.go @@ -22,7 +22,7 @@ import ( "path/filepath" "strings" - "github.com/coreos/etcd/functional/rpcpb" + "go.etcd.io/etcd/functional/rpcpb" "go.uber.org/zap" yaml "gopkg.in/yaml.v2" diff --git a/functional/tester/cluster_run.go b/functional/tester/cluster_run.go index 6dd002106..f4091e0d8 100644 --- a/functional/tester/cluster_run.go +++ b/functional/tester/cluster_run.go @@ -19,8 +19,8 @@ import ( "os" "time" - "github.com/coreos/etcd/functional/rpcpb" - "github.com/coreos/etcd/pkg/fileutil" + "go.etcd.io/etcd/functional/rpcpb" + "go.etcd.io/etcd/pkg/fileutil" "go.uber.org/zap" ) diff --git a/functional/tester/cluster_test.go b/functional/tester/cluster_test.go index 5d0a66ed0..7c7b25f2a 100644 --- a/functional/tester/cluster_test.go +++ b/functional/tester/cluster_test.go @@ -19,7 +19,7 @@ import ( "sort" "testing" - "github.com/coreos/etcd/functional/rpcpb" + "go.etcd.io/etcd/functional/rpcpb" "go.uber.org/zap" ) diff --git a/functional/tester/stresser.go b/functional/tester/stresser.go index 5f4fdea34..9a65eaa8b 100644 --- a/functional/tester/stresser.go +++ b/functional/tester/stresser.go @@ -18,7 +18,7 @@ import ( "fmt" "time" - "github.com/coreos/etcd/functional/rpcpb" + "go.etcd.io/etcd/functional/rpcpb" "go.uber.org/zap" ) diff --git a/functional/tester/stresser_key.go b/functional/tester/stresser_key.go index b3e46cc0e..7feec4637 100644 --- a/functional/tester/stresser_key.go +++ b/functional/tester/stresser_key.go @@ -23,11 +23,11 @@ import ( "sync/atomic" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - "github.com/coreos/etcd/functional/rpcpb" - "github.com/coreos/etcd/raft" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/functional/rpcpb" + "go.etcd.io/etcd/raft" "go.uber.org/zap" "golang.org/x/time/rate" diff --git a/functional/tester/stresser_lease.go b/functional/tester/stresser_lease.go index 673634e10..e54d9f5f1 100644 --- a/functional/tester/stresser_lease.go +++ b/functional/tester/stresser_lease.go @@ -22,9 +22,9 @@ import ( "sync/atomic" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - "github.com/coreos/etcd/functional/rpcpb" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/functional/rpcpb" "go.uber.org/zap" "golang.org/x/time/rate" diff --git a/functional/tester/stresser_runner.go b/functional/tester/stresser_runner.go index efcdfb6a7..e8e2bd1f8 100644 --- a/functional/tester/stresser_runner.go +++ b/functional/tester/stresser_runner.go @@ -20,7 +20,7 @@ import ( "os/exec" "syscall" - "github.com/coreos/etcd/functional/rpcpb" + "go.etcd.io/etcd/functional/rpcpb" "go.uber.org/zap" "golang.org/x/time/rate" diff --git a/integration/bridge.go b/integration/bridge.go index a61c1b4cc..483ee5829 100644 --- a/integration/bridge.go +++ b/integration/bridge.go @@ -21,7 +21,7 @@ import ( "net" "sync" - "github.com/coreos/etcd/pkg/transport" + "go.etcd.io/etcd/pkg/transport" ) // bridge creates a unix socket bridge to another unix socket, making it possible diff --git a/integration/cluster.go b/integration/cluster.go index 3d842b9cd..c1149de85 100644 --- a/integration/cluster.go +++ b/integration/cluster.go @@ -33,24 +33,24 @@ import ( "testing" "time" - "github.com/coreos/etcd/client" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/embed" - "github.com/coreos/etcd/etcdserver" - "github.com/coreos/etcd/etcdserver/api/etcdhttp" - "github.com/coreos/etcd/etcdserver/api/rafthttp" - "github.com/coreos/etcd/etcdserver/api/v2http" - "github.com/coreos/etcd/etcdserver/api/v3client" - "github.com/coreos/etcd/etcdserver/api/v3election" - epb "github.com/coreos/etcd/etcdserver/api/v3election/v3electionpb" - "github.com/coreos/etcd/etcdserver/api/v3lock" - lockpb "github.com/coreos/etcd/etcdserver/api/v3lock/v3lockpb" - "github.com/coreos/etcd/etcdserver/api/v3rpc" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/testutil" - "github.com/coreos/etcd/pkg/tlsutil" - "github.com/coreos/etcd/pkg/transport" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/client" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/embed" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api/etcdhttp" + "go.etcd.io/etcd/etcdserver/api/rafthttp" + "go.etcd.io/etcd/etcdserver/api/v2http" + "go.etcd.io/etcd/etcdserver/api/v3client" + "go.etcd.io/etcd/etcdserver/api/v3election" + epb "go.etcd.io/etcd/etcdserver/api/v3election/v3electionpb" + "go.etcd.io/etcd/etcdserver/api/v3lock" + lockpb "go.etcd.io/etcd/etcdserver/api/v3lock/v3lockpb" + "go.etcd.io/etcd/etcdserver/api/v3rpc" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/tlsutil" + "go.etcd.io/etcd/pkg/transport" + "go.etcd.io/etcd/pkg/types" "github.com/soheilhy/cmux" "go.uber.org/zap" diff --git a/integration/cluster_direct.go b/integration/cluster_direct.go index ff97e6146..8dd4d0370 100644 --- a/integration/cluster_direct.go +++ b/integration/cluster_direct.go @@ -17,10 +17,10 @@ package integration import ( - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver/api/v3election/v3electionpb" - "github.com/coreos/etcd/etcdserver/api/v3lock/v3lockpb" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver/api/v3election/v3electionpb" + "go.etcd.io/etcd/etcdserver/api/v3lock/v3lockpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" ) func toGRPC(c *clientv3.Client) grpcAPI { diff --git a/integration/cluster_proxy.go b/integration/cluster_proxy.go index 1e8d8b572..055a73883 100644 --- a/integration/cluster_proxy.go +++ b/integration/cluster_proxy.go @@ -19,10 +19,10 @@ package integration import ( "sync" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/namespace" - "github.com/coreos/etcd/proxy/grpcproxy" - "github.com/coreos/etcd/proxy/grpcproxy/adapter" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/namespace" + "go.etcd.io/etcd/proxy/grpcproxy" + "go.etcd.io/etcd/proxy/grpcproxy/adapter" ) var ( diff --git a/integration/cluster_test.go b/integration/cluster_test.go index 2e68c3286..113e2262d 100644 --- a/integration/cluster_test.go +++ b/integration/cluster_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" - "github.com/coreos/etcd/client" - "github.com/coreos/etcd/etcdserver" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/client" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/pkg/testutil" ) func init() { @@ -450,7 +450,7 @@ func TestRejectUnhealthyRemove(t *testing.T) { // TestRestartRemoved ensures that restarting removed member must exit // if 'initial-cluster-state' is set 'new' and old data directory still exists -// (see https://github.com/coreos/etcd/issues/7512 for more). +// (see https://go.etcd.io/etcd/issues/7512 for more). func TestRestartRemoved(t *testing.T) { defer testutil.AfterTest(t) diff --git a/integration/embed_test.go b/integration/embed_test.go index 27c56303d..c95d78d35 100644 --- a/integration/embed_test.go +++ b/integration/embed_test.go @@ -28,8 +28,8 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/embed" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/embed" ) func TestEmbedEtcd(t *testing.T) { diff --git a/integration/logger_test.go b/integration/logger_test.go index 48da6e8bd..f36664ec7 100644 --- a/integration/logger_test.go +++ b/integration/logger_test.go @@ -17,7 +17,7 @@ package integration import ( "io/ioutil" - "github.com/coreos/etcd/clientv3" + "go.etcd.io/etcd/clientv3" "google.golang.org/grpc/grpclog" ) diff --git a/integration/main_test.go b/integration/main_test.go index 2913ce511..c7362dde4 100644 --- a/integration/main_test.go +++ b/integration/main_test.go @@ -8,7 +8,7 @@ import ( "os" "testing" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/testutil" ) func TestMain(m *testing.M) { diff --git a/integration/member_test.go b/integration/member_test.go index 97c84bb13..87a70dda0 100644 --- a/integration/member_test.go +++ b/integration/member_test.go @@ -22,8 +22,8 @@ import ( "reflect" "testing" - "github.com/coreos/etcd/client" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/client" + "go.etcd.io/etcd/pkg/testutil" ) func TestPauseMember(t *testing.T) { diff --git a/integration/metrics_test.go b/integration/metrics_test.go index 087e6db45..70dcf7b03 100644 --- a/integration/metrics_test.go +++ b/integration/metrics_test.go @@ -20,10 +20,10 @@ import ( "testing" "time" - "github.com/coreos/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/testutil" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/testutil" ) // 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 db542943d..e815d6842 100644 --- a/integration/network_partition_test.go +++ b/integration/network_partition_test.go @@ -19,7 +19,7 @@ import ( "testing" "time" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/testutil" ) func TestNetworkPartition5MembersLeaderInMinority(t *testing.T) { diff --git a/integration/util_test.go b/integration/util_test.go index 188941980..616988e5e 100644 --- a/integration/util_test.go +++ b/integration/util_test.go @@ -19,7 +19,7 @@ import ( "os" "path/filepath" - "github.com/coreos/etcd/pkg/transport" + "go.etcd.io/etcd/pkg/transport" ) // copyTLSFiles clones certs files to dst directory. diff --git a/integration/v2_http_kv_test.go b/integration/v2_http_kv_test.go index 4b8444479..c42e5a873 100644 --- a/integration/v2_http_kv_test.go +++ b/integration/v2_http_kv_test.go @@ -26,8 +26,8 @@ import ( "testing" "time" - "github.com/coreos/etcd/pkg/testutil" - "github.com/coreos/etcd/pkg/transport" + "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/transport" ) func TestV2Set(t *testing.T) { diff --git a/integration/v3_alarm_test.go b/integration/v3_alarm_test.go index e66cf0bab..0763c9b02 100644 --- a/integration/v3_alarm_test.go +++ b/integration/v3_alarm_test.go @@ -22,11 +22,11 @@ import ( "testing" "time" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/mvcc" - "github.com/coreos/etcd/mvcc/backend" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/mvcc" + "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/pkg/testutil" "go.uber.org/zap" ) diff --git a/integration/v3_auth_test.go b/integration/v3_auth_test.go index bec4f8ae4..76c73b0ec 100644 --- a/integration/v3_auth_test.go +++ b/integration/v3_auth_test.go @@ -21,11 +21,11 @@ import ( "testing" "time" - "github.com/coreos/etcd/auth/authpb" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/auth/authpb" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/testutil" ) // TestV3AuthEmptyUserGet ensures that a get with an empty user will return an empty user error. diff --git a/integration/v3_barrier_test.go b/integration/v3_barrier_test.go index f86999c47..54fa3be66 100644 --- a/integration/v3_barrier_test.go +++ b/integration/v3_barrier_test.go @@ -18,9 +18,9 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/contrib/recipes" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/contrib/recipes" + "go.etcd.io/etcd/pkg/testutil" ) func TestBarrierSingleNode(t *testing.T) { diff --git a/integration/v3_double_barrier_test.go b/integration/v3_double_barrier_test.go index da520967d..dc5acd84c 100644 --- a/integration/v3_double_barrier_test.go +++ b/integration/v3_double_barrier_test.go @@ -18,8 +18,8 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3/concurrency" - "github.com/coreos/etcd/contrib/recipes" + "go.etcd.io/etcd/clientv3/concurrency" + "go.etcd.io/etcd/contrib/recipes" ) func TestDoubleBarrier(t *testing.T) { diff --git a/integration/v3_election_test.go b/integration/v3_election_test.go index 341430df5..ea6d8ae99 100644 --- a/integration/v3_election_test.go +++ b/integration/v3_election_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/concurrency" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/concurrency" ) // TestElectionWait tests if followers can correctly wait for elections. @@ -201,7 +201,7 @@ func TestElectionSessionRecampaign(t *testing.T) { // TestElectionOnPrefixOfExistingKey checks that a single // candidate can be elected on a new key that is a prefix // of an existing key. To wit, check for regression -// of bug #6278. https://github.com/coreos/etcd/issues/6278 +// of bug #6278. https://go.etcd.io/etcd/issues/6278 // func TestElectionOnPrefixOfExistingKey(t *testing.T) { clus := NewClusterV3(t, &ClusterConfig{Size: 1}) diff --git a/integration/v3_grpc_inflight_test.go b/integration/v3_grpc_inflight_test.go index 7b4d12a12..4b76513fa 100644 --- a/integration/v3_grpc_inflight_test.go +++ b/integration/v3_grpc_inflight_test.go @@ -20,9 +20,9 @@ import ( "testing" "time" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/testutil" "google.golang.org/grpc" "google.golang.org/grpc/codes" @@ -60,7 +60,7 @@ func TestV3MaintenanceDefragmentInflightRange(t *testing.T) { // TestV3KVInflightRangeRequests ensures that inflight requests // (sent before server shutdown) are gracefully handled by server-side. // They are either finished or canceled, but never crash the backend. -// See https://github.com/coreos/etcd/issues/7322 for more detail. +// See https://go.etcd.io/etcd/issues/7322 for more detail. func TestV3KVInflightRangeRequests(t *testing.T) { defer testutil.AfterTest(t) clus := NewClusterV3(t, &ClusterConfig{Size: 1}) diff --git a/integration/v3_grpc_test.go b/integration/v3_grpc_test.go index b193f661f..331f2bc60 100644 --- a/integration/v3_grpc_test.go +++ b/integration/v3_grpc_test.go @@ -25,11 +25,11 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/testutil" - "github.com/coreos/etcd/pkg/transport" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/transport" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/integration/v3_health_test.go b/integration/v3_health_test.go index 1636983cd..c5788fd12 100644 --- a/integration/v3_health_test.go +++ b/integration/v3_health_test.go @@ -18,7 +18,7 @@ import ( "context" "testing" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/testutil" healthpb "google.golang.org/grpc/health/grpc_health_v1" ) diff --git a/integration/v3_leadership_test.go b/integration/v3_leadership_test.go index 93c7f3ca6..1dcb98b67 100644 --- a/integration/v3_leadership_test.go +++ b/integration/v3_leadership_test.go @@ -19,9 +19,9 @@ import ( "testing" "time" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/testutil" ) func TestMoveLeader(t *testing.T) { testMoveLeader(t, true) } diff --git a/integration/v3_lease_test.go b/integration/v3_lease_test.go index 4e47e6c0a..756407a37 100644 --- a/integration/v3_lease_test.go +++ b/integration/v3_lease_test.go @@ -20,10 +20,10 @@ import ( "testing" "time" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/mvcc/mvccpb" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/pkg/testutil" "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" @@ -337,14 +337,14 @@ func TestV3LeaseLeases(t *testing.T) { // TestV3LeaseRenewStress keeps creating lease and renewing it immediately to ensure the renewal goes through. // it was oberserved that the immediate lease renewal after granting a lease from follower resulted lease not found. -// related issue https://github.com/coreos/etcd/issues/6978 +// related issue https://go.etcd.io/etcd/issues/6978 func TestV3LeaseRenewStress(t *testing.T) { testLeaseStress(t, stressLeaseRenew) } // TestV3LeaseTimeToLiveStress keeps creating lease and retrieving it immediately to ensure the lease can be retrieved. // it was oberserved that the immediate lease retrieval after granting a lease from follower resulted lease not found. -// related issue https://github.com/coreos/etcd/issues/6978 +// related issue https://go.etcd.io/etcd/issues/6978 func TestV3LeaseTimeToLiveStress(t *testing.T) { testLeaseStress(t, stressLeaseTimeToLive) } @@ -437,7 +437,7 @@ func TestV3PutOnNonExistLease(t *testing.T) { } // TestV3GetNonExistLease ensures client retrieving nonexistent lease on a follower doesn't result node panic -// related issue https://github.com/coreos/etcd/issues/6537 +// related issue https://go.etcd.io/etcd/issues/6537 func TestV3GetNonExistLease(t *testing.T) { defer testutil.AfterTest(t) clus := NewClusterV3(t, &ClusterConfig{Size: 3}) diff --git a/integration/v3_lock_test.go b/integration/v3_lock_test.go index 889a6ef1f..10b501eaf 100644 --- a/integration/v3_lock_test.go +++ b/integration/v3_lock_test.go @@ -21,11 +21,11 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/concurrency" - "github.com/coreos/etcd/contrib/recipes" - "github.com/coreos/etcd/mvcc/mvccpb" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/concurrency" + "go.etcd.io/etcd/contrib/recipes" + "go.etcd.io/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/pkg/testutil" ) func TestMutexSingleNode(t *testing.T) { diff --git a/integration/v3_queue_test.go b/integration/v3_queue_test.go index f7673f9b7..c7349fd84 100644 --- a/integration/v3_queue_test.go +++ b/integration/v3_queue_test.go @@ -20,7 +20,7 @@ import ( "sync/atomic" "testing" - "github.com/coreos/etcd/contrib/recipes" + "go.etcd.io/etcd/contrib/recipes" ) const ( diff --git a/integration/v3_stm_test.go b/integration/v3_stm_test.go index 7965b3c2c..25a1fd6c6 100644 --- a/integration/v3_stm_test.go +++ b/integration/v3_stm_test.go @@ -21,9 +21,9 @@ import ( "strconv" "testing" - v3 "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/concurrency" - "github.com/coreos/etcd/pkg/testutil" + v3 "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/concurrency" + "go.etcd.io/etcd/pkg/testutil" ) // TestSTMConflict tests that conflicts are retried. diff --git a/integration/v3_tls_test.go b/integration/v3_tls_test.go index 07b7334cc..324ce49df 100644 --- a/integration/v3_tls_test.go +++ b/integration/v3_tls_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/pkg/testutil" "google.golang.org/grpc" ) diff --git a/integration/v3_watch_restore_test.go b/integration/v3_watch_restore_test.go index 2b07a7161..c5dcb12c1 100644 --- a/integration/v3_watch_restore_test.go +++ b/integration/v3_watch_restore_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" ) // TestV3WatchRestoreSnapshotUnsync tests whether slow follower can restore diff --git a/integration/v3_watch_test.go b/integration/v3_watch_test.go index c91f4df65..da255d569 100644 --- a/integration/v3_watch_test.go +++ b/integration/v3_watch_test.go @@ -24,10 +24,10 @@ import ( "testing" "time" - "github.com/coreos/etcd/etcdserver/api/v3rpc" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/mvcc/mvccpb" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/etcdserver/api/v3rpc" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/pkg/testutil" ) // TestV3WatchFromCurrentRevision tests Watch APIs from current revision. diff --git a/integration/v3election_grpc_test.go b/integration/v3election_grpc_test.go index 12a0908b7..d49ad24fc 100644 --- a/integration/v3election_grpc_test.go +++ b/integration/v3election_grpc_test.go @@ -20,9 +20,9 @@ import ( "testing" "time" - epb "github.com/coreos/etcd/etcdserver/api/v3election/v3electionpb" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/testutil" + epb "go.etcd.io/etcd/etcdserver/api/v3election/v3electionpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/testutil" ) // TestV3ElectionCampaign checks that Campaign will not give diff --git a/integration/v3lock_grpc_test.go b/integration/v3lock_grpc_test.go index ccaf0a9cc..05276669f 100644 --- a/integration/v3lock_grpc_test.go +++ b/integration/v3lock_grpc_test.go @@ -19,9 +19,9 @@ import ( "testing" "time" - lockpb "github.com/coreos/etcd/etcdserver/api/v3lock/v3lockpb" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/testutil" + lockpb "go.etcd.io/etcd/etcdserver/api/v3lock/v3lockpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/testutil" ) // TestV3LockLockWaiter tests that a client will wait for a lock, then acquire it diff --git a/lease/leasehttp/http.go b/lease/leasehttp/http.go index aa713f28e..0f9c0c865 100644 --- a/lease/leasehttp/http.go +++ b/lease/leasehttp/http.go @@ -23,10 +23,10 @@ import ( "net/http" "time" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/lease" - "github.com/coreos/etcd/lease/leasepb" - "github.com/coreos/etcd/pkg/httputil" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/lease/leasepb" + "go.etcd.io/etcd/pkg/httputil" ) var ( diff --git a/lease/leasehttp/http_test.go b/lease/leasehttp/http_test.go index 2159cff03..0802515d5 100644 --- a/lease/leasehttp/http_test.go +++ b/lease/leasehttp/http_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - "github.com/coreos/etcd/lease" - "github.com/coreos/etcd/mvcc/backend" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/mvcc/backend" "go.uber.org/zap" ) diff --git a/lease/leasepb/lease.pb.go b/lease/leasepb/lease.pb.go index ca7dd8560..16637ee7e 100644 --- a/lease/leasepb/lease.pb.go +++ b/lease/leasepb/lease.pb.go @@ -23,7 +23,7 @@ import ( _ "github.com/gogo/protobuf/gogoproto" - etcdserverpb "github.com/coreos/etcd/etcdserver/etcdserverpb" + etcdserverpb "go.etcd.io/etcd/etcdserver/etcdserverpb" io "io" ) diff --git a/lease/lessor.go b/lease/lessor.go index 4b81bd81a..4312fe176 100644 --- a/lease/lessor.go +++ b/lease/lessor.go @@ -24,9 +24,9 @@ import ( "sync" "time" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/lease/leasepb" - "github.com/coreos/etcd/mvcc/backend" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/lease/leasepb" + "go.etcd.io/etcd/mvcc/backend" "go.uber.org/zap" ) diff --git a/lease/lessor_bench_test.go b/lease/lessor_bench_test.go index dd779b43c..4f14654a5 100644 --- a/lease/lessor_bench_test.go +++ b/lease/lessor_bench_test.go @@ -18,7 +18,7 @@ import ( "os" "testing" - "github.com/coreos/etcd/mvcc/backend" + "go.etcd.io/etcd/mvcc/backend" "go.uber.org/zap" ) diff --git a/lease/lessor_test.go b/lease/lessor_test.go index b034ca0a1..7f2d8f68b 100644 --- a/lease/lessor_test.go +++ b/lease/lessor_test.go @@ -26,8 +26,8 @@ import ( "testing" "time" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/mvcc/backend" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/mvcc/backend" "go.uber.org/zap" ) diff --git a/main.go b/main.go index 0b7357376..c03c49d1e 100644 --- a/main.go +++ b/main.go @@ -13,16 +13,16 @@ // limitations under the License. // Package main is a simple wrapper of the real etcd entrypoint package -// (located at github.com/coreos/etcd/etcdmain) to ensure that etcd is still -// "go getable"; e.g. `go get github.com/coreos/etcd` works as expected and +// (located at go.etcd.io/etcd/etcdmain) to ensure that etcd is still +// "go getable"; e.g. `go get go.etcd.io/etcd` works as expected and // builds a binary in $GOBIN/etcd // // This package should NOT be extended or modified in any way; to modify the -// etcd binary, work in the `github.com/coreos/etcd/etcdmain` package. +// etcd binary, work in the `go.etcd.io/etcd/etcdmain` package. // package main -import "github.com/coreos/etcd/etcdmain" +import "go.etcd.io/etcd/etcdmain" func main() { etcdmain.Main() diff --git a/pkg/adt/example_test.go b/pkg/adt/example_test.go index caa5317cd..e3edf225c 100644 --- a/pkg/adt/example_test.go +++ b/pkg/adt/example_test.go @@ -17,7 +17,7 @@ package adt_test import ( "fmt" - "github.com/coreos/etcd/pkg/adt" + "go.etcd.io/etcd/pkg/adt" ) func Example() { diff --git a/pkg/fileutil/fileutil.go b/pkg/fileutil/fileutil.go index 82996b6fb..5d9fb5303 100644 --- a/pkg/fileutil/fileutil.go +++ b/pkg/fileutil/fileutil.go @@ -31,7 +31,7 @@ const ( PrivateDirMode = 0700 ) -var plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "pkg/fileutil") +var plog = capnslog.NewPackageLogger("go.etcd.io/etcd", "pkg/fileutil") // IsDirWriteable checks if dir is writable by writing and removing a file // to dir. It returns nil if dir is writable. diff --git a/pkg/flags/flag.go b/pkg/flags/flag.go index 9f3c02aba..215902cf8 100644 --- a/pkg/flags/flag.go +++ b/pkg/flags/flag.go @@ -25,7 +25,7 @@ import ( "github.com/spf13/pflag" ) -var plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "pkg/flags") +var plog = capnslog.NewPackageLogger("go.etcd.io/etcd", "pkg/flags") // SetFlagsFromEnv parses all registered flags in the given flagset, // and if they are not already set it attempts to set their values from diff --git a/pkg/flags/unique_urls.go b/pkg/flags/unique_urls.go index 5f0b1451a..9b4178c3a 100644 --- a/pkg/flags/unique_urls.go +++ b/pkg/flags/unique_urls.go @@ -20,7 +20,7 @@ import ( "sort" "strings" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/pkg/types" ) // UniqueURLs contains unique URLs diff --git a/pkg/flags/urls.go b/pkg/flags/urls.go index 180a8d6f4..ca90970c2 100644 --- a/pkg/flags/urls.go +++ b/pkg/flags/urls.go @@ -19,7 +19,7 @@ import ( "net/url" "strings" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/pkg/types" ) // URLsValue wraps "types.URLs". diff --git a/pkg/ioutil/util.go b/pkg/ioutil/util.go index 192ad888c..6a6746e0b 100644 --- a/pkg/ioutil/util.go +++ b/pkg/ioutil/util.go @@ -18,7 +18,7 @@ import ( "io" "os" - "github.com/coreos/etcd/pkg/fileutil" + "go.etcd.io/etcd/pkg/fileutil" ) // WriteAndSyncFile behaves just like ioutil.WriteFile in the standard library, diff --git a/pkg/logutil/logger_test.go b/pkg/logutil/logger_test.go index 1f2ef9b68..312066500 100644 --- a/pkg/logutil/logger_test.go +++ b/pkg/logutil/logger_test.go @@ -20,7 +20,7 @@ import ( "strings" "testing" - "github.com/coreos/etcd/pkg/logutil" + "go.etcd.io/etcd/pkg/logutil" "google.golang.org/grpc/grpclog" ) diff --git a/pkg/logutil/merge_logger_test.go b/pkg/logutil/merge_logger_test.go index 10d0e4372..9eb1d016d 100644 --- a/pkg/logutil/merge_logger_test.go +++ b/pkg/logutil/merge_logger_test.go @@ -28,7 +28,7 @@ func TestMergeLogger(t *testing.T) { txt = "hello" repeatN = 6 duration = 2049843762 * time.Nanosecond - mg = NewMergeLogger(capnslog.NewPackageLogger("github.com/coreos/etcd", "pkg/logutil")) + mg = NewMergeLogger(capnslog.NewPackageLogger("go.etcd.io/etcd", "pkg/logutil")) ) // overwrite this for testing defaultMergePeriod = time.Minute diff --git a/pkg/logutil/package_logger.go b/pkg/logutil/package_logger.go index 378bee0e3..729cbdb57 100644 --- a/pkg/logutil/package_logger.go +++ b/pkg/logutil/package_logger.go @@ -27,7 +27,7 @@ var _ Logger = &packageLogger{} // For example: // // var defaultLogger Logger -// defaultLogger = NewPackageLogger("github.com/coreos/etcd", "snapshot") +// defaultLogger = NewPackageLogger("go.etcd.io/etcd", "snapshot") // func NewPackageLogger(repo, pkg string) Logger { return &packageLogger{p: capnslog.NewPackageLogger(repo, pkg)} diff --git a/pkg/logutil/package_logger_test.go b/pkg/logutil/package_logger_test.go index b6ab0052b..fa9887126 100644 --- a/pkg/logutil/package_logger_test.go +++ b/pkg/logutil/package_logger_test.go @@ -20,7 +20,7 @@ import ( "strings" "testing" - "github.com/coreos/etcd/pkg/logutil" + "go.etcd.io/etcd/pkg/logutil" "github.com/coreos/pkg/capnslog" ) @@ -29,9 +29,9 @@ func TestPackageLogger(t *testing.T) { buf := new(bytes.Buffer) capnslog.SetFormatter(capnslog.NewDefaultFormatter(buf)) - l := logutil.NewPackageLogger("github.com/coreos/etcd", "logger") + l := logutil.NewPackageLogger("go.etcd.io/etcd", "logger") - r := capnslog.MustRepoLogger("github.com/coreos/etcd") + r := capnslog.MustRepoLogger("go.etcd.io/etcd") r.SetLogLevel(map[string]capnslog.LogLevel{"logger": capnslog.INFO}) l.Infof("hello world!") diff --git a/pkg/logutil/zap_journal.go b/pkg/logutil/zap_journal.go index b1788bc83..fcd390381 100644 --- a/pkg/logutil/zap_journal.go +++ b/pkg/logutil/zap_journal.go @@ -24,7 +24,7 @@ import ( "os" "path/filepath" - "github.com/coreos/etcd/pkg/systemd" + "go.etcd.io/etcd/pkg/systemd" "github.com/coreos/go-systemd/journal" "go.uber.org/zap/zapcore" diff --git a/pkg/logutil/zap_raft.go b/pkg/logutil/zap_raft.go index 5ee703dd2..e92cba04c 100644 --- a/pkg/logutil/zap_raft.go +++ b/pkg/logutil/zap_raft.go @@ -17,7 +17,7 @@ package logutil import ( "errors" - "github.com/coreos/etcd/raft" + "go.etcd.io/etcd/raft" "go.uber.org/zap" "go.uber.org/zap/zapcore" diff --git a/pkg/mock/mockserver/mockserver.go b/pkg/mock/mockserver/mockserver.go index d72b40b45..59c543eaf 100644 --- a/pkg/mock/mockserver/mockserver.go +++ b/pkg/mock/mockserver/mockserver.go @@ -22,7 +22,7 @@ import ( "os" "sync" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" "google.golang.org/grpc" "google.golang.org/grpc/resolver" diff --git a/pkg/mock/mockstorage/storage_recorder.go b/pkg/mock/mockstorage/storage_recorder.go index 4ecab9831..d05413e62 100644 --- a/pkg/mock/mockstorage/storage_recorder.go +++ b/pkg/mock/mockstorage/storage_recorder.go @@ -15,9 +15,9 @@ package mockstorage import ( - "github.com/coreos/etcd/pkg/testutil" - "github.com/coreos/etcd/raft" - "github.com/coreos/etcd/raft/raftpb" + "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/raft" + "go.etcd.io/etcd/raft/raftpb" ) type storageRecorder struct { diff --git a/pkg/mock/mockstore/store_recorder.go b/pkg/mock/mockstore/store_recorder.go index 031f31c0c..2f4bf45db 100644 --- a/pkg/mock/mockstore/store_recorder.go +++ b/pkg/mock/mockstore/store_recorder.go @@ -17,8 +17,8 @@ package mockstore import ( "time" - "github.com/coreos/etcd/etcdserver/api/v2store" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/etcdserver/api/v2store" + "go.etcd.io/etcd/pkg/testutil" ) // StoreRecorder provides a Store interface with a testutil.Recorder diff --git a/pkg/mock/mockwait/wait_recorder.go b/pkg/mock/mockwait/wait_recorder.go index f9c820092..eff1a4766 100644 --- a/pkg/mock/mockwait/wait_recorder.go +++ b/pkg/mock/mockwait/wait_recorder.go @@ -15,8 +15,8 @@ package mockwait import ( - "github.com/coreos/etcd/pkg/testutil" - "github.com/coreos/etcd/pkg/wait" + "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/wait" ) type WaitRecorder struct { diff --git a/pkg/netutil/netutil.go b/pkg/netutil/netutil.go index 52373bd06..faef6466e 100644 --- a/pkg/netutil/netutil.go +++ b/pkg/netutil/netutil.go @@ -23,7 +23,7 @@ import ( "sort" "time" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/pkg/types" "go.uber.org/zap" ) diff --git a/pkg/netutil/routes_linux.go b/pkg/netutil/routes_linux.go index 797baeb48..5118d3dac 100644 --- a/pkg/netutil/routes_linux.go +++ b/pkg/netutil/routes_linux.go @@ -24,7 +24,7 @@ import ( "sort" "syscall" - "github.com/coreos/etcd/pkg/cpuutil" + "go.etcd.io/etcd/pkg/cpuutil" ) var errNoDefaultRoute = fmt.Errorf("could not find default route") diff --git a/pkg/osutil/osutil.go b/pkg/osutil/osutil.go index ef38280e7..f5c63e5e0 100644 --- a/pkg/osutil/osutil.go +++ b/pkg/osutil/osutil.go @@ -23,7 +23,7 @@ import ( ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "pkg/osutil") + plog = capnslog.NewPackageLogger("go.etcd.io/etcd", "pkg/osutil") // support to override setting SIG_DFL so tests don't terminate early setDflSignal = dflSignal diff --git a/pkg/pbutil/pbutil.go b/pkg/pbutil/pbutil.go index d70f98dd8..53167ffa5 100644 --- a/pkg/pbutil/pbutil.go +++ b/pkg/pbutil/pbutil.go @@ -18,7 +18,7 @@ package pbutil import "github.com/coreos/pkg/capnslog" var ( - plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "pkg/pbutil") + plog = capnslog.NewPackageLogger("go.etcd.io/etcd", "pkg/pbutil") ) type Marshaler interface { diff --git a/pkg/proxy/server.go b/pkg/proxy/server.go index aef5bc19a..911c1a5cd 100644 --- a/pkg/proxy/server.go +++ b/pkg/proxy/server.go @@ -26,7 +26,7 @@ import ( "sync" "time" - "github.com/coreos/etcd/pkg/transport" + "go.etcd.io/etcd/pkg/transport" humanize "github.com/dustin/go-humanize" "go.uber.org/zap" @@ -289,8 +289,8 @@ func (s *server) To() string { // TODO: implement packet reordering from multiple TCP connections // buffer packets per connection for awhile, reorder before transmit -// - https://github.com/coreos/etcd/issues/5614 -// - https://github.com/coreos/etcd/pull/6918#issuecomment-264093034 +// - https://go.etcd.io/etcd/issues/5614 +// - https://go.etcd.io/etcd/pull/6918#issuecomment-264093034 func (s *server) listenAndServe() { defer s.closeWg.Done() diff --git a/pkg/proxy/server_test.go b/pkg/proxy/server_test.go index d9db223ef..1ca0b6878 100644 --- a/pkg/proxy/server_test.go +++ b/pkg/proxy/server_test.go @@ -29,7 +29,7 @@ import ( "testing" "time" - "github.com/coreos/etcd/pkg/transport" + "go.etcd.io/etcd/pkg/transport" "go.uber.org/zap" ) diff --git a/pkg/srv/srv.go b/pkg/srv/srv.go index e1df5254f..9914104a7 100644 --- a/pkg/srv/srv.go +++ b/pkg/srv/srv.go @@ -21,7 +21,7 @@ import ( "net/url" "strings" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/pkg/types" ) var ( diff --git a/pkg/srv/srv_test.go b/pkg/srv/srv_test.go index fdc67bcb7..4ac2744ce 100644 --- a/pkg/srv/srv_test.go +++ b/pkg/srv/srv_test.go @@ -21,7 +21,7 @@ import ( "strings" "testing" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/testutil" ) func TestSRVGetCluster(t *testing.T) { diff --git a/pkg/testutil/leak.go b/pkg/testutil/leak.go index 2ebae1e6e..8a867b163 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 "github.com/coreos/etcd/pkg/testutil" + import "go.etcd.io/etcd/pkg/testutil" func TestMain(m *testing.M) { v := m.Run() @@ -125,8 +125,8 @@ func interestingGoroutines() (gs []string) { strings.Contains(stack, "created by testing.RunTests") || strings.Contains(stack, "testing.Main(") || strings.Contains(stack, "runtime.goexit") || - strings.Contains(stack, "github.com/coreos/etcd/pkg/testutil.interestingGoroutines") || - strings.Contains(stack, "github.com/coreos/etcd/pkg/logutil.(*MergeLogger).outputLoop") || + strings.Contains(stack, "go.etcd.io/etcd/pkg/testutil.interestingGoroutines") || + strings.Contains(stack, "go.etcd.io/etcd/pkg/logutil.(*MergeLogger).outputLoop") || strings.Contains(stack, "github.com/golang/glog.(*loggingT).flushDaemon") || strings.Contains(stack, "created by runtime.gc") || strings.Contains(stack, "runtime.MHeap_Scavenger") { diff --git a/pkg/transport/listener.go b/pkg/transport/listener.go index 662a0e178..620b9e790 100644 --- a/pkg/transport/listener.go +++ b/pkg/transport/listener.go @@ -31,7 +31,7 @@ import ( "strings" "time" - "github.com/coreos/etcd/pkg/tlsutil" + "go.etcd.io/etcd/pkg/tlsutil" "go.uber.org/zap" ) diff --git a/pkg/types/urls_test.go b/pkg/types/urls_test.go index b91d1a926..268cb8b16 100644 --- a/pkg/types/urls_test.go +++ b/pkg/types/urls_test.go @@ -18,7 +18,7 @@ import ( "reflect" "testing" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/testutil" ) func TestNewURLs(t *testing.T) { diff --git a/pkg/types/urlsmap_test.go b/pkg/types/urlsmap_test.go index 6f58765c0..35f34ab7c 100644 --- a/pkg/types/urlsmap_test.go +++ b/pkg/types/urlsmap_test.go @@ -15,7 +15,7 @@ package types import ( - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/testutil" "reflect" "testing" ) diff --git a/proxy/grpcproxy/adapter/auth_client_adapter.go b/proxy/grpcproxy/adapter/auth_client_adapter.go index 33dc91f01..59dbe6b0e 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 "github.com/coreos/etcd/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" grpc "google.golang.org/grpc" ) diff --git a/proxy/grpcproxy/adapter/cluster_client_adapter.go b/proxy/grpcproxy/adapter/cluster_client_adapter.go index 6c0340998..248dffd64 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 "github.com/coreos/etcd/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" "google.golang.org/grpc" ) diff --git a/proxy/grpcproxy/adapter/election_client_adapter.go b/proxy/grpcproxy/adapter/election_client_adapter.go index a2ebf138f..4722be040 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" - "github.com/coreos/etcd/etcdserver/api/v3election/v3electionpb" + "go.etcd.io/etcd/etcdserver/api/v3election/v3electionpb" "google.golang.org/grpc" ) diff --git a/proxy/grpcproxy/adapter/kv_client_adapter.go b/proxy/grpcproxy/adapter/kv_client_adapter.go index acd5673d0..b1a782099 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 "github.com/coreos/etcd/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" grpc "google.golang.org/grpc" ) diff --git a/proxy/grpcproxy/adapter/lease_client_adapter.go b/proxy/grpcproxy/adapter/lease_client_adapter.go index 84c48b591..a58408f9f 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 "github.com/coreos/etcd/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" "google.golang.org/grpc" ) diff --git a/proxy/grpcproxy/adapter/lock_client_adapter.go b/proxy/grpcproxy/adapter/lock_client_adapter.go index 9ce7913a3..65b5641d3 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" - "github.com/coreos/etcd/etcdserver/api/v3lock/v3lockpb" + "go.etcd.io/etcd/etcdserver/api/v3lock/v3lockpb" "google.golang.org/grpc" ) diff --git a/proxy/grpcproxy/adapter/maintenance_client_adapter.go b/proxy/grpcproxy/adapter/maintenance_client_adapter.go index 92d9dfd20..4a8781b13 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 "github.com/coreos/etcd/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" "google.golang.org/grpc" ) diff --git a/proxy/grpcproxy/adapter/watch_client_adapter.go b/proxy/grpcproxy/adapter/watch_client_adapter.go index afe61e837..2f629cc15 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 "github.com/coreos/etcd/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" "google.golang.org/grpc" ) diff --git a/proxy/grpcproxy/auth.go b/proxy/grpcproxy/auth.go index 0ed8d246d..e2c7f8c4b 100644 --- a/proxy/grpcproxy/auth.go +++ b/proxy/grpcproxy/auth.go @@ -17,8 +17,8 @@ package grpcproxy import ( "context" - "github.com/coreos/etcd/clientv3" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/clientv3" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" ) type AuthProxy struct { diff --git a/proxy/grpcproxy/cache/store.go b/proxy/grpcproxy/cache/store.go index 70715e499..0b31d3145 100644 --- a/proxy/grpcproxy/cache/store.go +++ b/proxy/grpcproxy/cache/store.go @@ -20,9 +20,9 @@ import ( "errors" "sync" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/adt" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/adt" "github.com/golang/groupcache/lru" ) diff --git a/proxy/grpcproxy/cluster.go b/proxy/grpcproxy/cluster.go index 6e8d3c85b..ebab4ba44 100644 --- a/proxy/grpcproxy/cluster.go +++ b/proxy/grpcproxy/cluster.go @@ -20,10 +20,10 @@ import ( "os" "sync" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/naming" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/naming" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" "golang.org/x/time/rate" gnaming "google.golang.org/grpc/naming" diff --git a/proxy/grpcproxy/cluster_test.go b/proxy/grpcproxy/cluster_test.go index f2c0af3f0..778681744 100644 --- a/proxy/grpcproxy/cluster_test.go +++ b/proxy/grpcproxy/cluster_test.go @@ -20,10 +20,10 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/clientv3" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/integration" + "go.etcd.io/etcd/pkg/testutil" "google.golang.org/grpc" ) diff --git a/proxy/grpcproxy/election.go b/proxy/grpcproxy/election.go index 4b4a4cc42..8a80809d2 100644 --- a/proxy/grpcproxy/election.go +++ b/proxy/grpcproxy/election.go @@ -17,8 +17,8 @@ package grpcproxy import ( "context" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver/api/v3election/v3electionpb" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver/api/v3election/v3electionpb" ) type electionProxy struct { diff --git a/proxy/grpcproxy/health.go b/proxy/grpcproxy/health.go index e5e91f29b..4756cff2e 100644 --- a/proxy/grpcproxy/health.go +++ b/proxy/grpcproxy/health.go @@ -19,9 +19,9 @@ import ( "net/http" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver/api/etcdhttp" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver/api/etcdhttp" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" ) // HandleHealth registers health handler on '/health'. diff --git a/proxy/grpcproxy/kv.go b/proxy/grpcproxy/kv.go index 1c9860f98..d3a350994 100644 --- a/proxy/grpcproxy/kv.go +++ b/proxy/grpcproxy/kv.go @@ -17,9 +17,9 @@ package grpcproxy import ( "context" - "github.com/coreos/etcd/clientv3" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/proxy/grpcproxy/cache" + "go.etcd.io/etcd/clientv3" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/proxy/grpcproxy/cache" ) type kvProxy struct { diff --git a/proxy/grpcproxy/kv_test.go b/proxy/grpcproxy/kv_test.go index 33fb597c0..a1d29e179 100644 --- a/proxy/grpcproxy/kv_test.go +++ b/proxy/grpcproxy/kv_test.go @@ -20,10 +20,10 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/clientv3" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/integration" + "go.etcd.io/etcd/pkg/testutil" "google.golang.org/grpc" ) diff --git a/proxy/grpcproxy/leader.go b/proxy/grpcproxy/leader.go index 2e01b466f..bba2b9703 100644 --- a/proxy/grpcproxy/leader.go +++ b/proxy/grpcproxy/leader.go @@ -19,7 +19,7 @@ import ( "math" "sync" - "github.com/coreos/etcd/clientv3" + "go.etcd.io/etcd/clientv3" "golang.org/x/time/rate" ) diff --git a/proxy/grpcproxy/lease.go b/proxy/grpcproxy/lease.go index 65f68b0ea..a688d429a 100644 --- a/proxy/grpcproxy/lease.go +++ b/proxy/grpcproxy/lease.go @@ -21,9 +21,9 @@ import ( "sync/atomic" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" "google.golang.org/grpc" "google.golang.org/grpc/metadata" diff --git a/proxy/grpcproxy/lock.go b/proxy/grpcproxy/lock.go index ceef26f0a..9e1543d83 100644 --- a/proxy/grpcproxy/lock.go +++ b/proxy/grpcproxy/lock.go @@ -17,8 +17,8 @@ package grpcproxy import ( "context" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver/api/v3lock/v3lockpb" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver/api/v3lock/v3lockpb" ) type lockProxy struct { diff --git a/proxy/grpcproxy/logger.go b/proxy/grpcproxy/logger.go index c2d818043..187951a55 100644 --- a/proxy/grpcproxy/logger.go +++ b/proxy/grpcproxy/logger.go @@ -16,4 +16,4 @@ package grpcproxy import "github.com/coreos/pkg/capnslog" -var plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "grpcproxy") +var plog = capnslog.NewPackageLogger("go.etcd.io/etcd", "grpcproxy") diff --git a/proxy/grpcproxy/maintenance.go b/proxy/grpcproxy/maintenance.go index 291e8e308..5e1e75176 100644 --- a/proxy/grpcproxy/maintenance.go +++ b/proxy/grpcproxy/maintenance.go @@ -18,8 +18,8 @@ import ( "context" "io" - "github.com/coreos/etcd/clientv3" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/clientv3" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" ) type maintenanceProxy struct { diff --git a/proxy/grpcproxy/register.go b/proxy/grpcproxy/register.go index 598c71f07..ba628c3eb 100644 --- a/proxy/grpcproxy/register.go +++ b/proxy/grpcproxy/register.go @@ -18,9 +18,9 @@ import ( "encoding/json" "os" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/concurrency" - "github.com/coreos/etcd/clientv3/naming" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/concurrency" + "go.etcd.io/etcd/clientv3/naming" "golang.org/x/time/rate" gnaming "google.golang.org/grpc/naming" diff --git a/proxy/grpcproxy/register_test.go b/proxy/grpcproxy/register_test.go index 7679e0e7b..33b01547c 100644 --- a/proxy/grpcproxy/register_test.go +++ b/proxy/grpcproxy/register_test.go @@ -18,10 +18,10 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/naming" - "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/naming" + "go.etcd.io/etcd/integration" + "go.etcd.io/etcd/pkg/testutil" gnaming "google.golang.org/grpc/naming" ) diff --git a/proxy/grpcproxy/util.go b/proxy/grpcproxy/util.go index a6d0b40dc..266ae7d72 100644 --- a/proxy/grpcproxy/util.go +++ b/proxy/grpcproxy/util.go @@ -17,7 +17,7 @@ package grpcproxy import ( "context" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" "google.golang.org/grpc" "google.golang.org/grpc/metadata" diff --git a/proxy/grpcproxy/watch.go b/proxy/grpcproxy/watch.go index 603095f27..ee1ba4e9c 100644 --- a/proxy/grpcproxy/watch.go +++ b/proxy/grpcproxy/watch.go @@ -18,10 +18,10 @@ import ( "context" "sync" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver/api/v3rpc" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver/api/v3rpc" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" "google.golang.org/grpc" "google.golang.org/grpc/metadata" diff --git a/proxy/grpcproxy/watch_broadcast.go b/proxy/grpcproxy/watch_broadcast.go index 46e56c79a..f9d2b148a 100644 --- a/proxy/grpcproxy/watch_broadcast.go +++ b/proxy/grpcproxy/watch_broadcast.go @@ -18,8 +18,8 @@ import ( "context" "sync" - "github.com/coreos/etcd/clientv3" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/clientv3" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" ) // watchBroadcast broadcasts a server watcher to many client watchers. diff --git a/proxy/grpcproxy/watcher.go b/proxy/grpcproxy/watcher.go index 1a497462f..0068a69e5 100644 --- a/proxy/grpcproxy/watcher.go +++ b/proxy/grpcproxy/watcher.go @@ -17,10 +17,10 @@ package grpcproxy import ( "time" - "github.com/coreos/etcd/clientv3" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/mvcc" - "github.com/coreos/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/clientv3" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/mvcc" + "go.etcd.io/etcd/mvcc/mvccpb" ) type watchRange struct { diff --git a/proxy/httpproxy/reverse.go b/proxy/httpproxy/reverse.go index 2ecff3aae..d3d658292 100644 --- a/proxy/httpproxy/reverse.go +++ b/proxy/httpproxy/reverse.go @@ -27,12 +27,12 @@ import ( "sync/atomic" "time" - "github.com/coreos/etcd/etcdserver/api/v2http/httptypes" + "go.etcd.io/etcd/etcdserver/api/v2http/httptypes" "github.com/coreos/pkg/capnslog" ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "proxy/httpproxy") + plog = capnslog.NewPackageLogger("go.etcd.io/etcd", "proxy/httpproxy") // Hop-by-hop headers. These are removed when sent to the backend. // http://www.w3.org/Protocols/rfc2616/rfc2616-sec13.html diff --git a/proxy/tcpproxy/userspace.go b/proxy/tcpproxy/userspace.go index 381f4b8d3..94575307a 100644 --- a/proxy/tcpproxy/userspace.go +++ b/proxy/tcpproxy/userspace.go @@ -26,7 +26,7 @@ import ( "go.uber.org/zap" ) -var plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "proxy/tcpproxy") +var plog = capnslog.NewPackageLogger("go.etcd.io/etcd", "proxy/tcpproxy") type remote struct { mu sync.Mutex diff --git a/tests/e2e/cluster_proxy_test.go b/tests/e2e/cluster_proxy_test.go index b6c93f440..f9028ae2b 100644 --- a/tests/e2e/cluster_proxy_test.go +++ b/tests/e2e/cluster_proxy_test.go @@ -24,7 +24,7 @@ import ( "strconv" "strings" - "github.com/coreos/etcd/pkg/expect" + "go.etcd.io/etcd/pkg/expect" ) type proxyEtcdProcess struct { diff --git a/tests/e2e/cluster_test.go b/tests/e2e/cluster_test.go index 4b32db189..901f7aa7d 100644 --- a/tests/e2e/cluster_test.go +++ b/tests/e2e/cluster_test.go @@ -21,7 +21,7 @@ import ( "os" "strings" - "github.com/coreos/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver" ) const etcdProcessBasePort = 20000 diff --git a/tests/e2e/ctl_v2_test.go b/tests/e2e/ctl_v2_test.go index 890262504..cbea2a3d8 100644 --- a/tests/e2e/ctl_v2_test.go +++ b/tests/e2e/ctl_v2_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" - "github.com/coreos/etcd/pkg/fileutil" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/fileutil" + "go.etcd.io/etcd/pkg/testutil" ) func TestCtlV2Set(t *testing.T) { testCtlV2Set(t, &configNoTLS, false) } diff --git a/tests/e2e/ctl_v3_alarm_test.go b/tests/e2e/ctl_v3_alarm_test.go index fa6d1bab6..a8bc38483 100644 --- a/tests/e2e/ctl_v3_alarm_test.go +++ b/tests/e2e/ctl_v3_alarm_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" + "go.etcd.io/etcd/clientv3" ) func TestCtlV3Alarm(t *testing.T) { diff --git a/tests/e2e/ctl_v3_auth_test.go b/tests/e2e/ctl_v3_auth_test.go index 928687d84..6dbcd1039 100644 --- a/tests/e2e/ctl_v3_auth_test.go +++ b/tests/e2e/ctl_v3_auth_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" + "go.etcd.io/etcd/clientv3" ) func TestCtlV3AuthEnable(t *testing.T) { testCtl(t, authEnableTest) } diff --git a/tests/e2e/ctl_v3_elect_test.go b/tests/e2e/ctl_v3_elect_test.go index 02c7090f7..354953138 100644 --- a/tests/e2e/ctl_v3_elect_test.go +++ b/tests/e2e/ctl_v3_elect_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - "github.com/coreos/etcd/pkg/expect" + "go.etcd.io/etcd/pkg/expect" ) func TestCtlV3Elect(t *testing.T) { diff --git a/tests/e2e/ctl_v3_endpoint_test.go b/tests/e2e/ctl_v3_endpoint_test.go index 821e77bb7..23070ba88 100644 --- a/tests/e2e/ctl_v3_endpoint_test.go +++ b/tests/e2e/ctl_v3_endpoint_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" + "go.etcd.io/etcd/clientv3" ) func TestCtlV3EndpointHealth(t *testing.T) { testCtl(t, endpointHealthTest, withQuorum()) } diff --git a/tests/e2e/ctl_v3_lock_test.go b/tests/e2e/ctl_v3_lock_test.go index 3e1332976..e27ccdea7 100644 --- a/tests/e2e/ctl_v3_lock_test.go +++ b/tests/e2e/ctl_v3_lock_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - "github.com/coreos/etcd/pkg/expect" + "go.etcd.io/etcd/pkg/expect" ) func TestCtlV3Lock(t *testing.T) { diff --git a/tests/e2e/ctl_v3_member_test.go b/tests/e2e/ctl_v3_member_test.go index d0dbc41cc..417f8672b 100644 --- a/tests/e2e/ctl_v3_member_test.go +++ b/tests/e2e/ctl_v3_member_test.go @@ -21,7 +21,7 @@ import ( "strings" "testing" - "github.com/coreos/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/etcdserver/etcdserverpb" ) func TestCtlV3MemberList(t *testing.T) { testCtl(t, memberListTest) } diff --git a/tests/e2e/ctl_v3_migrate_test.go b/tests/e2e/ctl_v3_migrate_test.go index 9f84907f8..1ecffe589 100644 --- a/tests/e2e/ctl_v3_migrate_test.go +++ b/tests/e2e/ctl_v3_migrate_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/pkg/testutil" ) func TestCtlV3Migrate(t *testing.T) { diff --git a/tests/e2e/ctl_v3_move_leader_test.go b/tests/e2e/ctl_v3_move_leader_test.go index da77ff2f7..f603ad34a 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" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/pkg/testutil" - "github.com/coreos/etcd/pkg/transport" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/transport" + "go.etcd.io/etcd/pkg/types" ) func TestCtlV3MoveLeaderSecure(t *testing.T) { diff --git a/tests/e2e/ctl_v3_snapshot_test.go b/tests/e2e/ctl_v3_snapshot_test.go index f69089b97..94929c089 100644 --- a/tests/e2e/ctl_v3_snapshot_test.go +++ b/tests/e2e/ctl_v3_snapshot_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3/snapshot" - "github.com/coreos/etcd/pkg/expect" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/clientv3/snapshot" + "go.etcd.io/etcd/pkg/expect" + "go.etcd.io/etcd/pkg/testutil" ) func TestCtlV3Snapshot(t *testing.T) { testCtl(t, snapshotTest) } diff --git a/tests/e2e/ctl_v3_test.go b/tests/e2e/ctl_v3_test.go index 82bcfdac0..04f5a6570 100644 --- a/tests/e2e/ctl_v3_test.go +++ b/tests/e2e/ctl_v3_test.go @@ -21,9 +21,9 @@ import ( "testing" "time" - "github.com/coreos/etcd/pkg/flags" - "github.com/coreos/etcd/pkg/testutil" - "github.com/coreos/etcd/version" + "go.etcd.io/etcd/pkg/flags" + "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/version" ) func TestCtlV3Version(t *testing.T) { testCtl(t, versionTest) } diff --git a/tests/e2e/etcd_config_test.go b/tests/e2e/etcd_config_test.go index b90824b2e..68370104f 100644 --- a/tests/e2e/etcd_config_test.go +++ b/tests/e2e/etcd_config_test.go @@ -21,7 +21,7 @@ import ( "strings" "testing" - "github.com/coreos/etcd/pkg/expect" + "go.etcd.io/etcd/pkg/expect" ) const exampleConfigFile = "../../etcd.conf.yml.sample" diff --git a/tests/e2e/etcd_corrupt_test.go b/tests/e2e/etcd_corrupt_test.go index d72d08792..72b1c65ba 100644 --- a/tests/e2e/etcd_corrupt_test.go +++ b/tests/e2e/etcd_corrupt_test.go @@ -23,8 +23,8 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/mvcc/mvccpb" bolt "github.com/coreos/bbolt" ) diff --git a/tests/e2e/etcd_process.go b/tests/e2e/etcd_process.go index 3663d248a..d6cb9d5de 100644 --- a/tests/e2e/etcd_process.go +++ b/tests/e2e/etcd_process.go @@ -19,8 +19,8 @@ import ( "net/url" "os" - "github.com/coreos/etcd/pkg/expect" - "github.com/coreos/etcd/pkg/fileutil" + "go.etcd.io/etcd/pkg/expect" + "go.etcd.io/etcd/pkg/fileutil" ) var ( diff --git a/tests/e2e/etcd_release_upgrade_test.go b/tests/e2e/etcd_release_upgrade_test.go index 136b62fd1..bb8cb7853 100644 --- a/tests/e2e/etcd_release_upgrade_test.go +++ b/tests/e2e/etcd_release_upgrade_test.go @@ -21,9 +21,9 @@ import ( "testing" "time" - "github.com/coreos/etcd/pkg/fileutil" - "github.com/coreos/etcd/pkg/testutil" - "github.com/coreos/etcd/version" + "go.etcd.io/etcd/pkg/fileutil" + "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/version" ) // TestReleaseUpgrade ensures that changes to master branch does not affect diff --git a/tests/e2e/etcd_spawn_cov.go b/tests/e2e/etcd_spawn_cov.go index f8805825c..cbdb2e66a 100644 --- a/tests/e2e/etcd_spawn_cov.go +++ b/tests/e2e/etcd_spawn_cov.go @@ -24,9 +24,9 @@ import ( "syscall" "time" - "github.com/coreos/etcd/pkg/expect" - "github.com/coreos/etcd/pkg/fileutil" - "github.com/coreos/etcd/pkg/flags" + "go.etcd.io/etcd/pkg/expect" + "go.etcd.io/etcd/pkg/fileutil" + "go.etcd.io/etcd/pkg/flags" ) const noOutputLineCount = 2 // cov-enabled binaries emit PASS and coverage count lines diff --git a/tests/e2e/etcd_spawn_nocov.go b/tests/e2e/etcd_spawn_nocov.go index 49d41822e..33f49ffa4 100644 --- a/tests/e2e/etcd_spawn_nocov.go +++ b/tests/e2e/etcd_spawn_nocov.go @@ -19,7 +19,7 @@ package e2e import ( "os" - "github.com/coreos/etcd/pkg/expect" + "go.etcd.io/etcd/pkg/expect" ) const noOutputLineCount = 0 // regular binaries emit no extra lines diff --git a/tests/e2e/gateway_test.go b/tests/e2e/gateway_test.go index 46bdb8918..ee7c415b0 100644 --- a/tests/e2e/gateway_test.go +++ b/tests/e2e/gateway_test.go @@ -19,7 +19,7 @@ import ( "strings" "testing" - "github.com/coreos/etcd/pkg/expect" + "go.etcd.io/etcd/pkg/expect" ) var ( diff --git a/tests/e2e/main_test.go b/tests/e2e/main_test.go index fcb681b5a..889d2cebc 100644 --- a/tests/e2e/main_test.go +++ b/tests/e2e/main_test.go @@ -10,7 +10,7 @@ import ( "runtime" "testing" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/testutil" ) var ( diff --git a/tests/e2e/metrics_test.go b/tests/e2e/metrics_test.go index 8c548c920..24ca95e4d 100644 --- a/tests/e2e/metrics_test.go +++ b/tests/e2e/metrics_test.go @@ -18,7 +18,7 @@ import ( "fmt" "testing" - "github.com/coreos/etcd/version" + "go.etcd.io/etcd/version" ) func TestV3MetricsSecure(t *testing.T) { diff --git a/tests/e2e/util.go b/tests/e2e/util.go index acbee8ae3..ce7289ae9 100644 --- a/tests/e2e/util.go +++ b/tests/e2e/util.go @@ -21,7 +21,7 @@ import ( "strings" "time" - "github.com/coreos/etcd/pkg/expect" + "go.etcd.io/etcd/pkg/expect" ) func waitReadyExpectProc(exproc *expect.ExpectProcess, readyStrs []string) error { diff --git a/tests/e2e/v2_curl_test.go b/tests/e2e/v2_curl_test.go index 22ef3bdca..3cbfc53f2 100644 --- a/tests/e2e/v2_curl_test.go +++ b/tests/e2e/v2_curl_test.go @@ -21,7 +21,7 @@ import ( "strings" "testing" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/testutil" ) func TestV2CurlNoTLS(t *testing.T) { testCurlPutGet(t, &configNoTLS) } diff --git a/tests/e2e/v3_cipher_suite_test.go b/tests/e2e/v3_cipher_suite_test.go index 56393e4b5..501dc28e1 100644 --- a/tests/e2e/v3_cipher_suite_test.go +++ b/tests/e2e/v3_cipher_suite_test.go @@ -20,7 +20,7 @@ import ( "fmt" "testing" - "github.com/coreos/etcd/version" + "go.etcd.io/etcd/version" ) func TestV3CurlCipherSuitesValid(t *testing.T) { testV3CurlCipherSuites(t, true) } diff --git a/tests/e2e/v3_curl_lease_test.go b/tests/e2e/v3_curl_lease_test.go index fc96a6e04..47d150a7a 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 "github.com/coreos/etcd/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" ) func TestV3CurlLeaseGrantNoTLS(t *testing.T) { diff --git a/tests/e2e/v3_curl_test.go b/tests/e2e/v3_curl_test.go index 250ea61aa..cdc99b7a1 100644 --- a/tests/e2e/v3_curl_test.go +++ b/tests/e2e/v3_curl_test.go @@ -22,10 +22,10 @@ import ( "strconv" "testing" - epb "github.com/coreos/etcd/etcdserver/api/v3election/v3electionpb" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/testutil" + epb "go.etcd.io/etcd/etcdserver/api/v3election/v3electionpb" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/testutil" "github.com/grpc-ecosystem/grpc-gateway/runtime" ) diff --git a/tools/benchmark/cmd/lease.go b/tools/benchmark/cmd/lease.go index 85bbb161d..8104390c9 100644 --- a/tools/benchmark/cmd/lease.go +++ b/tools/benchmark/cmd/lease.go @@ -19,8 +19,8 @@ import ( "fmt" "time" - v3 "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/pkg/report" + v3 "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/pkg/report" "github.com/spf13/cobra" "gopkg.in/cheggaaa/pb.v1" diff --git a/tools/benchmark/cmd/mvcc-put.go b/tools/benchmark/cmd/mvcc-put.go index 2bf482d1b..026693efe 100644 --- a/tools/benchmark/cmd/mvcc-put.go +++ b/tools/benchmark/cmd/mvcc-put.go @@ -21,8 +21,8 @@ import ( "runtime/pprof" "time" - "github.com/coreos/etcd/lease" - "github.com/coreos/etcd/pkg/report" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/pkg/report" "github.com/spf13/cobra" ) diff --git a/tools/benchmark/cmd/mvcc.go b/tools/benchmark/cmd/mvcc.go index 0e85d4b41..742ffe9cf 100644 --- a/tools/benchmark/cmd/mvcc.go +++ b/tools/benchmark/cmd/mvcc.go @@ -20,9 +20,9 @@ import ( "go.uber.org/zap" - "github.com/coreos/etcd/lease" - "github.com/coreos/etcd/mvcc" - "github.com/coreos/etcd/mvcc/backend" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/mvcc" + "go.etcd.io/etcd/mvcc/backend" "github.com/spf13/cobra" ) diff --git a/tools/benchmark/cmd/put.go b/tools/benchmark/cmd/put.go index 3d61fefa6..4f99d5c57 100644 --- a/tools/benchmark/cmd/put.go +++ b/tools/benchmark/cmd/put.go @@ -24,8 +24,8 @@ import ( "strings" "time" - v3 "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/pkg/report" + v3 "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/pkg/report" "github.com/dustin/go-humanize" "github.com/spf13/cobra" diff --git a/tools/benchmark/cmd/range.go b/tools/benchmark/cmd/range.go index 465dad6e5..a24cce318 100644 --- a/tools/benchmark/cmd/range.go +++ b/tools/benchmark/cmd/range.go @@ -21,8 +21,8 @@ import ( "os" "time" - v3 "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/pkg/report" + v3 "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/pkg/report" "github.com/spf13/cobra" "golang.org/x/time/rate" diff --git a/tools/benchmark/cmd/root.go b/tools/benchmark/cmd/root.go index cf54c8dfe..83d96f5d4 100644 --- a/tools/benchmark/cmd/root.go +++ b/tools/benchmark/cmd/root.go @@ -18,7 +18,7 @@ import ( "sync" "time" - "github.com/coreos/etcd/pkg/transport" + "go.etcd.io/etcd/pkg/transport" "github.com/spf13/cobra" "gopkg.in/cheggaaa/pb.v1" diff --git a/tools/benchmark/cmd/stm.go b/tools/benchmark/cmd/stm.go index 0312056e1..f8df5398d 100644 --- a/tools/benchmark/cmd/stm.go +++ b/tools/benchmark/cmd/stm.go @@ -23,10 +23,10 @@ import ( "os" "time" - v3 "github.com/coreos/etcd/clientv3" - v3sync "github.com/coreos/etcd/clientv3/concurrency" - "github.com/coreos/etcd/etcdserver/api/v3lock/v3lockpb" - "github.com/coreos/etcd/pkg/report" + v3 "go.etcd.io/etcd/clientv3" + v3sync "go.etcd.io/etcd/clientv3/concurrency" + "go.etcd.io/etcd/etcdserver/api/v3lock/v3lockpb" + "go.etcd.io/etcd/pkg/report" "github.com/spf13/cobra" "golang.org/x/time/rate" diff --git a/tools/benchmark/cmd/txn_put.go b/tools/benchmark/cmd/txn_put.go index 1626411f7..e042aacf6 100644 --- a/tools/benchmark/cmd/txn_put.go +++ b/tools/benchmark/cmd/txn_put.go @@ -22,8 +22,8 @@ import ( "os" "time" - v3 "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/pkg/report" + v3 "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/pkg/report" "github.com/spf13/cobra" "golang.org/x/time/rate" diff --git a/tools/benchmark/cmd/util.go b/tools/benchmark/cmd/util.go index 22ad83125..04944a317 100644 --- a/tools/benchmark/cmd/util.go +++ b/tools/benchmark/cmd/util.go @@ -22,8 +22,8 @@ import ( "strings" "github.com/bgentry/speakeasy" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/pkg/report" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/pkg/report" "google.golang.org/grpc/grpclog" ) diff --git a/tools/benchmark/cmd/watch.go b/tools/benchmark/cmd/watch.go index 5b2f57fc9..d217a39c8 100644 --- a/tools/benchmark/cmd/watch.go +++ b/tools/benchmark/cmd/watch.go @@ -23,8 +23,8 @@ import ( "sync/atomic" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/pkg/report" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/pkg/report" "github.com/spf13/cobra" "golang.org/x/time/rate" @@ -35,14 +35,14 @@ import ( var watchCmd = &cobra.Command{ Use: "watch", Short: "Benchmark watch", - Long: `Benchmark watch tests the performance of processing watch requests and -sending events to watchers. It tests the sending performance by -changing the value of the watched keys with concurrent put + Long: `Benchmark watch tests the performance of processing watch requests and +sending events to watchers. It tests the sending performance by +changing the value of the watched keys with concurrent put requests. -During the test, each watcher watches (--total/--watchers) keys +During the test, each watcher watches (--total/--watchers) keys -(a watcher might watch on the same key multiple times if +(a watcher might watch on the same key multiple times if --watched-key-total is small). Each key is watched by (--total/--watched-key-total) watchers. diff --git a/tools/benchmark/cmd/watch_get.go b/tools/benchmark/cmd/watch_get.go index bb6ee64c8..c6def95fb 100644 --- a/tools/benchmark/cmd/watch_get.go +++ b/tools/benchmark/cmd/watch_get.go @@ -20,8 +20,8 @@ import ( "sync" "time" - v3 "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/pkg/report" + v3 "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/pkg/report" "github.com/spf13/cobra" "gopkg.in/cheggaaa/pb.v1" diff --git a/tools/benchmark/cmd/watch_latency.go b/tools/benchmark/cmd/watch_latency.go index f00d29fb1..fc48ea2f3 100644 --- a/tools/benchmark/cmd/watch_latency.go +++ b/tools/benchmark/cmd/watch_latency.go @@ -21,8 +21,8 @@ import ( "sync" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/pkg/report" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/pkg/report" "github.com/spf13/cobra" "golang.org/x/time/rate" diff --git a/tools/benchmark/main.go b/tools/benchmark/main.go index 2b0396b2b..4e70b8125 100644 --- a/tools/benchmark/main.go +++ b/tools/benchmark/main.go @@ -18,7 +18,7 @@ import ( "fmt" "os" - "github.com/coreos/etcd/tools/benchmark/cmd" + "go.etcd.io/etcd/tools/benchmark/cmd" ) func main() { diff --git a/tools/etcd-dump-db/backend.go b/tools/etcd-dump-db/backend.go index 3b3eb1e54..f1a6eb119 100644 --- a/tools/etcd-dump-db/backend.go +++ b/tools/etcd-dump-db/backend.go @@ -19,10 +19,10 @@ import ( "fmt" "path/filepath" - "github.com/coreos/etcd/lease/leasepb" - "github.com/coreos/etcd/mvcc" - "github.com/coreos/etcd/mvcc/backend" - "github.com/coreos/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/lease/leasepb" + "go.etcd.io/etcd/mvcc" + "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/mvcc/mvccpb" bolt "github.com/coreos/bbolt" ) @@ -111,7 +111,7 @@ func iterateBucket(dbPath, bucket string, limit uint64, decode bool) (err error) // iterate in reverse order (use First() and Next() for ascending order) for k, v := c.Last(); k != nil; k, v = c.Prev() { // TODO: remove sensitive information - // (https://github.com/coreos/etcd/issues/7620) + // (https://go.etcd.io/etcd/issues/7620) if dec, ok := decoders[bucket]; decode && ok { dec(k, v) } else { diff --git a/tools/etcd-dump-logs/etcd-dump-log_test.go b/tools/etcd-dump-logs/etcd-dump-log_test.go index ef0d49f2b..f1b6b631c 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" - "github.com/coreos/etcd/auth/authpb" - "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/fileutil" - "github.com/coreos/etcd/pkg/pbutil" - "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/wal" + "go.etcd.io/etcd/auth/authpb" + "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/fileutil" + "go.etcd.io/etcd/pkg/pbutil" + "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/wal" "go.uber.org/zap" ) diff --git a/tools/etcd-dump-logs/main.go b/tools/etcd-dump-logs/main.go index 9c9b5e5ba..6bb589296 100644 --- a/tools/etcd-dump-logs/main.go +++ b/tools/etcd-dump-logs/main.go @@ -28,13 +28,13 @@ import ( "strings" "time" - "github.com/coreos/etcd/etcdserver/api/snap" - "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/pbutil" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/wal" - "github.com/coreos/etcd/wal/walpb" + "go.etcd.io/etcd/etcdserver/api/snap" + "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/pbutil" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/wal" + "go.etcd.io/etcd/wal/walpb" "go.uber.org/zap" ) @@ -46,8 +46,8 @@ func main() { ConfigChange, Normal, Request, InternalRaftRequest, IRRRange, IRRPut, IRRDeleteRange, IRRTxn, IRRCompaction, IRRLeaseGrant, IRRLeaseRevoke, IRRLeaseCheckpoint`) - streamdecoder := flag.String("stream-decoder", "", `The name of an executable decoding tool, the executable must process - hex encoded lines of binary input (from etcd-dump-logs) + streamdecoder := flag.String("stream-decoder", "", `The name of an executable decoding tool, the executable must process + hex encoded lines of binary input (from etcd-dump-logs) and output a hex encoded line of binary for each input line`) flag.Parse() diff --git a/tools/etcd-dump-metrics/etcd.go b/tools/etcd-dump-metrics/etcd.go index 32aefa96a..2939b60c2 100644 --- a/tools/etcd-dump-metrics/etcd.go +++ b/tools/etcd-dump-metrics/etcd.go @@ -23,8 +23,8 @@ import ( "strings" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/embed" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/embed" "go.uber.org/zap" ) diff --git a/tools/etcd-dump-metrics/install_darwin.go b/tools/etcd-dump-metrics/install_darwin.go index 33394e24b..4d545b240 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" - "github.com/coreos/etcd/pkg/fileutil" + "go.etcd.io/etcd/pkg/fileutil" ) const downloadURL = `https://storage.googleapis.com/etcd/%s/etcd-%s-darwin-amd64.zip` diff --git a/tools/etcd-dump-metrics/install_linux.go b/tools/etcd-dump-metrics/install_linux.go index 6faaa2325..0c6fc9707 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" - "github.com/coreos/etcd/pkg/fileutil" + "go.etcd.io/etcd/pkg/fileutil" ) const downloadURL = `https://storage.googleapis.com/etcd/%s/etcd-%s-linux-amd64.tar.gz` diff --git a/tools/etcd-dump-metrics/main.go b/tools/etcd-dump-metrics/main.go index 712be3c7d..a2ff77c31 100644 --- a/tools/etcd-dump-metrics/main.go +++ b/tools/etcd-dump-metrics/main.go @@ -24,7 +24,7 @@ import ( "path/filepath" "time" - "github.com/coreos/etcd/embed" + "go.etcd.io/etcd/embed" "go.uber.org/zap" ) diff --git a/tools/etcd-dump-metrics/metrics.go b/tools/etcd-dump-metrics/metrics.go index dba687fbf..3840b20fb 100644 --- a/tools/etcd-dump-metrics/metrics.go +++ b/tools/etcd-dump-metrics/metrics.go @@ -22,7 +22,7 @@ import ( "strings" "time" - "github.com/coreos/etcd/pkg/transport" + "go.etcd.io/etcd/pkg/transport" "go.uber.org/zap" )