From e3211e3219bcc144d20aa2fab6ec1b572d6eb845 Mon Sep 17 00:00:00 2001 From: Matt Klein Date: Fri, 6 Aug 2021 23:10:58 +0000 Subject: [PATCH] proto: fix verify to point at v3 only Somehow this is not working on Envoy Mobile but still seems to work in Envoy. Signed-off-by: Matt Klein --- source/server/proto_descriptors.cc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/source/server/proto_descriptors.cc b/source/server/proto_descriptors.cc index 6322ce763716..9638b84ba4f3 100644 --- a/source/server/proto_descriptors.cc +++ b/source/server/proto_descriptors.cc @@ -39,14 +39,15 @@ void validateProtoDescriptors() { } const auto types = { - "envoy.api.v2.Cluster", "envoy.api.v2.ClusterLoadAssignment", - "envoy.api.v2.Listener", "envoy.api.v2.RouteConfiguration", - "envoy.api.v2.route.VirtualHost", "envoy.api.v2.auth.Secret", + "envoy.config.cluster.v3.Cluster", "envoy.config.endpoint.v3.ClusterLoadAssignment", + "envoy.config.listener.v3.Listener", "envoy.config.route.v3.RouteConfiguration", + "envoy.config.route.v3.VirtualHost", "envoy.extensions.transport_sockets.tls.v3.Secret", }; for (const auto& type : types) { - RELEASE_ASSERT( - Protobuf::DescriptorPool::generated_pool()->FindMessageTypeByName(type) != nullptr, ""); + RELEASE_ASSERT(Protobuf::DescriptorPool::generated_pool()->FindMessageTypeByName(type) != + nullptr, + absl::StrCat("Unable to find message type for ", type)); } }