From 46da49ca604aef87498c628719b3408f27f4c6d7 Mon Sep 17 00:00:00 2001 From: Doug Fawley Date: Tue, 23 Mar 2021 13:26:01 -0700 Subject: [PATCH] xds: use different proto import for grpc services (#4285) --- admin/test/utils.go | 3 ++- xds/csds/csds.go | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/admin/test/utils.go b/admin/test/utils.go index 069ffb3c..1add8afa 100644 --- a/admin/test/utils.go +++ b/admin/test/utils.go @@ -26,6 +26,7 @@ import ( "testing" "time" + v3statusgrpc "github.com/envoyproxy/go-control-plane/envoy/service/status/v3" v3statuspb "github.com/envoyproxy/go-control-plane/envoy/service/status/v3" "github.com/google/uuid" "google.golang.org/grpc" @@ -105,7 +106,7 @@ func RunChannelz(conn *grpc.ClientConn) error { // RunCSDS makes a CSDS RPC. func RunCSDS(conn *grpc.ClientConn) error { - c := v3statuspb.NewClientStatusDiscoveryServiceClient(conn) + c := v3statusgrpc.NewClientStatusDiscoveryServiceClient(conn) ctx, cancel := context.WithTimeout(context.Background(), defaultTestTimeout) defer cancel() _, err := c.FetchClientStatus(ctx, &v3statuspb.ClientStatusRequest{}, grpc.WaitForReady(true)) diff --git a/xds/csds/csds.go b/xds/csds/csds.go index e803a2d2..73b92e94 100644 --- a/xds/csds/csds.go +++ b/xds/csds/csds.go @@ -32,6 +32,7 @@ import ( v3adminpb "github.com/envoyproxy/go-control-plane/envoy/admin/v3" v2corepb "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" v3corepb "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" + v3statusgrpc "github.com/envoyproxy/go-control-plane/envoy/service/status/v3" v3statuspb "github.com/envoyproxy/go-control-plane/envoy/service/status/v3" "github.com/golang/protobuf/proto" "google.golang.org/grpc/codes" @@ -83,7 +84,7 @@ func NewClientStatusDiscoveryServer() (*ClientStatusDiscoveryServer, error) { } // StreamClientStatus implementations interface ClientStatusDiscoveryServiceServer. -func (s *ClientStatusDiscoveryServer) StreamClientStatus(stream v3statuspb.ClientStatusDiscoveryService_StreamClientStatusServer) error { +func (s *ClientStatusDiscoveryServer) StreamClientStatus(stream v3statusgrpc.ClientStatusDiscoveryService_StreamClientStatusServer) error { for { req, err := stream.Recv() if err == io.EOF {