mirror of
https://github.com/etcd-io/etcd.git
synced 2024-09-27 06:25:44 +00:00
5f9a1394db
Fixes: go test -tags cluster_proxy ./clientv3/integration -v -run TestWatchRequestProgress Does not fail the grpc-server (completely) by a not implemented RPC. Failing whole server by remote request is anti-pattern and security risk. Prior to the fix, the command line above was failing with: ``` === RUN TestWatchRequestProgress/0-watcher panic: not implemented goroutine 602 [running]: go.etcd.io/etcd/v3/proxy/grpcproxy.(*watchProxyStream).recvLoop(0xc0004779d0, 0x0, 0x0) /home/ptab/corp/etcd/proxy/grpcproxy/watch.go:275 +0xac5 go.etcd.io/etcd/v3/proxy/grpcproxy.(*watchProxy).Watch.func1(0xc0034f94a0, 0xc0004779d0) /home/ptab/corp/etcd/proxy/grpcproxy/watch.go:129 +0x53 created by go.etcd.io/etcd/v3/proxy/grpcproxy.(*watchProxy).Watch /home/ptab/corp/etcd/proxy/grpcproxy/watch.go:127 +0x3c8 FAIL go.etcd.io/etcd/v3/clientv3/integration 0.215s FAIL ```
44 lines
1.4 KiB
Go
44 lines
1.4 KiB
Go
// Copyright 2016 The etcd Authors
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
// +build !cluster_proxy
|
|
|
|
package integration
|
|
|
|
import (
|
|
"go.etcd.io/etcd/v3/clientv3"
|
|
"go.etcd.io/etcd/v3/etcdserver/api/v3election/v3electionpb"
|
|
"go.etcd.io/etcd/v3/etcdserver/api/v3lock/v3lockpb"
|
|
pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
|
|
)
|
|
|
|
const ThroughProxy = false
|
|
|
|
func toGRPC(c *clientv3.Client) grpcAPI {
|
|
return grpcAPI{
|
|
pb.NewClusterClient(c.ActiveConnection()),
|
|
pb.NewKVClient(c.ActiveConnection()),
|
|
pb.NewLeaseClient(c.ActiveConnection()),
|
|
pb.NewWatchClient(c.ActiveConnection()),
|
|
pb.NewMaintenanceClient(c.ActiveConnection()),
|
|
pb.NewAuthClient(c.ActiveConnection()),
|
|
v3lockpb.NewLockClient(c.ActiveConnection()),
|
|
v3electionpb.NewElectionClient(c.ActiveConnection()),
|
|
}
|
|
}
|
|
|
|
func newClientV3(cfg clientv3.Config) (*clientv3.Client, error) {
|
|
return clientv3.New(cfg)
|
|
}
|