From 90d23d53d5be6785267882cbe283461c27df071e Mon Sep 17 00:00:00 2001 From: pxm286 Date: Wed, 6 Jan 2021 00:18:14 -0500 Subject: [PATCH 1/2] fix: Updated v3 type for http connection manager --- xds/internal/version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xds/internal/version/version.go b/xds/internal/version/version.go index db1929b76b96..dbcb76ffd1f1 100644 --- a/xds/internal/version/version.go +++ b/xds/internal/version/version.go @@ -45,7 +45,7 @@ const ( V3RouteConfigURL = "type.googleapis.com/envoy.config.route.v3.RouteConfiguration" V3ClusterURL = "type.googleapis.com/envoy.config.cluster.v3.Cluster" V3EndpointsURL = "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment" - V3HTTPConnManagerURL = "type.googleapis.com/envoy.config.filter.network.http_connection_manager.v3.HttpConnectionManager" + V3HTTPConnManagerURL = "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager" V3UpstreamTLSContextURL = "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext" V3DownstreamTLSContextURL = "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext" ) From b02d502eaf9f38a792fdc3eee5a1a179d6d4169a Mon Sep 17 00:00:00 2001 From: pxm286 Date: Wed, 6 Jan 2021 23:08:28 -0500 Subject: [PATCH 2/2] xds: used ptypes Marshal for connection manager --- xds/internal/client/client_lds_test.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/xds/internal/client/client_lds_test.go b/xds/internal/client/client_lds_test.go index 6c0ec32106ea..09dd2eea4d84 100644 --- a/xds/internal/client/client_lds_test.go +++ b/xds/internal/client/client_lds_test.go @@ -31,6 +31,7 @@ import ( v3httppb "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/http_connection_manager/v3" v3tlspb "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3" "github.com/golang/protobuf/proto" + "github.com/golang/protobuf/ptypes" anypb "github.com/golang/protobuf/ptypes/any" wrapperspb "github.com/golang/protobuf/ptypes/wrappers" "github.com/google/go-cmp/cmp" @@ -87,14 +88,11 @@ func (s) TestUnmarshalListener_ClientSide(t *testing.T) { }, }, } - mcm, _ := proto.Marshal(cm) + mcm, _ := ptypes.MarshalAny(cm) lis := &v3listenerpb.Listener{ Name: v3LDSTarget, ApiListener: &v3listenerpb.ApiListener{ - ApiListener: &anypb.Any{ - TypeUrl: version.V3HTTPConnManagerURL, - Value: mcm, - }, + ApiListener: mcm, }, } mLis, _ := proto.Marshal(lis)