client/v3: Rename of imports

Documentation/learning/lock/client/client.go

@@ -26,8 +26,8 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/concurrency"
+	"go.etcd.io/etcd/client/v3"
+	"go.etcd.io/etcd/client/v3/concurrency"
 	"io/ioutil"
 	"net/http"
 	"os"

client/v3/balancer/balancer.go

@@ -20,8 +20,8 @@ import (
 	"sync"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3/balancer/connectivity"
-	"go.etcd.io/etcd/v3/clientv3/balancer/picker"
+	"go.etcd.io/etcd/client/v3/balancer/connectivity"
+	"go.etcd.io/etcd/client/v3/balancer/picker"
 
 	"go.uber.org/zap"
 	"google.golang.org/grpc/balancer"

client/v3/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/client/v3/balancer/picker"
+	"go.etcd.io/etcd/client/v3/balancer/resolver/endpoint"
+	"go.etcd.io/etcd/client/v3/mock/mockserver"
 
 	"go.uber.org/zap"
 	"google.golang.org/grpc"

client/v3/client.go

@@ -27,11 +27,11 @@ import (
 
 	"github.com/google/uuid"
 	"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
+	"go.etcd.io/etcd/client/v3/balancer"
+	"go.etcd.io/etcd/client/v3/balancer/picker"
+	"go.etcd.io/etcd/client/v3/balancer/resolver/endpoint"
+	"go.etcd.io/etcd/client/v3/credentials"
 	"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.uber.org/zap"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"

client/v3/clientv3util/example_key_test.go

@@ -18,8 +18,8 @@ import (
 	"context"
 	"log"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/clientv3util"
+	"go.etcd.io/etcd/client/v3"
+	"go.etcd.io/etcd/client/v3/clientv3util"
 )
 
 func ExampleKeyMissing() {

client/v3/clientv3util/util.go

@@ -16,7 +16,7 @@
 package clientv3util
 
 import (
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 )
 
 // KeyExists returns a comparison operation that evaluates to true iff the given

client/v3/concurrency/election.go

@@ -21,7 +21,7 @@ import (
 
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
 	"go.etcd.io/etcd/api/v3/mvccpb"
-	v3 "go.etcd.io/etcd/v3/clientv3"
+	v3 "go.etcd.io/etcd/client/v3"
 )
 
 var (

client/v3/concurrency/key.go

@@ -20,7 +20,7 @@ import (
 
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
 	"go.etcd.io/etcd/api/v3/mvccpb"
-	v3 "go.etcd.io/etcd/v3/clientv3"
+	v3 "go.etcd.io/etcd/client/v3"
 )
 
 func waitDelete(ctx context.Context, client *v3.Client, key string, rev int64) error {

client/v3/concurrency/mutex.go

@@ -21,7 +21,7 @@ import (
 	"sync"
 
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
-	v3 "go.etcd.io/etcd/v3/clientv3"
+	v3 "go.etcd.io/etcd/client/v3"
 )
 
 // ErrLocked is returned by TryLock when Mutex is already locked by another session.

client/v3/concurrency/session.go

@@ -18,7 +18,7 @@ import (
 	"context"
 	"time"
 
-	v3 "go.etcd.io/etcd/v3/clientv3"
+	v3 "go.etcd.io/etcd/client/v3"
 )
 
 const defaultSessionTTL = 60

client/v3/concurrency/stm.go

@@ -18,7 +18,7 @@ import (
 	"context"
 	"math"
 
-	v3 "go.etcd.io/etcd/v3/clientv3"
+	v3 "go.etcd.io/etcd/client/v3"
 )
 
 // STM is an interface for software transactional memory.

client/v3/leasing/cache.go

@@ -22,7 +22,7 @@ import (
 
 	v3pb "go.etcd.io/etcd/api/v3/etcdserverpb"
 	"go.etcd.io/etcd/api/v3/mvccpb"
-	v3 "go.etcd.io/etcd/v3/clientv3"
+	v3 "go.etcd.io/etcd/client/v3"
 )
 
 const revokeBackoff = 2 * time.Second

client/v3/leasing/kv.go

@@ -23,8 +23,8 @@ import (
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
 	"go.etcd.io/etcd/api/v3/mvccpb"
 	"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
-	v3 "go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/concurrency"
+	v3 "go.etcd.io/etcd/client/v3"
+	"go.etcd.io/etcd/client/v3/concurrency"
 
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"

client/v3/leasing/txn.go

@@ -19,7 +19,7 @@ import (
 	"strings"
 
 	v3pb "go.etcd.io/etcd/api/v3/etcdserverpb"
-	v3 "go.etcd.io/etcd/v3/clientv3"
+	v3 "go.etcd.io/etcd/client/v3"
 )
 
 type txnLeasing struct {

client/v3/leasing/util.go

@@ -18,7 +18,7 @@ import (
 	"bytes"
 
 	v3pb "go.etcd.io/etcd/api/v3/etcdserverpb"
-	v3 "go.etcd.io/etcd/v3/clientv3"
+	v3 "go.etcd.io/etcd/client/v3"
 )
 
 func compareInt64(a, b int64) int {

client/v3/mirror/syncer.go

@@ -18,7 +18,7 @@ package mirror
 import (
 	"context"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 )
 
 const (

client/v3/namespace/kv.go

@@ -19,7 +19,7 @@ import (
 
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
 	"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 )
 
 type kvPrefix struct {

client/v3/namespace/lease.go

@@ -18,7 +18,7 @@ import (
 	"bytes"
 	"context"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 )
 
 type leasePrefix struct {

client/v3/namespace/watch.go

@@ -18,7 +18,7 @@ import (
 	"context"
 	"sync"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 )
 
 type watcherPrefix struct {

client/v3/naming/doc.go

@@ -17,8 +17,8 @@
 // To use, first import the packages:
 //
 //	import (
-//		"go.etcd.io/etcd/v3/clientv3"
-//		etcdnaming "go.etcd.io/etcd/v3/clientv3/naming"
+//		"go.etcd.io/etcd/client/v3"
+//		etcdnaming "go.etcd.io/etcd/client/v3/naming"
 //
 //		"google.golang.org/grpc"
 //		"google.golang.org/grpc/naming"

client/v3/naming/grpc.go

@@ -19,7 +19,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	etcd "go.etcd.io/etcd/v3/clientv3"
+	etcd "go.etcd.io/etcd/client/v3"
 
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/naming"

client/v3/ordering/kv.go

@@ -18,7 +18,7 @@ import (
 	"context"
 	"sync"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 )
 
 // kvOrdering ensures that serialized requests do not return

client/v3/ordering/kv_test.go

@@ -21,7 +21,7 @@ import (
 	"testing"
 
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 )
 
 type mockKV struct {

client/v3/ordering/logger_test.go

@@ -17,7 +17,7 @@ package ordering
 import (
 	"io/ioutil"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 
 	"google.golang.org/grpc/grpclog"
 )

client/v3/ordering/util.go

@@ -19,7 +19,7 @@ import (
 	"sync"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 )
 
 type OrderViolationFunc func(op clientv3.Op, resp clientv3.OpResponse, prevRev int64) error

client/v3/snapshot/v3_snapshot.go

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

client/v3/yaml/config.go

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

contrib/recipes/barrier.go

@@ -18,7 +18,7 @@ import (
 	"context"
 
 	"go.etcd.io/etcd/api/v3/mvccpb"
-	v3 "go.etcd.io/etcd/v3/clientv3"
+	v3 "go.etcd.io/etcd/client/v3"
 )
 
 // Barrier creates a key in etcd to block processes, then deletes the key to

contrib/recipes/client.go

@@ -19,7 +19,7 @@ import (
 	"errors"
 
 	spb "go.etcd.io/etcd/api/v3/mvccpb"
-	v3 "go.etcd.io/etcd/v3/clientv3"
+	v3 "go.etcd.io/etcd/client/v3"
 )
 
 var (

contrib/recipes/double_barrier.go

@@ -18,8 +18,8 @@ import (
 	"context"
 
 	"go.etcd.io/etcd/api/v3/mvccpb"
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/concurrency"
+	"go.etcd.io/etcd/client/v3"
+	"go.etcd.io/etcd/client/v3/concurrency"
 )
 
 // DoubleBarrier blocks processes on Enter until an expected count enters, then

contrib/recipes/key.go

@@ -20,8 +20,8 @@ import (
 	"strings"
 	"time"
 
-	v3 "go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/concurrency"
+	v3 "go.etcd.io/etcd/client/v3"
+	"go.etcd.io/etcd/client/v3/concurrency"
 )
 
 // RemoteKV is a key/revision pair created by the client and stored on etcd

contrib/recipes/priority_queue.go

@@ -19,7 +19,7 @@ import (
 	"fmt"
 
 	"go.etcd.io/etcd/api/v3/mvccpb"
-	v3 "go.etcd.io/etcd/v3/clientv3"
+	v3 "go.etcd.io/etcd/client/v3"
 )
 
 // PriorityQueue implements a multi-reader, multi-writer distributed queue.

contrib/recipes/queue.go

@@ -18,7 +18,7 @@ import (
 	"context"
 
 	"go.etcd.io/etcd/api/v3/mvccpb"
-	v3 "go.etcd.io/etcd/v3/clientv3"
+	v3 "go.etcd.io/etcd/client/v3"
 )
 
 // Queue implements a multi-reader, multi-writer distributed queue.

contrib/recipes/rwmutex.go

@@ -18,8 +18,8 @@ import (
 	"context"
 
 	"go.etcd.io/etcd/api/v3/mvccpb"
-	v3 "go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/concurrency"
+	v3 "go.etcd.io/etcd/client/v3"
+	"go.etcd.io/etcd/client/v3/concurrency"
 )
 
 type RWMutex struct {

contrib/recipes/watch.go

@@ -18,7 +18,7 @@ import (
 	"context"
 
 	"go.etcd.io/etcd/api/v3/mvccpb"
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 )
 
 // WaitEvents waits on a key until it observes the given events and returns the final one.

embed/serve.go

@@ -24,10 +24,10 @@ import (
 	"strings"
 
 	etcdservergw "go.etcd.io/etcd/api/v3/etcdserverpb/gw"
+	"go.etcd.io/etcd/client/v3/credentials"
 	"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"
 	"go.etcd.io/etcd/v3/etcdserver/api/v3election"

etcdctl/ctlv3/command/alarm_command.go

@@ -18,7 +18,7 @@ import (
 	"fmt"
 
 	"github.com/spf13/cobra"
-	v3 "go.etcd.io/etcd/v3/clientv3"
+	v3 "go.etcd.io/etcd/client/v3"
 )
 
 // NewAlarmCommand returns the cobra command for "alarm".

etcdctl/ctlv3/command/check.go

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

etcdctl/ctlv3/command/compaction_command.go

@@ -19,7 +19,7 @@ import (
 	"strconv"
 
 	"github.com/spf13/cobra"
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 )
 
 var compactPhysical bool

etcdctl/ctlv3/command/del_command.go

@@ -18,7 +18,7 @@ import (
 	"fmt"
 
 	"github.com/spf13/cobra"
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 )
 
 var (

etcdctl/ctlv3/command/elect_command.go

@@ -21,8 +21,8 @@ import (
 	"os/signal"
 	"syscall"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/concurrency"
+	"go.etcd.io/etcd/client/v3"
+	"go.etcd.io/etcd/client/v3/concurrency"
 
 	"github.com/spf13/cobra"
 )

etcdctl/ctlv3/command/ep_command.go

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

etcdctl/ctlv3/command/get_command.go

@@ -19,7 +19,7 @@ import (
 	"strings"
 
 	"github.com/spf13/cobra"
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 )
 
 var (

etcdctl/ctlv3/command/global.go

@@ -25,10 +25,10 @@ import (
 	"time"
 
 	"github.com/bgentry/speakeasy"
+	"go.etcd.io/etcd/client/v3"
 	"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"
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"

etcdctl/ctlv3/command/lease_command.go

@@ -19,7 +19,7 @@ import (
 	"fmt"
 	"strconv"
 
-	v3 "go.etcd.io/etcd/v3/clientv3"
+	v3 "go.etcd.io/etcd/client/v3"
 
 	"github.com/spf13/cobra"
 )

etcdctl/ctlv3/command/lock_command.go

@@ -23,8 +23,8 @@ import (
 	"os/signal"
 	"syscall"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/concurrency"
+	"go.etcd.io/etcd/client/v3"
+	"go.etcd.io/etcd/client/v3/concurrency"
 
 	"github.com/spf13/cobra"
 )

etcdctl/ctlv3/command/make_mirror_command.go

@@ -25,8 +25,8 @@ import (
 
 	"go.etcd.io/etcd/api/v3/mvccpb"
 	"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/mirror"
+	"go.etcd.io/etcd/client/v3"
+	"go.etcd.io/etcd/client/v3/mirror"
 
 	"github.com/spf13/cobra"
 )

etcdctl/ctlv3/command/member_command.go

@@ -21,7 +21,7 @@ import (
 	"strings"
 
 	"github.com/spf13/cobra"
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 )
 
 var (

etcdctl/ctlv3/command/move_leader_command.go

@@ -19,7 +19,7 @@ import (
 	"strconv"
 
 	"github.com/spf13/cobra"
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 )
 
 // NewMoveLeaderCommand returns the cobra command for "move-leader".

etcdctl/ctlv3/command/printer.go

@@ -20,7 +20,7 @@ import (
 	"strings"
 
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
-	v3 "go.etcd.io/etcd/v3/clientv3"
+	v3 "go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/v3/etcdctl/snapshot"
 
 	"github.com/dustin/go-humanize"

etcdctl/ctlv3/command/printer_fields.go

@@ -19,7 +19,7 @@ import (
 
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
 	spb "go.etcd.io/etcd/api/v3/mvccpb"
-	v3 "go.etcd.io/etcd/v3/clientv3"
+	v3 "go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/v3/etcdctl/snapshot"
 )
 

etcdctl/ctlv3/command/printer_json.go

@@ -21,7 +21,7 @@ import (
 	"os"
 	"strconv"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/v3/etcdctl/snapshot"
 )
 

etcdctl/ctlv3/command/printer_protobuf.go

@@ -20,7 +20,7 @@ import (
 
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
 	mvccpb "go.etcd.io/etcd/api/v3/mvccpb"
-	v3 "go.etcd.io/etcd/v3/clientv3"
+	v3 "go.etcd.io/etcd/client/v3"
 )
 
 type pbPrinter struct{ printer }

etcdctl/ctlv3/command/printer_simple.go

@@ -20,8 +20,8 @@ import (
 	"strings"
 
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
+	v3 "go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/pkg/v3/types"
-	v3 "go.etcd.io/etcd/v3/clientv3"
 	"go.etcd.io/etcd/v3/etcdctl/snapshot"
 )
 

etcdctl/ctlv3/command/printer_table.go

@@ -17,7 +17,7 @@ package command
 import (
 	"os"
 
-	v3 "go.etcd.io/etcd/v3/clientv3"
+	v3 "go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/v3/etcdctl/snapshot"
 
 	"github.com/olekukonko/tablewriter"

etcdctl/ctlv3/command/put_command.go

@@ -20,7 +20,7 @@ import (
 	"strconv"
 
 	"github.com/spf13/cobra"
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 )
 
 var (

etcdctl/ctlv3/command/role_command.go

@@ -19,7 +19,7 @@ import (
 	"fmt"
 
 	"github.com/spf13/cobra"
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 )
 
 var (

etcdctl/ctlv3/command/txn_command.go

@@ -23,7 +23,7 @@ import (
 	"strings"
 
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 
 	"github.com/spf13/cobra"
 )

etcdctl/ctlv3/command/user_command.go

@@ -21,7 +21,7 @@ import (
 
 	"github.com/bgentry/speakeasy"
 	"github.com/spf13/cobra"
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 )
 
 var (

etcdctl/ctlv3/command/util.go

@@ -26,7 +26,7 @@ import (
 	"time"
 
 	pb "go.etcd.io/etcd/api/v3/mvccpb"
-	v3 "go.etcd.io/etcd/v3/clientv3"
+	v3 "go.etcd.io/etcd/client/v3"
 
 	"github.com/spf13/cobra"
 )

etcdctl/ctlv3/command/watch_command.go

@@ -23,7 +23,7 @@ import (
 	"os/exec"
 	"strings"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 
 	"github.com/spf13/cobra"
 )

etcdctl/snapshot/v3_snapshot.go

@@ -29,13 +29,13 @@ import (
 
 	bolt "go.etcd.io/bbolt"
 	"go.etcd.io/etcd/api/v3/etcdserverpb"
+	"go.etcd.io/etcd/client/v3"
+	"go.etcd.io/etcd/client/v3/snapshot"
 	"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/raft/v3"
 	"go.etcd.io/etcd/raft/v3/raftpb"
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/snapshot"
 	"go.etcd.io/etcd/v3/etcdserver"
 	"go.etcd.io/etcd/v3/etcdserver/api/membership"
 	"go.etcd.io/etcd/v3/etcdserver/api/snap"

etcdmain/grpc_proxy.go

@@ -30,13 +30,13 @@ import (
 	"time"
 
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
+	"go.etcd.io/etcd/client/v3"
+	"go.etcd.io/etcd/client/v3/leasing"
+	"go.etcd.io/etcd/client/v3/namespace"
+	"go.etcd.io/etcd/client/v3/ordering"
 	"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"
-	"go.etcd.io/etcd/v3/clientv3/ordering"
 	"go.etcd.io/etcd/v3/embed"
 	"go.etcd.io/etcd/v3/etcdserver/api/v3election/v3electionpb"
 	"go.etcd.io/etcd/v3/etcdserver/api/v3lock/v3lockpb"

etcdserver/api/v2v3/server.go

@@ -20,8 +20,8 @@ import (
 	"time"
 
 	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/clientv3"
 	"go.etcd.io/etcd/v3/etcdserver"
 	"go.etcd.io/etcd/v3/etcdserver/api"
 	"go.etcd.io/etcd/v3/etcdserver/api/membership"

etcdserver/api/v2v3/store.go

@@ -23,8 +23,8 @@ import (
 	"time"
 
 	"go.etcd.io/etcd/api/v3/mvccpb"
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/concurrency"
+	"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"
 )

etcdserver/api/v2v3/watcher.go

@@ -18,7 +18,7 @@ import (
 	"context"
 	"strings"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/v3/etcdserver/api/v2error"
 	"go.etcd.io/etcd/v3/etcdserver/api/v2store"
 )

etcdserver/api/v3client/v3client.go

@@ -18,7 +18,7 @@ import (
 	"context"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"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"

etcdserver/api/v3election/election.go

@@ -18,8 +18,8 @@ import (
 	"context"
 	"errors"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/concurrency"
+	"go.etcd.io/etcd/client/v3"
+	"go.etcd.io/etcd/client/v3/concurrency"
 	epb "go.etcd.io/etcd/v3/etcdserver/api/v3election/v3electionpb"
 )
 

etcdserver/api/v3lock/lock.go

@@ -17,8 +17,8 @@ package v3lock
 import (
 	"context"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/concurrency"
+	"go.etcd.io/etcd/client/v3"
+	"go.etcd.io/etcd/client/v3/concurrency"
 	"go.etcd.io/etcd/v3/etcdserver/api/v3lock/v3lockpb"
 )
 

etcdserver/api/v3rpc/grpc.go

@@ -23,7 +23,7 @@ import (
 
 	grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware"
 	grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus"
-	"go.etcd.io/etcd/v3/clientv3/credentials"
+	"go.etcd.io/etcd/client/v3/credentials"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/health"
 	healthpb "google.golang.org/grpc/health/grpc_health_v1"

proxy/grpcproxy/auth.go

@@ -18,7 +18,7 @@ import (
 	"context"
 
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 )
 
 type AuthProxy struct {

proxy/grpcproxy/cluster.go

@@ -23,8 +23,8 @@ import (
 
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
 	"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/naming"
+	"go.etcd.io/etcd/client/v3"
+	"go.etcd.io/etcd/client/v3/naming"
 
 	"go.uber.org/zap"
 	"golang.org/x/time/rate"

proxy/grpcproxy/election.go

@@ -17,7 +17,7 @@ package grpcproxy
 import (
 	"context"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/v3/etcdserver/api/v3election/v3electionpb"
 )
 

proxy/grpcproxy/health.go

@@ -21,7 +21,7 @@ import (
 	"time"
 
 	"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/v3/etcdserver/api/etcdhttp"
 	"go.uber.org/zap"
 )

proxy/grpcproxy/kv.go

@@ -18,7 +18,7 @@ import (
 	"context"
 
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/v3/proxy/grpcproxy/cache"
 )
 

proxy/grpcproxy/leader.go

@@ -19,7 +19,7 @@ import (
 	"math"
 	"sync"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 
 	"golang.org/x/time/rate"
 )

proxy/grpcproxy/lease.go

@@ -23,7 +23,7 @@ import (
 
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
 	"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"

proxy/grpcproxy/lock.go

@@ -17,7 +17,7 @@ package grpcproxy
 import (
 	"context"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/v3/etcdserver/api/v3lock/v3lockpb"
 )
 

proxy/grpcproxy/maintenance.go

@@ -19,7 +19,7 @@ import (
 	"io"
 
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 )
 
 type maintenanceProxy struct {

proxy/grpcproxy/register.go

@@ -18,9 +18,9 @@ import (
 	"encoding/json"
 	"os"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/clientv3/concurrency"
-	"go.etcd.io/etcd/v3/clientv3/naming"
+	"go.etcd.io/etcd/client/v3"
+	"go.etcd.io/etcd/client/v3/concurrency"
+	"go.etcd.io/etcd/client/v3/naming"
 
 	"go.uber.org/zap"
 	"golang.org/x/time/rate"

proxy/grpcproxy/watch.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/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc"
 
 	"go.uber.org/zap"

proxy/grpcproxy/watch_broadcast.go

@@ -20,7 +20,7 @@ import (
 	"time"
 
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 
 	"go.uber.org/zap"
 )

proxy/grpcproxy/watcher.go

@@ -19,7 +19,7 @@ import (
 
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
 	"go.etcd.io/etcd/api/v3/mvccpb"
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/v3/mvcc"
 )
 

raft/go.sum

@@ -52,9 +52,7 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
-go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=
-go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
 go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA=
 go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=

tests/e2e/ctl_v3_alarm_test.go

@@ -21,7 +21,7 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 )
 
 func TestCtlV3Alarm(t *testing.T) {

tests/e2e/ctl_v3_auth_test.go

@@ -22,7 +22,7 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 )
 
 func TestCtlV3AuthEnable(t *testing.T)              { testCtl(t, authEnableTest) }

tests/e2e/ctl_v3_endpoint_test.go

@@ -21,7 +21,7 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 )
 
 func TestCtlV3EndpointHealth(t *testing.T) { testCtl(t, endpointHealthTest, withQuorum()) }

tests/e2e/ctl_v3_migrate_test.go

@@ -21,8 +21,8 @@ import (
 	"testing"
 	"time"
 
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/pkg/v3/testutil"
-	"go.etcd.io/etcd/v3/clientv3"
 )
 
 func TestCtlV3Migrate(t *testing.T) {

tests/e2e/ctl_v3_move_leader_test.go

@@ -22,10 +22,10 @@ import (
 	"testing"
 	"time"
 
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/pkg/v3/testutil"
 	"go.etcd.io/etcd/pkg/v3/transport"
 	"go.etcd.io/etcd/pkg/v3/types"
-	"go.etcd.io/etcd/v3/clientv3"
 )
 
 func TestCtlV3MoveLeaderSecure(t *testing.T) {

tests/e2e/etcd_corrupt_test.go

@@ -24,7 +24,7 @@ import (
 	"time"
 
 	"go.etcd.io/etcd/api/v3/mvccpb"
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 
 	bolt "go.etcd.io/bbolt"
 )

tests/functional/rpcpb/member.go

@@ -23,9 +23,9 @@ import (
 	"time"
 
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
+	"go.etcd.io/etcd/client/v3"
 	"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/etcdctl/snapshot"
 
 	"github.com/dustin/go-humanize"

tests/functional/runner/election_command.go

@@ -19,7 +19,7 @@ import (
 	"errors"
 	"fmt"
 
-	"go.etcd.io/etcd/v3/clientv3/concurrency"
+	"go.etcd.io/etcd/client/v3/concurrency"
 
 	"github.com/spf13/cobra"
 )

tests/functional/runner/global.go

@@ -21,7 +21,7 @@ import (
 	"sync"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 
 	"github.com/spf13/cobra"
 	"golang.org/x/time/rate"

tests/functional/runner/lease_renewer_command.go

@@ -21,7 +21,7 @@ import (
 	"log"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/client/v3"
 
 	"github.com/spf13/cobra"
 	"google.golang.org/grpc/codes"

tests/functional/runner/lock_racer_command.go

@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"sync"
 
-	"go.etcd.io/etcd/v3/clientv3/concurrency"
+	"go.etcd.io/etcd/client/v3/concurrency"
 
 	"github.com/spf13/cobra"
 )

tests/functional/runner/watch_command.go

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

tests/functional/tester/case_sigquit_remove.go

@@ -21,8 +21,8 @@ import (
 	"strings"
 	"time"
 
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/tests/v3/functional/rpcpb"
-	"go.etcd.io/etcd/v3/clientv3"
 
 	"go.uber.org/zap"
 )

tests/functional/tester/case_sigquit_remove_quorum.go

@@ -20,8 +20,8 @@ import (
 	"strings"
 	"time"
 
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/tests/v3/functional/rpcpb"
-	"go.etcd.io/etcd/v3/clientv3"
 
 	"go.uber.org/zap"
 )

tests/functional/tester/checker_lease_expire.go

@@ -20,8 +20,8 @@ import (
 	"time"
 
 	"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/tests/v3/functional/rpcpb"
-	"go.etcd.io/etcd/v3/clientv3"
 
 	"go.uber.org/zap"
 	"google.golang.org/grpc"

tests/functional/tester/stresser_key.go

@@ -24,9 +24,9 @@ import (
 	"time"
 
 	"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/raft/v3"
 	"go.etcd.io/etcd/tests/v3/functional/rpcpb"
-	"go.etcd.io/etcd/v3/clientv3"
 	"go.etcd.io/etcd/v3/etcdserver"
 
 	"go.uber.org/zap"