Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

all: goimports -w . #14788

Merged
merged 1 commit into from
Nov 18, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion client/v3/clientv3util/example_key_test.go
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ import (
"context"
"log"

"go.etcd.io/etcd/client/v3"
clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/client/v3/clientv3util"
)

2 changes: 1 addition & 1 deletion client/v3/clientv3util/util.go
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@
package clientv3util

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
2 changes: 1 addition & 1 deletion client/v3/experimental/recipes/double_barrier.go
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ import (
"context"

"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"
)

2 changes: 1 addition & 1 deletion client/v3/experimental/recipes/watch.go
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ import (
"context"

"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.
2 changes: 1 addition & 1 deletion client/v3/namespace/kv.go
Original file line number Diff line number Diff line change
@@ -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/client/v3"
clientv3 "go.etcd.io/etcd/client/v3"
)

type kvPrefix struct {
2 changes: 1 addition & 1 deletion client/v3/namespace/lease.go
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ import (
"bytes"
"context"

"go.etcd.io/etcd/client/v3"
clientv3 "go.etcd.io/etcd/client/v3"
)

type leasePrefix struct {
2 changes: 1 addition & 1 deletion client/v3/namespace/watch.go
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ import (
"context"
"sync"

"go.etcd.io/etcd/client/v3"
clientv3 "go.etcd.io/etcd/client/v3"
)

type watcherPrefix struct {
2 changes: 1 addition & 1 deletion client/v3/ordering/kv.go
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ import (
"context"
"sync"

"go.etcd.io/etcd/client/v3"
clientv3 "go.etcd.io/etcd/client/v3"
)

// kvOrdering ensures that serialized requests do not return
2 changes: 1 addition & 1 deletion client/v3/ordering/kv_test.go
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ import (
"testing"

pb "go.etcd.io/etcd/api/v3/etcdserverpb"
"go.etcd.io/etcd/client/v3"
clientv3 "go.etcd.io/etcd/client/v3"
)

type mockKV struct {
2 changes: 1 addition & 1 deletion client/v3/ordering/util.go
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ import (
"errors"
"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
2 changes: 1 addition & 1 deletion client/v3/snapshot/v3_snapshot.go
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ import (

"github.com/dustin/go-humanize"
"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"
)

2 changes: 1 addition & 1 deletion client/v3/yaml/config.go
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ import (
"sigs.k8s.io/yaml"

"go.etcd.io/etcd/client/pkg/v3/tlsutil"
"go.etcd.io/etcd/client/v3"
clientv3 "go.etcd.io/etcd/client/v3"
)

type yamlConfig struct {
2 changes: 1 addition & 1 deletion etcdctl/ctlv3/command/compaction_command.go
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ import (
"strconv"

"github.com/spf13/cobra"
"go.etcd.io/etcd/client/v3"
clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/pkg/v3/cobrautl"
)

2 changes: 1 addition & 1 deletion etcdctl/ctlv3/command/elect_command.go
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ import (
"os/signal"
"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/pkg/v3/cobrautl"

2 changes: 1 addition & 1 deletion etcdctl/ctlv3/command/lock_command.go
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ import (
"os/signal"
"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/pkg/v3/cobrautl"

2 changes: 1 addition & 1 deletion etcdctl/ctlv3/command/move_leader_command.go
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ import (
"strconv"

"github.com/spf13/cobra"
"go.etcd.io/etcd/client/v3"
clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/pkg/v3/cobrautl"
)

2 changes: 1 addition & 1 deletion etcdctl/ctlv3/command/printer_json.go
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ import (
"os"
"strconv"

"go.etcd.io/etcd/client/v3"
clientv3 "go.etcd.io/etcd/client/v3"
)

type jsonPrinter struct {
2 changes: 1 addition & 1 deletion etcdctl/ctlv3/command/role_command.go
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ import (
"fmt"

"github.com/spf13/cobra"
"go.etcd.io/etcd/client/v3"
clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/pkg/v3/cobrautl"
)

2 changes: 1 addition & 1 deletion etcdutl/snapshot/v3_snapshot.go
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ import (
"go.etcd.io/etcd/api/v3/etcdserverpb"
"go.etcd.io/etcd/client/pkg/v3/fileutil"
"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/raft/v3"
"go.etcd.io/etcd/raft/v3/raftpb"
2 changes: 1 addition & 1 deletion server/etcdserver/api/v3client/v3client.go
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ import (
"context"
"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/api/v3rpc"
"go.etcd.io/etcd/server/v3/proxy/grpcproxy/adapter"
2 changes: 1 addition & 1 deletion server/etcdserver/api/v3discovery/discovery_test.go
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ import (
"go.etcd.io/etcd/api/v3/etcdserverpb"
"go.etcd.io/etcd/api/v3/mvccpb"
"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"

"github.com/jonboulle/clockwork"
2 changes: 1 addition & 1 deletion server/etcdserver/api/v3election/election.go
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ import (
"context"
"errors"

"go.etcd.io/etcd/client/v3"
clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/client/v3/concurrency"
epb "go.etcd.io/etcd/server/v3/etcdserver/api/v3election/v3electionpb"
)
2 changes: 1 addition & 1 deletion server/etcdserver/api/v3lock/lock.go
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ package v3lock
import (
"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/server/v3/etcdserver/api/v3lock/v3lockpb"
)
2 changes: 1 addition & 1 deletion server/proxy/grpcproxy/cluster.go
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ import (
"sync"

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"
"golang.org/x/time/rate"

2 changes: 1 addition & 1 deletion server/proxy/grpcproxy/health.go
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ import (
"time"

"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.uber.org/zap"
)
2 changes: 1 addition & 1 deletion server/proxy/grpcproxy/leader.go
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ import (
"math"
"sync"

"go.etcd.io/etcd/client/v3"
clientv3 "go.etcd.io/etcd/client/v3"

"golang.org/x/time/rate"
)
2 changes: 1 addition & 1 deletion server/proxy/grpcproxy/lease.go
Original file line number Diff line number Diff line change
@@ -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/client/v3"
clientv3 "go.etcd.io/etcd/client/v3"

"google.golang.org/grpc"
"google.golang.org/grpc/codes"
2 changes: 1 addition & 1 deletion server/proxy/grpcproxy/register.go
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ import (
"encoding/json"
"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/naming/endpoints"

2 changes: 1 addition & 1 deletion server/proxy/grpcproxy/watch.go
Original file line number Diff line number Diff line change
@@ -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/client/v3"
clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/server/v3/etcdserver/api/v3rpc"
"go.uber.org/zap"
"google.golang.org/grpc/codes"
2 changes: 1 addition & 1 deletion server/proxy/grpcproxy/watcher.go
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ import (

pb "go.etcd.io/etcd/api/v3/etcdserverpb"
"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"
)

2 changes: 1 addition & 1 deletion server/storage/schema/version_test.go
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ import (
"go.uber.org/zap/zaptest"

"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.
2 changes: 1 addition & 1 deletion tests/e2e/corrupt_test.go
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ import (

"github.com/stretchr/testify/assert"
"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/mvcc/testutil"
"go.etcd.io/etcd/tests/v3/framework/config"
2 changes: 1 addition & 1 deletion tests/framework/integration/cluster_direct.go
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ package integration

import (
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/v3lock/v3lockpb"
)
2 changes: 1 addition & 1 deletion tests/framework/integration/cluster_proxy.go
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ import (
"context"
"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/server/v3/proxy/grpcproxy"
"go.etcd.io/etcd/server/v3/proxy/grpcproxy/adapter"
2 changes: 1 addition & 1 deletion tests/functional/rpcpb/member.go
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@ import (
pb "go.etcd.io/etcd/api/v3/etcdserverpb"
"go.etcd.io/etcd/client/pkg/v3/logutil"
"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"

"github.com/dustin/go-humanize"
2 changes: 1 addition & 1 deletion tests/functional/runner/global.go
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ import (
"sync"
"time"

"go.etcd.io/etcd/client/v3"
clientv3 "go.etcd.io/etcd/client/v3"

"github.com/spf13/cobra"
"golang.org/x/time/rate"
2 changes: 1 addition & 1 deletion tests/functional/runner/watch_command.go
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ import (
"sync"
"time"

"go.etcd.io/etcd/client/v3"
clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/pkg/v3/stringutil"

"github.com/spf13/cobra"
2 changes: 1 addition & 1 deletion tests/functional/tester/checker_lease_expire.go
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ import (
"time"

"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.uber.org/zap"
2 changes: 1 addition & 1 deletion tests/functional/tester/checker_short_ttl_lease_expire.go
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ import (
"fmt"
"time"

"go.etcd.io/etcd/client/v3"
clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/tests/v3/functional/rpcpb"

"go.uber.org/zap"
2 changes: 1 addition & 1 deletion tests/functional/tester/stresser_key.go
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ import (
"time"

"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/server/v3/etcdserver/errors"
"go.etcd.io/etcd/tests/v3/functional/rpcpb"
2 changes: 1 addition & 1 deletion tests/integration/clientv3/concurrency/election_test.go
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ import (
"testing"
"time"

"go.etcd.io/etcd/client/v3"
clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/client/v3/concurrency"
integration2 "go.etcd.io/etcd/tests/v3/framework/integration"
)
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ import (
"sync"
"time"

"go.etcd.io/etcd/client/v3"
clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/client/v3/concurrency"
)

Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ import (
"fmt"
"log"

"go.etcd.io/etcd/client/v3"
clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/client/v3/concurrency"
)

2 changes: 1 addition & 1 deletion tests/integration/clientv3/concurrency/example_stm_test.go
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ import (
"math/rand"
"sync"

"go.etcd.io/etcd/client/v3"
clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/client/v3/concurrency"
)

2 changes: 1 addition & 1 deletion tests/integration/clientv3/concurrency/mutex_test.go
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ import (
"errors"
"testing"

"go.etcd.io/etcd/client/v3"
clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/client/v3/concurrency"
integration2 "go.etcd.io/etcd/tests/v3/framework/integration"
)
4 changes: 2 additions & 2 deletions tests/integration/clientv3/connectivity/black_hole_test.go
Original file line number Diff line number Diff line change
@@ -23,9 +23,9 @@ import (
"time"

"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"
"go.etcd.io/etcd/tests/v3/integration/clientv3"
clientv3test "go.etcd.io/etcd/tests/v3/integration/clientv3"
"google.golang.org/grpc"
)

2 changes: 1 addition & 1 deletion tests/integration/clientv3/connectivity/dial_test.go
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ import (

pb "go.etcd.io/etcd/api/v3/etcdserverpb"
"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"
"go.etcd.io/etcd/tests/v3/framework/testutils"
clientv3test "go.etcd.io/etcd/tests/v3/integration/clientv3"
Original file line number Diff line number Diff line change
@@ -25,9 +25,9 @@ import (

pb "go.etcd.io/etcd/api/v3/etcdserverpb"
"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"
"go.etcd.io/etcd/tests/v3/integration/clientv3"
clientv3test "go.etcd.io/etcd/tests/v3/integration/clientv3"
"google.golang.org/grpc"
)

Original file line number Diff line number Diff line change
@@ -22,9 +22,9 @@ import (
"time"

"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"
"go.etcd.io/etcd/tests/v3/integration/clientv3"
clientv3test "go.etcd.io/etcd/tests/v3/integration/clientv3"
)

// TestBalancerUnderServerShutdownWatch expects that watch client
2 changes: 1 addition & 1 deletion tests/integration/clientv3/examples/example_auth_test.go
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ import (
"fmt"
"log"

"go.etcd.io/etcd/client/v3"
clientv3 "go.etcd.io/etcd/client/v3"
)

func mockAuth() {
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ import (
"fmt"
"log"

"go.etcd.io/etcd/client/v3"
clientv3 "go.etcd.io/etcd/client/v3"
)

func mockCluster_memberList() {
2 changes: 1 addition & 1 deletion tests/integration/clientv3/examples/example_kv_test.go
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ import (
"log"

"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
"go.etcd.io/etcd/client/v3"
clientv3 "go.etcd.io/etcd/client/v3"
)

func mockKV_put() {}
2 changes: 1 addition & 1 deletion tests/integration/clientv3/examples/example_lease_test.go
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ import (
"fmt"
"log"

"go.etcd.io/etcd/client/v3"
clientv3 "go.etcd.io/etcd/client/v3"
)

func mockLease_grant() {
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ import (
"context"
"log"

"go.etcd.io/etcd/client/v3"
clientv3 "go.etcd.io/etcd/client/v3"
)

func mockMaintenance_status() {}
3 changes: 1 addition & 2 deletions tests/integration/clientv3/examples/example_metrics_test.go
Original file line number Diff line number Diff line change
@@ -23,10 +23,9 @@ import (
"net/http"
"strings"

"go.etcd.io/etcd/client/v3"

grpcprom "github.com/grpc-ecosystem/go-grpc-prometheus"
"github.com/prometheus/client_golang/prometheus/promhttp"
clientv3 "go.etcd.io/etcd/client/v3"
"google.golang.org/grpc"
)

2 changes: 1 addition & 1 deletion tests/integration/clientv3/examples/example_test.go
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ import (
"log"

"go.etcd.io/etcd/client/pkg/v3/transport"
"go.etcd.io/etcd/client/v3"
clientv3 "go.etcd.io/etcd/client/v3"
)

func mockConfig_insecure() {}
2 changes: 1 addition & 1 deletion tests/integration/clientv3/examples/example_watch_test.go
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ import (
"log"
"time"

"go.etcd.io/etcd/client/v3"
clientv3 "go.etcd.io/etcd/client/v3"
)

func mockWatcher_watch() {
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ import (
"testing"
"time"

"go.etcd.io/etcd/client/v3"
clientv3 "go.etcd.io/etcd/client/v3"
recipe "go.etcd.io/etcd/client/v3/experimental/recipes"
integration2 "go.etcd.io/etcd/tests/v3/framework/integration"
)
2 changes: 1 addition & 1 deletion tests/integration/clientv3/namespace_test.go
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ import (
"testing"

"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"
integration2 "go.etcd.io/etcd/tests/v3/framework/integration"
)
2 changes: 1 addition & 1 deletion tests/integration/clientv3/ordering_kv_test.go
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ import (
"time"

"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"
integration2 "go.etcd.io/etcd/tests/v3/framework/integration"
)
2 changes: 1 addition & 1 deletion tests/integration/clientv3/ordering_util_test.go
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ import (
"testing"
"time"

"go.etcd.io/etcd/client/v3"
clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/client/v3/ordering"
integration2 "go.etcd.io/etcd/tests/v3/framework/integration"
)
2 changes: 1 addition & 1 deletion tests/integration/clientv3/txn_test.go
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ import (
"time"

"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"
integration2 "go.etcd.io/etcd/tests/v3/framework/integration"
)
2 changes: 1 addition & 1 deletion tests/integration/clientv3/user_test.go
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ import (
"time"

"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"
"google.golang.org/grpc"
)
2 changes: 1 addition & 1 deletion tests/integration/clientv3/watch_fragment_test.go
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@ import (
"time"

"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"
)

2 changes: 1 addition & 1 deletion tests/integration/proxy/grpcproxy/cluster_test.go
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ import (
"time"

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"
integration2 "go.etcd.io/etcd/tests/v3/framework/integration"
"go.uber.org/zap/zaptest"
2 changes: 1 addition & 1 deletion tests/integration/proxy/grpcproxy/kv_test.go
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ import (
"time"

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"
integration2 "go.etcd.io/etcd/tests/v3/framework/integration"
"google.golang.org/grpc"
2 changes: 1 addition & 1 deletion tests/integration/snapshot/member_test.go
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ import (
"time"

"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/etcdserver"
integration2 "go.etcd.io/etcd/tests/v3/framework/integration"
2 changes: 1 addition & 1 deletion tests/integration/snapshot/v3_snapshot_test.go
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@ import (
"time"

"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/server/v3/embed"
integration2 "go.etcd.io/etcd/tests/v3/framework/integration"
2 changes: 1 addition & 1 deletion tests/integration/v3_auth_test.go
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@ import (
pb "go.etcd.io/etcd/api/v3/etcdserverpb"
"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
"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"
)

2 changes: 1 addition & 1 deletion tests/integration/v3_kv_test.go
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ import (
"context"
"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/tests/v3/framework/integration"
)
2 changes: 1 addition & 1 deletion tests/integration/v3_tls_test.go
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ import (
"testing"
"time"

"go.etcd.io/etcd/client/v3"
clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/tests/v3/framework/integration"
"google.golang.org/grpc"
)