From 1399bc69ce091ed4e31ef932315ac78c4cefd85c Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Tue, 28 Aug 2018 17:11:43 -0700 Subject: [PATCH] etcdserver: update import paths to "go.etcd.io/etcd" Signed-off-by: Gyuho Lee --- etcdserver/api/capability.go | 4 +- etcdserver/api/cluster.go | 4 +- etcdserver/api/etcdhttp/base.go | 14 ++--- etcdserver/api/etcdhttp/metrics.go | 6 +- etcdserver/api/etcdhttp/peer.go | 8 +-- etcdserver/api/etcdhttp/peer_test.go | 8 +-- etcdserver/api/etcdhttp/version_test.go | 2 +- etcdserver/api/membership/cluster.go | 16 +++--- etcdserver/api/membership/cluster_test.go | 10 ++-- etcdserver/api/membership/errors.go | 2 +- etcdserver/api/membership/member.go | 4 +- etcdserver/api/membership/member_test.go | 2 +- etcdserver/api/membership/store.go | 6 +- etcdserver/api/rafthttp/coder.go | 2 +- etcdserver/api/rafthttp/functional_test.go | 8 +-- etcdserver/api/rafthttp/http.go | 10 ++-- etcdserver/api/rafthttp/http_test.go | 10 ++-- etcdserver/api/rafthttp/msg_codec.go | 4 +- etcdserver/api/rafthttp/msg_codec_test.go | 2 +- etcdserver/api/rafthttp/msgappv2_codec.go | 8 +-- .../api/rafthttp/msgappv2_codec_test.go | 6 +- etcdserver/api/rafthttp/peer.go | 10 ++-- etcdserver/api/rafthttp/peer_status.go | 2 +- etcdserver/api/rafthttp/peer_test.go | 2 +- etcdserver/api/rafthttp/pipeline.go | 10 ++-- etcdserver/api/rafthttp/pipeline_test.go | 10 ++-- etcdserver/api/rafthttp/remote.go | 4 +- etcdserver/api/rafthttp/snapshot_sender.go | 10 ++-- etcdserver/api/rafthttp/snapshot_test.go | 6 +- etcdserver/api/rafthttp/stream.go | 12 ++-- etcdserver/api/rafthttp/stream_test.go | 10 ++-- etcdserver/api/rafthttp/transport.go | 16 +++--- .../api/rafthttp/transport_bench_test.go | 8 +-- etcdserver/api/rafthttp/transport_test.go | 8 +-- etcdserver/api/rafthttp/urlpick.go | 2 +- etcdserver/api/rafthttp/urlpick_test.go | 2 +- etcdserver/api/rafthttp/util.go | 6 +- etcdserver/api/rafthttp/util_test.go | 4 +- etcdserver/api/snap/db.go | 2 +- etcdserver/api/snap/message.go | 4 +- etcdserver/api/snap/snapshotter.go | 12 ++-- etcdserver/api/snap/snapshotter_test.go | 2 +- etcdserver/api/v2auth/auth.go | 10 ++-- etcdserver/api/v2auth/auth_requests.go | 6 +- etcdserver/api/v2auth/auth_test.go | 8 +-- etcdserver/api/v2discovery/discovery.go | 8 +-- etcdserver/api/v2discovery/discovery_test.go | 2 +- etcdserver/api/v2http/capability.go | 4 +- etcdserver/api/v2http/client.go | 22 ++++---- etcdserver/api/v2http/client_auth.go | 6 +- etcdserver/api/v2http/client_auth_test.go | 4 +- etcdserver/api/v2http/client_test.go | 20 +++---- etcdserver/api/v2http/http.go | 10 ++-- etcdserver/api/v2http/http_test.go | 12 ++-- etcdserver/api/v2http/httptypes/errors.go | 2 +- etcdserver/api/v2http/httptypes/member.go | 2 +- .../api/v2http/httptypes/member_test.go | 2 +- etcdserver/api/v2http/metrics.go | 6 +- etcdserver/api/v2stats/server.go | 2 +- etcdserver/api/v2stats/stats.go | 2 +- etcdserver/api/v2store/event_history.go | 2 +- etcdserver/api/v2store/event_test.go | 2 +- etcdserver/api/v2store/node.go | 2 +- etcdserver/api/v2store/node_extern_test.go | 2 +- etcdserver/api/v2store/stats_test.go | 2 +- etcdserver/api/v2store/store.go | 4 +- etcdserver/api/v2store/store_test.go | 6 +- etcdserver/api/v2store/store_ttl_test.go | 4 +- etcdserver/api/v2store/store_v2_test.go | 4 +- etcdserver/api/v2store/store_v2v3_test.go | 8 +-- etcdserver/api/v2store/watcher_hub.go | 2 +- etcdserver/api/v2v3/cluster.go | 4 +- etcdserver/api/v2v3/server.go | 12 ++-- etcdserver/api/v2v3/store.go | 10 ++-- etcdserver/api/v2v3/watcher.go | 6 +- etcdserver/api/v3alarm/alarms.go | 8 +-- etcdserver/api/v3client/doc.go | 4 +- etcdserver/api/v3client/v3client.go | 8 +-- etcdserver/api/v3compactor/compactor.go | 4 +- etcdserver/api/v3compactor/compactor_test.go | 4 +- etcdserver/api/v3compactor/periodic.go | 4 +- etcdserver/api/v3compactor/periodic_test.go | 4 +- etcdserver/api/v3compactor/revision.go | 4 +- etcdserver/api/v3compactor/revision_test.go | 4 +- etcdserver/api/v3election/election.go | 6 +- .../v3electionpb/gw/v3election.pb.gw.go | 2 +- .../v3election/v3electionpb/v3election.pb.go | 4 +- etcdserver/api/v3lock/lock.go | 6 +- .../api/v3lock/v3lockpb/gw/v3lock.pb.gw.go | 2 +- etcdserver/api/v3lock/v3lockpb/v3lock.pb.go | 2 +- etcdserver/api/v3rpc/auth.go | 4 +- etcdserver/api/v3rpc/grpc.go | 4 +- etcdserver/api/v3rpc/header.go | 4 +- etcdserver/api/v3rpc/interceptor.go | 12 ++-- etcdserver/api/v3rpc/key.go | 10 ++-- etcdserver/api/v3rpc/lease.go | 8 +-- etcdserver/api/v3rpc/maintenance.go | 16 +++--- etcdserver/api/v3rpc/member.go | 12 ++-- etcdserver/api/v3rpc/quota.go | 8 +-- etcdserver/api/v3rpc/util.go | 12 ++-- etcdserver/api/v3rpc/util_test.go | 4 +- etcdserver/api/v3rpc/watch.go | 12 ++-- etcdserver/api/v3rpc/watch_test.go | 4 +- etcdserver/apply.go | 12 ++-- etcdserver/apply_auth.go | 8 +-- etcdserver/apply_v2.go | 8 +-- etcdserver/backend.go | 10 ++-- etcdserver/cluster_util.go | 6 +- etcdserver/cluster_util_test.go | 4 +- etcdserver/config.go | 8 +-- etcdserver/config_test.go | 2 +- etcdserver/corrupt.go | 10 ++-- etcdserver/etcdserverpb/gw/rpc.pb.gw.go | 2 +- etcdserver/etcdserverpb/rpc.pb.go | 4 +- etcdserver/metrics.go | 4 +- etcdserver/quota.go | 2 +- etcdserver/raft.go | 22 ++++---- etcdserver/raft_test.go | 12 ++-- etcdserver/server.go | 56 +++++++++---------- etcdserver/server_test.go | 38 ++++++------- etcdserver/snapshot_merge.go | 6 +- etcdserver/storage.go | 14 ++--- etcdserver/util.go | 8 +-- etcdserver/util_test.go | 10 ++-- etcdserver/v2_server.go | 4 +- etcdserver/v3_server.go | 14 ++--- 126 files changed, 458 insertions(+), 458 deletions(-) diff --git a/etcdserver/api/capability.go b/etcdserver/api/capability.go index 7cdd0dfd4..ec0d600e8 100644 --- a/etcdserver/api/capability.go +++ b/etcdserver/api/capability.go @@ -17,7 +17,7 @@ package api import ( "sync" - "github.com/coreos/etcd/version" + "go.etcd.io/etcd/version" "go.uber.org/zap" "github.com/coreos/go-semver/semver" @@ -32,7 +32,7 @@ const ( ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "etcdserver/api") + plog = capnslog.NewPackageLogger("go.etcd.io/etcd", "etcdserver/api") // capabilityMaps is a static map of version to capability map. capabilityMaps = map[string]map[Capability]bool{ diff --git a/etcdserver/api/cluster.go b/etcdserver/api/cluster.go index 770883b43..901be9d85 100644 --- a/etcdserver/api/cluster.go +++ b/etcdserver/api/cluster.go @@ -15,8 +15,8 @@ package api import ( - "github.com/coreos/etcd/etcdserver/api/membership" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/etcdserver/api/membership" + "go.etcd.io/etcd/pkg/types" "github.com/coreos/go-semver/semver" ) diff --git a/etcdserver/api/etcdhttp/base.go b/etcdserver/api/etcdhttp/base.go index 6597703bb..c9df62ea8 100644 --- a/etcdserver/api/etcdhttp/base.go +++ b/etcdserver/api/etcdhttp/base.go @@ -21,19 +21,19 @@ import ( "net/http" "strings" - "github.com/coreos/etcd/etcdserver" - "github.com/coreos/etcd/etcdserver/api" - "github.com/coreos/etcd/etcdserver/api/v2error" - "github.com/coreos/etcd/etcdserver/api/v2http/httptypes" - "github.com/coreos/etcd/pkg/logutil" - "github.com/coreos/etcd/version" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api" + "go.etcd.io/etcd/etcdserver/api/v2error" + "go.etcd.io/etcd/etcdserver/api/v2http/httptypes" + "go.etcd.io/etcd/pkg/logutil" + "go.etcd.io/etcd/version" "github.com/coreos/pkg/capnslog" "go.uber.org/zap" ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "etcdserver/api/etcdhttp") + plog = capnslog.NewPackageLogger("go.etcd.io/etcd", "etcdserver/api/etcdhttp") mlog = logutil.NewMergeLogger(plog) ) diff --git a/etcdserver/api/etcdhttp/metrics.go b/etcdserver/api/etcdhttp/metrics.go index f374adcaa..bec5e9e05 100644 --- a/etcdserver/api/etcdhttp/metrics.go +++ b/etcdserver/api/etcdhttp/metrics.go @@ -20,9 +20,9 @@ import ( "net/http" "time" - "github.com/coreos/etcd/etcdserver" - "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/raft" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/raft" "github.com/prometheus/client_golang/prometheus/promhttp" ) diff --git a/etcdserver/api/etcdhttp/peer.go b/etcdserver/api/etcdhttp/peer.go index c55f13b99..9f3eac352 100644 --- a/etcdserver/api/etcdhttp/peer.go +++ b/etcdserver/api/etcdhttp/peer.go @@ -18,10 +18,10 @@ import ( "encoding/json" "net/http" - "github.com/coreos/etcd/etcdserver" - "github.com/coreos/etcd/etcdserver/api" - "github.com/coreos/etcd/etcdserver/api/rafthttp" - "github.com/coreos/etcd/lease/leasehttp" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api" + "go.etcd.io/etcd/etcdserver/api/rafthttp" + "go.etcd.io/etcd/lease/leasehttp" "go.uber.org/zap" ) diff --git a/etcdserver/api/etcdhttp/peer_test.go b/etcdserver/api/etcdhttp/peer_test.go index a3b6feb70..b463eaff9 100644 --- a/etcdserver/api/etcdhttp/peer_test.go +++ b/etcdserver/api/etcdhttp/peer_test.go @@ -25,10 +25,10 @@ import ( "go.uber.org/zap" - "github.com/coreos/etcd/etcdserver/api/membership" - "github.com/coreos/etcd/etcdserver/api/rafthttp" - "github.com/coreos/etcd/pkg/testutil" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/etcdserver/api/membership" + "go.etcd.io/etcd/etcdserver/api/rafthttp" + "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/types" "github.com/coreos/go-semver/semver" ) diff --git a/etcdserver/api/etcdhttp/version_test.go b/etcdserver/api/etcdhttp/version_test.go index fea165950..c60907072 100644 --- a/etcdserver/api/etcdhttp/version_test.go +++ b/etcdserver/api/etcdhttp/version_test.go @@ -20,7 +20,7 @@ import ( "net/http/httptest" "testing" - "github.com/coreos/etcd/version" + "go.etcd.io/etcd/version" ) func TestServeVersion(t *testing.T) { diff --git a/etcdserver/api/membership/cluster.go b/etcdserver/api/membership/cluster.go index a0b6be412..e0f3caacc 100644 --- a/etcdserver/api/membership/cluster.go +++ b/etcdserver/api/membership/cluster.go @@ -27,13 +27,13 @@ import ( "sync" "time" - "github.com/coreos/etcd/etcdserver/api/v2store" - "github.com/coreos/etcd/mvcc/backend" - "github.com/coreos/etcd/pkg/netutil" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft" - "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/version" + "go.etcd.io/etcd/etcdserver/api/v2store" + "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/pkg/netutil" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft" + "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/version" "github.com/coreos/go-semver/semver" "go.uber.org/zap" @@ -516,7 +516,7 @@ func (c *RaftCluster) IsReadyToAddNewMember() bool { if nstarted == 1 && nmembers == 2 { // a case of adding a new node to 1-member cluster for restoring cluster data - // https://github.com/coreos/etcd/blob/master/Documentation/v2/admin_guide.md#restoring-the-cluster + // https://go.etcd.io/etcd/blob/master/Documentation/v2/admin_guide.md#restoring-the-cluster if c.lg != nil { c.lg.Debug("number of started member is 1; can accept add member request") } else { diff --git a/etcdserver/api/membership/cluster_test.go b/etcdserver/api/membership/cluster_test.go index f8ddc243d..7aed5aec2 100644 --- a/etcdserver/api/membership/cluster_test.go +++ b/etcdserver/api/membership/cluster_test.go @@ -21,11 +21,11 @@ import ( "reflect" "testing" - "github.com/coreos/etcd/etcdserver/api/v2store" - "github.com/coreos/etcd/pkg/mock/mockstore" - "github.com/coreos/etcd/pkg/testutil" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft/raftpb" + "go.etcd.io/etcd/etcdserver/api/v2store" + "go.etcd.io/etcd/pkg/mock/mockstore" + "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft/raftpb" "go.uber.org/zap" ) diff --git a/etcdserver/api/membership/errors.go b/etcdserver/api/membership/errors.go index 9bdfa1b68..ee5777383 100644 --- a/etcdserver/api/membership/errors.go +++ b/etcdserver/api/membership/errors.go @@ -17,7 +17,7 @@ package membership import ( "errors" - "github.com/coreos/etcd/etcdserver/api/v2error" + "go.etcd.io/etcd/etcdserver/api/v2error" ) var ( diff --git a/etcdserver/api/membership/member.go b/etcdserver/api/membership/member.go index c25fbf292..32085a7dd 100644 --- a/etcdserver/api/membership/member.go +++ b/etcdserver/api/membership/member.go @@ -22,12 +22,12 @@ import ( "sort" "time" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/pkg/types" "github.com/coreos/pkg/capnslog" ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "etcdserver/membership") + plog = capnslog.NewPackageLogger("go.etcd.io/etcd", "etcdserver/membership") ) // RaftAttributes represents the raft related attributes of an etcd member. diff --git a/etcdserver/api/membership/member_test.go b/etcdserver/api/membership/member_test.go index 36015fd1b..bbbb88986 100644 --- a/etcdserver/api/membership/member_test.go +++ b/etcdserver/api/membership/member_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/pkg/types" ) func timeParse(value string) *time.Time { diff --git a/etcdserver/api/membership/store.go b/etcdserver/api/membership/store.go index c023c920f..14ab1190e 100644 --- a/etcdserver/api/membership/store.go +++ b/etcdserver/api/membership/store.go @@ -19,9 +19,9 @@ import ( "fmt" "path" - "github.com/coreos/etcd/etcdserver/api/v2store" - "github.com/coreos/etcd/mvcc/backend" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/etcdserver/api/v2store" + "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/pkg/types" "github.com/coreos/go-semver/semver" ) diff --git a/etcdserver/api/rafthttp/coder.go b/etcdserver/api/rafthttp/coder.go index 86ede972e..12c3e4424 100644 --- a/etcdserver/api/rafthttp/coder.go +++ b/etcdserver/api/rafthttp/coder.go @@ -14,7 +14,7 @@ package rafthttp -import "github.com/coreos/etcd/raft/raftpb" +import "go.etcd.io/etcd/raft/raftpb" type encoder interface { // encode encodes the given message to an output stream. diff --git a/etcdserver/api/rafthttp/functional_test.go b/etcdserver/api/rafthttp/functional_test.go index 87ac5f042..83de44478 100644 --- a/etcdserver/api/rafthttp/functional_test.go +++ b/etcdserver/api/rafthttp/functional_test.go @@ -21,10 +21,10 @@ import ( "testing" "time" - stats "github.com/coreos/etcd/etcdserver/api/v2stats" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft" - "github.com/coreos/etcd/raft/raftpb" + stats "go.etcd.io/etcd/etcdserver/api/v2stats" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft" + "go.etcd.io/etcd/raft/raftpb" ) func TestSendMessage(t *testing.T) { diff --git a/etcdserver/api/rafthttp/http.go b/etcdserver/api/rafthttp/http.go index 4eaf8ad9d..480b96d7d 100644 --- a/etcdserver/api/rafthttp/http.go +++ b/etcdserver/api/rafthttp/http.go @@ -24,11 +24,11 @@ import ( "strings" "time" - "github.com/coreos/etcd/etcdserver/api/snap" - pioutil "github.com/coreos/etcd/pkg/ioutil" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/version" + "go.etcd.io/etcd/etcdserver/api/snap" + pioutil "go.etcd.io/etcd/pkg/ioutil" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/version" humanize "github.com/dustin/go-humanize" "go.uber.org/zap" diff --git a/etcdserver/api/rafthttp/http_test.go b/etcdserver/api/rafthttp/http_test.go index dc48fefef..fd5e24563 100644 --- a/etcdserver/api/rafthttp/http_test.go +++ b/etcdserver/api/rafthttp/http_test.go @@ -26,11 +26,11 @@ import ( "testing" "time" - "github.com/coreos/etcd/etcdserver/api/snap" - "github.com/coreos/etcd/pkg/pbutil" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/version" + "go.etcd.io/etcd/etcdserver/api/snap" + "go.etcd.io/etcd/pkg/pbutil" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/version" "go.uber.org/zap" ) diff --git a/etcdserver/api/rafthttp/msg_codec.go b/etcdserver/api/rafthttp/msg_codec.go index ef59bc888..2417d222e 100644 --- a/etcdserver/api/rafthttp/msg_codec.go +++ b/etcdserver/api/rafthttp/msg_codec.go @@ -19,8 +19,8 @@ import ( "errors" "io" - "github.com/coreos/etcd/pkg/pbutil" - "github.com/coreos/etcd/raft/raftpb" + "go.etcd.io/etcd/pkg/pbutil" + "go.etcd.io/etcd/raft/raftpb" ) // messageEncoder is a encoder that can encode all kinds of messages. diff --git a/etcdserver/api/rafthttp/msg_codec_test.go b/etcdserver/api/rafthttp/msg_codec_test.go index 6e9277132..883fc8ef8 100644 --- a/etcdserver/api/rafthttp/msg_codec_test.go +++ b/etcdserver/api/rafthttp/msg_codec_test.go @@ -19,7 +19,7 @@ import ( "reflect" "testing" - "github.com/coreos/etcd/raft/raftpb" + "go.etcd.io/etcd/raft/raftpb" ) func TestMessage(t *testing.T) { diff --git a/etcdserver/api/rafthttp/msgappv2_codec.go b/etcdserver/api/rafthttp/msgappv2_codec.go index 18ff16b70..1fa36deb3 100644 --- a/etcdserver/api/rafthttp/msgappv2_codec.go +++ b/etcdserver/api/rafthttp/msgappv2_codec.go @@ -20,10 +20,10 @@ import ( "io" "time" - stats "github.com/coreos/etcd/etcdserver/api/v2stats" - "github.com/coreos/etcd/pkg/pbutil" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft/raftpb" + stats "go.etcd.io/etcd/etcdserver/api/v2stats" + "go.etcd.io/etcd/pkg/pbutil" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft/raftpb" ) const ( diff --git a/etcdserver/api/rafthttp/msgappv2_codec_test.go b/etcdserver/api/rafthttp/msgappv2_codec_test.go index dff412b04..48fd28992 100644 --- a/etcdserver/api/rafthttp/msgappv2_codec_test.go +++ b/etcdserver/api/rafthttp/msgappv2_codec_test.go @@ -19,9 +19,9 @@ import ( "reflect" "testing" - stats "github.com/coreos/etcd/etcdserver/api/v2stats" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft/raftpb" + stats "go.etcd.io/etcd/etcdserver/api/v2stats" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft/raftpb" ) func TestMsgAppV2(t *testing.T) { diff --git a/etcdserver/api/rafthttp/peer.go b/etcdserver/api/rafthttp/peer.go index d3342fd1a..8130c4a96 100644 --- a/etcdserver/api/rafthttp/peer.go +++ b/etcdserver/api/rafthttp/peer.go @@ -19,11 +19,11 @@ import ( "sync" "time" - "github.com/coreos/etcd/etcdserver/api/snap" - stats "github.com/coreos/etcd/etcdserver/api/v2stats" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft" - "github.com/coreos/etcd/raft/raftpb" + "go.etcd.io/etcd/etcdserver/api/snap" + stats "go.etcd.io/etcd/etcdserver/api/v2stats" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft" + "go.etcd.io/etcd/raft/raftpb" "go.uber.org/zap" "golang.org/x/time/rate" diff --git a/etcdserver/api/rafthttp/peer_status.go b/etcdserver/api/rafthttp/peer_status.go index a0c1d560e..66149ff67 100644 --- a/etcdserver/api/rafthttp/peer_status.go +++ b/etcdserver/api/rafthttp/peer_status.go @@ -20,7 +20,7 @@ import ( "sync" "time" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/pkg/types" "go.uber.org/zap" ) diff --git a/etcdserver/api/rafthttp/peer_test.go b/etcdserver/api/rafthttp/peer_test.go index 00e00853b..29ef70fc6 100644 --- a/etcdserver/api/rafthttp/peer_test.go +++ b/etcdserver/api/rafthttp/peer_test.go @@ -17,7 +17,7 @@ package rafthttp import ( "testing" - "github.com/coreos/etcd/raft/raftpb" + "go.etcd.io/etcd/raft/raftpb" ) func TestPeerPick(t *testing.T) { diff --git a/etcdserver/api/rafthttp/pipeline.go b/etcdserver/api/rafthttp/pipeline.go index 6e6704f58..e2ce3c289 100644 --- a/etcdserver/api/rafthttp/pipeline.go +++ b/etcdserver/api/rafthttp/pipeline.go @@ -22,11 +22,11 @@ import ( "sync" "time" - stats "github.com/coreos/etcd/etcdserver/api/v2stats" - "github.com/coreos/etcd/pkg/pbutil" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft" - "github.com/coreos/etcd/raft/raftpb" + stats "go.etcd.io/etcd/etcdserver/api/v2stats" + "go.etcd.io/etcd/pkg/pbutil" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft" + "go.etcd.io/etcd/raft/raftpb" "go.uber.org/zap" ) diff --git a/etcdserver/api/rafthttp/pipeline_test.go b/etcdserver/api/rafthttp/pipeline_test.go index 4370887f6..231c768db 100644 --- a/etcdserver/api/rafthttp/pipeline_test.go +++ b/etcdserver/api/rafthttp/pipeline_test.go @@ -24,11 +24,11 @@ import ( "testing" "time" - stats "github.com/coreos/etcd/etcdserver/api/v2stats" - "github.com/coreos/etcd/pkg/testutil" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/version" + stats "go.etcd.io/etcd/etcdserver/api/v2stats" + "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/version" "go.uber.org/zap" ) diff --git a/etcdserver/api/rafthttp/remote.go b/etcdserver/api/rafthttp/remote.go index 02acd2826..1ef2493ed 100644 --- a/etcdserver/api/rafthttp/remote.go +++ b/etcdserver/api/rafthttp/remote.go @@ -15,8 +15,8 @@ package rafthttp import ( - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft/raftpb" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft/raftpb" "go.uber.org/zap" ) diff --git a/etcdserver/api/rafthttp/snapshot_sender.go b/etcdserver/api/rafthttp/snapshot_sender.go index fec6238e6..85abaeaa4 100644 --- a/etcdserver/api/rafthttp/snapshot_sender.go +++ b/etcdserver/api/rafthttp/snapshot_sender.go @@ -22,11 +22,11 @@ import ( "net/http" "time" - "github.com/coreos/etcd/etcdserver/api/snap" - "github.com/coreos/etcd/pkg/httputil" - pioutil "github.com/coreos/etcd/pkg/ioutil" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft" + "go.etcd.io/etcd/etcdserver/api/snap" + "go.etcd.io/etcd/pkg/httputil" + pioutil "go.etcd.io/etcd/pkg/ioutil" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft" "github.com/dustin/go-humanize" "go.uber.org/zap" diff --git a/etcdserver/api/rafthttp/snapshot_test.go b/etcdserver/api/rafthttp/snapshot_test.go index 902d17e98..504a8ff64 100644 --- a/etcdserver/api/rafthttp/snapshot_test.go +++ b/etcdserver/api/rafthttp/snapshot_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" - "github.com/coreos/etcd/etcdserver/api/snap" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft/raftpb" + "go.etcd.io/etcd/etcdserver/api/snap" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft/raftpb" "go.uber.org/zap" ) diff --git a/etcdserver/api/rafthttp/stream.go b/etcdserver/api/rafthttp/stream.go index b8795bff0..dcb2223ca 100644 --- a/etcdserver/api/rafthttp/stream.go +++ b/etcdserver/api/rafthttp/stream.go @@ -25,12 +25,12 @@ import ( "sync" "time" - stats "github.com/coreos/etcd/etcdserver/api/v2stats" - "github.com/coreos/etcd/pkg/httputil" - "github.com/coreos/etcd/pkg/transport" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/version" + stats "go.etcd.io/etcd/etcdserver/api/v2stats" + "go.etcd.io/etcd/pkg/httputil" + "go.etcd.io/etcd/pkg/transport" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/version" "github.com/coreos/go-semver/semver" "go.uber.org/zap" diff --git a/etcdserver/api/rafthttp/stream_test.go b/etcdserver/api/rafthttp/stream_test.go index 90986b8fd..56b3e7fe0 100644 --- a/etcdserver/api/rafthttp/stream_test.go +++ b/etcdserver/api/rafthttp/stream_test.go @@ -26,11 +26,11 @@ import ( "testing" "time" - stats "github.com/coreos/etcd/etcdserver/api/v2stats" - "github.com/coreos/etcd/pkg/testutil" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/version" + stats "go.etcd.io/etcd/etcdserver/api/v2stats" + "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/version" "github.com/coreos/go-semver/semver" "go.uber.org/zap" diff --git a/etcdserver/api/rafthttp/transport.go b/etcdserver/api/rafthttp/transport.go index d7aef130c..e52acfceb 100644 --- a/etcdserver/api/rafthttp/transport.go +++ b/etcdserver/api/rafthttp/transport.go @@ -20,13 +20,13 @@ import ( "sync" "time" - "github.com/coreos/etcd/etcdserver/api/snap" - stats "github.com/coreos/etcd/etcdserver/api/v2stats" - "github.com/coreos/etcd/pkg/logutil" - "github.com/coreos/etcd/pkg/transport" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft" - "github.com/coreos/etcd/raft/raftpb" + "go.etcd.io/etcd/etcdserver/api/snap" + stats "go.etcd.io/etcd/etcdserver/api/v2stats" + "go.etcd.io/etcd/pkg/logutil" + "go.etcd.io/etcd/pkg/transport" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft" + "go.etcd.io/etcd/raft/raftpb" "github.com/coreos/pkg/capnslog" "github.com/xiang90/probing" @@ -34,7 +34,7 @@ import ( "golang.org/x/time/rate" ) -var plog = logutil.NewMergeLogger(capnslog.NewPackageLogger("github.com/coreos/etcd", "rafthttp")) +var plog = logutil.NewMergeLogger(capnslog.NewPackageLogger("go.etcd.io/etcd", "rafthttp")) type Raft interface { Process(ctx context.Context, m raftpb.Message) error diff --git a/etcdserver/api/rafthttp/transport_bench_test.go b/etcdserver/api/rafthttp/transport_bench_test.go index f34e72465..9e6aabd4f 100644 --- a/etcdserver/api/rafthttp/transport_bench_test.go +++ b/etcdserver/api/rafthttp/transport_bench_test.go @@ -21,10 +21,10 @@ import ( "testing" "time" - stats "github.com/coreos/etcd/etcdserver/api/v2stats" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft" - "github.com/coreos/etcd/raft/raftpb" + stats "go.etcd.io/etcd/etcdserver/api/v2stats" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft" + "go.etcd.io/etcd/raft/raftpb" ) func BenchmarkSendingMsgApp(b *testing.B) { diff --git a/etcdserver/api/rafthttp/transport_test.go b/etcdserver/api/rafthttp/transport_test.go index a59e97cdc..9a58ce74f 100644 --- a/etcdserver/api/rafthttp/transport_test.go +++ b/etcdserver/api/rafthttp/transport_test.go @@ -20,10 +20,10 @@ import ( "testing" "time" - stats "github.com/coreos/etcd/etcdserver/api/v2stats" - "github.com/coreos/etcd/pkg/testutil" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft/raftpb" + stats "go.etcd.io/etcd/etcdserver/api/v2stats" + "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft/raftpb" "github.com/xiang90/probing" ) diff --git a/etcdserver/api/rafthttp/urlpick.go b/etcdserver/api/rafthttp/urlpick.go index 61839deeb..61ef46864 100644 --- a/etcdserver/api/rafthttp/urlpick.go +++ b/etcdserver/api/rafthttp/urlpick.go @@ -18,7 +18,7 @@ import ( "net/url" "sync" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/pkg/types" ) type urlPicker struct { diff --git a/etcdserver/api/rafthttp/urlpick_test.go b/etcdserver/api/rafthttp/urlpick_test.go index 70ebbd326..230730de5 100644 --- a/etcdserver/api/rafthttp/urlpick_test.go +++ b/etcdserver/api/rafthttp/urlpick_test.go @@ -18,7 +18,7 @@ import ( "net/url" "testing" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/testutil" ) // TestURLPickerPickTwice tests that pick returns a possible url, diff --git a/etcdserver/api/rafthttp/util.go b/etcdserver/api/rafthttp/util.go index bc521c46d..20938647c 100644 --- a/etcdserver/api/rafthttp/util.go +++ b/etcdserver/api/rafthttp/util.go @@ -23,9 +23,9 @@ import ( "strings" "time" - "github.com/coreos/etcd/pkg/transport" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/version" + "go.etcd.io/etcd/pkg/transport" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/version" "github.com/coreos/go-semver/semver" ) diff --git a/etcdserver/api/rafthttp/util_test.go b/etcdserver/api/rafthttp/util_test.go index bc55226ee..17a385ed1 100644 --- a/etcdserver/api/rafthttp/util_test.go +++ b/etcdserver/api/rafthttp/util_test.go @@ -22,8 +22,8 @@ import ( "reflect" "testing" - "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/version" + "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/version" "github.com/coreos/go-semver/semver" ) diff --git a/etcdserver/api/snap/db.go b/etcdserver/api/snap/db.go index be0933541..3002ccdcc 100644 --- a/etcdserver/api/snap/db.go +++ b/etcdserver/api/snap/db.go @@ -23,7 +23,7 @@ import ( "path/filepath" "time" - "github.com/coreos/etcd/pkg/fileutil" + "go.etcd.io/etcd/pkg/fileutil" humanize "github.com/dustin/go-humanize" "go.uber.org/zap" diff --git a/etcdserver/api/snap/message.go b/etcdserver/api/snap/message.go index d73713ff1..c1151e27e 100644 --- a/etcdserver/api/snap/message.go +++ b/etcdserver/api/snap/message.go @@ -17,8 +17,8 @@ package snap import ( "io" - "github.com/coreos/etcd/pkg/ioutil" - "github.com/coreos/etcd/raft/raftpb" + "go.etcd.io/etcd/pkg/ioutil" + "go.etcd.io/etcd/raft/raftpb" ) // Message is a struct that contains a raft Message and a ReadCloser. The type diff --git a/etcdserver/api/snap/snapshotter.go b/etcdserver/api/snap/snapshotter.go index 75edadbff..feb420b14 100644 --- a/etcdserver/api/snap/snapshotter.go +++ b/etcdserver/api/snap/snapshotter.go @@ -25,11 +25,11 @@ import ( "strings" "time" - "github.com/coreos/etcd/etcdserver/api/snap/snappb" - pioutil "github.com/coreos/etcd/pkg/ioutil" - "github.com/coreos/etcd/pkg/pbutil" - "github.com/coreos/etcd/raft" - "github.com/coreos/etcd/raft/raftpb" + "go.etcd.io/etcd/etcdserver/api/snap/snappb" + pioutil "go.etcd.io/etcd/pkg/ioutil" + "go.etcd.io/etcd/pkg/pbutil" + "go.etcd.io/etcd/raft" + "go.etcd.io/etcd/raft/raftpb" "github.com/coreos/pkg/capnslog" "go.uber.org/zap" @@ -38,7 +38,7 @@ import ( const snapSuffix = ".snap" var ( - plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "snap") + plog = capnslog.NewPackageLogger("go.etcd.io/etcd", "snap") ErrNoSnapshot = errors.New("snap: no available snapshot") ErrEmptySnapshot = errors.New("snap: empty snapshot") diff --git a/etcdserver/api/snap/snapshotter_test.go b/etcdserver/api/snap/snapshotter_test.go index fea99449b..00e3e21dc 100644 --- a/etcdserver/api/snap/snapshotter_test.go +++ b/etcdserver/api/snap/snapshotter_test.go @@ -23,7 +23,7 @@ import ( "reflect" "testing" - "github.com/coreos/etcd/raft/raftpb" + "go.etcd.io/etcd/raft/raftpb" "go.uber.org/zap" ) diff --git a/etcdserver/api/v2auth/auth.go b/etcdserver/api/v2auth/auth.go index c828323c4..bee089374 100644 --- a/etcdserver/api/v2auth/auth.go +++ b/etcdserver/api/v2auth/auth.go @@ -26,10 +26,10 @@ import ( "strings" "time" - "github.com/coreos/etcd/etcdserver" - "github.com/coreos/etcd/etcdserver/api/v2error" - "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api/v2error" + "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/types" "github.com/coreos/pkg/capnslog" "go.uber.org/zap" @@ -48,7 +48,7 @@ const ( ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "etcdserver/auth") + plog = capnslog.NewPackageLogger("go.etcd.io/etcd", "etcdserver/auth") ) var rootRole = Role{ diff --git a/etcdserver/api/v2auth/auth_requests.go b/etcdserver/api/v2auth/auth_requests.go index fb47866b7..21369860c 100644 --- a/etcdserver/api/v2auth/auth_requests.go +++ b/etcdserver/api/v2auth/auth_requests.go @@ -19,9 +19,9 @@ import ( "encoding/json" "path" - "github.com/coreos/etcd/etcdserver" - "github.com/coreos/etcd/etcdserver/api/v2error" - "github.com/coreos/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api/v2error" + "go.etcd.io/etcd/etcdserver/etcdserverpb" "go.uber.org/zap" ) diff --git a/etcdserver/api/v2auth/auth_test.go b/etcdserver/api/v2auth/auth_test.go index 43bce1a9c..5c1564b25 100644 --- a/etcdserver/api/v2auth/auth_test.go +++ b/etcdserver/api/v2auth/auth_test.go @@ -20,10 +20,10 @@ import ( "testing" "time" - "github.com/coreos/etcd/etcdserver" - "github.com/coreos/etcd/etcdserver/api/v2error" - "github.com/coreos/etcd/etcdserver/api/v2store" - "github.com/coreos/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api/v2error" + "go.etcd.io/etcd/etcdserver/api/v2store" + "go.etcd.io/etcd/etcdserver/etcdserverpb" "go.uber.org/zap" ) diff --git a/etcdserver/api/v2discovery/discovery.go b/etcdserver/api/v2discovery/discovery.go index ff44f2f2f..cf770b378 100644 --- a/etcdserver/api/v2discovery/discovery.go +++ b/etcdserver/api/v2discovery/discovery.go @@ -29,9 +29,9 @@ import ( "strings" "time" - "github.com/coreos/etcd/client" - "github.com/coreos/etcd/pkg/transport" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/client" + "go.etcd.io/etcd/pkg/transport" + "go.etcd.io/etcd/pkg/types" "github.com/coreos/pkg/capnslog" "github.com/jonboulle/clockwork" @@ -39,7 +39,7 @@ import ( ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "discovery") + plog = capnslog.NewPackageLogger("go.etcd.io/etcd", "discovery") ErrInvalidURL = errors.New("discovery: invalid URL") ErrBadSizeKey = errors.New("discovery: size key is bad") diff --git a/etcdserver/api/v2discovery/discovery_test.go b/etcdserver/api/v2discovery/discovery_test.go index 8d97b08a7..c1eff8823 100644 --- a/etcdserver/api/v2discovery/discovery_test.go +++ b/etcdserver/api/v2discovery/discovery_test.go @@ -28,7 +28,7 @@ import ( "go.uber.org/zap" - "github.com/coreos/etcd/client" + "go.etcd.io/etcd/client" "github.com/jonboulle/clockwork" ) diff --git a/etcdserver/api/v2http/capability.go b/etcdserver/api/v2http/capability.go index ab484bc6b..ed6c456d0 100644 --- a/etcdserver/api/v2http/capability.go +++ b/etcdserver/api/v2http/capability.go @@ -18,8 +18,8 @@ import ( "fmt" "net/http" - "github.com/coreos/etcd/etcdserver/api" - "github.com/coreos/etcd/etcdserver/api/v2http/httptypes" + "go.etcd.io/etcd/etcdserver/api" + "go.etcd.io/etcd/etcdserver/api/v2http/httptypes" ) func authCapabilityHandler(fn func(http.ResponseWriter, *http.Request)) http.HandlerFunc { diff --git a/etcdserver/api/v2http/client.go b/etcdserver/api/v2http/client.go index 58de1be95..b0e01c98a 100644 --- a/etcdserver/api/v2http/client.go +++ b/etcdserver/api/v2http/client.go @@ -27,17 +27,17 @@ import ( "strings" "time" - "github.com/coreos/etcd/etcdserver" - "github.com/coreos/etcd/etcdserver/api" - "github.com/coreos/etcd/etcdserver/api/etcdhttp" - "github.com/coreos/etcd/etcdserver/api/membership" - "github.com/coreos/etcd/etcdserver/api/v2auth" - "github.com/coreos/etcd/etcdserver/api/v2error" - "github.com/coreos/etcd/etcdserver/api/v2http/httptypes" - stats "github.com/coreos/etcd/etcdserver/api/v2stats" - "github.com/coreos/etcd/etcdserver/api/v2store" - "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api" + "go.etcd.io/etcd/etcdserver/api/etcdhttp" + "go.etcd.io/etcd/etcdserver/api/membership" + "go.etcd.io/etcd/etcdserver/api/v2auth" + "go.etcd.io/etcd/etcdserver/api/v2error" + "go.etcd.io/etcd/etcdserver/api/v2http/httptypes" + stats "go.etcd.io/etcd/etcdserver/api/v2stats" + "go.etcd.io/etcd/etcdserver/api/v2store" + "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/types" "github.com/jonboulle/clockwork" "go.uber.org/zap" diff --git a/etcdserver/api/v2http/client_auth.go b/etcdserver/api/v2http/client_auth.go index 539e91ce4..d8d6a883a 100644 --- a/etcdserver/api/v2http/client_auth.go +++ b/etcdserver/api/v2http/client_auth.go @@ -20,9 +20,9 @@ import ( "path" "strings" - "github.com/coreos/etcd/etcdserver/api" - "github.com/coreos/etcd/etcdserver/api/v2auth" - "github.com/coreos/etcd/etcdserver/api/v2http/httptypes" + "go.etcd.io/etcd/etcdserver/api" + "go.etcd.io/etcd/etcdserver/api/v2auth" + "go.etcd.io/etcd/etcdserver/api/v2http/httptypes" "go.uber.org/zap" ) diff --git a/etcdserver/api/v2http/client_auth_test.go b/etcdserver/api/v2http/client_auth_test.go index f4fc2fbdf..22dfafa8f 100644 --- a/etcdserver/api/v2http/client_auth_test.go +++ b/etcdserver/api/v2http/client_auth_test.go @@ -30,8 +30,8 @@ import ( "strings" "testing" - "github.com/coreos/etcd/etcdserver/api" - "github.com/coreos/etcd/etcdserver/api/v2auth" + "go.etcd.io/etcd/etcdserver/api" + "go.etcd.io/etcd/etcdserver/api/v2auth" "go.uber.org/zap" ) diff --git a/etcdserver/api/v2http/client_test.go b/etcdserver/api/v2http/client_test.go index fa8e1a270..4a8c37f05 100644 --- a/etcdserver/api/v2http/client_test.go +++ b/etcdserver/api/v2http/client_test.go @@ -29,16 +29,16 @@ import ( "testing" "time" - "github.com/coreos/etcd/etcdserver" - "github.com/coreos/etcd/etcdserver/api" - "github.com/coreos/etcd/etcdserver/api/membership" - "github.com/coreos/etcd/etcdserver/api/v2error" - "github.com/coreos/etcd/etcdserver/api/v2http/httptypes" - "github.com/coreos/etcd/etcdserver/api/v2store" - "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/testutil" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft/raftpb" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api" + "go.etcd.io/etcd/etcdserver/api/membership" + "go.etcd.io/etcd/etcdserver/api/v2error" + "go.etcd.io/etcd/etcdserver/api/v2http/httptypes" + "go.etcd.io/etcd/etcdserver/api/v2store" + "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft/raftpb" "github.com/coreos/go-semver/semver" "github.com/jonboulle/clockwork" diff --git a/etcdserver/api/v2http/http.go b/etcdserver/api/v2http/http.go index 892d202ba..c6956893e 100644 --- a/etcdserver/api/v2http/http.go +++ b/etcdserver/api/v2http/http.go @@ -20,10 +20,10 @@ import ( "strings" "time" - "github.com/coreos/etcd/etcdserver/api/etcdhttp" - "github.com/coreos/etcd/etcdserver/api/v2auth" - "github.com/coreos/etcd/etcdserver/api/v2http/httptypes" - "github.com/coreos/etcd/pkg/logutil" + "go.etcd.io/etcd/etcdserver/api/etcdhttp" + "go.etcd.io/etcd/etcdserver/api/v2auth" + "go.etcd.io/etcd/etcdserver/api/v2http/httptypes" + "go.etcd.io/etcd/pkg/logutil" "github.com/coreos/pkg/capnslog" "go.uber.org/zap" @@ -35,7 +35,7 @@ const ( ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "etcdserver/api/v2http") + plog = capnslog.NewPackageLogger("go.etcd.io/etcd", "etcdserver/api/v2http") mlog = logutil.NewMergeLogger(plog) ) diff --git a/etcdserver/api/v2http/http_test.go b/etcdserver/api/v2http/http_test.go index 266c28ed1..0e42c26ca 100644 --- a/etcdserver/api/v2http/http_test.go +++ b/etcdserver/api/v2http/http_test.go @@ -22,12 +22,12 @@ import ( "sort" "testing" - "github.com/coreos/etcd/etcdserver" - "github.com/coreos/etcd/etcdserver/api/membership" - "github.com/coreos/etcd/etcdserver/api/v2error" - "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft/raftpb" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api/membership" + "go.etcd.io/etcd/etcdserver/api/v2error" + "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft/raftpb" "github.com/coreos/go-semver/semver" "go.uber.org/zap" diff --git a/etcdserver/api/v2http/httptypes/errors.go b/etcdserver/api/v2http/httptypes/errors.go index 0657604ca..245c0899e 100644 --- a/etcdserver/api/v2http/httptypes/errors.go +++ b/etcdserver/api/v2http/httptypes/errors.go @@ -22,7 +22,7 @@ import ( ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "etcdserver/api/v2http/httptypes") + plog = capnslog.NewPackageLogger("go.etcd.io/etcd", "etcdserver/api/v2http/httptypes") ) type HTTPError struct { diff --git a/etcdserver/api/v2http/httptypes/member.go b/etcdserver/api/v2http/httptypes/member.go index 738d74432..95fd443ff 100644 --- a/etcdserver/api/v2http/httptypes/member.go +++ b/etcdserver/api/v2http/httptypes/member.go @@ -19,7 +19,7 @@ package httptypes import ( "encoding/json" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/pkg/types" ) type Member struct { diff --git a/etcdserver/api/v2http/httptypes/member_test.go b/etcdserver/api/v2http/httptypes/member_test.go index ab6045e0e..a13efbc14 100644 --- a/etcdserver/api/v2http/httptypes/member_test.go +++ b/etcdserver/api/v2http/httptypes/member_test.go @@ -20,7 +20,7 @@ import ( "reflect" "testing" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/pkg/types" ) func TestMemberUnmarshal(t *testing.T) { diff --git a/etcdserver/api/v2http/metrics.go b/etcdserver/api/v2http/metrics.go index 88e329934..14f7da0fe 100644 --- a/etcdserver/api/v2http/metrics.go +++ b/etcdserver/api/v2http/metrics.go @@ -20,9 +20,9 @@ import ( "net/http" - "github.com/coreos/etcd/etcdserver/api/v2error" - "github.com/coreos/etcd/etcdserver/api/v2http/httptypes" - "github.com/coreos/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/etcdserver/api/v2error" + "go.etcd.io/etcd/etcdserver/api/v2http/httptypes" + "go.etcd.io/etcd/etcdserver/etcdserverpb" "github.com/prometheus/client_golang/prometheus" ) diff --git a/etcdserver/api/v2stats/server.go b/etcdserver/api/v2stats/server.go index f80136907..c4accc735 100644 --- a/etcdserver/api/v2stats/server.go +++ b/etcdserver/api/v2stats/server.go @@ -20,7 +20,7 @@ import ( "sync" "time" - "github.com/coreos/etcd/raft" + "go.etcd.io/etcd/raft" ) // ServerStats encapsulates various statistics about an EtcdServer and its diff --git a/etcdserver/api/v2stats/stats.go b/etcdserver/api/v2stats/stats.go index 326f03e87..c50a20076 100644 --- a/etcdserver/api/v2stats/stats.go +++ b/etcdserver/api/v2stats/stats.go @@ -17,7 +17,7 @@ package v2stats import "github.com/coreos/pkg/capnslog" -var plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "etcdserver/stats") +var plog = capnslog.NewPackageLogger("go.etcd.io/etcd", "etcdserver/stats") type Stats interface { // SelfStats returns the struct representing statistics of this server diff --git a/etcdserver/api/v2store/event_history.go b/etcdserver/api/v2store/event_history.go index 6948233d6..6bf7c0f5d 100644 --- a/etcdserver/api/v2store/event_history.go +++ b/etcdserver/api/v2store/event_history.go @@ -20,7 +20,7 @@ import ( "strings" "sync" - "github.com/coreos/etcd/etcdserver/api/v2error" + "go.etcd.io/etcd/etcdserver/api/v2error" ) type EventHistory struct { diff --git a/etcdserver/api/v2store/event_test.go b/etcdserver/api/v2store/event_test.go index e9c3ceb71..7de87035c 100644 --- a/etcdserver/api/v2store/event_test.go +++ b/etcdserver/api/v2store/event_test.go @@ -17,7 +17,7 @@ package v2store import ( "testing" - "github.com/coreos/etcd/etcdserver/api/v2error" + "go.etcd.io/etcd/etcdserver/api/v2error" ) // TestEventQueue tests a queue with capacity = 100 diff --git a/etcdserver/api/v2store/node.go b/etcdserver/api/v2store/node.go index 490564404..b51ecf0aa 100644 --- a/etcdserver/api/v2store/node.go +++ b/etcdserver/api/v2store/node.go @@ -19,7 +19,7 @@ import ( "sort" "time" - "github.com/coreos/etcd/etcdserver/api/v2error" + "go.etcd.io/etcd/etcdserver/api/v2error" "github.com/jonboulle/clockwork" ) diff --git a/etcdserver/api/v2store/node_extern_test.go b/etcdserver/api/v2store/node_extern_test.go index a594e1795..df7e725f3 100644 --- a/etcdserver/api/v2store/node_extern_test.go +++ b/etcdserver/api/v2store/node_extern_test.go @@ -20,7 +20,7 @@ import ( "time" "unsafe" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/testutil" ) func TestNodeExternClone(t *testing.T) { diff --git a/etcdserver/api/v2store/stats_test.go b/etcdserver/api/v2store/stats_test.go index 293aae411..65dbf3622 100644 --- a/etcdserver/api/v2store/stats_test.go +++ b/etcdserver/api/v2store/stats_test.go @@ -18,7 +18,7 @@ import ( "testing" "time" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/testutil" ) // Ensure that a successful Get is recorded in the stats. diff --git a/etcdserver/api/v2store/store.go b/etcdserver/api/v2store/store.go index 65cc8559c..ce940436e 100644 --- a/etcdserver/api/v2store/store.go +++ b/etcdserver/api/v2store/store.go @@ -23,8 +23,8 @@ import ( "sync" "time" - "github.com/coreos/etcd/etcdserver/api/v2error" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/etcdserver/api/v2error" + "go.etcd.io/etcd/pkg/types" "github.com/jonboulle/clockwork" ) diff --git a/etcdserver/api/v2store/store_test.go b/etcdserver/api/v2store/store_test.go index b8de68615..451d9bec6 100644 --- a/etcdserver/api/v2store/store_test.go +++ b/etcdserver/api/v2store/store_test.go @@ -18,9 +18,9 @@ import ( "testing" "time" - "github.com/coreos/etcd/etcdserver/api/v2error" - "github.com/coreos/etcd/etcdserver/api/v2store" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/etcdserver/api/v2error" + "go.etcd.io/etcd/etcdserver/api/v2store" + "go.etcd.io/etcd/pkg/testutil" ) type StoreCloser interface { diff --git a/etcdserver/api/v2store/store_ttl_test.go b/etcdserver/api/v2store/store_ttl_test.go index 45c0e3648..94c7493f0 100644 --- a/etcdserver/api/v2store/store_ttl_test.go +++ b/etcdserver/api/v2store/store_ttl_test.go @@ -18,8 +18,8 @@ import ( "testing" "time" - "github.com/coreos/etcd/etcdserver/api/v2error" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/etcdserver/api/v2error" + "go.etcd.io/etcd/pkg/testutil" "github.com/jonboulle/clockwork" ) diff --git a/etcdserver/api/v2store/store_v2_test.go b/etcdserver/api/v2store/store_v2_test.go index 18d598acf..d327fd32d 100644 --- a/etcdserver/api/v2store/store_v2_test.go +++ b/etcdserver/api/v2store/store_v2_test.go @@ -19,8 +19,8 @@ package v2store_test import ( "testing" - "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" ) type v2TestStore struct { diff --git a/etcdserver/api/v2store/store_v2v3_test.go b/etcdserver/api/v2store/store_v2v3_test.go index 12ad2b2c9..d0350393a 100644 --- a/etcdserver/api/v2store/store_v2v3_test.go +++ b/etcdserver/api/v2store/store_v2v3_test.go @@ -20,10 +20,10 @@ import ( "io/ioutil" "testing" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver/api/v2store" - "github.com/coreos/etcd/etcdserver/api/v2v3" - "github.com/coreos/etcd/integration" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver/api/v2store" + "go.etcd.io/etcd/etcdserver/api/v2v3" + "go.etcd.io/etcd/integration" "google.golang.org/grpc/grpclog" ) diff --git a/etcdserver/api/v2store/watcher_hub.go b/etcdserver/api/v2store/watcher_hub.go index aa4088016..17652c2f3 100644 --- a/etcdserver/api/v2store/watcher_hub.go +++ b/etcdserver/api/v2store/watcher_hub.go @@ -21,7 +21,7 @@ import ( "sync" "sync/atomic" - "github.com/coreos/etcd/etcdserver/api/v2error" + "go.etcd.io/etcd/etcdserver/api/v2error" ) // A watcherHub contains all subscribed watchers diff --git a/etcdserver/api/v2v3/cluster.go b/etcdserver/api/v2v3/cluster.go index 2563f411f..a22e4afad 100644 --- a/etcdserver/api/v2v3/cluster.go +++ b/etcdserver/api/v2v3/cluster.go @@ -15,8 +15,8 @@ package v2v3 import ( - "github.com/coreos/etcd/etcdserver/api/membership" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/etcdserver/api/membership" + "go.etcd.io/etcd/pkg/types" "github.com/coreos/go-semver/semver" ) diff --git a/etcdserver/api/v2v3/server.go b/etcdserver/api/v2v3/server.go index f8d193080..448ba35d7 100644 --- a/etcdserver/api/v2v3/server.go +++ b/etcdserver/api/v2v3/server.go @@ -19,12 +19,12 @@ import ( "net/http" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver" - "github.com/coreos/etcd/etcdserver/api" - "github.com/coreos/etcd/etcdserver/api/membership" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api" + "go.etcd.io/etcd/etcdserver/api/membership" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/types" "github.com/coreos/go-semver/semver" "go.uber.org/zap" diff --git a/etcdserver/api/v2v3/store.go b/etcdserver/api/v2v3/store.go index 3d78e7b90..c7934d562 100644 --- a/etcdserver/api/v2v3/store.go +++ b/etcdserver/api/v2v3/store.go @@ -22,11 +22,11 @@ import ( "strings" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/concurrency" - "github.com/coreos/etcd/etcdserver/api/v2error" - "github.com/coreos/etcd/etcdserver/api/v2store" - "github.com/coreos/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/concurrency" + "go.etcd.io/etcd/etcdserver/api/v2error" + "go.etcd.io/etcd/etcdserver/api/v2store" + "go.etcd.io/etcd/mvcc/mvccpb" ) // store implements the Store interface for V2 using diff --git a/etcdserver/api/v2v3/watcher.go b/etcdserver/api/v2v3/watcher.go index c8858e84f..e8a3557c1 100644 --- a/etcdserver/api/v2v3/watcher.go +++ b/etcdserver/api/v2v3/watcher.go @@ -18,9 +18,9 @@ import ( "context" "strings" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver/api/v2error" - "github.com/coreos/etcd/etcdserver/api/v2store" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver/api/v2error" + "go.etcd.io/etcd/etcdserver/api/v2store" ) func (s *v2v3Store) Watch(prefix string, recursive, stream bool, sinceIndex uint64) (v2store.Watcher, error) { diff --git a/etcdserver/api/v3alarm/alarms.go b/etcdserver/api/v3alarm/alarms.go index 502c71967..2b085a8e7 100644 --- a/etcdserver/api/v3alarm/alarms.go +++ b/etcdserver/api/v3alarm/alarms.go @@ -18,16 +18,16 @@ package v3alarm import ( "sync" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/mvcc/backend" - "github.com/coreos/etcd/pkg/types" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/pkg/types" "github.com/coreos/pkg/capnslog" ) var ( alarmBucketName = []byte("alarm") - plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "alarm") + plog = capnslog.NewPackageLogger("go.etcd.io/etcd", "alarm") ) type BackendGetter interface { diff --git a/etcdserver/api/v3client/doc.go b/etcdserver/api/v3client/doc.go index 310715f5c..47922c433 100644 --- a/etcdserver/api/v3client/doc.go +++ b/etcdserver/api/v3client/doc.go @@ -19,8 +19,8 @@ // import ( // "context" // -// "github.com/coreos/etcd/embed" -// "github.com/coreos/etcd/etcdserver/api/v3client" +// "go.etcd.io/etcd/embed" +// "go.etcd.io/etcd/etcdserver/api/v3client" // ) // // ... diff --git a/etcdserver/api/v3client/v3client.go b/etcdserver/api/v3client/v3client.go index ab48ea75b..d2031213c 100644 --- a/etcdserver/api/v3client/v3client.go +++ b/etcdserver/api/v3client/v3client.go @@ -18,10 +18,10 @@ import ( "context" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver" - "github.com/coreos/etcd/etcdserver/api/v3rpc" - "github.com/coreos/etcd/proxy/grpcproxy/adapter" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api/v3rpc" + "go.etcd.io/etcd/proxy/grpcproxy/adapter" ) // New creates a clientv3 client that wraps an in-process EtcdServer. Instead diff --git a/etcdserver/api/v3compactor/compactor.go b/etcdserver/api/v3compactor/compactor.go index 0c44ae9c4..73a96842d 100644 --- a/etcdserver/api/v3compactor/compactor.go +++ b/etcdserver/api/v3compactor/compactor.go @@ -19,7 +19,7 @@ import ( "fmt" "time" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" "github.com/coreos/pkg/capnslog" "github.com/jonboulle/clockwork" @@ -27,7 +27,7 @@ import ( ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "compactor") + plog = capnslog.NewPackageLogger("go.etcd.io/etcd", "compactor") ) const ( diff --git a/etcdserver/api/v3compactor/compactor_test.go b/etcdserver/api/v3compactor/compactor_test.go index 697324287..76a11aeaf 100644 --- a/etcdserver/api/v3compactor/compactor_test.go +++ b/etcdserver/api/v3compactor/compactor_test.go @@ -18,8 +18,8 @@ import ( "context" "sync/atomic" - 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" ) type fakeCompactable struct { diff --git a/etcdserver/api/v3compactor/periodic.go b/etcdserver/api/v3compactor/periodic.go index 3401aad6b..ab64cb706 100644 --- a/etcdserver/api/v3compactor/periodic.go +++ b/etcdserver/api/v3compactor/periodic.go @@ -19,8 +19,8 @@ import ( "sync" "time" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/mvcc" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/mvcc" "github.com/jonboulle/clockwork" "go.uber.org/zap" diff --git a/etcdserver/api/v3compactor/periodic_test.go b/etcdserver/api/v3compactor/periodic_test.go index e6c53598d..b9d49afa6 100644 --- a/etcdserver/api/v3compactor/periodic_test.go +++ b/etcdserver/api/v3compactor/periodic_test.go @@ -19,8 +19,8 @@ import ( "testing" "time" - 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" "github.com/jonboulle/clockwork" "go.uber.org/zap" diff --git a/etcdserver/api/v3compactor/revision.go b/etcdserver/api/v3compactor/revision.go index 7807baead..cf8ac4301 100644 --- a/etcdserver/api/v3compactor/revision.go +++ b/etcdserver/api/v3compactor/revision.go @@ -19,8 +19,8 @@ import ( "sync" "time" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/mvcc" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/mvcc" "github.com/jonboulle/clockwork" "go.uber.org/zap" diff --git a/etcdserver/api/v3compactor/revision_test.go b/etcdserver/api/v3compactor/revision_test.go index 5ae5494be..fcd01066f 100644 --- a/etcdserver/api/v3compactor/revision_test.go +++ b/etcdserver/api/v3compactor/revision_test.go @@ -19,8 +19,8 @@ import ( "testing" "time" - 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" "github.com/jonboulle/clockwork" "go.uber.org/zap" diff --git a/etcdserver/api/v3election/election.go b/etcdserver/api/v3election/election.go index c66d7a382..f5a3be3b2 100644 --- a/etcdserver/api/v3election/election.go +++ b/etcdserver/api/v3election/election.go @@ -18,9 +18,9 @@ import ( "context" "errors" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/concurrency" - epb "github.com/coreos/etcd/etcdserver/api/v3election/v3electionpb" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/concurrency" + epb "go.etcd.io/etcd/etcdserver/api/v3election/v3electionpb" ) // ErrMissingLeaderKey is returned when election API request diff --git a/etcdserver/api/v3election/v3electionpb/gw/v3election.pb.gw.go b/etcdserver/api/v3election/v3electionpb/gw/v3election.pb.gw.go index b11c29175..23551b54b 100644 --- a/etcdserver/api/v3election/v3electionpb/gw/v3election.pb.gw.go +++ b/etcdserver/api/v3election/v3electionpb/gw/v3election.pb.gw.go @@ -9,7 +9,7 @@ It translates gRPC into RESTful JSON APIs. package gw import ( - "github.com/coreos/etcd/etcdserver/api/v3election/v3electionpb" + "go.etcd.io/etcd/etcdserver/api/v3election/v3electionpb" "io" "net/http" diff --git a/etcdserver/api/v3election/v3electionpb/v3election.pb.go b/etcdserver/api/v3election/v3electionpb/v3election.pb.go index 7822a9e3a..1fc1bce44 100644 --- a/etcdserver/api/v3election/v3electionpb/v3election.pb.go +++ b/etcdserver/api/v3election/v3electionpb/v3election.pb.go @@ -29,9 +29,9 @@ import ( _ "github.com/gogo/protobuf/gogoproto" - etcdserverpb "github.com/coreos/etcd/etcdserver/etcdserverpb" + etcdserverpb "go.etcd.io/etcd/etcdserver/etcdserverpb" - mvccpb "github.com/coreos/etcd/mvcc/mvccpb" + mvccpb "go.etcd.io/etcd/mvcc/mvccpb" context "golang.org/x/net/context" diff --git a/etcdserver/api/v3lock/lock.go b/etcdserver/api/v3lock/lock.go index a5efcbab5..5a17c86fc 100644 --- a/etcdserver/api/v3lock/lock.go +++ b/etcdserver/api/v3lock/lock.go @@ -17,9 +17,9 @@ package v3lock import ( "context" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/concurrency" - "github.com/coreos/etcd/etcdserver/api/v3lock/v3lockpb" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/concurrency" + "go.etcd.io/etcd/etcdserver/api/v3lock/v3lockpb" ) type lockServer struct { diff --git a/etcdserver/api/v3lock/v3lockpb/gw/v3lock.pb.gw.go b/etcdserver/api/v3lock/v3lockpb/gw/v3lock.pb.gw.go index 746ccdeaf..1eeeff185 100644 --- a/etcdserver/api/v3lock/v3lockpb/gw/v3lock.pb.gw.go +++ b/etcdserver/api/v3lock/v3lockpb/gw/v3lock.pb.gw.go @@ -9,7 +9,7 @@ It translates gRPC into RESTful JSON APIs. package gw import ( - "github.com/coreos/etcd/etcdserver/api/v3lock/v3lockpb" + "go.etcd.io/etcd/etcdserver/api/v3lock/v3lockpb" "io" "net/http" diff --git a/etcdserver/api/v3lock/v3lockpb/v3lock.pb.go b/etcdserver/api/v3lock/v3lockpb/v3lock.pb.go index 23c44e044..36ebdd90f 100644 --- a/etcdserver/api/v3lock/v3lockpb/v3lock.pb.go +++ b/etcdserver/api/v3lock/v3lockpb/v3lock.pb.go @@ -24,7 +24,7 @@ import ( _ "github.com/gogo/protobuf/gogoproto" - etcdserverpb "github.com/coreos/etcd/etcdserver/etcdserverpb" + etcdserverpb "go.etcd.io/etcd/etcdserver/etcdserverpb" context "golang.org/x/net/context" diff --git a/etcdserver/api/v3rpc/auth.go b/etcdserver/api/v3rpc/auth.go index ca8e53ad0..62ce757be 100644 --- a/etcdserver/api/v3rpc/auth.go +++ b/etcdserver/api/v3rpc/auth.go @@ -17,8 +17,8 @@ package v3rpc import ( "context" - "github.com/coreos/etcd/etcdserver" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/etcdserver" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" ) type AuthServer struct { diff --git a/etcdserver/api/v3rpc/grpc.go b/etcdserver/api/v3rpc/grpc.go index c97e74662..957c81895 100644 --- a/etcdserver/api/v3rpc/grpc.go +++ b/etcdserver/api/v3rpc/grpc.go @@ -18,8 +18,8 @@ import ( "crypto/tls" "math" - "github.com/coreos/etcd/etcdserver" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/etcdserver" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" "github.com/grpc-ecosystem/go-grpc-middleware" "github.com/grpc-ecosystem/go-grpc-prometheus" diff --git a/etcdserver/api/v3rpc/header.go b/etcdserver/api/v3rpc/header.go index c46418db1..f23b6a738 100644 --- a/etcdserver/api/v3rpc/header.go +++ b/etcdserver/api/v3rpc/header.go @@ -15,8 +15,8 @@ package v3rpc import ( - "github.com/coreos/etcd/etcdserver" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/etcdserver" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" ) type header struct { diff --git a/etcdserver/api/v3rpc/interceptor.go b/etcdserver/api/v3rpc/interceptor.go index cc095ef9c..5f6e7b6ba 100644 --- a/etcdserver/api/v3rpc/interceptor.go +++ b/etcdserver/api/v3rpc/interceptor.go @@ -19,13 +19,13 @@ import ( "sync" "time" - "github.com/coreos/etcd/etcdserver" - "github.com/coreos/etcd/etcdserver/api" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" "github.com/coreos/pkg/capnslog" "go.uber.org/zap" "google.golang.org/grpc" diff --git a/etcdserver/api/v3rpc/key.go b/etcdserver/api/v3rpc/key.go index 9781bddda..fdb002e0d 100644 --- a/etcdserver/api/v3rpc/key.go +++ b/etcdserver/api/v3rpc/key.go @@ -18,16 +18,16 @@ package v3rpc import ( "context" - "github.com/coreos/etcd/etcdserver" - "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" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/adt" "github.com/coreos/pkg/capnslog" ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "etcdserver/api/v3rpc") + plog = capnslog.NewPackageLogger("go.etcd.io/etcd", "etcdserver/api/v3rpc") ) type kvServer struct { diff --git a/etcdserver/api/v3rpc/lease.go b/etcdserver/api/v3rpc/lease.go index d8a8c6e3c..7441beedf 100644 --- a/etcdserver/api/v3rpc/lease.go +++ b/etcdserver/api/v3rpc/lease.go @@ -18,10 +18,10 @@ import ( "context" "io" - "github.com/coreos/etcd/etcdserver" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/lease" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/lease" "go.uber.org/zap" ) diff --git a/etcdserver/api/v3rpc/maintenance.go b/etcdserver/api/v3rpc/maintenance.go index 7f51f4f85..002d1c7fa 100644 --- a/etcdserver/api/v3rpc/maintenance.go +++ b/etcdserver/api/v3rpc/maintenance.go @@ -19,14 +19,14 @@ import ( "crypto/sha256" "io" - "github.com/coreos/etcd/auth" - "github.com/coreos/etcd/etcdserver" - "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/raft" - "github.com/coreos/etcd/version" + "go.etcd.io/etcd/auth" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/mvcc" + "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/raft" + "go.etcd.io/etcd/version" "go.uber.org/zap" ) diff --git a/etcdserver/api/v3rpc/member.go b/etcdserver/api/v3rpc/member.go index 81a7dc282..49baa76ee 100644 --- a/etcdserver/api/v3rpc/member.go +++ b/etcdserver/api/v3rpc/member.go @@ -18,12 +18,12 @@ import ( "context" "time" - "github.com/coreos/etcd/etcdserver" - "github.com/coreos/etcd/etcdserver/api" - "github.com/coreos/etcd/etcdserver/api/membership" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api" + "go.etcd.io/etcd/etcdserver/api/membership" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/types" ) type ClusterServer struct { diff --git a/etcdserver/api/v3rpc/quota.go b/etcdserver/api/v3rpc/quota.go index 4d78d3e7d..a145b8b09 100644 --- a/etcdserver/api/v3rpc/quota.go +++ b/etcdserver/api/v3rpc/quota.go @@ -17,10 +17,10 @@ package v3rpc import ( "context" - "github.com/coreos/etcd/etcdserver" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/types" ) type quotaKVServer struct { diff --git a/etcdserver/api/v3rpc/util.go b/etcdserver/api/v3rpc/util.go index d7812af97..62c6c12bb 100644 --- a/etcdserver/api/v3rpc/util.go +++ b/etcdserver/api/v3rpc/util.go @@ -18,12 +18,12 @@ import ( "context" "strings" - "github.com/coreos/etcd/auth" - "github.com/coreos/etcd/etcdserver" - "github.com/coreos/etcd/etcdserver/api/membership" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - "github.com/coreos/etcd/lease" - "github.com/coreos/etcd/mvcc" + "go.etcd.io/etcd/auth" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api/membership" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/mvcc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/etcdserver/api/v3rpc/util_test.go b/etcdserver/api/v3rpc/util_test.go index 8890b1d4f..e83144b96 100644 --- a/etcdserver/api/v3rpc/util_test.go +++ b/etcdserver/api/v3rpc/util_test.go @@ -19,8 +19,8 @@ import ( "errors" "testing" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - "github.com/coreos/etcd/mvcc" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/mvcc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/etcdserver/api/v3rpc/watch.go b/etcdserver/api/v3rpc/watch.go index 023cc8e16..7848cdd04 100644 --- a/etcdserver/api/v3rpc/watch.go +++ b/etcdserver/api/v3rpc/watch.go @@ -21,12 +21,12 @@ import ( "sync" "time" - "github.com/coreos/etcd/auth" - "github.com/coreos/etcd/etcdserver" - "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/mvccpb" + "go.etcd.io/etcd/auth" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/mvcc" + "go.etcd.io/etcd/mvcc/mvccpb" "go.uber.org/zap" ) diff --git a/etcdserver/api/v3rpc/watch_test.go b/etcdserver/api/v3rpc/watch_test.go index 15850ab41..66f584a06 100644 --- a/etcdserver/api/v3rpc/watch_test.go +++ b/etcdserver/api/v3rpc/watch_test.go @@ -19,8 +19,8 @@ import ( "math" "testing" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/mvcc/mvccpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/mvcc/mvccpb" ) func TestSendFragment(t *testing.T) { diff --git a/etcdserver/apply.go b/etcdserver/apply.go index 1c03995ea..1f06ad0dd 100644 --- a/etcdserver/apply.go +++ b/etcdserver/apply.go @@ -21,12 +21,12 @@ import ( "sort" "time" - "github.com/coreos/etcd/auth" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/lease" - "github.com/coreos/etcd/mvcc" - "github.com/coreos/etcd/mvcc/mvccpb" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/auth" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/mvcc" + "go.etcd.io/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/pkg/types" "github.com/gogo/protobuf/proto" "go.uber.org/zap" diff --git a/etcdserver/apply_auth.go b/etcdserver/apply_auth.go index 5aa79cb95..4b094ad5d 100644 --- a/etcdserver/apply_auth.go +++ b/etcdserver/apply_auth.go @@ -17,10 +17,10 @@ package etcdserver import ( "sync" - "github.com/coreos/etcd/auth" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/lease" - "github.com/coreos/etcd/mvcc" + "go.etcd.io/etcd/auth" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/mvcc" ) type authApplierV3 struct { diff --git a/etcdserver/apply_v2.go b/etcdserver/apply_v2.go index ab0e854c8..5b5376509 100644 --- a/etcdserver/apply_v2.go +++ b/etcdserver/apply_v2.go @@ -19,10 +19,10 @@ import ( "path" "time" - "github.com/coreos/etcd/etcdserver/api" - "github.com/coreos/etcd/etcdserver/api/membership" - "github.com/coreos/etcd/etcdserver/api/v2store" - "github.com/coreos/etcd/pkg/pbutil" + "go.etcd.io/etcd/etcdserver/api" + "go.etcd.io/etcd/etcdserver/api/membership" + "go.etcd.io/etcd/etcdserver/api/v2store" + "go.etcd.io/etcd/pkg/pbutil" "github.com/coreos/go-semver/semver" "go.uber.org/zap" diff --git a/etcdserver/backend.go b/etcdserver/backend.go index 6a0ea7e82..f22147c6c 100644 --- a/etcdserver/backend.go +++ b/etcdserver/backend.go @@ -19,11 +19,11 @@ import ( "os" "time" - "github.com/coreos/etcd/etcdserver/api/snap" - "github.com/coreos/etcd/lease" - "github.com/coreos/etcd/mvcc" - "github.com/coreos/etcd/mvcc/backend" - "github.com/coreos/etcd/raft/raftpb" + "go.etcd.io/etcd/etcdserver/api/snap" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/mvcc" + "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/raft/raftpb" "go.uber.org/zap" ) diff --git a/etcdserver/cluster_util.go b/etcdserver/cluster_util.go index 0fc9bd682..6166ac261 100644 --- a/etcdserver/cluster_util.go +++ b/etcdserver/cluster_util.go @@ -22,9 +22,9 @@ import ( "sort" "time" - "github.com/coreos/etcd/etcdserver/api/membership" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/version" + "go.etcd.io/etcd/etcdserver/api/membership" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/version" "github.com/coreos/go-semver/semver" "go.uber.org/zap" diff --git a/etcdserver/cluster_util_test.go b/etcdserver/cluster_util_test.go index 4e7123e1d..8a36a548b 100644 --- a/etcdserver/cluster_util_test.go +++ b/etcdserver/cluster_util_test.go @@ -18,8 +18,8 @@ import ( "reflect" "testing" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/version" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/version" "github.com/coreos/go-semver/semver" "go.uber.org/zap" diff --git a/etcdserver/config.go b/etcdserver/config.go index 6d945b342..143488bbe 100644 --- a/etcdserver/config.go +++ b/etcdserver/config.go @@ -22,9 +22,9 @@ import ( "strings" "time" - "github.com/coreos/etcd/pkg/netutil" - "github.com/coreos/etcd/pkg/transport" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/pkg/netutil" + "go.etcd.io/etcd/pkg/transport" + "go.etcd.io/etcd/pkg/types" "go.uber.org/zap" "go.uber.org/zap/zapcore" @@ -96,7 +96,7 @@ type ServerConfig 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 BootstrapTimeout time.Duration diff --git a/etcdserver/config_test.go b/etcdserver/config_test.go index 31c35f719..aa9582bc2 100644 --- a/etcdserver/config_test.go +++ b/etcdserver/config_test.go @@ -18,7 +18,7 @@ import ( "net/url" "testing" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/pkg/types" "go.uber.org/zap" ) diff --git a/etcdserver/corrupt.go b/etcdserver/corrupt.go index d4cd9f2e6..32678a7c5 100644 --- a/etcdserver/corrupt.go +++ b/etcdserver/corrupt.go @@ -19,11 +19,11 @@ import ( "fmt" "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/mvcc" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/mvcc" + "go.etcd.io/etcd/pkg/types" "go.uber.org/zap" ) diff --git a/etcdserver/etcdserverpb/gw/rpc.pb.gw.go b/etcdserver/etcdserverpb/gw/rpc.pb.gw.go index 5a557d52e..babe21305 100644 --- a/etcdserver/etcdserverpb/gw/rpc.pb.gw.go +++ b/etcdserver/etcdserverpb/gw/rpc.pb.gw.go @@ -9,7 +9,7 @@ It translates gRPC into RESTful JSON APIs. package gw import ( - "github.com/coreos/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/etcdserver/etcdserverpb" "io" "net/http" diff --git a/etcdserver/etcdserverpb/rpc.pb.go b/etcdserver/etcdserverpb/rpc.pb.go index ddf72d6a8..3e15079e6 100644 --- a/etcdserver/etcdserverpb/rpc.pb.go +++ b/etcdserver/etcdserverpb/rpc.pb.go @@ -12,9 +12,9 @@ import ( _ "github.com/gogo/protobuf/gogoproto" - mvccpb "github.com/coreos/etcd/mvcc/mvccpb" + mvccpb "go.etcd.io/etcd/mvcc/mvccpb" - authpb "github.com/coreos/etcd/auth/authpb" + authpb "go.etcd.io/etcd/auth/authpb" context "golang.org/x/net/context" diff --git a/etcdserver/metrics.go b/etcdserver/metrics.go index c17224a0b..99dbea96f 100644 --- a/etcdserver/metrics.go +++ b/etcdserver/metrics.go @@ -18,8 +18,8 @@ import ( goruntime "runtime" "time" - "github.com/coreos/etcd/pkg/runtime" - "github.com/coreos/etcd/version" + "go.etcd.io/etcd/pkg/runtime" + "go.etcd.io/etcd/version" "github.com/prometheus/client_golang/prometheus" "go.uber.org/zap" diff --git a/etcdserver/quota.go b/etcdserver/quota.go index 143cb35a2..6d70430e7 100644 --- a/etcdserver/quota.go +++ b/etcdserver/quota.go @@ -17,7 +17,7 @@ package etcdserver import ( "sync" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" humanize "github.com/dustin/go-humanize" "go.uber.org/zap" diff --git a/etcdserver/raft.go b/etcdserver/raft.go index d53bf2efd..0285a12a6 100644 --- a/etcdserver/raft.go +++ b/etcdserver/raft.go @@ -22,17 +22,17 @@ import ( "sync" "time" - "github.com/coreos/etcd/etcdserver/api/membership" - "github.com/coreos/etcd/etcdserver/api/rafthttp" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/contention" - "github.com/coreos/etcd/pkg/logutil" - "github.com/coreos/etcd/pkg/pbutil" - "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/membership" + "go.etcd.io/etcd/etcdserver/api/rafthttp" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/contention" + "go.etcd.io/etcd/pkg/logutil" + "go.etcd.io/etcd/pkg/pbutil" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft" + "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/wal" + "go.etcd.io/etcd/wal/walpb" "go.uber.org/zap" ) diff --git a/etcdserver/raft_test.go b/etcdserver/raft_test.go index 56712406a..0ed7ad00b 100644 --- a/etcdserver/raft_test.go +++ b/etcdserver/raft_test.go @@ -21,12 +21,12 @@ import ( "testing" "time" - "github.com/coreos/etcd/etcdserver/api/membership" - "github.com/coreos/etcd/pkg/mock/mockstorage" - "github.com/coreos/etcd/pkg/pbutil" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft" - "github.com/coreos/etcd/raft/raftpb" + "go.etcd.io/etcd/etcdserver/api/membership" + "go.etcd.io/etcd/pkg/mock/mockstorage" + "go.etcd.io/etcd/pkg/pbutil" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft" + "go.etcd.io/etcd/raft/raftpb" "go.uber.org/zap" ) diff --git a/etcdserver/server.go b/etcdserver/server.go index 7b569f20c..50e845923 100644 --- a/etcdserver/server.go +++ b/etcdserver/server.go @@ -29,33 +29,33 @@ import ( "sync/atomic" "time" - "github.com/coreos/etcd/auth" - "github.com/coreos/etcd/etcdserver/api" - "github.com/coreos/etcd/etcdserver/api/membership" - "github.com/coreos/etcd/etcdserver/api/rafthttp" - "github.com/coreos/etcd/etcdserver/api/snap" - "github.com/coreos/etcd/etcdserver/api/v2discovery" - "github.com/coreos/etcd/etcdserver/api/v2http/httptypes" - stats "github.com/coreos/etcd/etcdserver/api/v2stats" - "github.com/coreos/etcd/etcdserver/api/v2store" - "github.com/coreos/etcd/etcdserver/api/v3alarm" - "github.com/coreos/etcd/etcdserver/api/v3compactor" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/lease" - "github.com/coreos/etcd/lease/leasehttp" - "github.com/coreos/etcd/mvcc" - "github.com/coreos/etcd/mvcc/backend" - "github.com/coreos/etcd/pkg/fileutil" - "github.com/coreos/etcd/pkg/idutil" - "github.com/coreos/etcd/pkg/pbutil" - "github.com/coreos/etcd/pkg/runtime" - "github.com/coreos/etcd/pkg/schedule" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/pkg/wait" - "github.com/coreos/etcd/raft" - "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/version" - "github.com/coreos/etcd/wal" + "go.etcd.io/etcd/auth" + "go.etcd.io/etcd/etcdserver/api" + "go.etcd.io/etcd/etcdserver/api/membership" + "go.etcd.io/etcd/etcdserver/api/rafthttp" + "go.etcd.io/etcd/etcdserver/api/snap" + "go.etcd.io/etcd/etcdserver/api/v2discovery" + "go.etcd.io/etcd/etcdserver/api/v2http/httptypes" + stats "go.etcd.io/etcd/etcdserver/api/v2stats" + "go.etcd.io/etcd/etcdserver/api/v2store" + "go.etcd.io/etcd/etcdserver/api/v3alarm" + "go.etcd.io/etcd/etcdserver/api/v3compactor" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/lease/leasehttp" + "go.etcd.io/etcd/mvcc" + "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/pkg/fileutil" + "go.etcd.io/etcd/pkg/idutil" + "go.etcd.io/etcd/pkg/pbutil" + "go.etcd.io/etcd/pkg/runtime" + "go.etcd.io/etcd/pkg/schedule" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/pkg/wait" + "go.etcd.io/etcd/raft" + "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/version" + "go.etcd.io/etcd/wal" "github.com/coreos/go-semver/semver" "github.com/coreos/pkg/capnslog" @@ -100,7 +100,7 @@ const ( ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "etcdserver") + plog = capnslog.NewPackageLogger("go.etcd.io/etcd", "etcdserver") storeMemberAttributeRegexp = regexp.MustCompile(path.Join(membership.StoreMembersPrefix, "[[:xdigit:]]{1,16}", "attributes")) ) diff --git a/etcdserver/server_test.go b/etcdserver/server_test.go index 66d041c1e..3daad4896 100644 --- a/etcdserver/server_test.go +++ b/etcdserver/server_test.go @@ -30,25 +30,25 @@ import ( "go.uber.org/zap" - "github.com/coreos/etcd/etcdserver/api/membership" - "github.com/coreos/etcd/etcdserver/api/rafthttp" - "github.com/coreos/etcd/etcdserver/api/snap" - "github.com/coreos/etcd/etcdserver/api/v2store" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/lease" - "github.com/coreos/etcd/mvcc" - "github.com/coreos/etcd/mvcc/backend" - "github.com/coreos/etcd/pkg/fileutil" - "github.com/coreos/etcd/pkg/idutil" - "github.com/coreos/etcd/pkg/mock/mockstorage" - "github.com/coreos/etcd/pkg/mock/mockstore" - "github.com/coreos/etcd/pkg/mock/mockwait" - "github.com/coreos/etcd/pkg/pbutil" - "github.com/coreos/etcd/pkg/testutil" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/pkg/wait" - "github.com/coreos/etcd/raft" - "github.com/coreos/etcd/raft/raftpb" + "go.etcd.io/etcd/etcdserver/api/membership" + "go.etcd.io/etcd/etcdserver/api/rafthttp" + "go.etcd.io/etcd/etcdserver/api/snap" + "go.etcd.io/etcd/etcdserver/api/v2store" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/mvcc" + "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/pkg/fileutil" + "go.etcd.io/etcd/pkg/idutil" + "go.etcd.io/etcd/pkg/mock/mockstorage" + "go.etcd.io/etcd/pkg/mock/mockstore" + "go.etcd.io/etcd/pkg/mock/mockwait" + "go.etcd.io/etcd/pkg/pbutil" + "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/pkg/wait" + "go.etcd.io/etcd/raft" + "go.etcd.io/etcd/raft/raftpb" ) // TestDoLocalAction tests requests which do not need to go through raft to be applied, diff --git a/etcdserver/snapshot_merge.go b/etcdserver/snapshot_merge.go index 1cccd81c7..417776813 100644 --- a/etcdserver/snapshot_merge.go +++ b/etcdserver/snapshot_merge.go @@ -17,9 +17,9 @@ package etcdserver import ( "io" - "github.com/coreos/etcd/etcdserver/api/snap" - "github.com/coreos/etcd/mvcc/backend" - "github.com/coreos/etcd/raft/raftpb" + "go.etcd.io/etcd/etcdserver/api/snap" + "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/raft/raftpb" humanize "github.com/dustin/go-humanize" "go.uber.org/zap" diff --git a/etcdserver/storage.go b/etcdserver/storage.go index 2be027c51..d57b6f9a5 100644 --- a/etcdserver/storage.go +++ b/etcdserver/storage.go @@ -17,13 +17,13 @@ package etcdserver import ( "io" - "github.com/coreos/etcd/etcdserver/api/snap" - pb "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" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/pbutil" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/wal" + "go.etcd.io/etcd/wal/walpb" "go.uber.org/zap" ) diff --git a/etcdserver/util.go b/etcdserver/util.go index 4e547120c..7a781df9c 100644 --- a/etcdserver/util.go +++ b/etcdserver/util.go @@ -20,10 +20,10 @@ import ( "strings" "time" - "github.com/coreos/etcd/etcdserver/api/membership" - "github.com/coreos/etcd/etcdserver/api/rafthttp" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/etcdserver/api/membership" + "go.etcd.io/etcd/etcdserver/api/rafthttp" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/types" "github.com/golang/protobuf/proto" "go.uber.org/zap" diff --git a/etcdserver/util_test.go b/etcdserver/util_test.go index c2ea0d7c0..6ec87bc89 100644 --- a/etcdserver/util_test.go +++ b/etcdserver/util_test.go @@ -21,11 +21,11 @@ import ( "go.uber.org/zap" - "github.com/coreos/etcd/etcdserver/api/membership" - "github.com/coreos/etcd/etcdserver/api/rafthttp" - "github.com/coreos/etcd/etcdserver/api/snap" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft/raftpb" + "go.etcd.io/etcd/etcdserver/api/membership" + "go.etcd.io/etcd/etcdserver/api/rafthttp" + "go.etcd.io/etcd/etcdserver/api/snap" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft/raftpb" ) func TestLongestConnected(t *testing.T) { diff --git a/etcdserver/v2_server.go b/etcdserver/v2_server.go index 3a6468cd8..9238b2dc5 100644 --- a/etcdserver/v2_server.go +++ b/etcdserver/v2_server.go @@ -18,8 +18,8 @@ import ( "context" "time" - "github.com/coreos/etcd/etcdserver/api/v2store" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/etcdserver/api/v2store" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" ) type RequestV2 pb.Request diff --git a/etcdserver/v3_server.go b/etcdserver/v3_server.go index 092b918b9..6fa89969c 100644 --- a/etcdserver/v3_server.go +++ b/etcdserver/v3_server.go @@ -20,13 +20,13 @@ import ( "encoding/binary" "time" - "github.com/coreos/etcd/auth" - "github.com/coreos/etcd/etcdserver/api/membership" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/lease" - "github.com/coreos/etcd/lease/leasehttp" - "github.com/coreos/etcd/mvcc" - "github.com/coreos/etcd/raft" + "go.etcd.io/etcd/auth" + "go.etcd.io/etcd/etcdserver/api/membership" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/lease/leasehttp" + "go.etcd.io/etcd/mvcc" + "go.etcd.io/etcd/raft" "github.com/gogo/protobuf/proto" "go.uber.org/zap"