Merge pull request #12354 from ptabor/202009027-module-pkgs

Modularization: Make pkg a module (and distribute not pkg code)

.travis.yml

@@ -68,6 +68,7 @@ before_install:
 install:
   - go get -t -v -d ./...
   - (cd tests && go get -t -v -d ./...)
+  - (cd pkg && go get -t -v -d ./...)
 
 script:
   - echo "TRAVIS_GO_VERSION=${TRAVIS_GO_VERSION}"

api/go.mod

@@ -13,4 +13,10 @@ require (
 
 // Bad imports are sometimes causing attempts to pull that code.
 // This makes the error more explicit.
-replace go.etcd.io/etcd => ./FORBIDDEN_DEPENDENCY
+replace (
+	go.etcd.io/etcd => ./FORBIDDEN_DEPENDENCY
+	go.etcd.io/etcd/api/v3 => ./FORBIDDEN_DEPENDENCY
+	go.etcd.io/etcd/pkg/v3 => ./FORBIDDEN_DEPENDENCY
+	go.etcd.io/etcd/tests/v3 => ./FORBIDDEN_DEPENDENCY
+	go.etcd.io/etcd/v3 => ./FORBIDDEN_DEPENDENCY
+)

auth/main_test.go

@@ -7,7 +7,7 @@ package auth
 import (
 	"testing"
 
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/pkg/v3/testutil"
 )
 
 func TestMain(m *testing.M) {

auth/range_perm_cache.go

@@ -16,8 +16,8 @@ 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/v3/pkg/adt"
 
 	"go.uber.org/zap"
 )

auth/range_perm_cache_test.go

@@ -18,7 +18,7 @@ import (
 	"testing"
 
 	"go.etcd.io/etcd/api/v3/authpb"
-	"go.etcd.io/etcd/v3/pkg/adt"
+	"go.etcd.io/etcd/pkg/v3/adt"
 
 	"go.uber.org/zap"
 )

bill-of-materials.json

@@ -350,6 +350,15 @@
 			}
 		]
 	},
+	{
+		"project": "go.etcd.io/etcd/pkg/v3",
+		"licenses": [
+			{
+				"type": "Apache License 2.0",
+				"confidence": 1
+			}
+		]
+	},
 	{
 		"project": "go.etcd.io/etcd/tests/v3",
 		"licenses": [

client/client_test.go

@@ -30,7 +30,7 @@ import (
 	"time"
 
 	"go.etcd.io/etcd/api/v3/version"
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/pkg/v3/testutil"
 )
 
 type actionAssertingHTTPClient struct {

client/discover.go

@@ -15,7 +15,7 @@
 package client
 
 import (
-	"go.etcd.io/etcd/v3/pkg/srv"
+	"go.etcd.io/etcd/pkg/v3/srv"
 )
 
 // Discoverer is an interface that wraps the Discover method.

client/keys.go

@@ -19,7 +19,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"go.etcd.io/etcd/v3/pkg/pathutil"
+	"go.etcd.io/etcd/pkg/v3/pathutil"
 	"net/http"
 	"net/url"
 	"strconv"

client/main_test.go

@@ -18,7 +18,7 @@ import (
 	"net/http"
 	"testing"
 
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/pkg/v3/testutil"
 )
 
 func exampleEndpoints() []string        { return nil }

client/members.go

@@ -23,7 +23,7 @@ import (
 	"net/url"
 	"path"
 
-	"go.etcd.io/etcd/v3/pkg/types"
+	"go.etcd.io/etcd/pkg/v3/types"
 )
 
 var (

client/members_test.go

@@ -23,7 +23,7 @@ import (
 	"reflect"
 	"testing"
 
-	"go.etcd.io/etcd/v3/pkg/types"
+	"go.etcd.io/etcd/pkg/v3/types"
 )
 
 func TestMembersAPIActionList(t *testing.T) {

clientv3/balancer/balancer_test.go

@@ -22,9 +22,9 @@ import (
 	"time"
 
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
+	"go.etcd.io/etcd/v3/client/mock/mockserver"
 	"go.etcd.io/etcd/v3/clientv3/balancer/picker"
 	"go.etcd.io/etcd/v3/clientv3/balancer/resolver/endpoint"
-	"go.etcd.io/etcd/v3/pkg/mock/mockserver"
 
 	"go.uber.org/zap"
 	"google.golang.org/grpc"

clientv3/client.go

@@ -27,11 +27,11 @@ import (
 
 	"github.com/google/uuid"
 	"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
+	"go.etcd.io/etcd/pkg/v3/logutil"
 	"go.etcd.io/etcd/v3/clientv3/balancer"
 	"go.etcd.io/etcd/v3/clientv3/balancer/picker"
 	"go.etcd.io/etcd/v3/clientv3/balancer/resolver/endpoint"
 	"go.etcd.io/etcd/v3/clientv3/credentials"
-	"go.etcd.io/etcd/v3/pkg/logutil"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"

clientv3/client_test.go

@@ -22,7 +22,7 @@ import (
 	"time"
 
 	"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/pkg/v3/testutil"
 
 	"google.golang.org/grpc"
 )

clientv3/cluster.go

@@ -18,7 +18,7 @@ import (
 	"context"
 
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
-	"go.etcd.io/etcd/v3/pkg/types"
+	"go.etcd.io/etcd/pkg/v3/types"
 
 	"google.golang.org/grpc"
 )

clientv3/concurrency/main_test.go

@@ -17,7 +17,7 @@ package concurrency_test
 import (
 	"testing"
 
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/pkg/v3/testutil"
 )
 
 func exampleEndpoints() []string { return nil }

clientv3/logger.go

@@ -18,7 +18,7 @@ import (
 	"io/ioutil"
 	"sync"
 
-	"go.etcd.io/etcd/v3/pkg/logutil"
+	"go.etcd.io/etcd/pkg/v3/logutil"
 
 	"google.golang.org/grpc/grpclog"
 )

clientv3/main_test.go

@@ -18,7 +18,7 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/pkg/v3/testutil"
 )
 
 const (

clientv3/snapshot/v3_snapshot.go

@@ -23,8 +23,8 @@ import (
 	"time"
 
 	"github.com/dustin/go-humanize"
+	"go.etcd.io/etcd/pkg/v3/fileutil"
 	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/pkg/fileutil"
 	"go.uber.org/zap"
 )
 

clientv3/txn_test.go

@@ -18,7 +18,7 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/pkg/v3/testutil"
 )
 
 func TestTxnPanics(t *testing.T) {

clientv3/yaml/config.go

@@ -22,8 +22,8 @@ import (
 
 	"sigs.k8s.io/yaml"
 
+	"go.etcd.io/etcd/pkg/v3/tlsutil"
 	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/pkg/tlsutil"
 )
 
 type yamlConfig struct {

contrib/raftexample/raft.go

@@ -24,11 +24,11 @@ import (
 	"strconv"
 	"time"
 
+	"go.etcd.io/etcd/pkg/v3/fileutil"
+	"go.etcd.io/etcd/pkg/v3/types"
 	"go.etcd.io/etcd/v3/etcdserver/api/rafthttp"
 	"go.etcd.io/etcd/v3/etcdserver/api/snap"
 	stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats"
-	"go.etcd.io/etcd/v3/pkg/fileutil"
-	"go.etcd.io/etcd/v3/pkg/types"
 	"go.etcd.io/etcd/v3/raft"
 	"go.etcd.io/etcd/v3/raft/raftpb"
 	"go.etcd.io/etcd/v3/wal"

embed/config.go

@@ -26,15 +26,15 @@ import (
 	"sync"
 	"time"
 
+	"go.etcd.io/etcd/pkg/v3/flags"
+	"go.etcd.io/etcd/pkg/v3/logutil"
+	"go.etcd.io/etcd/pkg/v3/netutil"
+	"go.etcd.io/etcd/pkg/v3/srv"
+	"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/v3/pkg/flags"
-	"go.etcd.io/etcd/v3/pkg/logutil"
-	"go.etcd.io/etcd/v3/pkg/netutil"
-	"go.etcd.io/etcd/v3/pkg/srv"
-	"go.etcd.io/etcd/v3/pkg/tlsutil"
-	"go.etcd.io/etcd/v3/pkg/transport"
-	"go.etcd.io/etcd/v3/pkg/types"
 
 	bolt "go.etcd.io/bbolt"
 	"go.uber.org/zap"

embed/config_logging.go

@@ -19,7 +19,7 @@ import (
 	"fmt"
 	"sync"
 
-	"go.etcd.io/etcd/v3/pkg/logutil"
+	"go.etcd.io/etcd/pkg/v3/logutil"
 
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"

embed/config_logging_journal_unix.go

@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"os"
 
-	"go.etcd.io/etcd/v3/pkg/logutil"
+	"go.etcd.io/etcd/pkg/v3/logutil"
 
 	"go.uber.org/zap/zapcore"
 )

embed/config_test.go

@@ -22,7 +22,7 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/pkg/transport"
+	"go.etcd.io/etcd/pkg/v3/transport"
 
 	"sigs.k8s.io/yaml"
 )

embed/etcd.go

@@ -30,6 +30,10 @@ import (
 	"time"
 
 	"go.etcd.io/etcd/api/v3/version"
+	"go.etcd.io/etcd/pkg/v3/debugutil"
+	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"
@@ -37,10 +41,6 @@ import (
 	"go.etcd.io/etcd/v3/etcdserver/api/v2v3"
 	"go.etcd.io/etcd/v3/etcdserver/api/v3client"
 	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc"
-	"go.etcd.io/etcd/v3/pkg/debugutil"
-	runtimeutil "go.etcd.io/etcd/v3/pkg/runtime"
-	"go.etcd.io/etcd/v3/pkg/transport"
-	"go.etcd.io/etcd/v3/pkg/types"
 
 	grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus"
 	"github.com/soheilhy/cmux"

embed/serve.go

@@ -24,6 +24,9 @@ import (
 	"strings"
 
 	etcdservergw "go.etcd.io/etcd/api/v3/etcdserverpb/gw"
+	"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/clientv3/credentials"
 	"go.etcd.io/etcd/v3/etcdserver"
 	"go.etcd.io/etcd/v3/etcdserver/api/v3client"
@@ -34,9 +37,6 @@ import (
 	"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/v3/pkg/debugutil"
-	"go.etcd.io/etcd/v3/pkg/httputil"
-	"go.etcd.io/etcd/v3/pkg/transport"
 
 	gw "github.com/grpc-ecosystem/grpc-gateway/runtime"
 	"github.com/soheilhy/cmux"

etcdctl/ctlv2/command/backup_command.go

@@ -24,11 +24,11 @@ import (
 	"time"
 
 	"go.etcd.io/etcd/api/v3/etcdserverpb"
+	"go.etcd.io/etcd/pkg/v3/fileutil"
+	"go.etcd.io/etcd/pkg/v3/idutil"
+	"go.etcd.io/etcd/pkg/v3/pbutil"
 	"go.etcd.io/etcd/v3/etcdserver/api/membership"
 	"go.etcd.io/etcd/v3/etcdserver/api/snap"
-	"go.etcd.io/etcd/v3/pkg/fileutil"
-	"go.etcd.io/etcd/v3/pkg/idutil"
-	"go.etcd.io/etcd/v3/pkg/pbutil"
 	"go.etcd.io/etcd/v3/raft/raftpb"
 	"go.etcd.io/etcd/v3/wal"
 	"go.etcd.io/etcd/v3/wal/walpb"

etcdctl/ctlv2/command/role_commands.go

@@ -21,8 +21,8 @@ import (
 	"strings"
 
 	"github.com/urfave/cli"
+	"go.etcd.io/etcd/pkg/v3/pathutil"
 	"go.etcd.io/etcd/v3/client"
-	"go.etcd.io/etcd/v3/pkg/pathutil"
 )
 
 func NewRoleCommands() cli.Command {

etcdctl/ctlv2/command/util.go

@@ -28,8 +28,8 @@ import (
 	"syscall"
 	"time"
 
+	"go.etcd.io/etcd/pkg/v3/transport"
 	"go.etcd.io/etcd/v3/client"
-	"go.etcd.io/etcd/v3/pkg/transport"
 
 	"github.com/bgentry/speakeasy"
 	"github.com/urfave/cli"

etcdctl/ctlv3/command/check.go

@@ -25,8 +25,8 @@ import (
 	"sync"
 	"time"
 
+	"go.etcd.io/etcd/pkg/v3/report"
 	v3 "go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/pkg/report"
 
 	"github.com/spf13/cobra"
 	"golang.org/x/time/rate"

etcdctl/ctlv3/command/ep_command.go

@@ -21,8 +21,8 @@ import (
 	"time"
 
 	"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
+	"go.etcd.io/etcd/pkg/v3/flags"
 	v3 "go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/pkg/flags"
 
 	"github.com/spf13/cobra"
 	"go.uber.org/zap"

etcdctl/ctlv3/command/global.go

@@ -25,10 +25,10 @@ import (
 	"time"
 
 	"github.com/bgentry/speakeasy"
+	"go.etcd.io/etcd/pkg/v3/flags"
+	"go.etcd.io/etcd/pkg/v3/srv"
+	"go.etcd.io/etcd/pkg/v3/transport"
 	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/pkg/flags"
-	"go.etcd.io/etcd/v3/pkg/srv"
-	"go.etcd.io/etcd/v3/pkg/transport"
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"

etcdctl/ctlv3/command/migrate_command.go

@@ -26,6 +26,8 @@ import (
 
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
 	"go.etcd.io/etcd/api/v3/mvccpb"
+	"go.etcd.io/etcd/pkg/v3/pbutil"
+	"go.etcd.io/etcd/pkg/v3/types"
 	"go.etcd.io/etcd/v3/client"
 	"go.etcd.io/etcd/v3/etcdserver"
 	"go.etcd.io/etcd/v3/etcdserver/api"
@@ -35,8 +37,6 @@ import (
 	"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/pkg/pbutil"
-	"go.etcd.io/etcd/v3/pkg/types"
 	"go.etcd.io/etcd/v3/raft/raftpb"
 	"go.etcd.io/etcd/v3/wal"
 	"go.etcd.io/etcd/v3/wal/walpb"

etcdctl/ctlv3/command/printer_simple.go

@@ -20,9 +20,9 @@ import (
 	"strings"
 
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
+	"go.etcd.io/etcd/pkg/v3/types"
 	v3 "go.etcd.io/etcd/v3/clientv3"
 	"go.etcd.io/etcd/v3/etcdctl/snapshot"
-	"go.etcd.io/etcd/v3/pkg/types"
 )
 
 type simplePrinter struct {

etcdctl/snapshot/v3_snapshot.go

@@ -29,6 +29,9 @@ import (
 
 	bolt "go.etcd.io/bbolt"
 	"go.etcd.io/etcd/api/v3/etcdserverpb"
+	"go.etcd.io/etcd/pkg/v3/fileutil"
+	"go.etcd.io/etcd/pkg/v3/traceutil"
+	"go.etcd.io/etcd/pkg/v3/types"
 	"go.etcd.io/etcd/v3/clientv3"
 	"go.etcd.io/etcd/v3/clientv3/snapshot"
 	"go.etcd.io/etcd/v3/etcdserver"
@@ -39,9 +42,6 @@ import (
 	"go.etcd.io/etcd/v3/lease"
 	"go.etcd.io/etcd/v3/mvcc"
 	"go.etcd.io/etcd/v3/mvcc/backend"
-	"go.etcd.io/etcd/v3/pkg/fileutil"
-	"go.etcd.io/etcd/v3/pkg/traceutil"
-	"go.etcd.io/etcd/v3/pkg/types"
 	"go.etcd.io/etcd/v3/raft"
 	"go.etcd.io/etcd/v3/raft/raftpb"
 	"go.etcd.io/etcd/v3/wal"

etcdmain/config.go

@@ -25,9 +25,9 @@ import (
 	"runtime"
 
 	"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/v3/pkg/flags"
-	"go.etcd.io/etcd/v3/pkg/logutil"
 
 	"go.uber.org/zap"
 	"sigs.k8s.io/yaml"

etcdmain/etcd.go

@@ -26,15 +26,15 @@ import (
 	"strings"
 	"time"
 
+	"go.etcd.io/etcd/pkg/v3/fileutil"
+	pkgioutil "go.etcd.io/etcd/pkg/v3/ioutil"
+	"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/pkg/fileutil"
-	pkgioutil "go.etcd.io/etcd/v3/pkg/ioutil"
-	"go.etcd.io/etcd/v3/pkg/osutil"
-	"go.etcd.io/etcd/v3/pkg/transport"
-	"go.etcd.io/etcd/v3/pkg/types"
 	"go.etcd.io/etcd/v3/proxy/httpproxy"
 
 	"go.uber.org/zap"

etcdmain/grpc_proxy.go

@@ -30,6 +30,9 @@ import (
 	"time"
 
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
+	"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/clientv3"
 	"go.etcd.io/etcd/v3/clientv3/leasing"
 	"go.etcd.io/etcd/v3/clientv3/namespace"
@@ -37,9 +40,6 @@ import (
 	"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/pkg/debugutil"
-	"go.etcd.io/etcd/v3/pkg/logutil"
-	"go.etcd.io/etcd/v3/pkg/transport"
 	"go.etcd.io/etcd/v3/proxy/grpcproxy"
 
 	grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus"

etcdmain/util.go

@@ -18,8 +18,8 @@ import (
 	"fmt"
 	"os"
 
-	"go.etcd.io/etcd/v3/pkg/srv"
-	"go.etcd.io/etcd/v3/pkg/transport"
+	"go.etcd.io/etcd/pkg/v3/srv"
+	"go.etcd.io/etcd/pkg/v3/transport"
 
 	"go.uber.org/zap"
 )

etcdserver/api/cluster.go

@@ -15,8 +15,8 @@
 package api
 
 import (
+	"go.etcd.io/etcd/pkg/v3/types"
 	"go.etcd.io/etcd/v3/etcdserver/api/membership"
-	"go.etcd.io/etcd/v3/pkg/types"
 
 	"github.com/coreos/go-semver/semver"
 )

etcdserver/api/etcdhttp/peer.go

@@ -21,12 +21,12 @@ import (
 	"strconv"
 	"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/v3/pkg/types"
 
 	"go.uber.org/zap"
 )

etcdserver/api/etcdhttp/peer_test.go

@@ -30,11 +30,11 @@ import (
 
 	"github.com/coreos/go-semver/semver"
 	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/v3/pkg/testutil"
-	"go.etcd.io/etcd/v3/pkg/types"
 )
 
 type fakeCluster struct {

etcdserver/api/membership/cluster.go

@@ -28,10 +28,10 @@ import (
 	"time"
 
 	"go.etcd.io/etcd/api/v3/version"
+	"go.etcd.io/etcd/pkg/v3/netutil"
+	"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/v3/pkg/netutil"
-	"go.etcd.io/etcd/v3/pkg/types"
 	"go.etcd.io/etcd/v3/raft"
 	"go.etcd.io/etcd/v3/raft/raftpb"
 

etcdserver/api/membership/cluster_test.go

@@ -23,11 +23,11 @@ import (
 
 	"github.com/coreos/go-semver/semver"
 
+	"go.etcd.io/etcd/pkg/v3/testutil"
+	"go.etcd.io/etcd/pkg/v3/types"
 	"go.etcd.io/etcd/v3/etcdserver/api/v2store"
-	"go.etcd.io/etcd/v3/pkg/mock/mockstore"
-	"go.etcd.io/etcd/v3/pkg/testutil"
-	"go.etcd.io/etcd/v3/pkg/types"
 	"go.etcd.io/etcd/v3/raft/raftpb"
+	"go.etcd.io/etcd/v3/server/mock/mockstore"
 
 	"go.uber.org/zap"
 )

etcdserver/api/membership/member.go

@@ -22,7 +22,7 @@ import (
 	"sort"
 	"time"
 
-	"go.etcd.io/etcd/v3/pkg/types"
+	"go.etcd.io/etcd/pkg/v3/types"
 )
 
 // RaftAttributes represents the raft related attributes of an etcd member.

etcdserver/api/membership/member_test.go

@@ -20,7 +20,7 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/pkg/types"
+	"go.etcd.io/etcd/pkg/v3/types"
 )
 
 func timeParse(value string) *time.Time {

etcdserver/api/membership/store.go

@@ -19,9 +19,9 @@ import (
 	"fmt"
 	"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/v3/pkg/types"
 
 	"github.com/coreos/go-semver/semver"
 	"go.uber.org/zap"

etcdserver/api/rafthttp/functional_test.go

@@ -21,8 +21,8 @@ import (
 	"testing"
 	"time"
 
+	"go.etcd.io/etcd/pkg/v3/types"
 	stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats"
-	"go.etcd.io/etcd/v3/pkg/types"
 	"go.etcd.io/etcd/v3/raft"
 	"go.etcd.io/etcd/v3/raft/raftpb"
 

etcdserver/api/rafthttp/http.go

@@ -25,9 +25,9 @@ import (
 	"time"
 
 	"go.etcd.io/etcd/api/v3/version"
+	pioutil "go.etcd.io/etcd/pkg/v3/ioutil"
+	"go.etcd.io/etcd/pkg/v3/types"
 	"go.etcd.io/etcd/v3/etcdserver/api/snap"
-	pioutil "go.etcd.io/etcd/v3/pkg/ioutil"
-	"go.etcd.io/etcd/v3/pkg/types"
 	"go.etcd.io/etcd/v3/raft/raftpb"
 
 	humanize "github.com/dustin/go-humanize"

etcdserver/api/rafthttp/http_test.go

@@ -27,9 +27,9 @@ import (
 	"time"
 
 	"go.etcd.io/etcd/api/v3/version"
+	"go.etcd.io/etcd/pkg/v3/pbutil"
+	"go.etcd.io/etcd/pkg/v3/types"
 	"go.etcd.io/etcd/v3/etcdserver/api/snap"
-	"go.etcd.io/etcd/v3/pkg/pbutil"
-	"go.etcd.io/etcd/v3/pkg/types"
 	"go.etcd.io/etcd/v3/raft/raftpb"
 
 	"go.uber.org/zap"

etcdserver/api/rafthttp/msg_codec.go

@@ -19,7 +19,7 @@ import (
 	"errors"
 	"io"
 
-	"go.etcd.io/etcd/v3/pkg/pbutil"
+	"go.etcd.io/etcd/pkg/v3/pbutil"
 	"go.etcd.io/etcd/v3/raft/raftpb"
 )
 

etcdserver/api/rafthttp/msgappv2_codec.go

@@ -20,9 +20,9 @@ import (
 	"io"
 	"time"
 
+	"go.etcd.io/etcd/pkg/v3/pbutil"
+	"go.etcd.io/etcd/pkg/v3/types"
 	stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats"
-	"go.etcd.io/etcd/v3/pkg/pbutil"
-	"go.etcd.io/etcd/v3/pkg/types"
 	"go.etcd.io/etcd/v3/raft/raftpb"
 )
 

etcdserver/api/rafthttp/msgappv2_codec_test.go

@@ -19,8 +19,8 @@ import (
 	"reflect"
 	"testing"
 
+	"go.etcd.io/etcd/pkg/v3/types"
 	stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats"
-	"go.etcd.io/etcd/v3/pkg/types"
 	"go.etcd.io/etcd/v3/raft/raftpb"
 )
 

etcdserver/api/rafthttp/peer.go

@@ -19,9 +19,9 @@ import (
 	"sync"
 	"time"
 
+	"go.etcd.io/etcd/pkg/v3/types"
 	"go.etcd.io/etcd/v3/etcdserver/api/snap"
 	stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats"
-	"go.etcd.io/etcd/v3/pkg/types"
 	"go.etcd.io/etcd/v3/raft"
 	"go.etcd.io/etcd/v3/raft/raftpb"
 

etcdserver/api/rafthttp/peer_status.go

@@ -20,7 +20,7 @@ import (
 	"sync"
 	"time"
 
-	"go.etcd.io/etcd/v3/pkg/types"
+	"go.etcd.io/etcd/pkg/v3/types"
 
 	"go.uber.org/zap"
 )

etcdserver/api/rafthttp/pipeline.go

@@ -22,9 +22,9 @@ import (
 	"sync"
 	"time"
 
+	"go.etcd.io/etcd/pkg/v3/pbutil"
+	"go.etcd.io/etcd/pkg/v3/types"
 	stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats"
-	"go.etcd.io/etcd/v3/pkg/pbutil"
-	"go.etcd.io/etcd/v3/pkg/types"
 	"go.etcd.io/etcd/v3/raft"
 	"go.etcd.io/etcd/v3/raft/raftpb"
 

etcdserver/api/rafthttp/pipeline_test.go

@@ -25,9 +25,9 @@ import (
 	"time"
 
 	"go.etcd.io/etcd/api/v3/version"
+	"go.etcd.io/etcd/pkg/v3/testutil"
+	"go.etcd.io/etcd/pkg/v3/types"
 	stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats"
-	"go.etcd.io/etcd/v3/pkg/testutil"
-	"go.etcd.io/etcd/v3/pkg/types"
 	"go.etcd.io/etcd/v3/raft/raftpb"
 
 	"go.uber.org/zap"

etcdserver/api/rafthttp/remote.go

@@ -15,7 +15,7 @@
 package rafthttp
 
 import (
-	"go.etcd.io/etcd/v3/pkg/types"
+	"go.etcd.io/etcd/pkg/v3/types"
 	"go.etcd.io/etcd/v3/raft/raftpb"
 
 	"go.uber.org/zap"

etcdserver/api/rafthttp/snapshot_sender.go

@@ -22,10 +22,10 @@ import (
 	"net/http"
 	"time"
 
+	"go.etcd.io/etcd/pkg/v3/httputil"
+	pioutil "go.etcd.io/etcd/pkg/v3/ioutil"
+	"go.etcd.io/etcd/pkg/v3/types"
 	"go.etcd.io/etcd/v3/etcdserver/api/snap"
-	"go.etcd.io/etcd/v3/pkg/httputil"
-	pioutil "go.etcd.io/etcd/v3/pkg/ioutil"
-	"go.etcd.io/etcd/v3/pkg/types"
 	"go.etcd.io/etcd/v3/raft"
 
 	"github.com/dustin/go-humanize"

etcdserver/api/rafthttp/snapshot_test.go

@@ -25,8 +25,8 @@ import (
 	"testing"
 	"time"
 
+	"go.etcd.io/etcd/pkg/v3/types"
 	"go.etcd.io/etcd/v3/etcdserver/api/snap"
-	"go.etcd.io/etcd/v3/pkg/types"
 	"go.etcd.io/etcd/v3/raft/raftpb"
 
 	"go.uber.org/zap"

etcdserver/api/rafthttp/stream.go

@@ -26,10 +26,10 @@ import (
 	"time"
 
 	"go.etcd.io/etcd/api/v3/version"
+	"go.etcd.io/etcd/pkg/v3/httputil"
+	"go.etcd.io/etcd/pkg/v3/transport"
+	"go.etcd.io/etcd/pkg/v3/types"
 	stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats"
-	"go.etcd.io/etcd/v3/pkg/httputil"
-	"go.etcd.io/etcd/v3/pkg/transport"
-	"go.etcd.io/etcd/v3/pkg/types"
 	"go.etcd.io/etcd/v3/raft/raftpb"
 
 	"github.com/coreos/go-semver/semver"

etcdserver/api/rafthttp/stream_test.go

@@ -27,9 +27,9 @@ import (
 	"time"
 
 	"go.etcd.io/etcd/api/v3/version"
+	"go.etcd.io/etcd/pkg/v3/testutil"
+	"go.etcd.io/etcd/pkg/v3/types"
 	stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats"
-	"go.etcd.io/etcd/v3/pkg/testutil"
-	"go.etcd.io/etcd/v3/pkg/types"
 	"go.etcd.io/etcd/v3/raft/raftpb"
 
 	"github.com/coreos/go-semver/semver"

etcdserver/api/rafthttp/transport.go

@@ -20,10 +20,10 @@ import (
 	"sync"
 	"time"
 
+	"go.etcd.io/etcd/pkg/v3/transport"
+	"go.etcd.io/etcd/pkg/v3/types"
 	"go.etcd.io/etcd/v3/etcdserver/api/snap"
 	stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats"
-	"go.etcd.io/etcd/v3/pkg/transport"
-	"go.etcd.io/etcd/v3/pkg/types"
 	"go.etcd.io/etcd/v3/raft"
 	"go.etcd.io/etcd/v3/raft/raftpb"
 

etcdserver/api/rafthttp/transport_bench_test.go

@@ -21,8 +21,8 @@ import (
 	"testing"
 	"time"
 
+	"go.etcd.io/etcd/pkg/v3/types"
 	stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats"
-	"go.etcd.io/etcd/v3/pkg/types"
 	"go.etcd.io/etcd/v3/raft"
 	"go.etcd.io/etcd/v3/raft/raftpb"
 

etcdserver/api/rafthttp/transport_test.go

@@ -20,9 +20,9 @@ import (
 	"testing"
 	"time"
 
+	"go.etcd.io/etcd/pkg/v3/testutil"
+	"go.etcd.io/etcd/pkg/v3/types"
 	stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats"
-	"go.etcd.io/etcd/v3/pkg/testutil"
-	"go.etcd.io/etcd/v3/pkg/types"
 	"go.etcd.io/etcd/v3/raft/raftpb"
 
 	"github.com/xiang90/probing"

etcdserver/api/rafthttp/urlpick.go

@@ -18,7 +18,7 @@ import (
 	"net/url"
 	"sync"
 
-	"go.etcd.io/etcd/v3/pkg/types"
+	"go.etcd.io/etcd/pkg/v3/types"
 )
 
 type urlPicker struct {

etcdserver/api/rafthttp/urlpick_test.go

@@ -18,7 +18,7 @@ import (
 	"net/url"
 	"testing"
 
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/pkg/v3/testutil"
 )
 
 // TestURLPickerPickTwice tests that pick returns a possible url,

etcdserver/api/rafthttp/util.go

@@ -24,8 +24,8 @@ import (
 	"time"
 
 	"go.etcd.io/etcd/api/v3/version"
-	"go.etcd.io/etcd/v3/pkg/transport"
-	"go.etcd.io/etcd/v3/pkg/types"
+	"go.etcd.io/etcd/pkg/v3/transport"
+	"go.etcd.io/etcd/pkg/v3/types"
 
 	"github.com/coreos/go-semver/semver"
 	"go.uber.org/zap"

etcdserver/api/snap/db.go

@@ -23,7 +23,7 @@ import (
 	"path/filepath"
 	"time"
 
-	"go.etcd.io/etcd/v3/pkg/fileutil"
+	"go.etcd.io/etcd/pkg/v3/fileutil"
 
 	humanize "github.com/dustin/go-humanize"
 	"go.uber.org/zap"

etcdserver/api/snap/message.go

@@ -17,7 +17,7 @@ package snap
 import (
 	"io"
 
-	"go.etcd.io/etcd/v3/pkg/ioutil"
+	"go.etcd.io/etcd/pkg/v3/ioutil"
 	"go.etcd.io/etcd/v3/raft/raftpb"
 )
 

etcdserver/api/snap/snapshotter.go

@@ -26,9 +26,9 @@ import (
 	"strings"
 	"time"
 
+	pioutil "go.etcd.io/etcd/pkg/v3/ioutil"
+	"go.etcd.io/etcd/pkg/v3/pbutil"
 	"go.etcd.io/etcd/v3/etcdserver/api/snap/snappb"
-	pioutil "go.etcd.io/etcd/v3/pkg/ioutil"
-	"go.etcd.io/etcd/v3/pkg/pbutil"
 	"go.etcd.io/etcd/v3/raft"
 	"go.etcd.io/etcd/v3/raft/raftpb"
 	"go.etcd.io/etcd/v3/wal/walpb"

etcdserver/api/snap/snapshotter_test.go

@@ -23,7 +23,7 @@ import (
 	"reflect"
 	"testing"
 
-	"go.etcd.io/etcd/v3/pkg/fileutil"
+	"go.etcd.io/etcd/pkg/v3/fileutil"
 	"go.etcd.io/etcd/v3/raft/raftpb"
 	"go.etcd.io/etcd/v3/wal/walpb"
 	"go.uber.org/zap"

etcdserver/api/v2auth/auth.go

@@ -27,9 +27,9 @@ import (
 	"time"
 
 	"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/v3/pkg/types"
 
 	"go.uber.org/zap"
 	"golang.org/x/crypto/bcrypt"

etcdserver/api/v2discovery/discovery.go

@@ -29,9 +29,9 @@ import (
 	"strings"
 	"time"
 
+	"go.etcd.io/etcd/pkg/v3/transport"
+	"go.etcd.io/etcd/pkg/v3/types"
 	"go.etcd.io/etcd/v3/client"
-	"go.etcd.io/etcd/v3/pkg/transport"
-	"go.etcd.io/etcd/v3/pkg/types"
 
 	"github.com/jonboulle/clockwork"
 	"go.uber.org/zap"

etcdserver/api/v2discovery/discovery_test.go

@@ -27,8 +27,8 @@ import (
 	"testing"
 	"time"
 
+	"go.etcd.io/etcd/pkg/v3/types"
 	"go.etcd.io/etcd/v3/client"
-	"go.etcd.io/etcd/v3/pkg/types"
 
 	"github.com/jonboulle/clockwork"
 	"go.uber.org/zap"

etcdserver/api/v2http/client.go

@@ -28,6 +28,7 @@ import (
 	"time"
 
 	"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"
@@ -37,7 +38,6 @@ import (
 	"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/pkg/types"
 
 	"github.com/jonboulle/clockwork"
 	"go.uber.org/zap"

etcdserver/api/v2http/client_test.go

@@ -30,14 +30,14 @@ import (
 	"time"
 
 	"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"
 	"go.etcd.io/etcd/v3/etcdserver/api"
 	"go.etcd.io/etcd/v3/etcdserver/api/membership"
 	"go.etcd.io/etcd/v3/etcdserver/api/v2error"
 	"go.etcd.io/etcd/v3/etcdserver/api/v2http/httptypes"
 	"go.etcd.io/etcd/v3/etcdserver/api/v2store"
-	"go.etcd.io/etcd/v3/pkg/testutil"
-	"go.etcd.io/etcd/v3/pkg/types"
 	"go.etcd.io/etcd/v3/raft/raftpb"
 
 	"github.com/coreos/go-semver/semver"

etcdserver/api/v2http/http_test.go

@@ -23,10 +23,10 @@ import (
 	"testing"
 
 	"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/membership"
 	"go.etcd.io/etcd/v3/etcdserver/api/v2error"
-	"go.etcd.io/etcd/v3/pkg/types"
 	"go.etcd.io/etcd/v3/raft/raftpb"
 
 	"github.com/coreos/go-semver/semver"

etcdserver/api/v2http/httptypes/member.go

@@ -19,7 +19,7 @@ package httptypes
 import (
 	"encoding/json"
 
-	"go.etcd.io/etcd/v3/pkg/types"
+	"go.etcd.io/etcd/pkg/v3/types"
 )
 
 type Member struct {

etcdserver/api/v2http/httptypes/member_test.go

@@ -20,7 +20,7 @@ import (
 	"reflect"
 	"testing"
 
-	"go.etcd.io/etcd/v3/pkg/types"
+	"go.etcd.io/etcd/pkg/v3/types"
 )
 
 func TestMemberUnmarshal(t *testing.T) {

etcdserver/api/v2store/node_extern_test.go

@@ -20,7 +20,7 @@ import (
 	"time"
 	"unsafe"
 
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/pkg/v3/testutil"
 )
 
 func TestNodeExternClone(t *testing.T) {

etcdserver/api/v2store/stats_test.go

@@ -18,7 +18,7 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/pkg/v3/testutil"
 )
 
 // Ensure that a successful Get is recorded in the stats.

etcdserver/api/v2store/store.go

@@ -23,8 +23,8 @@ import (
 	"sync"
 	"time"
 
+	"go.etcd.io/etcd/pkg/v3/types"
 	"go.etcd.io/etcd/v3/etcdserver/api/v2error"
-	"go.etcd.io/etcd/v3/pkg/types"
 
 	"github.com/jonboulle/clockwork"
 )

etcdserver/api/v2store/store_ttl_test.go

@@ -18,8 +18,8 @@ import (
 	"testing"
 	"time"
 
+	"go.etcd.io/etcd/pkg/v3/testutil"
 	"go.etcd.io/etcd/v3/etcdserver/api/v2error"
-	"go.etcd.io/etcd/v3/pkg/testutil"
 
 	"github.com/jonboulle/clockwork"
 )

etcdserver/api/v2v3/cluster.go

@@ -15,8 +15,8 @@
 package v2v3
 
 import (
+	"go.etcd.io/etcd/pkg/v3/types"
 	"go.etcd.io/etcd/v3/etcdserver/api/membership"
-	"go.etcd.io/etcd/v3/pkg/types"
 
 	"github.com/coreos/go-semver/semver"
 )

etcdserver/api/v2v3/server.go

@@ -20,11 +20,11 @@ import (
 	"time"
 
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
+	"go.etcd.io/etcd/pkg/v3/types"
 	"go.etcd.io/etcd/v3/clientv3"
 	"go.etcd.io/etcd/v3/etcdserver"
 	"go.etcd.io/etcd/v3/etcdserver/api"
 	"go.etcd.io/etcd/v3/etcdserver/api/membership"
-	"go.etcd.io/etcd/v3/pkg/types"
 
 	"github.com/coreos/go-semver/semver"
 	"go.uber.org/zap"

etcdserver/api/v3alarm/alarms.go

@@ -19,8 +19,8 @@ import (
 	"sync"
 
 	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/v3/pkg/types"
 
 	"go.uber.org/zap"
 )

etcdserver/api/v3compactor/compactor_test.go

@@ -19,7 +19,7 @@ import (
 	"sync/atomic"
 
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/pkg/v3/testutil"
 )
 
 type fakeCompactable struct {

etcdserver/api/v3compactor/periodic_test.go

@@ -20,7 +20,7 @@ import (
 	"time"
 
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/pkg/v3/testutil"
 
 	"github.com/jonboulle/clockwork"
 	"go.uber.org/zap"

etcdserver/api/v3compactor/revision_test.go

@@ -20,7 +20,7 @@ import (
 	"time"
 
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/pkg/v3/testutil"
 
 	"github.com/jonboulle/clockwork"
 	"go.uber.org/zap"

etcdserver/api/v3rpc/interceptor.go

@@ -20,9 +20,9 @@ import (
 	"time"
 
 	"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/pkg/types"
 	"go.etcd.io/etcd/v3/raft"
 
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"

etcdserver/api/v3rpc/key.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/pkg/v3/adt"
 	"go.etcd.io/etcd/v3/etcdserver"
-	"go.etcd.io/etcd/v3/pkg/adt"
 )
 
 type kvServer struct {

etcdserver/api/v3rpc/member.go

@@ -20,10 +20,10 @@ 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/v3/pkg/types"
 )
 
 type ClusterServer struct {

etcdserver/api/v3rpc/quota.go

@@ -19,8 +19,8 @@ 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/pkg/types"
 )
 
 type quotaKVServer struct {

etcdserver/apply.go

@@ -25,13 +25,13 @@ import (
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
 	"go.etcd.io/etcd/api/v3/membershippb"
 	"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/v3/pkg/traceutil"
-	"go.etcd.io/etcd/v3/pkg/types"
 
 	"github.com/gogo/protobuf/proto"
 	"go.uber.org/zap"