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

ClientV3 tests use integration.NewClient that configures proper logger.

Browse Source
This commit is contained in:
Piotr Tabor 2021-04-29 17:12:12 +02:00
parent bc8d3f6639
commit ffea1537d4
35 changed files with 103 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/pkg/transport/sockopt_unix.go
View File

@ -4,8 +4,9 @@
package transport
import (
"golang.org/x/sys/unix"
"syscall"
"golang.org/x/sys/unix"
)
func setReusePort(network, address string, conn syscall.RawConn) error {

3
client/pkg/types/urlsmap_test.go
View File

@ -15,9 +15,10 @@
package types
import (
"go.etcd.io/etcd/client/pkg/v3/testutil"
"reflect"
"testing"
"go.etcd.io/etcd/client/pkg/v3/testutil"
)
func TestParseInitialCluster(t *testing.T) {

5
client/v2/json.go
View File

@ -15,10 +15,11 @@
package client
import (
"github.com/json-iterator/go"
"github.com/modern-go/reflect2"
"strconv"
"unsafe"
"github.com/json-iterator/go"
"github.com/modern-go/reflect2"
)
type customNumberExtension struct {

3
client/v2/keys.go
View File

@ -19,12 +19,13 @@ import (
"encoding/json"
"errors"
"fmt"
"go.etcd.io/etcd/client/pkg/v3/pathutil"
"net/http"
"net/url"
"strconv"
"strings"
"time"
"go.etcd.io/etcd/client/pkg/v3/pathutil"
)
const (

15
client/v3/client_test.go
View File

@ -23,10 +23,19 @@ import (
"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
"go.etcd.io/etcd/client/pkg/v3/testutil"
"go.uber.org/zap/zaptest"
"google.golang.org/grpc"
)
func NewClient(t *testing.T, cfg Config) (*Client, error) {
client, err := New(cfg)
if err != nil {
return nil, err
}
return client.WithLogger(zaptest.NewLogger(t)), nil
}
func TestDialCancel(t *testing.T) {
testutil.BeforeTest(t)
@ -41,7 +50,7 @@ func TestDialCancel(t *testing.T) {
cfg := Config{
Endpoints: []string{ep},
DialTimeout: 30 * time.Second}
c, err := New(cfg)
c, err := NewClient(t, cfg)
if err != nil {
t.Fatal(err)
}
@ -104,7 +113,7 @@ func TestDialTimeout(t *testing.T) {
donec := make(chan error, 1)
go func(cfg Config) {
// without timeout, dial continues forever on ipv4 black hole
c, err := New(cfg)
c, err := NewClient(t, cfg)
if c != nil || err == nil {
t.Errorf("#%d: new client should fail", i)
}
@ -132,7 +141,7 @@ func TestDialTimeout(t *testing.T) {
func TestDialNoTimeout(t *testing.T) {
cfg := Config{Endpoints: []string{"127.0.0.1:12345"}}
c, err := New(cfg)
c, err := NewClient(t, cfg)
if c == nil || err != nil {
t.Fatalf("new client with DialNoWait should succeed, got %v", err)
}

5
contrib/lock/client/client.go
View File

@ -26,14 +26,15 @@ import (
"bytes"
"encoding/json"
"fmt"
"go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/client/v3/concurrency"
"io/ioutil"
"net/http"
"os"
"runtime"
"strconv"
"time"
"go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/client/v3/concurrency"
)
type node struct {

3
etcdctl/ctlv3/command/make_mirror_command.go
View File

@ -18,11 +18,12 @@ import (
"context"
"errors"
"fmt"
"github.com/bgentry/speakeasy"
"strings"
"sync/atomic"
"time"
"github.com/bgentry/speakeasy"
"go.etcd.io/etcd/api/v3/mvccpb"
"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
"go.etcd.io/etcd/client/v3"

3
server/auth/metrics.go
View File

@ -15,8 +15,9 @@
package auth
import (
"github.com/prometheus/client_golang/prometheus"
"sync"
"github.com/prometheus/client_golang/prometheus"
)
var (

3
server/etcdserver/api/v2http/metrics.go
View File

@ -15,11 +15,10 @@
package v2http
import (
"net/http"
"strconv"
"time"
"net/http"
"go.etcd.io/etcd/api/v3/etcdserverpb"
"go.etcd.io/etcd/server/v3/etcdserver/api/v2error"
"go.etcd.io/etcd/server/v3/etcdserver/api/v2http/httptypes"

7
server/etcdserver/zap_raft_test.go
View File

@ -17,15 +17,16 @@ package etcdserver
import (
"bytes"
"fmt"
"go.etcd.io/etcd/client/pkg/v3/logutil"
"go.uber.org/zap"
"go.uber.org/zap/zapcore"
"io/ioutil"
"os"
"path/filepath"
"strings"
"testing"
"time"
"go.etcd.io/etcd/client/pkg/v3/logutil"
"go.uber.org/zap"
"go.uber.org/zap/zapcore"
)
func TestNewRaftLogger(t *testing.T) {

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

@ -23,12 +23,13 @@ import (
"go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/client/v3/concurrency"
"go.etcd.io/etcd/tests/v3/integration"
)
func TestResumeElection(t *testing.T) {
const prefix = "/resume-election/"
cli, err := clientv3.New(clientv3.Config{Endpoints: exampleEndpoints()})
cli, err := integration.NewClient(t, clientv3.Config{Endpoints: exampleEndpoints()})
if err != nil {
log.Fatal(err)
}

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

@ -20,10 +20,11 @@ import (
"go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/client/v3/concurrency"
"go.etcd.io/etcd/tests/v3/integration"
)
func TestMutexLockSessionExpired(t *testing.T) {
cli, err := clientv3.New(clientv3.Config{Endpoints: exampleEndpoints()})
cli, err := integration.NewClient(t, clientv3.Config{Endpoints: exampleEndpoints()})
if err != nil {
t.Fatal(err)
}

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

@ -59,7 +59,7 @@ func TestBalancerUnderBlackholeKeepAliveWatch(t *testing.T) {
// then we can reduce 3s to 1s.
timeout := pingInterval + integration.RequestWaitTimeout
cli, err := clientv3.New(ccfg)
cli, err := integration.NewClient(t, ccfg)
if err != nil {
t.Fatal(err)
}
@ -180,7 +180,7 @@ func testBalancerUnderBlackholeNoKeepAlive(t *testing.T, op func(*clientv3.Clien
DialTimeout: 1 * time.Second,
DialOptions: []grpc.DialOption{grpc.WithBlock()},
}
cli, err := clientv3.New(ccfg)
cli, err := integration.NewClient(t, ccfg)
if err != nil {
t.Fatal(err)
}

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

@ -56,7 +56,7 @@ func TestDialTLSExpired(t *testing.T) {
t.Fatal(err)
}
// expect remote errors "tls: bad certificate"
_, err = clientv3.New(clientv3.Config{
_, err = integration.NewClient(t, clientv3.Config{
Endpoints: []string{clus.Members[0].GRPCAddr()},
DialTimeout: 3 * time.Second,
DialOptions: []grpc.DialOption{grpc.WithBlock()},
@ -74,7 +74,7 @@ func TestDialTLSNoConfig(t *testing.T) {
clus := integration.NewClusterV3(t, &integration.ClusterConfig{Size: 1, ClientTLS: &testTLSInfo, SkipCreatingClient: true})
defer clus.Terminate(t)
// expect "signed by unknown authority"
c, err := clientv3.New(clientv3.Config{
c, err := integration.NewClient(t, clientv3.Config{
Endpoints: []string{clus.Members[0].GRPCAddr()},
DialTimeout: time.Second,
DialOptions: []grpc.DialOption{grpc.WithBlock()},
@ -117,7 +117,7 @@ func testDialSetEndpoints(t *testing.T, setBefore bool) {
DialTimeout: 1 * time.Second,
DialOptions: []grpc.DialOption{grpc.WithBlock()},
}
cli, err := clientv3.New(cfg)
cli, err := integration.NewClient(t, cfg)
if err != nil {
t.Fatal(err)
}
@ -175,7 +175,7 @@ func TestRejectOldCluster(t *testing.T) {
DialOptions: []grpc.DialOption{grpc.WithBlock()},
RejectOldCluster: true,
}
cli, err := clientv3.New(cfg)
cli, err := integration.NewClient(t, cfg)
if err != nil {
t.Fatal(err)
}

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

@ -120,7 +120,7 @@ func testBalancerUnderNetworkPartition(t *testing.T, op func(*clientv3.Client, c
DialTimeout: 3 * time.Second,
DialOptions: []grpc.DialOption{grpc.WithBlock()},
}
cli, err := clientv3.New(ccfg)
cli, err := integration.NewClient(t, ccfg)
if err != nil {
t.Fatal(err)
}
@ -174,7 +174,7 @@ func TestBalancerUnderNetworkPartitionLinearizableGetLeaderElection(t *testing.T
timeout := 3 * clus.Members[(lead+1)%2].ServerConfig.ReqTimeout()
cli, err := clientv3.New(clientv3.Config{
cli, err := integration.NewClient(t, clientv3.Config{
Endpoints: []string{eps[(lead+1)%2]},
DialTimeout: 2 * time.Second,
DialOptions: []grpc.DialOption{grpc.WithBlock()},
@ -232,7 +232,7 @@ func testBalancerUnderNetworkPartitionWatch(t *testing.T, isolateLeader bool) {
}
// pin eps[target]
watchCli, err := clientv3.New(clientv3.Config{Endpoints: []string{eps[target]}})
watchCli, err := integration.NewClient(t, clientv3.Config{Endpoints: []string{eps[target]}})
if err != nil {
t.Fatal(err)
}
@ -291,7 +291,7 @@ func TestDropReadUnderNetworkPartition(t *testing.T) {
DialTimeout: 10 * time.Second,
DialOptions: []grpc.DialOption{grpc.WithBlock()},
}
cli, err := clientv3.New(ccfg)
cli, err := integration.NewClient(t, ccfg)
if err != nil {
t.Fatal(err)
}

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

@ -42,7 +42,7 @@ func TestBalancerUnderServerShutdownWatch(t *testing.T) {
lead := clus.WaitLeader(t)
// pin eps[lead]
watchCli, err := clientv3.New(clientv3.Config{Endpoints: []string{eps[lead]}})
watchCli, err := integration.NewClient(t, clientv3.Config{Endpoints: []string{eps[lead]}})
if err != nil {
t.Fatal(err)
}
@ -88,7 +88,7 @@ func TestBalancerUnderServerShutdownWatch(t *testing.T) {
clus.Members[lead].Terminate(t)
// writes to eps[lead+1]
putCli, err := clientv3.New(clientv3.Config{Endpoints: []string{eps[(lead+1)%3]}})
putCli, err := integration.NewClient(t, clientv3.Config{Endpoints: []string{eps[(lead+1)%3]}})
if err != nil {
t.Fatal(err)
}
@ -152,7 +152,7 @@ func testBalancerUnderServerShutdownMutable(t *testing.T, op func(*clientv3.Clie
eps := []string{clus.Members[0].GRPCAddr(), clus.Members[1].GRPCAddr(), clus.Members[2].GRPCAddr()}
// pin eps[0]
cli, err := clientv3.New(clientv3.Config{Endpoints: []string{eps[0]}})
cli, err := integration.NewClient(t, clientv3.Config{Endpoints: []string{eps[0]}})
if err != nil {
t.Fatal(err)
}
@ -210,7 +210,7 @@ func testBalancerUnderServerShutdownImmutable(t *testing.T, op func(*clientv3.Cl
eps := []string{clus.Members[0].GRPCAddr(), clus.Members[1].GRPCAddr(), clus.Members[2].GRPCAddr()}
// pin eps[0]
cli, err := clientv3.New(clientv3.Config{Endpoints: []string{eps[0]}})
cli, err := integration.NewClient(t, clientv3.Config{Endpoints: []string{eps[0]}})
if err != nil {
t.Errorf("failed to create client: %v", err)
}
@ -293,7 +293,7 @@ func testBalancerUnderServerStopInflightRangeOnRestart(t *testing.T, linearizabl
}
// pin eps[target]
cli, err := clientv3.New(clientv3.Config{Endpoints: []string{eps[target]}})
cli, err := integration.NewClient(t, clientv3.Config{Endpoints: []string{eps[target]}})
if err != nil {
t.Errorf("failed to create client: %v", err)
}

4
tests/integration/clientv3/kv_test.go
View File

@ -1034,7 +1034,7 @@ func TestKVForLearner(t *testing.T) {
DialOptions: []grpc.DialOption{grpc.WithBlock()},
}
// this client only has endpoint of the learner member
cli, err := clientv3.New(cfg)
cli, err := integration.NewClient(t, cfg)
if err != nil {
t.Fatalf("failed to create clientv3: %v", err)
}
@ -1106,7 +1106,7 @@ func TestBalancerSupportLearner(t *testing.T) {
DialTimeout: 5 * time.Second,
DialOptions: []grpc.DialOption{grpc.WithBlock()},
}
cli, err := clientv3.New(cfg)
cli, err := integration.NewClient(t, cfg)
if err != nil {
t.Fatalf("failed to create clientv3: %v", err)
}

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

@ -209,7 +209,7 @@ func TestMaintenanceStatus(t *testing.T) {
eps[i] = clus.Members[i].GRPCAddr()
}
cli, err := clientv3.New(clientv3.Config{Endpoints: eps, DialOptions: []grpc.DialOption{grpc.WithBlock()}})
cli, err := integration.NewClient(t, clientv3.Config{Endpoints: eps, DialOptions: []grpc.DialOption{grpc.WithBlock()}})
if err != nil {
t.Fatal(err)
}

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

@ -81,7 +81,7 @@ func TestV3ClientMetrics(t *testing.T) {
grpc.WithStreamInterceptor(grpcprom.StreamClientInterceptor),
},
}
cli, cerr := clientv3.New(cfg)
cli, cerr := integration.NewClient(t, cfg)
if cerr != nil {
t.Fatal(cerr)
}

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

@ -40,7 +40,7 @@ func TestDetectKvOrderViolation(t *testing.T) {
clus.Members[2].GRPCAddr(),
},
}
cli, err := clientv3.New(cfg)
cli, err := integration.NewClient(t, cfg)
if err != nil {
t.Fatal(err)
}
@ -107,7 +107,7 @@ func TestDetectTxnOrderViolation(t *testing.T) {
clus.Members[2].GRPCAddr(),
},
}
cli, err := clientv3.New(cfg)
cli, err := integration.NewClient(t, cfg)
if err != nil {
t.Fatal(err)
}

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

@ -34,7 +34,7 @@ func TestEndpointSwitchResolvesViolation(t *testing.T) {
clus.Members[2].GRPCAddr(),
}
cfg := clientv3.Config{Endpoints: []string{clus.Members[0].GRPCAddr()}}
cli, err := clientv3.New(cfg)
cli, err := integration.NewClient(t, cfg)
if err != nil {
t.Fatal(err)
}
@ -91,7 +91,7 @@ func TestUnresolvableOrderViolation(t *testing.T) {
clus.Members[4].GRPCAddr(),
},
}
cli, err := clientv3.New(cfg)
cli, err := integration.NewClient(t, cfg)
if err != nil {
t.Fatal(err)
}

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

@ -83,7 +83,7 @@ func createSnapshotFile(t *testing.T, kvs []kv) string {
}
ccfg := clientv3.Config{Endpoints: []string{cfg.ACUrls[0].String()}}
cli, err := clientv3.New(ccfg)
cli, err := integration.NewClient(t, ccfg)
if err != nil {
t.Fatal(err)
}

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

@ -75,16 +75,16 @@ func TestUserErrorAuth(t *testing.T) {
DialOptions: []grpc.DialOption{grpc.WithBlock()},
}
cfg.Username, cfg.Password = "wrong-id", "123"
if _, err := clientv3.New(cfg); err != rpctypes.ErrAuthFailed {
if _, err := integration.NewClient(t, cfg); err != rpctypes.ErrAuthFailed {
t.Fatalf("expected %v, got %v", rpctypes.ErrAuthFailed, err)
}
cfg.Username, cfg.Password = "root", "wrong-pass"
if _, err := clientv3.New(cfg); err != rpctypes.ErrAuthFailed {
if _, err := integration.NewClient(t, cfg); err != rpctypes.ErrAuthFailed {
t.Fatalf("expected %v, got %v", rpctypes.ErrAuthFailed, err)
}
cfg.Username, cfg.Password = "root", "123"
authed, err := clientv3.New(cfg)
authed, err := integration.NewClient(t, cfg)
if err != nil {
t.Fatal(err)
}
@ -135,7 +135,7 @@ func TestGetTokenWithoutAuth(t *testing.T) {
Password: "123",
}
client, err = clientv3.New(cfg)
client, err = integration.NewClient(t, cfg)
if err == nil {
defer client.Close()
}

5
tests/integration/embed/embed_test.go
View File

@ -35,6 +35,7 @@ import (
"go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/server/v3/embed"
"go.etcd.io/etcd/tests/v3/integration"
"go.uber.org/zap/zaptest"
)
var (
@ -160,12 +161,14 @@ func testEmbedEtcdGracefulStop(t *testing.T, secure bool) {
t.Fatal(err)
}
}
cli, err := clientv3.New(clientCfg)
cli, err := integration.NewClient(t, clientCfg)
if err != nil {
t.Fatal(err)
}
defer cli.Close()
cli = cli.WithLogger(zaptest.NewLogger(t))
// open watch connection
cli.Watch(context.Background(), "foo")

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

@ -42,7 +42,7 @@ func TestClusterProxyMemberList(t *testing.T) {
Endpoints: []string{cts.caddr},
DialTimeout: 5 * time.Second,
}
client, err := clientv3.New(cfg)
client, err := integration.NewClient(t, cfg)
if err != nil {
t.Fatalf("err %v, want nil", err)
}
@ -94,7 +94,7 @@ func newClusterProxyServer(lg *zap.Logger, endpoints []string, t *testing.T) *cl
Endpoints: endpoints,
DialTimeout: 5 * time.Second,
}
client, err := clientv3.New(cfg)
client, err := integration.NewClient(t, cfg)
if err != nil {
t.Fatal(err)
}

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

@ -42,7 +42,7 @@ func TestKVProxyRange(t *testing.T) {
Endpoints: []string{kvts.l.Addr().String()},
DialTimeout: 5 * time.Second,
}
client, err := clientv3.New(cfg)
client, err := integration.NewClient(t, cfg)
if err != nil {
t.Fatalf("err = %v, want nil", err)
}
@ -71,7 +71,7 @@ func newKVProxyServer(endpoints []string, t *testing.T) *kvproxyTestServer {
Endpoints: endpoints,
DialTimeout: 5 * time.Second,
}
client, err := clientv3.New(cfg)
client, err := integration.NewClient(t, cfg)
if err != nil {
t.Fatal(err)
}

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

@ -48,7 +48,7 @@ func TestSnapshotV3RestoreMultiMemberAdd(t *testing.T) {
// wait for health interval + leader election
time.Sleep(etcdserver.HealthInterval + 2*time.Second)
cli, err := clientv3.New(clientv3.Config{Endpoints: []string{cURLs[0].String()}})
cli, err := integration.NewClient(t, clientv3.Config{Endpoints: []string{cURLs[0].String()}})
if err != nil {
t.Fatal(err)
}
@ -88,7 +88,7 @@ func TestSnapshotV3RestoreMultiMemberAdd(t *testing.T) {
t.Fatalf("failed to start the newly added etcd member")
}
cli2, err := clientv3.New(clientv3.Config{Endpoints: []string{newCURLs[0].String()}})
cli2, err := integration.NewClient(t, clientv3.Config{Endpoints: []string{newCURLs[0].String()}})
if err != nil {
t.Fatal(err)
}

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

@ -82,7 +82,7 @@ func TestSnapshotV3RestoreSingle(t *testing.T) {
}
var cli *clientv3.Client
cli, err = clientv3.New(clientv3.Config{Endpoints: []string{cfg.ACUrls[0].String()}})
cli, err = integration.NewClient(t, clientv3.Config{Endpoints: []string{cfg.ACUrls[0].String()}})
if err != nil {
t.Fatal(err)
}
@ -119,7 +119,7 @@ func TestSnapshotV3RestoreMulti(t *testing.T) {
time.Sleep(time.Second)
for i := 0; i < clusterN; i++ {
cli, err := clientv3.New(clientv3.Config{Endpoints: []string{cURLs[i].String()}})
cli, err := integration.NewClient(t, clientv3.Config{Endpoints: []string{cURLs[i].String()}})
if err != nil {
t.Fatal(err)
}
@ -194,7 +194,7 @@ func createSnapshotFile(t *testing.T, kvs []kv) string {
}
ccfg := clientv3.Config{Endpoints: []string{cfg.ACUrls[0].String()}}
cli, err := clientv3.New(ccfg)
cli, err := integration.NewClient(t, ccfg)
if err != nil {
t.Fatal(err)
}

9
tests/integration/testing.go
View File

@ -21,6 +21,7 @@ import (
grpc_logsettable "github.com/grpc-ecosystem/go-grpc-middleware/logging/settable"
"go.etcd.io/etcd/client/pkg/v3/testutil"
clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/server/v3/embed"
"go.etcd.io/etcd/server/v3/verify"
"go.uber.org/zap/zapcore"
@ -70,3 +71,11 @@ func NewEmbedConfig(t testing.TB, name string) *embed.Config {
cfg.Dir = t.TempDir()
return cfg
}
func NewClient(t testing.TB, cfg clientv3.Config) (*clientv3.Client, error) {
client, err := clientv3.New(cfg)
if err != nil {
return nil, err
}
return client.WithLogger(zaptest.NewLogger(t)), nil
}

6
tests/integration/v2store/store_v2v3_test.go
View File

@ -54,7 +54,7 @@ func testCreateKV(t testing.TB, endpoints []string) {
//{key: "hello", value: "3", unique: true, wantKeyMatch: false},
}
cli, err := clientv3.New(clientv3.Config{Endpoints: endpoints})
cli, err := integration.NewClient(t, clientv3.Config{Endpoints: endpoints})
if err != nil {
t.Fatal(err)
}
@ -102,7 +102,7 @@ func testSetKV(t testing.TB, endpoints []string) {
{key: "/sdir/set", value: "4", wantIndexMatch: false},
}
cli, err := clientv3.New(clientv3.Config{Endpoints: endpoints})
cli, err := integration.NewClient(t, clientv3.Config{Endpoints: endpoints})
if err != nil {
t.Fatal(err)
}
@ -138,7 +138,7 @@ func testCreateSetDir(t testing.TB, endpoints []string) {
{dir: "/ddir/1/2/3"},
}
cli, err := clientv3.New(clientv3.Config{Endpoints: endpoints})
cli, err := integration.NewClient(t, clientv3.Config{Endpoints: endpoints})
if err != nil {
t.Fatal(err)
}

14
tests/integration/v3_auth_test.go
View File

@ -55,7 +55,7 @@ func TestV3AuthTokenWithDisable(t *testing.T) {
authSetupRoot(t, toGRPC(clus.Client(0)).Auth)
c, cerr := clientv3.New(clientv3.Config{Endpoints: clus.Client(0).Endpoints(), Username: "root", Password: "123"})
c, cerr := NewClient(t, clientv3.Config{Endpoints: clus.Client(0).Endpoints(), Username: "root", Password: "123"})
if cerr != nil {
t.Fatal(cerr)
}
@ -127,7 +127,7 @@ func testV3AuthWithLeaseRevokeWithRoot(t *testing.T, ccfg ClusterConfig) {
api := toGRPC(clus.Client(0))
authSetupRoot(t, api.Auth)
rootc, cerr := clientv3.New(clientv3.Config{
rootc, cerr := NewClient(t, clientv3.Config{
Endpoints: clus.Client(0).Endpoints(),
Username: "root",
Password: "123",
@ -194,7 +194,7 @@ func TestV3AuthWithLeaseRevoke(t *testing.T) {
authSetupRoot(t, toGRPC(clus.Client(0)).Auth)
rootc, cerr := clientv3.New(clientv3.Config{Endpoints: clus.Client(0).Endpoints(), Username: "root", Password: "123"})
rootc, cerr := NewClient(t, clientv3.Config{Endpoints: clus.Client(0).Endpoints(), Username: "root", Password: "123"})
if cerr != nil {
t.Fatal(cerr)
}
@ -211,7 +211,7 @@ func TestV3AuthWithLeaseRevoke(t *testing.T) {
t.Fatal(err)
}
userc, cerr := clientv3.New(clientv3.Config{Endpoints: clus.Client(0).Endpoints(), Username: "user1", Password: "user1-123"})
userc, cerr := NewClient(t, clientv3.Config{Endpoints: clus.Client(0).Endpoints(), Username: "user1", Password: "user1-123"})
if cerr != nil {
t.Fatal(cerr)
}
@ -247,13 +247,13 @@ func TestV3AuthWithLeaseAttach(t *testing.T) {
authSetupRoot(t, toGRPC(clus.Client(0)).Auth)
user1c, cerr := clientv3.New(clientv3.Config{Endpoints: clus.Client(0).Endpoints(), Username: "user1", Password: "user1-123"})
user1c, cerr := NewClient(t, clientv3.Config{Endpoints: clus.Client(0).Endpoints(), Username: "user1", Password: "user1-123"})
if cerr != nil {
t.Fatal(cerr)
}
defer user1c.Close()
user2c, cerr := clientv3.New(clientv3.Config{Endpoints: clus.Client(0).Endpoints(), Username: "user2", Password: "user2-123"})
user2c, cerr := NewClient(t, clientv3.Config{Endpoints: clus.Client(0).Endpoints(), Username: "user2", Password: "user2-123"})
if cerr != nil {
t.Fatal(cerr)
}
@ -364,7 +364,7 @@ func TestV3AuthOldRevConcurrent(t *testing.T) {
authSetupRoot(t, toGRPC(clus.Client(0)).Auth)
c, cerr := clientv3.New(clientv3.Config{
c, cerr := NewClient(t, clientv3.Config{
Endpoints: clus.Client(0).Endpoints(),
DialTimeout: 5 * time.Second,
Username: "root",

4
tests/integration/v3_grpc_test.go
View File

@ -1758,7 +1758,7 @@ func testTLSReload(
t.Log(err)
continue
}
cli, cerr := clientv3.New(clientv3.Config{
cli, cerr := NewClient(t, clientv3.Config{
DialOptions: []grpc.DialOption{grpc.WithBlock()},
Endpoints: []string{clus.Members[0].GRPCAddr()},
DialTimeout: time.Second,
@ -1793,7 +1793,7 @@ func testTLSReload(
if terr != nil {
t.Fatal(terr)
}
cl, cerr := clientv3.New(clientv3.Config{
cl, cerr := NewClient(t, clientv3.Config{
Endpoints: []string{clus.Members[0].GRPCAddr()},
DialTimeout: 5 * time.Second,
TLS: tls,

2
tests/integration/v3_tls_test.go
View File

@ -54,7 +54,7 @@ func testTLSCipherSuites(t *testing.T, valid bool) {
if err != nil {
t.Fatal(err)
}
cli, cerr := clientv3.New(clientv3.Config{
cli, cerr := NewClient(t, clientv3.Config{
Endpoints: []string{clus.Members[0].GRPCAddr()},
DialTimeout: time.Second,
DialOptions: []grpc.DialOption{grpc.WithBlock()},

3
tools/etcd-dump-db/backend.go
View File

@ -17,9 +17,10 @@ package main
import (
"encoding/binary"
"fmt"
"go.etcd.io/etcd/api/v3/authpb"
"path/filepath"
"go.etcd.io/etcd/api/v3/authpb"
"go.etcd.io/etcd/api/v3/mvccpb"
"go.etcd.io/etcd/server/v3/lease/leasepb"
"go.etcd.io/etcd/server/v3/mvcc"

2
tools/mod/tools.go
View File

@ -31,8 +31,8 @@ import (
_ "github.com/hexfusion/schwag"
_ "github.com/mdempsky/unconvert"
_ "github.com/mgechev/revive"
_ "github.com/mikefarah/yq/v3"
_ "go.etcd.io/protodoc"
_ "honnef.co/go/tools/cmd/staticcheck"
_ "mvdan.cc/unparam"
_ "github.com/mikefarah/yq/v3"
)