From 21cb320080c49fbff5d49204ac492d3c631dbace Mon Sep 17 00:00:00 2001 From: "Mark D. Roth" Date: Thu, 8 Feb 2024 16:55:21 -0800 Subject: [PATCH] [reorg] move service config code to src/core/service_config (#35843) Closes #35843 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/35843 from markdroth:client_channel_reorg4 0c50ada6f9c7c32530923303bc55bb1d52a0d9f0 PiperOrigin-RevId: 605466874 --- BUILD | 4 +-- CMakeLists.txt | 10 +++--- Makefile | 8 ++--- Package.swift | 12 +++---- build_autogenerated.yaml | 32 +++++++++---------- config.m4 | 6 ++-- config.w32 | 6 ++-- gRPC-C++.podspec | 16 +++++----- gRPC-Core.podspec | 20 ++++++------ grpc.gemspec | 12 +++---- grpc.gyp | 10 +++--- package.xml | 12 +++---- src/core/BUILD | 8 ++--- .../client_channel/client_channel_filter.cc | 4 +-- .../client_channel/client_channel_filter.h | 2 +- .../client_channel/client_channel_internal.h | 2 +- .../client_channel_service_config.h | 2 +- src/core/client_channel/config_selector.h | 2 +- src/core/client_channel/retry_filter.cc | 4 +-- .../client_channel/retry_service_config.h | 2 +- .../service_config_channel_arg_filter.cc | 8 ++--- .../fault_injection/fault_injection_filter.cc | 2 +- .../fault_injection_service_config_parser.h | 2 +- .../message_size/message_size_filter.cc | 2 +- .../message_size/message_size_filter.h | 2 +- src/core/ext/filters/rbac/rbac_filter.cc | 2 +- .../filters/rbac/rbac_service_config_parser.h | 2 +- .../server_config_selector.h | 4 +-- .../server_config_selector_filter.cc | 4 +-- .../stateful_session_filter.cc | 2 +- .../stateful_session_filter.h | 2 +- .../stateful_session_service_config_parser.h | 2 +- src/core/ext/xds/xds_server_config_fetcher.cc | 4 +-- src/core/lib/config/core_configuration.h | 2 +- src/core/load_balancing/ring_hash/ring_hash.h | 2 +- src/core/load_balancing/rls/rls.cc | 2 +- .../resolver/dns/c_ares/dns_resolver_ares.cc | 4 +-- .../event_engine_client_channel_resolver.cc | 4 +-- src/core/resolver/polling_resolver.cc | 2 +- src/core/resolver/resolver.h | 2 +- src/core/resolver/xds/xds_resolver.cc | 4 +-- .../resolver/xds/xds_resolver_attributes.h | 2 +- .../{lib => }/service_config/service_config.h | 8 ++--- .../service_config/service_config_call_data.h | 10 +++--- .../service_config/service_config_impl.cc | 4 +-- .../service_config/service_config_impl.h | 10 +++--- .../service_config/service_config_parser.cc | 2 +- .../service_config/service_config_parser.h | 6 ++-- src/cpp/common/validate_service_config.cc | 4 +-- src/python/grpcio/grpc_core_dependencies.py | 4 +-- .../client_channel_service_config_test.cc | 6 ++-- .../lb_policy/lb_policy_test_lib.h | 2 +- ...outlier_detection_lb_config_parser_test.cc | 4 +-- .../lb_policy/rls_lb_config_parser_test.cc | 4 +-- .../weighted_round_robin_config_test.cc | 4 +-- ...xds_override_host_lb_config_parser_test.cc | 4 +-- .../retry_service_config_test.cc | 6 ++-- test/core/end2end/no_server_test.cc | 2 +- .../rbac/rbac_service_config_parser_test.cc | 4 +-- .../message_size_service_config_test.cc | 6 ++-- .../service_config/service_config_test.cc | 6 ++-- ...channel_with_active_connect_stress_test.cc | 2 +- test/cpp/end2end/client_lb_end2end_test.cc | 4 +-- test/cpp/end2end/grpclb_end2end_test.cc | 2 +- test/cpp/end2end/rls_end2end_test.cc | 2 +- .../end2end/service_config_end2end_test.cc | 2 +- tools/doxygen/Doxyfile.c++.internal | 12 +++---- tools/doxygen/Doxyfile.core.internal | 12 +++---- 68 files changed, 184 insertions(+), 184 deletions(-) rename src/core/{lib => }/service_config/service_config.h (92%) rename src/core/{lib => }/service_config/service_config_call_data.h (91%) rename src/core/{lib => }/service_config/service_config_impl.cc (98%) rename src/core/{lib => }/service_config/service_config_impl.h (93%) rename src/core/{lib => }/service_config/service_config_parser.cc (97%) rename src/core/{lib => }/service_config/service_config_parser.h (94%) diff --git a/BUILD b/BUILD index 145f9803428..8b9c529c90e 100644 --- a/BUILD +++ b/BUILD @@ -2896,10 +2896,10 @@ grpc_cc_library( grpc_cc_library( name = "grpc_service_config_impl", srcs = [ - "//src/core:lib/service_config/service_config_impl.cc", + "//src/core:service_config/service_config_impl.cc", ], hdrs = [ - "//src/core:lib/service_config/service_config_impl.h", + "//src/core:service_config/service_config_impl.h", ], external_deps = [ "absl/status", diff --git a/CMakeLists.txt b/CMakeLists.txt index 797ee03bb3a..db9f40b0069 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2447,8 +2447,6 @@ add_library(grpc src/core/lib/security/transport/server_auth_filter.cc src/core/lib/security/transport/tsi_error.cc src/core/lib/security/util/json_util.cc - src/core/lib/service_config/service_config_impl.cc - src/core/lib/service_config/service_config_parser.cc src/core/lib/slice/b64.cc src/core/lib/slice/percent_encoding.cc src/core/lib/slice/slice.cc @@ -2548,6 +2546,8 @@ add_library(grpc src/core/resolver/xds/xds_dependency_manager.cc src/core/resolver/xds/xds_resolver.cc src/core/resolver/xds/xds_resolver_trace.cc + src/core/service_config/service_config_impl.cc + src/core/service_config/service_config_parser.cc src/core/tsi/alts/crypt/aes_gcm.cc src/core/tsi/alts/crypt/gsec.cc src/core/tsi/alts/frame_protector/alts_counter.cc @@ -3175,8 +3175,6 @@ add_library(grpc_unsecure src/core/lib/security/transport/server_auth_filter.cc src/core/lib/security/transport/tsi_error.cc src/core/lib/security/util/json_util.cc - src/core/lib/service_config/service_config_impl.cc - src/core/lib/service_config/service_config_parser.cc src/core/lib/slice/b64.cc src/core/lib/slice/percent_encoding.cc src/core/lib/slice/slice.cc @@ -3266,6 +3264,8 @@ add_library(grpc_unsecure src/core/resolver/resolver.cc src/core/resolver/resolver_registry.cc src/core/resolver/sockaddr/sockaddr_resolver.cc + src/core/service_config/service_config_impl.cc + src/core/service_config/service_config_parser.cc src/core/tsi/alts/handshaker/transport_security_common_api.cc src/core/tsi/fake_transport_security.cc src/core/tsi/local_transport_security.cc @@ -5300,7 +5300,6 @@ add_library(grpc_authorization_provider src/core/lib/security/transport/server_auth_filter.cc src/core/lib/security/transport/tsi_error.cc src/core/lib/security/util/json_util.cc - src/core/lib/service_config/service_config_parser.cc src/core/lib/slice/b64.cc src/core/lib/slice/percent_encoding.cc src/core/lib/slice/slice.cc @@ -5352,6 +5351,7 @@ add_library(grpc_authorization_provider src/core/resolver/endpoint_addresses.cc src/core/resolver/resolver.cc src/core/resolver/resolver_registry.cc + src/core/service_config/service_config_parser.cc src/core/tsi/alts/handshaker/transport_security_common_api.cc src/core/tsi/transport_security.cc src/core/tsi/transport_security_grpc.cc diff --git a/Makefile b/Makefile index 5ad65ba66e1..9fd6c6cd083 100644 --- a/Makefile +++ b/Makefile @@ -1629,8 +1629,6 @@ LIBGRPC_SRC = \ src/core/lib/security/transport/server_auth_filter.cc \ src/core/lib/security/transport/tsi_error.cc \ src/core/lib/security/util/json_util.cc \ - src/core/lib/service_config/service_config_impl.cc \ - src/core/lib/service_config/service_config_parser.cc \ src/core/lib/slice/b64.cc \ src/core/lib/slice/percent_encoding.cc \ src/core/lib/slice/slice.cc \ @@ -1730,6 +1728,8 @@ LIBGRPC_SRC = \ src/core/resolver/xds/xds_dependency_manager.cc \ src/core/resolver/xds/xds_resolver.cc \ src/core/resolver/xds/xds_resolver_trace.cc \ + src/core/service_config/service_config_impl.cc \ + src/core/service_config/service_config_parser.cc \ src/core/tsi/alts/crypt/aes_gcm.cc \ src/core/tsi/alts/crypt/gsec.cc \ src/core/tsi/alts/frame_protector/alts_counter.cc \ @@ -2191,8 +2191,6 @@ LIBGRPC_UNSECURE_SRC = \ src/core/lib/security/transport/server_auth_filter.cc \ src/core/lib/security/transport/tsi_error.cc \ src/core/lib/security/util/json_util.cc \ - src/core/lib/service_config/service_config_impl.cc \ - src/core/lib/service_config/service_config_parser.cc \ src/core/lib/slice/b64.cc \ src/core/lib/slice/percent_encoding.cc \ src/core/lib/slice/slice.cc \ @@ -2282,6 +2280,8 @@ LIBGRPC_UNSECURE_SRC = \ src/core/resolver/resolver.cc \ src/core/resolver/resolver_registry.cc \ src/core/resolver/sockaddr/sockaddr_resolver.cc \ + src/core/service_config/service_config_impl.cc \ + src/core/service_config/service_config_parser.cc \ src/core/tsi/alts/handshaker/transport_security_common_api.cc \ src/core/tsi/fake_transport_security.cc \ src/core/tsi/local_transport_security.cc \ diff --git a/Package.swift b/Package.swift index 6cf43da1fb0..26d2940c26a 100644 --- a/Package.swift +++ b/Package.swift @@ -1748,12 +1748,6 @@ let package = Package( "src/core/lib/security/transport/tsi_error.h", "src/core/lib/security/util/json_util.cc", "src/core/lib/security/util/json_util.h", - "src/core/lib/service_config/service_config.h", - "src/core/lib/service_config/service_config_call_data.h", - "src/core/lib/service_config/service_config_impl.cc", - "src/core/lib/service_config/service_config_impl.h", - "src/core/lib/service_config/service_config_parser.cc", - "src/core/lib/service_config/service_config_parser.h", "src/core/lib/slice/b64.cc", "src/core/lib/slice/b64.h", "src/core/lib/slice/percent_encoding.cc", @@ -1946,6 +1940,12 @@ let package = Package( "src/core/resolver/xds/xds_resolver_attributes.h", "src/core/resolver/xds/xds_resolver_trace.cc", "src/core/resolver/xds/xds_resolver_trace.h", + "src/core/service_config/service_config.h", + "src/core/service_config/service_config_call_data.h", + "src/core/service_config/service_config_impl.cc", + "src/core/service_config/service_config_impl.h", + "src/core/service_config/service_config_parser.cc", + "src/core/service_config/service_config_parser.h", "src/core/tsi/alts/crypt/aes_gcm.cc", "src/core/tsi/alts/crypt/gsec.cc", "src/core/tsi/alts/crypt/gsec.h", diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml index 04c2cd81a07..0ba22a14d77 100644 --- a/build_autogenerated.yaml +++ b/build_autogenerated.yaml @@ -1105,10 +1105,6 @@ libs: - src/core/lib/security/transport/security_handshaker.h - src/core/lib/security/transport/tsi_error.h - src/core/lib/security/util/json_util.h - - src/core/lib/service_config/service_config.h - - src/core/lib/service_config/service_config_call_data.h - - src/core/lib/service_config/service_config_impl.h - - src/core/lib/service_config/service_config_parser.h - src/core/lib/slice/b64.h - src/core/lib/slice/percent_encoding.h - src/core/lib/slice/slice.h @@ -1202,6 +1198,10 @@ libs: - src/core/resolver/xds/xds_dependency_manager.h - src/core/resolver/xds/xds_resolver_attributes.h - src/core/resolver/xds/xds_resolver_trace.h + - src/core/service_config/service_config.h + - src/core/service_config/service_config_call_data.h + - src/core/service_config/service_config_impl.h + - src/core/service_config/service_config_parser.h - src/core/tsi/alts/crypt/gsec.h - src/core/tsi/alts/frame_protector/alts_counter.h - src/core/tsi/alts/frame_protector/alts_crypter.h @@ -1904,8 +1904,6 @@ libs: - src/core/lib/security/transport/server_auth_filter.cc - src/core/lib/security/transport/tsi_error.cc - src/core/lib/security/util/json_util.cc - - src/core/lib/service_config/service_config_impl.cc - - src/core/lib/service_config/service_config_parser.cc - src/core/lib/slice/b64.cc - src/core/lib/slice/percent_encoding.cc - src/core/lib/slice/slice.cc @@ -2005,6 +2003,8 @@ libs: - src/core/resolver/xds/xds_dependency_manager.cc - src/core/resolver/xds/xds_resolver.cc - src/core/resolver/xds/xds_resolver_trace.cc + - src/core/service_config/service_config_impl.cc + - src/core/service_config/service_config_parser.cc - src/core/tsi/alts/crypt/aes_gcm.cc - src/core/tsi/alts/crypt/gsec.cc - src/core/tsi/alts/frame_protector/alts_counter.cc @@ -2566,10 +2566,6 @@ libs: - src/core/lib/security/transport/security_handshaker.h - src/core/lib/security/transport/tsi_error.h - src/core/lib/security/util/json_util.h - - src/core/lib/service_config/service_config.h - - src/core/lib/service_config/service_config_call_data.h - - src/core/lib/service_config/service_config_impl.h - - src/core/lib/service_config/service_config_parser.h - src/core/lib/slice/b64.h - src/core/lib/slice/percent_encoding.h - src/core/lib/slice/slice.h @@ -2657,6 +2653,10 @@ libs: - src/core/resolver/resolver_factory.h - src/core/resolver/resolver_registry.h - src/core/resolver/server_address.h + - src/core/service_config/service_config.h + - src/core/service_config/service_config_call_data.h + - src/core/service_config/service_config_impl.h + - src/core/service_config/service_config_parser.h - src/core/tsi/alts/handshaker/transport_security_common_api.h - src/core/tsi/fake_transport_security.h - src/core/tsi/local_transport_security.h @@ -2985,8 +2985,6 @@ libs: - src/core/lib/security/transport/server_auth_filter.cc - src/core/lib/security/transport/tsi_error.cc - src/core/lib/security/util/json_util.cc - - src/core/lib/service_config/service_config_impl.cc - - src/core/lib/service_config/service_config_parser.cc - src/core/lib/slice/b64.cc - src/core/lib/slice/percent_encoding.cc - src/core/lib/slice/slice.cc @@ -3076,6 +3074,8 @@ libs: - src/core/resolver/resolver.cc - src/core/resolver/resolver_registry.cc - src/core/resolver/sockaddr/sockaddr_resolver.cc + - src/core/service_config/service_config_impl.cc + - src/core/service_config/service_config_parser.cc - src/core/tsi/alts/handshaker/transport_security_common_api.cc - src/core/tsi/fake_transport_security.cc - src/core/tsi/local_transport_security.cc @@ -4641,9 +4641,6 @@ libs: - src/core/lib/security/transport/security_handshaker.h - src/core/lib/security/transport/tsi_error.h - src/core/lib/security/util/json_util.h - - src/core/lib/service_config/service_config.h - - src/core/lib/service_config/service_config_call_data.h - - src/core/lib/service_config/service_config_parser.h - src/core/lib/slice/b64.h - src/core/lib/slice/percent_encoding.h - src/core/lib/slice/slice.h @@ -4702,6 +4699,9 @@ libs: - src/core/resolver/resolver_factory.h - src/core/resolver/resolver_registry.h - src/core/resolver/server_address.h + - src/core/service_config/service_config.h + - src/core/service_config/service_config_call_data.h + - src/core/service_config/service_config_parser.h - src/core/tsi/alts/handshaker/transport_security_common_api.h - src/core/tsi/transport_security.h - src/core/tsi/transport_security_grpc.h @@ -4944,7 +4944,6 @@ libs: - src/core/lib/security/transport/server_auth_filter.cc - src/core/lib/security/transport/tsi_error.cc - src/core/lib/security/util/json_util.cc - - src/core/lib/service_config/service_config_parser.cc - src/core/lib/slice/b64.cc - src/core/lib/slice/percent_encoding.cc - src/core/lib/slice/slice.cc @@ -4996,6 +4995,7 @@ libs: - src/core/resolver/endpoint_addresses.cc - src/core/resolver/resolver.cc - src/core/resolver/resolver_registry.cc + - src/core/service_config/service_config_parser.cc - src/core/tsi/alts/handshaker/transport_security_common_api.cc - src/core/tsi/transport_security.cc - src/core/tsi/transport_security_grpc.cc diff --git a/config.m4 b/config.m4 index 7d05f7b8f43..b93d4bcebbb 100644 --- a/config.m4 +++ b/config.m4 @@ -757,8 +757,6 @@ if test "$PHP_GRPC" != "no"; then src/core/lib/security/transport/server_auth_filter.cc \ src/core/lib/security/transport/tsi_error.cc \ src/core/lib/security/util/json_util.cc \ - src/core/lib/service_config/service_config_impl.cc \ - src/core/lib/service_config/service_config_parser.cc \ src/core/lib/slice/b64.cc \ src/core/lib/slice/percent_encoding.cc \ src/core/lib/slice/slice.cc \ @@ -858,6 +856,8 @@ if test "$PHP_GRPC" != "no"; then src/core/resolver/xds/xds_dependency_manager.cc \ src/core/resolver/xds/xds_resolver.cc \ src/core/resolver/xds/xds_resolver_trace.cc \ + src/core/service_config/service_config_impl.cc \ + src/core/service_config/service_config_parser.cc \ src/core/tsi/alts/crypt/aes_gcm.cc \ src/core/tsi/alts/crypt/gsec.cc \ src/core/tsi/alts/frame_protector/alts_counter.cc \ @@ -1553,7 +1553,6 @@ if test "$PHP_GRPC" != "no"; then PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/security/security_connector/tls) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/security/transport) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/security/util) - PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/service_config) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/slice) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/surface) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/transport) @@ -1580,6 +1579,7 @@ if test "$PHP_GRPC" != "no"; then PHP_ADD_BUILD_DIR($ext_builddir/src/core/resolver/google_c2p) PHP_ADD_BUILD_DIR($ext_builddir/src/core/resolver/sockaddr) PHP_ADD_BUILD_DIR($ext_builddir/src/core/resolver/xds) + PHP_ADD_BUILD_DIR($ext_builddir/src/core/service_config) PHP_ADD_BUILD_DIR($ext_builddir/src/core/tsi) PHP_ADD_BUILD_DIR($ext_builddir/src/core/tsi/alts/crypt) PHP_ADD_BUILD_DIR($ext_builddir/src/core/tsi/alts/frame_protector) diff --git a/config.w32 b/config.w32 index 4a6bd77a184..e8e19a43c81 100644 --- a/config.w32 +++ b/config.w32 @@ -722,8 +722,6 @@ if (PHP_GRPC != "no") { "src\\core\\lib\\security\\transport\\server_auth_filter.cc " + "src\\core\\lib\\security\\transport\\tsi_error.cc " + "src\\core\\lib\\security\\util\\json_util.cc " + - "src\\core\\lib\\service_config\\service_config_impl.cc " + - "src\\core\\lib\\service_config\\service_config_parser.cc " + "src\\core\\lib\\slice\\b64.cc " + "src\\core\\lib\\slice\\percent_encoding.cc " + "src\\core\\lib\\slice\\slice.cc " + @@ -823,6 +821,8 @@ if (PHP_GRPC != "no") { "src\\core\\resolver\\xds\\xds_dependency_manager.cc " + "src\\core\\resolver\\xds\\xds_resolver.cc " + "src\\core\\resolver\\xds\\xds_resolver_trace.cc " + + "src\\core\\service_config\\service_config_impl.cc " + + "src\\core\\service_config\\service_config_parser.cc " + "src\\core\\tsi\\alts\\crypt\\aes_gcm.cc " + "src\\core\\tsi\\alts\\crypt\\gsec.cc " + "src\\core\\tsi\\alts\\frame_protector\\alts_counter.cc " + @@ -1691,7 +1691,6 @@ if (PHP_GRPC != "no") { FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\security\\security_connector\\tls"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\security\\transport"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\security\\util"); - FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\service_config"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\slice"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\surface"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\transport"); @@ -1718,6 +1717,7 @@ if (PHP_GRPC != "no") { FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\resolver\\google_c2p"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\resolver\\sockaddr"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\resolver\\xds"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\service_config"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\tsi"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\tsi\\alts"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\tsi\\alts\\crypt"); diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec index fd75e613cd3..ce7e8d11cd5 100644 --- a/gRPC-C++.podspec +++ b/gRPC-C++.podspec @@ -1209,10 +1209,6 @@ Pod::Spec.new do |s| 'src/core/lib/security/transport/security_handshaker.h', 'src/core/lib/security/transport/tsi_error.h', 'src/core/lib/security/util/json_util.h', - 'src/core/lib/service_config/service_config.h', - 'src/core/lib/service_config/service_config_call_data.h', - 'src/core/lib/service_config/service_config_impl.h', - 'src/core/lib/service_config/service_config_parser.h', 'src/core/lib/slice/b64.h', 'src/core/lib/slice/percent_encoding.h', 'src/core/lib/slice/slice.h', @@ -1306,6 +1302,10 @@ Pod::Spec.new do |s| 'src/core/resolver/xds/xds_dependency_manager.h', 'src/core/resolver/xds/xds_resolver_attributes.h', 'src/core/resolver/xds/xds_resolver_trace.h', + 'src/core/service_config/service_config.h', + 'src/core/service_config/service_config_call_data.h', + 'src/core/service_config/service_config_impl.h', + 'src/core/service_config/service_config_parser.h', 'src/core/tsi/alts/crypt/gsec.h', 'src/core/tsi/alts/frame_protector/alts_counter.h', 'src/core/tsi/alts/frame_protector/alts_crypter.h', @@ -2466,10 +2466,6 @@ Pod::Spec.new do |s| 'src/core/lib/security/transport/security_handshaker.h', 'src/core/lib/security/transport/tsi_error.h', 'src/core/lib/security/util/json_util.h', - 'src/core/lib/service_config/service_config.h', - 'src/core/lib/service_config/service_config_call_data.h', - 'src/core/lib/service_config/service_config_impl.h', - 'src/core/lib/service_config/service_config_parser.h', 'src/core/lib/slice/b64.h', 'src/core/lib/slice/percent_encoding.h', 'src/core/lib/slice/slice.h', @@ -2563,6 +2559,10 @@ Pod::Spec.new do |s| 'src/core/resolver/xds/xds_dependency_manager.h', 'src/core/resolver/xds/xds_resolver_attributes.h', 'src/core/resolver/xds/xds_resolver_trace.h', + 'src/core/service_config/service_config.h', + 'src/core/service_config/service_config_call_data.h', + 'src/core/service_config/service_config_impl.h', + 'src/core/service_config/service_config_parser.h', 'src/core/tsi/alts/crypt/gsec.h', 'src/core/tsi/alts/frame_protector/alts_counter.h', 'src/core/tsi/alts/frame_protector/alts_crypter.h', diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index 6c9edbce1d7..708c9fdc6ad 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -1857,12 +1857,6 @@ Pod::Spec.new do |s| 'src/core/lib/security/transport/tsi_error.h', 'src/core/lib/security/util/json_util.cc', 'src/core/lib/security/util/json_util.h', - 'src/core/lib/service_config/service_config.h', - 'src/core/lib/service_config/service_config_call_data.h', - 'src/core/lib/service_config/service_config_impl.cc', - 'src/core/lib/service_config/service_config_impl.h', - 'src/core/lib/service_config/service_config_parser.cc', - 'src/core/lib/service_config/service_config_parser.h', 'src/core/lib/slice/b64.cc', 'src/core/lib/slice/b64.h', 'src/core/lib/slice/percent_encoding.cc', @@ -2055,6 +2049,12 @@ Pod::Spec.new do |s| 'src/core/resolver/xds/xds_resolver_attributes.h', 'src/core/resolver/xds/xds_resolver_trace.cc', 'src/core/resolver/xds/xds_resolver_trace.h', + 'src/core/service_config/service_config.h', + 'src/core/service_config/service_config_call_data.h', + 'src/core/service_config/service_config_impl.cc', + 'src/core/service_config/service_config_impl.h', + 'src/core/service_config/service_config_parser.cc', + 'src/core/service_config/service_config_parser.h', 'src/core/tsi/alts/crypt/aes_gcm.cc', 'src/core/tsi/alts/crypt/gsec.cc', 'src/core/tsi/alts/crypt/gsec.h', @@ -3246,10 +3246,6 @@ Pod::Spec.new do |s| 'src/core/lib/security/transport/security_handshaker.h', 'src/core/lib/security/transport/tsi_error.h', 'src/core/lib/security/util/json_util.h', - 'src/core/lib/service_config/service_config.h', - 'src/core/lib/service_config/service_config_call_data.h', - 'src/core/lib/service_config/service_config_impl.h', - 'src/core/lib/service_config/service_config_parser.h', 'src/core/lib/slice/b64.h', 'src/core/lib/slice/percent_encoding.h', 'src/core/lib/slice/slice.h', @@ -3343,6 +3339,10 @@ Pod::Spec.new do |s| 'src/core/resolver/xds/xds_dependency_manager.h', 'src/core/resolver/xds/xds_resolver_attributes.h', 'src/core/resolver/xds/xds_resolver_trace.h', + 'src/core/service_config/service_config.h', + 'src/core/service_config/service_config_call_data.h', + 'src/core/service_config/service_config_impl.h', + 'src/core/service_config/service_config_parser.h', 'src/core/tsi/alts/crypt/gsec.h', 'src/core/tsi/alts/frame_protector/alts_counter.h', 'src/core/tsi/alts/frame_protector/alts_crypter.h', diff --git a/grpc.gemspec b/grpc.gemspec index 234cd253852..2cdbd2600bd 100644 --- a/grpc.gemspec +++ b/grpc.gemspec @@ -1750,12 +1750,6 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/security/transport/tsi_error.h ) s.files += %w( src/core/lib/security/util/json_util.cc ) s.files += %w( src/core/lib/security/util/json_util.h ) - s.files += %w( src/core/lib/service_config/service_config.h ) - s.files += %w( src/core/lib/service_config/service_config_call_data.h ) - s.files += %w( src/core/lib/service_config/service_config_impl.cc ) - s.files += %w( src/core/lib/service_config/service_config_impl.h ) - s.files += %w( src/core/lib/service_config/service_config_parser.cc ) - s.files += %w( src/core/lib/service_config/service_config_parser.h ) s.files += %w( src/core/lib/slice/b64.cc ) s.files += %w( src/core/lib/slice/b64.h ) s.files += %w( src/core/lib/slice/percent_encoding.cc ) @@ -1948,6 +1942,12 @@ Gem::Specification.new do |s| s.files += %w( src/core/resolver/xds/xds_resolver_attributes.h ) s.files += %w( src/core/resolver/xds/xds_resolver_trace.cc ) s.files += %w( src/core/resolver/xds/xds_resolver_trace.h ) + s.files += %w( src/core/service_config/service_config.h ) + s.files += %w( src/core/service_config/service_config_call_data.h ) + s.files += %w( src/core/service_config/service_config_impl.cc ) + s.files += %w( src/core/service_config/service_config_impl.h ) + s.files += %w( src/core/service_config/service_config_parser.cc ) + s.files += %w( src/core/service_config/service_config_parser.h ) s.files += %w( src/core/tsi/alts/crypt/aes_gcm.cc ) s.files += %w( src/core/tsi/alts/crypt/gsec.cc ) s.files += %w( src/core/tsi/alts/crypt/gsec.h ) diff --git a/grpc.gyp b/grpc.gyp index e7245887711..6cf0129fa3f 100644 --- a/grpc.gyp +++ b/grpc.gyp @@ -943,8 +943,6 @@ 'src/core/lib/security/transport/server_auth_filter.cc', 'src/core/lib/security/transport/tsi_error.cc', 'src/core/lib/security/util/json_util.cc', - 'src/core/lib/service_config/service_config_impl.cc', - 'src/core/lib/service_config/service_config_parser.cc', 'src/core/lib/slice/b64.cc', 'src/core/lib/slice/percent_encoding.cc', 'src/core/lib/slice/slice.cc', @@ -1044,6 +1042,8 @@ 'src/core/resolver/xds/xds_dependency_manager.cc', 'src/core/resolver/xds/xds_resolver.cc', 'src/core/resolver/xds/xds_resolver_trace.cc', + 'src/core/service_config/service_config_impl.cc', + 'src/core/service_config/service_config_parser.cc', 'src/core/tsi/alts/crypt/aes_gcm.cc', 'src/core/tsi/alts/crypt/gsec.cc', 'src/core/tsi/alts/frame_protector/alts_counter.cc', @@ -1445,8 +1445,6 @@ 'src/core/lib/security/transport/server_auth_filter.cc', 'src/core/lib/security/transport/tsi_error.cc', 'src/core/lib/security/util/json_util.cc', - 'src/core/lib/service_config/service_config_impl.cc', - 'src/core/lib/service_config/service_config_parser.cc', 'src/core/lib/slice/b64.cc', 'src/core/lib/slice/percent_encoding.cc', 'src/core/lib/slice/slice.cc', @@ -1536,6 +1534,8 @@ 'src/core/resolver/resolver.cc', 'src/core/resolver/resolver_registry.cc', 'src/core/resolver/sockaddr/sockaddr_resolver.cc', + 'src/core/service_config/service_config_impl.cc', + 'src/core/service_config/service_config_parser.cc', 'src/core/tsi/alts/handshaker/transport_security_common_api.cc', 'src/core/tsi/fake_transport_security.cc', 'src/core/tsi/local_transport_security.cc', @@ -2252,7 +2252,6 @@ 'src/core/lib/security/transport/server_auth_filter.cc', 'src/core/lib/security/transport/tsi_error.cc', 'src/core/lib/security/util/json_util.cc', - 'src/core/lib/service_config/service_config_parser.cc', 'src/core/lib/slice/b64.cc', 'src/core/lib/slice/percent_encoding.cc', 'src/core/lib/slice/slice.cc', @@ -2304,6 +2303,7 @@ 'src/core/resolver/endpoint_addresses.cc', 'src/core/resolver/resolver.cc', 'src/core/resolver/resolver_registry.cc', + 'src/core/service_config/service_config_parser.cc', 'src/core/tsi/alts/handshaker/transport_security_common_api.cc', 'src/core/tsi/transport_security.cc', 'src/core/tsi/transport_security_grpc.cc', diff --git a/package.xml b/package.xml index 4b276061aac..b33b90e2976 100644 --- a/package.xml +++ b/package.xml @@ -1732,12 +1732,6 @@ - - - - - - @@ -1930,6 +1924,12 @@ + + + + + + diff --git a/src/core/BUILD b/src/core/BUILD index b4779505fcb..da7e1f04af8 100644 --- a/src/core/BUILD +++ b/src/core/BUILD @@ -2884,8 +2884,8 @@ grpc_cc_library( grpc_cc_library( name = "grpc_service_config", hdrs = [ - "lib/service_config/service_config.h", - "lib/service_config/service_config_call_data.h", + "service_config/service_config.h", + "service_config/service_config_call_data.h", ], external_deps = ["absl/strings"], language = "c++", @@ -2906,10 +2906,10 @@ grpc_cc_library( grpc_cc_library( name = "service_config_parser", srcs = [ - "lib/service_config/service_config_parser.cc", + "service_config/service_config_parser.cc", ], hdrs = [ - "lib/service_config/service_config_parser.h", + "service_config/service_config_parser.h", ], external_deps = ["absl/strings"], language = "c++", diff --git a/src/core/client_channel/client_channel_filter.cc b/src/core/client_channel/client_channel_filter.cc index f54758aa490..fdd7a848d60 100644 --- a/src/core/client_channel/client_channel_filter.cc +++ b/src/core/client_channel/client_channel_filter.cc @@ -92,8 +92,8 @@ #include "src/core/lib/promise/promise.h" #include "src/core/lib/promise/try_seq.h" #include "src/core/lib/security/credentials/credentials.h" -#include "src/core/lib/service_config/service_config_call_data.h" -#include "src/core/lib/service_config/service_config_impl.h" +#include "src/core/service_config/service_config_call_data.h" +#include "src/core/service_config/service_config_impl.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/surface/call.h" diff --git a/src/core/client_channel/client_channel_filter.h b/src/core/client_channel/client_channel_filter.h index 7cafde97b94..e27178b4a67 100644 --- a/src/core/client_channel/client_channel_filter.h +++ b/src/core/client_channel/client_channel_filter.h @@ -63,7 +63,7 @@ #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/resource_quota/arena.h" -#include "src/core/lib/service_config/service_config.h" +#include "src/core/service_config/service_config.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/surface/channel.h" #include "src/core/lib/transport/connectivity_state.h" diff --git a/src/core/client_channel/client_channel_internal.h b/src/core/client_channel/client_channel_internal.h index 33590550130..fc61b6685d9 100644 --- a/src/core/client_channel/client_channel_internal.h +++ b/src/core/client_channel/client_channel_internal.h @@ -29,7 +29,7 @@ #include "src/core/lib/channel/context.h" #include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/lib/resource_quota/arena.h" -#include "src/core/lib/service_config/service_config_call_data.h" +#include "src/core/service_config/service_config_call_data.h" #include "src/core/load_balancing/lb_policy.h" // diff --git a/src/core/client_channel/client_channel_service_config.h b/src/core/client_channel/client_channel_service_config.h index 7bbcf772a2f..070d2bce315 100644 --- a/src/core/client_channel/client_channel_service_config.h +++ b/src/core/client_channel/client_channel_service_config.h @@ -35,7 +35,7 @@ #include "src/core/lib/json/json.h" #include "src/core/lib/json/json_args.h" #include "src/core/lib/json/json_object_loader.h" -#include "src/core/lib/service_config/service_config_parser.h" +#include "src/core/service_config/service_config_parser.h" #include "src/core/load_balancing/lb_policy.h" namespace grpc_core { diff --git a/src/core/client_channel/config_selector.h b/src/core/client_channel/config_selector.h index 265a1d01d32..cee71b86c06 100644 --- a/src/core/client_channel/config_selector.h +++ b/src/core/client_channel/config_selector.h @@ -36,7 +36,7 @@ #include "src/core/lib/gprpp/ref_counted.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/resource_quota/arena.h" -#include "src/core/lib/service_config/service_config.h" +#include "src/core/service_config/service_config.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/transport/metadata_batch.h" diff --git a/src/core/client_channel/retry_filter.cc b/src/core/client_channel/retry_filter.cc index d328ad00f53..b00899392f6 100644 --- a/src/core/client_channel/retry_filter.cc +++ b/src/core/client_channel/retry_filter.cc @@ -35,8 +35,8 @@ #include "src/core/lib/debug/trace.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/error.h" -#include "src/core/lib/service_config/service_config.h" -#include "src/core/lib/service_config/service_config_call_data.h" +#include "src/core/service_config/service_config.h" +#include "src/core/service_config/service_config_call_data.h" #include "src/core/lib/uri/uri_parser.h" // diff --git a/src/core/client_channel/retry_service_config.h b/src/core/client_channel/retry_service_config.h index 92f0272a28b..3039df511e1 100644 --- a/src/core/client_channel/retry_service_config.h +++ b/src/core/client_channel/retry_service_config.h @@ -35,7 +35,7 @@ #include "src/core/lib/json/json.h" #include "src/core/lib/json/json_args.h" #include "src/core/lib/json/json_object_loader.h" -#include "src/core/lib/service_config/service_config_parser.h" +#include "src/core/service_config/service_config_parser.h" namespace grpc_core { namespace internal { diff --git a/src/core/client_channel/service_config_channel_arg_filter.cc b/src/core/client_channel/service_config_channel_arg_filter.cc index 639d2c0a8b5..fda1006f97f 100644 --- a/src/core/client_channel/service_config_channel_arg_filter.cc +++ b/src/core/client_channel/service_config_channel_arg_filter.cc @@ -42,10 +42,10 @@ #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/resource_quota/arena.h" -#include "src/core/lib/service_config/service_config.h" -#include "src/core/lib/service_config/service_config_call_data.h" -#include "src/core/lib/service_config/service_config_impl.h" -#include "src/core/lib/service_config/service_config_parser.h" +#include "src/core/service_config/service_config.h" +#include "src/core/service_config/service_config_call_data.h" +#include "src/core/service_config/service_config_impl.h" +#include "src/core/service_config/service_config_parser.h" #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" diff --git a/src/core/ext/filters/fault_injection/fault_injection_filter.cc b/src/core/ext/filters/fault_injection/fault_injection_filter.cc index 6ddc4c26230..1ab908fb74d 100644 --- a/src/core/ext/filters/fault_injection/fault_injection_filter.cc +++ b/src/core/ext/filters/fault_injection/fault_injection_filter.cc @@ -47,9 +47,9 @@ #include "src/core/lib/promise/context.h" #include "src/core/lib/promise/sleep.h" #include "src/core/lib/promise/try_seq.h" -#include "src/core/lib/service_config/service_config_call_data.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/service_config/service_config_call_data.h" namespace grpc_core { diff --git a/src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h b/src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h index acd8aa72491..4cb2c1b03bb 100644 --- a/src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h +++ b/src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h @@ -38,7 +38,7 @@ #include "src/core/lib/json/json.h" #include "src/core/lib/json/json_args.h" #include "src/core/lib/json/json_object_loader.h" -#include "src/core/lib/service_config/service_config_parser.h" +#include "src/core/service_config/service_config_parser.h" // Channel arg key for enabling parsing fault injection via method config. #define GRPC_ARG_PARSE_FAULT_INJECTION_METHOD_CONFIG \ diff --git a/src/core/ext/filters/message_size/message_size_filter.cc b/src/core/ext/filters/message_size/message_size_filter.cc index d4b58307512..c9fe96cc41c 100644 --- a/src/core/ext/filters/message_size/message_size_filter.cc +++ b/src/core/ext/filters/message_size/message_size_filter.cc @@ -40,13 +40,13 @@ #include "src/core/lib/promise/latch.h" #include "src/core/lib/promise/race.h" #include "src/core/lib/resource_quota/arena.h" -#include "src/core/lib/service_config/service_config_call_data.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_buffer.h" #include "src/core/lib/surface/call_trace.h" #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/service_config/service_config_call_data.h" namespace grpc_core { diff --git a/src/core/ext/filters/message_size/message_size_filter.h b/src/core/ext/filters/message_size/message_size_filter.h index 647aeeed94f..3a9ea1f2064 100644 --- a/src/core/ext/filters/message_size/message_size_filter.h +++ b/src/core/ext/filters/message_size/message_size_filter.h @@ -38,8 +38,8 @@ #include "src/core/lib/json/json_args.h" #include "src/core/lib/json/json_object_loader.h" #include "src/core/lib/promise/arena_promise.h" -#include "src/core/lib/service_config/service_config_parser.h" #include "src/core/lib/transport/transport.h" +#include "src/core/service_config/service_config_parser.h" namespace grpc_core { diff --git a/src/core/ext/filters/rbac/rbac_filter.cc b/src/core/ext/filters/rbac/rbac_filter.cc index 3481b434bb8..a006135bee4 100644 --- a/src/core/ext/filters/rbac/rbac_filter.cc +++ b/src/core/ext/filters/rbac/rbac_filter.cc @@ -37,9 +37,9 @@ #include "src/core/lib/security/authorization/authorization_engine.h" #include "src/core/lib/security/authorization/grpc_authorization_engine.h" #include "src/core/lib/security/context/security_context.h" -#include "src/core/lib/service_config/service_config_call_data.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/service_config/service_config_call_data.h" namespace grpc_core { diff --git a/src/core/ext/filters/rbac/rbac_service_config_parser.h b/src/core/ext/filters/rbac/rbac_service_config_parser.h index bdf9b662534..4d1ff294d14 100644 --- a/src/core/ext/filters/rbac/rbac_service_config_parser.h +++ b/src/core/ext/filters/rbac/rbac_service_config_parser.h @@ -34,7 +34,7 @@ #include "src/core/lib/json/json.h" #include "src/core/lib/security/authorization/grpc_authorization_engine.h" #include "src/core/lib/security/authorization/rbac_policy.h" -#include "src/core/lib/service_config/service_config_parser.h" +#include "src/core/service_config/service_config_parser.h" namespace grpc_core { diff --git a/src/core/ext/filters/server_config_selector/server_config_selector.h b/src/core/ext/filters/server_config_selector/server_config_selector.h index 5f55cff3aa8..924aed3778d 100644 --- a/src/core/ext/filters/server_config_selector/server_config_selector.h +++ b/src/core/ext/filters/server_config_selector/server_config_selector.h @@ -28,9 +28,9 @@ #include "src/core/lib/gprpp/dual_ref_counted.h" #include "src/core/lib/gprpp/ref_counted.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/service_config/service_config.h" -#include "src/core/lib/service_config/service_config_parser.h" #include "src/core/lib/transport/metadata_batch.h" +#include "src/core/service_config/service_config.h" +#include "src/core/service_config/service_config_parser.h" namespace grpc_core { diff --git a/src/core/ext/filters/server_config_selector/server_config_selector_filter.cc b/src/core/ext/filters/server_config_selector/server_config_selector_filter.cc index b79090ddab9..fc78beba190 100644 --- a/src/core/ext/filters/server_config_selector/server_config_selector_filter.cc +++ b/src/core/ext/filters/server_config_selector/server_config_selector_filter.cc @@ -38,10 +38,10 @@ #include "src/core/lib/promise/context.h" #include "src/core/lib/promise/promise.h" #include "src/core/lib/resource_quota/arena.h" -#include "src/core/lib/service_config/service_config.h" -#include "src/core/lib/service_config/service_config_call_data.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/service_config/service_config.h" +#include "src/core/service_config/service_config_call_data.h" namespace grpc_core { diff --git a/src/core/ext/filters/stateful_session/stateful_session_filter.cc b/src/core/ext/filters/stateful_session/stateful_session_filter.cc index 19f72a4831d..f9dab68ab5a 100644 --- a/src/core/ext/filters/stateful_session/stateful_session_filter.cc +++ b/src/core/ext/filters/stateful_session/stateful_session_filter.cc @@ -49,11 +49,11 @@ #include "src/core/lib/promise/map.h" #include "src/core/lib/promise/pipe.h" #include "src/core/lib/resource_quota/arena.h" -#include "src/core/lib/service_config/service_config_call_data.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" #include "src/core/resolver/xds/xds_resolver_attributes.h" +#include "src/core/service_config/service_config_call_data.h" namespace grpc_core { diff --git a/src/core/ext/filters/stateful_session/stateful_session_filter.h b/src/core/ext/filters/stateful_session/stateful_session_filter.h index 29b5c878dd9..1fc27e1508b 100644 --- a/src/core/ext/filters/stateful_session/stateful_session_filter.h +++ b/src/core/ext/filters/stateful_session/stateful_session_filter.h @@ -33,8 +33,8 @@ #include "src/core/lib/gprpp/ref_counted_string.h" #include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/lib/promise/arena_promise.h" -#include "src/core/lib/service_config/service_config_call_data.h" #include "src/core/lib/transport/transport.h" +#include "src/core/service_config/service_config_call_data.h" namespace grpc_core { diff --git a/src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h b/src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h index 4b57d233d4d..876c0fda405 100644 --- a/src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h +++ b/src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h @@ -35,7 +35,7 @@ #include "src/core/lib/json/json.h" #include "src/core/lib/json/json_args.h" #include "src/core/lib/json/json_object_loader.h" -#include "src/core/lib/service_config/service_config_parser.h" +#include "src/core/service_config/service_config_parser.h" // Channel arg key for enabling parsing fault injection via method config. #define GRPC_ARG_PARSE_STATEFUL_SESSION_METHOD_CONFIG \ diff --git a/src/core/ext/xds/xds_server_config_fetcher.cc b/src/core/ext/xds/xds_server_config_fetcher.cc index 6c911696013..b996a7b56d8 100644 --- a/src/core/ext/xds/xds_server_config_fetcher.cc +++ b/src/core/ext/xds/xds_server_config_fetcher.cc @@ -82,12 +82,12 @@ #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h" #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h" #include "src/core/lib/security/credentials/xds/xds_credentials.h" -#include "src/core/lib/service_config/service_config.h" -#include "src/core/lib/service_config/service_config_impl.h" #include "src/core/lib/surface/api_trace.h" #include "src/core/lib/surface/server.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/uri/uri_parser.h" +#include "src/core/service_config/service_config.h" +#include "src/core/service_config/service_config_impl.h" namespace grpc_core { namespace { diff --git a/src/core/lib/config/core_configuration.h b/src/core/lib/config/core_configuration.h index 327f9be8ce2..761eb5d1fc0 100644 --- a/src/core/lib/config/core_configuration.h +++ b/src/core/lib/config/core_configuration.h @@ -27,11 +27,11 @@ #include "src/core/lib/handshaker/proxy_mapper_registry.h" #include "src/core/lib/security/certificate_provider/certificate_provider_registry.h" #include "src/core/lib/security/credentials/channel_creds_registry.h" -#include "src/core/lib/service_config/service_config_parser.h" #include "src/core/lib/surface/channel_init.h" #include "src/core/lib/transport/handshaker_registry.h" #include "src/core/load_balancing/lb_policy_registry.h" #include "src/core/resolver/resolver_registry.h" +#include "src/core/service_config/service_config_parser.h" namespace grpc_core { diff --git a/src/core/load_balancing/ring_hash/ring_hash.h b/src/core/load_balancing/ring_hash/ring_hash.h index b70c3c9ddc1..d2b564e806f 100644 --- a/src/core/load_balancing/ring_hash/ring_hash.h +++ b/src/core/load_balancing/ring_hash/ring_hash.h @@ -26,7 +26,7 @@ #include "src/core/lib/json/json.h" #include "src/core/lib/json/json_args.h" #include "src/core/lib/json/json_object_loader.h" -#include "src/core/lib/service_config/service_config_call_data.h" +#include "src/core/service_config/service_config_call_data.h" namespace grpc_core { diff --git a/src/core/load_balancing/rls/rls.cc b/src/core/load_balancing/rls/rls.cc index 2ce049d9a6f..e62efb4a1f3 100644 --- a/src/core/load_balancing/rls/rls.cc +++ b/src/core/load_balancing/rls/rls.cc @@ -88,7 +88,7 @@ #include "src/core/lib/json/json_object_loader.h" #include "src/core/lib/json/json_writer.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" -#include "src/core/lib/service_config/service_config_impl.h" +#include "src/core/service_config/service_config_impl.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/surface/call.h" diff --git a/src/core/resolver/dns/c_ares/dns_resolver_ares.cc b/src/core/resolver/dns/c_ares/dns_resolver_ares.cc index 400816bcabd..aa50e62005d 100644 --- a/src/core/resolver/dns/c_ares/dns_resolver_ares.cc +++ b/src/core/resolver/dns/c_ares/dns_resolver_ares.cc @@ -53,7 +53,7 @@ #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/resolver/resolver.h" #include "src/core/resolver/resolver_factory.h" -#include "src/core/lib/service_config/service_config.h" +#include "src/core/service_config/service_config.h" #include "src/core/lib/uri/uri_parser.h" #if GRPC_ARES == 1 @@ -67,7 +67,7 @@ #include "src/core/lib/config/config_vars.h" #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/resolver/endpoint_addresses.h" -#include "src/core/lib/service_config/service_config_impl.h" +#include "src/core/service_config/service_config_impl.h" #include "src/core/lib/transport/error_utils.h" #include "src/core/load_balancing/grpclb/grpclb_balancer_addresses.h" #include "src/core/resolver/dns/c_ares/grpc_ares_wrapper.h" diff --git a/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.cc b/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.cc index 14ef76734a0..1305580fe7c 100644 --- a/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.cc +++ b/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.cc @@ -49,8 +49,8 @@ #include "src/core/lib/gprpp/validation_errors.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/resolve_address.h" -#include "src/core/lib/service_config/service_config.h" -#include "src/core/lib/service_config/service_config_impl.h" +#include "src/core/service_config/service_config.h" +#include "src/core/service_config/service_config_impl.h" #include "src/core/load_balancing/grpclb/grpclb_balancer_addresses.h" #include "src/core/resolver/dns/event_engine/service_config_helper.h" #include "src/core/resolver/endpoint_addresses.h" diff --git a/src/core/resolver/polling_resolver.cc b/src/core/resolver/polling_resolver.cc index 01956a2c8e1..74bd5c05ece 100644 --- a/src/core/resolver/polling_resolver.cc +++ b/src/core/resolver/polling_resolver.cc @@ -39,7 +39,7 @@ #include "src/core/lib/gprpp/work_serializer.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/resolver/endpoint_addresses.h" -#include "src/core/lib/service_config/service_config.h" +#include "src/core/service_config/service_config.h" #include "src/core/lib/uri/uri_parser.h" namespace grpc_core { diff --git a/src/core/resolver/resolver.h b/src/core/resolver/resolver.h index de6379c83e8..107f92ff4b4 100644 --- a/src/core/resolver/resolver.h +++ b/src/core/resolver/resolver.h @@ -31,7 +31,7 @@ #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/server_address.h" // IWYU pragma: keep -#include "src/core/lib/service_config/service_config.h" +#include "src/core/service_config/service_config.h" extern grpc_core::DebugOnlyTraceFlag grpc_trace_resolver_refcount; diff --git a/src/core/resolver/xds/xds_resolver.cc b/src/core/resolver/xds/xds_resolver.cc index 6ac69817204..ce2f33482dd 100644 --- a/src/core/resolver/xds/xds_resolver.cc +++ b/src/core/resolver/xds/xds_resolver.cc @@ -83,8 +83,8 @@ #include "src/core/resolver/resolver.h" #include "src/core/resolver/resolver_factory.h" #include "src/core/lib/resource_quota/arena.h" -#include "src/core/lib/service_config/service_config.h" -#include "src/core/lib/service_config/service_config_impl.h" +#include "src/core/service_config/service_config.h" +#include "src/core/service_config/service_config_impl.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" diff --git a/src/core/resolver/xds/xds_resolver_attributes.h b/src/core/resolver/xds/xds_resolver_attributes.h index cfe833db798..c7f585f1b38 100644 --- a/src/core/resolver/xds/xds_resolver_attributes.h +++ b/src/core/resolver/xds/xds_resolver_attributes.h @@ -22,7 +22,7 @@ #include "absl/strings/string_view.h" #include "src/core/lib/gprpp/unique_type_name.h" -#include "src/core/lib/service_config/service_config_call_data.h" +#include "src/core/service_config/service_config_call_data.h" namespace grpc_core { diff --git a/src/core/lib/service_config/service_config.h b/src/core/service_config/service_config.h similarity index 92% rename from src/core/lib/service_config/service_config.h rename to src/core/service_config/service_config.h index d3ea9e80837..6453e2401cc 100644 --- a/src/core/lib/service_config/service_config.h +++ b/src/core/service_config/service_config.h @@ -14,8 +14,8 @@ // limitations under the License. // -#ifndef GRPC_SRC_CORE_LIB_SERVICE_CONFIG_SERVICE_CONFIG_H -#define GRPC_SRC_CORE_LIB_SERVICE_CONFIG_SERVICE_CONFIG_H +#ifndef GRPC_SRC_CORE_SERVICE_CONFIG_SERVICE_CONFIG_H +#define GRPC_SRC_CORE_SERVICE_CONFIG_SERVICE_CONFIG_H #include @@ -27,7 +27,7 @@ #include "src/core/lib/gpr/useful.h" #include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/service_config/service_config_parser.h" +#include "src/core/service_config/service_config_parser.h" // The main purpose of the code here is to parse the service config in // JSON form, which will look like this: @@ -86,4 +86,4 @@ class ServiceConfig : public RefCounted { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_SERVICE_CONFIG_SERVICE_CONFIG_H +#endif // GRPC_SRC_CORE_SERVICE_CONFIG_SERVICE_CONFIG_H diff --git a/src/core/lib/service_config/service_config_call_data.h b/src/core/service_config/service_config_call_data.h similarity index 91% rename from src/core/lib/service_config/service_config_call_data.h rename to src/core/service_config/service_config_call_data.h index 661f92755d4..b549f4dcaaf 100644 --- a/src/core/lib/service_config/service_config_call_data.h +++ b/src/core/service_config/service_config_call_data.h @@ -14,8 +14,8 @@ // limitations under the License. // -#ifndef GRPC_SRC_CORE_LIB_SERVICE_CONFIG_SERVICE_CONFIG_CALL_DATA_H -#define GRPC_SRC_CORE_LIB_SERVICE_CONFIG_SERVICE_CONFIG_CALL_DATA_H +#ifndef GRPC_SRC_CORE_SERVICE_CONFIG_SERVICE_CONFIG_CALL_DATA_H +#define GRPC_SRC_CORE_SERVICE_CONFIG_SERVICE_CONFIG_CALL_DATA_H #include @@ -29,8 +29,8 @@ #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/lib/resource_quota/arena.h" -#include "src/core/lib/service_config/service_config.h" -#include "src/core/lib/service_config/service_config_parser.h" +#include "src/core/service_config/service_config.h" +#include "src/core/service_config/service_config_parser.h" namespace grpc_core { @@ -113,4 +113,4 @@ class ServiceConfigCallData { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_SERVICE_CONFIG_SERVICE_CONFIG_CALL_DATA_H +#endif // GRPC_SRC_CORE_SERVICE_CONFIG_SERVICE_CONFIG_CALL_DATA_H diff --git a/src/core/lib/service_config/service_config_impl.cc b/src/core/service_config/service_config_impl.cc similarity index 98% rename from src/core/lib/service_config/service_config_impl.cc rename to src/core/service_config/service_config_impl.cc index ec1e3671150..ccd0559b579 100644 --- a/src/core/lib/service_config/service_config_impl.cc +++ b/src/core/service_config/service_config_impl.cc @@ -16,7 +16,7 @@ #include -#include "src/core/lib/service_config/service_config_impl.h" +#include "src/core/service_config/service_config_impl.h" #include @@ -36,9 +36,9 @@ #include "src/core/lib/json/json_object_loader.h" #include "src/core/lib/json/json_reader.h" #include "src/core/lib/json/json_writer.h" -#include "src/core/lib/service_config/service_config_parser.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/service_config/service_config_parser.h" namespace grpc_core { diff --git a/src/core/lib/service_config/service_config_impl.h b/src/core/service_config/service_config_impl.h similarity index 93% rename from src/core/lib/service_config/service_config_impl.h rename to src/core/service_config/service_config_impl.h index d220a7b32d0..499110d11c3 100644 --- a/src/core/lib/service_config/service_config_impl.h +++ b/src/core/service_config/service_config_impl.h @@ -14,8 +14,8 @@ // limitations under the License. // -#ifndef GRPC_SRC_CORE_LIB_SERVICE_CONFIG_SERVICE_CONFIG_IMPL_H -#define GRPC_SRC_CORE_LIB_SERVICE_CONFIG_SERVICE_CONFIG_IMPL_H +#ifndef GRPC_SRC_CORE_SERVICE_CONFIG_SERVICE_CONFIG_IMPL_H +#define GRPC_SRC_CORE_SERVICE_CONFIG_SERVICE_CONFIG_IMPL_H #include @@ -36,9 +36,9 @@ #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/validation_errors.h" #include "src/core/lib/json/json.h" -#include "src/core/lib/service_config/service_config.h" -#include "src/core/lib/service_config/service_config_parser.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/service_config/service_config.h" +#include "src/core/service_config/service_config_parser.h" // The main purpose of the code here is to parse the service config in // JSON form, which will look like this: @@ -122,4 +122,4 @@ class ServiceConfigImpl final : public ServiceConfig { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_SERVICE_CONFIG_SERVICE_CONFIG_IMPL_H +#endif // GRPC_SRC_CORE_SERVICE_CONFIG_SERVICE_CONFIG_IMPL_H diff --git a/src/core/lib/service_config/service_config_parser.cc b/src/core/service_config/service_config_parser.cc similarity index 97% rename from src/core/lib/service_config/service_config_parser.cc rename to src/core/service_config/service_config_parser.cc index c97f7daae55..e67c8a509fd 100644 --- a/src/core/lib/service_config/service_config_parser.cc +++ b/src/core/service_config/service_config_parser.cc @@ -16,7 +16,7 @@ #include -#include "src/core/lib/service_config/service_config_parser.h" +#include "src/core/service_config/service_config_parser.h" #include diff --git a/src/core/lib/service_config/service_config_parser.h b/src/core/service_config/service_config_parser.h similarity index 94% rename from src/core/lib/service_config/service_config_parser.h rename to src/core/service_config/service_config_parser.h index 41147adf906..b88255d12db 100644 --- a/src/core/lib/service_config/service_config_parser.h +++ b/src/core/service_config/service_config_parser.h @@ -14,8 +14,8 @@ // limitations under the License. // -#ifndef GRPC_SRC_CORE_LIB_SERVICE_CONFIG_SERVICE_CONFIG_PARSER_H -#define GRPC_SRC_CORE_LIB_SERVICE_CONFIG_SERVICE_CONFIG_PARSER_H +#ifndef GRPC_SRC_CORE_SERVICE_CONFIG_SERVICE_CONFIG_PARSER_H +#define GRPC_SRC_CORE_SERVICE_CONFIG_SERVICE_CONFIG_PARSER_H #include @@ -102,4 +102,4 @@ class ServiceConfigParser { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_SERVICE_CONFIG_SERVICE_CONFIG_PARSER_H +#endif // GRPC_SRC_CORE_SERVICE_CONFIG_SERVICE_CONFIG_PARSER_H diff --git a/src/cpp/common/validate_service_config.cc b/src/cpp/common/validate_service_config.cc index b606a33e0ba..bdd92f60e1a 100644 --- a/src/cpp/common/validate_service_config.cc +++ b/src/cpp/common/validate_service_config.cc @@ -26,8 +26,8 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/service_config/service_config.h" -#include "src/core/lib/service_config/service_config_impl.h" +#include "src/core/service_config/service_config.h" +#include "src/core/service_config/service_config_impl.h" namespace grpc { namespace experimental { diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py index 2551487924b..4a56cb502d2 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -731,8 +731,6 @@ CORE_SOURCE_FILES = [ 'src/core/lib/security/transport/server_auth_filter.cc', 'src/core/lib/security/transport/tsi_error.cc', 'src/core/lib/security/util/json_util.cc', - 'src/core/lib/service_config/service_config_impl.cc', - 'src/core/lib/service_config/service_config_parser.cc', 'src/core/lib/slice/b64.cc', 'src/core/lib/slice/percent_encoding.cc', 'src/core/lib/slice/slice.cc', @@ -832,6 +830,8 @@ CORE_SOURCE_FILES = [ 'src/core/resolver/xds/xds_dependency_manager.cc', 'src/core/resolver/xds/xds_resolver.cc', 'src/core/resolver/xds/xds_resolver_trace.cc', + 'src/core/service_config/service_config_impl.cc', + 'src/core/service_config/service_config_parser.cc', 'src/core/tsi/alts/crypt/aes_gcm.cc', 'src/core/tsi/alts/crypt/gsec.cc', 'src/core/tsi/alts/frame_protector/alts_counter.cc', diff --git a/test/core/client_channel/client_channel_service_config_test.cc b/test/core/client_channel/client_channel_service_config_test.cc index b857c85c2ea..5d2904a1ad7 100644 --- a/test/core/client_channel/client_channel_service_config_test.cc +++ b/test/core/client_channel/client_channel_service_config_test.cc @@ -26,9 +26,9 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/gprpp/time.h" -#include "src/core/lib/service_config/service_config.h" -#include "src/core/lib/service_config/service_config_impl.h" -#include "src/core/lib/service_config/service_config_parser.h" +#include "src/core/service_config/service_config.h" +#include "src/core/service_config/service_config_impl.h" +#include "src/core/service_config/service_config_parser.h" #include "test/core/util/test_config.h" namespace grpc_core { diff --git a/test/core/client_channel/lb_policy/lb_policy_test_lib.h b/test/core/client_channel/lb_policy/lb_policy_test_lib.h index 83ed95e9e09..3c8b8c8de31 100644 --- a/test/core/client_channel/lb_policy/lb_policy_test_lib.h +++ b/test/core/client_channel/lb_policy/lb_policy_test_lib.h @@ -74,7 +74,6 @@ #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/json/json.h" #include "src/core/lib/security/credentials/credentials.h" -#include "src/core/lib/service_config/service_config_call_data.h" #include "src/core/lib/transport/connectivity_state.h" #include "src/core/lib/uri/uri_parser.h" #include "src/core/load_balancing/backend_metric_data.h" @@ -85,6 +84,7 @@ #include "src/core/load_balancing/oob_backend_metric_internal.h" #include "src/core/load_balancing/subchannel_interface.h" #include "src/core/resolver/endpoint_addresses.h" +#include "src/core/service_config/service_config_call_data.h" #include "test/core/event_engine/event_engine_test_utils.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.pb.h" diff --git a/test/core/client_channel/lb_policy/outlier_detection_lb_config_parser_test.cc b/test/core/client_channel/lb_policy/outlier_detection_lb_config_parser_test.cc index a7fede5a639..7ddbe6a8259 100644 --- a/test/core/client_channel/lb_policy/outlier_detection_lb_config_parser_test.cc +++ b/test/core/client_channel/lb_policy/outlier_detection_lb_config_parser_test.cc @@ -25,8 +25,8 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/service_config/service_config.h" -#include "src/core/lib/service_config/service_config_impl.h" +#include "src/core/service_config/service_config.h" +#include "src/core/service_config/service_config_impl.h" #include "test/core/util/test_config.h" namespace grpc_core { diff --git a/test/core/client_channel/lb_policy/rls_lb_config_parser_test.cc b/test/core/client_channel/lb_policy/rls_lb_config_parser_test.cc index 3ed3bae3c19..0f98189d112 100644 --- a/test/core/client_channel/lb_policy/rls_lb_config_parser_test.cc +++ b/test/core/client_channel/lb_policy/rls_lb_config_parser_test.cc @@ -25,8 +25,8 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/service_config/service_config.h" -#include "src/core/lib/service_config/service_config_impl.h" +#include "src/core/service_config/service_config.h" +#include "src/core/service_config/service_config_impl.h" #include "test/core/util/test_config.h" namespace grpc_core { diff --git a/test/core/client_channel/lb_policy/weighted_round_robin_config_test.cc b/test/core/client_channel/lb_policy/weighted_round_robin_config_test.cc index 000d2db30e3..c04aaa50cb7 100644 --- a/test/core/client_channel/lb_policy/weighted_round_robin_config_test.cc +++ b/test/core/client_channel/lb_policy/weighted_round_robin_config_test.cc @@ -24,8 +24,8 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/service_config/service_config.h" -#include "src/core/lib/service_config/service_config_impl.h" +#include "src/core/service_config/service_config.h" +#include "src/core/service_config/service_config_impl.h" #include "test/core/util/test_config.h" namespace grpc_core { diff --git a/test/core/client_channel/lb_policy/xds_override_host_lb_config_parser_test.cc b/test/core/client_channel/lb_policy/xds_override_host_lb_config_parser_test.cc index ace8c54dadb..6126050a532 100644 --- a/test/core/client_channel/lb_policy/xds_override_host_lb_config_parser_test.cc +++ b/test/core/client_channel/lb_policy/xds_override_host_lb_config_parser_test.cc @@ -26,9 +26,9 @@ #include "src/core/ext/xds/xds_health_status.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/service_config/service_config.h" -#include "src/core/lib/service_config/service_config_impl.h" #include "src/core/load_balancing/xds/xds_override_host.h" +#include "src/core/service_config/service_config.h" +#include "src/core/service_config/service_config_impl.h" #include "test/core/util/test_config.h" namespace grpc_core { diff --git a/test/core/client_channel/retry_service_config_test.cc b/test/core/client_channel/retry_service_config_test.cc index b80018929ca..a9284664a61 100644 --- a/test/core/client_channel/retry_service_config_test.cc +++ b/test/core/client_channel/retry_service_config_test.cc @@ -29,9 +29,9 @@ #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/time.h" -#include "src/core/lib/service_config/service_config.h" -#include "src/core/lib/service_config/service_config_impl.h" -#include "src/core/lib/service_config/service_config_parser.h" +#include "src/core/service_config/service_config.h" +#include "src/core/service_config/service_config_impl.h" +#include "src/core/service_config/service_config_parser.h" #include "test/core/util/test_config.h" namespace grpc_core { diff --git a/test/core/end2end/no_server_test.cc b/test/core/end2end/no_server_test.cc index 9096408c145..0a785d921ff 100644 --- a/test/core/end2end/no_server_test.cc +++ b/test/core/end2end/no_server_test.cc @@ -35,10 +35,10 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/exec_ctx.h" -#include "src/core/lib/service_config/service_config.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/fake/fake_resolver.h" #include "src/core/resolver/resolver.h" +#include "src/core/service_config/service_config.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/util/test_config.h" diff --git a/test/core/ext/filters/rbac/rbac_service_config_parser_test.cc b/test/core/ext/filters/rbac/rbac_service_config_parser_test.cc index 9961d7fb1d9..c0c822692b7 100644 --- a/test/core/ext/filters/rbac/rbac_service_config_parser_test.cc +++ b/test/core/ext/filters/rbac/rbac_service_config_parser_test.cc @@ -31,8 +31,8 @@ #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/json/json_writer.h" #include "src/core/lib/security/authorization/audit_logging.h" -#include "src/core/lib/service_config/service_config.h" -#include "src/core/lib/service_config/service_config_impl.h" +#include "src/core/service_config/service_config.h" +#include "src/core/service_config/service_config_impl.h" #include "test/core/util/test_config.h" namespace grpc_core { diff --git a/test/core/message_size/message_size_service_config_test.cc b/test/core/message_size/message_size_service_config_test.cc index 03447db4b7b..3c62db4802c 100644 --- a/test/core/message_size/message_size_service_config_test.cc +++ b/test/core/message_size/message_size_service_config_test.cc @@ -29,9 +29,9 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/service_config/service_config.h" -#include "src/core/lib/service_config/service_config_impl.h" -#include "src/core/lib/service_config/service_config_parser.h" +#include "src/core/service_config/service_config.h" +#include "src/core/service_config/service_config_impl.h" +#include "src/core/service_config/service_config_parser.h" #include "test/core/util/test_config.h" namespace grpc_core { diff --git a/test/core/service_config/service_config_test.cc b/test/core/service_config/service_config_test.cc index 47ec64c3605..913f38d7b40 100644 --- a/test/core/service_config/service_config_test.cc +++ b/test/core/service_config/service_config_test.cc @@ -14,7 +14,7 @@ // limitations under the License. // -#include "src/core/lib/service_config/service_config.h" +#include "src/core/service_config/service_config.h" #include @@ -37,8 +37,8 @@ #include "src/core/lib/json/json.h" #include "src/core/lib/json/json_args.h" #include "src/core/lib/json/json_object_loader.h" -#include "src/core/lib/service_config/service_config_impl.h" -#include "src/core/lib/service_config/service_config_parser.h" +#include "src/core/service_config/service_config_impl.h" +#include "src/core/service_config/service_config_parser.h" #include "test/core/util/test_config.h" namespace grpc_core { diff --git a/test/cpp/client/destroy_grpclb_channel_with_active_connect_stress_test.cc b/test/cpp/client/destroy_grpclb_channel_with_active_connect_stress_test.cc index 9eb7f201d0d..9c190b61449 100644 --- a/test/cpp/client/destroy_grpclb_channel_with_active_connect_stress_test.cc +++ b/test/cpp/client/destroy_grpclb_channel_with_active_connect_stress_test.cc @@ -43,10 +43,10 @@ #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/thd.h" #include "src/core/lib/iomgr/sockaddr.h" -#include "src/core/lib/service_config/service_config_impl.h" #include "src/core/load_balancing/grpclb/grpclb_balancer_addresses.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/fake/fake_resolver.h" +#include "src/core/service_config/service_config_impl.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" diff --git a/test/cpp/end2end/client_lb_end2end_test.cc b/test/cpp/end2end/client_lb_end2end_test.cc index fc511fb6c25..11bc2492cdd 100644 --- a/test/cpp/end2end/client_lb_end2end_test.cc +++ b/test/cpp/end2end/client_lb_end2end_test.cc @@ -65,12 +65,12 @@ #include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/tcp_client.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" -#include "src/core/lib/service_config/service_config.h" -#include "src/core/lib/service_config/service_config_impl.h" #include "src/core/lib/surface/server.h" #include "src/core/lib/transport/connectivity_state.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/fake/fake_resolver.h" +#include "src/core/service_config/service_config.h" +#include "src/core/service_config/service_config_impl.h" #include "src/cpp/client/secure_credentials.h" #include "src/cpp/server/secure_server_credentials.h" #include "src/proto/grpc/health/v1/health.grpc.pb.h" diff --git a/test/cpp/end2end/grpclb_end2end_test.cc b/test/cpp/end2end/grpclb_end2end_test.cc index 7864614ce2b..6b95dbf569a 100644 --- a/test/cpp/end2end/grpclb_end2end_test.cc +++ b/test/cpp/end2end/grpclb_end2end_test.cc @@ -53,11 +53,11 @@ #include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" -#include "src/core/lib/service_config/service_config_impl.h" #include "src/core/load_balancing/grpclb/grpclb.h" #include "src/core/load_balancing/grpclb/grpclb_balancer_addresses.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/fake/fake_resolver.h" +#include "src/core/service_config/service_config_impl.h" #include "src/cpp/client/secure_credentials.h" #include "src/cpp/server/secure_server_credentials.h" #include "src/proto/grpc/lb/v1/load_balancer.grpc.pb.h" diff --git a/test/cpp/end2end/rls_end2end_test.cc b/test/cpp/end2end/rls_end2end_test.cc index e51a5064ff2..faa798acfbc 100644 --- a/test/cpp/end2end/rls_end2end_test.cc +++ b/test/cpp/end2end/rls_end2end_test.cc @@ -48,9 +48,9 @@ #include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" -#include "src/core/lib/service_config/service_config_impl.h" #include "src/core/lib/uri/uri_parser.h" #include "src/core/resolver/fake/fake_resolver.h" +#include "src/core/service_config/service_config_impl.h" #include "src/cpp/client/secure_credentials.h" #include "src/cpp/server/secure_server_credentials.h" #include "src/proto/grpc/lookup/v1/rls.grpc.pb.h" diff --git a/test/cpp/end2end/service_config_end2end_test.cc b/test/cpp/end2end/service_config_end2end_test.cc index 1960e874aa9..5793117b08b 100644 --- a/test/cpp/end2end/service_config_end2end_test.cc +++ b/test/cpp/end2end/service_config_end2end_test.cc @@ -55,10 +55,10 @@ #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/tcp_client.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" -#include "src/core/lib/service_config/service_config_impl.h" #include "src/core/lib/transport/error_utils.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/fake/fake_resolver.h" +#include "src/core/service_config/service_config_impl.h" #include "src/cpp/client/secure_credentials.h" #include "src/cpp/server/secure_server_credentials.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal index 83b2932d558..6d93d41fad0 100644 --- a/tools/doxygen/Doxyfile.c++.internal +++ b/tools/doxygen/Doxyfile.c++.internal @@ -2749,12 +2749,6 @@ src/core/lib/security/transport/tsi_error.cc \ src/core/lib/security/transport/tsi_error.h \ src/core/lib/security/util/json_util.cc \ src/core/lib/security/util/json_util.h \ -src/core/lib/service_config/service_config.h \ -src/core/lib/service_config/service_config_call_data.h \ -src/core/lib/service_config/service_config_impl.cc \ -src/core/lib/service_config/service_config_impl.h \ -src/core/lib/service_config/service_config_parser.cc \ -src/core/lib/service_config/service_config_parser.h \ src/core/lib/slice/b64.cc \ src/core/lib/slice/b64.h \ src/core/lib/slice/percent_encoding.cc \ @@ -2947,6 +2941,12 @@ src/core/resolver/xds/xds_resolver.cc \ src/core/resolver/xds/xds_resolver_attributes.h \ src/core/resolver/xds/xds_resolver_trace.cc \ src/core/resolver/xds/xds_resolver_trace.h \ +src/core/service_config/service_config.h \ +src/core/service_config/service_config_call_data.h \ +src/core/service_config/service_config_impl.cc \ +src/core/service_config/service_config_impl.h \ +src/core/service_config/service_config_parser.cc \ +src/core/service_config/service_config_parser.h \ src/core/tsi/alts/crypt/aes_gcm.cc \ src/core/tsi/alts/crypt/gsec.cc \ src/core/tsi/alts/crypt/gsec.h \ diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index a0e3208e899..18aa50c0550 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -2524,12 +2524,6 @@ src/core/lib/security/transport/tsi_error.cc \ src/core/lib/security/transport/tsi_error.h \ src/core/lib/security/util/json_util.cc \ src/core/lib/security/util/json_util.h \ -src/core/lib/service_config/service_config.h \ -src/core/lib/service_config/service_config_call_data.h \ -src/core/lib/service_config/service_config_impl.cc \ -src/core/lib/service_config/service_config_impl.h \ -src/core/lib/service_config/service_config_parser.cc \ -src/core/lib/service_config/service_config_parser.h \ src/core/lib/slice/b64.cc \ src/core/lib/slice/b64.h \ src/core/lib/slice/percent_encoding.cc \ @@ -2728,6 +2722,12 @@ src/core/resolver/xds/xds_resolver.cc \ src/core/resolver/xds/xds_resolver_attributes.h \ src/core/resolver/xds/xds_resolver_trace.cc \ src/core/resolver/xds/xds_resolver_trace.h \ +src/core/service_config/service_config.h \ +src/core/service_config/service_config_call_data.h \ +src/core/service_config/service_config_impl.cc \ +src/core/service_config/service_config_impl.h \ +src/core/service_config/service_config_parser.cc \ +src/core/service_config/service_config_parser.h \ src/core/tsi/README.md \ src/core/tsi/alts/crypt/aes_gcm.cc \ src/core/tsi/alts/crypt/gsec.cc \