grpc 1.42.0 → 1.43.1

data/src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.c

@@ -8,19 +8,12 @@
 
 #include "upb/def.h"
 #include "envoy/config/core/v3/extension.upbdefs.h"
+#include "envoy/config/core/v3/extension.upb.h"
 
 extern upb_def_init envoy_config_core_v3_config_source_proto_upbdefinit;
 extern upb_def_init google_protobuf_any_proto_upbdefinit;
 extern upb_def_init udpa_annotations_status_proto_upbdefinit;
 extern upb_def_init validate_validate_proto_upbdefinit;
-extern const upb_msglayout envoy_config_core_v3_TypedExtensionConfig_msginit;
-extern const upb_msglayout envoy_config_core_v3_ExtensionConfigSource_msginit;
-
-static const upb_msglayout *layouts[2] = {
-  &envoy_config_core_v3_TypedExtensionConfig_msginit,
-  &envoy_config_core_v3_ExtensionConfigSource_msginit,
-};
-
 static const char descriptor[666] = {'\n', '$', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'e', 'x', 
 't', 'e', 'n', 's', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\022', '\024', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 
 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '\032', '(', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 
@@ -60,7 +53,7 @@ static upb_def_init *deps[5] = {
 
 upb_def_init envoy_config_core_v3_extension_proto_upbdefinit = {
   deps,
-  layouts,
+  &envoy_config_core_v3_extension_proto_upb_file_layout,
   "envoy/config/core/v3/extension.proto",
   UPB_STRVIEW_INIT(descriptor, 666)
 };

data/src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.c

@@ -8,6 +8,7 @@
 
 #include "upb/def.h"
 #include "envoy/config/core/v3/grpc_service.upbdefs.h"
+#include "envoy/config/core/v3/grpc_service.upb.h"
 
 extern upb_def_init envoy_config_core_v3_base_proto_upbdefinit;
 extern upb_def_init google_protobuf_any_proto_upbdefinit;
@@ -19,38 +20,6 @@ extern upb_def_init udpa_annotations_sensitive_proto_upbdefinit;
 extern upb_def_init udpa_annotations_status_proto_upbdefinit;
 extern upb_def_init udpa_annotations_versioning_proto_upbdefinit;
 extern upb_def_init validate_validate_proto_upbdefinit;
-extern const upb_msglayout envoy_config_core_v3_GrpcService_msginit;
-extern const upb_msglayout envoy_config_core_v3_GrpcService_EnvoyGrpc_msginit;
-extern const upb_msglayout envoy_config_core_v3_GrpcService_GoogleGrpc_msginit;
-extern const upb_msglayout envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_msginit;
-extern const upb_msglayout envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredentials_msginit;
-extern const upb_msglayout envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_msginit;
-extern const upb_msglayout envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_msginit;
-extern const upb_msglayout envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials_msginit;
-extern const upb_msglayout envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials_msginit;
-extern const upb_msglayout envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_msginit;
-extern const upb_msglayout envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService_msginit;
-extern const upb_msglayout envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_msginit;
-extern const upb_msglayout envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value_msginit;
-extern const upb_msglayout envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_ArgsEntry_msginit;
-
-static const upb_msglayout *layouts[14] = {
-  &envoy_config_core_v3_GrpcService_msginit,
-  &envoy_config_core_v3_GrpcService_EnvoyGrpc_msginit,
-  &envoy_config_core_v3_GrpcService_GoogleGrpc_msginit,
-  &envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_msginit,
-  &envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredentials_msginit,
-  &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_msginit,
-  &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_msginit,
-  &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials_msginit,
-  &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials_msginit,
-  &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_msginit,
-  &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService_msginit,
-  &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_msginit,
-  &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value_msginit,
-  &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_ArgsEntry_msginit,
-};
-
 static const char descriptor[4684] = {'\n', '\'', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'g', 'r', 
 'p', 'c', '_', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'p', 'r', 'o', 't', 'o', '\022', '\024', 'e', 'n', 'v', 'o', 'y', '.', 'c', 
 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '\032', '\037', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 
@@ -257,7 +226,7 @@ static upb_def_init *deps[11] = {
 
 upb_def_init envoy_config_core_v3_grpc_service_proto_upbdefinit = {
   deps,
-  layouts,
+  &envoy_config_core_v3_grpc_service_proto_upb_file_layout,
   "envoy/config/core/v3/grpc_service.proto",
   UPB_STRVIEW_INIT(descriptor, 4684)
 };

data/src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.c

@@ -8,6 +8,7 @@
 
 #include "upb/def.h"
 #include "envoy/config/core/v3/health_check.upbdefs.h"
+#include "envoy/config/core/v3/health_check.upb.h"
 
 extern upb_def_init envoy_config_core_v3_base_proto_upbdefinit;
 extern upb_def_init envoy_config_core_v3_event_service_config_proto_upbdefinit;
@@ -21,26 +22,6 @@ extern upb_def_init google_protobuf_wrappers_proto_upbdefinit;
 extern upb_def_init udpa_annotations_status_proto_upbdefinit;
 extern upb_def_init udpa_annotations_versioning_proto_upbdefinit;
 extern upb_def_init validate_validate_proto_upbdefinit;
-extern const upb_msglayout envoy_config_core_v3_HealthCheck_msginit;
-extern const upb_msglayout envoy_config_core_v3_HealthCheck_Payload_msginit;
-extern const upb_msglayout envoy_config_core_v3_HealthCheck_HttpHealthCheck_msginit;
-extern const upb_msglayout envoy_config_core_v3_HealthCheck_TcpHealthCheck_msginit;
-extern const upb_msglayout envoy_config_core_v3_HealthCheck_RedisHealthCheck_msginit;
-extern const upb_msglayout envoy_config_core_v3_HealthCheck_GrpcHealthCheck_msginit;
-extern const upb_msglayout envoy_config_core_v3_HealthCheck_CustomHealthCheck_msginit;
-extern const upb_msglayout envoy_config_core_v3_HealthCheck_TlsOptions_msginit;
-
-static const upb_msglayout *layouts[8] = {
-  &envoy_config_core_v3_HealthCheck_msginit,
-  &envoy_config_core_v3_HealthCheck_Payload_msginit,
-  &envoy_config_core_v3_HealthCheck_HttpHealthCheck_msginit,
-  &envoy_config_core_v3_HealthCheck_TcpHealthCheck_msginit,
-  &envoy_config_core_v3_HealthCheck_RedisHealthCheck_msginit,
-  &envoy_config_core_v3_HealthCheck_GrpcHealthCheck_msginit,
-  &envoy_config_core_v3_HealthCheck_CustomHealthCheck_msginit,
-  &envoy_config_core_v3_HealthCheck_TlsOptions_msginit,
-};
-
 static const char descriptor[4221] = {'\n', '\'', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'h', 'e', 
 'a', 'l', 't', 'h', '_', 'c', 'h', 'e', 'c', 'k', '.', 'p', 'r', 'o', 't', 'o', '\022', '\024', 'e', 'n', 'v', 'o', 'y', '.', 'c', 
 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '\032', '\037', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 
@@ -230,7 +211,7 @@ static upb_def_init *deps[13] = {
 
 upb_def_init envoy_config_core_v3_health_check_proto_upbdefinit = {
   deps,
-  layouts,
+  &envoy_config_core_v3_health_check_proto_upb_file_layout,
   "envoy/config/core/v3/health_check.proto",
   UPB_STRVIEW_INIT(descriptor, 4221)
 };

data/src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.c

@@ -8,17 +8,12 @@
 
 #include "upb/def.h"
 #include "envoy/config/core/v3/http_uri.upbdefs.h"
+#include "envoy/config/core/v3/http_uri.upb.h"
 
 extern upb_def_init google_protobuf_duration_proto_upbdefinit;
 extern upb_def_init udpa_annotations_status_proto_upbdefinit;
 extern upb_def_init udpa_annotations_versioning_proto_upbdefinit;
 extern upb_def_init validate_validate_proto_upbdefinit;
-extern const upb_msglayout envoy_config_core_v3_HttpUri_msginit;
-
-static const upb_msglayout *layouts[1] = {
-  &envoy_config_core_v3_HttpUri_msginit,
-};
-
 static const char descriptor[454] = {'\n', '#', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'h', 't', 
 't', 'p', '_', 'u', 'r', 'i', '.', 'p', 'r', 'o', 't', 'o', '\022', '\024', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 
 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 
@@ -50,7 +45,7 @@ static upb_def_init *deps[5] = {
 
 upb_def_init envoy_config_core_v3_http_uri_proto_upbdefinit = {
   deps,
-  layouts,
+  &envoy_config_core_v3_http_uri_proto_upb_file_layout,
   "envoy/config/core/v3/http_uri.proto",
   UPB_STRVIEW_INIT(descriptor, 454)
 };

data/src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.c

@@ -8,6 +8,7 @@
 
 #include "upb/def.h"
 #include "envoy/config/core/v3/protocol.upbdefs.h"
+#include "envoy/config/core/v3/protocol.upb.h"
 
 extern upb_def_init envoy_config_core_v3_extension_proto_upbdefinit;
 extern upb_def_init envoy_type_v3_percent_proto_upbdefinit;
@@ -18,38 +19,6 @@ extern upb_def_init envoy_annotations_deprecation_proto_upbdefinit;
 extern upb_def_init udpa_annotations_status_proto_upbdefinit;
 extern upb_def_init udpa_annotations_versioning_proto_upbdefinit;
 extern upb_def_init validate_validate_proto_upbdefinit;
-extern const upb_msglayout envoy_config_core_v3_TcpProtocolOptions_msginit;
-extern const upb_msglayout envoy_config_core_v3_QuicProtocolOptions_msginit;
-extern const upb_msglayout envoy_config_core_v3_UpstreamHttpProtocolOptions_msginit;
-extern const upb_msglayout envoy_config_core_v3_AlternateProtocolsCacheOptions_msginit;
-extern const upb_msglayout envoy_config_core_v3_HttpProtocolOptions_msginit;
-extern const upb_msglayout envoy_config_core_v3_Http1ProtocolOptions_msginit;
-extern const upb_msglayout envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_msginit;
-extern const upb_msglayout envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords_msginit;
-extern const upb_msglayout envoy_config_core_v3_KeepaliveSettings_msginit;
-extern const upb_msglayout envoy_config_core_v3_Http2ProtocolOptions_msginit;
-extern const upb_msglayout envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_msginit;
-extern const upb_msglayout envoy_config_core_v3_GrpcProtocolOptions_msginit;
-extern const upb_msglayout envoy_config_core_v3_Http3ProtocolOptions_msginit;
-extern const upb_msglayout envoy_config_core_v3_SchemeHeaderTransformation_msginit;
-
-static const upb_msglayout *layouts[14] = {
-  &envoy_config_core_v3_TcpProtocolOptions_msginit,
-  &envoy_config_core_v3_QuicProtocolOptions_msginit,
-  &envoy_config_core_v3_UpstreamHttpProtocolOptions_msginit,
-  &envoy_config_core_v3_AlternateProtocolsCacheOptions_msginit,
-  &envoy_config_core_v3_HttpProtocolOptions_msginit,
-  &envoy_config_core_v3_Http1ProtocolOptions_msginit,
-  &envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_msginit,
-  &envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords_msginit,
-  &envoy_config_core_v3_KeepaliveSettings_msginit,
-  &envoy_config_core_v3_Http2ProtocolOptions_msginit,
-  &envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_msginit,
-  &envoy_config_core_v3_GrpcProtocolOptions_msginit,
-  &envoy_config_core_v3_Http3ProtocolOptions_msginit,
-  &envoy_config_core_v3_SchemeHeaderTransformation_msginit,
-};
-
 static const char descriptor[5660] = {'\n', '#', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'p', 'r', 
 'o', 't', 'o', 'c', 'o', 'l', '.', 'p', 'r', 'o', 't', 'o', '\022', '\024', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 
 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '\032', '$', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 
@@ -294,7 +263,7 @@ static upb_def_init *deps[10] = {
 
 upb_def_init envoy_config_core_v3_protocol_proto_upbdefinit = {
   deps,
-  layouts,
+  &envoy_config_core_v3_protocol_proto_upb_file_layout,
   "envoy/config/core/v3/protocol.proto",
   UPB_STRVIEW_INIT(descriptor, 5660)
 };

data/src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.c

@@ -8,14 +8,9 @@
 
 #include "upb/def.h"
 #include "envoy/config/core/v3/proxy_protocol.upbdefs.h"
+#include "envoy/config/core/v3/proxy_protocol.upb.h"
 
 extern upb_def_init udpa_annotations_status_proto_upbdefinit;
-extern const upb_msglayout envoy_config_core_v3_ProxyProtocolConfig_msginit;
-
-static const upb_msglayout *layouts[1] = {
-  &envoy_config_core_v3_ProxyProtocolConfig_msginit,
-};
-
 static const char descriptor[299] = {'\n', ')', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'p', 'r', 
 'o', 'x', 'y', '_', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', '.', 'p', 'r', 'o', 't', 'o', '\022', '\024', 'e', 'n', 'v', 'o', 'y', 
 '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 
@@ -37,7 +32,7 @@ static upb_def_init *deps[2] = {
 
 upb_def_init envoy_config_core_v3_proxy_protocol_proto_upbdefinit = {
   deps,
-  layouts,
+  &envoy_config_core_v3_proxy_protocol_proto_upb_file_layout,
   "envoy/config/core/v3/proxy_protocol.proto",
   UPB_STRVIEW_INIT(descriptor, 299)
 };

data/src/core/ext/upbdefs-generated/envoy/config/core/v3/resolver.upbdefs.c

@@ -8,18 +8,11 @@
 
 #include "upb/def.h"
 #include "envoy/config/core/v3/resolver.upbdefs.h"
+#include "envoy/config/core/v3/resolver.upb.h"
 
 extern upb_def_init envoy_config_core_v3_address_proto_upbdefinit;
 extern upb_def_init udpa_annotations_status_proto_upbdefinit;
 extern upb_def_init validate_validate_proto_upbdefinit;
-extern const upb_msglayout envoy_config_core_v3_DnsResolverOptions_msginit;
-extern const upb_msglayout envoy_config_core_v3_DnsResolutionConfig_msginit;
-
-static const upb_msglayout *layouts[2] = {
-  &envoy_config_core_v3_DnsResolverOptions_msginit,
-  &envoy_config_core_v3_DnsResolutionConfig_msginit,
-};
-
 static const char descriptor[543] = {'\n', '#', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'r', 'e', 
 's', 'o', 'l', 'v', 'e', 'r', '.', 'p', 'r', 'o', 't', 'o', '\022', '\024', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 
 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '\032', '\"', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 
@@ -53,7 +46,7 @@ static upb_def_init *deps[4] = {
 
 upb_def_init envoy_config_core_v3_resolver_proto_upbdefinit = {
   deps,
-  layouts,
+  &envoy_config_core_v3_resolver_proto_upb_file_layout,
   "envoy/config/core/v3/resolver.proto",
   UPB_STRVIEW_INIT(descriptor, 543)
 };

data/src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.c

@@ -8,16 +8,11 @@
 
 #include "upb/def.h"
 #include "envoy/config/core/v3/socket_option.upbdefs.h"
+#include "envoy/config/core/v3/socket_option.upb.h"
 
 extern upb_def_init udpa_annotations_status_proto_upbdefinit;
 extern upb_def_init udpa_annotations_versioning_proto_upbdefinit;
 extern upb_def_init validate_validate_proto_upbdefinit;
-extern const upb_msglayout envoy_config_core_v3_SocketOption_msginit;
-
-static const upb_msglayout *layouts[1] = {
-  &envoy_config_core_v3_SocketOption_msginit,
-};
-
 static const char descriptor[590] = {'\n', '(', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 's', 'o', 
 'c', 'k', 'e', 't', '_', 'o', 'p', 't', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\022', '\024', 'e', 'n', 'v', 'o', 'y', '.', 
 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 
@@ -53,7 +48,7 @@ static upb_def_init *deps[4] = {
 
 upb_def_init envoy_config_core_v3_socket_option_proto_upbdefinit = {
   deps,
-  layouts,
+  &envoy_config_core_v3_socket_option_proto_upb_file_layout,
   "envoy/config/core/v3/socket_option.proto",
   UPB_STRVIEW_INIT(descriptor, 590)
 };

data/src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.c

@@ -8,6 +8,7 @@
 
 #include "upb/def.h"
 #include "envoy/config/core/v3/substitution_format_string.upbdefs.h"
+#include "envoy/config/core/v3/substitution_format_string.upb.h"
 
 extern upb_def_init envoy_config_core_v3_base_proto_upbdefinit;
 extern upb_def_init envoy_config_core_v3_extension_proto_upbdefinit;
@@ -15,12 +16,6 @@ extern upb_def_init google_protobuf_struct_proto_upbdefinit;
 extern upb_def_init envoy_annotations_deprecation_proto_upbdefinit;
 extern upb_def_init udpa_annotations_status_proto_upbdefinit;
 extern upb_def_init validate_validate_proto_upbdefinit;
-extern const upb_msglayout envoy_config_core_v3_SubstitutionFormatString_msginit;
-
-static const upb_msglayout *layouts[1] = {
-  &envoy_config_core_v3_SubstitutionFormatString_msginit,
-};
-
 static const char descriptor[757] = {'\n', '5', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 's', 'u', 
 'b', 's', 't', 'i', 't', 'u', 't', 'i', 'o', 'n', '_', 'f', 'o', 'r', 'm', 'a', 't', '_', 's', 't', 'r', 'i', 'n', 'g', '.', 
 'p', 'r', 'o', 't', 'o', '\022', '\024', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 
@@ -66,7 +61,7 @@ static upb_def_init *deps[7] = {
 
 upb_def_init envoy_config_core_v3_substitution_format_string_proto_upbdefinit = {
   deps,
-  layouts,
+  &envoy_config_core_v3_substitution_format_string_proto_upb_file_layout,
   "envoy/config/core/v3/substitution_format_string.proto",
   UPB_STRVIEW_INIT(descriptor, 757)
 };

data/src/core/ext/upbdefs-generated/envoy/config/core/v3/udp_socket_config.upbdefs.c

@@ -8,16 +8,11 @@
 
 #include "upb/def.h"
 #include "envoy/config/core/v3/udp_socket_config.upbdefs.h"
+#include "envoy/config/core/v3/udp_socket_config.upb.h"
 
 extern upb_def_init google_protobuf_wrappers_proto_upbdefinit;
 extern upb_def_init udpa_annotations_status_proto_upbdefinit;
 extern upb_def_init validate_validate_proto_upbdefinit;
-extern const upb_msglayout envoy_config_core_v3_UdpSocketConfig_msginit;
-
-static const upb_msglayout *layouts[1] = {
-  &envoy_config_core_v3_UdpSocketConfig_msginit,
-};
-
 static const char descriptor[405] = {'\n', ',', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'u', 'd', 
 'p', '_', 's', 'o', 'c', 'k', 'e', 't', '_', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'p', 'r', 'o', 't', 'o', '\022', '\024', 'e', 'n', 
 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 
@@ -46,7 +41,7 @@ static upb_def_init *deps[4] = {
 
 upb_def_init envoy_config_core_v3_udp_socket_config_proto_upbdefinit = {
   deps,
-  layouts,
+  &envoy_config_core_v3_udp_socket_config_proto_upb_file_layout,
   "envoy/config/core/v3/udp_socket_config.proto",
   UPB_STRVIEW_INIT(descriptor, 405)
 };

data/src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.c

@@ -8,6 +8,7 @@
 
 #include "upb/def.h"
 #include "envoy/config/endpoint/v3/endpoint.upbdefs.h"
+#include "envoy/config/endpoint/v3/endpoint.upb.h"
 
 extern upb_def_init envoy_config_endpoint_v3_endpoint_components_proto_upbdefinit;
 extern upb_def_init envoy_type_v3_percent_proto_upbdefinit;
@@ -16,18 +17,6 @@ extern upb_def_init google_protobuf_wrappers_proto_upbdefinit;
 extern upb_def_init udpa_annotations_status_proto_upbdefinit;
 extern upb_def_init udpa_annotations_versioning_proto_upbdefinit;
 extern upb_def_init validate_validate_proto_upbdefinit;
-extern const upb_msglayout envoy_config_endpoint_v3_ClusterLoadAssignment_msginit;
-extern const upb_msglayout envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_msginit;
-extern const upb_msglayout envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload_msginit;
-extern const upb_msglayout envoy_config_endpoint_v3_ClusterLoadAssignment_NamedEndpointsEntry_msginit;
-
-static const upb_msglayout *layouts[4] = {
-  &envoy_config_endpoint_v3_ClusterLoadAssignment_msginit,
-  &envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_msginit,
-  &envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload_msginit,
-  &envoy_config_endpoint_v3_ClusterLoadAssignment_NamedEndpointsEntry_msginit,
-};
-
 static const char descriptor[1443] = {'\n', '\'', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '/', 'v', 
 '3', '/', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '.', 'p', 'r', 'o', 't', 'o', '\022', '\030', 'e', 'n', 'v', 'o', 'y', '.', 'c', 
 'o', 'n', 'f', 'i', 'g', '.', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '.', 'v', '3', '\032', '2', 'e', 'n', 'v', 'o', 'y', '/', 
@@ -101,7 +90,7 @@ static upb_def_init *deps[8] = {
 
 upb_def_init envoy_config_endpoint_v3_endpoint_proto_upbdefinit = {
   deps,
-  layouts,
+  &envoy_config_endpoint_v3_endpoint_proto_upb_file_layout,
   "envoy/config/endpoint/v3/endpoint.proto",
   UPB_STRVIEW_INIT(descriptor, 1443)
 };

data/src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.c

@@ -8,6 +8,7 @@
 
 #include "upb/def.h"
 #include "envoy/config/endpoint/v3/endpoint_components.upbdefs.h"
+#include "envoy/config/endpoint/v3/endpoint_components.upb.h"
 
 extern upb_def_init envoy_config_core_v3_address_proto_upbdefinit;
 extern upb_def_init envoy_config_core_v3_base_proto_upbdefinit;
@@ -17,22 +18,6 @@ extern upb_def_init google_protobuf_wrappers_proto_upbdefinit;
 extern upb_def_init udpa_annotations_status_proto_upbdefinit;
 extern upb_def_init udpa_annotations_versioning_proto_upbdefinit;
 extern upb_def_init validate_validate_proto_upbdefinit;
-extern const upb_msglayout envoy_config_endpoint_v3_Endpoint_msginit;
-extern const upb_msglayout envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_msginit;
-extern const upb_msglayout envoy_config_endpoint_v3_LbEndpoint_msginit;
-extern const upb_msglayout envoy_config_endpoint_v3_LedsClusterLocalityConfig_msginit;
-extern const upb_msglayout envoy_config_endpoint_v3_LocalityLbEndpoints_msginit;
-extern const upb_msglayout envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList_msginit;
-
-static const upb_msglayout *layouts[6] = {
-  &envoy_config_endpoint_v3_Endpoint_msginit,
-  &envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_msginit,
-  &envoy_config_endpoint_v3_LbEndpoint_msginit,
-  &envoy_config_endpoint_v3_LedsClusterLocalityConfig_msginit,
-  &envoy_config_endpoint_v3_LocalityLbEndpoints_msginit,
-  &envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList_msginit,
-};
-
 static const char descriptor[2119] = {'\n', '2', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '/', 'v', 
 '3', '/', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '_', 'c', 'o', 'm', 'p', 'o', 'n', 'e', 'n', 't', 's', '.', 'p', 'r', 'o', 
 't', 'o', '\022', '\030', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', 
@@ -134,7 +119,7 @@ static upb_def_init *deps[9] = {
 
 upb_def_init envoy_config_endpoint_v3_endpoint_components_proto_upbdefinit = {
   deps,
-  layouts,
+  &envoy_config_endpoint_v3_endpoint_components_proto_upb_file_layout,
   "envoy/config/endpoint/v3/endpoint_components.proto",
   UPB_STRVIEW_INIT(descriptor, 2119)
 };

data/src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.c

@@ -8,6 +8,7 @@
 
 #include "upb/def.h"
 #include "envoy/config/endpoint/v3/load_report.upbdefs.h"
+#include "envoy/config/endpoint/v3/load_report.upb.h"
 
 extern upb_def_init envoy_config_core_v3_address_proto_upbdefinit;
 extern upb_def_init envoy_config_core_v3_base_proto_upbdefinit;
@@ -16,20 +17,6 @@ extern upb_def_init google_protobuf_struct_proto_upbdefinit;
 extern upb_def_init udpa_annotations_status_proto_upbdefinit;
 extern upb_def_init udpa_annotations_versioning_proto_upbdefinit;
 extern upb_def_init validate_validate_proto_upbdefinit;
-extern const upb_msglayout envoy_config_endpoint_v3_UpstreamLocalityStats_msginit;
-extern const upb_msglayout envoy_config_endpoint_v3_UpstreamEndpointStats_msginit;
-extern const upb_msglayout envoy_config_endpoint_v3_EndpointLoadMetricStats_msginit;
-extern const upb_msglayout envoy_config_endpoint_v3_ClusterStats_msginit;
-extern const upb_msglayout envoy_config_endpoint_v3_ClusterStats_DroppedRequests_msginit;
-
-static const upb_msglayout *layouts[5] = {
-  &envoy_config_endpoint_v3_UpstreamLocalityStats_msginit,
-  &envoy_config_endpoint_v3_UpstreamEndpointStats_msginit,
-  &envoy_config_endpoint_v3_EndpointLoadMetricStats_msginit,
-  &envoy_config_endpoint_v3_ClusterStats_msginit,
-  &envoy_config_endpoint_v3_ClusterStats_DroppedRequests_msginit,
-};
-
 static const char descriptor[2351] = {'\n', '*', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '/', 'v', 
 '3', '/', 'l', 'o', 'a', 'd', '_', 'r', 'e', 'p', 'o', 'r', 't', '.', 'p', 'r', 'o', 't', 'o', '\022', '\030', 'e', 'n', 'v', 'o', 
 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '.', 'v', '3', '\032', '\"', 'e', 'n', 'v', 
@@ -140,7 +127,7 @@ static upb_def_init *deps[8] = {
 
 upb_def_init envoy_config_endpoint_v3_load_report_proto_upbdefinit = {
   deps,
-  layouts,
+  &envoy_config_endpoint_v3_load_report_proto_upb_file_layout,
   "envoy/config/endpoint/v3/load_report.proto",
   UPB_STRVIEW_INIT(descriptor, 2351)
 };

data/src/core/ext/upbdefs-generated/envoy/config/listener/v3/api_listener.upbdefs.c

@@ -8,16 +8,11 @@
 
 #include "upb/def.h"
 #include "envoy/config/listener/v3/api_listener.upbdefs.h"
+#include "envoy/config/listener/v3/api_listener.upb.h"
 
 extern upb_def_init google_protobuf_any_proto_upbdefinit;
 extern upb_def_init udpa_annotations_status_proto_upbdefinit;
 extern upb_def_init udpa_annotations_versioning_proto_upbdefinit;
-extern const upb_msglayout envoy_config_listener_v3_ApiListener_msginit;
-
-static const upb_msglayout *layouts[1] = {
-  &envoy_config_listener_v3_ApiListener_msginit,
-};
-
 static const char descriptor[359] = {'\n', '+', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '/', 'v', 
 '3', '/', 'a', 'p', 'i', '_', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'p', 'r', 'o', 't', 'o', '\022', '\030', 'e', 'n', 'v', 
 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'v', '3', '\032', '\031', 'g', 'o', 
@@ -44,7 +39,7 @@ static upb_def_init *deps[4] = {
 
 upb_def_init envoy_config_listener_v3_api_listener_proto_upbdefinit = {
   deps,
-  layouts,
+  &envoy_config_listener_v3_api_listener_proto_upb_file_layout,
   "envoy/config/listener/v3/api_listener.proto",
   UPB_STRVIEW_INIT(descriptor, 359)
 };

data/src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.c

@@ -8,6 +8,7 @@
 
 #include "upb/def.h"
 #include "envoy/config/listener/v3/listener.upbdefs.h"
+#include "envoy/config/listener/v3/listener.upb.h"
 
 extern upb_def_init envoy_config_accesslog_v3_accesslog_proto_upbdefinit;
 extern upb_def_init envoy_config_core_v3_address_proto_upbdefinit;
@@ -24,22 +25,6 @@ extern upb_def_init udpa_annotations_security_proto_upbdefinit;
 extern upb_def_init udpa_annotations_status_proto_upbdefinit;
 extern upb_def_init udpa_annotations_versioning_proto_upbdefinit;
 extern upb_def_init validate_validate_proto_upbdefinit;
-extern const upb_msglayout envoy_config_listener_v3_ListenerCollection_msginit;
-extern const upb_msglayout envoy_config_listener_v3_Listener_msginit;
-extern const upb_msglayout envoy_config_listener_v3_Listener_DeprecatedV1_msginit;
-extern const upb_msglayout envoy_config_listener_v3_Listener_ConnectionBalanceConfig_msginit;
-extern const upb_msglayout envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalance_msginit;
-extern const upb_msglayout envoy_config_listener_v3_Listener_InternalListenerConfig_msginit;
-
-static const upb_msglayout *layouts[6] = {
-  &envoy_config_listener_v3_ListenerCollection_msginit,
-  &envoy_config_listener_v3_Listener_msginit,
-  &envoy_config_listener_v3_Listener_DeprecatedV1_msginit,
-  &envoy_config_listener_v3_Listener_ConnectionBalanceConfig_msginit,
-  &envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalance_msginit,
-  &envoy_config_listener_v3_Listener_InternalListenerConfig_msginit,
-};
-
 static const char descriptor[3383] = {'\n', '\'', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '/', 'v', 
 '3', '/', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'p', 'r', 'o', 't', 'o', '\022', '\030', 'e', 'n', 'v', 'o', 'y', '.', 'c', 
 'o', 'n', 'f', 'i', 'g', '.', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'v', '3', '\032', ')', 'e', 'n', 'v', 'o', 'y', '/', 
@@ -199,7 +184,7 @@ static upb_def_init *deps[16] = {
 
 upb_def_init envoy_config_listener_v3_listener_proto_upbdefinit = {
   deps,
-  layouts,
+  &envoy_config_listener_v3_listener_proto_upb_file_layout,
   "envoy/config/listener/v3/listener.proto",
   UPB_STRVIEW_INIT(descriptor, 3383)
 };

data/src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.c

@@ -8,6 +8,7 @@
 
 #include "upb/def.h"
 #include "envoy/config/listener/v3/listener_components.upbdefs.h"
+#include "envoy/config/listener/v3/listener_components.upb.h"
 
 extern upb_def_init envoy_config_core_v3_address_proto_upbdefinit;
 extern upb_def_init envoy_config_core_v3_base_proto_upbdefinit;
@@ -20,24 +21,6 @@ extern upb_def_init envoy_annotations_deprecation_proto_upbdefinit;
 extern upb_def_init udpa_annotations_status_proto_upbdefinit;
 extern upb_def_init udpa_annotations_versioning_proto_upbdefinit;
 extern upb_def_init validate_validate_proto_upbdefinit;
-extern const upb_msglayout envoy_config_listener_v3_Filter_msginit;
-extern const upb_msglayout envoy_config_listener_v3_FilterChainMatch_msginit;
-extern const upb_msglayout envoy_config_listener_v3_FilterChain_msginit;
-extern const upb_msglayout envoy_config_listener_v3_FilterChain_OnDemandConfiguration_msginit;
-extern const upb_msglayout envoy_config_listener_v3_ListenerFilterChainMatchPredicate_msginit;
-extern const upb_msglayout envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet_msginit;
-extern const upb_msglayout envoy_config_listener_v3_ListenerFilter_msginit;
-
-static const upb_msglayout *layouts[7] = {
-  &envoy_config_listener_v3_Filter_msginit,
-  &envoy_config_listener_v3_FilterChainMatch_msginit,
-  &envoy_config_listener_v3_FilterChain_msginit,
-  &envoy_config_listener_v3_FilterChain_OnDemandConfiguration_msginit,
-  &envoy_config_listener_v3_ListenerFilterChainMatchPredicate_msginit,
-  &envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet_msginit,
-  &envoy_config_listener_v3_ListenerFilter_msginit,
-};
-
 static const char descriptor[3426] = {'\n', '2', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '/', 'v', 
 '3', '/', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '_', 'c', 'o', 'm', 'p', 'o', 'n', 'e', 'n', 't', 's', '.', 'p', 'r', 'o', 
 't', 'o', '\022', '\030', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', 
@@ -195,7 +178,7 @@ static upb_def_init *deps[12] = {
 
 upb_def_init envoy_config_listener_v3_listener_components_proto_upbdefinit = {
   deps,
-  layouts,
+  &envoy_config_listener_v3_listener_components_proto_upb_file_layout,
   "envoy/config/listener/v3/listener_components.proto",
   UPB_STRVIEW_INIT(descriptor, 3426)
 };

data/src/core/ext/upbdefs-generated/envoy/config/listener/v3/quic_config.upbdefs.c

@@ -8,6 +8,7 @@
 
 #include "upb/def.h"
 #include "envoy/config/listener/v3/quic_config.upbdefs.h"
+#include "envoy/config/listener/v3/quic_config.upb.h"
 
 extern upb_def_init envoy_config_core_v3_base_proto_upbdefinit;
 extern upb_def_init envoy_config_core_v3_extension_proto_upbdefinit;
@@ -17,12 +18,6 @@ extern upb_def_init google_protobuf_wrappers_proto_upbdefinit;
 extern upb_def_init udpa_annotations_status_proto_upbdefinit;
 extern upb_def_init udpa_annotations_versioning_proto_upbdefinit;
 extern upb_def_init validate_validate_proto_upbdefinit;
-extern const upb_msglayout envoy_config_listener_v3_QuicProtocolOptions_msginit;
-
-static const upb_msglayout *layouts[1] = {
-  &envoy_config_listener_v3_QuicProtocolOptions_msginit,
-};
-
 static const char descriptor[1107] = {'\n', '*', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '/', 'v', 
 '3', '/', 'q', 'u', 'i', 'c', '_', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'p', 'r', 'o', 't', 'o', '\022', '\030', 'e', 'n', 'v', 'o', 
 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'v', '3', '\032', '\037', 'e', 'n', 'v', 
@@ -84,7 +79,7 @@ static upb_def_init *deps[9] = {
 
 upb_def_init envoy_config_listener_v3_quic_config_proto_upbdefinit = {
   deps,
-  layouts,
+  &envoy_config_listener_v3_quic_config_proto_upb_file_layout,
   "envoy/config/listener/v3/quic_config.proto",
   UPB_STRVIEW_INIT(descriptor, 1107)
 };