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

integration/cluster_proxy.go: Fix broken build with tags=cov.

Browse Source 
Prior to the fix:
```
go test -mod=mod -timeout 30m -tags cluster_proxy "./integration/..."
```

Was failing with:
```
integration/cluster_proxy.go:58:37: not enough arguments in call to grpcproxy.NewWatchProxy
   have (*clientv3.Client)
   want (*zap.Logger, *clientv3.Client)
FAIL    go.etcd.io/etcd/v3/integration [build failed]
```
This commit is contained in:
Piotr Tabor 2020-09-07 14:39:26 +02:00
parent 76e769ce95
commit 32bad8e9a8
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
integration/cluster_proxy.go
View File

@ -45,6 +45,8 @@ func toGRPC(c *clientv3.Client) grpcAPI {
pmu.Lock() pmu.Lock()
defer pmu.Unlock() defer pmu.Unlock()
lg := zap.NewExample()
if v, ok := proxies[c]; ok { if v, ok := proxies[c]; ok {
return v.grpc return v.grpc
} }
@ -55,10 +57,10 @@ func toGRPC(c *clientv3.Client) grpcAPI {
c.Lease = namespace.NewLease(c.Lease, proxyNamespace) c.Lease = namespace.NewLease(c.Lease, proxyNamespace)
// test coalescing/caching proxy // test coalescing/caching proxy
kvp, kvpch := grpcproxy.NewKvProxy(c) kvp, kvpch := grpcproxy.NewKvProxy(c)
wp, wpch := grpcproxy.NewWatchProxy(c) wp, wpch := grpcproxy.NewWatchProxy(lg, c)
lp, lpch := grpcproxy.NewLeaseProxy(c) lp, lpch := grpcproxy.NewLeaseProxy(c)
mp := grpcproxy.NewMaintenanceProxy(c) mp := grpcproxy.NewMaintenanceProxy(c)
clp, _ := grpcproxy.NewClusterProxy(zap.NewExample(), c, "", "") // without registering proxy URLs clp, _ := grpcproxy.NewClusterProxy(lg, c, "", "") // without registering proxy URLs
authp := grpcproxy.NewAuthProxy(c) authp := grpcproxy.NewAuthProxy(c)
lockp := grpcproxy.NewLockProxy(c) lockp := grpcproxy.NewLockProxy(c)
electp := grpcproxy.NewElectionProxy(c) electp := grpcproxy.NewElectionProxy(c)