diff --git a/BUILD b/BUILD index 7e51a43fb63..8e7fd2cda7c 100644 --- a/BUILD +++ b/BUILD @@ -1322,11 +1322,13 @@ grpc_cc_library( ], external_deps = [ "upb_lib", + "upb_textformat_lib", "re2", ], language = "c++", deps = [ "envoy_ads_upb", + "envoy_ads_upbdefs", "grpc_base", "grpc_client_channel", "grpc_google_mesh_ca_certificate_provider_factory", @@ -2565,6 +2567,7 @@ grpc_cc_library( ], external_deps = [ "upb_lib", + "upb_lib_descriptor", ], language = "c++", deps = [ @@ -2578,6 +2581,88 @@ grpc_cc_library( ], ) +grpc_cc_library( + name = "envoy_ads_upbdefs", + srcs = [ + "src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/config/listener/v3/api_listener.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/service/cluster/v3/cds.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/service/discovery/v3/ads.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/service/endpoint/v3/eds.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/service/listener/v3/lds.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/service/route/v3/rds.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/service/route/v3/srds.upbdefs.c", + ], + hdrs = [ + "src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/config/listener/v3/api_listener.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/service/cluster/v3/cds.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/service/discovery/v3/ads.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/service/endpoint/v3/eds.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/service/listener/v3/lds.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/service/route/v3/rds.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/service/route/v3/srds.upbdefs.h", + ], + external_deps = [ + "upb_lib", + "upb_lib_descriptor", + "upb_textformat_lib", + ], + language = "c++", + deps = [ + ":envoy_ads_upb", + ":envoy_annotations_upbdefs", + ":envoy_core_upbdefs", + ":envoy_type_upbdefs", + ":google_api_upbdefs", + ":proto_gen_validate_upbdefs", + ":udpa_annotations_upbdefs", + ":udpa_core_upbdefs", + ], +) + grpc_cc_library( name = "envoy_annotations_upb", srcs = [ @@ -2590,6 +2675,7 @@ grpc_cc_library( ], external_deps = [ "upb_lib", + "upb_lib_descriptor", ], language = "c++", deps = [ @@ -2597,6 +2683,28 @@ grpc_cc_library( ], ) +grpc_cc_library( + name = "envoy_annotations_upbdefs", + srcs = [ + "src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.c", + ], + hdrs = [ + "src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.h", + ], + external_deps = [ + "upb_lib", + "upb_lib_descriptor", + "upb_textformat_lib", + ], + language = "c++", + deps = [ + ":envoy_annotations_upb", + ":google_api_upbdefs", + ], +) + grpc_cc_library( name = "envoy_core_upb", srcs = [ @@ -2631,6 +2739,7 @@ grpc_cc_library( ], external_deps = [ "upb_lib", + "upb_lib_descriptor", ], language = "c++", deps = [ @@ -2643,6 +2752,52 @@ grpc_cc_library( ], ) +grpc_cc_library( + name = "envoy_core_upbdefs", + srcs = [ + "src/core/ext/upbdefs-generated/envoy/config/core/v3/address.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/config/core/v3/backoff.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.c", + ], + hdrs = [ + "src/core/ext/upbdefs-generated/envoy/config/core/v3/address.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/config/core/v3/backoff.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.h", + ], + external_deps = [ + "upb_lib", + "upb_lib_descriptor", + "upb_textformat_lib", + ], + language = "c++", + deps = [ + ":envoy_core_upb", + ":envoy_type_upbdefs", + ":google_api_upbdefs", + ":proto_gen_validate_upbdefs", + ], +) + grpc_cc_library( name = "envoy_type_upb", srcs = [ @@ -2675,6 +2830,7 @@ grpc_cc_library( ], external_deps = [ "upb_lib", + "upb_lib_descriptor", ], language = "c++", deps = [ @@ -2685,6 +2841,49 @@ grpc_cc_library( ], ) +grpc_cc_library( + name = "envoy_type_upbdefs", + srcs = [ + "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.c", + ], + hdrs = [ + "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.h", + ], + external_deps = [ + "upb_lib", + "upb_lib_descriptor", + "upb_textformat_lib", + ], + language = "c++", + deps = [ + ":envoy_type_upb", + ":google_api_upbdefs", + ":proto_gen_validate_upbdefs", + ], +) + grpc_cc_library( name = "proto_gen_validate_upb", srcs = [ @@ -2695,6 +2894,7 @@ grpc_cc_library( ], external_deps = [ "upb_lib", + "upb_lib_descriptor", ], language = "c++", deps = [ @@ -2702,6 +2902,26 @@ grpc_cc_library( ], ) +grpc_cc_library( + name = "proto_gen_validate_upbdefs", + srcs = [ + "src/core/ext/upbdefs-generated/validate/validate.upbdefs.c", + ], + hdrs = [ + "src/core/ext/upbdefs-generated/validate/validate.upbdefs.h", + ], + external_deps = [ + "upb_lib", + "upb_lib_descriptor", + "upb_textformat_lib", + ], + language = "c++", + deps = [ + ":google_api_upbdefs", + ":proto_gen_validate_upb", + ], +) + # Once upb code-gen issue is resolved, replace udpa_orca_upb with this. # grpc_upb_proto_library( # name = "udpa_orca_upb", @@ -2718,6 +2938,7 @@ grpc_cc_library( ], external_deps = [ "upb_lib", + "upb_lib_descriptor", ], language = "c++", deps = [ @@ -2743,6 +2964,7 @@ grpc_cc_library( ], external_deps = [ "upb_lib", + "upb_lib_descriptor", ], language = "c++", deps = [ @@ -2751,6 +2973,34 @@ grpc_cc_library( ], ) +grpc_cc_library( + name = "udpa_annotations_upbdefs", + srcs = [ + "src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.c", + "src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.c", + "src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.c", + "src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.c", + "src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c", + ], + hdrs = [ + "src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.h", + "src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.h", + "src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.h", + "src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.h", + "src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.h", + ], + external_deps = [ + "upb_lib", + "upb_lib_descriptor", + "upb_textformat_lib", + ], + language = "c++", + deps = [ + ":google_api_upbdefs", + ":udpa_annotations_upb", + ], +) + grpc_cc_library( name = "udpa_core_upb", srcs = [ @@ -2771,6 +3021,7 @@ grpc_cc_library( ], external_deps = [ "upb_lib", + "upb_lib_descriptor", ], language = "c++", deps = [ @@ -2780,6 +3031,38 @@ grpc_cc_library( ], ) +grpc_cc_library( + name = "udpa_core_upbdefs", + srcs = [ + "src/core/ext/upbdefs-generated/udpa/core/v1/authority.upbdefs.c", + "src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.c", + "src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.c", + "src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.c", + "src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.c", + "src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.c", + ], + hdrs = [ + "src/core/ext/upbdefs-generated/udpa/core/v1/authority.upbdefs.h", + "src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.h", + "src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.h", + "src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.h", + "src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.h", + "src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.h", + ], + external_deps = [ + "upb_lib", + "upb_lib_descriptor", + "upb_textformat_lib", + ], + language = "c++", + deps = [ + ":google_api_upbdefs", + ":proto_gen_validate_upbdefs", + ":udpa_annotations_upbdefs", + ":udpa_core_upb", + ], +) + # Once upb code-gen issue is resolved, replace grpc_health_upb with this. # grpc_upb_proto_library( # name = "grpc_health_upb", @@ -2796,6 +3079,7 @@ grpc_cc_library( ], external_deps = [ "upb_lib", + "upb_lib_descriptor", ], language = "c++", ) @@ -2809,7 +3093,6 @@ grpc_cc_library( "src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.c", "src/core/ext/upb-generated/google/api/http.upb.c", "src/core/ext/upb-generated/google/protobuf/any.upb.c", - "src/core/ext/upb-generated/google/protobuf/descriptor.upb.c", "src/core/ext/upb-generated/google/protobuf/duration.upb.c", "src/core/ext/upb-generated/google/protobuf/empty.upb.c", "src/core/ext/upb-generated/google/protobuf/struct.upb.c", @@ -2823,7 +3106,6 @@ grpc_cc_library( "src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.h", "src/core/ext/upb-generated/google/api/http.upb.h", "src/core/ext/upb-generated/google/protobuf/any.upb.h", - "src/core/ext/upb-generated/google/protobuf/descriptor.upb.h", "src/core/ext/upb-generated/google/protobuf/duration.upb.h", "src/core/ext/upb-generated/google/protobuf/empty.upb.h", "src/core/ext/upb-generated/google/protobuf/struct.upb.h", @@ -2833,10 +3115,48 @@ grpc_cc_library( ], external_deps = [ "upb_lib", + "upb_lib_descriptor", ], language = "c++", ) +grpc_cc_library( + name = "google_api_upbdefs", + srcs = [ + "src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.c", + "src/core/ext/upbdefs-generated/google/api/http.upbdefs.c", + "src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.c", + "src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c", + "src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.c", + "src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.c", + "src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.c", + "src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.c", + "src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.c", + "src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.c", + ], + hdrs = [ + "src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.h", + "src/core/ext/upbdefs-generated/google/api/http.upbdefs.h", + "src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.h", + "src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.h", + "src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.h", + "src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.h", + "src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.h", + "src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.h", + "src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.h", + "src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.h", + ], + external_deps = [ + "upb_lib", + "upb_lib_descriptor", + "upb_textformat_lib", + ], + language = "c++", + deps = [ + ":google_api_upb", + ], +) + # Once upb code-gen issue is resolved, replace grpc_lb_upb with this. # grpc_upb_proto_library( # name = "grpc_lb_upb", @@ -2853,6 +3173,7 @@ grpc_cc_library( ], external_deps = [ "upb_lib", + "upb_lib_descriptor", ], language = "c++", deps = [ @@ -2900,6 +3221,7 @@ grpc_cc_library( ], external_deps = [ "upb_lib", + "upb_lib_descriptor", ], language = "c++", ) diff --git a/BUILD.gn b/BUILD.gn index 6aab2f0ac88..bfac342e695 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -512,8 +512,6 @@ config("grpc_config") { "src/core/ext/upb-generated/google/api/http.upb.h", "src/core/ext/upb-generated/google/protobuf/any.upb.c", "src/core/ext/upb-generated/google/protobuf/any.upb.h", - "src/core/ext/upb-generated/google/protobuf/descriptor.upb.c", - "src/core/ext/upb-generated/google/protobuf/descriptor.upb.h", "src/core/ext/upb-generated/google/protobuf/duration.upb.c", "src/core/ext/upb-generated/google/protobuf/duration.upb.h", "src/core/ext/upb-generated/google/protobuf/empty.upb.c", @@ -562,6 +560,162 @@ config("grpc_config") { "src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h", "src/core/ext/upb-generated/validate/validate.upb.c", "src/core/ext/upb-generated/validate/validate.upb.h", + "src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/config/core/v3/address.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/config/core/v3/address.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/config/core/v3/backoff.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/config/core/v3/backoff.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/config/listener/v3/api_listener.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/config/listener/v3/api_listener.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/service/cluster/v3/cds.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/service/cluster/v3/cds.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/service/discovery/v3/ads.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/service/discovery/v3/ads.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/service/endpoint/v3/eds.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/service/endpoint/v3/eds.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/service/listener/v3/lds.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/service/listener/v3/lds.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/service/route/v3/rds.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/service/route/v3/rds.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/service/route/v3/srds.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/service/route/v3/srds.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.h", + "src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.c", + "src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.h", + "src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.c", + "src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.h", + "src/core/ext/upbdefs-generated/google/api/http.upbdefs.c", + "src/core/ext/upbdefs-generated/google/api/http.upbdefs.h", + "src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.c", + "src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.h", + "src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c", + "src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.h", + "src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.c", + "src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.h", + "src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.c", + "src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.h", + "src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.c", + "src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.h", + "src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.c", + "src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.h", + "src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.c", + "src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.h", + "src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.c", + "src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.h", + "src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.c", + "src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.h", + "src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.c", + "src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.h", + "src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.c", + "src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.h", + "src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.c", + "src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.h", + "src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c", + "src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.h", + "src/core/ext/upbdefs-generated/udpa/core/v1/authority.upbdefs.c", + "src/core/ext/upbdefs-generated/udpa/core/v1/authority.upbdefs.h", + "src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.c", + "src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.h", + "src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.c", + "src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.h", + "src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.c", + "src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.h", + "src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.c", + "src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.h", + "src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.c", + "src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.h", + "src/core/ext/upbdefs-generated/validate/validate.upbdefs.c", + "src/core/ext/upbdefs-generated/validate/validate.upbdefs.h", "src/core/ext/xds/certificate_provider_factory.h", "src/core/ext/xds/certificate_provider_registry.cc", "src/core/ext/xds/certificate_provider_registry.h", diff --git a/CMakeLists.txt b/CMakeLists.txt index caa1f818190..3923b38b6f0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1585,7 +1585,6 @@ add_library(grpc src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.c src/core/ext/upb-generated/google/api/http.upb.c src/core/ext/upb-generated/google/protobuf/any.upb.c - src/core/ext/upb-generated/google/protobuf/descriptor.upb.c src/core/ext/upb-generated/google/protobuf/duration.upb.c src/core/ext/upb-generated/google/protobuf/empty.upb.c src/core/ext/upb-generated/google/protobuf/struct.upb.c @@ -1610,6 +1609,84 @@ add_library(grpc src/core/ext/upb-generated/udpa/core/v1/resource_name.upb.c src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c src/core/ext/upb-generated/validate/validate.upb.c + src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.c + src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.c + src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.c + src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.c + src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.c + src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.c + src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.c + src/core/ext/upbdefs-generated/envoy/config/core/v3/address.upbdefs.c + src/core/ext/upbdefs-generated/envoy/config/core/v3/backoff.upbdefs.c + src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.c + src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.c + src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.c + src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.c + src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.c + src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.c + src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.c + src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.c + src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.c + src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.c + src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.c + src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.c + src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.c + src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.c + src/core/ext/upbdefs-generated/envoy/config/listener/v3/api_listener.upbdefs.c + src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.c + src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.c + src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.c + src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.c + src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.c + src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.c + src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.c + src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c + src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c + src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c + src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.c + src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c + src/core/ext/upbdefs-generated/envoy/service/cluster/v3/cds.upbdefs.c + src/core/ext/upbdefs-generated/envoy/service/discovery/v3/ads.upbdefs.c + src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.c + src/core/ext/upbdefs-generated/envoy/service/endpoint/v3/eds.upbdefs.c + src/core/ext/upbdefs-generated/envoy/service/listener/v3/lds.upbdefs.c + src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.c + src/core/ext/upbdefs-generated/envoy/service/route/v3/rds.upbdefs.c + src/core/ext/upbdefs-generated/envoy/service/route/v3/srds.upbdefs.c + src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.c + src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.c + src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.c + src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.c + src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.c + src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.c + src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.c + src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.c + src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.c + src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.c + src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.c + src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.c + src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.c + src/core/ext/upbdefs-generated/google/api/http.upbdefs.c + src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.c + src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c + src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.c + src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.c + src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.c + src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.c + src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.c + src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.c + src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.c + src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.c + src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.c + src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.c + src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c + src/core/ext/upbdefs-generated/udpa/core/v1/authority.upbdefs.c + src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.c + src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.c + src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.c + src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.c + src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.c + src/core/ext/upbdefs-generated/validate/validate.upbdefs.c src/core/ext/xds/certificate_provider_registry.cc src/core/ext/xds/google_mesh_ca_certificate_provider_factory.cc src/core/ext/xds/xds_api.cc @@ -2234,7 +2311,6 @@ add_library(grpc_unsecure src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.c src/core/ext/upb-generated/google/api/http.upb.c src/core/ext/upb-generated/google/protobuf/any.upb.c - src/core/ext/upb-generated/google/protobuf/descriptor.upb.c src/core/ext/upb-generated/google/protobuf/duration.upb.c src/core/ext/upb-generated/google/protobuf/empty.upb.c src/core/ext/upb-generated/google/protobuf/struct.upb.c @@ -3669,6 +3745,23 @@ add_library(upb third_party/upb/upb/port.c third_party/upb/upb/table.c third_party/upb/upb/upb.c + third_party/upb/upb/def.c + third_party/upb/upb/reflection.c + third_party/upb/upb/text_encode.c + src/core/ext/upb-generated/google/protobuf/any.upb.c + src/core/ext/upb-generated/google/protobuf/descriptor.upb.c + src/core/ext/upb-generated/google/protobuf/duration.upb.c + src/core/ext/upb-generated/google/protobuf/empty.upb.c + src/core/ext/upb-generated/google/protobuf/struct.upb.c + src/core/ext/upb-generated/google/protobuf/timestamp.upb.c + src/core/ext/upb-generated/google/protobuf/wrappers.upb.c + src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.c + src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c + src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.c + src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.c + src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.c + src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.c + src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.c ) set_target_properties(upb PROPERTIES diff --git a/Makefile b/Makefile index ae10e17629b..656d1778065 100644 --- a/Makefile +++ b/Makefile @@ -1986,7 +1986,6 @@ LIBGRPC_SRC = \ src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.c \ src/core/ext/upb-generated/google/api/http.upb.c \ src/core/ext/upb-generated/google/protobuf/any.upb.c \ - src/core/ext/upb-generated/google/protobuf/descriptor.upb.c \ src/core/ext/upb-generated/google/protobuf/duration.upb.c \ src/core/ext/upb-generated/google/protobuf/empty.upb.c \ src/core/ext/upb-generated/google/protobuf/struct.upb.c \ @@ -2011,6 +2010,84 @@ LIBGRPC_SRC = \ src/core/ext/upb-generated/udpa/core/v1/resource_name.upb.c \ src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c \ src/core/ext/upb-generated/validate/validate.upb.c \ + src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/config/core/v3/address.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/config/core/v3/backoff.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/config/listener/v3/api_listener.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/service/cluster/v3/cds.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/service/discovery/v3/ads.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/service/endpoint/v3/eds.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/service/listener/v3/lds.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/service/route/v3/rds.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/service/route/v3/srds.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.c \ + src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.c \ + src/core/ext/upbdefs-generated/google/api/http.upbdefs.c \ + src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.c \ + src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c \ + src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.c \ + src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.c \ + src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.c \ + src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.c \ + src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.c \ + src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.c \ + src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.c \ + src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.c \ + src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.c \ + src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.c \ + src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c \ + src/core/ext/upbdefs-generated/udpa/core/v1/authority.upbdefs.c \ + src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.c \ + src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.c \ + src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.c \ + src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.c \ + src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.c \ + src/core/ext/upbdefs-generated/validate/validate.upbdefs.c \ src/core/ext/xds/certificate_provider_registry.cc \ src/core/ext/xds/google_mesh_ca_certificate_provider_factory.cc \ src/core/ext/xds/xds_api.cc \ @@ -2494,7 +2571,6 @@ LIBGRPC_UNSECURE_SRC = \ src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.c \ src/core/ext/upb-generated/google/api/http.upb.c \ src/core/ext/upb-generated/google/protobuf/any.upb.c \ - src/core/ext/upb-generated/google/protobuf/descriptor.upb.c \ src/core/ext/upb-generated/google/protobuf/duration.upb.c \ src/core/ext/upb-generated/google/protobuf/empty.upb.c \ src/core/ext/upb-generated/google/protobuf/struct.upb.c \ @@ -3996,6 +4072,23 @@ LIBUPB_SRC = \ third_party/upb/upb/port.c \ third_party/upb/upb/table.c \ third_party/upb/upb/upb.c \ + third_party/upb/upb/def.c \ + third_party/upb/upb/reflection.c \ + third_party/upb/upb/text_encode.c \ + src/core/ext/upb-generated/google/protobuf/any.upb.c \ + src/core/ext/upb-generated/google/protobuf/descriptor.upb.c \ + src/core/ext/upb-generated/google/protobuf/duration.upb.c \ + src/core/ext/upb-generated/google/protobuf/empty.upb.c \ + src/core/ext/upb-generated/google/protobuf/struct.upb.c \ + src/core/ext/upb-generated/google/protobuf/timestamp.upb.c \ + src/core/ext/upb-generated/google/protobuf/wrappers.upb.c \ + src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.c \ + src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c \ + src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.c \ + src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.c \ + src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.c \ + src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.c \ + src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.c \ PUBLIC_HEADERS_C += \ @@ -4582,6 +4675,77 @@ src/core/ext/upb-generated/udpa/core/v1/context_params.upb.c: $(OPENSSL_DEP) src/core/ext/upb-generated/udpa/core/v1/resource.upb.c: $(OPENSSL_DEP) src/core/ext/upb-generated/udpa/core/v1/resource_locator.upb.c: $(OPENSSL_DEP) src/core/ext/upb-generated/udpa/core/v1/resource_name.upb.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/envoy/config/core/v3/address.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/envoy/config/core/v3/backoff.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/envoy/config/listener/v3/api_listener.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/envoy/service/cluster/v3/cds.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/envoy/service/discovery/v3/ads.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/envoy/service/endpoint/v3/eds.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/envoy/service/listener/v3/lds.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/envoy/service/route/v3/rds.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/envoy/service/route/v3/srds.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/google/api/http.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/udpa/core/v1/authority.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/validate/validate.upbdefs.c: $(OPENSSL_DEP) src/core/ext/xds/certificate_provider_registry.cc: $(OPENSSL_DEP) src/core/ext/xds/google_mesh_ca_certificate_provider_factory.cc: $(OPENSSL_DEP) src/core/ext/xds/xds_api.cc: $(OPENSSL_DEP) diff --git a/bazel/grpc_deps.bzl b/bazel/grpc_deps.bzl index 75d1b4dbbe3..37b2cb0585c 100644 --- a/bazel/grpc_deps.bzl +++ b/bazel/grpc_deps.bzl @@ -11,6 +11,16 @@ def grpc_deps(): actual = "@upb//:upb", ) + native.bind( + name = "upb_lib_descriptor", + actual = "@upb//:descriptor_upb_proto", + ) + + native.bind( + name = "upb_textformat_lib", + actual = "@upb//:textformat", + ) + native.bind( name = "absl", actual = "@com_google_absl//absl", diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml index c2990a5c534..a4b10ffb5ac 100644 --- a/build_autogenerated.yaml +++ b/build_autogenerated.yaml @@ -520,7 +520,6 @@ libs: - src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.h - src/core/ext/upb-generated/google/api/http.upb.h - src/core/ext/upb-generated/google/protobuf/any.upb.h - - src/core/ext/upb-generated/google/protobuf/descriptor.upb.h - src/core/ext/upb-generated/google/protobuf/duration.upb.h - src/core/ext/upb-generated/google/protobuf/empty.upb.h - src/core/ext/upb-generated/google/protobuf/struct.upb.h @@ -545,6 +544,84 @@ libs: - src/core/ext/upb-generated/udpa/core/v1/resource_name.upb.h - src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h - src/core/ext/upb-generated/validate/validate.upb.h + - src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.h + - src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.h + - src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.h + - src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.h + - src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.h + - src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.h + - src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.h + - src/core/ext/upbdefs-generated/envoy/config/core/v3/address.upbdefs.h + - src/core/ext/upbdefs-generated/envoy/config/core/v3/backoff.upbdefs.h + - src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.h + - src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.h + - src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.h + - src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.h + - src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.h + - src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.h + - src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.h + - src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.h + - src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.h + - src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.h + - src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.h + - src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.h + - src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.h + - src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.h + - src/core/ext/upbdefs-generated/envoy/config/listener/v3/api_listener.upbdefs.h + - src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.h + - src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.h + - src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.h + - src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.h + - src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.h + - src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.h + - src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.h + - src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h + - src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.h + - src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.h + - src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.h + - src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.h + - src/core/ext/upbdefs-generated/envoy/service/cluster/v3/cds.upbdefs.h + - src/core/ext/upbdefs-generated/envoy/service/discovery/v3/ads.upbdefs.h + - src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.h + - src/core/ext/upbdefs-generated/envoy/service/endpoint/v3/eds.upbdefs.h + - src/core/ext/upbdefs-generated/envoy/service/listener/v3/lds.upbdefs.h + - src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.h + - src/core/ext/upbdefs-generated/envoy/service/route/v3/rds.upbdefs.h + - src/core/ext/upbdefs-generated/envoy/service/route/v3/srds.upbdefs.h + - src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.h + - src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.h + - src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.h + - src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.h + - src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.h + - src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.h + - src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.h + - src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.h + - src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.h + - src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.h + - src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.h + - src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.h + - src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.h + - src/core/ext/upbdefs-generated/google/api/http.upbdefs.h + - src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.h + - src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.h + - src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.h + - src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.h + - src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.h + - src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.h + - src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.h + - src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.h + - src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.h + - src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.h + - src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.h + - src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.h + - src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.h + - src/core/ext/upbdefs-generated/udpa/core/v1/authority.upbdefs.h + - src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.h + - src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.h + - src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.h + - src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.h + - src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.h + - src/core/ext/upbdefs-generated/validate/validate.upbdefs.h - src/core/ext/xds/certificate_provider_factory.h - src/core/ext/xds/certificate_provider_registry.h - src/core/ext/xds/certificate_provider_store.h @@ -939,7 +1016,6 @@ libs: - src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.c - src/core/ext/upb-generated/google/api/http.upb.c - src/core/ext/upb-generated/google/protobuf/any.upb.c - - src/core/ext/upb-generated/google/protobuf/descriptor.upb.c - src/core/ext/upb-generated/google/protobuf/duration.upb.c - src/core/ext/upb-generated/google/protobuf/empty.upb.c - src/core/ext/upb-generated/google/protobuf/struct.upb.c @@ -964,6 +1040,84 @@ libs: - src/core/ext/upb-generated/udpa/core/v1/resource_name.upb.c - src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c - src/core/ext/upb-generated/validate/validate.upb.c + - src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.c + - src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.c + - src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.c + - src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.c + - src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.c + - src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.c + - src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.c + - src/core/ext/upbdefs-generated/envoy/config/core/v3/address.upbdefs.c + - src/core/ext/upbdefs-generated/envoy/config/core/v3/backoff.upbdefs.c + - src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.c + - src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.c + - src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.c + - src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.c + - src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.c + - src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.c + - src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.c + - src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.c + - src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.c + - src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.c + - src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.c + - src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.c + - src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.c + - src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.c + - src/core/ext/upbdefs-generated/envoy/config/listener/v3/api_listener.upbdefs.c + - src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.c + - src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.c + - src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.c + - src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.c + - src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.c + - src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.c + - src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.c + - src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c + - src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c + - src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c + - src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.c + - src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c + - src/core/ext/upbdefs-generated/envoy/service/cluster/v3/cds.upbdefs.c + - src/core/ext/upbdefs-generated/envoy/service/discovery/v3/ads.upbdefs.c + - src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.c + - src/core/ext/upbdefs-generated/envoy/service/endpoint/v3/eds.upbdefs.c + - src/core/ext/upbdefs-generated/envoy/service/listener/v3/lds.upbdefs.c + - src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.c + - src/core/ext/upbdefs-generated/envoy/service/route/v3/rds.upbdefs.c + - src/core/ext/upbdefs-generated/envoy/service/route/v3/srds.upbdefs.c + - src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.c + - src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.c + - src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.c + - src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.c + - src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.c + - src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.c + - src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.c + - src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.c + - src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.c + - src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.c + - src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.c + - src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.c + - src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.c + - src/core/ext/upbdefs-generated/google/api/http.upbdefs.c + - src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.c + - src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c + - src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.c + - src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.c + - src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.c + - src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.c + - src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.c + - src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.c + - src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.c + - src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.c + - src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.c + - src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.c + - src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c + - src/core/ext/upbdefs-generated/udpa/core/v1/authority.upbdefs.c + - src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.c + - src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.c + - src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.c + - src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.c + - src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.c + - src/core/ext/upbdefs-generated/validate/validate.upbdefs.c - src/core/ext/xds/certificate_provider_registry.cc - src/core/ext/xds/google_mesh_ca_certificate_provider_factory.cc - src/core/ext/xds/xds_api.cc @@ -1455,7 +1609,6 @@ libs: - src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.h - src/core/ext/upb-generated/google/api/http.upb.h - src/core/ext/upb-generated/google/protobuf/any.upb.h - - src/core/ext/upb-generated/google/protobuf/descriptor.upb.h - src/core/ext/upb-generated/google/protobuf/duration.upb.h - src/core/ext/upb-generated/google/protobuf/empty.upb.h - src/core/ext/upb-generated/google/protobuf/struct.upb.h @@ -1718,7 +1871,6 @@ libs: - src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.c - src/core/ext/upb-generated/google/api/http.upb.c - src/core/ext/upb-generated/google/protobuf/any.upb.c - - src/core/ext/upb-generated/google/protobuf/descriptor.upb.c - src/core/ext/upb-generated/google/protobuf/duration.upb.c - src/core/ext/upb-generated/google/protobuf/empty.upb.c - src/core/ext/upb-generated/google/protobuf/struct.upb.c diff --git a/config.m4 b/config.m4 index f41f94ee407..bb66552079c 100644 --- a/config.m4 +++ b/config.m4 @@ -232,6 +232,84 @@ if test "$PHP_GRPC" != "no"; then src/core/ext/upb-generated/udpa/core/v1/resource_name.upb.c \ src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c \ src/core/ext/upb-generated/validate/validate.upb.c \ + src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/config/core/v3/address.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/config/core/v3/backoff.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/config/listener/v3/api_listener.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/service/cluster/v3/cds.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/service/discovery/v3/ads.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/service/endpoint/v3/eds.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/service/listener/v3/lds.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/service/route/v3/rds.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/service/route/v3/srds.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.c \ + src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.c \ + src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.c \ + src/core/ext/upbdefs-generated/google/api/http.upbdefs.c \ + src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.c \ + src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c \ + src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.c \ + src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.c \ + src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.c \ + src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.c \ + src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.c \ + src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.c \ + src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.c \ + src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.c \ + src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.c \ + src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.c \ + src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c \ + src/core/ext/upbdefs-generated/udpa/core/v1/authority.upbdefs.c \ + src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.c \ + src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.c \ + src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.c \ + src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.c \ + src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.c \ + src/core/ext/upbdefs-generated/validate/validate.upbdefs.c \ src/core/ext/xds/certificate_provider_registry.cc \ src/core/ext/xds/google_mesh_ca_certificate_provider_factory.cc \ src/core/ext/xds/xds_api.cc \ @@ -898,10 +976,13 @@ if test "$PHP_GRPC" != "no"; then third_party/re2/util/rune.cc \ third_party/re2/util/strutil.cc \ third_party/upb/upb/decode.c \ + third_party/upb/upb/def.c \ third_party/upb/upb/encode.c \ third_party/upb/upb/msg.c \ third_party/upb/upb/port.c \ + third_party/upb/upb/reflection.c \ third_party/upb/upb/table.c \ + third_party/upb/upb/text_encode.c \ third_party/upb/upb/upb.c \ , $ext_shared, , -fvisibility=hidden \ -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN \ @@ -974,6 +1055,32 @@ if test "$PHP_GRPC" != "no"; then PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/udpa/core/v1) PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/udpa/data/orca/v1) PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/validate) + PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/annotations) + PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/config/accesslog/v3) + PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/config/cluster/v3) + PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/config/core/v3) + PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/config/endpoint/v3) + PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/config/listener/v3) + PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/config/route/v3) + PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/config/trace/v3) + PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3) + PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3) + PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/service/cluster/v3) + PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/service/discovery/v3) + PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/service/endpoint/v3) + PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/service/listener/v3) + PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/service/load_stats/v3) + PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/service/route/v3) + PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/type/matcher/v3) + PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/type/metadata/v3) + PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/type/tracing/v3) + PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/type/v3) + PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/google/api) + PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/google/protobuf) + PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/google/rpc) + PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/udpa/annotations) + PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/udpa/core/v1) + PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/validate) PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/xds) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/avl) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/backoff) diff --git a/config.w32 b/config.w32 index 7e7d025c831..036b52c403b 100644 --- a/config.w32 +++ b/config.w32 @@ -199,6 +199,84 @@ if (PHP_GRPC != "no") { "src\\core\\ext\\upb-generated\\udpa\\core\\v1\\resource_name.upb.c " + "src\\core\\ext\\upb-generated\\udpa\\data\\orca\\v1\\orca_load_report.upb.c " + "src\\core\\ext\\upb-generated\\validate\\validate.upb.c " + + "src\\core\\ext\\upbdefs-generated\\envoy\\annotations\\deprecation.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\envoy\\annotations\\resource.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\envoy\\config\\accesslog\\v3\\accesslog.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\envoy\\config\\cluster\\v3\\circuit_breaker.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\envoy\\config\\cluster\\v3\\cluster.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\envoy\\config\\cluster\\v3\\filter.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\envoy\\config\\cluster\\v3\\outlier_detection.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\envoy\\config\\core\\v3\\address.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\envoy\\config\\core\\v3\\backoff.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\envoy\\config\\core\\v3\\base.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\envoy\\config\\core\\v3\\config_source.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\envoy\\config\\core\\v3\\event_service_config.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\envoy\\config\\core\\v3\\extension.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\envoy\\config\\core\\v3\\grpc_service.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\envoy\\config\\core\\v3\\health_check.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\envoy\\config\\core\\v3\\http_uri.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\envoy\\config\\core\\v3\\protocol.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\envoy\\config\\core\\v3\\proxy_protocol.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\envoy\\config\\core\\v3\\socket_option.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\envoy\\config\\core\\v3\\substitution_format_string.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\envoy\\config\\endpoint\\v3\\endpoint.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\envoy\\config\\endpoint\\v3\\endpoint_components.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\envoy\\config\\endpoint\\v3\\load_report.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\envoy\\config\\listener\\v3\\api_listener.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\envoy\\config\\listener\\v3\\listener.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\envoy\\config\\listener\\v3\\listener_components.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\envoy\\config\\listener\\v3\\udp_listener_config.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\envoy\\config\\route\\v3\\route.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\envoy\\config\\route\\v3\\route_components.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\envoy\\config\\route\\v3\\scoped_route.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\envoy\\config\\trace\\v3\\http_tracer.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\envoy\\extensions\\filters\\network\\http_connection_manager\\v3\\http_connection_manager.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\envoy\\extensions\\transport_sockets\\tls\\v3\\cert.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\envoy\\extensions\\transport_sockets\\tls\\v3\\common.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\envoy\\extensions\\transport_sockets\\tls\\v3\\secret.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\envoy\\extensions\\transport_sockets\\tls\\v3\\tls.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\envoy\\service\\cluster\\v3\\cds.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\envoy\\service\\discovery\\v3\\ads.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\envoy\\service\\discovery\\v3\\discovery.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\envoy\\service\\endpoint\\v3\\eds.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\envoy\\service\\listener\\v3\\lds.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\envoy\\service\\load_stats\\v3\\lrs.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\envoy\\service\\route\\v3\\rds.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\envoy\\service\\route\\v3\\srds.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\envoy\\type\\matcher\\v3\\metadata.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\envoy\\type\\matcher\\v3\\number.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\envoy\\type\\matcher\\v3\\path.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\envoy\\type\\matcher\\v3\\regex.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\envoy\\type\\matcher\\v3\\string.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\envoy\\type\\matcher\\v3\\value.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\envoy\\type\\metadata\\v3\\metadata.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\envoy\\type\\tracing\\v3\\custom_tag.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\envoy\\type\\v3\\http.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\envoy\\type\\v3\\percent.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\envoy\\type\\v3\\range.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\envoy\\type\\v3\\semantic_version.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\google\\api\\annotations.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\google\\api\\http.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\google\\protobuf\\any.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\google\\protobuf\\descriptor.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\google\\protobuf\\duration.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\google\\protobuf\\empty.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\google\\protobuf\\struct.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\google\\protobuf\\timestamp.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\google\\protobuf\\wrappers.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\google\\rpc\\status.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\udpa\\annotations\\migrate.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\udpa\\annotations\\security.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\udpa\\annotations\\sensitive.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\udpa\\annotations\\status.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\udpa\\annotations\\versioning.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\udpa\\core\\v1\\authority.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\udpa\\core\\v1\\collection_entry.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\udpa\\core\\v1\\context_params.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\udpa\\core\\v1\\resource.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\udpa\\core\\v1\\resource_locator.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\udpa\\core\\v1\\resource_name.upbdefs.c " + + "src\\core\\ext\\upbdefs-generated\\validate\\validate.upbdefs.c " + "src\\core\\ext\\xds\\certificate_provider_registry.cc " + "src\\core\\ext\\xds\\google_mesh_ca_certificate_provider_factory.cc " + "src\\core\\ext\\xds\\xds_api.cc " + @@ -865,10 +943,13 @@ if (PHP_GRPC != "no") { "third_party\\re2\\util\\rune.cc " + "third_party\\re2\\util\\strutil.cc " + "third_party\\upb\\upb\\decode.c " + + "third_party\\upb\\upb\\def.c " + "third_party\\upb\\upb\\encode.c " + "third_party\\upb\\upb\\msg.c " + "third_party\\upb\\upb\\port.c " + + "third_party\\upb\\upb\\reflection.c " + "third_party\\upb\\upb\\table.c " + + "third_party\\upb\\upb\\text_encode.c " + "third_party\\upb\\upb\\upb.c " + "third_party\\zlib\\adler32.c " + "third_party\\zlib\\compress.c " + @@ -1015,6 +1096,62 @@ if (PHP_GRPC != "no") { FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\udpa\\data\\orca"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\udpa\\data\\orca\\v1"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\validate"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\annotations"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\config"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\config\\accesslog"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\config\\accesslog\\v3"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\config\\cluster"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\config\\cluster\\v3"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\config\\core"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\config\\core\\v3"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\config\\endpoint"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\config\\endpoint\\v3"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\config\\listener"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\config\\listener\\v3"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\config\\route"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\config\\route\\v3"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\config\\trace"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\config\\trace\\v3"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\extensions"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\extensions\\filters"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\extensions\\filters\\network"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\extensions\\filters\\network\\http_connection_manager"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\extensions\\filters\\network\\http_connection_manager\\v3"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\extensions\\transport_sockets"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\extensions\\transport_sockets\\tls"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\extensions\\transport_sockets\\tls\\v3"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\service"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\service\\cluster"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\service\\cluster\\v3"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\service\\discovery"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\service\\discovery\\v3"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\service\\endpoint"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\service\\endpoint\\v3"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\service\\listener"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\service\\listener\\v3"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\service\\load_stats"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\service\\load_stats\\v3"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\service\\route"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\service\\route\\v3"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\type"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\type\\matcher"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\type\\matcher\\v3"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\type\\metadata"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\type\\metadata\\v3"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\type\\tracing"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\type\\tracing\\v3"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\type\\v3"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\google"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\google\\api"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\google\\protobuf"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\google\\rpc"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\udpa"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\udpa\\annotations"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\udpa\\core"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\udpa\\core\\v1"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\validate"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\xds"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\avl"); diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec index 6b5a764dda9..529290a66e4 100644 --- a/gRPC-C++.podspec +++ b/gRPC-C++.podspec @@ -363,6 +363,84 @@ Pod::Spec.new do |s| 'src/core/ext/upb-generated/udpa/core/v1/resource_name.upb.h', 'src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h', 'src/core/ext/upb-generated/validate/validate.upb.h', + 'src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/address.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/backoff.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/listener/v3/api_listener.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/service/cluster/v3/cds.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/service/discovery/v3/ads.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/service/endpoint/v3/eds.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/service/listener/v3/lds.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/service/route/v3/rds.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/service/route/v3/srds.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.h', + 'src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.h', + 'src/core/ext/upbdefs-generated/google/api/http.upbdefs.h', + 'src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.h', + 'src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.h', + 'src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.h', + 'src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.h', + 'src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.h', + 'src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.h', + 'src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.h', + 'src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.h', + 'src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.h', + 'src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.h', + 'src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.h', + 'src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.h', + 'src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.h', + 'src/core/ext/upbdefs-generated/udpa/core/v1/authority.upbdefs.h', + 'src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.h', + 'src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.h', + 'src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.h', + 'src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.h', + 'src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.h', + 'src/core/ext/upbdefs-generated/validate/validate.upbdefs.h', 'src/core/ext/xds/certificate_provider_factory.h', 'src/core/ext/xds/certificate_provider_registry.h', 'src/core/ext/xds/certificate_provider_store.h', @@ -702,11 +780,15 @@ Pod::Spec.new do |s| 'third_party/re2/util/utf.h', 'third_party/re2/util/util.h', 'third_party/upb/upb/decode.h', + 'third_party/upb/upb/def.h', + 'third_party/upb/upb/def.hpp', 'third_party/upb/upb/encode.h', 'third_party/upb/upb/msg.h', 'third_party/upb/upb/port_def.inc', 'third_party/upb/upb/port_undef.inc', + 'third_party/upb/upb/reflection.h', 'third_party/upb/upb/table.int.h', + 'third_party/upb/upb/text_encode.h', 'third_party/upb/upb/upb.h', 'third_party/upb/upb/upb.hpp' @@ -878,6 +960,84 @@ Pod::Spec.new do |s| 'src/core/ext/upb-generated/udpa/core/v1/resource_name.upb.h', 'src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h', 'src/core/ext/upb-generated/validate/validate.upb.h', + 'src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/address.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/backoff.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/listener/v3/api_listener.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/service/cluster/v3/cds.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/service/discovery/v3/ads.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/service/endpoint/v3/eds.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/service/listener/v3/lds.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/service/route/v3/rds.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/service/route/v3/srds.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.h', + 'src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.h', + 'src/core/ext/upbdefs-generated/google/api/http.upbdefs.h', + 'src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.h', + 'src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.h', + 'src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.h', + 'src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.h', + 'src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.h', + 'src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.h', + 'src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.h', + 'src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.h', + 'src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.h', + 'src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.h', + 'src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.h', + 'src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.h', + 'src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.h', + 'src/core/ext/upbdefs-generated/udpa/core/v1/authority.upbdefs.h', + 'src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.h', + 'src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.h', + 'src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.h', + 'src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.h', + 'src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.h', + 'src/core/ext/upbdefs-generated/validate/validate.upbdefs.h', 'src/core/ext/xds/certificate_provider_factory.h', 'src/core/ext/xds/certificate_provider_registry.h', 'src/core/ext/xds/certificate_provider_store.h', @@ -1170,11 +1330,15 @@ Pod::Spec.new do |s| 'third_party/re2/util/utf.h', 'third_party/re2/util/util.h', 'third_party/upb/upb/decode.h', + 'third_party/upb/upb/def.h', + 'third_party/upb/upb/def.hpp', 'third_party/upb/upb/encode.h', 'third_party/upb/upb/msg.h', 'third_party/upb/upb/port_def.inc', 'third_party/upb/upb/port_undef.inc', + 'third_party/upb/upb/reflection.h', 'third_party/upb/upb/table.int.h', + 'third_party/upb/upb/text_encode.h', 'third_party/upb/upb/upb.h', 'third_party/upb/upb/upb.hpp' end diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index 4dcc3bab81b..a929c9a0e17 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -547,6 +547,162 @@ Pod::Spec.new do |s| 'src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h', 'src/core/ext/upb-generated/validate/validate.upb.c', 'src/core/ext/upb-generated/validate/validate.upb.h', + 'src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/address.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/address.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/backoff.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/backoff.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/listener/v3/api_listener.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/listener/v3/api_listener.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/service/cluster/v3/cds.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/service/cluster/v3/cds.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/service/discovery/v3/ads.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/service/discovery/v3/ads.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/service/endpoint/v3/eds.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/service/endpoint/v3/eds.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/service/listener/v3/lds.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/service/listener/v3/lds.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/service/route/v3/rds.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/service/route/v3/rds.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/service/route/v3/srds.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/service/route/v3/srds.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.h', + 'src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.c', + 'src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.h', + 'src/core/ext/upbdefs-generated/google/api/http.upbdefs.c', + 'src/core/ext/upbdefs-generated/google/api/http.upbdefs.h', + 'src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.c', + 'src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.h', + 'src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c', + 'src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.h', + 'src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.c', + 'src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.h', + 'src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.c', + 'src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.h', + 'src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.c', + 'src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.h', + 'src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.c', + 'src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.h', + 'src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.c', + 'src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.h', + 'src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.c', + 'src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.h', + 'src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.c', + 'src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.h', + 'src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.c', + 'src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.h', + 'src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.c', + 'src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.h', + 'src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.c', + 'src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.h', + 'src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c', + 'src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.h', + 'src/core/ext/upbdefs-generated/udpa/core/v1/authority.upbdefs.c', + 'src/core/ext/upbdefs-generated/udpa/core/v1/authority.upbdefs.h', + 'src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.c', + 'src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.h', + 'src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.c', + 'src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.h', + 'src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.c', + 'src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.h', + 'src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.c', + 'src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.h', + 'src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.c', + 'src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.h', + 'src/core/ext/upbdefs-generated/validate/validate.upbdefs.c', + 'src/core/ext/upbdefs-generated/validate/validate.upbdefs.h', 'src/core/ext/xds/certificate_provider_factory.h', 'src/core/ext/xds/certificate_provider_registry.cc', 'src/core/ext/xds/certificate_provider_registry.h', @@ -1141,6 +1297,9 @@ Pod::Spec.new do |s| 'third_party/re2/util/util.h', 'third_party/upb/upb/decode.c', 'third_party/upb/upb/decode.h', + 'third_party/upb/upb/def.c', + 'third_party/upb/upb/def.h', + 'third_party/upb/upb/def.hpp', 'third_party/upb/upb/encode.c', 'third_party/upb/upb/encode.h', 'third_party/upb/upb/msg.c', @@ -1148,8 +1307,12 @@ Pod::Spec.new do |s| 'third_party/upb/upb/port.c', 'third_party/upb/upb/port_def.inc', 'third_party/upb/upb/port_undef.inc', + 'third_party/upb/upb/reflection.c', + 'third_party/upb/upb/reflection.h', 'third_party/upb/upb/table.c', 'third_party/upb/upb/table.int.h', + 'third_party/upb/upb/text_encode.c', + 'third_party/upb/upb/text_encode.h', 'third_party/upb/upb/upb.c', 'third_party/upb/upb/upb.h', 'third_party/upb/upb/upb.hpp' @@ -1321,6 +1484,84 @@ Pod::Spec.new do |s| 'src/core/ext/upb-generated/udpa/core/v1/resource_name.upb.h', 'src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h', 'src/core/ext/upb-generated/validate/validate.upb.h', + 'src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/address.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/backoff.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/listener/v3/api_listener.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/service/cluster/v3/cds.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/service/discovery/v3/ads.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/service/endpoint/v3/eds.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/service/listener/v3/lds.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/service/route/v3/rds.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/service/route/v3/srds.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.h', + 'src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.h', + 'src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.h', + 'src/core/ext/upbdefs-generated/google/api/http.upbdefs.h', + 'src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.h', + 'src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.h', + 'src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.h', + 'src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.h', + 'src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.h', + 'src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.h', + 'src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.h', + 'src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.h', + 'src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.h', + 'src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.h', + 'src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.h', + 'src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.h', + 'src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.h', + 'src/core/ext/upbdefs-generated/udpa/core/v1/authority.upbdefs.h', + 'src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.h', + 'src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.h', + 'src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.h', + 'src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.h', + 'src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.h', + 'src/core/ext/upbdefs-generated/validate/validate.upbdefs.h', 'src/core/ext/xds/certificate_provider_factory.h', 'src/core/ext/xds/certificate_provider_registry.h', 'src/core/ext/xds/certificate_provider_store.h', @@ -1602,11 +1843,15 @@ Pod::Spec.new do |s| 'third_party/re2/util/utf.h', 'third_party/re2/util/util.h', 'third_party/upb/upb/decode.h', + 'third_party/upb/upb/def.h', + 'third_party/upb/upb/def.hpp', 'third_party/upb/upb/encode.h', 'third_party/upb/upb/msg.h', 'third_party/upb/upb/port_def.inc', 'third_party/upb/upb/port_undef.inc', + 'third_party/upb/upb/reflection.h', 'third_party/upb/upb/table.int.h', + 'third_party/upb/upb/text_encode.h', 'third_party/upb/upb/upb.h', 'third_party/upb/upb/upb.hpp' end diff --git a/grpc.gemspec b/grpc.gemspec index 84128329d49..c60418ce2c9 100644 --- a/grpc.gemspec +++ b/grpc.gemspec @@ -465,6 +465,162 @@ Gem::Specification.new do |s| s.files += %w( src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h ) s.files += %w( src/core/ext/upb-generated/validate/validate.upb.c ) s.files += %w( src/core/ext/upb-generated/validate/validate.upb.h ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/address.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/address.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/backoff.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/backoff.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/config/listener/v3/api_listener.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/config/listener/v3/api_listener.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/service/cluster/v3/cds.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/service/cluster/v3/cds.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/service/discovery/v3/ads.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/service/discovery/v3/ads.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/service/endpoint/v3/eds.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/service/endpoint/v3/eds.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/service/listener/v3/lds.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/service/listener/v3/lds.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/service/route/v3/rds.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/service/route/v3/rds.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/service/route/v3/srds.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/service/route/v3/srds.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/google/api/http.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/google/api/http.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/udpa/core/v1/authority.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/udpa/core/v1/authority.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.h ) + s.files += %w( src/core/ext/upbdefs-generated/validate/validate.upbdefs.c ) + s.files += %w( src/core/ext/upbdefs-generated/validate/validate.upbdefs.h ) s.files += %w( src/core/ext/xds/certificate_provider_factory.h ) s.files += %w( src/core/ext/xds/certificate_provider_registry.cc ) s.files += %w( src/core/ext/xds/certificate_provider_registry.h ) @@ -1838,6 +1994,9 @@ Gem::Specification.new do |s| s.files += %w( third_party/re2/util/util.h ) s.files += %w( third_party/upb/upb/decode.c ) s.files += %w( third_party/upb/upb/decode.h ) + s.files += %w( third_party/upb/upb/def.c ) + s.files += %w( third_party/upb/upb/def.h ) + s.files += %w( third_party/upb/upb/def.hpp ) s.files += %w( third_party/upb/upb/encode.c ) s.files += %w( third_party/upb/upb/encode.h ) s.files += %w( third_party/upb/upb/msg.c ) @@ -1845,8 +2004,12 @@ Gem::Specification.new do |s| s.files += %w( third_party/upb/upb/port.c ) s.files += %w( third_party/upb/upb/port_def.inc ) s.files += %w( third_party/upb/upb/port_undef.inc ) + s.files += %w( third_party/upb/upb/reflection.c ) + s.files += %w( third_party/upb/upb/reflection.h ) s.files += %w( third_party/upb/upb/table.c ) s.files += %w( third_party/upb/upb/table.int.h ) + s.files += %w( third_party/upb/upb/text_encode.c ) + s.files += %w( third_party/upb/upb/text_encode.h ) s.files += %w( third_party/upb/upb/upb.c ) s.files += %w( third_party/upb/upb/upb.h ) s.files += %w( third_party/upb/upb/upb.hpp ) diff --git a/grpc.gyp b/grpc.gyp index 2c66c4637c7..853e377a2e8 100644 --- a/grpc.gyp +++ b/grpc.gyp @@ -612,7 +612,6 @@ 'src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.c', 'src/core/ext/upb-generated/google/api/http.upb.c', 'src/core/ext/upb-generated/google/protobuf/any.upb.c', - 'src/core/ext/upb-generated/google/protobuf/descriptor.upb.c', 'src/core/ext/upb-generated/google/protobuf/duration.upb.c', 'src/core/ext/upb-generated/google/protobuf/empty.upb.c', 'src/core/ext/upb-generated/google/protobuf/struct.upb.c', @@ -637,6 +636,84 @@ 'src/core/ext/upb-generated/udpa/core/v1/resource_name.upb.c', 'src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c', 'src/core/ext/upb-generated/validate/validate.upb.c', + 'src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/address.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/backoff.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/listener/v3/api_listener.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/service/cluster/v3/cds.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/service/discovery/v3/ads.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/service/endpoint/v3/eds.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/service/listener/v3/lds.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/service/route/v3/rds.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/service/route/v3/srds.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.c', + 'src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.c', + 'src/core/ext/upbdefs-generated/google/api/http.upbdefs.c', + 'src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.c', + 'src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c', + 'src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.c', + 'src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.c', + 'src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.c', + 'src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.c', + 'src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.c', + 'src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.c', + 'src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.c', + 'src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.c', + 'src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.c', + 'src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.c', + 'src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c', + 'src/core/ext/upbdefs-generated/udpa/core/v1/authority.upbdefs.c', + 'src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.c', + 'src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.c', + 'src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.c', + 'src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.c', + 'src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.c', + 'src/core/ext/upbdefs-generated/validate/validate.upbdefs.c', 'src/core/ext/xds/certificate_provider_registry.cc', 'src/core/ext/xds/google_mesh_ca_certificate_provider_factory.cc', 'src/core/ext/xds/xds_api.cc', @@ -1091,7 +1168,6 @@ 'src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.c', 'src/core/ext/upb-generated/google/api/http.upb.c', 'src/core/ext/upb-generated/google/protobuf/any.upb.c', - 'src/core/ext/upb-generated/google/protobuf/descriptor.upb.c', 'src/core/ext/upb-generated/google/protobuf/duration.upb.c', 'src/core/ext/upb-generated/google/protobuf/empty.upb.c', 'src/core/ext/upb-generated/google/protobuf/struct.upb.c', @@ -1881,6 +1957,23 @@ 'third_party/upb/upb/port.c', 'third_party/upb/upb/table.c', 'third_party/upb/upb/upb.c', + 'third_party/upb/upb/def.c', + 'third_party/upb/upb/reflection.c', + 'third_party/upb/upb/text_encode.c', + 'src/core/ext/upb-generated/google/protobuf/any.upb.c', + 'src/core/ext/upb-generated/google/protobuf/descriptor.upb.c', + 'src/core/ext/upb-generated/google/protobuf/duration.upb.c', + 'src/core/ext/upb-generated/google/protobuf/empty.upb.c', + 'src/core/ext/upb-generated/google/protobuf/struct.upb.c', + 'src/core/ext/upb-generated/google/protobuf/timestamp.upb.c', + 'src/core/ext/upb-generated/google/protobuf/wrappers.upb.c', + 'src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.c', + 'src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c', + 'src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.c', + 'src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.c', + 'src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.c', + 'src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.c', + 'src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.c', ], }, { diff --git a/package.xml b/package.xml index 4d6af4e91f8..0469ee5d7c4 100644 --- a/package.xml +++ b/package.xml @@ -445,6 +445,162 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1763,6 +1919,9 @@ + + + @@ -1770,8 +1929,12 @@ + + + + diff --git a/src/core/ext/xds/xds_api.cc b/src/core/ext/xds/xds_api.cc index 6233391cd0f..49a14051609 100644 --- a/src/core/ext/xds/xds_api.cc +++ b/src/core/ext/xds/xds_api.cc @@ -44,26 +44,34 @@ #include "envoy/config/cluster/v3/circuit_breaker.upb.h" #include "envoy/config/cluster/v3/cluster.upb.h" +#include "envoy/config/cluster/v3/cluster.upbdefs.h" #include "envoy/config/core/v3/address.upb.h" #include "envoy/config/core/v3/base.upb.h" #include "envoy/config/core/v3/config_source.upb.h" #include "envoy/config/core/v3/health_check.upb.h" #include "envoy/config/endpoint/v3/endpoint.upb.h" +#include "envoy/config/endpoint/v3/endpoint.upbdefs.h" #include "envoy/config/endpoint/v3/endpoint_components.upb.h" #include "envoy/config/endpoint/v3/load_report.upb.h" #include "envoy/config/listener/v3/api_listener.upb.h" #include "envoy/config/listener/v3/listener.upb.h" #include "envoy/config/route/v3/route.upb.h" +#include "envoy/config/route/v3/route.upbdefs.h" #include "envoy/config/route/v3/route_components.upb.h" #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h" #include "envoy/extensions/transport_sockets/tls/v3/common.upb.h" #include "envoy/extensions/transport_sockets/tls/v3/tls.upb.h" #include "envoy/service/cluster/v3/cds.upb.h" +#include "envoy/service/cluster/v3/cds.upbdefs.h" #include "envoy/service/discovery/v3/discovery.upb.h" +#include "envoy/service/discovery/v3/discovery.upbdefs.h" #include "envoy/service/endpoint/v3/eds.upb.h" +#include "envoy/service/endpoint/v3/eds.upbdefs.h" #include "envoy/service/listener/v3/lds.upb.h" #include "envoy/service/load_stats/v3/lrs.upb.h" +#include "envoy/service/load_stats/v3/lrs.upbdefs.h" #include "envoy/service/route/v3/rds.upb.h" +#include "envoy/service/route/v3/rds.upbdefs.h" #include "envoy/type/matcher/v3/regex.upb.h" #include "envoy/type/matcher/v3/string.upb.h" #include "envoy/type/v3/percent.upb.h" @@ -73,6 +81,7 @@ #include "google/protobuf/struct.upb.h" #include "google/protobuf/wrappers.upb.h" #include "google/rpc/status.upb.h" +#include "upb/text_encode.h" #include "upb/upb.h" namespace grpc_core { @@ -303,9 +312,11 @@ enum MatchType { }; // Returns true if match succeeds. -bool DomainMatch(MatchType match_type, std::string domain_pattern, - std::string expected_host_name) { +bool DomainMatch(MatchType match_type, const std::string& domain_pattern_in, + const std::string& expected_host_name_in) { // Normalize the args to lower-case. Domain matching is case-insensitive. + std::string domain_pattern = domain_pattern_in; + std::string expected_host_name = expected_host_name_in; std::transform(domain_pattern.begin(), domain_pattern.end(), domain_pattern.begin(), [](unsigned char c) { return std::tolower(c); }); @@ -698,172 +709,17 @@ inline std::string UpbStringToStdString(const upb_strview& str) { return std::string(str.data, str.size); } -inline void AddStringField(const char* name, const upb_strview& value, - std::vector* fields, - bool add_if_empty = false) { - if (value.size > 0 || add_if_empty) { - fields->emplace_back( - absl::StrCat(name, ": \"", UpbStringToAbsl(value), "\"")); - } -} - -inline void AddUInt32ValueField(const char* name, - const google_protobuf_UInt32Value* value, - std::vector* fields) { - if (value != nullptr) { - fields->emplace_back(absl::StrCat( - name, " { value: ", google_protobuf_UInt32Value_value(value), " }")); - } -} - -inline void AddLocalityField(int indent_level, - const envoy_config_core_v3_Locality* locality, - std::vector* fields) { - std::string indent = - absl::StrJoin(std::vector(indent_level, " "), ""); - // region - std::string field = absl::StrCat(indent, "region"); - AddStringField(field.c_str(), envoy_config_core_v3_Locality_region(locality), - fields); - // zone - field = absl::StrCat(indent, "zone"); - AddStringField(field.c_str(), envoy_config_core_v3_Locality_zone(locality), - fields); - // sub_zone - field = absl::StrCat(indent, "sub_zone"); - AddStringField(field.c_str(), - envoy_config_core_v3_Locality_sub_zone(locality), fields); -} - -void AddNodeLogFields(const envoy_config_core_v3_Node* node, - const std::string& build_version, - std::vector* fields) { - fields->emplace_back("node {"); - // id - AddStringField(" id", envoy_config_core_v3_Node_id(node), fields); - // metadata - const google_protobuf_Struct* metadata = - envoy_config_core_v3_Node_metadata(node); - if (metadata != nullptr) { - fields->emplace_back(" metadata {"); - size_t entry_idx = UPB_MAP_BEGIN; - while (true) { - const google_protobuf_Struct_FieldsEntry* entry = - google_protobuf_Struct_fields_next(metadata, &entry_idx); - if (entry == nullptr) break; - fields->emplace_back(" field {"); - // key - AddStringField(" key", google_protobuf_Struct_FieldsEntry_key(entry), - fields); - // value - const google_protobuf_Value* value = - google_protobuf_Struct_FieldsEntry_value(entry); - if (value != nullptr) { - std::string value_str; - if (google_protobuf_Value_has_string_value(value)) { - value_str = absl::StrCat( - "string_value: \"", - UpbStringToAbsl(google_protobuf_Value_string_value(value)), "\""); - } else if (google_protobuf_Value_has_null_value(value)) { - value_str = "null_value: NULL_VALUE"; - } else if (google_protobuf_Value_has_number_value(value)) { - value_str = absl::StrCat("double_value: ", - google_protobuf_Value_number_value(value)); - } else if (google_protobuf_Value_has_bool_value(value)) { - value_str = absl::StrCat("bool_value: ", - google_protobuf_Value_bool_value(value)); - } else if (google_protobuf_Value_has_struct_value(value)) { - value_str = "struct_value: "; - } else if (google_protobuf_Value_has_list_value(value)) { - value_str = "list_value: "; - } else { - value_str = ""; - } - fields->emplace_back(absl::StrCat(" value { ", value_str, " }")); - } - fields->emplace_back(" }"); - } - fields->emplace_back(" }"); - } - // locality - const envoy_config_core_v3_Locality* locality = - envoy_config_core_v3_Node_locality(node); - if (locality != nullptr) { - fields->emplace_back(" locality {"); - AddLocalityField(2, locality, fields); - fields->emplace_back(" }"); - } - // build_version (doesn't exist in v3 proto; this is a horrible hack) - if (!build_version.empty()) { - fields->emplace_back( - absl::StrCat(" build_version: \"", build_version, "\"")); - } - // user_agent_name - AddStringField(" user_agent_name", - envoy_config_core_v3_Node_user_agent_name(node), fields); - // user_agent_version - AddStringField(" user_agent_version", - envoy_config_core_v3_Node_user_agent_version(node), fields); - // client_features - size_t num_client_features; - const upb_strview* client_features = - envoy_config_core_v3_Node_client_features(node, &num_client_features); - for (size_t i = 0; i < num_client_features; ++i) { - AddStringField(" client_features", client_features[i], fields); - } - fields->emplace_back("}"); -} - void MaybeLogDiscoveryRequest( - XdsClient* client, TraceFlag* tracer, - const envoy_service_discovery_v3_DiscoveryRequest* request, - const std::string& build_version) { + XdsClient* client, TraceFlag* tracer, upb_symtab* symtab, + const envoy_service_discovery_v3_DiscoveryRequest* request) { if (GRPC_TRACE_FLAG_ENABLED(*tracer) && gpr_should_log(GPR_LOG_SEVERITY_DEBUG)) { - // TODO(roth): When we can upgrade upb, use upb textformat code to dump - // the raw proto instead of doing this manually. - std::vector fields; - // version_info - AddStringField( - "version_info", - envoy_service_discovery_v3_DiscoveryRequest_version_info(request), - &fields); - // node - const envoy_config_core_v3_Node* node = - envoy_service_discovery_v3_DiscoveryRequest_node(request); - if (node != nullptr) AddNodeLogFields(node, build_version, &fields); - // resource_names - size_t num_resource_names; - const upb_strview* resource_names = - envoy_service_discovery_v3_DiscoveryRequest_resource_names( - request, &num_resource_names); - for (size_t i = 0; i < num_resource_names; ++i) { - AddStringField("resource_names", resource_names[i], &fields); - } - // type_url - AddStringField( - "type_url", - envoy_service_discovery_v3_DiscoveryRequest_type_url(request), &fields); - // response_nonce - AddStringField( - "response_nonce", - envoy_service_discovery_v3_DiscoveryRequest_response_nonce(request), - &fields); - // error_detail - const struct google_rpc_Status* error_detail = - envoy_service_discovery_v3_DiscoveryRequest_error_detail(request); - if (error_detail != nullptr) { - fields.emplace_back("error_detail {"); - // code - int32_t code = google_rpc_Status_code(error_detail); - if (code != 0) fields.emplace_back(absl::StrCat(" code: ", code)); - // message - AddStringField(" message", google_rpc_Status_message(error_detail), - &fields); - fields.emplace_back("}"); - } + const upb_msgdef* msg_type = + envoy_service_discovery_v3_DiscoveryRequest_getmsgdef(symtab); + char buf[10240]; + upb_text_encode(request, msg_type, nullptr, 0, buf, sizeof(buf)); gpr_log(GPR_DEBUG, "[xds_client %p] constructed ADS request: %s", client, - absl::StrJoin(fields, "\n").c_str()); + buf); } } @@ -948,383 +804,61 @@ grpc_slice XdsApi::CreateAdsRequest( envoy_service_discovery_v3_DiscoveryRequest_add_resource_names( request, StdStringToUpbString(resource_name), arena.ptr()); } - MaybeLogDiscoveryRequest(client_, tracer_, request, build_version_); + MaybeLogDiscoveryRequest(client_, tracer_, symtab_.ptr(), request); return SerializeDiscoveryRequest(arena.ptr(), request); } namespace { void MaybeLogDiscoveryResponse( - XdsClient* client, TraceFlag* tracer, + XdsClient* client, TraceFlag* tracer, upb_symtab* symtab, const envoy_service_discovery_v3_DiscoveryResponse* response) { if (GRPC_TRACE_FLAG_ENABLED(*tracer) && gpr_should_log(GPR_LOG_SEVERITY_DEBUG)) { - // TODO(roth): When we can upgrade upb, use upb textformat code to dump - // the raw proto instead of doing this manually. - std::vector fields; - // version_info - AddStringField( - "version_info", - envoy_service_discovery_v3_DiscoveryResponse_version_info(response), - &fields); - // resources - size_t num_resources; - envoy_service_discovery_v3_DiscoveryResponse_resources(response, - &num_resources); - fields.emplace_back( - absl::StrCat("resources: <", num_resources, " element(s)>")); - // type_url - AddStringField( - "type_url", - envoy_service_discovery_v3_DiscoveryResponse_type_url(response), - &fields); - // nonce - AddStringField("nonce", - envoy_service_discovery_v3_DiscoveryResponse_nonce(response), - &fields); - gpr_log(GPR_DEBUG, "[xds_client %p] received response: %s", client, - absl::StrJoin(fields, "\n").c_str()); + const upb_msgdef* msg_type = + envoy_service_discovery_v3_DiscoveryResponse_getmsgdef(symtab); + char buf[10240]; + upb_text_encode(response, msg_type, nullptr, 0, buf, sizeof(buf)); + gpr_log(GPR_DEBUG, "[xds_client %p] received response: %s", client, buf); } } void MaybeLogRouteConfiguration( - XdsClient* client, TraceFlag* tracer, + XdsClient* client, TraceFlag* tracer, upb_symtab* symtab, const envoy_config_route_v3_RouteConfiguration* route_config) { if (GRPC_TRACE_FLAG_ENABLED(*tracer) && gpr_should_log(GPR_LOG_SEVERITY_DEBUG)) { - // TODO(roth): When we can upgrade upb, use upb textformat code to dump - // the raw proto instead of doing this manually. - std::vector fields; - // name - AddStringField("name", - envoy_config_route_v3_RouteConfiguration_name(route_config), - &fields); - // virtual_hosts - size_t num_virtual_hosts; - const envoy_config_route_v3_VirtualHost* const* virtual_hosts = - envoy_config_route_v3_RouteConfiguration_virtual_hosts( - route_config, &num_virtual_hosts); - for (size_t i = 0; i < num_virtual_hosts; ++i) { - const auto* virtual_host = virtual_hosts[i]; - fields.push_back("virtual_hosts {"); - // name - AddStringField(" name", - envoy_config_route_v3_VirtualHost_name(virtual_host), - &fields); - // domains - size_t num_domains; - const upb_strview* const domains = - envoy_config_route_v3_VirtualHost_domains(virtual_host, &num_domains); - for (size_t j = 0; j < num_domains; ++j) { - AddStringField(" domains", domains[j], &fields); - } - // routes - size_t num_routes; - const envoy_config_route_v3_Route* const* routes = - envoy_config_route_v3_VirtualHost_routes(virtual_host, &num_routes); - for (size_t j = 0; j < num_routes; ++j) { - const auto* route = routes[j]; - fields.push_back(" route {"); - // name - AddStringField(" name", envoy_config_route_v3_Route_name(route), - &fields); - // match - const envoy_config_route_v3_RouteMatch* match = - envoy_config_route_v3_Route_match(route); - if (match != nullptr) { - fields.emplace_back(" match {"); - // path matching - if (envoy_config_route_v3_RouteMatch_has_prefix(match)) { - AddStringField(" prefix", - envoy_config_route_v3_RouteMatch_prefix(match), - &fields, - /*add_if_empty=*/true); - } else if (envoy_config_route_v3_RouteMatch_has_path(match)) { - AddStringField(" path", - envoy_config_route_v3_RouteMatch_path(match), - &fields, - /*add_if_empty=*/true); - } else if (envoy_config_route_v3_RouteMatch_has_safe_regex(match)) { - fields.emplace_back(" safe_regex: "); - } else { - fields.emplace_back(" "); - } - // header matching - size_t num_headers; - envoy_config_route_v3_RouteMatch_headers(match, &num_headers); - if (num_headers > 0) { - fields.emplace_back( - absl::StrCat(" headers: <", num_headers, " element(s)>")); - } - fields.emplace_back(" }"); - } - // action - if (envoy_config_route_v3_Route_has_route(route)) { - const envoy_config_route_v3_RouteAction* action = - envoy_config_route_v3_Route_route(route); - fields.emplace_back(" route {"); - if (envoy_config_route_v3_RouteAction_has_cluster(action)) { - AddStringField(" cluster", - envoy_config_route_v3_RouteAction_cluster(action), - &fields); - } else if (envoy_config_route_v3_RouteAction_has_cluster_header( - action)) { - AddStringField( - " cluster_header", - envoy_config_route_v3_RouteAction_cluster_header(action), - &fields); - } else if (envoy_config_route_v3_RouteAction_has_weighted_clusters( - action)) { - const envoy_config_route_v3_WeightedCluster* weighted_clusters = - envoy_config_route_v3_RouteAction_weighted_clusters(action); - fields.emplace_back(" weighted_clusters {"); - size_t num_cluster_weights; - const envoy_config_route_v3_WeightedCluster_ClusterWeight* const* - cluster_weights = - envoy_config_route_v3_WeightedCluster_clusters( - weighted_clusters, &num_cluster_weights); - for (size_t i = 0; i < num_cluster_weights; ++i) { - const envoy_config_route_v3_WeightedCluster_ClusterWeight* - cluster_weight = cluster_weights[i]; - fields.emplace_back(" clusters {"); - AddStringField( - " name", - envoy_config_route_v3_WeightedCluster_ClusterWeight_name( - cluster_weight), - &fields); - AddUInt32ValueField( - " weight", - envoy_config_route_v3_WeightedCluster_ClusterWeight_weight( - cluster_weight), - &fields); - fields.emplace_back(" }"); - } - AddUInt32ValueField( - " total_weight", - envoy_config_route_v3_WeightedCluster_total_weight( - weighted_clusters), - &fields); - fields.emplace_back(" }"); - } - fields.emplace_back(" }"); - } else if (envoy_config_route_v3_Route_has_redirect(route)) { - fields.emplace_back(" redirect: "); - } else if (envoy_config_route_v3_Route_has_direct_response(route)) { - fields.emplace_back(" direct_response: "); - } else if (envoy_config_route_v3_Route_has_filter_action(route)) { - fields.emplace_back(" filter_action: "); - } - fields.push_back(" }"); - } - fields.push_back("}"); - } - gpr_log(GPR_DEBUG, "[xds_client %p] RouteConfiguration: %s", client, - absl::StrJoin(fields, "\n").c_str()); + const upb_msgdef* msg_type = + envoy_config_route_v3_RouteConfiguration_getmsgdef(symtab); + char buf[10240]; + upb_text_encode(route_config, msg_type, nullptr, 0, buf, sizeof(buf)); + gpr_log(GPR_DEBUG, "[xds_client %p] RouteConfiguration: %s", client, buf); } } -void MaybeLogCluster(XdsClient* client, TraceFlag* tracer, +void MaybeLogCluster(XdsClient* client, TraceFlag* tracer, upb_symtab* symtab, const envoy_config_cluster_v3_Cluster* cluster) { if (GRPC_TRACE_FLAG_ENABLED(*tracer) && gpr_should_log(GPR_LOG_SEVERITY_DEBUG)) { - // TODO(roth): When we can upgrade upb, use upb textformat code to dump - // the raw proto instead of doing this manually. - std::vector fields; - // name - AddStringField("name", envoy_config_cluster_v3_Cluster_name(cluster), - &fields); - // type - if (envoy_config_cluster_v3_Cluster_has_type(cluster)) { - fields.emplace_back(absl::StrCat( - "type: ", envoy_config_cluster_v3_Cluster_type(cluster))); - } else if (envoy_config_cluster_v3_Cluster_has_cluster_type(cluster)) { - fields.emplace_back("cluster_type: "); - } else { - fields.emplace_back(""); - } - // eds_cluster_config - const envoy_config_cluster_v3_Cluster_EdsClusterConfig* eds_cluster_config = - envoy_config_cluster_v3_Cluster_eds_cluster_config(cluster); - if (eds_cluster_config != nullptr) { - fields.emplace_back("eds_cluster_config {"); - // eds_config - const struct envoy_config_core_v3_ConfigSource* eds_config = - envoy_config_cluster_v3_Cluster_EdsClusterConfig_eds_config( - eds_cluster_config); - if (eds_config != nullptr) { - if (envoy_config_core_v3_ConfigSource_has_ads(eds_config)) { - fields.emplace_back(" eds_config { ads {} }"); - } else { - fields.emplace_back(" eds_config: "); - } - } - // service_name - AddStringField( - " service_name", - envoy_config_cluster_v3_Cluster_EdsClusterConfig_service_name( - eds_cluster_config), - &fields); - fields.emplace_back("}"); - } - // lb_policy - fields.emplace_back(absl::StrCat( - "lb_policy: ", envoy_config_cluster_v3_Cluster_lb_policy(cluster))); - // lrs_server - const envoy_config_core_v3_ConfigSource* lrs_server = - envoy_config_cluster_v3_Cluster_lrs_server(cluster); - if (lrs_server != nullptr) { - if (envoy_config_core_v3_ConfigSource_has_self(lrs_server)) { - fields.emplace_back("lrs_server { self {} }"); - } else { - fields.emplace_back("lrs_server: "); - } - } - gpr_log(GPR_DEBUG, "[xds_client %p] Cluster: %s", client, - absl::StrJoin(fields, "\n").c_str()); + const upb_msgdef* msg_type = + envoy_config_cluster_v3_Cluster_getmsgdef(symtab); + char buf[10240]; + upb_text_encode(cluster, msg_type, nullptr, 0, buf, sizeof(buf)); + gpr_log(GPR_DEBUG, "[xds_client %p] Cluster: %s", client, buf); } } void MaybeLogClusterLoadAssignment( - XdsClient* client, TraceFlag* tracer, + XdsClient* client, TraceFlag* tracer, upb_symtab* symtab, const envoy_config_endpoint_v3_ClusterLoadAssignment* cla) { if (GRPC_TRACE_FLAG_ENABLED(*tracer) && gpr_should_log(GPR_LOG_SEVERITY_DEBUG)) { - // TODO(roth): When we can upgrade upb, use upb textformat code to dump - // the raw proto instead of doing this manually. - std::vector fields; - // cluster_name - AddStringField( - "cluster_name", - envoy_config_endpoint_v3_ClusterLoadAssignment_cluster_name(cla), - &fields); - // endpoints - size_t num_localities; - const struct envoy_config_endpoint_v3_LocalityLbEndpoints* const* - locality_endpoints = - envoy_config_endpoint_v3_ClusterLoadAssignment_endpoints( - cla, &num_localities); - for (size_t i = 0; i < num_localities; ++i) { - const auto* locality_endpoint = locality_endpoints[i]; - fields.emplace_back("endpoints {"); - // locality - const auto* locality = - envoy_config_endpoint_v3_LocalityLbEndpoints_locality( - locality_endpoint); - if (locality != nullptr) { - fields.emplace_back(" locality {"); - AddLocalityField(2, locality, &fields); - fields.emplace_back(" }"); - } - // lb_endpoints - size_t num_lb_endpoints; - const envoy_config_endpoint_v3_LbEndpoint* const* lb_endpoints = - envoy_config_endpoint_v3_LocalityLbEndpoints_lb_endpoints( - locality_endpoint, &num_lb_endpoints); - for (size_t j = 0; j < num_lb_endpoints; ++j) { - const auto* lb_endpoint = lb_endpoints[j]; - fields.emplace_back(" lb_endpoints {"); - // health_status - uint32_t health_status = - envoy_config_endpoint_v3_LbEndpoint_health_status(lb_endpoint); - if (health_status > 0) { - fields.emplace_back( - absl::StrCat(" health_status: ", health_status)); - } - // endpoint - const envoy_config_endpoint_v3_Endpoint* endpoint = - envoy_config_endpoint_v3_LbEndpoint_endpoint(lb_endpoint); - if (endpoint != nullptr) { - fields.emplace_back(" endpoint {"); - // address - const auto* address = - envoy_config_endpoint_v3_Endpoint_address(endpoint); - if (address != nullptr) { - fields.emplace_back(" address {"); - // socket_address - const auto* socket_address = - envoy_config_core_v3_Address_socket_address(address); - if (socket_address != nullptr) { - fields.emplace_back(" socket_address {"); - // address - AddStringField( - " address", - envoy_config_core_v3_SocketAddress_address(socket_address), - &fields); - // port_value - if (envoy_config_core_v3_SocketAddress_has_port_value( - socket_address)) { - fields.emplace_back( - absl::StrCat(" port_value: ", - envoy_config_core_v3_SocketAddress_port_value( - socket_address))); - } else { - fields.emplace_back(" "); - } - fields.emplace_back(" }"); - } else { - fields.emplace_back(" "); - } - fields.emplace_back(" }"); - } - fields.emplace_back(" }"); - } - fields.emplace_back(" }"); - } - // load_balancing_weight - AddUInt32ValueField( - " load_balancing_weight", - envoy_config_endpoint_v3_LocalityLbEndpoints_load_balancing_weight( - locality_endpoint), - &fields); - // priority - uint32_t priority = envoy_config_endpoint_v3_LocalityLbEndpoints_priority( - locality_endpoint); - if (priority > 0) { - fields.emplace_back(absl::StrCat(" priority: ", priority)); - } - fields.emplace_back("}"); - } - // policy - const envoy_config_endpoint_v3_ClusterLoadAssignment_Policy* policy = - envoy_config_endpoint_v3_ClusterLoadAssignment_policy(cla); - if (policy != nullptr) { - fields.emplace_back("policy {"); - // drop_overloads - size_t num_drop_overloads; - const envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload* const* - drop_overloads = - envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_drop_overloads( - policy, &num_drop_overloads); - for (size_t i = 0; i < num_drop_overloads; ++i) { - auto* drop_overload = drop_overloads[i]; - fields.emplace_back(" drop_overloads {"); - // category - AddStringField( - " category", - envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload_category( - drop_overload), - &fields); - // drop_percentage - const auto* drop_percentage = - envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload_drop_percentage( - drop_overload); - if (drop_percentage != nullptr) { - fields.emplace_back(" drop_percentage {"); - fields.emplace_back(absl::StrCat( - " numerator: ", - envoy_type_v3_FractionalPercent_numerator(drop_percentage))); - fields.emplace_back(absl::StrCat( - " denominator: ", - envoy_type_v3_FractionalPercent_denominator(drop_percentage))); - fields.emplace_back(" }"); - } - fields.emplace_back(" }"); - } - // overprovisioning_factor - fields.emplace_back("}"); - } + const upb_msgdef* msg_type = + envoy_config_endpoint_v3_ClusterLoadAssignment_getmsgdef(symtab); + char buf[10240]; + upb_text_encode(cla, msg_type, nullptr, 0, buf, sizeof(buf)); gpr_log(GPR_DEBUG, "[xds_client %p] ClusterLoadAssignment: %s", client, - absl::StrJoin(fields, "\n").c_str()); + buf); } } @@ -1593,10 +1127,10 @@ grpc_error* RouteActionParse(const envoy_config_route_v3_Route* route_msg, } grpc_error* RouteConfigParse( - XdsClient* client, TraceFlag* tracer, + XdsClient* client, TraceFlag* tracer, upb_symtab* symtab, const envoy_config_route_v3_RouteConfiguration* route_config, XdsApi::RdsUpdate* rds_update) { - MaybeLogRouteConfiguration(client, tracer, route_config); + MaybeLogRouteConfiguration(client, tracer, symtab, route_config); // Get the virtual hosts. size_t size; const envoy_config_route_v3_VirtualHost* const* virtual_hosts = @@ -1662,7 +1196,7 @@ grpc_error* RouteConfigParse( } grpc_error* LdsResponseParse( - XdsClient* client, TraceFlag* tracer, + XdsClient* client, TraceFlag* tracer, upb_symtab* symtab, const envoy_service_discovery_v3_DiscoveryResponse* response, const std::set& expected_listener_names, XdsApi::LdsUpdateMap* lds_update_map, upb_arena* arena) { @@ -1725,7 +1259,7 @@ grpc_error* LdsResponseParse( http_connection_manager); XdsApi::RdsUpdate rds_update; grpc_error* error = - RouteConfigParse(client, tracer, route_config, &rds_update); + RouteConfigParse(client, tracer, symtab, route_config, &rds_update); if (error != GRPC_ERROR_NONE) return error; lds_update.rds_update = std::move(rds_update); continue; @@ -1760,7 +1294,7 @@ grpc_error* LdsResponseParse( } grpc_error* RdsResponseParse( - XdsClient* client, TraceFlag* tracer, + XdsClient* client, TraceFlag* tracer, upb_symtab* symtab, const envoy_service_discovery_v3_DiscoveryResponse* response, const std::set& expected_route_configuration_names, XdsApi::RdsUpdateMap* rds_update_map, upb_arena* arena) { @@ -1802,7 +1336,7 @@ grpc_error* RdsResponseParse( XdsApi::RdsUpdate& rds_update = (*rds_update_map)[std::move(route_config_name)]; grpc_error* error = - RouteConfigParse(client, tracer, route_config, &rds_update); + RouteConfigParse(client, tracer, symtab, route_config, &rds_update); if (error != GRPC_ERROR_NONE) return error; } return GRPC_ERROR_NONE; @@ -1895,7 +1429,7 @@ grpc_error* CommonTlsContextParse( } grpc_error* CdsResponseParse( - XdsClient* client, TraceFlag* tracer, + XdsClient* client, TraceFlag* tracer, upb_symtab* symtab, const envoy_service_discovery_v3_DiscoveryResponse* response, const std::set& expected_cluster_names, XdsApi::CdsUpdateMap* cds_update_map, upb_arena* arena) { @@ -1919,7 +1453,7 @@ grpc_error* CdsResponseParse( if (cluster == nullptr) { return GRPC_ERROR_CREATE_FROM_STATIC_STRING("Can't decode cluster."); } - MaybeLogCluster(client, tracer, cluster); + MaybeLogCluster(client, tracer, symtab, cluster); // Ignore unexpected cluster names. std::string cluster_name = UpbStringToStdString(envoy_config_cluster_v3_Cluster_name(cluster)); @@ -2148,7 +1682,7 @@ grpc_error* DropParseAndAppend( } grpc_error* EdsResponseParse( - XdsClient* client, TraceFlag* tracer, + XdsClient* client, TraceFlag* tracer, upb_symtab* symtab, const envoy_service_discovery_v3_DiscoveryResponse* response, const std::set& expected_eds_service_names, XdsApi::EdsUpdateMap* eds_update_map, upb_arena* arena) { @@ -2174,7 +1708,8 @@ grpc_error* EdsResponseParse( return GRPC_ERROR_CREATE_FROM_STATIC_STRING( "Can't parse cluster_load_assignment."); } - MaybeLogClusterLoadAssignment(client, tracer, cluster_load_assignment); + MaybeLogClusterLoadAssignment(client, tracer, symtab, + cluster_load_assignment); // Check the EDS service name. Ignore unexpected names. std::string eds_service_name = UpbStringToStdString( envoy_config_endpoint_v3_ClusterLoadAssignment_cluster_name( @@ -2272,7 +1807,7 @@ XdsApi::AdsParseResult XdsApi::ParseAdsResponse( GRPC_ERROR_CREATE_FROM_STATIC_STRING("Can't decode DiscoveryResponse."); return result; } - MaybeLogDiscoveryResponse(client_, tracer_, response); + MaybeLogDiscoveryResponse(client_, tracer_, symtab_.ptr(), response); // Record the type_url, the version_info, and the nonce of the response. result.type_url = TypeUrlInternalToExternal(UpbStringToAbsl( envoy_service_discovery_v3_DiscoveryResponse_type_url(response))); @@ -2282,21 +1817,22 @@ XdsApi::AdsParseResult XdsApi::ParseAdsResponse( envoy_service_discovery_v3_DiscoveryResponse_nonce(response)); // Parse the response according to the resource type. if (IsLds(result.type_url)) { - result.parse_error = - LdsResponseParse(client_, tracer_, response, expected_listener_names, - &result.lds_update_map, arena.ptr()); + result.parse_error = LdsResponseParse(client_, tracer_, symtab_.ptr(), + response, expected_listener_names, + &result.lds_update_map, arena.ptr()); } else if (IsRds(result.type_url)) { - result.parse_error = RdsResponseParse(client_, tracer_, response, - expected_route_configuration_names, - &result.rds_update_map, arena.ptr()); - } else if (IsCds(result.type_url)) { result.parse_error = - CdsResponseParse(client_, tracer_, response, expected_cluster_names, - &result.cds_update_map, arena.ptr()); + RdsResponseParse(client_, tracer_, symtab_.ptr(), response, + expected_route_configuration_names, + &result.rds_update_map, arena.ptr()); + } else if (IsCds(result.type_url)) { + result.parse_error = CdsResponseParse(client_, tracer_, symtab_.ptr(), + response, expected_cluster_names, + &result.cds_update_map, arena.ptr()); } else if (IsEds(result.type_url)) { - result.parse_error = - EdsResponseParse(client_, tracer_, response, expected_eds_service_names, - &result.eds_update_map, arena.ptr()); + result.parse_error = EdsResponseParse(client_, tracer_, symtab_.ptr(), + response, expected_eds_service_names, + &result.eds_update_map, arena.ptr()); } return result; } @@ -2304,120 +1840,16 @@ XdsApi::AdsParseResult XdsApi::ParseAdsResponse( namespace { void MaybeLogLrsRequest( - XdsClient* client, TraceFlag* tracer, - const envoy_service_load_stats_v3_LoadStatsRequest* request, - const std::string& build_version) { + XdsClient* client, TraceFlag* tracer, upb_symtab* symtab, + const envoy_service_load_stats_v3_LoadStatsRequest* request) { if (GRPC_TRACE_FLAG_ENABLED(*tracer) && gpr_should_log(GPR_LOG_SEVERITY_DEBUG)) { - // TODO(roth): When we can upgrade upb, use upb textformat code to dump - // the raw proto instead of doing this manually. - std::vector fields; - // node - const auto* node = - envoy_service_load_stats_v3_LoadStatsRequest_node(request); - if (node != nullptr) { - AddNodeLogFields(node, build_version, &fields); - } - // cluster_stats - size_t num_cluster_stats; - const struct envoy_config_endpoint_v3_ClusterStats* const* cluster_stats = - envoy_service_load_stats_v3_LoadStatsRequest_cluster_stats( - request, &num_cluster_stats); - for (size_t i = 0; i < num_cluster_stats; ++i) { - const auto* cluster_stat = cluster_stats[i]; - fields.emplace_back("cluster_stats {"); - // cluster_name - AddStringField( - " cluster_name", - envoy_config_endpoint_v3_ClusterStats_cluster_name(cluster_stat), - &fields); - // cluster_service_name - AddStringField(" cluster_service_name", - envoy_config_endpoint_v3_ClusterStats_cluster_service_name( - cluster_stat), - &fields); - // upstream_locality_stats - size_t num_stats; - const envoy_config_endpoint_v3_UpstreamLocalityStats* const* stats = - envoy_config_endpoint_v3_ClusterStats_upstream_locality_stats( - cluster_stat, &num_stats); - for (size_t j = 0; j < num_stats; ++j) { - const auto* stat = stats[j]; - fields.emplace_back(" upstream_locality_stats {"); - // locality - const auto* locality = - envoy_config_endpoint_v3_UpstreamLocalityStats_locality(stat); - if (locality != nullptr) { - fields.emplace_back(" locality {"); - AddLocalityField(3, locality, &fields); - fields.emplace_back(" }"); - } - // total_successful_requests - fields.emplace_back(absl::StrCat( - " total_successful_requests: ", - envoy_config_endpoint_v3_UpstreamLocalityStats_total_successful_requests( - stat))); - // total_requests_in_progress - fields.emplace_back(absl::StrCat( - " total_requests_in_progress: ", - envoy_config_endpoint_v3_UpstreamLocalityStats_total_requests_in_progress( - stat))); - // total_error_requests - fields.emplace_back(absl::StrCat( - " total_error_requests: ", - envoy_config_endpoint_v3_UpstreamLocalityStats_total_error_requests( - stat))); - // total_issued_requests - fields.emplace_back(absl::StrCat( - " total_issued_requests: ", - envoy_config_endpoint_v3_UpstreamLocalityStats_total_issued_requests( - stat))); - fields.emplace_back(" }"); - } - // total_dropped_requests - fields.emplace_back(absl::StrCat( - " total_dropped_requests: ", - envoy_config_endpoint_v3_ClusterStats_total_dropped_requests( - cluster_stat))); - // dropped_requests - size_t num_drops; - const envoy_config_endpoint_v3_ClusterStats_DroppedRequests* const* - drops = envoy_config_endpoint_v3_ClusterStats_dropped_requests( - cluster_stat, &num_drops); - for (size_t j = 0; j < num_drops; ++j) { - const auto* drop = drops[j]; - fields.emplace_back(" dropped_requests {"); - // category - AddStringField( - " category", - envoy_config_endpoint_v3_ClusterStats_DroppedRequests_category( - drop), - &fields); - // dropped_count - fields.emplace_back(absl::StrCat( - " dropped_count: ", - envoy_config_endpoint_v3_ClusterStats_DroppedRequests_dropped_count( - drop))); - fields.emplace_back(" }"); - } - // load_report_interval - const auto* load_report_interval = - envoy_config_endpoint_v3_ClusterStats_load_report_interval( - cluster_stat); - if (load_report_interval != nullptr) { - fields.emplace_back(" load_report_interval {"); - fields.emplace_back(absl::StrCat( - " seconds: ", - google_protobuf_Duration_seconds(load_report_interval))); - fields.emplace_back( - absl::StrCat(" nanos: ", - google_protobuf_Duration_nanos(load_report_interval))); - fields.emplace_back(" }"); - } - fields.emplace_back("}"); - } + const upb_msgdef* msg_type = + envoy_service_load_stats_v3_LoadStatsRequest_getmsgdef(symtab); + char buf[10240]; + upb_text_encode(request, msg_type, nullptr, 0, buf, sizeof(buf)); gpr_log(GPR_DEBUG, "[xds_client %p] constructed LRS request: %s", client, - absl::StrJoin(fields, "\n").c_str()); + buf); } } @@ -2446,7 +1878,7 @@ grpc_slice XdsApi::CreateLrsInitialRequest() { envoy_config_core_v3_Node_add_client_features( node_msg, upb_strview_makez("envoy.lrs.supports_send_all_clusters"), arena.ptr()); - MaybeLogLrsRequest(client_, tracer_, request, build_version_); + MaybeLogLrsRequest(client_, tracer_, symtab_.ptr(), request); return SerializeLrsRequest(request, arena.ptr()); } @@ -2558,7 +1990,7 @@ grpc_slice XdsApi::CreateLrsRequest( google_protobuf_Duration_set_seconds(load_report_interval, timespec.tv_sec); google_protobuf_Duration_set_nanos(load_report_interval, timespec.tv_nsec); } - MaybeLogLrsRequest(client_, tracer_, request, build_version_); + MaybeLogLrsRequest(client_, tracer_, symtab_.ptr(), request); return SerializeLrsRequest(request, arena.ptr()); } diff --git a/src/core/ext/xds/xds_api.h b/src/core/ext/xds/xds_api.h index 1ec7f6cfb5f..825c1bb3ef7 100644 --- a/src/core/ext/xds/xds_api.h +++ b/src/core/ext/xds/xds_api.h @@ -29,6 +29,8 @@ #include "absl/types/optional.h" #include "re2/re2.h" +#include "upb/def.hpp" + #include #include "src/core/ext/filters/client_channel/server_address.h" @@ -389,6 +391,7 @@ class XdsApi { TraceFlag* tracer_; const bool use_v3_; const XdsBootstrap* bootstrap_; // Do not own. + upb::SymbolTable symtab_; const std::string build_version_; const std::string user_agent_name_; }; diff --git a/src/objective-c/tests/Podfile b/src/objective-c/tests/Podfile index bf399c4777b..6dac4d0150f 100644 --- a/src/objective-c/tests/Podfile +++ b/src/objective-c/tests/Podfile @@ -14,7 +14,7 @@ def grpc_deps pod 'BoringSSL-GRPC', :podspec => "#{GRPC_LOCAL_SRC}/src/objective-c", :inhibit_warnings => true pod 'gRPC/InternalTesting', :path => GRPC_LOCAL_SRC - pod 'gRPC-Core', :path => GRPC_LOCAL_SRC + pod 'gRPC-Core', :path => GRPC_LOCAL_SRC, :inhibit_warnings => true pod 'gRPC-RxLibrary', :path => GRPC_LOCAL_SRC pod 'gRPC-ProtoRPC', :path => GRPC_LOCAL_SRC, :inhibit_warnings => true pod 'RemoteTest', :path => "RemoteTestClient", :inhibit_warnings => true diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py index 35edeb799df..cee912ba7fb 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -208,6 +208,84 @@ CORE_SOURCE_FILES = [ 'src/core/ext/upb-generated/udpa/core/v1/resource_name.upb.c', 'src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c', 'src/core/ext/upb-generated/validate/validate.upb.c', + 'src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/address.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/backoff.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/listener/v3/api_listener.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/service/cluster/v3/cds.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/service/discovery/v3/ads.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/service/endpoint/v3/eds.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/service/listener/v3/lds.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/service/route/v3/rds.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/service/route/v3/srds.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.c', + 'src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.c', + 'src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.c', + 'src/core/ext/upbdefs-generated/google/api/http.upbdefs.c', + 'src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.c', + 'src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c', + 'src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.c', + 'src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.c', + 'src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.c', + 'src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.c', + 'src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.c', + 'src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.c', + 'src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.c', + 'src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.c', + 'src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.c', + 'src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.c', + 'src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c', + 'src/core/ext/upbdefs-generated/udpa/core/v1/authority.upbdefs.c', + 'src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.c', + 'src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.c', + 'src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.c', + 'src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.c', + 'src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.c', + 'src/core/ext/upbdefs-generated/validate/validate.upbdefs.c', 'src/core/ext/xds/certificate_provider_registry.cc', 'src/core/ext/xds/google_mesh_ca_certificate_provider_factory.cc', 'src/core/ext/xds/xds_api.cc', @@ -914,10 +992,13 @@ CORE_SOURCE_FILES = [ 'third_party/re2/util/rune.cc', 'third_party/re2/util/strutil.cc', 'third_party/upb/upb/decode.c', + 'third_party/upb/upb/def.c', 'third_party/upb/upb/encode.c', 'third_party/upb/upb/msg.c', 'third_party/upb/upb/port.c', + 'third_party/upb/upb/reflection.c', 'third_party/upb/upb/table.c', + 'third_party/upb/upb/text_encode.c', 'third_party/upb/upb/upb.c', 'third_party/zlib/adler32.c', 'third_party/zlib/compress.c', diff --git a/src/upb/gen_build_yaml.py b/src/upb/gen_build_yaml.py index 2816bd4e4c0..cd585095ef6 100755 --- a/src/upb/gen_build_yaml.py +++ b/src/upb/gen_build_yaml.py @@ -36,6 +36,23 @@ try: "third_party/upb/upb/port.c", "third_party/upb/upb/table.c", "third_party/upb/upb/upb.c", + "third_party/upb/upb/def.c", + "third_party/upb/upb/reflection.c", + "third_party/upb/upb/text_encode.c", + "src/core/ext/upb-generated/google/protobuf/any.upb.c", + "src/core/ext/upb-generated/google/protobuf/descriptor.upb.c", + "src/core/ext/upb-generated/google/protobuf/duration.upb.c", + "src/core/ext/upb-generated/google/protobuf/empty.upb.c", + "src/core/ext/upb-generated/google/protobuf/struct.upb.c", + "src/core/ext/upb-generated/google/protobuf/timestamp.upb.c", + "src/core/ext/upb-generated/google/protobuf/wrappers.upb.c", + "src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.c", + "src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c", + "src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.c", + "src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.c", + "src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.c", + "src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.c", + "src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.c", ], 'headers': [ "third_party/upb/upb/decode.h", @@ -46,6 +63,24 @@ try: "third_party/upb/upb/table.int.h", "third_party/upb/upb/upb.h", "third_party/upb/upb/upb.hpp", + "third_party/upb/upb/def.h", + "third_party/upb/upb/def.hpp", + "third_party/upb/upb/reflection.h", + "third_party/upb/upb/text_encode.h", + "src/core/ext/upb-generated/google/protobuf/any.upb.h", + "src/core/ext/upb-generated/google/protobuf/descriptor.upb.h", + "src/core/ext/upb-generated/google/protobuf/duration.upb.h", + "src/core/ext/upb-generated/google/protobuf/empty.upb.h", + "src/core/ext/upb-generated/google/protobuf/struct.upb.h", + "src/core/ext/upb-generated/google/protobuf/timestamp.upb.h", + "src/core/ext/upb-generated/google/protobuf/wrappers.upb.h", + "src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.h", + "src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.h", + "src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.h", + "src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.h", + "src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.h", + "src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.h", + "src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.h", ], 'secure': False, }] diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal index 0440d277ee3..8338de177e8 100644 --- a/tools/doxygen/Doxyfile.c++.internal +++ b/tools/doxygen/Doxyfile.c++.internal @@ -1348,8 +1348,6 @@ src/core/ext/upb-generated/google/api/http.upb.c \ src/core/ext/upb-generated/google/api/http.upb.h \ src/core/ext/upb-generated/google/protobuf/any.upb.c \ src/core/ext/upb-generated/google/protobuf/any.upb.h \ -src/core/ext/upb-generated/google/protobuf/descriptor.upb.c \ -src/core/ext/upb-generated/google/protobuf/descriptor.upb.h \ src/core/ext/upb-generated/google/protobuf/duration.upb.c \ src/core/ext/upb-generated/google/protobuf/duration.upb.h \ src/core/ext/upb-generated/google/protobuf/empty.upb.c \ @@ -1398,6 +1396,162 @@ src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c \ src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h \ src/core/ext/upb-generated/validate/validate.upb.c \ src/core/ext/upb-generated/validate/validate.upb.h \ +src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/config/core/v3/address.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/config/core/v3/address.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/config/core/v3/backoff.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/config/core/v3/backoff.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/config/listener/v3/api_listener.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/config/listener/v3/api_listener.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/service/cluster/v3/cds.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/service/cluster/v3/cds.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/service/discovery/v3/ads.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/service/discovery/v3/ads.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/service/endpoint/v3/eds.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/service/endpoint/v3/eds.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/service/listener/v3/lds.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/service/listener/v3/lds.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/service/route/v3/rds.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/service/route/v3/rds.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/service/route/v3/srds.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/service/route/v3/srds.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.h \ +src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.c \ +src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.h \ +src/core/ext/upbdefs-generated/google/api/http.upbdefs.c \ +src/core/ext/upbdefs-generated/google/api/http.upbdefs.h \ +src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.c \ +src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.h \ +src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c \ +src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.h \ +src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.c \ +src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.h \ +src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.c \ +src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.h \ +src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.c \ +src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.h \ +src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.c \ +src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.h \ +src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.c \ +src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.h \ +src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.c \ +src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.h \ +src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.c \ +src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.h \ +src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.c \ +src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.h \ +src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.c \ +src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.h \ +src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.c \ +src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.h \ +src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c \ +src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.h \ +src/core/ext/upbdefs-generated/udpa/core/v1/authority.upbdefs.c \ +src/core/ext/upbdefs-generated/udpa/core/v1/authority.upbdefs.h \ +src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.c \ +src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.h \ +src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.c \ +src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.h \ +src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.c \ +src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.h \ +src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.c \ +src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.h \ +src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.c \ +src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.h \ +src/core/ext/upbdefs-generated/validate/validate.upbdefs.c \ +src/core/ext/upbdefs-generated/validate/validate.upbdefs.h \ src/core/ext/xds/certificate_provider_factory.h \ src/core/ext/xds/certificate_provider_registry.cc \ src/core/ext/xds/certificate_provider_registry.h \ diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index f2f6ae9088b..a49287342ce 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -1186,8 +1186,6 @@ src/core/ext/upb-generated/google/api/http.upb.c \ src/core/ext/upb-generated/google/api/http.upb.h \ src/core/ext/upb-generated/google/protobuf/any.upb.c \ src/core/ext/upb-generated/google/protobuf/any.upb.h \ -src/core/ext/upb-generated/google/protobuf/descriptor.upb.c \ -src/core/ext/upb-generated/google/protobuf/descriptor.upb.h \ src/core/ext/upb-generated/google/protobuf/duration.upb.c \ src/core/ext/upb-generated/google/protobuf/duration.upb.h \ src/core/ext/upb-generated/google/protobuf/empty.upb.c \ @@ -1236,6 +1234,162 @@ src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c \ src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h \ src/core/ext/upb-generated/validate/validate.upb.c \ src/core/ext/upb-generated/validate/validate.upb.h \ +src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/config/core/v3/address.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/config/core/v3/address.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/config/core/v3/backoff.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/config/core/v3/backoff.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/config/listener/v3/api_listener.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/config/listener/v3/api_listener.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/service/cluster/v3/cds.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/service/cluster/v3/cds.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/service/discovery/v3/ads.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/service/discovery/v3/ads.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/service/endpoint/v3/eds.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/service/endpoint/v3/eds.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/service/listener/v3/lds.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/service/listener/v3/lds.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/service/route/v3/rds.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/service/route/v3/rds.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/service/route/v3/srds.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/service/route/v3/srds.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.h \ +src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.c \ +src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.h \ +src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.c \ +src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.h \ +src/core/ext/upbdefs-generated/google/api/http.upbdefs.c \ +src/core/ext/upbdefs-generated/google/api/http.upbdefs.h \ +src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.c \ +src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.h \ +src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c \ +src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.h \ +src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.c \ +src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.h \ +src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.c \ +src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.h \ +src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.c \ +src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.h \ +src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.c \ +src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.h \ +src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.c \ +src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.h \ +src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.c \ +src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.h \ +src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.c \ +src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.h \ +src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.c \ +src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.h \ +src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.c \ +src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.h \ +src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.c \ +src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.h \ +src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c \ +src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.h \ +src/core/ext/upbdefs-generated/udpa/core/v1/authority.upbdefs.c \ +src/core/ext/upbdefs-generated/udpa/core/v1/authority.upbdefs.h \ +src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.c \ +src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.h \ +src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.c \ +src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.h \ +src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.c \ +src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.h \ +src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.c \ +src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.h \ +src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.c \ +src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.h \ +src/core/ext/upbdefs-generated/validate/validate.upbdefs.c \ +src/core/ext/upbdefs-generated/validate/validate.upbdefs.h \ src/core/ext/xds/certificate_provider_factory.h \ src/core/ext/xds/certificate_provider_registry.cc \ src/core/ext/xds/certificate_provider_registry.h \