diff --git a/contrib/raftexample/kvstore.go b/contrib/raftexample/kvstore.go index 77e42594b..7f69ef8ca 100644 --- a/contrib/raftexample/kvstore.go +++ b/contrib/raftexample/kvstore.go @@ -21,7 +21,7 @@ import ( "log" "sync" - "go.etcd.io/etcd/v3/etcdserver/api/snap" + "go.etcd.io/etcd/server/v3/etcdserver/api/snap" ) // a key-value store backed by raft diff --git a/contrib/raftexample/raft.go b/contrib/raftexample/raft.go index e7ed6566c..399252fbd 100644 --- a/contrib/raftexample/raft.go +++ b/contrib/raftexample/raft.go @@ -28,11 +28,11 @@ import ( "go.etcd.io/etcd/pkg/v3/types" "go.etcd.io/etcd/raft/v3" "go.etcd.io/etcd/raft/v3/raftpb" - "go.etcd.io/etcd/v3/etcdserver/api/rafthttp" - "go.etcd.io/etcd/v3/etcdserver/api/snap" - stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats" - "go.etcd.io/etcd/v3/wal" - "go.etcd.io/etcd/v3/wal/walpb" + "go.etcd.io/etcd/server/v3/etcdserver/api/rafthttp" + "go.etcd.io/etcd/server/v3/etcdserver/api/snap" + stats "go.etcd.io/etcd/server/v3/etcdserver/api/v2stats" + "go.etcd.io/etcd/server/v3/wal" + "go.etcd.io/etcd/server/v3/wal/walpb" "go.uber.org/zap" ) diff --git a/etcdctl/ctlv2/command/backup_command.go b/etcdctl/ctlv2/command/backup_command.go index 22440d9e5..2fbdbb36e 100644 --- a/etcdctl/ctlv2/command/backup_command.go +++ b/etcdctl/ctlv2/command/backup_command.go @@ -28,10 +28,10 @@ import ( "go.etcd.io/etcd/pkg/v3/idutil" "go.etcd.io/etcd/pkg/v3/pbutil" "go.etcd.io/etcd/raft/v3/raftpb" - "go.etcd.io/etcd/v3/etcdserver/api/membership" - "go.etcd.io/etcd/v3/etcdserver/api/snap" - "go.etcd.io/etcd/v3/wal" - "go.etcd.io/etcd/v3/wal/walpb" + "go.etcd.io/etcd/server/v3/etcdserver/api/membership" + "go.etcd.io/etcd/server/v3/etcdserver/api/snap" + "go.etcd.io/etcd/server/v3/wal" + "go.etcd.io/etcd/server/v3/wal/walpb" "github.com/urfave/cli" bolt "go.etcd.io/bbolt" diff --git a/etcdctl/ctlv3/command/defrag_command.go b/etcdctl/ctlv3/command/defrag_command.go index 141071912..058847574 100644 --- a/etcdctl/ctlv3/command/defrag_command.go +++ b/etcdctl/ctlv3/command/defrag_command.go @@ -21,7 +21,7 @@ import ( "time" "github.com/spf13/cobra" - "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/server/v3/mvcc/backend" ) var ( diff --git a/etcdctl/ctlv3/command/migrate_command.go b/etcdctl/ctlv3/command/migrate_command.go index 95fd02541..a7a7b6dca 100644 --- a/etcdctl/ctlv3/command/migrate_command.go +++ b/etcdctl/ctlv3/command/migrate_command.go @@ -30,16 +30,16 @@ import ( "go.etcd.io/etcd/pkg/v3/pbutil" "go.etcd.io/etcd/pkg/v3/types" "go.etcd.io/etcd/raft/v3/raftpb" - "go.etcd.io/etcd/v3/etcdserver" - "go.etcd.io/etcd/v3/etcdserver/api" - "go.etcd.io/etcd/v3/etcdserver/api/membership" - "go.etcd.io/etcd/v3/etcdserver/api/snap" - "go.etcd.io/etcd/v3/etcdserver/api/v2error" - "go.etcd.io/etcd/v3/etcdserver/api/v2store" - "go.etcd.io/etcd/v3/mvcc" - "go.etcd.io/etcd/v3/mvcc/backend" - "go.etcd.io/etcd/v3/wal" - "go.etcd.io/etcd/v3/wal/walpb" + "go.etcd.io/etcd/server/v3/etcdserver" + "go.etcd.io/etcd/server/v3/etcdserver/api" + "go.etcd.io/etcd/server/v3/etcdserver/api/membership" + "go.etcd.io/etcd/server/v3/etcdserver/api/snap" + "go.etcd.io/etcd/server/v3/etcdserver/api/v2error" + "go.etcd.io/etcd/server/v3/etcdserver/api/v2store" + "go.etcd.io/etcd/server/v3/mvcc" + "go.etcd.io/etcd/server/v3/mvcc/backend" + "go.etcd.io/etcd/server/v3/wal" + "go.etcd.io/etcd/server/v3/wal/walpb" "github.com/gogo/protobuf/proto" "github.com/spf13/cobra" diff --git a/etcdctl/snapshot/v3_snapshot.go b/etcdctl/snapshot/v3_snapshot.go index 865a95d43..4b4d8dd92 100644 --- a/etcdctl/snapshot/v3_snapshot.go +++ b/etcdctl/snapshot/v3_snapshot.go @@ -36,16 +36,16 @@ import ( "go.etcd.io/etcd/pkg/v3/types" "go.etcd.io/etcd/raft/v3" "go.etcd.io/etcd/raft/v3/raftpb" - "go.etcd.io/etcd/v3/etcdserver" - "go.etcd.io/etcd/v3/etcdserver/api/membership" - "go.etcd.io/etcd/v3/etcdserver/api/snap" - "go.etcd.io/etcd/v3/etcdserver/api/v2store" - "go.etcd.io/etcd/v3/etcdserver/cindex" - "go.etcd.io/etcd/v3/lease" - "go.etcd.io/etcd/v3/mvcc" - "go.etcd.io/etcd/v3/mvcc/backend" - "go.etcd.io/etcd/v3/wal" - "go.etcd.io/etcd/v3/wal/walpb" + "go.etcd.io/etcd/server/v3/etcdserver" + "go.etcd.io/etcd/server/v3/etcdserver/api/membership" + "go.etcd.io/etcd/server/v3/etcdserver/api/snap" + "go.etcd.io/etcd/server/v3/etcdserver/api/v2store" + "go.etcd.io/etcd/server/v3/etcdserver/cindex" + "go.etcd.io/etcd/server/v3/lease" + "go.etcd.io/etcd/server/v3/mvcc" + "go.etcd.io/etcd/server/v3/mvcc/backend" + "go.etcd.io/etcd/server/v3/wal" + "go.etcd.io/etcd/server/v3/wal/walpb" "go.uber.org/zap" ) diff --git a/main.go b/main.go deleted file mode 100644 index 9ec6bf1e8..000000000 --- a/main.go +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright 2015 The etcd Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// Package main is a simple wrapper of the real etcd entrypoint package -// (located at go.etcd.io/etcd/etcdmain) to ensure that etcd is still -// "go getable"; e.g. `go get go.etcd.io/etcd` works as expected and -// builds a binary in $GOBIN/etcd -// -// This package should NOT be extended or modified in any way; to modify the -// etcd binary, work in the `go.etcd.io/etcd/etcdmain` package. -// -package main - -import ( - "os" - - "go.etcd.io/etcd/v3/etcdmain" -) - -func main() { - etcdmain.Main(os.Args) -} diff --git a/main_test.go b/main_test.go deleted file mode 100644 index 060f7c55c..000000000 --- a/main_test.go +++ /dev/null @@ -1,68 +0,0 @@ -// Copyright 2017 The etcd Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package main - -import ( - "log" - "os" - "os/signal" - "strings" - "syscall" - "testing" - - "go.etcd.io/etcd/v3/etcdmain" -) - -func SplitTestArgs(args []string) (testArgs, appArgs []string) { - for i, arg := range os.Args { - switch { - case strings.HasPrefix(arg, "-test."): - testArgs = append(testArgs, arg) - case i == 0: - appArgs = append(appArgs, arg) - testArgs = append(testArgs, arg) - default: - appArgs = append(appArgs, arg) - } - } - return -} - -func TestEmpty(t *testing.T) {} - -/** - * The purpose of this "test" is to run etcd server with code-coverage - * collection turned on. The technique is documented here: - * - * https://www.cyphar.com/blog/post/20170412-golang-integration-coverage - */ -func TestMain(m *testing.M) { - // don't launch etcd server when invoked via go test - if strings.HasSuffix(os.Args[0], ".test") { - log.Printf("skip launching etcd server when invoked via go test") - return - } - - testArgs, appArgs := SplitTestArgs(os.Args) - - notifier := make(chan os.Signal, 1) - signal.Notify(notifier, syscall.SIGINT, syscall.SIGTERM) - go etcdmain.Main(appArgs) - <-notifier - - // This will generate coverage files: - os.Args = testArgs - m.Run() -} diff --git a/server/auth/jwt_test.go b/server/auth/jwt_test.go index 5578e564e..a3983cc5a 100644 --- a/server/auth/jwt_test.go +++ b/server/auth/jwt_test.go @@ -23,11 +23,11 @@ import ( ) const ( - jwtRSAPubKey = "../tests/fixtures/server.crt" - jwtRSAPrivKey = "../tests/fixtures/server.key.insecure" + jwtRSAPubKey = "../../tests/fixtures/server.crt" + jwtRSAPrivKey = "../../tests/fixtures/server.key.insecure" - jwtECPubKey = "../tests/fixtures/server-ecdsa.crt" - jwtECPrivKey = "../tests/fixtures/server-ecdsa.key.insecure" + jwtECPubKey = "../../tests/fixtures/server-ecdsa.crt" + jwtECPrivKey = "../../tests/fixtures/server-ecdsa.key.insecure" ) func TestJWTInfo(t *testing.T) { diff --git a/server/auth/range_perm_cache.go b/server/auth/range_perm_cache.go index d1c5e655b..7d77b16ea 100644 --- a/server/auth/range_perm_cache.go +++ b/server/auth/range_perm_cache.go @@ -17,7 +17,7 @@ package auth import ( "go.etcd.io/etcd/api/v3/authpb" "go.etcd.io/etcd/pkg/v3/adt" - "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/server/v3/mvcc/backend" "go.uber.org/zap" ) diff --git a/server/auth/store.go b/server/auth/store.go index 674577a98..965c3e86d 100644 --- a/server/auth/store.go +++ b/server/auth/store.go @@ -29,8 +29,8 @@ import ( "go.etcd.io/etcd/api/v3/authpb" pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" - "go.etcd.io/etcd/v3/etcdserver/cindex" - "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/server/v3/etcdserver/cindex" + "go.etcd.io/etcd/server/v3/mvcc/backend" "go.uber.org/zap" "golang.org/x/crypto/bcrypt" diff --git a/server/auth/store_test.go b/server/auth/store_test.go index 9448a7655..d92c67e9f 100644 --- a/server/auth/store_test.go +++ b/server/auth/store_test.go @@ -28,7 +28,7 @@ import ( "go.etcd.io/etcd/api/v3/authpb" pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" - "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/server/v3/mvcc/backend" "go.uber.org/zap" "golang.org/x/crypto/bcrypt" diff --git a/server/embed/auth_test.go b/server/embed/auth_test.go index a96c585f8..f2fb76ef1 100644 --- a/server/embed/auth_test.go +++ b/server/embed/auth_test.go @@ -20,7 +20,7 @@ import ( "os" "testing" - "go.etcd.io/etcd/v3/etcdserver/api/v3client" + "go.etcd.io/etcd/server/v3/etcdserver/api/v3client" ) func TestEnableAuth(t *testing.T) { diff --git a/server/embed/config.go b/server/embed/config.go index 4475c59d8..b6626a6fa 100644 --- a/server/embed/config.go +++ b/server/embed/config.go @@ -33,8 +33,8 @@ import ( "go.etcd.io/etcd/pkg/v3/tlsutil" "go.etcd.io/etcd/pkg/v3/transport" "go.etcd.io/etcd/pkg/v3/types" - "go.etcd.io/etcd/v3/etcdserver" - "go.etcd.io/etcd/v3/etcdserver/api/v3compactor" + "go.etcd.io/etcd/server/v3/etcdserver" + "go.etcd.io/etcd/server/v3/etcdserver/api/v3compactor" bolt "go.etcd.io/bbolt" "go.uber.org/zap" diff --git a/server/embed/doc.go b/server/embed/doc.go index d8aaf33f6..3449855b5 100644 --- a/server/embed/doc.go +++ b/server/embed/doc.go @@ -21,7 +21,7 @@ Launch an embedded etcd server using the configuration defaults: "log" "time" - "go.etcd.io/etcd/v3/embed" + "go.etcd.io/etcd/server/v3/embed" ) func main() { diff --git a/server/embed/etcd.go b/server/embed/etcd.go index 556d79178..79bfccbe8 100644 --- a/server/embed/etcd.go +++ b/server/embed/etcd.go @@ -34,13 +34,13 @@ import ( runtimeutil "go.etcd.io/etcd/pkg/v3/runtime" "go.etcd.io/etcd/pkg/v3/transport" "go.etcd.io/etcd/pkg/v3/types" - "go.etcd.io/etcd/v3/etcdserver" - "go.etcd.io/etcd/v3/etcdserver/api/etcdhttp" - "go.etcd.io/etcd/v3/etcdserver/api/rafthttp" - "go.etcd.io/etcd/v3/etcdserver/api/v2http" - "go.etcd.io/etcd/v3/etcdserver/api/v2v3" - "go.etcd.io/etcd/v3/etcdserver/api/v3client" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc" + "go.etcd.io/etcd/server/v3/etcdserver" + "go.etcd.io/etcd/server/v3/etcdserver/api/etcdhttp" + "go.etcd.io/etcd/server/v3/etcdserver/api/rafthttp" + "go.etcd.io/etcd/server/v3/etcdserver/api/v2http" + "go.etcd.io/etcd/server/v3/etcdserver/api/v2v3" + "go.etcd.io/etcd/server/v3/etcdserver/api/v3client" + "go.etcd.io/etcd/server/v3/etcdserver/api/v3rpc" grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" "github.com/soheilhy/cmux" diff --git a/server/embed/serve.go b/server/embed/serve.go index 9086b8b04..102058641 100644 --- a/server/embed/serve.go +++ b/server/embed/serve.go @@ -28,15 +28,15 @@ import ( "go.etcd.io/etcd/pkg/v3/debugutil" "go.etcd.io/etcd/pkg/v3/httputil" "go.etcd.io/etcd/pkg/v3/transport" - "go.etcd.io/etcd/v3/etcdserver" - "go.etcd.io/etcd/v3/etcdserver/api/v3client" - "go.etcd.io/etcd/v3/etcdserver/api/v3election" - "go.etcd.io/etcd/v3/etcdserver/api/v3election/v3electionpb" - v3electiongw "go.etcd.io/etcd/v3/etcdserver/api/v3election/v3electionpb/gw" - "go.etcd.io/etcd/v3/etcdserver/api/v3lock" - "go.etcd.io/etcd/v3/etcdserver/api/v3lock/v3lockpb" - v3lockgw "go.etcd.io/etcd/v3/etcdserver/api/v3lock/v3lockpb/gw" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc" + "go.etcd.io/etcd/server/v3/etcdserver" + "go.etcd.io/etcd/server/v3/etcdserver/api/v3client" + "go.etcd.io/etcd/server/v3/etcdserver/api/v3election" + "go.etcd.io/etcd/server/v3/etcdserver/api/v3election/v3electionpb" + v3electiongw "go.etcd.io/etcd/server/v3/etcdserver/api/v3election/v3electionpb/gw" + "go.etcd.io/etcd/server/v3/etcdserver/api/v3lock" + "go.etcd.io/etcd/server/v3/etcdserver/api/v3lock/v3lockpb" + v3lockgw "go.etcd.io/etcd/server/v3/etcdserver/api/v3lock/v3lockpb/gw" + "go.etcd.io/etcd/server/v3/etcdserver/api/v3rpc" gw "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/soheilhy/cmux" diff --git a/server/embed/serve_test.go b/server/embed/serve_test.go index 5164fcdfe..b8e6b1318 100644 --- a/server/embed/serve_test.go +++ b/server/embed/serve_test.go @@ -21,7 +21,7 @@ import ( "os" "testing" - "go.etcd.io/etcd/v3/auth" + "go.etcd.io/etcd/server/v3/auth" ) // TestStartEtcdWrongToken ensures that StartEtcd with wrong configs returns with error. diff --git a/server/embed/util.go b/server/embed/util.go index 4d8164093..ad4615345 100644 --- a/server/embed/util.go +++ b/server/embed/util.go @@ -17,7 +17,7 @@ package embed import ( "path/filepath" - "go.etcd.io/etcd/v3/wal" + "go.etcd.io/etcd/server/v3/wal" ) func isMemberInitialized(cfg *Config) bool { diff --git a/server/etcdmain/config.go b/server/etcdmain/config.go index 823402ef1..9bb6b4d45 100644 --- a/server/etcdmain/config.go +++ b/server/etcdmain/config.go @@ -27,7 +27,7 @@ import ( "go.etcd.io/etcd/api/v3/version" "go.etcd.io/etcd/pkg/v3/flags" "go.etcd.io/etcd/pkg/v3/logutil" - "go.etcd.io/etcd/v3/embed" + "go.etcd.io/etcd/server/v3/embed" "go.uber.org/zap" "sigs.k8s.io/yaml" diff --git a/server/etcdmain/config_test.go b/server/etcdmain/config_test.go index bfe28c3c4..0dd4db97e 100644 --- a/server/etcdmain/config_test.go +++ b/server/etcdmain/config_test.go @@ -23,7 +23,7 @@ import ( "strings" "testing" - "go.etcd.io/etcd/v3/embed" + "go.etcd.io/etcd/server/v3/embed" "sigs.k8s.io/yaml" ) diff --git a/server/etcdmain/etcd.go b/server/etcdmain/etcd.go index 18c80a613..3961200e5 100644 --- a/server/etcdmain/etcd.go +++ b/server/etcdmain/etcd.go @@ -31,11 +31,11 @@ import ( "go.etcd.io/etcd/pkg/v3/osutil" "go.etcd.io/etcd/pkg/v3/transport" "go.etcd.io/etcd/pkg/v3/types" - "go.etcd.io/etcd/v3/embed" - "go.etcd.io/etcd/v3/etcdserver" - "go.etcd.io/etcd/v3/etcdserver/api/etcdhttp" - "go.etcd.io/etcd/v3/etcdserver/api/v2discovery" - "go.etcd.io/etcd/v3/proxy/httpproxy" + "go.etcd.io/etcd/server/v3/embed" + "go.etcd.io/etcd/server/v3/etcdserver" + "go.etcd.io/etcd/server/v3/etcdserver/api/etcdhttp" + "go.etcd.io/etcd/server/v3/etcdserver/api/v2discovery" + "go.etcd.io/etcd/server/v3/proxy/httpproxy" "go.uber.org/zap" "google.golang.org/grpc" diff --git a/server/etcdmain/gateway.go b/server/etcdmain/gateway.go index 20fd8e18d..3e4d0620c 100644 --- a/server/etcdmain/gateway.go +++ b/server/etcdmain/gateway.go @@ -21,7 +21,7 @@ import ( "os" "time" - "go.etcd.io/etcd/v3/proxy/tcpproxy" + "go.etcd.io/etcd/server/v3/proxy/tcpproxy" "github.com/spf13/cobra" "go.uber.org/zap" diff --git a/server/etcdmain/grpc_proxy.go b/server/etcdmain/grpc_proxy.go index c8e927582..0327034d4 100644 --- a/server/etcdmain/grpc_proxy.go +++ b/server/etcdmain/grpc_proxy.go @@ -37,10 +37,10 @@ import ( "go.etcd.io/etcd/pkg/v3/debugutil" "go.etcd.io/etcd/pkg/v3/logutil" "go.etcd.io/etcd/pkg/v3/transport" - "go.etcd.io/etcd/v3/embed" - "go.etcd.io/etcd/v3/etcdserver/api/v3election/v3electionpb" - "go.etcd.io/etcd/v3/etcdserver/api/v3lock/v3lockpb" - "go.etcd.io/etcd/v3/proxy/grpcproxy" + "go.etcd.io/etcd/server/v3/embed" + "go.etcd.io/etcd/server/v3/etcdserver/api/v3election/v3electionpb" + "go.etcd.io/etcd/server/v3/etcdserver/api/v3lock/v3lockpb" + "go.etcd.io/etcd/server/v3/proxy/grpcproxy" grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" "github.com/soheilhy/cmux" diff --git a/server/etcdmain/help.go b/server/etcdmain/help.go index 6784cd567..ce074f050 100644 --- a/server/etcdmain/help.go +++ b/server/etcdmain/help.go @@ -18,7 +18,7 @@ import ( "fmt" "strconv" - "go.etcd.io/etcd/v3/embed" + "go.etcd.io/etcd/server/v3/embed" "golang.org/x/crypto/bcrypt" ) diff --git a/server/etcdserver/api/capability.go b/server/etcdserver/api/capability.go index 08ca4c186..ea2f0e97e 100644 --- a/server/etcdserver/api/capability.go +++ b/server/etcdserver/api/capability.go @@ -18,7 +18,7 @@ import ( "sync" "go.etcd.io/etcd/api/v3/version" - "go.etcd.io/etcd/v3/etcdserver/api/membership" + "go.etcd.io/etcd/server/v3/etcdserver/api/membership" "go.uber.org/zap" "github.com/coreos/go-semver/semver" diff --git a/server/etcdserver/api/cluster.go b/server/etcdserver/api/cluster.go index ed0794726..f3d886b18 100644 --- a/server/etcdserver/api/cluster.go +++ b/server/etcdserver/api/cluster.go @@ -16,7 +16,7 @@ package api import ( "go.etcd.io/etcd/pkg/v3/types" - "go.etcd.io/etcd/v3/etcdserver/api/membership" + "go.etcd.io/etcd/server/v3/etcdserver/api/membership" "github.com/coreos/go-semver/semver" ) diff --git a/server/etcdserver/api/etcdhttp/base.go b/server/etcdserver/api/etcdhttp/base.go index 80e97479d..dcfa3f069 100644 --- a/server/etcdserver/api/etcdhttp/base.go +++ b/server/etcdserver/api/etcdhttp/base.go @@ -21,10 +21,10 @@ import ( "net/http" "go.etcd.io/etcd/api/v3/version" - "go.etcd.io/etcd/v3/etcdserver" - "go.etcd.io/etcd/v3/etcdserver/api" - "go.etcd.io/etcd/v3/etcdserver/api/v2error" - "go.etcd.io/etcd/v3/etcdserver/api/v2http/httptypes" + "go.etcd.io/etcd/server/v3/etcdserver" + "go.etcd.io/etcd/server/v3/etcdserver/api" + "go.etcd.io/etcd/server/v3/etcdserver/api/v2error" + "go.etcd.io/etcd/server/v3/etcdserver/api/v2http/httptypes" "go.uber.org/zap" ) diff --git a/server/etcdserver/api/etcdhttp/metrics.go b/server/etcdserver/api/etcdhttp/metrics.go index 4bb8ba094..827efbefe 100644 --- a/server/etcdserver/api/etcdhttp/metrics.go +++ b/server/etcdserver/api/etcdhttp/metrics.go @@ -25,7 +25,7 @@ import ( "github.com/prometheus/client_golang/prometheus/promhttp" "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/raft/v3" - "go.etcd.io/etcd/v3/etcdserver" + "go.etcd.io/etcd/server/v3/etcdserver" "go.uber.org/zap" ) diff --git a/server/etcdserver/api/etcdhttp/peer.go b/server/etcdserver/api/etcdhttp/peer.go index 3e0adb252..bcd02cc8c 100644 --- a/server/etcdserver/api/etcdhttp/peer.go +++ b/server/etcdserver/api/etcdhttp/peer.go @@ -22,11 +22,11 @@ import ( "strings" "go.etcd.io/etcd/pkg/v3/types" - "go.etcd.io/etcd/v3/etcdserver" - "go.etcd.io/etcd/v3/etcdserver/api" - "go.etcd.io/etcd/v3/etcdserver/api/membership" - "go.etcd.io/etcd/v3/etcdserver/api/rafthttp" - "go.etcd.io/etcd/v3/lease/leasehttp" + "go.etcd.io/etcd/server/v3/etcdserver" + "go.etcd.io/etcd/server/v3/etcdserver/api" + "go.etcd.io/etcd/server/v3/etcdserver/api/membership" + "go.etcd.io/etcd/server/v3/etcdserver/api/rafthttp" + "go.etcd.io/etcd/server/v3/lease/leasehttp" "go.uber.org/zap" ) diff --git a/server/etcdserver/api/etcdhttp/peer_test.go b/server/etcdserver/api/etcdhttp/peer_test.go index a03557033..8fe300cd1 100644 --- a/server/etcdserver/api/etcdhttp/peer_test.go +++ b/server/etcdserver/api/etcdhttp/peer_test.go @@ -32,9 +32,9 @@ import ( pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/pkg/v3/testutil" "go.etcd.io/etcd/pkg/v3/types" - "go.etcd.io/etcd/v3/etcdserver/api" - "go.etcd.io/etcd/v3/etcdserver/api/membership" - "go.etcd.io/etcd/v3/etcdserver/api/rafthttp" + "go.etcd.io/etcd/server/v3/etcdserver/api" + "go.etcd.io/etcd/server/v3/etcdserver/api/membership" + "go.etcd.io/etcd/server/v3/etcdserver/api/rafthttp" ) type fakeCluster struct { diff --git a/server/etcdserver/api/membership/cluster.go b/server/etcdserver/api/membership/cluster.go index eb4ed9002..8e083f21a 100644 --- a/server/etcdserver/api/membership/cluster.go +++ b/server/etcdserver/api/membership/cluster.go @@ -32,8 +32,8 @@ import ( "go.etcd.io/etcd/pkg/v3/types" "go.etcd.io/etcd/raft/v3" "go.etcd.io/etcd/raft/v3/raftpb" - "go.etcd.io/etcd/v3/etcdserver/api/v2store" - "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/server/v3/etcdserver/api/v2store" + "go.etcd.io/etcd/server/v3/mvcc/backend" "github.com/coreos/go-semver/semver" "github.com/prometheus/client_golang/prometheus" diff --git a/server/etcdserver/api/membership/cluster_test.go b/server/etcdserver/api/membership/cluster_test.go index 7b782adce..417eedd4e 100644 --- a/server/etcdserver/api/membership/cluster_test.go +++ b/server/etcdserver/api/membership/cluster_test.go @@ -26,8 +26,8 @@ import ( "go.etcd.io/etcd/pkg/v3/testutil" "go.etcd.io/etcd/pkg/v3/types" "go.etcd.io/etcd/raft/v3/raftpb" - "go.etcd.io/etcd/v3/etcdserver/api/v2store" - "go.etcd.io/etcd/v3/server/mock/mockstore" + "go.etcd.io/etcd/server/v3/etcdserver/api/v2store" + "go.etcd.io/etcd/server/v3/mock/mockstore" "go.uber.org/zap" ) diff --git a/server/etcdserver/api/membership/errors.go b/server/etcdserver/api/membership/errors.go index ef50dea99..e944d48c6 100644 --- a/server/etcdserver/api/membership/errors.go +++ b/server/etcdserver/api/membership/errors.go @@ -17,7 +17,7 @@ package membership import ( "errors" - "go.etcd.io/etcd/v3/etcdserver/api/v2error" + "go.etcd.io/etcd/server/v3/etcdserver/api/v2error" ) var ( diff --git a/server/etcdserver/api/membership/store.go b/server/etcdserver/api/membership/store.go index 892b84902..7efb83b03 100644 --- a/server/etcdserver/api/membership/store.go +++ b/server/etcdserver/api/membership/store.go @@ -20,8 +20,8 @@ import ( "path" "go.etcd.io/etcd/pkg/v3/types" - "go.etcd.io/etcd/v3/etcdserver/api/v2store" - "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/server/v3/etcdserver/api/v2store" + "go.etcd.io/etcd/server/v3/mvcc/backend" "github.com/coreos/go-semver/semver" "go.uber.org/zap" diff --git a/server/etcdserver/api/rafthttp/functional_test.go b/server/etcdserver/api/rafthttp/functional_test.go index 8ea843135..4f18217d5 100644 --- a/server/etcdserver/api/rafthttp/functional_test.go +++ b/server/etcdserver/api/rafthttp/functional_test.go @@ -24,7 +24,7 @@ import ( "go.etcd.io/etcd/pkg/v3/types" "go.etcd.io/etcd/raft/v3" "go.etcd.io/etcd/raft/v3/raftpb" - stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats" + stats "go.etcd.io/etcd/server/v3/etcdserver/api/v2stats" "go.uber.org/zap" ) diff --git a/server/etcdserver/api/rafthttp/http.go b/server/etcdserver/api/rafthttp/http.go index 2764c46cc..251cc960b 100644 --- a/server/etcdserver/api/rafthttp/http.go +++ b/server/etcdserver/api/rafthttp/http.go @@ -28,7 +28,7 @@ import ( pioutil "go.etcd.io/etcd/pkg/v3/ioutil" "go.etcd.io/etcd/pkg/v3/types" "go.etcd.io/etcd/raft/v3/raftpb" - "go.etcd.io/etcd/v3/etcdserver/api/snap" + "go.etcd.io/etcd/server/v3/etcdserver/api/snap" humanize "github.com/dustin/go-humanize" "go.uber.org/zap" diff --git a/server/etcdserver/api/rafthttp/http_test.go b/server/etcdserver/api/rafthttp/http_test.go index 57903e57c..2917e569a 100644 --- a/server/etcdserver/api/rafthttp/http_test.go +++ b/server/etcdserver/api/rafthttp/http_test.go @@ -30,7 +30,7 @@ import ( "go.etcd.io/etcd/pkg/v3/pbutil" "go.etcd.io/etcd/pkg/v3/types" "go.etcd.io/etcd/raft/v3/raftpb" - "go.etcd.io/etcd/v3/etcdserver/api/snap" + "go.etcd.io/etcd/server/v3/etcdserver/api/snap" "go.uber.org/zap" ) diff --git a/server/etcdserver/api/rafthttp/msgappv2_codec.go b/server/etcdserver/api/rafthttp/msgappv2_codec.go index 8d5b9aaa8..642506bf8 100644 --- a/server/etcdserver/api/rafthttp/msgappv2_codec.go +++ b/server/etcdserver/api/rafthttp/msgappv2_codec.go @@ -23,7 +23,7 @@ import ( "go.etcd.io/etcd/pkg/v3/pbutil" "go.etcd.io/etcd/pkg/v3/types" "go.etcd.io/etcd/raft/v3/raftpb" - stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats" + stats "go.etcd.io/etcd/server/v3/etcdserver/api/v2stats" ) const ( diff --git a/server/etcdserver/api/rafthttp/msgappv2_codec_test.go b/server/etcdserver/api/rafthttp/msgappv2_codec_test.go index ec0a7f260..dbb1a7cc6 100644 --- a/server/etcdserver/api/rafthttp/msgappv2_codec_test.go +++ b/server/etcdserver/api/rafthttp/msgappv2_codec_test.go @@ -21,7 +21,7 @@ import ( "go.etcd.io/etcd/pkg/v3/types" "go.etcd.io/etcd/raft/v3/raftpb" - stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats" + stats "go.etcd.io/etcd/server/v3/etcdserver/api/v2stats" ) func TestMsgAppV2(t *testing.T) { diff --git a/server/etcdserver/api/rafthttp/peer.go b/server/etcdserver/api/rafthttp/peer.go index 8aa9848d2..136bc075c 100644 --- a/server/etcdserver/api/rafthttp/peer.go +++ b/server/etcdserver/api/rafthttp/peer.go @@ -22,8 +22,8 @@ import ( "go.etcd.io/etcd/pkg/v3/types" "go.etcd.io/etcd/raft/v3" "go.etcd.io/etcd/raft/v3/raftpb" - "go.etcd.io/etcd/v3/etcdserver/api/snap" - stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats" + "go.etcd.io/etcd/server/v3/etcdserver/api/snap" + stats "go.etcd.io/etcd/server/v3/etcdserver/api/v2stats" "go.uber.org/zap" "golang.org/x/time/rate" diff --git a/server/etcdserver/api/rafthttp/pipeline.go b/server/etcdserver/api/rafthttp/pipeline.go index b8a889bed..7de56bb7b 100644 --- a/server/etcdserver/api/rafthttp/pipeline.go +++ b/server/etcdserver/api/rafthttp/pipeline.go @@ -26,7 +26,7 @@ import ( "go.etcd.io/etcd/pkg/v3/types" "go.etcd.io/etcd/raft/v3" "go.etcd.io/etcd/raft/v3/raftpb" - stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats" + stats "go.etcd.io/etcd/server/v3/etcdserver/api/v2stats" "go.uber.org/zap" ) diff --git a/server/etcdserver/api/rafthttp/pipeline_test.go b/server/etcdserver/api/rafthttp/pipeline_test.go index 26a231ad2..cb17b0d48 100644 --- a/server/etcdserver/api/rafthttp/pipeline_test.go +++ b/server/etcdserver/api/rafthttp/pipeline_test.go @@ -28,7 +28,7 @@ import ( "go.etcd.io/etcd/pkg/v3/testutil" "go.etcd.io/etcd/pkg/v3/types" "go.etcd.io/etcd/raft/v3/raftpb" - stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats" + stats "go.etcd.io/etcd/server/v3/etcdserver/api/v2stats" "go.uber.org/zap" ) diff --git a/server/etcdserver/api/rafthttp/snapshot_sender.go b/server/etcdserver/api/rafthttp/snapshot_sender.go index a01a52bb0..76a30bf05 100644 --- a/server/etcdserver/api/rafthttp/snapshot_sender.go +++ b/server/etcdserver/api/rafthttp/snapshot_sender.go @@ -26,7 +26,7 @@ import ( pioutil "go.etcd.io/etcd/pkg/v3/ioutil" "go.etcd.io/etcd/pkg/v3/types" "go.etcd.io/etcd/raft/v3" - "go.etcd.io/etcd/v3/etcdserver/api/snap" + "go.etcd.io/etcd/server/v3/etcdserver/api/snap" "github.com/dustin/go-humanize" "go.uber.org/zap" diff --git a/server/etcdserver/api/rafthttp/snapshot_test.go b/server/etcdserver/api/rafthttp/snapshot_test.go index d91a8aff3..375337cee 100644 --- a/server/etcdserver/api/rafthttp/snapshot_test.go +++ b/server/etcdserver/api/rafthttp/snapshot_test.go @@ -27,7 +27,7 @@ import ( "go.etcd.io/etcd/pkg/v3/types" "go.etcd.io/etcd/raft/v3/raftpb" - "go.etcd.io/etcd/v3/etcdserver/api/snap" + "go.etcd.io/etcd/server/v3/etcdserver/api/snap" "go.uber.org/zap" ) diff --git a/server/etcdserver/api/rafthttp/stream.go b/server/etcdserver/api/rafthttp/stream.go index 84c2b42b4..a8ef7fec7 100644 --- a/server/etcdserver/api/rafthttp/stream.go +++ b/server/etcdserver/api/rafthttp/stream.go @@ -30,7 +30,7 @@ import ( "go.etcd.io/etcd/pkg/v3/transport" "go.etcd.io/etcd/pkg/v3/types" "go.etcd.io/etcd/raft/v3/raftpb" - stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats" + stats "go.etcd.io/etcd/server/v3/etcdserver/api/v2stats" "github.com/coreos/go-semver/semver" "go.uber.org/zap" diff --git a/server/etcdserver/api/rafthttp/stream_test.go b/server/etcdserver/api/rafthttp/stream_test.go index 51ea6e0f1..f63dddc17 100644 --- a/server/etcdserver/api/rafthttp/stream_test.go +++ b/server/etcdserver/api/rafthttp/stream_test.go @@ -30,7 +30,7 @@ import ( "go.etcd.io/etcd/pkg/v3/testutil" "go.etcd.io/etcd/pkg/v3/types" "go.etcd.io/etcd/raft/v3/raftpb" - stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats" + stats "go.etcd.io/etcd/server/v3/etcdserver/api/v2stats" "github.com/coreos/go-semver/semver" "go.uber.org/zap" diff --git a/server/etcdserver/api/rafthttp/transport.go b/server/etcdserver/api/rafthttp/transport.go index e1ab452a6..40642bba3 100644 --- a/server/etcdserver/api/rafthttp/transport.go +++ b/server/etcdserver/api/rafthttp/transport.go @@ -24,8 +24,8 @@ import ( "go.etcd.io/etcd/pkg/v3/types" "go.etcd.io/etcd/raft/v3" "go.etcd.io/etcd/raft/v3/raftpb" - "go.etcd.io/etcd/v3/etcdserver/api/snap" - stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats" + "go.etcd.io/etcd/server/v3/etcdserver/api/snap" + stats "go.etcd.io/etcd/server/v3/etcdserver/api/v2stats" "github.com/xiang90/probing" "go.uber.org/zap" diff --git a/server/etcdserver/api/rafthttp/transport_bench_test.go b/server/etcdserver/api/rafthttp/transport_bench_test.go index 74bd18d2f..5bcea03d7 100644 --- a/server/etcdserver/api/rafthttp/transport_bench_test.go +++ b/server/etcdserver/api/rafthttp/transport_bench_test.go @@ -24,7 +24,7 @@ import ( "go.etcd.io/etcd/pkg/v3/types" "go.etcd.io/etcd/raft/v3" "go.etcd.io/etcd/raft/v3/raftpb" - stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats" + stats "go.etcd.io/etcd/server/v3/etcdserver/api/v2stats" "go.uber.org/zap" ) diff --git a/server/etcdserver/api/rafthttp/transport_test.go b/server/etcdserver/api/rafthttp/transport_test.go index ec3d1f32f..ebc69cbfa 100644 --- a/server/etcdserver/api/rafthttp/transport_test.go +++ b/server/etcdserver/api/rafthttp/transport_test.go @@ -23,7 +23,7 @@ import ( "go.etcd.io/etcd/pkg/v3/testutil" "go.etcd.io/etcd/pkg/v3/types" "go.etcd.io/etcd/raft/v3/raftpb" - stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats" + stats "go.etcd.io/etcd/server/v3/etcdserver/api/v2stats" "github.com/xiang90/probing" "go.uber.org/zap" diff --git a/server/etcdserver/api/snap/snapshotter.go b/server/etcdserver/api/snap/snapshotter.go index 0fc1ea067..52cc0ae26 100644 --- a/server/etcdserver/api/snap/snapshotter.go +++ b/server/etcdserver/api/snap/snapshotter.go @@ -30,8 +30,8 @@ import ( "go.etcd.io/etcd/pkg/v3/pbutil" "go.etcd.io/etcd/raft/v3" "go.etcd.io/etcd/raft/v3/raftpb" - "go.etcd.io/etcd/v3/etcdserver/api/snap/snappb" - "go.etcd.io/etcd/v3/wal/walpb" + "go.etcd.io/etcd/server/v3/etcdserver/api/snap/snappb" + "go.etcd.io/etcd/server/v3/wal/walpb" "go.uber.org/zap" ) diff --git a/server/etcdserver/api/snap/snapshotter_test.go b/server/etcdserver/api/snap/snapshotter_test.go index 7a477b866..bee040d4a 100644 --- a/server/etcdserver/api/snap/snapshotter_test.go +++ b/server/etcdserver/api/snap/snapshotter_test.go @@ -25,7 +25,7 @@ import ( "go.etcd.io/etcd/pkg/v3/fileutil" "go.etcd.io/etcd/raft/v3/raftpb" - "go.etcd.io/etcd/v3/wal/walpb" + "go.etcd.io/etcd/server/v3/wal/walpb" "go.uber.org/zap" ) diff --git a/server/etcdserver/api/v2auth/auth.go b/server/etcdserver/api/v2auth/auth.go index 455e15f7f..f784b445c 100644 --- a/server/etcdserver/api/v2auth/auth.go +++ b/server/etcdserver/api/v2auth/auth.go @@ -28,8 +28,8 @@ import ( "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/pkg/v3/types" - "go.etcd.io/etcd/v3/etcdserver" - "go.etcd.io/etcd/v3/etcdserver/api/v2error" + "go.etcd.io/etcd/server/v3/etcdserver" + "go.etcd.io/etcd/server/v3/etcdserver/api/v2error" "go.uber.org/zap" "golang.org/x/crypto/bcrypt" diff --git a/server/etcdserver/api/v2auth/auth_requests.go b/server/etcdserver/api/v2auth/auth_requests.go index d3742b889..6c8c50c8c 100644 --- a/server/etcdserver/api/v2auth/auth_requests.go +++ b/server/etcdserver/api/v2auth/auth_requests.go @@ -20,8 +20,8 @@ import ( "path" "go.etcd.io/etcd/api/v3/etcdserverpb" - "go.etcd.io/etcd/v3/etcdserver" - "go.etcd.io/etcd/v3/etcdserver/api/v2error" + "go.etcd.io/etcd/server/v3/etcdserver" + "go.etcd.io/etcd/server/v3/etcdserver/api/v2error" "go.uber.org/zap" ) diff --git a/server/etcdserver/api/v2auth/auth_test.go b/server/etcdserver/api/v2auth/auth_test.go index 4264a976f..1b664e0e8 100644 --- a/server/etcdserver/api/v2auth/auth_test.go +++ b/server/etcdserver/api/v2auth/auth_test.go @@ -21,9 +21,9 @@ import ( "time" "go.etcd.io/etcd/api/v3/etcdserverpb" - "go.etcd.io/etcd/v3/etcdserver" - "go.etcd.io/etcd/v3/etcdserver/api/v2error" - "go.etcd.io/etcd/v3/etcdserver/api/v2store" + "go.etcd.io/etcd/server/v3/etcdserver" + "go.etcd.io/etcd/server/v3/etcdserver/api/v2error" + "go.etcd.io/etcd/server/v3/etcdserver/api/v2store" "go.uber.org/zap" ) diff --git a/server/etcdserver/api/v2http/capability.go b/server/etcdserver/api/v2http/capability.go index 49f6af4c6..718b5ed50 100644 --- a/server/etcdserver/api/v2http/capability.go +++ b/server/etcdserver/api/v2http/capability.go @@ -18,8 +18,8 @@ import ( "fmt" "net/http" - "go.etcd.io/etcd/v3/etcdserver/api" - "go.etcd.io/etcd/v3/etcdserver/api/v2http/httptypes" + "go.etcd.io/etcd/server/v3/etcdserver/api" + "go.etcd.io/etcd/server/v3/etcdserver/api/v2http/httptypes" ) func authCapabilityHandler(fn func(http.ResponseWriter, *http.Request)) http.HandlerFunc { diff --git a/server/etcdserver/api/v2http/client.go b/server/etcdserver/api/v2http/client.go index 0b1741834..3504c2c49 100644 --- a/server/etcdserver/api/v2http/client.go +++ b/server/etcdserver/api/v2http/client.go @@ -29,15 +29,15 @@ import ( "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/pkg/v3/types" - "go.etcd.io/etcd/v3/etcdserver" - "go.etcd.io/etcd/v3/etcdserver/api" - "go.etcd.io/etcd/v3/etcdserver/api/etcdhttp" - "go.etcd.io/etcd/v3/etcdserver/api/membership" - "go.etcd.io/etcd/v3/etcdserver/api/v2auth" - "go.etcd.io/etcd/v3/etcdserver/api/v2error" - "go.etcd.io/etcd/v3/etcdserver/api/v2http/httptypes" - stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats" - "go.etcd.io/etcd/v3/etcdserver/api/v2store" + "go.etcd.io/etcd/server/v3/etcdserver" + "go.etcd.io/etcd/server/v3/etcdserver/api" + "go.etcd.io/etcd/server/v3/etcdserver/api/etcdhttp" + "go.etcd.io/etcd/server/v3/etcdserver/api/membership" + "go.etcd.io/etcd/server/v3/etcdserver/api/v2auth" + "go.etcd.io/etcd/server/v3/etcdserver/api/v2error" + "go.etcd.io/etcd/server/v3/etcdserver/api/v2http/httptypes" + stats "go.etcd.io/etcd/server/v3/etcdserver/api/v2stats" + "go.etcd.io/etcd/server/v3/etcdserver/api/v2store" "github.com/jonboulle/clockwork" "go.uber.org/zap" diff --git a/server/etcdserver/api/v2http/client_auth.go b/server/etcdserver/api/v2http/client_auth.go index 144b8ef4f..2c6e7744e 100644 --- a/server/etcdserver/api/v2http/client_auth.go +++ b/server/etcdserver/api/v2http/client_auth.go @@ -20,9 +20,9 @@ import ( "path" "strings" - "go.etcd.io/etcd/v3/etcdserver/api" - "go.etcd.io/etcd/v3/etcdserver/api/v2auth" - "go.etcd.io/etcd/v3/etcdserver/api/v2http/httptypes" + "go.etcd.io/etcd/server/v3/etcdserver/api" + "go.etcd.io/etcd/server/v3/etcdserver/api/v2auth" + "go.etcd.io/etcd/server/v3/etcdserver/api/v2http/httptypes" "go.uber.org/zap" ) diff --git a/server/etcdserver/api/v2http/client_auth_test.go b/server/etcdserver/api/v2http/client_auth_test.go index 2350eb87e..157003f72 100644 --- a/server/etcdserver/api/v2http/client_auth_test.go +++ b/server/etcdserver/api/v2http/client_auth_test.go @@ -30,8 +30,8 @@ import ( "strings" "testing" - "go.etcd.io/etcd/v3/etcdserver/api" - "go.etcd.io/etcd/v3/etcdserver/api/v2auth" + "go.etcd.io/etcd/server/v3/etcdserver/api" + "go.etcd.io/etcd/server/v3/etcdserver/api/v2auth" "go.uber.org/zap" ) diff --git a/server/etcdserver/api/v2http/client_test.go b/server/etcdserver/api/v2http/client_test.go index 853133f09..bdb455c0e 100644 --- a/server/etcdserver/api/v2http/client_test.go +++ b/server/etcdserver/api/v2http/client_test.go @@ -33,12 +33,12 @@ import ( "go.etcd.io/etcd/pkg/v3/testutil" "go.etcd.io/etcd/pkg/v3/types" "go.etcd.io/etcd/raft/v3/raftpb" - "go.etcd.io/etcd/v3/etcdserver" - "go.etcd.io/etcd/v3/etcdserver/api" - "go.etcd.io/etcd/v3/etcdserver/api/membership" - "go.etcd.io/etcd/v3/etcdserver/api/v2error" - "go.etcd.io/etcd/v3/etcdserver/api/v2http/httptypes" - "go.etcd.io/etcd/v3/etcdserver/api/v2store" + "go.etcd.io/etcd/server/v3/etcdserver" + "go.etcd.io/etcd/server/v3/etcdserver/api" + "go.etcd.io/etcd/server/v3/etcdserver/api/membership" + "go.etcd.io/etcd/server/v3/etcdserver/api/v2error" + "go.etcd.io/etcd/server/v3/etcdserver/api/v2http/httptypes" + "go.etcd.io/etcd/server/v3/etcdserver/api/v2store" "github.com/coreos/go-semver/semver" "github.com/jonboulle/clockwork" diff --git a/server/etcdserver/api/v2http/http.go b/server/etcdserver/api/v2http/http.go index 753826325..88138b80a 100644 --- a/server/etcdserver/api/v2http/http.go +++ b/server/etcdserver/api/v2http/http.go @@ -20,9 +20,9 @@ import ( "strings" "time" - "go.etcd.io/etcd/v3/etcdserver/api/etcdhttp" - "go.etcd.io/etcd/v3/etcdserver/api/v2auth" - "go.etcd.io/etcd/v3/etcdserver/api/v2http/httptypes" + "go.etcd.io/etcd/server/v3/etcdserver/api/etcdhttp" + "go.etcd.io/etcd/server/v3/etcdserver/api/v2auth" + "go.etcd.io/etcd/server/v3/etcdserver/api/v2http/httptypes" "go.uber.org/zap" ) diff --git a/server/etcdserver/api/v2http/http_test.go b/server/etcdserver/api/v2http/http_test.go index 79353698e..e61c665fa 100644 --- a/server/etcdserver/api/v2http/http_test.go +++ b/server/etcdserver/api/v2http/http_test.go @@ -25,9 +25,9 @@ import ( "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/pkg/v3/types" "go.etcd.io/etcd/raft/v3/raftpb" - "go.etcd.io/etcd/v3/etcdserver" - "go.etcd.io/etcd/v3/etcdserver/api/membership" - "go.etcd.io/etcd/v3/etcdserver/api/v2error" + "go.etcd.io/etcd/server/v3/etcdserver" + "go.etcd.io/etcd/server/v3/etcdserver/api/membership" + "go.etcd.io/etcd/server/v3/etcdserver/api/v2error" "github.com/coreos/go-semver/semver" "go.uber.org/zap" diff --git a/server/etcdserver/api/v2http/metrics.go b/server/etcdserver/api/v2http/metrics.go index 848ceade5..f119d1b99 100644 --- a/server/etcdserver/api/v2http/metrics.go +++ b/server/etcdserver/api/v2http/metrics.go @@ -21,8 +21,8 @@ import ( "net/http" "go.etcd.io/etcd/api/v3/etcdserverpb" - "go.etcd.io/etcd/v3/etcdserver/api/v2error" - "go.etcd.io/etcd/v3/etcdserver/api/v2http/httptypes" + "go.etcd.io/etcd/server/v3/etcdserver/api/v2error" + "go.etcd.io/etcd/server/v3/etcdserver/api/v2http/httptypes" "github.com/prometheus/client_golang/prometheus" ) diff --git a/server/etcdserver/api/v2store/event_history.go b/server/etcdserver/api/v2store/event_history.go index 18aa8a17f..c9bcdca05 100644 --- a/server/etcdserver/api/v2store/event_history.go +++ b/server/etcdserver/api/v2store/event_history.go @@ -20,7 +20,7 @@ import ( "strings" "sync" - "go.etcd.io/etcd/v3/etcdserver/api/v2error" + "go.etcd.io/etcd/server/v3/etcdserver/api/v2error" ) type EventHistory struct { diff --git a/server/etcdserver/api/v2store/event_test.go b/server/etcdserver/api/v2store/event_test.go index b37e0ad33..6fc25fd74 100644 --- a/server/etcdserver/api/v2store/event_test.go +++ b/server/etcdserver/api/v2store/event_test.go @@ -17,7 +17,7 @@ package v2store import ( "testing" - "go.etcd.io/etcd/v3/etcdserver/api/v2error" + "go.etcd.io/etcd/server/v3/etcdserver/api/v2error" ) // TestEventQueue tests a queue with capacity = 100 diff --git a/server/etcdserver/api/v2store/node.go b/server/etcdserver/api/v2store/node.go index 50316ec4c..9fe6263e2 100644 --- a/server/etcdserver/api/v2store/node.go +++ b/server/etcdserver/api/v2store/node.go @@ -19,7 +19,7 @@ import ( "sort" "time" - "go.etcd.io/etcd/v3/etcdserver/api/v2error" + "go.etcd.io/etcd/server/v3/etcdserver/api/v2error" "github.com/jonboulle/clockwork" ) diff --git a/server/etcdserver/api/v2store/store.go b/server/etcdserver/api/v2store/store.go index afc894289..0090f4c16 100644 --- a/server/etcdserver/api/v2store/store.go +++ b/server/etcdserver/api/v2store/store.go @@ -24,7 +24,7 @@ import ( "time" "go.etcd.io/etcd/pkg/v3/types" - "go.etcd.io/etcd/v3/etcdserver/api/v2error" + "go.etcd.io/etcd/server/v3/etcdserver/api/v2error" "github.com/jonboulle/clockwork" ) diff --git a/server/etcdserver/api/v2store/store_ttl_test.go b/server/etcdserver/api/v2store/store_ttl_test.go index fdf44c333..1468fbb3d 100644 --- a/server/etcdserver/api/v2store/store_ttl_test.go +++ b/server/etcdserver/api/v2store/store_ttl_test.go @@ -19,7 +19,7 @@ import ( "time" "go.etcd.io/etcd/pkg/v3/testutil" - "go.etcd.io/etcd/v3/etcdserver/api/v2error" + "go.etcd.io/etcd/server/v3/etcdserver/api/v2error" "github.com/jonboulle/clockwork" ) diff --git a/server/etcdserver/api/v2store/watcher_hub.go b/server/etcdserver/api/v2store/watcher_hub.go index 3b3e7f103..dc5c8f2bb 100644 --- a/server/etcdserver/api/v2store/watcher_hub.go +++ b/server/etcdserver/api/v2store/watcher_hub.go @@ -21,7 +21,7 @@ import ( "sync" "sync/atomic" - "go.etcd.io/etcd/v3/etcdserver/api/v2error" + "go.etcd.io/etcd/server/v3/etcdserver/api/v2error" ) // A watcherHub contains all subscribed watchers diff --git a/server/etcdserver/api/v2v3/cluster.go b/server/etcdserver/api/v2v3/cluster.go index e07610d1e..f20aa38c7 100644 --- a/server/etcdserver/api/v2v3/cluster.go +++ b/server/etcdserver/api/v2v3/cluster.go @@ -16,7 +16,7 @@ package v2v3 import ( "go.etcd.io/etcd/pkg/v3/types" - "go.etcd.io/etcd/v3/etcdserver/api/membership" + "go.etcd.io/etcd/server/v3/etcdserver/api/membership" "github.com/coreos/go-semver/semver" ) diff --git a/server/etcdserver/api/v2v3/server.go b/server/etcdserver/api/v2v3/server.go index 2b3471bcf..0cdb5c636 100644 --- a/server/etcdserver/api/v2v3/server.go +++ b/server/etcdserver/api/v2v3/server.go @@ -22,9 +22,9 @@ import ( pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/pkg/v3/types" - "go.etcd.io/etcd/v3/etcdserver" - "go.etcd.io/etcd/v3/etcdserver/api" - "go.etcd.io/etcd/v3/etcdserver/api/membership" + "go.etcd.io/etcd/server/v3/etcdserver" + "go.etcd.io/etcd/server/v3/etcdserver/api" + "go.etcd.io/etcd/server/v3/etcdserver/api/membership" "github.com/coreos/go-semver/semver" "go.uber.org/zap" diff --git a/server/etcdserver/api/v2v3/store.go b/server/etcdserver/api/v2v3/store.go index 65e4255a8..6d78cab71 100644 --- a/server/etcdserver/api/v2v3/store.go +++ b/server/etcdserver/api/v2v3/store.go @@ -25,8 +25,8 @@ import ( "go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/client/v3/concurrency" - "go.etcd.io/etcd/v3/etcdserver/api/v2error" - "go.etcd.io/etcd/v3/etcdserver/api/v2store" + "go.etcd.io/etcd/server/v3/etcdserver/api/v2error" + "go.etcd.io/etcd/server/v3/etcdserver/api/v2store" ) // store implements the Store interface for V2 using diff --git a/server/etcdserver/api/v2v3/watcher.go b/server/etcdserver/api/v2v3/watcher.go index b75b75fba..046c25d45 100644 --- a/server/etcdserver/api/v2v3/watcher.go +++ b/server/etcdserver/api/v2v3/watcher.go @@ -19,8 +19,8 @@ import ( "strings" "go.etcd.io/etcd/client/v3" - "go.etcd.io/etcd/v3/etcdserver/api/v2error" - "go.etcd.io/etcd/v3/etcdserver/api/v2store" + "go.etcd.io/etcd/server/v3/etcdserver/api/v2error" + "go.etcd.io/etcd/server/v3/etcdserver/api/v2store" ) func (s *v2v3Store) Watch(prefix string, recursive, stream bool, sinceIndex uint64) (v2store.Watcher, error) { diff --git a/server/etcdserver/api/v3alarm/alarms.go b/server/etcdserver/api/v3alarm/alarms.go index fcad18cdf..c933ce35b 100644 --- a/server/etcdserver/api/v3alarm/alarms.go +++ b/server/etcdserver/api/v3alarm/alarms.go @@ -20,7 +20,7 @@ import ( pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/pkg/v3/types" - "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/server/v3/mvcc/backend" "go.uber.org/zap" ) diff --git a/server/etcdserver/api/v3client/doc.go b/server/etcdserver/api/v3client/doc.go index 7adbec97b..279195e1a 100644 --- a/server/etcdserver/api/v3client/doc.go +++ b/server/etcdserver/api/v3client/doc.go @@ -19,8 +19,8 @@ // import ( // "context" // -// "go.etcd.io/etcd/v3/embed" -// "go.etcd.io/etcd/v3/etcdserver/api/v3client" +// "go.etcd.io/etcd/server/v3/embed" +// "go.etcd.io/etcd/server/v3/etcdserver/api/v3client" // ) // // ... diff --git a/server/etcdserver/api/v3client/v3client.go b/server/etcdserver/api/v3client/v3client.go index 1b269b4a2..ff4d91b5c 100644 --- a/server/etcdserver/api/v3client/v3client.go +++ b/server/etcdserver/api/v3client/v3client.go @@ -19,9 +19,9 @@ import ( "time" "go.etcd.io/etcd/client/v3" - "go.etcd.io/etcd/v3/etcdserver" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc" - "go.etcd.io/etcd/v3/proxy/grpcproxy/adapter" + "go.etcd.io/etcd/server/v3/etcdserver" + "go.etcd.io/etcd/server/v3/etcdserver/api/v3rpc" + "go.etcd.io/etcd/server/v3/proxy/grpcproxy/adapter" ) // New creates a clientv3 client that wraps an in-process EtcdServer. Instead diff --git a/server/etcdserver/api/v3compactor/periodic.go b/server/etcdserver/api/v3compactor/periodic.go index b3c1d3900..083c72ede 100644 --- a/server/etcdserver/api/v3compactor/periodic.go +++ b/server/etcdserver/api/v3compactor/periodic.go @@ -20,7 +20,7 @@ import ( "time" pb "go.etcd.io/etcd/api/v3/etcdserverpb" - "go.etcd.io/etcd/v3/mvcc" + "go.etcd.io/etcd/server/v3/mvcc" "github.com/jonboulle/clockwork" "go.uber.org/zap" diff --git a/server/etcdserver/api/v3compactor/revision.go b/server/etcdserver/api/v3compactor/revision.go index 1ab216662..83be62794 100644 --- a/server/etcdserver/api/v3compactor/revision.go +++ b/server/etcdserver/api/v3compactor/revision.go @@ -20,7 +20,7 @@ import ( "time" pb "go.etcd.io/etcd/api/v3/etcdserverpb" - "go.etcd.io/etcd/v3/mvcc" + "go.etcd.io/etcd/server/v3/mvcc" "github.com/jonboulle/clockwork" "go.uber.org/zap" diff --git a/server/etcdserver/api/v3election/election.go b/server/etcdserver/api/v3election/election.go index edfebd3dc..78b26ad7c 100644 --- a/server/etcdserver/api/v3election/election.go +++ b/server/etcdserver/api/v3election/election.go @@ -20,7 +20,7 @@ import ( "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/client/v3/concurrency" - epb "go.etcd.io/etcd/v3/etcdserver/api/v3election/v3electionpb" + epb "go.etcd.io/etcd/server/v3/etcdserver/api/v3election/v3electionpb" ) // ErrMissingLeaderKey is returned when election API request diff --git a/server/etcdserver/api/v3election/v3electionpb/gw/v3election.pb.gw.go b/server/etcdserver/api/v3election/v3electionpb/gw/v3election.pb.gw.go index f4d25c93a..6465e26c9 100644 --- a/server/etcdserver/api/v3election/v3electionpb/gw/v3election.pb.gw.go +++ b/server/etcdserver/api/v3election/v3electionpb/gw/v3election.pb.gw.go @@ -10,7 +10,7 @@ package gw import ( "context" - "go.etcd.io/etcd/v3/etcdserver/api/v3election/v3electionpb" + "go.etcd.io/etcd/server/v3/etcdserver/api/v3election/v3electionpb" "io" "net/http" diff --git a/server/etcdserver/api/v3lock/lock.go b/server/etcdserver/api/v3lock/lock.go index 80cb6b573..8f9623361 100644 --- a/server/etcdserver/api/v3lock/lock.go +++ b/server/etcdserver/api/v3lock/lock.go @@ -19,7 +19,7 @@ import ( "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/client/v3/concurrency" - "go.etcd.io/etcd/v3/etcdserver/api/v3lock/v3lockpb" + "go.etcd.io/etcd/server/v3/etcdserver/api/v3lock/v3lockpb" ) type lockServer struct { diff --git a/server/etcdserver/api/v3lock/v3lockpb/gw/v3lock.pb.gw.go b/server/etcdserver/api/v3lock/v3lockpb/gw/v3lock.pb.gw.go index 91256c9e1..fd455fdde 100644 --- a/server/etcdserver/api/v3lock/v3lockpb/gw/v3lock.pb.gw.go +++ b/server/etcdserver/api/v3lock/v3lockpb/gw/v3lock.pb.gw.go @@ -10,7 +10,7 @@ package gw import ( "context" - "go.etcd.io/etcd/v3/etcdserver/api/v3lock/v3lockpb" + "go.etcd.io/etcd/server/v3/etcdserver/api/v3lock/v3lockpb" "io" "net/http" diff --git a/server/etcdserver/api/v3rpc/auth.go b/server/etcdserver/api/v3rpc/auth.go index 52cdd6965..d986037a1 100644 --- a/server/etcdserver/api/v3rpc/auth.go +++ b/server/etcdserver/api/v3rpc/auth.go @@ -18,7 +18,7 @@ import ( "context" pb "go.etcd.io/etcd/api/v3/etcdserverpb" - "go.etcd.io/etcd/v3/etcdserver" + "go.etcd.io/etcd/server/v3/etcdserver" ) type AuthServer struct { diff --git a/server/etcdserver/api/v3rpc/grpc.go b/server/etcdserver/api/v3rpc/grpc.go index 46a44b56d..10f525bce 100644 --- a/server/etcdserver/api/v3rpc/grpc.go +++ b/server/etcdserver/api/v3rpc/grpc.go @@ -19,7 +19,7 @@ import ( "math" pb "go.etcd.io/etcd/api/v3/etcdserverpb" - "go.etcd.io/etcd/v3/etcdserver" + "go.etcd.io/etcd/server/v3/etcdserver" grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware" grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" diff --git a/server/etcdserver/api/v3rpc/header.go b/server/etcdserver/api/v3rpc/header.go index 0238d811c..112cc922e 100644 --- a/server/etcdserver/api/v3rpc/header.go +++ b/server/etcdserver/api/v3rpc/header.go @@ -16,7 +16,7 @@ package v3rpc import ( pb "go.etcd.io/etcd/api/v3/etcdserverpb" - "go.etcd.io/etcd/v3/etcdserver" + "go.etcd.io/etcd/server/v3/etcdserver" ) type header struct { diff --git a/server/etcdserver/api/v3rpc/interceptor.go b/server/etcdserver/api/v3rpc/interceptor.go index 7f4d10e68..124522e6b 100644 --- a/server/etcdserver/api/v3rpc/interceptor.go +++ b/server/etcdserver/api/v3rpc/interceptor.go @@ -22,8 +22,8 @@ import ( "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/pkg/v3/types" "go.etcd.io/etcd/raft/v3" - "go.etcd.io/etcd/v3/etcdserver" - "go.etcd.io/etcd/v3/etcdserver/api" + "go.etcd.io/etcd/server/v3/etcdserver" + "go.etcd.io/etcd/server/v3/etcdserver/api" pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.uber.org/zap" diff --git a/server/etcdserver/api/v3rpc/key.go b/server/etcdserver/api/v3rpc/key.go index ef71d83e8..d1a7ee633 100644 --- a/server/etcdserver/api/v3rpc/key.go +++ b/server/etcdserver/api/v3rpc/key.go @@ -21,7 +21,7 @@ import ( pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/pkg/v3/adt" - "go.etcd.io/etcd/v3/etcdserver" + "go.etcd.io/etcd/server/v3/etcdserver" ) type kvServer struct { diff --git a/server/etcdserver/api/v3rpc/lease.go b/server/etcdserver/api/v3rpc/lease.go index 170892c21..e123dd2a3 100644 --- a/server/etcdserver/api/v3rpc/lease.go +++ b/server/etcdserver/api/v3rpc/lease.go @@ -20,8 +20,8 @@ import ( pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" - "go.etcd.io/etcd/v3/etcdserver" - "go.etcd.io/etcd/v3/lease" + "go.etcd.io/etcd/server/v3/etcdserver" + "go.etcd.io/etcd/server/v3/lease" "go.uber.org/zap" ) diff --git a/server/etcdserver/api/v3rpc/maintenance.go b/server/etcdserver/api/v3rpc/maintenance.go index a25a4f93c..dcacbf497 100644 --- a/server/etcdserver/api/v3rpc/maintenance.go +++ b/server/etcdserver/api/v3rpc/maintenance.go @@ -25,10 +25,10 @@ import ( "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/api/v3/version" "go.etcd.io/etcd/raft/v3" - "go.etcd.io/etcd/v3/auth" - "go.etcd.io/etcd/v3/etcdserver" - "go.etcd.io/etcd/v3/mvcc" - "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/server/v3/auth" + "go.etcd.io/etcd/server/v3/etcdserver" + "go.etcd.io/etcd/server/v3/mvcc" + "go.etcd.io/etcd/server/v3/mvcc/backend" "go.uber.org/zap" ) diff --git a/server/etcdserver/api/v3rpc/member.go b/server/etcdserver/api/v3rpc/member.go index 8739b6376..7330fd59e 100644 --- a/server/etcdserver/api/v3rpc/member.go +++ b/server/etcdserver/api/v3rpc/member.go @@ -21,9 +21,9 @@ import ( pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/pkg/v3/types" - "go.etcd.io/etcd/v3/etcdserver" - "go.etcd.io/etcd/v3/etcdserver/api" - "go.etcd.io/etcd/v3/etcdserver/api/membership" + "go.etcd.io/etcd/server/v3/etcdserver" + "go.etcd.io/etcd/server/v3/etcdserver/api" + "go.etcd.io/etcd/server/v3/etcdserver/api/membership" ) type ClusterServer struct { diff --git a/server/etcdserver/api/v3rpc/quota.go b/server/etcdserver/api/v3rpc/quota.go index 508f3ae66..f1f88ecff 100644 --- a/server/etcdserver/api/v3rpc/quota.go +++ b/server/etcdserver/api/v3rpc/quota.go @@ -20,7 +20,7 @@ import ( pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/pkg/v3/types" - "go.etcd.io/etcd/v3/etcdserver" + "go.etcd.io/etcd/server/v3/etcdserver" ) type quotaKVServer struct { diff --git a/server/etcdserver/api/v3rpc/util.go b/server/etcdserver/api/v3rpc/util.go index 89938fe05..dc6e0271f 100644 --- a/server/etcdserver/api/v3rpc/util.go +++ b/server/etcdserver/api/v3rpc/util.go @@ -20,11 +20,11 @@ import ( pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" - "go.etcd.io/etcd/v3/auth" - "go.etcd.io/etcd/v3/etcdserver" - "go.etcd.io/etcd/v3/etcdserver/api/membership" - "go.etcd.io/etcd/v3/lease" - "go.etcd.io/etcd/v3/mvcc" + "go.etcd.io/etcd/server/v3/auth" + "go.etcd.io/etcd/server/v3/etcdserver" + "go.etcd.io/etcd/server/v3/etcdserver/api/membership" + "go.etcd.io/etcd/server/v3/lease" + "go.etcd.io/etcd/server/v3/mvcc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/server/etcdserver/api/v3rpc/util_test.go b/server/etcdserver/api/v3rpc/util_test.go index cd5674a57..d7f5a3ce9 100644 --- a/server/etcdserver/api/v3rpc/util_test.go +++ b/server/etcdserver/api/v3rpc/util_test.go @@ -20,7 +20,7 @@ import ( "testing" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" - "go.etcd.io/etcd/v3/mvcc" + "go.etcd.io/etcd/server/v3/mvcc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/server/etcdserver/api/v3rpc/watch.go b/server/etcdserver/api/v3rpc/watch.go index 4c7794f6a..dca865d8e 100644 --- a/server/etcdserver/api/v3rpc/watch.go +++ b/server/etcdserver/api/v3rpc/watch.go @@ -24,9 +24,9 @@ import ( pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" - "go.etcd.io/etcd/v3/auth" - "go.etcd.io/etcd/v3/etcdserver" - "go.etcd.io/etcd/v3/mvcc" + "go.etcd.io/etcd/server/v3/auth" + "go.etcd.io/etcd/server/v3/etcdserver" + "go.etcd.io/etcd/server/v3/mvcc" "go.uber.org/zap" ) diff --git a/server/etcdserver/apply.go b/server/etcdserver/apply.go index 208dea1f1..179a4bd96 100644 --- a/server/etcdserver/apply.go +++ b/server/etcdserver/apply.go @@ -27,11 +27,11 @@ import ( "go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/pkg/v3/traceutil" "go.etcd.io/etcd/pkg/v3/types" - "go.etcd.io/etcd/v3/auth" - "go.etcd.io/etcd/v3/etcdserver/api" - "go.etcd.io/etcd/v3/etcdserver/api/membership" - "go.etcd.io/etcd/v3/lease" - "go.etcd.io/etcd/v3/mvcc" + "go.etcd.io/etcd/server/v3/auth" + "go.etcd.io/etcd/server/v3/etcdserver/api" + "go.etcd.io/etcd/server/v3/etcdserver/api/membership" + "go.etcd.io/etcd/server/v3/lease" + "go.etcd.io/etcd/server/v3/mvcc" "github.com/gogo/protobuf/proto" "go.uber.org/zap" diff --git a/server/etcdserver/apply_auth.go b/server/etcdserver/apply_auth.go index bc2112214..c1de09f11 100644 --- a/server/etcdserver/apply_auth.go +++ b/server/etcdserver/apply_auth.go @@ -20,9 +20,9 @@ import ( pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/pkg/v3/traceutil" - "go.etcd.io/etcd/v3/auth" - "go.etcd.io/etcd/v3/lease" - "go.etcd.io/etcd/v3/mvcc" + "go.etcd.io/etcd/server/v3/auth" + "go.etcd.io/etcd/server/v3/lease" + "go.etcd.io/etcd/server/v3/mvcc" ) type authApplierV3 struct { diff --git a/server/etcdserver/apply_v2.go b/server/etcdserver/apply_v2.go index 8709e3f91..06cd86938 100644 --- a/server/etcdserver/apply_v2.go +++ b/server/etcdserver/apply_v2.go @@ -21,8 +21,8 @@ import ( "time" "go.etcd.io/etcd/pkg/v3/pbutil" - "go.etcd.io/etcd/v3/etcdserver/api/membership" - "go.etcd.io/etcd/v3/etcdserver/api/v2store" + "go.etcd.io/etcd/server/v3/etcdserver/api/membership" + "go.etcd.io/etcd/server/v3/etcdserver/api/v2store" "go.uber.org/zap" ) diff --git a/server/etcdserver/backend.go b/server/etcdserver/backend.go index 37527f5bb..41747b138 100644 --- a/server/etcdserver/backend.go +++ b/server/etcdserver/backend.go @@ -20,9 +20,9 @@ import ( "time" "go.etcd.io/etcd/raft/v3/raftpb" - "go.etcd.io/etcd/v3/etcdserver/api/snap" - "go.etcd.io/etcd/v3/etcdserver/cindex" - "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/server/v3/etcdserver/api/snap" + "go.etcd.io/etcd/server/v3/etcdserver/cindex" + "go.etcd.io/etcd/server/v3/mvcc/backend" "go.uber.org/zap" ) diff --git a/server/etcdserver/cindex/cindex.go b/server/etcdserver/cindex/cindex.go index c0d7c048e..e47e186e4 100644 --- a/server/etcdserver/cindex/cindex.go +++ b/server/etcdserver/cindex/cindex.go @@ -19,7 +19,7 @@ import ( "sync" "sync/atomic" - "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/server/v3/mvcc/backend" ) var ( diff --git a/server/etcdserver/cindex/cindex_test.go b/server/etcdserver/cindex/cindex_test.go index 7f3a5ba7c..118f8200f 100644 --- a/server/etcdserver/cindex/cindex_test.go +++ b/server/etcdserver/cindex/cindex_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/server/v3/mvcc/backend" ) // TestConsistentIndex ensures that LoadConsistentIndex/Save/ConsistentIndex and backend.BatchTx can work well together. diff --git a/server/etcdserver/cluster_util.go b/server/etcdserver/cluster_util.go index 97e70d90c..197d93a08 100644 --- a/server/etcdserver/cluster_util.go +++ b/server/etcdserver/cluster_util.go @@ -27,7 +27,7 @@ import ( "go.etcd.io/etcd/api/v3/version" "go.etcd.io/etcd/pkg/v3/types" - "go.etcd.io/etcd/v3/etcdserver/api/membership" + "go.etcd.io/etcd/server/v3/etcdserver/api/membership" "github.com/coreos/go-semver/semver" "go.uber.org/zap" diff --git a/server/etcdserver/corrupt.go b/server/etcdserver/corrupt.go index a6f0f15cb..b784fad36 100644 --- a/server/etcdserver/corrupt.go +++ b/server/etcdserver/corrupt.go @@ -28,7 +28,7 @@ import ( "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/pkg/v3/traceutil" "go.etcd.io/etcd/pkg/v3/types" - "go.etcd.io/etcd/v3/mvcc" + "go.etcd.io/etcd/server/v3/mvcc" "go.uber.org/zap" ) diff --git a/server/etcdserver/raft.go b/server/etcdserver/raft.go index 67fdb93a6..09812ee67 100644 --- a/server/etcdserver/raft.go +++ b/server/etcdserver/raft.go @@ -30,10 +30,10 @@ import ( "go.etcd.io/etcd/pkg/v3/types" "go.etcd.io/etcd/raft/v3" "go.etcd.io/etcd/raft/v3/raftpb" - "go.etcd.io/etcd/v3/etcdserver/api/membership" - "go.etcd.io/etcd/v3/etcdserver/api/rafthttp" - "go.etcd.io/etcd/v3/wal" - "go.etcd.io/etcd/v3/wal/walpb" + "go.etcd.io/etcd/server/v3/etcdserver/api/membership" + "go.etcd.io/etcd/server/v3/etcdserver/api/rafthttp" + "go.etcd.io/etcd/server/v3/wal" + "go.etcd.io/etcd/server/v3/wal/walpb" "go.uber.org/zap" ) diff --git a/server/etcdserver/raft_test.go b/server/etcdserver/raft_test.go index 0920e527b..d3b91f99e 100644 --- a/server/etcdserver/raft_test.go +++ b/server/etcdserver/raft_test.go @@ -26,8 +26,8 @@ import ( "go.etcd.io/etcd/pkg/v3/types" "go.etcd.io/etcd/raft/v3" "go.etcd.io/etcd/raft/v3/raftpb" - "go.etcd.io/etcd/v3/etcdserver/api/membership" - "go.etcd.io/etcd/v3/server/mock/mockstorage" + "go.etcd.io/etcd/server/v3/etcdserver/api/membership" + "go.etcd.io/etcd/server/v3/mock/mockstorage" "go.uber.org/zap" ) diff --git a/server/etcdserver/server.go b/server/etcdserver/server.go index e0e8cf109..a4fa259ae 100644 --- a/server/etcdserver/server.go +++ b/server/etcdserver/server.go @@ -48,23 +48,23 @@ import ( "go.etcd.io/etcd/pkg/v3/wait" "go.etcd.io/etcd/raft/v3" "go.etcd.io/etcd/raft/v3/raftpb" - "go.etcd.io/etcd/v3/auth" - "go.etcd.io/etcd/v3/etcdserver/api" - "go.etcd.io/etcd/v3/etcdserver/api/membership" - "go.etcd.io/etcd/v3/etcdserver/api/rafthttp" - "go.etcd.io/etcd/v3/etcdserver/api/snap" - "go.etcd.io/etcd/v3/etcdserver/api/v2discovery" - "go.etcd.io/etcd/v3/etcdserver/api/v2http/httptypes" - stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats" - "go.etcd.io/etcd/v3/etcdserver/api/v2store" - "go.etcd.io/etcd/v3/etcdserver/api/v3alarm" - "go.etcd.io/etcd/v3/etcdserver/api/v3compactor" - "go.etcd.io/etcd/v3/etcdserver/cindex" - "go.etcd.io/etcd/v3/lease" - "go.etcd.io/etcd/v3/lease/leasehttp" - "go.etcd.io/etcd/v3/mvcc" - "go.etcd.io/etcd/v3/mvcc/backend" - "go.etcd.io/etcd/v3/wal" + "go.etcd.io/etcd/server/v3/auth" + "go.etcd.io/etcd/server/v3/etcdserver/api" + "go.etcd.io/etcd/server/v3/etcdserver/api/membership" + "go.etcd.io/etcd/server/v3/etcdserver/api/rafthttp" + "go.etcd.io/etcd/server/v3/etcdserver/api/snap" + "go.etcd.io/etcd/server/v3/etcdserver/api/v2discovery" + "go.etcd.io/etcd/server/v3/etcdserver/api/v2http/httptypes" + stats "go.etcd.io/etcd/server/v3/etcdserver/api/v2stats" + "go.etcd.io/etcd/server/v3/etcdserver/api/v2store" + "go.etcd.io/etcd/server/v3/etcdserver/api/v3alarm" + "go.etcd.io/etcd/server/v3/etcdserver/api/v3compactor" + "go.etcd.io/etcd/server/v3/etcdserver/cindex" + "go.etcd.io/etcd/server/v3/lease" + "go.etcd.io/etcd/server/v3/lease/leasehttp" + "go.etcd.io/etcd/server/v3/mvcc" + "go.etcd.io/etcd/server/v3/mvcc/backend" + "go.etcd.io/etcd/server/v3/wal" ) const ( diff --git a/server/etcdserver/server_test.go b/server/etcdserver/server_test.go index 4e24c7d3e..84bf785b6 100644 --- a/server/etcdserver/server_test.go +++ b/server/etcdserver/server_test.go @@ -36,17 +36,17 @@ import ( "go.etcd.io/etcd/pkg/v3/wait" "go.etcd.io/etcd/raft/v3" "go.etcd.io/etcd/raft/v3/raftpb" - "go.etcd.io/etcd/v3/etcdserver/api/membership" - "go.etcd.io/etcd/v3/etcdserver/api/rafthttp" - "go.etcd.io/etcd/v3/etcdserver/api/snap" - "go.etcd.io/etcd/v3/etcdserver/api/v2store" - "go.etcd.io/etcd/v3/etcdserver/cindex" - "go.etcd.io/etcd/v3/lease" - "go.etcd.io/etcd/v3/mvcc" - "go.etcd.io/etcd/v3/mvcc/backend" - "go.etcd.io/etcd/v3/server/mock/mockstorage" - "go.etcd.io/etcd/v3/server/mock/mockstore" - "go.etcd.io/etcd/v3/server/mock/mockwait" + "go.etcd.io/etcd/server/v3/etcdserver/api/membership" + "go.etcd.io/etcd/server/v3/etcdserver/api/rafthttp" + "go.etcd.io/etcd/server/v3/etcdserver/api/snap" + "go.etcd.io/etcd/server/v3/etcdserver/api/v2store" + "go.etcd.io/etcd/server/v3/etcdserver/cindex" + "go.etcd.io/etcd/server/v3/lease" + "go.etcd.io/etcd/server/v3/mock/mockstorage" + "go.etcd.io/etcd/server/v3/mock/mockstore" + "go.etcd.io/etcd/server/v3/mock/mockwait" + "go.etcd.io/etcd/server/v3/mvcc" + "go.etcd.io/etcd/server/v3/mvcc/backend" "go.uber.org/zap" ) diff --git a/server/etcdserver/snapshot_merge.go b/server/etcdserver/snapshot_merge.go index 2b45d9549..c3bd0290b 100644 --- a/server/etcdserver/snapshot_merge.go +++ b/server/etcdserver/snapshot_merge.go @@ -18,8 +18,8 @@ import ( "io" "go.etcd.io/etcd/raft/v3/raftpb" - "go.etcd.io/etcd/v3/etcdserver/api/snap" - "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/server/v3/etcdserver/api/snap" + "go.etcd.io/etcd/server/v3/mvcc/backend" humanize "github.com/dustin/go-humanize" "go.uber.org/zap" diff --git a/server/etcdserver/storage.go b/server/etcdserver/storage.go index 1ecd13814..9fad6f483 100644 --- a/server/etcdserver/storage.go +++ b/server/etcdserver/storage.go @@ -21,9 +21,9 @@ import ( "go.etcd.io/etcd/pkg/v3/pbutil" "go.etcd.io/etcd/pkg/v3/types" "go.etcd.io/etcd/raft/v3/raftpb" - "go.etcd.io/etcd/v3/etcdserver/api/snap" - "go.etcd.io/etcd/v3/wal" - "go.etcd.io/etcd/v3/wal/walpb" + "go.etcd.io/etcd/server/v3/etcdserver/api/snap" + "go.etcd.io/etcd/server/v3/wal" + "go.etcd.io/etcd/server/v3/wal/walpb" "go.uber.org/zap" ) diff --git a/server/etcdserver/util.go b/server/etcdserver/util.go index 78f8278f4..c82c90abd 100644 --- a/server/etcdserver/util.go +++ b/server/etcdserver/util.go @@ -23,8 +23,8 @@ import ( "github.com/golang/protobuf/proto" pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/pkg/v3/types" - "go.etcd.io/etcd/v3/etcdserver/api/membership" - "go.etcd.io/etcd/v3/etcdserver/api/rafthttp" + "go.etcd.io/etcd/server/v3/etcdserver/api/membership" + "go.etcd.io/etcd/server/v3/etcdserver/api/rafthttp" "go.uber.org/zap" ) diff --git a/server/etcdserver/util_test.go b/server/etcdserver/util_test.go index 746f3fe1a..0eff5ba68 100644 --- a/server/etcdserver/util_test.go +++ b/server/etcdserver/util_test.go @@ -23,9 +23,9 @@ import ( "go.etcd.io/etcd/pkg/v3/types" "go.etcd.io/etcd/raft/v3/raftpb" - "go.etcd.io/etcd/v3/etcdserver/api/membership" - "go.etcd.io/etcd/v3/etcdserver/api/rafthttp" - "go.etcd.io/etcd/v3/etcdserver/api/snap" + "go.etcd.io/etcd/server/v3/etcdserver/api/membership" + "go.etcd.io/etcd/server/v3/etcdserver/api/rafthttp" + "go.etcd.io/etcd/server/v3/etcdserver/api/snap" ) func TestLongestConnected(t *testing.T) { diff --git a/server/etcdserver/v2_server.go b/server/etcdserver/v2_server.go index a95408d8d..7372823c0 100644 --- a/server/etcdserver/v2_server.go +++ b/server/etcdserver/v2_server.go @@ -19,7 +19,7 @@ import ( "time" pb "go.etcd.io/etcd/api/v3/etcdserverpb" - "go.etcd.io/etcd/v3/etcdserver/api/v2store" + "go.etcd.io/etcd/server/v3/etcdserver/api/v2store" ) type RequestV2 pb.Request diff --git a/server/etcdserver/v3_server.go b/server/etcdserver/v3_server.go index ec3ae23fc..a7797eb47 100644 --- a/server/etcdserver/v3_server.go +++ b/server/etcdserver/v3_server.go @@ -26,11 +26,11 @@ import ( "go.etcd.io/etcd/api/v3/membershippb" "go.etcd.io/etcd/pkg/v3/traceutil" "go.etcd.io/etcd/raft/v3" - "go.etcd.io/etcd/v3/auth" - "go.etcd.io/etcd/v3/etcdserver/api/membership" - "go.etcd.io/etcd/v3/lease" - "go.etcd.io/etcd/v3/lease/leasehttp" - "go.etcd.io/etcd/v3/mvcc" + "go.etcd.io/etcd/server/v3/auth" + "go.etcd.io/etcd/server/v3/etcdserver/api/membership" + "go.etcd.io/etcd/server/v3/lease" + "go.etcd.io/etcd/server/v3/lease/leasehttp" + "go.etcd.io/etcd/server/v3/mvcc" "github.com/gogo/protobuf/proto" "go.uber.org/zap" diff --git a/server/lease/leasehttp/http.go b/server/lease/leasehttp/http.go index 6f2c7a680..4b0a60a9b 100644 --- a/server/lease/leasehttp/http.go +++ b/server/lease/leasehttp/http.go @@ -25,8 +25,8 @@ import ( pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/pkg/v3/httputil" - "go.etcd.io/etcd/v3/lease" - "go.etcd.io/etcd/v3/lease/leasepb" + "go.etcd.io/etcd/server/v3/lease" + "go.etcd.io/etcd/server/v3/lease/leasepb" ) var ( diff --git a/server/lease/leasehttp/http_test.go b/server/lease/leasehttp/http_test.go index 41d162f52..11ae8ac46 100644 --- a/server/lease/leasehttp/http_test.go +++ b/server/lease/leasehttp/http_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/lease" - "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/server/v3/lease" + "go.etcd.io/etcd/server/v3/mvcc/backend" "go.uber.org/zap" ) diff --git a/server/lease/lessor.go b/server/lease/lessor.go index f4f82d7ba..a12591e46 100644 --- a/server/lease/lessor.go +++ b/server/lease/lessor.go @@ -25,9 +25,9 @@ import ( "time" pb "go.etcd.io/etcd/api/v3/etcdserverpb" - "go.etcd.io/etcd/v3/etcdserver/cindex" - "go.etcd.io/etcd/v3/lease/leasepb" - "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/server/v3/etcdserver/cindex" + "go.etcd.io/etcd/server/v3/lease/leasepb" + "go.etcd.io/etcd/server/v3/mvcc/backend" "go.uber.org/zap" ) diff --git a/server/lease/lessor_bench_test.go b/server/lease/lessor_bench_test.go index 4858aad09..4f90a50bf 100644 --- a/server/lease/lessor_bench_test.go +++ b/server/lease/lessor_bench_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/server/v3/mvcc/backend" "go.uber.org/zap" ) diff --git a/server/lease/lessor_test.go b/server/lease/lessor_test.go index 38f5b42d2..61b930929 100644 --- a/server/lease/lessor_test.go +++ b/server/lease/lessor_test.go @@ -27,7 +27,7 @@ import ( "time" pb "go.etcd.io/etcd/api/v3/etcdserverpb" - "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/server/v3/mvcc/backend" "go.uber.org/zap" ) diff --git a/server/mock/mockstore/store_recorder.go b/server/mock/mockstore/store_recorder.go index 0f4d861f3..f3f463483 100644 --- a/server/mock/mockstore/store_recorder.go +++ b/server/mock/mockstore/store_recorder.go @@ -18,7 +18,7 @@ import ( "time" "go.etcd.io/etcd/pkg/v3/testutil" - "go.etcd.io/etcd/v3/etcdserver/api/v2store" + "go.etcd.io/etcd/server/v3/etcdserver/api/v2store" ) // StoreRecorder provides a Store interface with a testutil.Recorder diff --git a/server/mvcc/kv.go b/server/mvcc/kv.go index c9737911a..850183d75 100644 --- a/server/mvcc/kv.go +++ b/server/mvcc/kv.go @@ -17,8 +17,8 @@ package mvcc import ( "go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/pkg/v3/traceutil" - "go.etcd.io/etcd/v3/lease" - "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/server/v3/lease" + "go.etcd.io/etcd/server/v3/mvcc/backend" ) type RangeOptions struct { diff --git a/server/mvcc/kv_test.go b/server/mvcc/kv_test.go index cb5c7408c..326efc0aa 100644 --- a/server/mvcc/kv_test.go +++ b/server/mvcc/kv_test.go @@ -24,8 +24,8 @@ import ( "go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/pkg/v3/testutil" "go.etcd.io/etcd/pkg/v3/traceutil" - "go.etcd.io/etcd/v3/lease" - "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/server/v3/lease" + "go.etcd.io/etcd/server/v3/mvcc/backend" "github.com/prometheus/client_golang/prometheus" dto "github.com/prometheus/client_model/go" diff --git a/server/mvcc/kv_view.go b/server/mvcc/kv_view.go index b38297f1f..f25c2aaf3 100644 --- a/server/mvcc/kv_view.go +++ b/server/mvcc/kv_view.go @@ -16,7 +16,7 @@ package mvcc import ( "go.etcd.io/etcd/pkg/v3/traceutil" - "go.etcd.io/etcd/v3/lease" + "go.etcd.io/etcd/server/v3/lease" ) type readView struct{ kv KV } diff --git a/server/mvcc/kvstore.go b/server/mvcc/kvstore.go index e719cc223..ce9abf6cb 100644 --- a/server/mvcc/kvstore.go +++ b/server/mvcc/kvstore.go @@ -26,9 +26,9 @@ import ( "go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/pkg/v3/schedule" "go.etcd.io/etcd/pkg/v3/traceutil" - "go.etcd.io/etcd/v3/etcdserver/cindex" - "go.etcd.io/etcd/v3/lease" - "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/server/v3/etcdserver/cindex" + "go.etcd.io/etcd/server/v3/lease" + "go.etcd.io/etcd/server/v3/mvcc/backend" "go.uber.org/zap" ) diff --git a/server/mvcc/kvstore_bench_test.go b/server/mvcc/kvstore_bench_test.go index aa2a4ba60..be7ca7790 100644 --- a/server/mvcc/kvstore_bench_test.go +++ b/server/mvcc/kvstore_bench_test.go @@ -18,9 +18,9 @@ import ( "testing" "go.etcd.io/etcd/pkg/v3/traceutil" - "go.etcd.io/etcd/v3/etcdserver/cindex" - "go.etcd.io/etcd/v3/lease" - "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/server/v3/etcdserver/cindex" + "go.etcd.io/etcd/server/v3/lease" + "go.etcd.io/etcd/server/v3/mvcc/backend" "go.uber.org/zap" ) diff --git a/server/mvcc/kvstore_compaction_test.go b/server/mvcc/kvstore_compaction_test.go index 6ea653b9c..7f95724a0 100644 --- a/server/mvcc/kvstore_compaction_test.go +++ b/server/mvcc/kvstore_compaction_test.go @@ -21,8 +21,8 @@ import ( "time" "go.etcd.io/etcd/pkg/v3/traceutil" - "go.etcd.io/etcd/v3/lease" - "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/server/v3/lease" + "go.etcd.io/etcd/server/v3/mvcc/backend" "go.uber.org/zap" ) diff --git a/server/mvcc/kvstore_test.go b/server/mvcc/kvstore_test.go index 8c3874a8d..0e2355ee6 100644 --- a/server/mvcc/kvstore_test.go +++ b/server/mvcc/kvstore_test.go @@ -33,8 +33,8 @@ import ( "go.etcd.io/etcd/pkg/v3/schedule" "go.etcd.io/etcd/pkg/v3/testutil" "go.etcd.io/etcd/pkg/v3/traceutil" - "go.etcd.io/etcd/v3/lease" - "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/server/v3/lease" + "go.etcd.io/etcd/server/v3/mvcc/backend" "go.uber.org/zap" ) diff --git a/server/mvcc/kvstore_txn.go b/server/mvcc/kvstore_txn.go index 8b2e465aa..8d880e9e7 100644 --- a/server/mvcc/kvstore_txn.go +++ b/server/mvcc/kvstore_txn.go @@ -17,8 +17,8 @@ package mvcc import ( "go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/pkg/v3/traceutil" - "go.etcd.io/etcd/v3/lease" - "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/server/v3/lease" + "go.etcd.io/etcd/server/v3/mvcc/backend" "go.uber.org/zap" ) diff --git a/server/mvcc/metrics_txn.go b/server/mvcc/metrics_txn.go index 89f9297ec..7e40d9352 100644 --- a/server/mvcc/metrics_txn.go +++ b/server/mvcc/metrics_txn.go @@ -14,7 +14,7 @@ package mvcc -import "go.etcd.io/etcd/v3/lease" +import "go.etcd.io/etcd/server/v3/lease" type metricsTxnWrite struct { TxnWrite diff --git a/server/mvcc/util.go b/server/mvcc/util.go index b99d6c838..fad79c572 100644 --- a/server/mvcc/util.go +++ b/server/mvcc/util.go @@ -19,7 +19,7 @@ import ( "fmt" "go.etcd.io/etcd/api/v3/mvccpb" - "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/server/v3/mvcc/backend" ) func UpdateConsistentIndex(be backend.Backend, index uint64) { diff --git a/server/mvcc/watchable_store.go b/server/mvcc/watchable_store.go index 23429a270..848e1bf8b 100644 --- a/server/mvcc/watchable_store.go +++ b/server/mvcc/watchable_store.go @@ -20,9 +20,9 @@ import ( "go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/pkg/v3/traceutil" - "go.etcd.io/etcd/v3/etcdserver/cindex" - "go.etcd.io/etcd/v3/lease" - "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/server/v3/etcdserver/cindex" + "go.etcd.io/etcd/server/v3/lease" + "go.etcd.io/etcd/server/v3/mvcc/backend" "go.uber.org/zap" ) diff --git a/server/mvcc/watchable_store_bench_test.go b/server/mvcc/watchable_store_bench_test.go index 7471fd6ec..984318d99 100644 --- a/server/mvcc/watchable_store_bench_test.go +++ b/server/mvcc/watchable_store_bench_test.go @@ -20,9 +20,9 @@ import ( "testing" "go.etcd.io/etcd/pkg/v3/traceutil" - "go.etcd.io/etcd/v3/etcdserver/cindex" - "go.etcd.io/etcd/v3/lease" - "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/server/v3/etcdserver/cindex" + "go.etcd.io/etcd/server/v3/lease" + "go.etcd.io/etcd/server/v3/mvcc/backend" "go.uber.org/zap" ) diff --git a/server/mvcc/watchable_store_test.go b/server/mvcc/watchable_store_test.go index 213bea647..247295078 100644 --- a/server/mvcc/watchable_store_test.go +++ b/server/mvcc/watchable_store_test.go @@ -25,9 +25,9 @@ import ( "go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/pkg/v3/traceutil" - "go.etcd.io/etcd/v3/etcdserver/cindex" - "go.etcd.io/etcd/v3/lease" - "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/server/v3/etcdserver/cindex" + "go.etcd.io/etcd/server/v3/lease" + "go.etcd.io/etcd/server/v3/mvcc/backend" "go.uber.org/zap" ) diff --git a/server/mvcc/watcher_bench_test.go b/server/mvcc/watcher_bench_test.go index c4fb8671e..b9331736f 100644 --- a/server/mvcc/watcher_bench_test.go +++ b/server/mvcc/watcher_bench_test.go @@ -18,8 +18,8 @@ import ( "fmt" "testing" - "go.etcd.io/etcd/v3/lease" - "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/server/v3/lease" + "go.etcd.io/etcd/server/v3/mvcc/backend" "go.uber.org/zap" ) diff --git a/server/mvcc/watcher_test.go b/server/mvcc/watcher_test.go index ef53e6843..37c8b8c37 100644 --- a/server/mvcc/watcher_test.go +++ b/server/mvcc/watcher_test.go @@ -23,8 +23,8 @@ import ( "time" "go.etcd.io/etcd/api/v3/mvccpb" - "go.etcd.io/etcd/v3/lease" - "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/server/v3/lease" + "go.etcd.io/etcd/server/v3/mvcc/backend" "go.uber.org/zap" ) diff --git a/server/proxy/grpcproxy/adapter/election_client_adapter.go b/server/proxy/grpcproxy/adapter/election_client_adapter.go index 06ebcc9ef..81d743447 100644 --- a/server/proxy/grpcproxy/adapter/election_client_adapter.go +++ b/server/proxy/grpcproxy/adapter/election_client_adapter.go @@ -17,7 +17,7 @@ package adapter import ( "context" - "go.etcd.io/etcd/v3/etcdserver/api/v3election/v3electionpb" + "go.etcd.io/etcd/server/v3/etcdserver/api/v3election/v3electionpb" "google.golang.org/grpc" ) diff --git a/server/proxy/grpcproxy/adapter/lock_client_adapter.go b/server/proxy/grpcproxy/adapter/lock_client_adapter.go index eb2a3d641..a3ceaf26d 100644 --- a/server/proxy/grpcproxy/adapter/lock_client_adapter.go +++ b/server/proxy/grpcproxy/adapter/lock_client_adapter.go @@ -17,7 +17,7 @@ package adapter import ( "context" - "go.etcd.io/etcd/v3/etcdserver/api/v3lock/v3lockpb" + "go.etcd.io/etcd/server/v3/etcdserver/api/v3lock/v3lockpb" "google.golang.org/grpc" ) diff --git a/server/proxy/grpcproxy/election.go b/server/proxy/grpcproxy/election.go index ba7387c8d..a9ec0fddd 100644 --- a/server/proxy/grpcproxy/election.go +++ b/server/proxy/grpcproxy/election.go @@ -18,7 +18,7 @@ import ( "context" "go.etcd.io/etcd/client/v3" - "go.etcd.io/etcd/v3/etcdserver/api/v3election/v3electionpb" + "go.etcd.io/etcd/server/v3/etcdserver/api/v3election/v3electionpb" ) type electionProxy struct { diff --git a/server/proxy/grpcproxy/health.go b/server/proxy/grpcproxy/health.go index 85c8659e1..385464294 100644 --- a/server/proxy/grpcproxy/health.go +++ b/server/proxy/grpcproxy/health.go @@ -22,7 +22,7 @@ import ( "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/client/v3" - "go.etcd.io/etcd/v3/etcdserver/api/etcdhttp" + "go.etcd.io/etcd/server/v3/etcdserver/api/etcdhttp" "go.uber.org/zap" ) diff --git a/server/proxy/grpcproxy/kv.go b/server/proxy/grpcproxy/kv.go index af5a0700e..6e88eb9fb 100644 --- a/server/proxy/grpcproxy/kv.go +++ b/server/proxy/grpcproxy/kv.go @@ -19,7 +19,7 @@ import ( pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/client/v3" - "go.etcd.io/etcd/v3/proxy/grpcproxy/cache" + "go.etcd.io/etcd/server/v3/proxy/grpcproxy/cache" ) type kvProxy struct { diff --git a/server/proxy/grpcproxy/lock.go b/server/proxy/grpcproxy/lock.go index ebadfba80..9859b9369 100644 --- a/server/proxy/grpcproxy/lock.go +++ b/server/proxy/grpcproxy/lock.go @@ -18,7 +18,7 @@ import ( "context" "go.etcd.io/etcd/client/v3" - "go.etcd.io/etcd/v3/etcdserver/api/v3lock/v3lockpb" + "go.etcd.io/etcd/server/v3/etcdserver/api/v3lock/v3lockpb" ) type lockProxy struct { diff --git a/server/proxy/grpcproxy/metrics.go b/server/proxy/grpcproxy/metrics.go index ed2e62973..01a7a94c8 100644 --- a/server/proxy/grpcproxy/metrics.go +++ b/server/proxy/grpcproxy/metrics.go @@ -24,7 +24,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" - "go.etcd.io/etcd/v3/etcdserver/api/etcdhttp" + "go.etcd.io/etcd/server/v3/etcdserver/api/etcdhttp" ) var ( diff --git a/server/proxy/grpcproxy/watch.go b/server/proxy/grpcproxy/watch.go index 0ee6b5b96..3ec38d600 100644 --- a/server/proxy/grpcproxy/watch.go +++ b/server/proxy/grpcproxy/watch.go @@ -21,7 +21,7 @@ import ( pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/client/v3" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc" + "go.etcd.io/etcd/server/v3/etcdserver/api/v3rpc" "go.uber.org/zap" "google.golang.org/grpc/codes" diff --git a/server/proxy/grpcproxy/watcher.go b/server/proxy/grpcproxy/watcher.go index fcc2fc970..5f6c3db80 100644 --- a/server/proxy/grpcproxy/watcher.go +++ b/server/proxy/grpcproxy/watcher.go @@ -20,7 +20,7 @@ import ( pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/client/v3" - "go.etcd.io/etcd/v3/mvcc" + "go.etcd.io/etcd/server/v3/mvcc" ) type watchRange struct { diff --git a/server/proxy/httpproxy/reverse.go b/server/proxy/httpproxy/reverse.go index 701ed021b..83247486b 100644 --- a/server/proxy/httpproxy/reverse.go +++ b/server/proxy/httpproxy/reverse.go @@ -27,7 +27,7 @@ import ( "sync/atomic" "time" - "go.etcd.io/etcd/v3/etcdserver/api/v2http/httptypes" + "go.etcd.io/etcd/server/v3/etcdserver/api/v2http/httptypes" "go.uber.org/zap" ) diff --git a/server/wal/decoder.go b/server/wal/decoder.go index e676a9f2c..0251a7213 100644 --- a/server/wal/decoder.go +++ b/server/wal/decoder.go @@ -24,7 +24,7 @@ import ( "go.etcd.io/etcd/pkg/v3/crc" "go.etcd.io/etcd/pkg/v3/pbutil" "go.etcd.io/etcd/raft/v3/raftpb" - "go.etcd.io/etcd/v3/wal/walpb" + "go.etcd.io/etcd/server/v3/wal/walpb" ) const minSectorSize = 512 diff --git a/server/wal/encoder.go b/server/wal/encoder.go index 7d6bd5f8a..61b4c20ef 100644 --- a/server/wal/encoder.go +++ b/server/wal/encoder.go @@ -23,7 +23,7 @@ import ( "go.etcd.io/etcd/pkg/v3/crc" "go.etcd.io/etcd/pkg/v3/ioutil" - "go.etcd.io/etcd/v3/wal/walpb" + "go.etcd.io/etcd/server/v3/wal/walpb" ) // walPageBytes is the alignment for flushing records to the backing Writer. diff --git a/server/wal/record_test.go b/server/wal/record_test.go index 61ab26c50..d28807ebb 100644 --- a/server/wal/record_test.go +++ b/server/wal/record_test.go @@ -23,7 +23,7 @@ import ( "reflect" "testing" - "go.etcd.io/etcd/v3/wal/walpb" + "go.etcd.io/etcd/server/v3/wal/walpb" ) var ( diff --git a/server/wal/repair.go b/server/wal/repair.go index 863a71a3b..1d7a71b3f 100644 --- a/server/wal/repair.go +++ b/server/wal/repair.go @@ -21,7 +21,7 @@ import ( "time" "go.etcd.io/etcd/pkg/v3/fileutil" - "go.etcd.io/etcd/v3/wal/walpb" + "go.etcd.io/etcd/server/v3/wal/walpb" "go.uber.org/zap" ) diff --git a/server/wal/repair_test.go b/server/wal/repair_test.go index 90f4f1e81..e2e3294ac 100644 --- a/server/wal/repair_test.go +++ b/server/wal/repair_test.go @@ -22,7 +22,7 @@ import ( "testing" "go.etcd.io/etcd/raft/v3/raftpb" - "go.etcd.io/etcd/v3/wal/walpb" + "go.etcd.io/etcd/server/v3/wal/walpb" "go.uber.org/zap" ) diff --git a/server/wal/wal.go b/server/wal/wal.go index 45f0d9ddd..bf820a61f 100644 --- a/server/wal/wal.go +++ b/server/wal/wal.go @@ -30,7 +30,7 @@ import ( "go.etcd.io/etcd/pkg/v3/pbutil" "go.etcd.io/etcd/raft/v3" "go.etcd.io/etcd/raft/v3/raftpb" - "go.etcd.io/etcd/v3/wal/walpb" + "go.etcd.io/etcd/server/v3/wal/walpb" "go.uber.org/zap" ) diff --git a/server/wal/wal_test.go b/server/wal/wal_test.go index 5e9547f18..a2dd70044 100644 --- a/server/wal/wal_test.go +++ b/server/wal/wal_test.go @@ -30,7 +30,7 @@ import ( "go.etcd.io/etcd/pkg/v3/fileutil" "go.etcd.io/etcd/pkg/v3/pbutil" "go.etcd.io/etcd/raft/v3/raftpb" - "go.etcd.io/etcd/v3/wal/walpb" + "go.etcd.io/etcd/server/v3/wal/walpb" "go.uber.org/zap" ) diff --git a/tests/e2e/cluster_test.go b/tests/e2e/cluster_test.go index 5d2fef28a..cfbbf00f9 100644 --- a/tests/e2e/cluster_test.go +++ b/tests/e2e/cluster_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/etcdserver" + "go.etcd.io/etcd/server/v3/etcdserver" ) const etcdProcessBasePort = 20000 diff --git a/tests/e2e/v3_curl_test.go b/tests/e2e/v3_curl_test.go index 4f8290734..b78515d05 100644 --- a/tests/e2e/v3_curl_test.go +++ b/tests/e2e/v3_curl_test.go @@ -26,7 +26,7 @@ import ( pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/pkg/v3/testutil" - epb "go.etcd.io/etcd/v3/etcdserver/api/v3election/v3electionpb" + epb "go.etcd.io/etcd/server/v3/etcdserver/api/v3election/v3electionpb" "github.com/grpc-ecosystem/grpc-gateway/runtime" ) diff --git a/tests/functional/agent/server.go b/tests/functional/agent/server.go index 85070ca28..bfd5e018d 100644 --- a/tests/functional/agent/server.go +++ b/tests/functional/agent/server.go @@ -22,8 +22,8 @@ import ( "strings" "go.etcd.io/etcd/pkg/v3/proxy" + "go.etcd.io/etcd/server/v3/embed" "go.etcd.io/etcd/tests/v3/functional/rpcpb" - "go.etcd.io/etcd/v3/embed" "go.uber.org/zap" "google.golang.org/grpc" diff --git a/tests/functional/tester/stresser_key.go b/tests/functional/tester/stresser_key.go index df5c342ef..9ffb0038d 100644 --- a/tests/functional/tester/stresser_key.go +++ b/tests/functional/tester/stresser_key.go @@ -26,8 +26,8 @@ import ( "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/raft/v3" + "go.etcd.io/etcd/server/v3/etcdserver" "go.etcd.io/etcd/tests/v3/functional/rpcpb" - "go.etcd.io/etcd/v3/etcdserver" "go.uber.org/zap" "golang.org/x/time/rate" diff --git a/tests/integration/clientv3/maintenance_test.go b/tests/integration/clientv3/maintenance_test.go index 53f864830..93eb4eb52 100644 --- a/tests/integration/clientv3/maintenance_test.go +++ b/tests/integration/clientv3/maintenance_test.go @@ -31,10 +31,10 @@ import ( "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/pkg/v3/testutil" + "go.etcd.io/etcd/server/v3/lease" + "go.etcd.io/etcd/server/v3/mvcc" + "go.etcd.io/etcd/server/v3/mvcc/backend" "go.etcd.io/etcd/tests/v3/integration" - "go.etcd.io/etcd/v3/lease" - "go.etcd.io/etcd/v3/mvcc" - "go.etcd.io/etcd/v3/mvcc/backend" ) func TestMaintenanceHashKV(t *testing.T) { diff --git a/tests/integration/clientv3/snapshot/v3_snapshot_test.go b/tests/integration/clientv3/snapshot/v3_snapshot_test.go index e42cf608d..1d141cab3 100644 --- a/tests/integration/clientv3/snapshot/v3_snapshot_test.go +++ b/tests/integration/clientv3/snapshot/v3_snapshot_test.go @@ -28,7 +28,7 @@ import ( "go.etcd.io/etcd/client/v3/snapshot" "go.etcd.io/etcd/pkg/v3/fileutil" "go.etcd.io/etcd/pkg/v3/testutil" - "go.etcd.io/etcd/v3/embed" + "go.etcd.io/etcd/server/v3/embed" "go.uber.org/zap" ) diff --git a/tests/integration/clientv3/txn_test.go b/tests/integration/clientv3/txn_test.go index 50802064b..ae19b4f8c 100644 --- a/tests/integration/clientv3/txn_test.go +++ b/tests/integration/clientv3/txn_test.go @@ -23,8 +23,8 @@ import ( "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/pkg/v3/testutil" + "go.etcd.io/etcd/server/v3/embed" "go.etcd.io/etcd/tests/v3/integration" - "go.etcd.io/etcd/v3/embed" ) func TestTxnError(t *testing.T) { diff --git a/tests/integration/clientv3/watch_test.go b/tests/integration/clientv3/watch_test.go index 2418b7119..e68a31a02 100644 --- a/tests/integration/clientv3/watch_test.go +++ b/tests/integration/clientv3/watch_test.go @@ -29,8 +29,8 @@ import ( "go.etcd.io/etcd/api/v3/version" "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/pkg/v3/testutil" + "go.etcd.io/etcd/server/v3/etcdserver/api/v3rpc" "go.etcd.io/etcd/tests/v3/integration" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc" "google.golang.org/grpc/metadata" ) diff --git a/tests/integration/cluster.go b/tests/integration/cluster.go index f9af71b33..e237dcf36 100644 --- a/tests/integration/cluster.go +++ b/tests/integration/cluster.go @@ -41,17 +41,17 @@ import ( "go.etcd.io/etcd/pkg/v3/tlsutil" "go.etcd.io/etcd/pkg/v3/transport" "go.etcd.io/etcd/pkg/v3/types" - "go.etcd.io/etcd/v3/embed" - "go.etcd.io/etcd/v3/etcdserver" - "go.etcd.io/etcd/v3/etcdserver/api/etcdhttp" - "go.etcd.io/etcd/v3/etcdserver/api/rafthttp" - "go.etcd.io/etcd/v3/etcdserver/api/v2http" - "go.etcd.io/etcd/v3/etcdserver/api/v3client" - "go.etcd.io/etcd/v3/etcdserver/api/v3election" - epb "go.etcd.io/etcd/v3/etcdserver/api/v3election/v3electionpb" - "go.etcd.io/etcd/v3/etcdserver/api/v3lock" - lockpb "go.etcd.io/etcd/v3/etcdserver/api/v3lock/v3lockpb" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc" + "go.etcd.io/etcd/server/v3/embed" + "go.etcd.io/etcd/server/v3/etcdserver" + "go.etcd.io/etcd/server/v3/etcdserver/api/etcdhttp" + "go.etcd.io/etcd/server/v3/etcdserver/api/rafthttp" + "go.etcd.io/etcd/server/v3/etcdserver/api/v2http" + "go.etcd.io/etcd/server/v3/etcdserver/api/v3client" + "go.etcd.io/etcd/server/v3/etcdserver/api/v3election" + epb "go.etcd.io/etcd/server/v3/etcdserver/api/v3election/v3electionpb" + "go.etcd.io/etcd/server/v3/etcdserver/api/v3lock" + lockpb "go.etcd.io/etcd/server/v3/etcdserver/api/v3lock/v3lockpb" + "go.etcd.io/etcd/server/v3/etcdserver/api/v3rpc" "github.com/soheilhy/cmux" "go.uber.org/zap" diff --git a/tests/integration/cluster_direct.go b/tests/integration/cluster_direct.go index b5dc397fe..f452cd7fd 100644 --- a/tests/integration/cluster_direct.go +++ b/tests/integration/cluster_direct.go @@ -19,8 +19,8 @@ package integration import ( pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/client/v3" - "go.etcd.io/etcd/v3/etcdserver/api/v3election/v3electionpb" - "go.etcd.io/etcd/v3/etcdserver/api/v3lock/v3lockpb" + "go.etcd.io/etcd/server/v3/etcdserver/api/v3election/v3electionpb" + "go.etcd.io/etcd/server/v3/etcdserver/api/v3lock/v3lockpb" ) const ThroughProxy = false diff --git a/tests/integration/cluster_proxy.go b/tests/integration/cluster_proxy.go index 7a5a9236f..59a6cbc6a 100644 --- a/tests/integration/cluster_proxy.go +++ b/tests/integration/cluster_proxy.go @@ -22,8 +22,8 @@ import ( "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/client/v3/namespace" - "go.etcd.io/etcd/v3/proxy/grpcproxy" - "go.etcd.io/etcd/v3/proxy/grpcproxy/adapter" + "go.etcd.io/etcd/server/v3/proxy/grpcproxy" + "go.etcd.io/etcd/server/v3/proxy/grpcproxy/adapter" "go.uber.org/zap" ) diff --git a/tests/integration/cluster_test.go b/tests/integration/cluster_test.go index e5e470af3..6037b81a1 100644 --- a/tests/integration/cluster_test.go +++ b/tests/integration/cluster_test.go @@ -27,7 +27,7 @@ import ( "go.etcd.io/etcd/client/v2" "go.etcd.io/etcd/pkg/v3/testutil" - "go.etcd.io/etcd/v3/etcdserver" + "go.etcd.io/etcd/server/v3/etcdserver" ) func init() { diff --git a/tests/integration/embed/embed_test.go b/tests/integration/embed/embed_test.go index a8b11859c..36d2fc7d8 100644 --- a/tests/integration/embed/embed_test.go +++ b/tests/integration/embed/embed_test.go @@ -32,7 +32,7 @@ import ( "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/pkg/v3/testutil" "go.etcd.io/etcd/pkg/v3/transport" - "go.etcd.io/etcd/v3/embed" + "go.etcd.io/etcd/server/v3/embed" ) var ( diff --git a/tests/integration/metrics_test.go b/tests/integration/metrics_test.go index 23a230bf9..dfa3cc2e9 100644 --- a/tests/integration/metrics_test.go +++ b/tests/integration/metrics_test.go @@ -25,7 +25,7 @@ import ( pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/pkg/v3/testutil" "go.etcd.io/etcd/pkg/v3/transport" - "go.etcd.io/etcd/v3/etcdserver" + "go.etcd.io/etcd/server/v3/etcdserver" ) // TestMetricDbSizeBoot checks that the db size metric is set on boot. diff --git a/tests/integration/proxy/grpcproxy/cluster_test.go b/tests/integration/proxy/grpcproxy/cluster_test.go index 6632f9926..ac5a1e01e 100644 --- a/tests/integration/proxy/grpcproxy/cluster_test.go +++ b/tests/integration/proxy/grpcproxy/cluster_test.go @@ -23,8 +23,8 @@ import ( pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/pkg/v3/testutil" + "go.etcd.io/etcd/server/v3/proxy/grpcproxy" "go.etcd.io/etcd/tests/v3/integration" - "go.etcd.io/etcd/v3/proxy/grpcproxy" "go.uber.org/zap" "google.golang.org/grpc" diff --git a/tests/integration/proxy/grpcproxy/kv_test.go b/tests/integration/proxy/grpcproxy/kv_test.go index fc1f94f1a..8e9aa05a3 100644 --- a/tests/integration/proxy/grpcproxy/kv_test.go +++ b/tests/integration/proxy/grpcproxy/kv_test.go @@ -23,8 +23,8 @@ import ( pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/pkg/v3/testutil" + "go.etcd.io/etcd/server/v3/proxy/grpcproxy" "go.etcd.io/etcd/tests/v3/integration" - "go.etcd.io/etcd/v3/proxy/grpcproxy" "google.golang.org/grpc" ) diff --git a/tests/integration/proxy/grpcproxy/register_test.go b/tests/integration/proxy/grpcproxy/register_test.go index 84473dc79..41a6871d3 100644 --- a/tests/integration/proxy/grpcproxy/register_test.go +++ b/tests/integration/proxy/grpcproxy/register_test.go @@ -21,8 +21,8 @@ import ( "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/client/v3/naming" "go.etcd.io/etcd/pkg/v3/testutil" + "go.etcd.io/etcd/server/v3/proxy/grpcproxy" "go.etcd.io/etcd/tests/v3/integration" - "go.etcd.io/etcd/v3/proxy/grpcproxy" "go.uber.org/zap" gnaming "google.golang.org/grpc/naming" diff --git a/tests/integration/snapshot/member_test.go b/tests/integration/snapshot/member_test.go index eaa107f86..1a6cecfa6 100644 --- a/tests/integration/snapshot/member_test.go +++ b/tests/integration/snapshot/member_test.go @@ -24,8 +24,8 @@ import ( "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/pkg/v3/testutil" - "go.etcd.io/etcd/v3/embed" - "go.etcd.io/etcd/v3/etcdserver" + "go.etcd.io/etcd/server/v3/embed" + "go.etcd.io/etcd/server/v3/etcdserver" ) // TestSnapshotV3RestoreMultiMemberAdd ensures that multiple members diff --git a/tests/integration/snapshot/v3_snapshot_test.go b/tests/integration/snapshot/v3_snapshot_test.go index 41f8a8d01..4c10f4292 100644 --- a/tests/integration/snapshot/v3_snapshot_test.go +++ b/tests/integration/snapshot/v3_snapshot_test.go @@ -28,7 +28,7 @@ import ( "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/etcdctl/v3/snapshot" "go.etcd.io/etcd/pkg/v3/testutil" - "go.etcd.io/etcd/v3/embed" + "go.etcd.io/etcd/server/v3/embed" "go.uber.org/zap" ) diff --git a/tests/integration/v2store/store_tag_not_v2v3_test.go b/tests/integration/v2store/store_tag_not_v2v3_test.go index 5e7550c45..5d3183dfe 100644 --- a/tests/integration/v2store/store_tag_not_v2v3_test.go +++ b/tests/integration/v2store/store_tag_not_v2v3_test.go @@ -20,7 +20,7 @@ import ( "testing" "go.etcd.io/etcd/pkg/v3/testutil" - "go.etcd.io/etcd/v3/etcdserver/api/v2store" + "go.etcd.io/etcd/server/v3/etcdserver/api/v2store" ) type v2TestStore struct { diff --git a/tests/integration/v2store/store_tag_v2v3_test.go b/tests/integration/v2store/store_tag_v2v3_test.go index 0ea609315..d6bdfb6bc 100644 --- a/tests/integration/v2store/store_tag_v2v3_test.go +++ b/tests/integration/v2store/store_tag_v2v3_test.go @@ -21,9 +21,9 @@ import ( "testing" "go.etcd.io/etcd/client/v3" + "go.etcd.io/etcd/server/v3/etcdserver/api/v2store" + "go.etcd.io/etcd/server/v3/etcdserver/api/v2v3" "go.etcd.io/etcd/tests/v3/integration" - "go.etcd.io/etcd/v3/etcdserver/api/v2store" - "go.etcd.io/etcd/v3/etcdserver/api/v2v3" "google.golang.org/grpc/grpclog" ) diff --git a/tests/integration/v2store/store_test.go b/tests/integration/v2store/store_test.go index 6e20a85a6..8e7822622 100644 --- a/tests/integration/v2store/store_test.go +++ b/tests/integration/v2store/store_test.go @@ -20,8 +20,8 @@ import ( "time" "go.etcd.io/etcd/pkg/v3/testutil" - "go.etcd.io/etcd/v3/etcdserver/api/v2error" - "go.etcd.io/etcd/v3/etcdserver/api/v2store" + "go.etcd.io/etcd/server/v3/etcdserver/api/v2error" + "go.etcd.io/etcd/server/v3/etcdserver/api/v2store" ) type StoreCloser interface { diff --git a/tests/integration/v2store/store_v2v3_test.go b/tests/integration/v2store/store_v2v3_test.go index bf125ccf5..7249102b8 100644 --- a/tests/integration/v2store/store_v2v3_test.go +++ b/tests/integration/v2store/store_v2v3_test.go @@ -19,8 +19,8 @@ import ( "testing" "go.etcd.io/etcd/client/v3" - "go.etcd.io/etcd/v3/etcdserver/api/v2store" - "go.etcd.io/etcd/v3/etcdserver/api/v2v3" + "go.etcd.io/etcd/server/v3/etcdserver/api/v2store" + "go.etcd.io/etcd/server/v3/etcdserver/api/v2v3" ) // TODO: fix tests diff --git a/tests/integration/v3_alarm_test.go b/tests/integration/v3_alarm_test.go index 05ef22c18..2d6063562 100644 --- a/tests/integration/v3_alarm_test.go +++ b/tests/integration/v3_alarm_test.go @@ -26,9 +26,9 @@ import ( "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/pkg/v3/testutil" "go.etcd.io/etcd/pkg/v3/traceutil" - "go.etcd.io/etcd/v3/etcdserver/cindex" - "go.etcd.io/etcd/v3/mvcc" - "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/server/v3/etcdserver/cindex" + "go.etcd.io/etcd/server/v3/mvcc" + "go.etcd.io/etcd/server/v3/mvcc/backend" "go.uber.org/zap" ) diff --git a/tests/integration/v3_kv_test.go b/tests/integration/v3_kv_test.go index 68bdeaf95..9f3b4e7c6 100644 --- a/tests/integration/v3_kv_test.go +++ b/tests/integration/v3_kv_test.go @@ -5,8 +5,8 @@ import ( "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/client/v3/namespace" "go.etcd.io/etcd/pkg/v3/testutil" - "go.etcd.io/etcd/v3/embed" - "go.etcd.io/etcd/v3/etcdserver/api/v3client" + "go.etcd.io/etcd/server/v3/embed" + "go.etcd.io/etcd/server/v3/etcdserver/api/v3client" "io/ioutil" "os" "testing" diff --git a/tests/integration/v3_watch_test.go b/tests/integration/v3_watch_test.go index de90f9faa..140ce250c 100644 --- a/tests/integration/v3_watch_test.go +++ b/tests/integration/v3_watch_test.go @@ -27,7 +27,7 @@ import ( pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/pkg/v3/testutil" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc" + "go.etcd.io/etcd/server/v3/etcdserver/api/v3rpc" ) // TestV3WatchFromCurrentRevision tests Watch APIs from current revision. diff --git a/tests/integration/v3election_grpc_test.go b/tests/integration/v3election_grpc_test.go index 3f3a8b02e..4a529626c 100644 --- a/tests/integration/v3election_grpc_test.go +++ b/tests/integration/v3election_grpc_test.go @@ -22,7 +22,7 @@ import ( pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/pkg/v3/testutil" - epb "go.etcd.io/etcd/v3/etcdserver/api/v3election/v3electionpb" + epb "go.etcd.io/etcd/server/v3/etcdserver/api/v3election/v3electionpb" ) // TestV3ElectionCampaign checks that Campaign will not give diff --git a/tests/integration/v3lock_grpc_test.go b/tests/integration/v3lock_grpc_test.go index 10ca2e4ce..cbff0465f 100644 --- a/tests/integration/v3lock_grpc_test.go +++ b/tests/integration/v3lock_grpc_test.go @@ -21,7 +21,7 @@ import ( pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/pkg/v3/testutil" - lockpb "go.etcd.io/etcd/v3/etcdserver/api/v3lock/v3lockpb" + lockpb "go.etcd.io/etcd/server/v3/etcdserver/api/v3lock/v3lockpb" ) // TestV3LockLockWaiter tests that a client will wait for a lock, then acquire it diff --git a/tools/benchmark/cmd/mvcc-put.go b/tools/benchmark/cmd/mvcc-put.go index 8f9d075f9..11ca074f0 100644 --- a/tools/benchmark/cmd/mvcc-put.go +++ b/tools/benchmark/cmd/mvcc-put.go @@ -23,7 +23,7 @@ import ( "go.etcd.io/etcd/pkg/v3/report" "go.etcd.io/etcd/pkg/v3/traceutil" - "go.etcd.io/etcd/v3/lease" + "go.etcd.io/etcd/server/v3/lease" "github.com/spf13/cobra" ) diff --git a/tools/benchmark/cmd/mvcc.go b/tools/benchmark/cmd/mvcc.go index 8a73799a6..5bdef9797 100644 --- a/tools/benchmark/cmd/mvcc.go +++ b/tools/benchmark/cmd/mvcc.go @@ -20,9 +20,9 @@ import ( "go.uber.org/zap" - "go.etcd.io/etcd/v3/lease" - "go.etcd.io/etcd/v3/mvcc" - "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/server/v3/lease" + "go.etcd.io/etcd/server/v3/mvcc" + "go.etcd.io/etcd/server/v3/mvcc/backend" "github.com/spf13/cobra" ) diff --git a/tools/benchmark/cmd/stm.go b/tools/benchmark/cmd/stm.go index b20c3910a..b950b28a0 100644 --- a/tools/benchmark/cmd/stm.go +++ b/tools/benchmark/cmd/stm.go @@ -26,7 +26,7 @@ import ( v3 "go.etcd.io/etcd/client/v3" v3sync "go.etcd.io/etcd/client/v3/concurrency" "go.etcd.io/etcd/pkg/v3/report" - "go.etcd.io/etcd/v3/etcdserver/api/v3lock/v3lockpb" + "go.etcd.io/etcd/server/v3/etcdserver/api/v3lock/v3lockpb" "github.com/spf13/cobra" "golang.org/x/time/rate" diff --git a/tools/etcd-dump-db/backend.go b/tools/etcd-dump-db/backend.go index 7e8f64d8f..c4a2379df 100644 --- a/tools/etcd-dump-db/backend.go +++ b/tools/etcd-dump-db/backend.go @@ -21,9 +21,9 @@ import ( "path/filepath" "go.etcd.io/etcd/api/v3/mvccpb" - "go.etcd.io/etcd/v3/lease/leasepb" - "go.etcd.io/etcd/v3/mvcc" - "go.etcd.io/etcd/v3/mvcc/backend" + "go.etcd.io/etcd/server/v3/lease/leasepb" + "go.etcd.io/etcd/server/v3/mvcc" + "go.etcd.io/etcd/server/v3/mvcc/backend" bolt "go.etcd.io/bbolt" ) diff --git a/tools/etcd-dump-logs/etcd-dump-log_test.go b/tools/etcd-dump-logs/etcd-dump-log_test.go index f87b94d75..3a07f95c6 100644 --- a/tools/etcd-dump-logs/etcd-dump-log_test.go +++ b/tools/etcd-dump-logs/etcd-dump-log_test.go @@ -29,7 +29,7 @@ import ( "go.etcd.io/etcd/pkg/v3/fileutil" "go.etcd.io/etcd/pkg/v3/pbutil" "go.etcd.io/etcd/raft/v3/raftpb" - "go.etcd.io/etcd/v3/wal" + "go.etcd.io/etcd/server/v3/wal" "go.uber.org/zap" ) diff --git a/tools/etcd-dump-logs/main.go b/tools/etcd-dump-logs/main.go index 85bc07971..5363561ba 100644 --- a/tools/etcd-dump-logs/main.go +++ b/tools/etcd-dump-logs/main.go @@ -32,9 +32,9 @@ import ( "go.etcd.io/etcd/pkg/v3/pbutil" "go.etcd.io/etcd/pkg/v3/types" "go.etcd.io/etcd/raft/v3/raftpb" - "go.etcd.io/etcd/v3/etcdserver/api/snap" - "go.etcd.io/etcd/v3/wal" - "go.etcd.io/etcd/v3/wal/walpb" + "go.etcd.io/etcd/server/v3/etcdserver/api/snap" + "go.etcd.io/etcd/server/v3/wal" + "go.etcd.io/etcd/server/v3/wal/walpb" "go.uber.org/zap" ) diff --git a/tools/etcd-dump-metrics/etcd.go b/tools/etcd-dump-metrics/etcd.go index 6d4dd6cbf..f14cb1cdf 100644 --- a/tools/etcd-dump-metrics/etcd.go +++ b/tools/etcd-dump-metrics/etcd.go @@ -24,7 +24,7 @@ import ( "time" "go.etcd.io/etcd/client/v3" - "go.etcd.io/etcd/v3/embed" + "go.etcd.io/etcd/server/v3/embed" "go.uber.org/zap" ) diff --git a/tools/etcd-dump-metrics/main.go b/tools/etcd-dump-metrics/main.go index ba2c843dc..1145833f2 100644 --- a/tools/etcd-dump-metrics/main.go +++ b/tools/etcd-dump-metrics/main.go @@ -25,7 +25,7 @@ import ( "path/filepath" "time" - "go.etcd.io/etcd/v3/embed" + "go.etcd.io/etcd/server/v3/embed" "go.uber.org/zap" )