From 23c9e5ee44d2855e2bffb5ffe6dd0f3021be3ce2 Mon Sep 17 00:00:00 2001 From: Joel Galenson Date: Fri, 2 Apr 2021 14:59:08 -0700 Subject: Upgrade rust/crates/grpcio-sys to 0.8.1 Test: make Change-Id: I333e35e7d00abaa92ea6beb00e9cf5b85840998f --- grpc/BUILD | 529 ++++++++++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 473 insertions(+), 56 deletions(-) (limited to 'grpc/BUILD') diff --git a/grpc/BUILD b/grpc/BUILD index 16e76a45..909b8114 100644 --- a/grpc/BUILD +++ b/grpc/BUILD @@ -80,11 +80,11 @@ config_setting( python_config_settings() # This should be updated along with build_handwritten.yaml -g_stands_for = "geeky" +g_stands_for = "gecko" -core_version = "13.0.0" +core_version = "14.0.0" -version = "1.33.1" +version = "1.35.0" GPR_PUBLIC_HDRS = [ "include/grpc/support/alloc.h", @@ -251,6 +251,7 @@ GRPCXX_PUBLIC_HDRS = [ "include/grpcpp/security/auth_metadata_processor.h", "include/grpcpp/security/credentials.h", "include/grpcpp/security/server_credentials.h", + "include/grpcpp/security/tls_certificate_provider.h", "include/grpcpp/security/tls_credentials_options.h", "include/grpcpp/server.h", "include/grpcpp/server_builder.h", @@ -322,11 +323,11 @@ grpc_cc_library( "grpc_no_xds": [], "//conditions:default": [ "grpc_lb_policy_cds", - "grpc_lb_policy_eds", - "grpc_lb_policy_eds_drop", + "grpc_lb_policy_xds_cluster_impl", "grpc_lb_policy_xds_cluster_manager", + "grpc_lb_policy_xds_cluster_resolver", "grpc_resolver_xds", - "grpc_xds_credentials", + "grpc_xds_server_config_fetcher", ], }, standalone = True, @@ -343,6 +344,9 @@ grpc_cc_library( grpc_cc_library( name = "grpc++_public_hdrs", hdrs = GRPCXX_PUBLIC_HDRS, + external_deps = [ + "protobuf_headers", + ], ) grpc_cc_library( @@ -354,6 +358,7 @@ grpc_cc_library( "src/cpp/common/secure_auth_context.cc", "src/cpp/common/secure_channel_arguments.cc", "src/cpp/common/secure_create_auth_context.cc", + "src/cpp/common/tls_certificate_provider.cc", "src/cpp/common/tls_credentials_options.cc", "src/cpp/common/tls_credentials_options_util.cc", "src/cpp/server/insecure_server_credentials.cc", @@ -365,8 +370,18 @@ grpc_cc_library( "src/cpp/common/tls_credentials_options_util.h", "src/cpp/server/secure_server_credentials.h", ], + external_deps = [ + "protobuf_headers", + ], language = "c++", public_hdrs = GRPCXX_PUBLIC_HDRS, + select_deps = { + "grpc_no_xds": [], + "//conditions:default": [ + "grpc++_xds_client", + "grpc++_xds_server", + ], + }, standalone = True, deps = [ "gpr", @@ -379,6 +394,37 @@ grpc_cc_library( ], ) +grpc_cc_library( + name = "grpc++_xds_client", + srcs = [ + "src/cpp/client/xds_credentials.cc", + ], + hdrs = [ + "src/cpp/client/secure_credentials.h", + ], + language = "c++", + deps = [ + "grpc++_base", + ], +) + +grpc_cc_library( + name = "grpc++_xds_server", + srcs = [ + "src/cpp/server/xds_server_credentials.cc", + ], + hdrs = [ + "src/cpp/server/secure_server_credentials.h", + ], + language = "c++", + public_hdrs = [ + "include/grpcpp/xds_server_builder.h", + ], + deps = [ + "grpc++_base", + ], +) + grpc_cc_library( name = "grpc++_unsecure", srcs = [ @@ -507,10 +553,13 @@ grpc_cc_library( "src/core/lib/gpr/tmpfile_windows.cc", "src/core/lib/gpr/wrap_memcpy.cc", "src/core/lib/gprpp/arena.cc", + "src/core/lib/gprpp/examine_stack.cc", "src/core/lib/gprpp/fork.cc", "src/core/lib/gprpp/global_config_env.cc", "src/core/lib/gprpp/host_port.cc", "src/core/lib/gprpp/mpscq.cc", + "src/core/lib/gprpp/stat_posix.cc", + "src/core/lib/gprpp/stat_windows.cc", "src/core/lib/gprpp/thd_posix.cc", "src/core/lib/gprpp/thd_windows.cc", "src/core/lib/profiling/basic_timers.cc", @@ -529,10 +578,12 @@ grpc_cc_library( "src/core/lib/gpr/tls_gcc.h", "src/core/lib/gpr/tls_msvc.h", "src/core/lib/gpr/tls_pthread.h", + "src/core/lib/gpr/tls_stdcpp.h", "src/core/lib/gpr/tmpfile.h", "src/core/lib/gpr/useful.h", "src/core/lib/gprpp/arena.h", "src/core/lib/gprpp/atomic.h", + "src/core/lib/gprpp/examine_stack.h", "src/core/lib/gprpp/fork.h", "src/core/lib/gprpp/global_config.h", "src/core/lib/gprpp/global_config_custom.h", @@ -540,9 +591,9 @@ grpc_cc_library( "src/core/lib/gprpp/global_config_generic.h", "src/core/lib/gprpp/host_port.h", "src/core/lib/gprpp/manual_constructor.h", - "src/core/lib/gprpp/map.h", "src/core/lib/gprpp/memory.h", "src/core/lib/gprpp/mpscq.h", + "src/core/lib/gprpp/stat.h", "src/core/lib/gprpp/sync.h", "src/core/lib/gprpp/thd.h", "src/core/lib/profiling/timers.h", @@ -550,10 +601,12 @@ grpc_cc_library( external_deps = [ "absl/base", "absl/memory", + "absl/status", "absl/strings", "absl/strings:str_format", "absl/synchronization", "absl/time:time", + "absl/types:optional", ], language = "c++", public_hdrs = GPR_PUBLIC_HDRS, @@ -972,8 +1025,10 @@ grpc_cc_library( "madler_zlib", "absl/container:inlined_vector", "absl/status", + "absl/status:statusor", "absl/strings", "absl/types:optional", + "absl/container:flat_hash_map", ], language = "c++", public_hdrs = GRPC_PUBLIC_HDRS, @@ -1040,6 +1095,7 @@ grpc_cc_library( "src/core/ext/filters/client_channel/client_channel_factory.cc", "src/core/ext/filters/client_channel/client_channel_plugin.cc", "src/core/ext/filters/client_channel/config_selector.cc", + "src/core/ext/filters/client_channel/dynamic_filters.cc", "src/core/ext/filters/client_channel/global_subchannel_pool.cc", "src/core/ext/filters/client_channel/health/health_check_client.cc", "src/core/ext/filters/client_channel/http_connect_handshaker.cc", @@ -1052,7 +1108,6 @@ grpc_cc_library( "src/core/ext/filters/client_channel/resolver.cc", "src/core/ext/filters/client_channel/resolver_registry.cc", "src/core/ext/filters/client_channel/resolver_result_parsing.cc", - "src/core/ext/filters/client_channel/resolving_lb_policy.cc", "src/core/ext/filters/client_channel/retry_throttle.cc", "src/core/ext/filters/client_channel/server_address.cc", "src/core/ext/filters/client_channel/service_config.cc", @@ -1069,6 +1124,7 @@ grpc_cc_library( "src/core/ext/filters/client_channel/client_channel_factory.h", "src/core/ext/filters/client_channel/config_selector.h", "src/core/ext/filters/client_channel/connector.h", + "src/core/ext/filters/client_channel/dynamic_filters.h", "src/core/ext/filters/client_channel/global_subchannel_pool.h", "src/core/ext/filters/client_channel/health/health_check_client.h", "src/core/ext/filters/client_channel/http_connect_handshaker.h", @@ -1084,7 +1140,6 @@ grpc_cc_library( "src/core/ext/filters/client_channel/resolver_factory.h", "src/core/ext/filters/client_channel/resolver_registry.h", "src/core/ext/filters/client_channel/resolver_result_parsing.h", - "src/core/ext/filters/client_channel/resolving_lb_policy.h", "src/core/ext/filters/client_channel/retry_throttle.h", "src/core/ext/filters/client_channel/server_address.h", "src/core/ext/filters/client_channel/service_config.h", @@ -1305,42 +1360,56 @@ grpc_cc_library( ) grpc_cc_library( - name = "grpc_xds_api_header", + name = "grpc_xds_client", + srcs = [ + "src/core/ext/xds/certificate_provider_registry.cc", + "src/core/ext/xds/certificate_provider_store.cc", + "src/core/ext/xds/file_watcher_certificate_provider_factory.cc", + "src/core/ext/xds/xds_api.cc", + "src/core/ext/xds/xds_bootstrap.cc", + "src/core/ext/xds/xds_certificate_provider.cc", + "src/core/ext/xds/xds_client.cc", + "src/core/ext/xds/xds_client_stats.cc", + "src/core/lib/security/credentials/xds/xds_credentials.cc", + ], hdrs = [ + "src/core/ext/xds/certificate_provider_factory.h", + "src/core/ext/xds/certificate_provider_registry.h", + "src/core/ext/xds/certificate_provider_store.h", + "src/core/ext/xds/file_watcher_certificate_provider_factory.h", "src/core/ext/xds/xds_api.h", "src/core/ext/xds/xds_bootstrap.h", + "src/core/ext/xds/xds_certificate_provider.h", + "src/core/ext/xds/xds_channel_args.h", + "src/core/ext/xds/xds_client.h", "src/core/ext/xds/xds_client_stats.h", + "src/core/lib/security/credentials/xds/xds_credentials.h", ], external_deps = [ + "absl/functional:bind_front", "upb_lib", + "upb_textformat_lib", "re2", ], language = "c++", deps = [ + "envoy_ads_upb", + "envoy_ads_upbdefs", "grpc_base", + "grpc_client_channel", + "grpc_secure", + "grpc_transport_chttp2_client_secure", ], ) grpc_cc_library( - name = "grpc_xds_client", + name = "grpc_xds_server_config_fetcher", srcs = [ - "src/core/ext/xds/xds_api.cc", - "src/core/ext/xds/xds_bootstrap.cc", - "src/core/ext/xds/xds_client.cc", - "src/core/ext/xds/xds_client_stats.cc", - ], - hdrs = [ - "src/core/ext/xds/xds_channel_args.h", - "src/core/ext/xds/xds_client.h", + "src/core/ext/xds/xds_server_config_fetcher.cc", ], language = "c++", deps = [ - "envoy_ads_upb", - "grpc_base", - "grpc_client_channel", - "grpc_google_mesh_ca_certificate_provider_factory", - "grpc_secure", - "grpc_xds_api_header", + "grpc_xds_client", ], ) @@ -1355,7 +1424,7 @@ grpc_cc_library( language = "c++", deps = [ "grpc_base", - "grpc_secure", + "grpc_xds_client", ], ) @@ -1373,13 +1442,31 @@ grpc_cc_library( ) grpc_cc_library( - name = "grpc_lb_policy_eds", - srcs = [ - "src/core/ext/filters/client_channel/lb_policy/xds/eds.cc", + name = "grpc_lb_xds_channel_args", + hdrs = [ + "src/core/ext/filters/client_channel/lb_policy/xds/xds_channel_args.h", ], + language = "c++", +) + +grpc_cc_library( + name = "grpc_lb_xds_common", hdrs = [ "src/core/ext/filters/client_channel/lb_policy/xds/xds.h", ], + language = "c++", + deps = [ + "grpc_base", + "grpc_client_channel", + "grpc_xds_client", + ], +) + +grpc_cc_library( + name = "grpc_lb_policy_xds_cluster_resolver", + srcs = [ + "src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_resolver.cc", + ], external_deps = [ "absl/strings", ], @@ -1388,14 +1475,15 @@ grpc_cc_library( "grpc_base", "grpc_client_channel", "grpc_lb_address_filtering", + "grpc_lb_xds_common", "grpc_xds_client", ], ) grpc_cc_library( - name = "grpc_lb_policy_eds_drop", + name = "grpc_lb_policy_xds_cluster_impl", srcs = [ - "src/core/ext/filters/client_channel/lb_policy/xds/eds_drop.cc", + "src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_impl.cc", ], external_deps = [ "absl/strings", @@ -1404,6 +1492,8 @@ grpc_cc_library( deps = [ "grpc_base", "grpc_client_channel", + "grpc_lb_xds_channel_args", + "grpc_lb_xds_common", "grpc_xds_client", ], ) @@ -1421,7 +1511,6 @@ grpc_cc_library( "grpc_base", "grpc_client_channel", "grpc_resolver_xds_header", - "grpc_xds_api_header", ], ) @@ -1658,12 +1747,10 @@ grpc_cc_library( name = "grpc_resolver_dns_ares", srcs = [ "src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc", - "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.cc", "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_libuv.cc", "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc", "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc", "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc", - "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_fallback.cc", "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_libuv.cc", "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc", "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc", @@ -1733,17 +1820,22 @@ grpc_cc_library( grpc_cc_library( name = "grpc_secure", srcs = [ - "src/core/ext/xds/certificate_provider_registry.cc", "src/core/lib/http/httpcli_security_connector.cc", "src/core/lib/security/context/security_context.cc", "src/core/lib/security/credentials/alts/alts_credentials.cc", "src/core/lib/security/credentials/composite/composite_credentials.cc", "src/core/lib/security/credentials/credentials.cc", "src/core/lib/security/credentials/credentials_metadata.cc", + "src/core/lib/security/credentials/external/aws_external_account_credentials.cc", + "src/core/lib/security/credentials/external/aws_request_signer.cc", + "src/core/lib/security/credentials/external/external_account_credentials.cc", + "src/core/lib/security/credentials/external/file_external_account_credentials.cc", + "src/core/lib/security/credentials/external/url_external_account_credentials.cc", "src/core/lib/security/credentials/fake/fake_credentials.cc", "src/core/lib/security/credentials/google_default/credentials_generic.cc", "src/core/lib/security/credentials/google_default/google_default_credentials.cc", "src/core/lib/security/credentials/iam/iam_credentials.cc", + "src/core/lib/security/credentials/insecure/insecure_credentials.cc", "src/core/lib/security/credentials/jwt/json_token.cc", "src/core/lib/security/credentials/jwt/jwt_credentials.cc", "src/core/lib/security/credentials/jwt/jwt_verifier.cc", @@ -1752,10 +1844,13 @@ grpc_cc_library( "src/core/lib/security/credentials/plugin/plugin_credentials.cc", "src/core/lib/security/credentials/ssl/ssl_credentials.cc", "src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.cc", + "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.cc", "src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc", "src/core/lib/security/credentials/tls/tls_credentials.cc", + "src/core/lib/security/credentials/tls/tls_utils.cc", "src/core/lib/security/security_connector/alts/alts_security_connector.cc", "src/core/lib/security/security_connector/fake/fake_security_connector.cc", + "src/core/lib/security/security_connector/insecure/insecure_security_connector.cc", "src/core/lib/security/security_connector/load_system_roots_fallback.cc", "src/core/lib/security/security_connector/load_system_roots_linux.cc", "src/core/lib/security/security_connector/local/local_security_connector.cc", @@ -1774,15 +1869,16 @@ grpc_cc_library( ], hdrs = [ "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.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", "src/core/ext/xds/xds_channel_args.h", - "src/core/lib/security/certificate_provider.h", "src/core/lib/security/context/security_context.h", "src/core/lib/security/credentials/alts/alts_credentials.h", "src/core/lib/security/credentials/composite/composite_credentials.h", "src/core/lib/security/credentials/credentials.h", + "src/core/lib/security/credentials/external/aws_external_account_credentials.h", + "src/core/lib/security/credentials/external/aws_request_signer.h", + "src/core/lib/security/credentials/external/external_account_credentials.h", + "src/core/lib/security/credentials/external/file_external_account_credentials.h", + "src/core/lib/security/credentials/external/url_external_account_credentials.h", "src/core/lib/security/credentials/fake/fake_credentials.h", "src/core/lib/security/credentials/google_default/google_default_credentials.h", "src/core/lib/security/credentials/iam/iam_credentials.h", @@ -1794,10 +1890,13 @@ grpc_cc_library( "src/core/lib/security/credentials/plugin/plugin_credentials.h", "src/core/lib/security/credentials/ssl/ssl_credentials.h", "src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h", + "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h", "src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h", "src/core/lib/security/credentials/tls/tls_credentials.h", + "src/core/lib/security/credentials/tls/tls_utils.h", "src/core/lib/security/security_connector/alts/alts_security_connector.h", "src/core/lib/security/security_connector/fake/fake_security_connector.h", + "src/core/lib/security/security_connector/insecure/insecure_security_connector.h", "src/core/lib/security/security_connector/load_system_roots.h", "src/core/lib/security/security_connector/load_system_roots_linux.h", "src/core/lib/security/security_connector/local/local_security_connector.h", @@ -1817,24 +1916,12 @@ grpc_cc_library( deps = [ "alts_util", "grpc_base", + "grpc_lb_xds_channel_args", "grpc_transport_chttp2_alpn", "tsi", ], ) -grpc_cc_library( - name = "grpc_xds_credentials", - srcs = [ - "src/core/lib/security/credentials/xds/xds_credentials.cc", - ], - hdrs = [ - "src/core/lib/security/credentials/xds/xds_credentials.h", - ], - deps = [ - "grpc_secure", - ], -) - grpc_cc_library( name = "grpc_mock_cel", hdrs = [ @@ -1844,7 +1931,6 @@ grpc_cc_library( "src/core/lib/security/authorization/mock_cel/cel_value.h", "src/core/lib/security/authorization/mock_cel/evaluator_core.h", "src/core/lib/security/authorization/mock_cel/flat_expr_builder.h", - "src/core/lib/security/authorization/mock_cel/statusor.h", ], language = "c++", deps = [ @@ -2188,6 +2274,9 @@ grpc_cc_library( name = "grpc++_base", srcs = GRPCXX_SRCS, hdrs = GRPCXX_HDRS, + external_deps = [ + "protobuf_headers", + ], language = "c++", public_hdrs = GRPCXX_PUBLIC_HDRS, deps = [ @@ -2202,6 +2291,9 @@ grpc_cc_library( name = "grpc++_base_unsecure", srcs = GRPCXX_SRCS, hdrs = GRPCXX_HDRS, + external_deps = [ + "protobuf_headers", + ], language = "c++", public_hdrs = GRPCXX_PUBLIC_HDRS, deps = [ @@ -2310,6 +2402,9 @@ grpc_cc_library( grpc_cc_library( name = "grpc++_codegen_proto", + external_deps = [ + "protobuf_headers", + ], language = "c++", public_hdrs = [ "include/grpc++/impl/codegen/proto_utils.h", @@ -2368,7 +2463,6 @@ grpc_cc_library( language = "c++", public_hdrs = [ "include/grpcpp/ext/channelz_service_plugin.h", - "include/grpcpp/ext/channelz_service_plugin_impl.h", ], deps = [ ":grpc++", @@ -2382,6 +2476,9 @@ grpc_cc_library( srcs = [ "src/cpp/client/channel_test_peer.cc", ], + external_deps = [ + "gtest", + ], public_hdrs = [ "include/grpc++/test/mock_stream.h", "include/grpc++/test/server_context_test_spouse.h", @@ -2572,6 +2669,7 @@ grpc_cc_library( ], external_deps = [ "upb_lib", + "upb_lib_descriptor", ], language = "c++", deps = [ @@ -2585,6 +2683,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 = [ @@ -2597,6 +2777,7 @@ grpc_cc_library( ], external_deps = [ "upb_lib", + "upb_lib_descriptor", ], language = "c++", deps = [ @@ -2604,6 +2785,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 = [ @@ -2638,6 +2841,7 @@ grpc_cc_library( ], external_deps = [ "upb_lib", + "upb_lib_descriptor", ], language = "c++", deps = [ @@ -2650,6 +2854,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 = [ @@ -2682,6 +2932,7 @@ grpc_cc_library( ], external_deps = [ "upb_lib", + "upb_lib_descriptor", ], language = "c++", deps = [ @@ -2692,6 +2943,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 = [ @@ -2702,6 +2996,7 @@ grpc_cc_library( ], external_deps = [ "upb_lib", + "upb_lib_descriptor", ], language = "c++", deps = [ @@ -2709,6 +3004,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", @@ -2725,6 +3040,7 @@ grpc_cc_library( ], external_deps = [ "upb_lib", + "upb_lib_descriptor", ], language = "c++", deps = [ @@ -2750,6 +3066,7 @@ grpc_cc_library( ], external_deps = [ "upb_lib", + "upb_lib_descriptor", ], language = "c++", deps = [ @@ -2758,6 +3075,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 = [ @@ -2778,6 +3123,7 @@ grpc_cc_library( ], external_deps = [ "upb_lib", + "upb_lib_descriptor", ], language = "c++", deps = [ @@ -2787,6 +3133,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", @@ -2803,6 +3181,7 @@ grpc_cc_library( ], external_deps = [ "upb_lib", + "upb_lib_descriptor", ], language = "c++", ) @@ -2816,7 +3195,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", @@ -2830,7 +3208,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", @@ -2840,10 +3217,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", @@ -2860,6 +3275,7 @@ grpc_cc_library( ], external_deps = [ "upb_lib", + "upb_lib_descriptor", ], language = "c++", deps = [ @@ -2907,6 +3323,7 @@ grpc_cc_library( ], external_deps = [ "upb_lib", + "upb_lib_descriptor", ], language = "c++", ) -- cgit v1.2.3