diff --git a/clientv3/snapshot/v3_snapshot.go b/clientv3/snapshot/v3_snapshot.go index c780fa488..2b288d514 100644 --- a/clientv3/snapshot/v3_snapshot.go +++ b/clientv3/snapshot/v3_snapshot.go @@ -29,10 +29,10 @@ import ( "github.com/coreos/etcd/clientv3" "github.com/coreos/etcd/etcdserver" + "github.com/coreos/etcd/etcdserver/api/membership" "github.com/coreos/etcd/etcdserver/api/snap" "github.com/coreos/etcd/etcdserver/api/v2store" "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/etcdserver/membership" "github.com/coreos/etcd/lease" "github.com/coreos/etcd/mvcc" "github.com/coreos/etcd/mvcc/backend" diff --git a/etcdctl/ctlv2/command/backup_command.go b/etcdctl/ctlv2/command/backup_command.go index c63919ec7..7e423fe82 100644 --- a/etcdctl/ctlv2/command/backup_command.go +++ b/etcdctl/ctlv2/command/backup_command.go @@ -23,9 +23,9 @@ 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/etcdserver/membership" "github.com/coreos/etcd/pkg/fileutil" "github.com/coreos/etcd/pkg/idutil" "github.com/coreos/etcd/pkg/pbutil" diff --git a/etcdctl/ctlv3/command/migrate_command.go b/etcdctl/ctlv3/command/migrate_command.go index 97c26bb93..d609a6ad2 100644 --- a/etcdctl/ctlv3/command/migrate_command.go +++ b/etcdctl/ctlv3/command/migrate_command.go @@ -27,11 +27,11 @@ import ( "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/etcdserver/membership" "github.com/coreos/etcd/mvcc" "github.com/coreos/etcd/mvcc/backend" "github.com/coreos/etcd/mvcc/mvccpb" diff --git a/etcdserver/api/cluster.go b/etcdserver/api/cluster.go index 654c25804..770883b43 100644 --- a/etcdserver/api/cluster.go +++ b/etcdserver/api/cluster.go @@ -15,7 +15,7 @@ package api import ( - "github.com/coreos/etcd/etcdserver/membership" + "github.com/coreos/etcd/etcdserver/api/membership" "github.com/coreos/etcd/pkg/types" "github.com/coreos/go-semver/semver" diff --git a/etcdserver/api/etcdhttp/peer_test.go b/etcdserver/api/etcdhttp/peer_test.go index ad48f1478..eb4370168 100644 --- a/etcdserver/api/etcdhttp/peer_test.go +++ b/etcdserver/api/etcdhttp/peer_test.go @@ -25,7 +25,7 @@ import ( "go.uber.org/zap" - "github.com/coreos/etcd/etcdserver/membership" + "github.com/coreos/etcd/etcdserver/api/membership" "github.com/coreos/etcd/pkg/testutil" "github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/rafthttp" diff --git a/etcdserver/membership/cluster.go b/etcdserver/api/membership/cluster.go similarity index 100% rename from etcdserver/membership/cluster.go rename to etcdserver/api/membership/cluster.go diff --git a/etcdserver/membership/cluster_test.go b/etcdserver/api/membership/cluster_test.go similarity index 100% rename from etcdserver/membership/cluster_test.go rename to etcdserver/api/membership/cluster_test.go diff --git a/etcdserver/membership/doc.go b/etcdserver/api/membership/doc.go similarity index 100% rename from etcdserver/membership/doc.go rename to etcdserver/api/membership/doc.go diff --git a/etcdserver/membership/errors.go b/etcdserver/api/membership/errors.go similarity index 100% rename from etcdserver/membership/errors.go rename to etcdserver/api/membership/errors.go diff --git a/etcdserver/membership/member.go b/etcdserver/api/membership/member.go similarity index 100% rename from etcdserver/membership/member.go rename to etcdserver/api/membership/member.go diff --git a/etcdserver/membership/member_test.go b/etcdserver/api/membership/member_test.go similarity index 100% rename from etcdserver/membership/member_test.go rename to etcdserver/api/membership/member_test.go diff --git a/etcdserver/membership/store.go b/etcdserver/api/membership/store.go similarity index 100% rename from etcdserver/membership/store.go rename to etcdserver/api/membership/store.go diff --git a/etcdserver/api/v2http/client.go b/etcdserver/api/v2http/client.go index a3b85ade1..58de1be95 100644 --- a/etcdserver/api/v2http/client.go +++ b/etcdserver/api/v2http/client.go @@ -30,13 +30,13 @@ import ( "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/etcdserver/membership" "github.com/coreos/etcd/pkg/types" "github.com/jonboulle/clockwork" diff --git a/etcdserver/api/v2http/client_test.go b/etcdserver/api/v2http/client_test.go index 78625b552..fa8e1a270 100644 --- a/etcdserver/api/v2http/client_test.go +++ b/etcdserver/api/v2http/client_test.go @@ -31,11 +31,11 @@ import ( "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/etcdserver/membership" "github.com/coreos/etcd/pkg/testutil" "github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/raft/raftpb" diff --git a/etcdserver/api/v2http/http_test.go b/etcdserver/api/v2http/http_test.go index e9fce30f7..266c28ed1 100644 --- a/etcdserver/api/v2http/http_test.go +++ b/etcdserver/api/v2http/http_test.go @@ -23,9 +23,9 @@ import ( "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/etcdserver/membership" "github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/raft/raftpb" diff --git a/etcdserver/api/v2v3/cluster.go b/etcdserver/api/v2v3/cluster.go index b53e6d7c8..2563f411f 100644 --- a/etcdserver/api/v2v3/cluster.go +++ b/etcdserver/api/v2v3/cluster.go @@ -15,7 +15,7 @@ package v2v3 import ( - "github.com/coreos/etcd/etcdserver/membership" + "github.com/coreos/etcd/etcdserver/api/membership" "github.com/coreos/etcd/pkg/types" "github.com/coreos/go-semver/semver" diff --git a/etcdserver/api/v2v3/server.go b/etcdserver/api/v2v3/server.go index 30698284d..f8d193080 100644 --- a/etcdserver/api/v2v3/server.go +++ b/etcdserver/api/v2v3/server.go @@ -22,8 +22,8 @@ import ( "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/etcdserver/membership" "github.com/coreos/etcd/pkg/types" "github.com/coreos/go-semver/semver" diff --git a/etcdserver/api/v3rpc/member.go b/etcdserver/api/v3rpc/member.go index cbe7b470a..81a7dc282 100644 --- a/etcdserver/api/v3rpc/member.go +++ b/etcdserver/api/v3rpc/member.go @@ -20,9 +20,9 @@ import ( "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/etcdserver/membership" "github.com/coreos/etcd/pkg/types" ) diff --git a/etcdserver/api/v3rpc/util.go b/etcdserver/api/v3rpc/util.go index 799c1197d..d7812af97 100644 --- a/etcdserver/api/v3rpc/util.go +++ b/etcdserver/api/v3rpc/util.go @@ -20,8 +20,8 @@ import ( "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/etcdserver/membership" "github.com/coreos/etcd/lease" "github.com/coreos/etcd/mvcc" diff --git a/etcdserver/apply_v2.go b/etcdserver/apply_v2.go index c750f80f2..89d3ccfb3 100644 --- a/etcdserver/apply_v2.go +++ b/etcdserver/apply_v2.go @@ -20,8 +20,8 @@ import ( "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/etcdserver/membership" "github.com/coreos/etcd/pkg/pbutil" "github.com/coreos/go-semver/semver" diff --git a/etcdserver/cluster_util.go b/etcdserver/cluster_util.go index d639ab08d..0fc9bd682 100644 --- a/etcdserver/cluster_util.go +++ b/etcdserver/cluster_util.go @@ -22,7 +22,7 @@ import ( "sort" "time" - "github.com/coreos/etcd/etcdserver/membership" + "github.com/coreos/etcd/etcdserver/api/membership" "github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/version" diff --git a/etcdserver/raft.go b/etcdserver/raft.go index 4f2a91dca..c247653f1 100644 --- a/etcdserver/raft.go +++ b/etcdserver/raft.go @@ -22,8 +22,8 @@ import ( "sync" "time" + "github.com/coreos/etcd/etcdserver/api/membership" pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/etcdserver/membership" "github.com/coreos/etcd/pkg/contention" "github.com/coreos/etcd/pkg/logutil" "github.com/coreos/etcd/pkg/pbutil" diff --git a/etcdserver/raft_test.go b/etcdserver/raft_test.go index 6ccbec035..56712406a 100644 --- a/etcdserver/raft_test.go +++ b/etcdserver/raft_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/coreos/etcd/etcdserver/membership" + "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" diff --git a/etcdserver/server.go b/etcdserver/server.go index 5137c78be..b78095f91 100644 --- a/etcdserver/server.go +++ b/etcdserver/server.go @@ -33,13 +33,13 @@ import ( "github.com/coreos/etcd/auth" "github.com/coreos/etcd/compactor" "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/v2discovery" "github.com/coreos/etcd/etcdserver/api/v2http/httptypes" stats "github.com/coreos/etcd/etcdserver/api/v2stats" "github.com/coreos/etcd/etcdserver/api/v2store" pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/etcdserver/membership" "github.com/coreos/etcd/lease" "github.com/coreos/etcd/lease/leasehttp" "github.com/coreos/etcd/mvcc" diff --git a/etcdserver/server_test.go b/etcdserver/server_test.go index 071acc842..c0b36c55d 100644 --- a/etcdserver/server_test.go +++ b/etcdserver/server_test.go @@ -30,10 +30,10 @@ import ( "go.uber.org/zap" + "github.com/coreos/etcd/etcdserver/api/membership" "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/etcdserver/membership" "github.com/coreos/etcd/lease" "github.com/coreos/etcd/mvcc" "github.com/coreos/etcd/mvcc/backend" diff --git a/etcdserver/util.go b/etcdserver/util.go index ad0632da1..b8077eaf3 100644 --- a/etcdserver/util.go +++ b/etcdserver/util.go @@ -18,7 +18,7 @@ import ( "fmt" "time" - "github.com/coreos/etcd/etcdserver/membership" + "github.com/coreos/etcd/etcdserver/api/membership" "github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/rafthttp" diff --git a/etcdserver/util_test.go b/etcdserver/util_test.go index e787b5817..5fdfbe938 100644 --- a/etcdserver/util_test.go +++ b/etcdserver/util_test.go @@ -21,8 +21,8 @@ import ( "go.uber.org/zap" + "github.com/coreos/etcd/etcdserver/api/membership" "github.com/coreos/etcd/etcdserver/api/snap" - "github.com/coreos/etcd/etcdserver/membership" "github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/raft/raftpb" "github.com/coreos/etcd/rafthttp" diff --git a/etcdserver/v3_server.go b/etcdserver/v3_server.go index a02c7dc1f..13b9bff0d 100644 --- a/etcdserver/v3_server.go +++ b/etcdserver/v3_server.go @@ -22,8 +22,8 @@ import ( "time" "github.com/coreos/etcd/auth" + "github.com/coreos/etcd/etcdserver/api/membership" pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/etcdserver/membership" "github.com/coreos/etcd/lease" "github.com/coreos/etcd/lease/leasehttp" "github.com/coreos/etcd/mvcc"