Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10640 from shrajfr12/gomodulecompat

Browse Source 
Fix module path to have the major version to comply with go modules specification.
This commit is contained in:
Gyuho Lee 2019-05-01 22:46:03 -07:00 committed by GitHub
commit e899023f3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
544 changed files with 1384 additions and 1376 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
.travis.yml
View File

@ -1,5 +1,5 @@
language: go language: go
go_import_path: go.etcd.io/etcd go_import_path: go.etcd.io/etcd/v3
sudo: required sudo: required
@ -14,6 +14,8 @@ notifications:
on_failure: never on_failure: never
env: env:
global:
- GO111MODULE=on
matrix: matrix:
- TARGET=linux-amd64-fmt - TARGET=linux-amd64-fmt
- TARGET=linux-amd64-integration-1-cpu - TARGET=linux-amd64-integration-1-cpu
@ -65,45 +67,45 @@ matrix:
before_install: before_install:
- if [[ $TRAVIS_GO_VERSION == 1.* ]]; then docker pull gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION}; fi - if [[ $TRAVIS_GO_VERSION == 1.* ]]; then docker pull gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION}; fi
install: install: true
- go get -t -d ./...
script: script:
- echo "TRAVIS_GO_VERSION=${TRAVIS_GO_VERSION}" - echo "TRAVIS_GO_VERSION=${TRAVIS_GO_VERSION}"
- > - >
case "${TARGET}" in case "${TARGET}" in
linux-amd64-fmt) linux-amd64-fmt)
docker run --rm \ docker run --rm -e GO111MODULE \
--volume=`pwd`:/go/src/go.etcd.io/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \ --volume=`pwd`:/go/src/go.etcd.io/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \
/bin/bash -c "GOARCH=amd64 PASSES='fmt bom dep' ./test" /bin/bash -c "GOARCH=amd64 PASSES='fmt bom dep' ./test"
;; ;;
linux-amd64-integration-1-cpu) linux-amd64-integration-1-cpu)
docker run --rm \ docker run --rm -e GO111MODULE \
--volume=`pwd`:/go/src/go.etcd.io/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \ --volume=`pwd`:/go/src/go.etcd.io/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \
/bin/bash -c "GOARCH=amd64 CPU=1 PASSES='integration' ./test" /bin/bash -c "GOARCH=amd64 CPU=1 PASSES='integration' ./test"
;; ;;
linux-amd64-integration-2-cpu) linux-amd64-integration-2-cpu)
docker run --rm \ docker run --rm -e GO111MODULE \
--volume=`pwd`:/go/src/go.etcd.io/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \ --volume=`pwd`:/go/src/go.etcd.io/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \
/bin/bash -c "GOARCH=amd64 CPU=2 PASSES='integration' ./test" /bin/bash -c "GOARCH=amd64 CPU=2 PASSES='integration' ./test"
;; ;;
linux-amd64-integration-4-cpu) linux-amd64-integration-4-cpu)
docker run --rm \ docker run --rm -e GO111MODULE \
--volume=`pwd`:/go/src/go.etcd.io/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \ --volume=`pwd`:/go/src/go.etcd.io/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \
/bin/bash -c "GOARCH=amd64 CPU=4 PASSES='integration' ./test" /bin/bash -c "GOARCH=amd64 CPU=4 PASSES='integration' ./test"
;; ;;
linux-amd64-functional) linux-amd64-functional)
docker run --rm \ docker run --rm -e GO111MODULE \
--volume=`pwd`:/go/src/go.etcd.io/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \ --volume=`pwd`:/go/src/go.etcd.io/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \
/bin/bash -c "./build && GOARCH=amd64 PASSES='functional' ./test" /bin/bash -c "./build && GOARCH=amd64 PASSES='functional' ./test"
;; ;;
linux-amd64-unit) linux-amd64-unit)
docker run --rm \ docker run --rm -e GO111MODULE \
--volume=`pwd`:/go/src/go.etcd.io/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \ --volume=`pwd`:/go/src/go.etcd.io/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \
/bin/bash -c "GOARCH=amd64 PASSES='unit' ./test" /bin/bash -c "GOARCH=amd64 PASSES='unit' ./test"
;; ;;
all-build) all-build)
docker run --rm \ docker run --rm -e GO111MODULE \
--volume=`pwd`:/go/src/go.etcd.io/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \ --volume=`pwd`:/go/src/go.etcd.io/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \
/bin/bash -c "GOARCH=amd64 PASSES='build' ./test \ /bin/bash -c "GOARCH=amd64 PASSES='build' ./test \
&& GOARCH=386 PASSES='build' ./test \ && GOARCH=386 PASSES='build' ./test \
@ -123,7 +125,7 @@ script:
GOARCH=amd64 PASSES='fmt unit' ./test GOARCH=amd64 PASSES='fmt unit' ./test
;; ;;
linux-386-unit) linux-386-unit)
docker run --rm \ docker run --rm -e GO111MODULE \
--volume=`pwd`:/go/src/go.etcd.io/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \ --volume=`pwd`:/go/src/go.etcd.io/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \
/bin/bash -c "GOARCH=386 PASSES='unit' ./test" /bin/bash -c "GOARCH=386 PASSES='unit' ./test"
;; ;;

6
auth/range_perm_cache.go
View File

@ -15,9 +15,9 @@
package auth package auth
import ( import (
"go.etcd.io/etcd/auth/authpb" "go.etcd.io/etcd/v3/auth/authpb"
"go.etcd.io/etcd/mvcc/backend" "go.etcd.io/etcd/v3/mvcc/backend"
"go.etcd.io/etcd/pkg/adt" "go.etcd.io/etcd/v3/pkg/adt"
"go.uber.org/zap" "go.uber.org/zap"
) )

4
auth/range_perm_cache_test.go
View File

@ -17,8 +17,8 @@ package auth
import ( import (
"testing" "testing"
"go.etcd.io/etcd/auth/authpb" "go.etcd.io/etcd/v3/auth/authpb"
"go.etcd.io/etcd/pkg/adt" "go.etcd.io/etcd/v3/pkg/adt"
"go.uber.org/zap" "go.uber.org/zap"
) )

8
auth/store.go
View File

@ -24,10 +24,10 @@ import (
"sync" "sync"
"sync/atomic" "sync/atomic"
"go.etcd.io/etcd/auth/authpb" "go.etcd.io/etcd/v3/auth/authpb"
"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
pb "go.etcd.io/etcd/etcdserver/etcdserverpb" pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
"go.etcd.io/etcd/mvcc/backend" "go.etcd.io/etcd/v3/mvcc/backend"
"github.com/coreos/pkg/capnslog" "github.com/coreos/pkg/capnslog"
"go.uber.org/zap" "go.uber.org/zap"

8
auth/store_test.go
View File

@ -24,10 +24,10 @@ import (
"testing" "testing"
"time" "time"
"go.etcd.io/etcd/auth/authpb" "go.etcd.io/etcd/v3/auth/authpb"
"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
pb "go.etcd.io/etcd/etcdserver/etcdserverpb" pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
"go.etcd.io/etcd/mvcc/backend" "go.etcd.io/etcd/v3/mvcc/backend"
"go.uber.org/zap" "go.uber.org/zap"
"golang.org/x/crypto/bcrypt" "golang.org/x/crypto/bcrypt"

2
build
View File

@ -2,7 +2,7 @@
# set some environment variables # set some environment variables
ORG_PATH="go.etcd.io" ORG_PATH="go.etcd.io"
REPO_PATH="${ORG_PATH}/etcd" REPO_PATH="${ORG_PATH}/etcd/v3"
GIT_SHA=$(git rev-parse --short HEAD || echo "GitNotFound") GIT_SHA=$(git rev-parse --short HEAD || echo "GitNotFound")
if [[ -n "$FAILPOINTS" ]]; then if [[ -n "$FAILPOINTS" ]]; then

2
client/client.go
View File

@ -29,7 +29,7 @@ import (
"sync" "sync"
"time" "time"
"go.etcd.io/etcd/version" "go.etcd.io/etcd/v3/version"
) )
var ( var (

4
client/client_test.go
View File

@ -29,8 +29,8 @@ import (
"testing" "testing"
"time" "time"
"go.etcd.io/etcd/pkg/testutil" "go.etcd.io/etcd/v3/pkg/testutil"
"go.etcd.io/etcd/version" "go.etcd.io/etcd/v3/version"
) )
type actionAssertingHTTPClient struct { type actionAssertingHTTPClient struct {

2
client/discover.go
View File

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

2
client/doc.go
View File

@ -21,7 +21,7 @@ Create a Config and exchange it for a Client:
"net/http" "net/http"
"context" "context"
"go.etcd.io/etcd/client" "go.etcd.io/etcd/v3/client"
) )
cfg := client.Config{ cfg := client.Config{

2
client/example_keys_test.go
View File

@ -20,7 +20,7 @@ import (
"log" "log"
"sort" "sort"
"go.etcd.io/etcd/client" "go.etcd.io/etcd/v3/client"
) )
func ExampleKeysAPI_directory() { func ExampleKeysAPI_directory() {

6
client/integration/client_test.go
View File

@ -24,9 +24,9 @@ import (
"sync/atomic" "sync/atomic"
"testing" "testing"
"go.etcd.io/etcd/client" "go.etcd.io/etcd/v3/client"
"go.etcd.io/etcd/integration" "go.etcd.io/etcd/v3/integration"
"go.etcd.io/etcd/pkg/testutil" "go.etcd.io/etcd/v3/pkg/testutil"
) )
// TestV2NoRetryEOF tests destructive api calls won't retry on a disconnection. // TestV2NoRetryEOF tests destructive api calls won't retry on a disconnection.

2
client/integration/main_test.go
View File

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

2
client/keys.go
View File

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

6
client/main_test.go
View File

@ -23,9 +23,9 @@ import (
"testing" "testing"
"time" "time"
"go.etcd.io/etcd/integration" "go.etcd.io/etcd/v3/integration"
"go.etcd.io/etcd/pkg/testutil" "go.etcd.io/etcd/v3/pkg/testutil"
"go.etcd.io/etcd/pkg/transport" "go.etcd.io/etcd/v3/pkg/transport"
) )
var exampleEndpoints []string var exampleEndpoints []string

2
client/members.go
View File

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

2
client/members_test.go
View File

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

4
clientv3/auth.go
View File

@ -19,8 +19,8 @@ import (
"fmt" "fmt"
"strings" "strings"
"go.etcd.io/etcd/auth/authpb" "go.etcd.io/etcd/v3/auth/authpb"
pb "go.etcd.io/etcd/etcdserver/etcdserverpb" pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
"google.golang.org/grpc" "google.golang.org/grpc"
) )

2
clientv3/balancer/balancer.go
View File

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

8
clientv3/balancer/balancer_test.go
View File

@ -21,10 +21,10 @@ import (
"testing" "testing"
"time" "time"
"go.etcd.io/etcd/clientv3/balancer/picker" "go.etcd.io/etcd/v3/clientv3/balancer/picker"
"go.etcd.io/etcd/clientv3/balancer/resolver/endpoint" "go.etcd.io/etcd/v3/clientv3/balancer/resolver/endpoint"
pb "go.etcd.io/etcd/etcdserver/etcdserverpb" pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
"go.etcd.io/etcd/pkg/mock/mockserver" "go.etcd.io/etcd/v3/pkg/mock/mockserver"
"go.uber.org/zap" "go.uber.org/zap"
"google.golang.org/grpc" "google.golang.org/grpc"

2
clientv3/balancer/config.go
View File

@ -15,7 +15,7 @@
package balancer package balancer
import ( import (
"go.etcd.io/etcd/clientv3/balancer/picker" "go.etcd.io/etcd/v3/clientv3/balancer/picker"
"go.uber.org/zap" "go.uber.org/zap"
) )

4
clientv3/balancer/grpc1.7-health_test.go
View File

@ -22,8 +22,8 @@ import (
"testing" "testing"
"time" "time"
pb "go.etcd.io/etcd/etcdserver/etcdserverpb" pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
"go.etcd.io/etcd/pkg/testutil" "go.etcd.io/etcd/v3/pkg/testutil"
"google.golang.org/grpc" "google.golang.org/grpc"
) )

10
clientv3/client.go
View File

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

4
clientv3/client_test.go
View File

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

4
clientv3/clientv3util/example_key_test.go
View File

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

2
clientv3/clientv3util/util.go
View File

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

4
clientv3/cluster.go
View File

@ -17,8 +17,8 @@ package clientv3
import ( import (
"context" "context"
pb "go.etcd.io/etcd/etcdserver/etcdserverpb" pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
"go.etcd.io/etcd/pkg/types" "go.etcd.io/etcd/v3/pkg/types"
"google.golang.org/grpc" "google.golang.org/grpc"
) )

2
clientv3/compact_op.go
View File

@ -15,7 +15,7 @@
package clientv3 package clientv3
import ( import (
pb "go.etcd.io/etcd/etcdserver/etcdserverpb" pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
) )
// CompactOp represents a compact operation. // CompactOp represents a compact operation.

2
clientv3/compact_op_test.go
View File

@ -18,7 +18,7 @@ import (
"reflect" "reflect"
"testing" "testing"
"go.etcd.io/etcd/etcdserver/etcdserverpb" "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
) )
func TestCompactOp(t *testing.T) { func TestCompactOp(t *testing.T) {

2
clientv3/compare.go
View File

@ -15,7 +15,7 @@
package clientv3 package clientv3
import ( import (
pb "go.etcd.io/etcd/etcdserver/etcdserverpb" pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
) )
type CompareTarget int type CompareTarget int

6
clientv3/concurrency/election.go
View File

@ -19,9 +19,9 @@ import (
"errors" "errors"
"fmt" "fmt"
v3 "go.etcd.io/etcd/clientv3" v3 "go.etcd.io/etcd/v3/clientv3"
pb "go.etcd.io/etcd/etcdserver/etcdserverpb" pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
"go.etcd.io/etcd/mvcc/mvccpb" "go.etcd.io/etcd/v3/mvcc/mvccpb"
) )
var ( var (

4
clientv3/concurrency/election_test.go
View File

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

4
clientv3/concurrency/example_election_test.go
View File

@ -21,8 +21,8 @@ import (
"sync" "sync"
"time" "time"
"go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/v3/clientv3"
"go.etcd.io/etcd/clientv3/concurrency" "go.etcd.io/etcd/v3/clientv3/concurrency"
) )
func ExampleElection_Campaign() { func ExampleElection_Campaign() {

4
clientv3/concurrency/example_mutex_test.go
View File

@ -19,8 +19,8 @@ import (
"fmt" "fmt"
"log" "log"
"go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/v3/clientv3"
"go.etcd.io/etcd/clientv3/concurrency" "go.etcd.io/etcd/v3/clientv3/concurrency"
) )
func ExampleMutex_Lock() { func ExampleMutex_Lock() {

4
clientv3/concurrency/example_stm_test.go
View File

@ -21,8 +21,8 @@ import (
"math/rand" "math/rand"
"sync" "sync"
"go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/v3/clientv3"
"go.etcd.io/etcd/clientv3/concurrency" "go.etcd.io/etcd/v3/clientv3/concurrency"
) )
// ExampleSTM_apply shows how to use STM with a transactional // ExampleSTM_apply shows how to use STM with a transactional

6
clientv3/concurrency/key.go
View File

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

4
clientv3/concurrency/main_test.go
View File

@ -20,8 +20,8 @@ import (
"testing" "testing"
"time" "time"
"go.etcd.io/etcd/integration" "go.etcd.io/etcd/v3/integration"
"go.etcd.io/etcd/pkg/testutil" "go.etcd.io/etcd/v3/pkg/testutil"
) )
var endpoints []string var endpoints []string

4
clientv3/concurrency/mutex.go
View File

@ -19,8 +19,8 @@ import (
"fmt" "fmt"
"sync" "sync"
v3 "go.etcd.io/etcd/clientv3" v3 "go.etcd.io/etcd/v3/clientv3"
pb "go.etcd.io/etcd/etcdserver/etcdserverpb" pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
) )
// Mutex implements the sync Locker interface with etcd // Mutex implements the sync Locker interface with etcd

2
clientv3/concurrency/session.go
View File

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

2
clientv3/concurrency/stm.go
View File

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

2
clientv3/example_auth_test.go
View File

@ -19,7 +19,7 @@ import (
"fmt" "fmt"
"log" "log"
"go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/v3/clientv3"
) )
func ExampleAuth() { func ExampleAuth() {

2
clientv3/example_cluster_test.go
View File

@ -19,7 +19,7 @@ import (
"fmt" "fmt"
"log" "log"
"go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/v3/clientv3"
) )
func ExampleCluster_memberList() { func ExampleCluster_memberList() {

4
clientv3/example_kv_test.go
View File

@ -19,8 +19,8 @@ import (
"fmt" "fmt"
"log" "log"
"go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/v3/clientv3"
"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
) )
func ExampleKV_put() { func ExampleKV_put() {

2
clientv3/example_lease_test.go
View File

@ -19,7 +19,7 @@ import (
"fmt" "fmt"
"log" "log"
"go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/v3/clientv3"
) )
func ExampleLease_grant() { func ExampleLease_grant() {

2
clientv3/example_maintenence_test.go
View File

@ -19,7 +19,7 @@ import (
"fmt" "fmt"
"log" "log"
"go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/v3/clientv3"
) )
func ExampleMaintenance_status() { func ExampleMaintenance_status() {

2
clientv3/example_metrics_test.go
View File

@ -23,7 +23,7 @@ import (
"net/http" "net/http"
"strings" "strings"
"go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/v3/clientv3"
grpcprom "github.com/grpc-ecosystem/go-grpc-prometheus" grpcprom "github.com/grpc-ecosystem/go-grpc-prometheus"
"github.com/prometheus/client_golang/prometheus/promhttp" "github.com/prometheus/client_golang/prometheus/promhttp"

4
clientv3/example_test.go
View File

@ -20,8 +20,8 @@ import (
"os" "os"
"time" "time"
"go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/v3/clientv3"
"go.etcd.io/etcd/pkg/transport" "go.etcd.io/etcd/v3/pkg/transport"
"google.golang.org/grpc/grpclog" "google.golang.org/grpc/grpclog"
) )

2
clientv3/example_watch_test.go
View File

@ -19,7 +19,7 @@ import (
"fmt" "fmt"
"log" "log"
"go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/v3/clientv3"
) )
func ExampleWatcher_watch() { func ExampleWatcher_watch() {

8
clientv3/integration/black_hole_test.go
View File

@ -21,10 +21,10 @@ import (
"testing" "testing"
"time" "time"
"go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/v3/clientv3"
"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
"go.etcd.io/etcd/integration" "go.etcd.io/etcd/v3/integration"
"go.etcd.io/etcd/pkg/testutil" "go.etcd.io/etcd/v3/pkg/testutil"
"google.golang.org/grpc" "google.golang.org/grpc"
) )

6
clientv3/integration/cluster_test.go
View File

@ -20,9 +20,9 @@ import (
"strings" "strings"
"testing" "testing"
"go.etcd.io/etcd/integration" "go.etcd.io/etcd/v3/integration"
"go.etcd.io/etcd/pkg/testutil" "go.etcd.io/etcd/v3/pkg/testutil"
"go.etcd.io/etcd/pkg/types" "go.etcd.io/etcd/v3/pkg/types"
) )
func TestMemberList(t *testing.T) { func TestMemberList(t *testing.T) {

10
clientv3/integration/dial_test.go
View File

@ -21,11 +21,11 @@ import (
"testing" "testing"
"time" "time"
"go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/v3/clientv3"
pb "go.etcd.io/etcd/etcdserver/etcdserverpb" pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
"go.etcd.io/etcd/integration" "go.etcd.io/etcd/v3/integration"
"go.etcd.io/etcd/pkg/testutil" "go.etcd.io/etcd/v3/pkg/testutil"
"go.etcd.io/etcd/pkg/transport" "go.etcd.io/etcd/v3/pkg/transport"
"google.golang.org/grpc" "google.golang.org/grpc"
) )

10
clientv3/integration/kv_test.go
View File

@ -23,11 +23,11 @@ import (
"testing" "testing"
"time" "time"
"go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/v3/clientv3"
"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
"go.etcd.io/etcd/integration" "go.etcd.io/etcd/v3/integration"
"go.etcd.io/etcd/mvcc/mvccpb" "go.etcd.io/etcd/v3/mvcc/mvccpb"
"go.etcd.io/etcd/pkg/testutil" "go.etcd.io/etcd/v3/pkg/testutil"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/codes" "google.golang.org/grpc/codes"

10
clientv3/integration/lease_test.go
View File

@ -22,11 +22,11 @@ import (
"testing" "testing"
"time" "time"
"go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/v3/clientv3"
"go.etcd.io/etcd/clientv3/concurrency" "go.etcd.io/etcd/v3/clientv3/concurrency"
"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
"go.etcd.io/etcd/integration" "go.etcd.io/etcd/v3/integration"
"go.etcd.io/etcd/pkg/testutil" "go.etcd.io/etcd/v3/pkg/testutil"
"google.golang.org/grpc" "google.golang.org/grpc"
) )

10
clientv3/integration/leasing_test.go
View File

@ -23,11 +23,11 @@ import (
"testing" "testing"
"time" "time"
"go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/v3/clientv3"
"go.etcd.io/etcd/clientv3/concurrency" "go.etcd.io/etcd/v3/clientv3/concurrency"
"go.etcd.io/etcd/clientv3/leasing" "go.etcd.io/etcd/v3/clientv3/leasing"
"go.etcd.io/etcd/integration" "go.etcd.io/etcd/v3/integration"
"go.etcd.io/etcd/pkg/testutil" "go.etcd.io/etcd/v3/pkg/testutil"
) )
func TestLeasingPutGet(t *testing.T) { func TestLeasingPutGet(t *testing.T) {

2
clientv3/integration/logger_test.go
View File

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

2
clientv3/integration/main_test.go
View File

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

14
clientv3/integration/maintenance_test.go
View File

@ -27,13 +27,13 @@ import (
"go.uber.org/zap" "go.uber.org/zap"
"google.golang.org/grpc" "google.golang.org/grpc"
"go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/v3/clientv3"
"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
"go.etcd.io/etcd/integration" "go.etcd.io/etcd/v3/integration"
"go.etcd.io/etcd/lease" "go.etcd.io/etcd/v3/lease"
"go.etcd.io/etcd/mvcc" "go.etcd.io/etcd/v3/mvcc"
"go.etcd.io/etcd/mvcc/backend" "go.etcd.io/etcd/v3/mvcc/backend"
"go.etcd.io/etcd/pkg/testutil" "go.etcd.io/etcd/v3/pkg/testutil"
) )
func TestMaintenanceHashKV(t *testing.T) { func TestMaintenanceHashKV(t *testing.T) {

8
clientv3/integration/metrics_test.go
View File

@ -25,10 +25,10 @@ import (
"testing" "testing"
"time" "time"
"go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/v3/clientv3"
"go.etcd.io/etcd/integration" "go.etcd.io/etcd/v3/integration"
"go.etcd.io/etcd/pkg/testutil" "go.etcd.io/etcd/v3/pkg/testutil"
"go.etcd.io/etcd/pkg/transport" "go.etcd.io/etcd/v3/pkg/transport"
grpcprom "github.com/grpc-ecosystem/go-grpc-prometheus" grpcprom "github.com/grpc-ecosystem/go-grpc-prometheus"
"github.com/prometheus/client_golang/prometheus/promhttp" "github.com/prometheus/client_golang/prometheus/promhttp"

8
clientv3/integration/mirror_test.go
View File

@ -22,10 +22,10 @@ import (
"testing" "testing"
"time" "time"
"go.etcd.io/etcd/clientv3/mirror" "go.etcd.io/etcd/v3/clientv3/mirror"
"go.etcd.io/etcd/integration" "go.etcd.io/etcd/v3/integration"
"go.etcd.io/etcd/mvcc/mvccpb" "go.etcd.io/etcd/v3/mvcc/mvccpb"
"go.etcd.io/etcd/pkg/testutil" "go.etcd.io/etcd/v3/pkg/testutil"
) )
func TestMirrorSync(t *testing.T) { func TestMirrorSync(t *testing.T) {

10
clientv3/integration/namespace_test.go
View File

@ -19,11 +19,11 @@ import (
"reflect" "reflect"
"testing" "testing"
"go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/v3/clientv3"
"go.etcd.io/etcd/clientv3/namespace" "go.etcd.io/etcd/v3/clientv3/namespace"
"go.etcd.io/etcd/integration" "go.etcd.io/etcd/v3/integration"
"go.etcd.io/etcd/mvcc/mvccpb" "go.etcd.io/etcd/v3/mvcc/mvccpb"
"go.etcd.io/etcd/pkg/testutil" "go.etcd.io/etcd/v3/pkg/testutil"
) )
func TestNamespacePutGet(t *testing.T) { func TestNamespacePutGet(t *testing.T) {

10
clientv3/integration/network_partition_test.go
View File

@ -22,11 +22,11 @@ import (
"testing" "testing"
"time" "time"
"go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/v3/clientv3"
"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
pb "go.etcd.io/etcd/etcdserver/etcdserverpb" pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
"go.etcd.io/etcd/integration" "go.etcd.io/etcd/v3/integration"
"go.etcd.io/etcd/pkg/testutil" "go.etcd.io/etcd/v3/pkg/testutil"
"google.golang.org/grpc" "google.golang.org/grpc"
) )

6
clientv3/integration/role_test.go
View File

@ -18,9 +18,9 @@ import (
"context" "context"
"testing" "testing"
"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
"go.etcd.io/etcd/integration" "go.etcd.io/etcd/v3/integration"
"go.etcd.io/etcd/pkg/testutil" "go.etcd.io/etcd/v3/pkg/testutil"
) )
func TestRoleError(t *testing.T) { func TestRoleError(t *testing.T) {

8
clientv3/integration/server_shutdown_test.go
View File

@ -21,10 +21,10 @@ import (
"testing" "testing"
"time" "time"
"go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/v3/clientv3"
"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
"go.etcd.io/etcd/integration" "go.etcd.io/etcd/v3/integration"
"go.etcd.io/etcd/pkg/testutil" "go.etcd.io/etcd/v3/pkg/testutil"
"google.golang.org/grpc/codes" "google.golang.org/grpc/codes"
"google.golang.org/grpc/status" "google.golang.org/grpc/status"

10
clientv3/integration/txn_test.go
View File

@ -20,11 +20,11 @@ import (
"testing" "testing"
"time" "time"
"go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/v3/clientv3"
"go.etcd.io/etcd/embed" "go.etcd.io/etcd/v3/embed"
"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
"go.etcd.io/etcd/integration" "go.etcd.io/etcd/v3/integration"
"go.etcd.io/etcd/pkg/testutil" "go.etcd.io/etcd/v3/pkg/testutil"
) )
func TestTxnError(t *testing.T) { func TestTxnError(t *testing.T) {

8
clientv3/integration/user_test.go
View File

@ -19,10 +19,10 @@ import (
"testing" "testing"
"time" "time"
"go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/v3/clientv3"
"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
"go.etcd.io/etcd/integration" "go.etcd.io/etcd/v3/integration"
"go.etcd.io/etcd/pkg/testutil" "go.etcd.io/etcd/v3/pkg/testutil"
"google.golang.org/grpc" "google.golang.org/grpc"
) )

2
clientv3/integration/util.go
View File

@ -19,7 +19,7 @@ import (
"testing" "testing"
"time" "time"
"go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/v3/clientv3"
) )
// mustWaitPinReady waits up to 3-second until connection is up (pin endpoint). // mustWaitPinReady waits up to 3-second until connection is up (pin endpoint).

6
clientv3/integration/watch_fragment_test.go
View File

@ -23,9 +23,9 @@ import (
"testing" "testing"
"time" "time"
"go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/v3/clientv3"
"go.etcd.io/etcd/integration" "go.etcd.io/etcd/v3/integration"
"go.etcd.io/etcd/pkg/testutil" "go.etcd.io/etcd/v3/pkg/testutil"
) )
// TestWatchFragmentDisable ensures that large watch // TestWatchFragmentDisable ensures that large watch

12
clientv3/integration/watch_test.go
View File

@ -23,12 +23,12 @@ import (
"testing" "testing"
"time" "time"
"go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/v3/clientv3"
"go.etcd.io/etcd/etcdserver/api/v3rpc" "go.etcd.io/etcd/v3/etcdserver/api/v3rpc"
"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
"go.etcd.io/etcd/integration" "go.etcd.io/etcd/v3/integration"
mvccpb "go.etcd.io/etcd/mvcc/mvccpb" mvccpb "go.etcd.io/etcd/v3/mvcc/mvccpb"
"go.etcd.io/etcd/pkg/testutil" "go.etcd.io/etcd/v3/pkg/testutil"
"google.golang.org/grpc/metadata" "google.golang.org/grpc/metadata"
) )

2
clientv3/kv.go
View File

@ -17,7 +17,7 @@ package clientv3
import ( import (
"context" "context"
pb "go.etcd.io/etcd/etcdserver/etcdserverpb" pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
"google.golang.org/grpc" "google.golang.org/grpc"
) )

4
clientv3/lease.go
View File

@ -19,8 +19,8 @@ import (
"sync" "sync"
"time" "time"
"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
pb "go.etcd.io/etcd/etcdserver/etcdserverpb" pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
"go.uber.org/zap" "go.uber.org/zap"
"google.golang.org/grpc" "google.golang.org/grpc"

6
clientv3/leasing/cache.go
View File

@ -20,9 +20,9 @@ import (
"sync" "sync"
"time" "time"
v3 "go.etcd.io/etcd/clientv3" v3 "go.etcd.io/etcd/v3/clientv3"
v3pb "go.etcd.io/etcd/etcdserver/etcdserverpb" v3pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
"go.etcd.io/etcd/mvcc/mvccpb" "go.etcd.io/etcd/v3/mvcc/mvccpb"
) )
const revokeBackoff = 2 * time.Second const revokeBackoff = 2 * time.Second

10
clientv3/leasing/kv.go
View File

@ -20,11 +20,11 @@ import (
"sync" "sync"
"time" "time"
v3 "go.etcd.io/etcd/clientv3" v3 "go.etcd.io/etcd/v3/clientv3"
"go.etcd.io/etcd/clientv3/concurrency" "go.etcd.io/etcd/v3/clientv3/concurrency"
"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
pb "go.etcd.io/etcd/etcdserver/etcdserverpb" pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
"go.etcd.io/etcd/mvcc/mvccpb" "go.etcd.io/etcd/v3/mvcc/mvccpb"
"google.golang.org/grpc/codes" "google.golang.org/grpc/codes"
"google.golang.org/grpc/status" "google.golang.org/grpc/status"

4
clientv3/leasing/txn.go
View File

@ -18,8 +18,8 @@ import (
"context" "context"
"strings" "strings"
v3 "go.etcd.io/etcd/clientv3" v3 "go.etcd.io/etcd/v3/clientv3"
v3pb "go.etcd.io/etcd/etcdserver/etcdserverpb" v3pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
) )
type txnLeasing struct { type txnLeasing struct {

4
clientv3/leasing/util.go
View File

@ -17,8 +17,8 @@ package leasing
import ( import (
"bytes" "bytes"
v3 "go.etcd.io/etcd/clientv3" v3 "go.etcd.io/etcd/v3/clientv3"
v3pb "go.etcd.io/etcd/etcdserver/etcdserverpb" v3pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
) )
func compareInt64(a, b int64) int { func compareInt64(a, b int64) int {

2
clientv3/logger.go
View File

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

4
clientv3/main_test.go
View File

@ -22,8 +22,8 @@ import (
"testing" "testing"
"time" "time"
"go.etcd.io/etcd/integration" "go.etcd.io/etcd/v3/integration"
"go.etcd.io/etcd/pkg/testutil" "go.etcd.io/etcd/v3/pkg/testutil"
) )
// TestMain sets up an etcd cluster if running the examples. // TestMain sets up an etcd cluster if running the examples.

2
clientv3/maintenance.go
View File

@ -19,7 +19,7 @@ import (
"fmt" "fmt"
"io" "io"
pb "go.etcd.io/etcd/etcdserver/etcdserverpb" pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
"google.golang.org/grpc" "google.golang.org/grpc"
) )

2
clientv3/mirror/syncer.go
View File

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

6
clientv3/namespace/kv.go
View File

@ -17,9 +17,9 @@ package namespace
import ( import (
"context" "context"
"go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/v3/clientv3"
"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
pb "go.etcd.io/etcd/etcdserver/etcdserverpb" pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
) )
type kvPrefix struct { type kvPrefix struct {

2
clientv3/namespace/lease.go
View File

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

2
clientv3/namespace/watch.go
View File

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

4
clientv3/naming/doc.go
View File

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

2
clientv3/naming/grpc.go
View File

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

6
clientv3/naming/grpc_test.go
View File

@ -20,9 +20,9 @@ import (
"reflect" "reflect"
"testing" "testing"
etcd "go.etcd.io/etcd/clientv3" etcd "go.etcd.io/etcd/v3/clientv3"
"go.etcd.io/etcd/integration" "go.etcd.io/etcd/v3/integration"
"go.etcd.io/etcd/pkg/testutil" "go.etcd.io/etcd/v3/pkg/testutil"
"google.golang.org/grpc/naming" "google.golang.org/grpc/naming"
) )

2
clientv3/op.go
View File

@ -14,7 +14,7 @@
package clientv3 package clientv3
import pb "go.etcd.io/etcd/etcdserver/etcdserverpb" import pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
type opType int type opType int

2
clientv3/op_test.go
View File

@ -18,7 +18,7 @@ import (
"reflect" "reflect"
"testing" "testing"
pb "go.etcd.io/etcd/etcdserver/etcdserverpb" pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
) )
// TestOpWithSort tests if WithSort(ASCEND, KEY) and WithLimit are specified, // TestOpWithSort tests if WithSort(ASCEND, KEY) and WithLimit are specified,

2
clientv3/ordering/kv.go
View File

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

8
clientv3/ordering/kv_test.go
View File

@ -22,10 +22,10 @@ import (
"testing" "testing"
"time" "time"
"go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/v3/clientv3"
pb "go.etcd.io/etcd/etcdserver/etcdserverpb" pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
"go.etcd.io/etcd/integration" "go.etcd.io/etcd/v3/integration"
"go.etcd.io/etcd/pkg/testutil" "go.etcd.io/etcd/v3/pkg/testutil"
) )
func TestDetectKvOrderViolation(t *testing.T) { func TestDetectKvOrderViolation(t *testing.T) {

2
clientv3/ordering/logger_test.go
View File

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

2
clientv3/ordering/util.go
View File

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

6
clientv3/ordering/util_test.go
View File

@ -19,9 +19,9 @@ import (
"testing" "testing"
"time" "time"
"go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/v3/clientv3"
"go.etcd.io/etcd/integration" "go.etcd.io/etcd/v3/integration"
"go.etcd.io/etcd/pkg/testutil" "go.etcd.io/etcd/v3/pkg/testutil"
) )
func TestEndpointSwitchResolvesViolation(t *testing.T) { func TestEndpointSwitchResolvesViolation(t *testing.T) {

4
clientv3/retry.go
View File

@ -17,8 +17,8 @@ package clientv3
import ( import (
"context" "context"
"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
pb "go.etcd.io/etcd/etcdserver/etcdserverpb" pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/codes" "google.golang.org/grpc/codes"

2
clientv3/retry_interceptor.go
View File

@ -23,7 +23,7 @@ import (
"sync" "sync"
"time" "time"
"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
"go.uber.org/zap" "go.uber.org/zap"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/codes" "google.golang.org/grpc/codes"

8
clientv3/snapshot/member_test.go
View File

@ -22,10 +22,10 @@ import (
"testing" "testing"
"time" "time"
"go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/v3/clientv3"
"go.etcd.io/etcd/embed" "go.etcd.io/etcd/v3/embed"
"go.etcd.io/etcd/etcdserver" "go.etcd.io/etcd/v3/etcdserver"
"go.etcd.io/etcd/pkg/testutil" "go.etcd.io/etcd/v3/pkg/testutil"
) )
// TestSnapshotV3RestoreMultiMemberAdd ensures that multiple members // TestSnapshotV3RestoreMultiMemberAdd ensures that multiple members

30
clientv3/snapshot/v3_snapshot.go
View File

@ -28,21 +28,21 @@ import (
"strings" "strings"
"time" "time"
"go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/v3/clientv3"
"go.etcd.io/etcd/etcdserver" "go.etcd.io/etcd/v3/etcdserver"
"go.etcd.io/etcd/etcdserver/api/membership" "go.etcd.io/etcd/v3/etcdserver/api/membership"
"go.etcd.io/etcd/etcdserver/api/snap" "go.etcd.io/etcd/v3/etcdserver/api/snap"
"go.etcd.io/etcd/etcdserver/api/v2store" "go.etcd.io/etcd/v3/etcdserver/api/v2store"
"go.etcd.io/etcd/etcdserver/etcdserverpb" "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
"go.etcd.io/etcd/lease" "go.etcd.io/etcd/v3/lease"
"go.etcd.io/etcd/mvcc" "go.etcd.io/etcd/v3/mvcc"
"go.etcd.io/etcd/mvcc/backend" "go.etcd.io/etcd/v3/mvcc/backend"
"go.etcd.io/etcd/pkg/fileutil" "go.etcd.io/etcd/v3/pkg/fileutil"
"go.etcd.io/etcd/pkg/types" "go.etcd.io/etcd/v3/pkg/types"
"go.etcd.io/etcd/raft" "go.etcd.io/etcd/v3/raft"
"go.etcd.io/etcd/raft/raftpb" "go.etcd.io/etcd/v3/raft/raftpb"
"go.etcd.io/etcd/wal" "go.etcd.io/etcd/v3/wal"
"go.etcd.io/etcd/wal/walpb" "go.etcd.io/etcd/v3/wal/walpb"
bolt "go.etcd.io/bbolt" bolt "go.etcd.io/bbolt"
"go.uber.org/zap" "go.uber.org/zap"

8
clientv3/snapshot/v3_snapshot_test.go
View File

@ -25,10 +25,10 @@ import (
"testing" "testing"
"time" "time"
"go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/v3/clientv3"
"go.etcd.io/etcd/embed" "go.etcd.io/etcd/v3/embed"
"go.etcd.io/etcd/pkg/fileutil" "go.etcd.io/etcd/v3/pkg/fileutil"
"go.etcd.io/etcd/pkg/testutil" "go.etcd.io/etcd/v3/pkg/testutil"
"go.uber.org/zap" "go.uber.org/zap"
) )

2
clientv3/txn.go
View File

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

2
clientv3/txn_test.go
View File

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

6
clientv3/watch.go
View File

@ -21,9 +21,9 @@ import (
"sync" "sync"
"time" "time"
v3rpc "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" v3rpc "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
pb "go.etcd.io/etcd/etcdserver/etcdserverpb" pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
mvccpb "go.etcd.io/etcd/mvcc/mvccpb" mvccpb "go.etcd.io/etcd/v3/mvcc/mvccpb"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/codes" "google.golang.org/grpc/codes"

2
clientv3/watch_test.go
View File

@ -17,7 +17,7 @@ package clientv3
import ( import (
"testing" "testing"
"go.etcd.io/etcd/mvcc/mvccpb" "go.etcd.io/etcd/v3/mvcc/mvccpb"
) )
func TestEvent(t *testing.T) { func TestEvent(t *testing.T) {

Some files were not shown because too many files have changed in this diff Show More