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

all: goimports -w .

Browse Source 
Signed-off-by: Sasha Melentyev <sasha@melentyev.io>
This commit is contained in:
Sasha Melentyev 2022-11-17 19:07:04 +03:00
parent 719a0a4249
commit c3b6cbdb73
71 changed files with 74 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/v3/clientv3util/example_key_test.go
View File

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

2
client/v3/clientv3util/util.go
View File

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

2
client/v3/experimental/recipes/double_barrier.go
View File

@ -18,7 +18,7 @@ import (
"context" "context"
"go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/api/v3/mvccpb"
"go.etcd.io/etcd/client/v3" clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/client/v3/concurrency" "go.etcd.io/etcd/client/v3/concurrency"
) )

2
client/v3/experimental/recipes/watch.go
View File

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

2
client/v3/namespace/kv.go
View File

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

2
client/v3/namespace/lease.go
View File

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

2
client/v3/namespace/watch.go
View File

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

2
client/v3/ordering/kv.go
View File

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

2
client/v3/ordering/kv_test.go
View File

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

2
client/v3/ordering/util.go
View File

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

2
client/v3/snapshot/v3_snapshot.go
View File

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

2
client/v3/yaml/config.go
View File

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

2
etcdctl/ctlv3/command/compaction_command.go
View File

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

2
etcdctl/ctlv3/command/elect_command.go
View File

@ -21,7 +21,7 @@ import (
"os/signal" "os/signal"
"syscall" "syscall"
"go.etcd.io/etcd/client/v3" clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/client/v3/concurrency" "go.etcd.io/etcd/client/v3/concurrency"
"go.etcd.io/etcd/pkg/v3/cobrautl" "go.etcd.io/etcd/pkg/v3/cobrautl"

2
etcdctl/ctlv3/command/lock_command.go
View File

@ -23,7 +23,7 @@ import (
"os/signal" "os/signal"
"syscall" "syscall"
"go.etcd.io/etcd/client/v3" clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/client/v3/concurrency" "go.etcd.io/etcd/client/v3/concurrency"
"go.etcd.io/etcd/pkg/v3/cobrautl" "go.etcd.io/etcd/pkg/v3/cobrautl"

2
etcdctl/ctlv3/command/move_leader_command.go
View File

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

2
etcdctl/ctlv3/command/printer_json.go
View File

@ -21,7 +21,7 @@ import (
"os" "os"
"strconv" "strconv"
"go.etcd.io/etcd/client/v3" clientv3 "go.etcd.io/etcd/client/v3"
) )
type jsonPrinter struct { type jsonPrinter struct {

2
etcdctl/ctlv3/command/role_command.go
View File

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

2
etcdutl/snapshot/v3_snapshot.go
View File

@ -30,7 +30,7 @@ import (
"go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/api/v3/etcdserverpb"
"go.etcd.io/etcd/client/pkg/v3/fileutil" "go.etcd.io/etcd/client/pkg/v3/fileutil"
"go.etcd.io/etcd/client/pkg/v3/types" "go.etcd.io/etcd/client/pkg/v3/types"
"go.etcd.io/etcd/client/v3" clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/client/v3/snapshot" "go.etcd.io/etcd/client/v3/snapshot"
"go.etcd.io/etcd/raft/v3" "go.etcd.io/etcd/raft/v3"
"go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/etcd/raft/v3/raftpb"

2
server/etcdserver/api/v3client/v3client.go
View File

@ -18,7 +18,7 @@ import (
"context" "context"
"time" "time"
"go.etcd.io/etcd/client/v3" clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/server/v3/etcdserver" "go.etcd.io/etcd/server/v3/etcdserver"
"go.etcd.io/etcd/server/v3/etcdserver/api/v3rpc" "go.etcd.io/etcd/server/v3/etcdserver/api/v3rpc"
"go.etcd.io/etcd/server/v3/proxy/grpcproxy/adapter" "go.etcd.io/etcd/server/v3/proxy/grpcproxy/adapter"

2
server/etcdserver/api/v3discovery/discovery_test.go
View File

@ -9,7 +9,7 @@ import (
"go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/api/v3/etcdserverpb"
"go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/api/v3/mvccpb"
"go.etcd.io/etcd/client/pkg/v3/types" "go.etcd.io/etcd/client/pkg/v3/types"
"go.etcd.io/etcd/client/v3" clientv3 "go.etcd.io/etcd/client/v3"
"go.uber.org/zap/zaptest" "go.uber.org/zap/zaptest"
"github.com/jonboulle/clockwork" "github.com/jonboulle/clockwork"

2
server/etcdserver/api/v3election/election.go
View File

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

2
server/etcdserver/api/v3lock/lock.go
View File

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

2
server/proxy/grpcproxy/cluster.go
View File

@ -22,7 +22,7 @@ import (
"sync" "sync"
pb "go.etcd.io/etcd/api/v3/etcdserverpb" pb "go.etcd.io/etcd/api/v3/etcdserverpb"
"go.etcd.io/etcd/client/v3" clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/client/v3/naming/endpoints" "go.etcd.io/etcd/client/v3/naming/endpoints"
"golang.org/x/time/rate" "golang.org/x/time/rate"

2
server/proxy/grpcproxy/health.go
View File

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

2
server/proxy/grpcproxy/leader.go
View File

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

2
server/proxy/grpcproxy/lease.go
View File

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

2
server/proxy/grpcproxy/register.go
View File

@ -18,7 +18,7 @@ import (
"encoding/json" "encoding/json"
"os" "os"
"go.etcd.io/etcd/client/v3" clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/client/v3/concurrency" "go.etcd.io/etcd/client/v3/concurrency"
"go.etcd.io/etcd/client/v3/naming/endpoints" "go.etcd.io/etcd/client/v3/naming/endpoints"

2
server/proxy/grpcproxy/watch.go
View File

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

2
server/proxy/grpcproxy/watcher.go
View File

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

2
server/storage/schema/version_test.go
View File

@ -24,7 +24,7 @@ import (
"go.uber.org/zap/zaptest" "go.uber.org/zap/zaptest"
"go.etcd.io/etcd/server/v3/storage/backend" "go.etcd.io/etcd/server/v3/storage/backend"
"go.etcd.io/etcd/server/v3/storage/backend/testing" betesting "go.etcd.io/etcd/server/v3/storage/backend/testing"
) )
// TestVersion ensures that UnsafeSetStorageVersion/UnsafeReadStorageVersion work well together. // TestVersion ensures that UnsafeSetStorageVersion/UnsafeReadStorageVersion work well together.

2
tests/e2e/corrupt_test.go
View File

@ -22,7 +22,7 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/api/v3/etcdserverpb"
"go.etcd.io/etcd/client/v3" clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/server/v3/storage/datadir" "go.etcd.io/etcd/server/v3/storage/datadir"
"go.etcd.io/etcd/server/v3/storage/mvcc/testutil" "go.etcd.io/etcd/server/v3/storage/mvcc/testutil"
"go.etcd.io/etcd/tests/v3/framework/config" "go.etcd.io/etcd/tests/v3/framework/config"

2
tests/framework/integration/cluster_direct.go
View File

@ -19,7 +19,7 @@ package integration
import ( import (
pb "go.etcd.io/etcd/api/v3/etcdserverpb" pb "go.etcd.io/etcd/api/v3/etcdserverpb"
"go.etcd.io/etcd/client/v3" clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/server/v3/etcdserver/api/v3election/v3electionpb" "go.etcd.io/etcd/server/v3/etcdserver/api/v3election/v3electionpb"
"go.etcd.io/etcd/server/v3/etcdserver/api/v3lock/v3lockpb" "go.etcd.io/etcd/server/v3/etcdserver/api/v3lock/v3lockpb"
) )

2
tests/framework/integration/cluster_proxy.go
View File

@ -21,7 +21,7 @@ import (
"context" "context"
"sync" "sync"
"go.etcd.io/etcd/client/v3" clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/client/v3/namespace" "go.etcd.io/etcd/client/v3/namespace"
"go.etcd.io/etcd/server/v3/proxy/grpcproxy" "go.etcd.io/etcd/server/v3/proxy/grpcproxy"
"go.etcd.io/etcd/server/v3/proxy/grpcproxy/adapter" "go.etcd.io/etcd/server/v3/proxy/grpcproxy/adapter"

2
tests/functional/rpcpb/member.go
View File

@ -25,7 +25,7 @@ import (
pb "go.etcd.io/etcd/api/v3/etcdserverpb" pb "go.etcd.io/etcd/api/v3/etcdserverpb"
"go.etcd.io/etcd/client/pkg/v3/logutil" "go.etcd.io/etcd/client/pkg/v3/logutil"
"go.etcd.io/etcd/client/pkg/v3/transport" "go.etcd.io/etcd/client/pkg/v3/transport"
"go.etcd.io/etcd/client/v3" clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/etcdutl/v3/snapshot" "go.etcd.io/etcd/etcdutl/v3/snapshot"
"github.com/dustin/go-humanize" "github.com/dustin/go-humanize"

2
tests/functional/runner/global.go
View File

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

2
tests/functional/runner/watch_command.go
View File

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

2
tests/functional/tester/checker_lease_expire.go
View File

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

2
tests/functional/tester/checker_short_ttl_lease_expire.go
View File

@ -18,7 +18,7 @@ import (
"fmt" "fmt"
"time" "time"
"go.etcd.io/etcd/client/v3" clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/tests/v3/functional/rpcpb" "go.etcd.io/etcd/tests/v3/functional/rpcpb"
"go.uber.org/zap" "go.uber.org/zap"

2
tests/functional/tester/stresser_key.go
View File

@ -24,7 +24,7 @@ import (
"time" "time"
"go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
"go.etcd.io/etcd/client/v3" clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/raft/v3" "go.etcd.io/etcd/raft/v3"
"go.etcd.io/etcd/server/v3/etcdserver/errors" "go.etcd.io/etcd/server/v3/etcdserver/errors"
"go.etcd.io/etcd/tests/v3/functional/rpcpb" "go.etcd.io/etcd/tests/v3/functional/rpcpb"

2
tests/integration/clientv3/concurrency/election_test.go
View File

@ -21,7 +21,7 @@ import (
"testing" "testing"
"time" "time"
"go.etcd.io/etcd/client/v3" clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/client/v3/concurrency" "go.etcd.io/etcd/client/v3/concurrency"
integration2 "go.etcd.io/etcd/tests/v3/framework/integration" integration2 "go.etcd.io/etcd/tests/v3/framework/integration"
) )

2
tests/integration/clientv3/concurrency/example_election_test.go
View File

@ -21,7 +21,7 @@ import (
"sync" "sync"
"time" "time"
"go.etcd.io/etcd/client/v3" clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/client/v3/concurrency" "go.etcd.io/etcd/client/v3/concurrency"
) )

2
tests/integration/clientv3/concurrency/example_mutex_test.go
View File

@ -19,7 +19,7 @@ import (
"fmt" "fmt"
"log" "log"
"go.etcd.io/etcd/client/v3" clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/client/v3/concurrency" "go.etcd.io/etcd/client/v3/concurrency"
) )

2
tests/integration/clientv3/concurrency/example_stm_test.go
View File

@ -21,7 +21,7 @@ import (
"math/rand" "math/rand"
"sync" "sync"
"go.etcd.io/etcd/client/v3" clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/client/v3/concurrency" "go.etcd.io/etcd/client/v3/concurrency"
) )

2
tests/integration/clientv3/concurrency/mutex_test.go
View File

@ -19,7 +19,7 @@ import (
"errors" "errors"
"testing" "testing"
"go.etcd.io/etcd/client/v3" clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/client/v3/concurrency" "go.etcd.io/etcd/client/v3/concurrency"
integration2 "go.etcd.io/etcd/tests/v3/framework/integration" integration2 "go.etcd.io/etcd/tests/v3/framework/integration"
) )

4
tests/integration/clientv3/connectivity/black_hole_test.go
View File

@ -23,9 +23,9 @@ import (
"time" "time"
"go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
"go.etcd.io/etcd/client/v3" clientv3 "go.etcd.io/etcd/client/v3"
integration2 "go.etcd.io/etcd/tests/v3/framework/integration" integration2 "go.etcd.io/etcd/tests/v3/framework/integration"
"go.etcd.io/etcd/tests/v3/integration/clientv3" clientv3test "go.etcd.io/etcd/tests/v3/integration/clientv3"
"google.golang.org/grpc" "google.golang.org/grpc"
) )

2
tests/integration/clientv3/connectivity/dial_test.go
View File

@ -23,7 +23,7 @@ import (
pb "go.etcd.io/etcd/api/v3/etcdserverpb" pb "go.etcd.io/etcd/api/v3/etcdserverpb"
"go.etcd.io/etcd/client/pkg/v3/transport" "go.etcd.io/etcd/client/pkg/v3/transport"
"go.etcd.io/etcd/client/v3" clientv3 "go.etcd.io/etcd/client/v3"
integration2 "go.etcd.io/etcd/tests/v3/framework/integration" integration2 "go.etcd.io/etcd/tests/v3/framework/integration"
"go.etcd.io/etcd/tests/v3/framework/testutils" "go.etcd.io/etcd/tests/v3/framework/testutils"
clientv3test "go.etcd.io/etcd/tests/v3/integration/clientv3" clientv3test "go.etcd.io/etcd/tests/v3/integration/clientv3"

4
tests/integration/clientv3/connectivity/network_partition_test.go
View File

@ -25,9 +25,9 @@ import (
pb "go.etcd.io/etcd/api/v3/etcdserverpb" pb "go.etcd.io/etcd/api/v3/etcdserverpb"
"go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
"go.etcd.io/etcd/client/v3" clientv3 "go.etcd.io/etcd/client/v3"
integration2 "go.etcd.io/etcd/tests/v3/framework/integration" integration2 "go.etcd.io/etcd/tests/v3/framework/integration"
"go.etcd.io/etcd/tests/v3/integration/clientv3" clientv3test "go.etcd.io/etcd/tests/v3/integration/clientv3"
"google.golang.org/grpc" "google.golang.org/grpc"
) )

4
tests/integration/clientv3/connectivity/server_shutdown_test.go
View File

@ -22,9 +22,9 @@ import (
"time" "time"
"go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
"go.etcd.io/etcd/client/v3" clientv3 "go.etcd.io/etcd/client/v3"
integration2 "go.etcd.io/etcd/tests/v3/framework/integration" integration2 "go.etcd.io/etcd/tests/v3/framework/integration"
"go.etcd.io/etcd/tests/v3/integration/clientv3" clientv3test "go.etcd.io/etcd/tests/v3/integration/clientv3"
) )
// TestBalancerUnderServerShutdownWatch expects that watch client // TestBalancerUnderServerShutdownWatch expects that watch client

2
tests/integration/clientv3/examples/example_auth_test.go
View File

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

2
tests/integration/clientv3/examples/example_cluster_test.go
View File

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

2
tests/integration/clientv3/examples/example_kv_test.go
View File

@ -20,7 +20,7 @@ import (
"log" "log"
"go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
"go.etcd.io/etcd/client/v3" clientv3 "go.etcd.io/etcd/client/v3"
) )
func mockKV_put() {} func mockKV_put() {}

2
tests/integration/clientv3/examples/example_lease_test.go
View File

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

2
tests/integration/clientv3/examples/example_maintenance_test.go
View File

@ -18,7 +18,7 @@ import (
"context" "context"
"log" "log"
"go.etcd.io/etcd/client/v3" clientv3 "go.etcd.io/etcd/client/v3"
) )
func mockMaintenance_status() {} func mockMaintenance_status() {}

3
tests/integration/clientv3/examples/example_metrics_test.go
View File

@ -23,10 +23,9 @@ import (
"net/http" "net/http"
"strings" "strings"
"go.etcd.io/etcd/client/v3"
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"
clientv3 "go.etcd.io/etcd/client/v3"
"google.golang.org/grpc" "google.golang.org/grpc"
) )

2
tests/integration/clientv3/examples/example_test.go
View File

@ -19,7 +19,7 @@ import (
"log" "log"
"go.etcd.io/etcd/client/pkg/v3/transport" "go.etcd.io/etcd/client/pkg/v3/transport"
"go.etcd.io/etcd/client/v3" clientv3 "go.etcd.io/etcd/client/v3"
) )
func mockConfig_insecure() {} func mockConfig_insecure() {}

2
tests/integration/clientv3/examples/example_watch_test.go
View File

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

2
tests/integration/clientv3/experimental/recipes/v3_barrier_test.go
View File

@ -18,7 +18,7 @@ import (
"testing" "testing"
"time" "time"
"go.etcd.io/etcd/client/v3" clientv3 "go.etcd.io/etcd/client/v3"
recipe "go.etcd.io/etcd/client/v3/experimental/recipes" recipe "go.etcd.io/etcd/client/v3/experimental/recipes"
integration2 "go.etcd.io/etcd/tests/v3/framework/integration" integration2 "go.etcd.io/etcd/tests/v3/framework/integration"
) )

2
tests/integration/clientv3/namespace_test.go
View File

@ -20,7 +20,7 @@ import (
"testing" "testing"
"go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/api/v3/mvccpb"
"go.etcd.io/etcd/client/v3" clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/client/v3/namespace" "go.etcd.io/etcd/client/v3/namespace"
integration2 "go.etcd.io/etcd/tests/v3/framework/integration" integration2 "go.etcd.io/etcd/tests/v3/framework/integration"
) )

2
tests/integration/clientv3/ordering_kv_test.go
View File

@ -21,7 +21,7 @@ import (
"time" "time"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"go.etcd.io/etcd/client/v3" clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/client/v3/ordering" "go.etcd.io/etcd/client/v3/ordering"
integration2 "go.etcd.io/etcd/tests/v3/framework/integration" integration2 "go.etcd.io/etcd/tests/v3/framework/integration"
) )

2
tests/integration/clientv3/ordering_util_test.go
View File

@ -19,7 +19,7 @@ import (
"testing" "testing"
"time" "time"
"go.etcd.io/etcd/client/v3" clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/client/v3/ordering" "go.etcd.io/etcd/client/v3/ordering"
integration2 "go.etcd.io/etcd/tests/v3/framework/integration" integration2 "go.etcd.io/etcd/tests/v3/framework/integration"
) )

2
tests/integration/clientv3/txn_test.go
View File

@ -21,7 +21,7 @@ import (
"time" "time"
"go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
"go.etcd.io/etcd/client/v3" clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/server/v3/embed" "go.etcd.io/etcd/server/v3/embed"
integration2 "go.etcd.io/etcd/tests/v3/framework/integration" integration2 "go.etcd.io/etcd/tests/v3/framework/integration"
) )

2
tests/integration/clientv3/user_test.go
View File

@ -20,7 +20,7 @@ import (
"time" "time"
"go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
"go.etcd.io/etcd/client/v3" clientv3 "go.etcd.io/etcd/client/v3"
integration2 "go.etcd.io/etcd/tests/v3/framework/integration" integration2 "go.etcd.io/etcd/tests/v3/framework/integration"
"google.golang.org/grpc" "google.golang.org/grpc"
) )

2
tests/integration/clientv3/watch_fragment_test.go
View File

@ -25,7 +25,7 @@ import (
"time" "time"
"go.etcd.io/etcd/client/pkg/v3/testutil" "go.etcd.io/etcd/client/pkg/v3/testutil"
"go.etcd.io/etcd/client/v3" clientv3 "go.etcd.io/etcd/client/v3"
integration2 "go.etcd.io/etcd/tests/v3/framework/integration" integration2 "go.etcd.io/etcd/tests/v3/framework/integration"
) )

2
tests/integration/proxy/grpcproxy/cluster_test.go
View File

@ -21,7 +21,7 @@ import (
"time" "time"
pb "go.etcd.io/etcd/api/v3/etcdserverpb" pb "go.etcd.io/etcd/api/v3/etcdserverpb"
"go.etcd.io/etcd/client/v3" clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/server/v3/proxy/grpcproxy" "go.etcd.io/etcd/server/v3/proxy/grpcproxy"
integration2 "go.etcd.io/etcd/tests/v3/framework/integration" integration2 "go.etcd.io/etcd/tests/v3/framework/integration"
"go.uber.org/zap/zaptest" "go.uber.org/zap/zaptest"

2
tests/integration/proxy/grpcproxy/kv_test.go
View File

@ -21,7 +21,7 @@ import (
"time" "time"
pb "go.etcd.io/etcd/api/v3/etcdserverpb" pb "go.etcd.io/etcd/api/v3/etcdserverpb"
"go.etcd.io/etcd/client/v3" clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/server/v3/proxy/grpcproxy" "go.etcd.io/etcd/server/v3/proxy/grpcproxy"
integration2 "go.etcd.io/etcd/tests/v3/framework/integration" integration2 "go.etcd.io/etcd/tests/v3/framework/integration"
"google.golang.org/grpc" "google.golang.org/grpc"

2
tests/integration/snapshot/member_test.go
View File

@ -21,7 +21,7 @@ import (
"time" "time"
"go.etcd.io/etcd/client/pkg/v3/testutil" "go.etcd.io/etcd/client/pkg/v3/testutil"
"go.etcd.io/etcd/client/v3" clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/server/v3/embed" "go.etcd.io/etcd/server/v3/embed"
"go.etcd.io/etcd/server/v3/etcdserver" "go.etcd.io/etcd/server/v3/etcdserver"
integration2 "go.etcd.io/etcd/tests/v3/framework/integration" integration2 "go.etcd.io/etcd/tests/v3/framework/integration"

2
tests/integration/snapshot/v3_snapshot_test.go
View File

@ -25,7 +25,7 @@ import (
"time" "time"
"go.etcd.io/etcd/client/pkg/v3/testutil" "go.etcd.io/etcd/client/pkg/v3/testutil"
"go.etcd.io/etcd/client/v3" clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/etcdutl/v3/snapshot" "go.etcd.io/etcd/etcdutl/v3/snapshot"
"go.etcd.io/etcd/server/v3/embed" "go.etcd.io/etcd/server/v3/embed"
integration2 "go.etcd.io/etcd/tests/v3/framework/integration" integration2 "go.etcd.io/etcd/tests/v3/framework/integration"

2
tests/integration/v3_auth_test.go
View File

@ -25,7 +25,7 @@ import (
pb "go.etcd.io/etcd/api/v3/etcdserverpb" pb "go.etcd.io/etcd/api/v3/etcdserverpb"
"go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
"go.etcd.io/etcd/client/pkg/v3/testutil" "go.etcd.io/etcd/client/pkg/v3/testutil"
"go.etcd.io/etcd/client/v3" clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/tests/v3/framework/integration" "go.etcd.io/etcd/tests/v3/framework/integration"
) )

2
tests/integration/v3_kv_test.go
View File

@ -18,7 +18,7 @@ import (
"context" "context"
"testing" "testing"
"go.etcd.io/etcd/client/v3" clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/client/v3/namespace" "go.etcd.io/etcd/client/v3/namespace"
"go.etcd.io/etcd/tests/v3/framework/integration" "go.etcd.io/etcd/tests/v3/framework/integration"
) )

2
tests/integration/v3_tls_test.go
View File

@ -20,7 +20,7 @@ import (
"testing" "testing"
"time" "time"
"go.etcd.io/etcd/client/v3" clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/tests/v3/framework/integration" "go.etcd.io/etcd/tests/v3/framework/integration"
"google.golang.org/grpc" "google.golang.org/grpc"
) )