diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 14a883c7cdc..7998f90b0a0 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,11 +1,12 @@
-/**/OWNERS @markdroth @a11r
/bazel/** @veblush @gnossen
/bazel/experiments.yaml
/cmake/** @veblush @apolcyn
-/src/core/ext/filters/client_channel/** @markdroth
+/src/core/client_channel/** @markdroth
/src/core/ext/transport/chttp2/transport/** @ctiller
-/src/core/ext/xds/** @markdroth
-/src/core/lib/resolver/** @markdroth
-/src/core/lib/service_config/** @markdroth
+/src/core/load_balancing/** @markdroth
+/src/core/resolver/** @markdroth
+/src/core/server/xds* @markdroth
+/src/core/service_config/** @markdroth
+/src/core/xds/** @markdroth
/tools/dockerfile/** @drfloob @apolcyn @gnossen
/tools/run_tests/xds_k8s_test_driver/** @sergiitk @XuanWang-Amos @gnossen
diff --git a/BUILD b/BUILD
index e26d4e2ba02..4ca17cd38bb 100644
--- a/BUILD
+++ b/BUILD
@@ -4317,21 +4317,21 @@ grpc_cc_library(
grpc_cc_library(
name = "xds_client",
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",
+ "//src/core:xds/xds_client/xds_api.cc",
+ "//src/core:xds/xds_client/xds_bootstrap.cc",
+ "//src/core:xds/xds_client/xds_client.cc",
+ "//src/core:xds/xds_client/xds_client_stats.cc",
],
hdrs = [
- "//src/core:ext/xds/xds_api.h",
- "//src/core:ext/xds/xds_bootstrap.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:ext/xds/xds_metrics.h",
- "//src/core:ext/xds/xds_resource_type.h",
- "//src/core:ext/xds/xds_resource_type_impl.h",
- "//src/core:ext/xds/xds_transport.h",
+ "//src/core:xds/xds_client/xds_api.h",
+ "//src/core:xds/xds_client/xds_bootstrap.h",
+ "//src/core:xds/xds_client/xds_channel_args.h",
+ "//src/core:xds/xds_client/xds_client.h",
+ "//src/core:xds/xds_client/xds_client_stats.h",
+ "//src/core:xds/xds_client/xds_metrics.h",
+ "//src/core:xds/xds_client/xds_resource_type.h",
+ "//src/core:xds/xds_client/xds_resource_type_impl.h",
+ "//src/core:xds/xds_client/xds_transport.h",
],
external_deps = [
"absl/base:core_headers",
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f24293cc3be..4a80ddd5202 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2213,30 +2213,6 @@ add_library(grpc
src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.c
src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.c
src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.c
- 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_audit_logger_registry.cc
- src/core/ext/xds/xds_bootstrap.cc
- src/core/ext/xds/xds_bootstrap_grpc.cc
- src/core/ext/xds/xds_certificate_provider.cc
- src/core/ext/xds/xds_client.cc
- src/core/ext/xds/xds_client_grpc.cc
- src/core/ext/xds/xds_client_stats.cc
- src/core/ext/xds/xds_cluster.cc
- src/core/ext/xds/xds_cluster_specifier_plugin.cc
- src/core/ext/xds/xds_common_types.cc
- src/core/ext/xds/xds_endpoint.cc
- src/core/ext/xds/xds_health_status.cc
- src/core/ext/xds/xds_http_fault_filter.cc
- src/core/ext/xds/xds_http_filters.cc
- src/core/ext/xds/xds_http_rbac_filter.cc
- src/core/ext/xds/xds_http_stateful_session_filter.cc
- src/core/ext/xds/xds_lb_policy_registry.cc
- src/core/ext/xds/xds_listener.cc
- src/core/ext/xds/xds_route_config.cc
- src/core/ext/xds/xds_routing.cc
- src/core/ext/xds/xds_transport_grpc.cc
src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc
src/core/handshaker/handshaker.cc
src/core/handshaker/handshaker_registry.cc
@@ -2622,6 +2598,30 @@ add_library(grpc
src/core/tsi/ssl_transport_security_utils.cc
src/core/tsi/transport_security.cc
src/core/tsi/transport_security_grpc.cc
+ src/core/xds/grpc/certificate_provider_store.cc
+ src/core/xds/grpc/file_watcher_certificate_provider_factory.cc
+ src/core/xds/grpc/xds_audit_logger_registry.cc
+ src/core/xds/grpc/xds_bootstrap_grpc.cc
+ src/core/xds/grpc/xds_certificate_provider.cc
+ src/core/xds/grpc/xds_client_grpc.cc
+ src/core/xds/grpc/xds_cluster.cc
+ src/core/xds/grpc/xds_cluster_specifier_plugin.cc
+ src/core/xds/grpc/xds_common_types.cc
+ src/core/xds/grpc/xds_endpoint.cc
+ src/core/xds/grpc/xds_health_status.cc
+ src/core/xds/grpc/xds_http_fault_filter.cc
+ src/core/xds/grpc/xds_http_filters.cc
+ src/core/xds/grpc/xds_http_rbac_filter.cc
+ src/core/xds/grpc/xds_http_stateful_session_filter.cc
+ src/core/xds/grpc/xds_lb_policy_registry.cc
+ src/core/xds/grpc/xds_listener.cc
+ src/core/xds/grpc/xds_route_config.cc
+ src/core/xds/grpc/xds_routing.cc
+ src/core/xds/grpc/xds_transport_grpc.cc
+ src/core/xds/xds_client/xds_api.cc
+ src/core/xds/xds_client/xds_bootstrap.cc
+ src/core/xds/xds_client/xds_client.cc
+ src/core/xds/xds_client/xds_client_stats.cc
)
target_compile_features(grpc PUBLIC cxx_std_14)
diff --git a/Makefile b/Makefile
index b5f3f448d53..8716b6ffa4e 100644
--- a/Makefile
+++ b/Makefile
@@ -1054,30 +1054,6 @@ LIBGRPC_SRC = \
src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.c \
src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.c \
src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.c \
- 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_audit_logger_registry.cc \
- src/core/ext/xds/xds_bootstrap.cc \
- src/core/ext/xds/xds_bootstrap_grpc.cc \
- src/core/ext/xds/xds_certificate_provider.cc \
- src/core/ext/xds/xds_client.cc \
- src/core/ext/xds/xds_client_grpc.cc \
- src/core/ext/xds/xds_client_stats.cc \
- src/core/ext/xds/xds_cluster.cc \
- src/core/ext/xds/xds_cluster_specifier_plugin.cc \
- src/core/ext/xds/xds_common_types.cc \
- src/core/ext/xds/xds_endpoint.cc \
- src/core/ext/xds/xds_health_status.cc \
- src/core/ext/xds/xds_http_fault_filter.cc \
- src/core/ext/xds/xds_http_filters.cc \
- src/core/ext/xds/xds_http_rbac_filter.cc \
- src/core/ext/xds/xds_http_stateful_session_filter.cc \
- src/core/ext/xds/xds_lb_policy_registry.cc \
- src/core/ext/xds/xds_listener.cc \
- src/core/ext/xds/xds_route_config.cc \
- src/core/ext/xds/xds_routing.cc \
- src/core/ext/xds/xds_transport_grpc.cc \
src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc \
src/core/handshaker/handshaker.cc \
src/core/handshaker/handshaker_registry.cc \
@@ -1508,6 +1484,30 @@ LIBGRPC_SRC = \
src/core/tsi/ssl_transport_security_utils.cc \
src/core/tsi/transport_security.cc \
src/core/tsi/transport_security_grpc.cc \
+ src/core/xds/grpc/certificate_provider_store.cc \
+ src/core/xds/grpc/file_watcher_certificate_provider_factory.cc \
+ src/core/xds/grpc/xds_audit_logger_registry.cc \
+ src/core/xds/grpc/xds_bootstrap_grpc.cc \
+ src/core/xds/grpc/xds_certificate_provider.cc \
+ src/core/xds/grpc/xds_client_grpc.cc \
+ src/core/xds/grpc/xds_cluster.cc \
+ src/core/xds/grpc/xds_cluster_specifier_plugin.cc \
+ src/core/xds/grpc/xds_common_types.cc \
+ src/core/xds/grpc/xds_endpoint.cc \
+ src/core/xds/grpc/xds_health_status.cc \
+ src/core/xds/grpc/xds_http_fault_filter.cc \
+ src/core/xds/grpc/xds_http_filters.cc \
+ src/core/xds/grpc/xds_http_rbac_filter.cc \
+ src/core/xds/grpc/xds_http_stateful_session_filter.cc \
+ src/core/xds/grpc/xds_lb_policy_registry.cc \
+ src/core/xds/grpc/xds_listener.cc \
+ src/core/xds/grpc/xds_route_config.cc \
+ src/core/xds/grpc/xds_routing.cc \
+ src/core/xds/grpc/xds_transport_grpc.cc \
+ src/core/xds/xds_client/xds_api.cc \
+ src/core/xds/xds_client/xds_bootstrap.cc \
+ src/core/xds/xds_client/xds_client.cc \
+ src/core/xds/xds_client/xds_client_stats.cc \
third_party/abseil-cpp/absl/base/internal/cycleclock.cc \
third_party/abseil-cpp/absl/base/internal/low_level_alloc.cc \
third_party/abseil-cpp/absl/base/internal/raw_logging.cc \
diff --git a/Package.swift b/Package.swift
index 9afca3494ca..9a1f76a9dc2 100644
--- a/Package.swift
+++ b/Package.swift
@@ -1059,60 +1059,6 @@ let package = Package(
"src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.h",
"src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.c",
"src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.h",
- "src/core/ext/xds/certificate_provider_store.cc",
- "src/core/ext/xds/certificate_provider_store.h",
- "src/core/ext/xds/file_watcher_certificate_provider_factory.cc",
- "src/core/ext/xds/file_watcher_certificate_provider_factory.h",
- "src/core/ext/xds/upb_utils.h",
- "src/core/ext/xds/xds_api.cc",
- "src/core/ext/xds/xds_api.h",
- "src/core/ext/xds/xds_audit_logger_registry.cc",
- "src/core/ext/xds/xds_audit_logger_registry.h",
- "src/core/ext/xds/xds_bootstrap.cc",
- "src/core/ext/xds/xds_bootstrap.h",
- "src/core/ext/xds/xds_bootstrap_grpc.cc",
- "src/core/ext/xds/xds_bootstrap_grpc.h",
- "src/core/ext/xds/xds_certificate_provider.cc",
- "src/core/ext/xds/xds_certificate_provider.h",
- "src/core/ext/xds/xds_channel_args.h",
- "src/core/ext/xds/xds_client.cc",
- "src/core/ext/xds/xds_client.h",
- "src/core/ext/xds/xds_client_grpc.cc",
- "src/core/ext/xds/xds_client_grpc.h",
- "src/core/ext/xds/xds_client_stats.cc",
- "src/core/ext/xds/xds_client_stats.h",
- "src/core/ext/xds/xds_cluster.cc",
- "src/core/ext/xds/xds_cluster.h",
- "src/core/ext/xds/xds_cluster_specifier_plugin.cc",
- "src/core/ext/xds/xds_cluster_specifier_plugin.h",
- "src/core/ext/xds/xds_common_types.cc",
- "src/core/ext/xds/xds_common_types.h",
- "src/core/ext/xds/xds_endpoint.cc",
- "src/core/ext/xds/xds_endpoint.h",
- "src/core/ext/xds/xds_health_status.cc",
- "src/core/ext/xds/xds_health_status.h",
- "src/core/ext/xds/xds_http_fault_filter.cc",
- "src/core/ext/xds/xds_http_fault_filter.h",
- "src/core/ext/xds/xds_http_filters.cc",
- "src/core/ext/xds/xds_http_filters.h",
- "src/core/ext/xds/xds_http_rbac_filter.cc",
- "src/core/ext/xds/xds_http_rbac_filter.h",
- "src/core/ext/xds/xds_http_stateful_session_filter.cc",
- "src/core/ext/xds/xds_http_stateful_session_filter.h",
- "src/core/ext/xds/xds_lb_policy_registry.cc",
- "src/core/ext/xds/xds_lb_policy_registry.h",
- "src/core/ext/xds/xds_listener.cc",
- "src/core/ext/xds/xds_listener.h",
- "src/core/ext/xds/xds_metrics.h",
- "src/core/ext/xds/xds_resource_type.h",
- "src/core/ext/xds/xds_resource_type_impl.h",
- "src/core/ext/xds/xds_route_config.cc",
- "src/core/ext/xds/xds_route_config.h",
- "src/core/ext/xds/xds_routing.cc",
- "src/core/ext/xds/xds_routing.h",
- "src/core/ext/xds/xds_transport.h",
- "src/core/ext/xds/xds_transport_grpc.cc",
- "src/core/ext/xds/xds_transport_grpc.h",
"src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc",
"src/core/handshaker/endpoint_info/endpoint_info_handshaker.h",
"src/core/handshaker/handshaker.cc",
@@ -2006,6 +1952,60 @@ let package = Package(
"src/core/tsi/transport_security_grpc.cc",
"src/core/tsi/transport_security_grpc.h",
"src/core/tsi/transport_security_interface.h",
+ "src/core/xds/grpc/certificate_provider_store.cc",
+ "src/core/xds/grpc/certificate_provider_store.h",
+ "src/core/xds/grpc/file_watcher_certificate_provider_factory.cc",
+ "src/core/xds/grpc/file_watcher_certificate_provider_factory.h",
+ "src/core/xds/grpc/upb_utils.h",
+ "src/core/xds/grpc/xds_audit_logger_registry.cc",
+ "src/core/xds/grpc/xds_audit_logger_registry.h",
+ "src/core/xds/grpc/xds_bootstrap_grpc.cc",
+ "src/core/xds/grpc/xds_bootstrap_grpc.h",
+ "src/core/xds/grpc/xds_certificate_provider.cc",
+ "src/core/xds/grpc/xds_certificate_provider.h",
+ "src/core/xds/grpc/xds_client_grpc.cc",
+ "src/core/xds/grpc/xds_client_grpc.h",
+ "src/core/xds/grpc/xds_cluster.cc",
+ "src/core/xds/grpc/xds_cluster.h",
+ "src/core/xds/grpc/xds_cluster_specifier_plugin.cc",
+ "src/core/xds/grpc/xds_cluster_specifier_plugin.h",
+ "src/core/xds/grpc/xds_common_types.cc",
+ "src/core/xds/grpc/xds_common_types.h",
+ "src/core/xds/grpc/xds_endpoint.cc",
+ "src/core/xds/grpc/xds_endpoint.h",
+ "src/core/xds/grpc/xds_health_status.cc",
+ "src/core/xds/grpc/xds_health_status.h",
+ "src/core/xds/grpc/xds_http_fault_filter.cc",
+ "src/core/xds/grpc/xds_http_fault_filter.h",
+ "src/core/xds/grpc/xds_http_filters.cc",
+ "src/core/xds/grpc/xds_http_filters.h",
+ "src/core/xds/grpc/xds_http_rbac_filter.cc",
+ "src/core/xds/grpc/xds_http_rbac_filter.h",
+ "src/core/xds/grpc/xds_http_stateful_session_filter.cc",
+ "src/core/xds/grpc/xds_http_stateful_session_filter.h",
+ "src/core/xds/grpc/xds_lb_policy_registry.cc",
+ "src/core/xds/grpc/xds_lb_policy_registry.h",
+ "src/core/xds/grpc/xds_listener.cc",
+ "src/core/xds/grpc/xds_listener.h",
+ "src/core/xds/grpc/xds_route_config.cc",
+ "src/core/xds/grpc/xds_route_config.h",
+ "src/core/xds/grpc/xds_routing.cc",
+ "src/core/xds/grpc/xds_routing.h",
+ "src/core/xds/grpc/xds_transport_grpc.cc",
+ "src/core/xds/grpc/xds_transport_grpc.h",
+ "src/core/xds/xds_client/xds_api.cc",
+ "src/core/xds/xds_client/xds_api.h",
+ "src/core/xds/xds_client/xds_bootstrap.cc",
+ "src/core/xds/xds_client/xds_bootstrap.h",
+ "src/core/xds/xds_client/xds_channel_args.h",
+ "src/core/xds/xds_client/xds_client.cc",
+ "src/core/xds/xds_client/xds_client.h",
+ "src/core/xds/xds_client/xds_client_stats.cc",
+ "src/core/xds/xds_client/xds_client_stats.h",
+ "src/core/xds/xds_client/xds_metrics.h",
+ "src/core/xds/xds_client/xds_resource_type.h",
+ "src/core/xds/xds_client/xds_resource_type_impl.h",
+ "src/core/xds/xds_client/xds_transport.h",
"third_party/re2/re2/bitmap256.h",
"third_party/re2/re2/bitstate.cc",
"third_party/re2/re2/compile.cc",
diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml
index 64ff8ce6d14..7e4f95f2932 100644
--- a/build_autogenerated.yaml
+++ b/build_autogenerated.yaml
@@ -776,36 +776,6 @@ libs:
- src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.h
- src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.h
- src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.h
- - src/core/ext/xds/certificate_provider_store.h
- - src/core/ext/xds/file_watcher_certificate_provider_factory.h
- - src/core/ext/xds/upb_utils.h
- - src/core/ext/xds/xds_api.h
- - src/core/ext/xds/xds_audit_logger_registry.h
- - src/core/ext/xds/xds_bootstrap.h
- - src/core/ext/xds/xds_bootstrap_grpc.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_grpc.h
- - src/core/ext/xds/xds_client_stats.h
- - src/core/ext/xds/xds_cluster.h
- - src/core/ext/xds/xds_cluster_specifier_plugin.h
- - src/core/ext/xds/xds_common_types.h
- - src/core/ext/xds/xds_endpoint.h
- - src/core/ext/xds/xds_health_status.h
- - src/core/ext/xds/xds_http_fault_filter.h
- - src/core/ext/xds/xds_http_filters.h
- - src/core/ext/xds/xds_http_rbac_filter.h
- - src/core/ext/xds/xds_http_stateful_session_filter.h
- - src/core/ext/xds/xds_lb_policy_registry.h
- - src/core/ext/xds/xds_listener.h
- - src/core/ext/xds/xds_metrics.h
- - src/core/ext/xds/xds_resource_type.h
- - src/core/ext/xds/xds_resource_type_impl.h
- - src/core/ext/xds/xds_route_config.h
- - src/core/ext/xds/xds_routing.h
- - src/core/ext/xds/xds_transport.h
- - src/core/ext/xds/xds_transport_grpc.h
- src/core/handshaker/endpoint_info/endpoint_info_handshaker.h
- src/core/handshaker/handshaker.h
- src/core/handshaker/handshaker_factory.h
@@ -1241,6 +1211,36 @@ libs:
- src/core/tsi/transport_security.h
- src/core/tsi/transport_security_grpc.h
- src/core/tsi/transport_security_interface.h
+ - src/core/xds/grpc/certificate_provider_store.h
+ - src/core/xds/grpc/file_watcher_certificate_provider_factory.h
+ - src/core/xds/grpc/upb_utils.h
+ - src/core/xds/grpc/xds_audit_logger_registry.h
+ - src/core/xds/grpc/xds_bootstrap_grpc.h
+ - src/core/xds/grpc/xds_certificate_provider.h
+ - src/core/xds/grpc/xds_client_grpc.h
+ - src/core/xds/grpc/xds_cluster.h
+ - src/core/xds/grpc/xds_cluster_specifier_plugin.h
+ - src/core/xds/grpc/xds_common_types.h
+ - src/core/xds/grpc/xds_endpoint.h
+ - src/core/xds/grpc/xds_health_status.h
+ - src/core/xds/grpc/xds_http_fault_filter.h
+ - src/core/xds/grpc/xds_http_filters.h
+ - src/core/xds/grpc/xds_http_rbac_filter.h
+ - src/core/xds/grpc/xds_http_stateful_session_filter.h
+ - src/core/xds/grpc/xds_lb_policy_registry.h
+ - src/core/xds/grpc/xds_listener.h
+ - src/core/xds/grpc/xds_route_config.h
+ - src/core/xds/grpc/xds_routing.h
+ - src/core/xds/grpc/xds_transport_grpc.h
+ - src/core/xds/xds_client/xds_api.h
+ - src/core/xds/xds_client/xds_bootstrap.h
+ - src/core/xds/xds_client/xds_channel_args.h
+ - src/core/xds/xds_client/xds_client.h
+ - src/core/xds/xds_client/xds_client_stats.h
+ - src/core/xds/xds_client/xds_metrics.h
+ - src/core/xds/xds_client/xds_resource_type.h
+ - src/core/xds/xds_client/xds_resource_type_impl.h
+ - src/core/xds/xds_client/xds_transport.h
- third_party/upb/upb/generated_code_support.h
- third_party/xxhash/xxhash.h
src:
@@ -1632,30 +1632,6 @@ libs:
- src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.c
- src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.c
- src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.c
- - 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_audit_logger_registry.cc
- - src/core/ext/xds/xds_bootstrap.cc
- - src/core/ext/xds/xds_bootstrap_grpc.cc
- - src/core/ext/xds/xds_certificate_provider.cc
- - src/core/ext/xds/xds_client.cc
- - src/core/ext/xds/xds_client_grpc.cc
- - src/core/ext/xds/xds_client_stats.cc
- - src/core/ext/xds/xds_cluster.cc
- - src/core/ext/xds/xds_cluster_specifier_plugin.cc
- - src/core/ext/xds/xds_common_types.cc
- - src/core/ext/xds/xds_endpoint.cc
- - src/core/ext/xds/xds_health_status.cc
- - src/core/ext/xds/xds_http_fault_filter.cc
- - src/core/ext/xds/xds_http_filters.cc
- - src/core/ext/xds/xds_http_rbac_filter.cc
- - src/core/ext/xds/xds_http_stateful_session_filter.cc
- - src/core/ext/xds/xds_lb_policy_registry.cc
- - src/core/ext/xds/xds_listener.cc
- - src/core/ext/xds/xds_route_config.cc
- - src/core/ext/xds/xds_routing.cc
- - src/core/ext/xds/xds_transport_grpc.cc
- src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc
- src/core/handshaker/handshaker.cc
- src/core/handshaker/handshaker_registry.cc
@@ -2041,6 +2017,30 @@ libs:
- src/core/tsi/ssl_transport_security_utils.cc
- src/core/tsi/transport_security.cc
- src/core/tsi/transport_security_grpc.cc
+ - src/core/xds/grpc/certificate_provider_store.cc
+ - src/core/xds/grpc/file_watcher_certificate_provider_factory.cc
+ - src/core/xds/grpc/xds_audit_logger_registry.cc
+ - src/core/xds/grpc/xds_bootstrap_grpc.cc
+ - src/core/xds/grpc/xds_certificate_provider.cc
+ - src/core/xds/grpc/xds_client_grpc.cc
+ - src/core/xds/grpc/xds_cluster.cc
+ - src/core/xds/grpc/xds_cluster_specifier_plugin.cc
+ - src/core/xds/grpc/xds_common_types.cc
+ - src/core/xds/grpc/xds_endpoint.cc
+ - src/core/xds/grpc/xds_health_status.cc
+ - src/core/xds/grpc/xds_http_fault_filter.cc
+ - src/core/xds/grpc/xds_http_filters.cc
+ - src/core/xds/grpc/xds_http_rbac_filter.cc
+ - src/core/xds/grpc/xds_http_stateful_session_filter.cc
+ - src/core/xds/grpc/xds_lb_policy_registry.cc
+ - src/core/xds/grpc/xds_listener.cc
+ - src/core/xds/grpc/xds_route_config.cc
+ - src/core/xds/grpc/xds_routing.cc
+ - src/core/xds/grpc/xds_transport_grpc.cc
+ - src/core/xds/xds_client/xds_api.cc
+ - src/core/xds/xds_client/xds_bootstrap.cc
+ - src/core/xds/xds_client/xds_client.cc
+ - src/core/xds/xds_client/xds_client_stats.cc
deps:
- upb_json_lib
- upb_textformat_lib
@@ -3850,7 +3850,7 @@ libs:
- src/core/ext/transport/binder/wire_format/wire_reader.h
- src/core/ext/transport/binder/wire_format/wire_reader_impl.h
- src/core/ext/transport/binder/wire_format/wire_writer.h
- - src/core/ext/xds/xds_enabled_server.h
+ - src/core/xds/grpc/xds_enabled_server.h
- src/cpp/client/client_stats_interceptor.h
- src/cpp/client/create_channel_internal.h
- src/cpp/client/secure_credentials.h
diff --git a/config.m4 b/config.m4
index 125cc7f8c1e..a9b92c2aca0 100644
--- a/config.m4
+++ b/config.m4
@@ -429,30 +429,6 @@ if test "$PHP_GRPC" != "no"; then
src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.c \
src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.c \
src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.c \
- 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_audit_logger_registry.cc \
- src/core/ext/xds/xds_bootstrap.cc \
- src/core/ext/xds/xds_bootstrap_grpc.cc \
- src/core/ext/xds/xds_certificate_provider.cc \
- src/core/ext/xds/xds_client.cc \
- src/core/ext/xds/xds_client_grpc.cc \
- src/core/ext/xds/xds_client_stats.cc \
- src/core/ext/xds/xds_cluster.cc \
- src/core/ext/xds/xds_cluster_specifier_plugin.cc \
- src/core/ext/xds/xds_common_types.cc \
- src/core/ext/xds/xds_endpoint.cc \
- src/core/ext/xds/xds_health_status.cc \
- src/core/ext/xds/xds_http_fault_filter.cc \
- src/core/ext/xds/xds_http_filters.cc \
- src/core/ext/xds/xds_http_rbac_filter.cc \
- src/core/ext/xds/xds_http_stateful_session_filter.cc \
- src/core/ext/xds/xds_lb_policy_registry.cc \
- src/core/ext/xds/xds_listener.cc \
- src/core/ext/xds/xds_route_config.cc \
- src/core/ext/xds/xds_routing.cc \
- src/core/ext/xds/xds_transport_grpc.cc \
src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc \
src/core/handshaker/handshaker.cc \
src/core/handshaker/handshaker_registry.cc \
@@ -883,6 +859,30 @@ if test "$PHP_GRPC" != "no"; then
src/core/tsi/ssl_transport_security_utils.cc \
src/core/tsi/transport_security.cc \
src/core/tsi/transport_security_grpc.cc \
+ src/core/xds/grpc/certificate_provider_store.cc \
+ src/core/xds/grpc/file_watcher_certificate_provider_factory.cc \
+ src/core/xds/grpc/xds_audit_logger_registry.cc \
+ src/core/xds/grpc/xds_bootstrap_grpc.cc \
+ src/core/xds/grpc/xds_certificate_provider.cc \
+ src/core/xds/grpc/xds_client_grpc.cc \
+ src/core/xds/grpc/xds_cluster.cc \
+ src/core/xds/grpc/xds_cluster_specifier_plugin.cc \
+ src/core/xds/grpc/xds_common_types.cc \
+ src/core/xds/grpc/xds_endpoint.cc \
+ src/core/xds/grpc/xds_health_status.cc \
+ src/core/xds/grpc/xds_http_fault_filter.cc \
+ src/core/xds/grpc/xds_http_filters.cc \
+ src/core/xds/grpc/xds_http_rbac_filter.cc \
+ src/core/xds/grpc/xds_http_stateful_session_filter.cc \
+ src/core/xds/grpc/xds_lb_policy_registry.cc \
+ src/core/xds/grpc/xds_listener.cc \
+ src/core/xds/grpc/xds_route_config.cc \
+ src/core/xds/grpc/xds_routing.cc \
+ src/core/xds/grpc/xds_transport_grpc.cc \
+ src/core/xds/xds_client/xds_api.cc \
+ src/core/xds/xds_client/xds_bootstrap.cc \
+ src/core/xds/xds_client/xds_client.cc \
+ src/core/xds/xds_client/xds_client_stats.cc \
src/php/ext/grpc/byte_buffer.c \
src/php/ext/grpc/call.c \
src/php/ext/grpc/call_credentials.c \
@@ -1506,7 +1506,6 @@ if test "$PHP_GRPC" != "no"; then
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/xds/core/v3)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/xds/type/matcher/v3)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/xds/type/v3)
- PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/xds)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/handshaker)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/handshaker/endpoint_info)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/handshaker/http_connect)
@@ -1606,6 +1605,8 @@ if test "$PHP_GRPC" != "no"; then
PHP_ADD_BUILD_DIR($ext_builddir/src/core/tsi/alts/zero_copy_frame_protector)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/tsi/ssl/key_logging)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/tsi/ssl/session_cache)
+ PHP_ADD_BUILD_DIR($ext_builddir/src/core/xds/grpc)
+ PHP_ADD_BUILD_DIR($ext_builddir/src/core/xds/xds_client)
PHP_ADD_BUILD_DIR($ext_builddir/src/php/ext/grpc)
PHP_ADD_BUILD_DIR($ext_builddir/third_party/abseil-cpp/absl/base)
PHP_ADD_BUILD_DIR($ext_builddir/third_party/abseil-cpp/absl/base/internal)
diff --git a/config.w32 b/config.w32
index a0cc2a6ee58..0d0a85c04d7 100644
--- a/config.w32
+++ b/config.w32
@@ -394,30 +394,6 @@ if (PHP_GRPC != "no") {
"src\\core\\ext\\upbdefs-gen\\xds\\type\\v3\\cel.upbdefs.c " +
"src\\core\\ext\\upbdefs-gen\\xds\\type\\v3\\range.upbdefs.c " +
"src\\core\\ext\\upbdefs-gen\\xds\\type\\v3\\typed_struct.upbdefs.c " +
- "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_audit_logger_registry.cc " +
- "src\\core\\ext\\xds\\xds_bootstrap.cc " +
- "src\\core\\ext\\xds\\xds_bootstrap_grpc.cc " +
- "src\\core\\ext\\xds\\xds_certificate_provider.cc " +
- "src\\core\\ext\\xds\\xds_client.cc " +
- "src\\core\\ext\\xds\\xds_client_grpc.cc " +
- "src\\core\\ext\\xds\\xds_client_stats.cc " +
- "src\\core\\ext\\xds\\xds_cluster.cc " +
- "src\\core\\ext\\xds\\xds_cluster_specifier_plugin.cc " +
- "src\\core\\ext\\xds\\xds_common_types.cc " +
- "src\\core\\ext\\xds\\xds_endpoint.cc " +
- "src\\core\\ext\\xds\\xds_health_status.cc " +
- "src\\core\\ext\\xds\\xds_http_fault_filter.cc " +
- "src\\core\\ext\\xds\\xds_http_filters.cc " +
- "src\\core\\ext\\xds\\xds_http_rbac_filter.cc " +
- "src\\core\\ext\\xds\\xds_http_stateful_session_filter.cc " +
- "src\\core\\ext\\xds\\xds_lb_policy_registry.cc " +
- "src\\core\\ext\\xds\\xds_listener.cc " +
- "src\\core\\ext\\xds\\xds_route_config.cc " +
- "src\\core\\ext\\xds\\xds_routing.cc " +
- "src\\core\\ext\\xds\\xds_transport_grpc.cc " +
"src\\core\\handshaker\\endpoint_info\\endpoint_info_handshaker.cc " +
"src\\core\\handshaker\\handshaker.cc " +
"src\\core\\handshaker\\handshaker_registry.cc " +
@@ -848,6 +824,30 @@ if (PHP_GRPC != "no") {
"src\\core\\tsi\\ssl_transport_security_utils.cc " +
"src\\core\\tsi\\transport_security.cc " +
"src\\core\\tsi\\transport_security_grpc.cc " +
+ "src\\core\\xds\\grpc\\certificate_provider_store.cc " +
+ "src\\core\\xds\\grpc\\file_watcher_certificate_provider_factory.cc " +
+ "src\\core\\xds\\grpc\\xds_audit_logger_registry.cc " +
+ "src\\core\\xds\\grpc\\xds_bootstrap_grpc.cc " +
+ "src\\core\\xds\\grpc\\xds_certificate_provider.cc " +
+ "src\\core\\xds\\grpc\\xds_client_grpc.cc " +
+ "src\\core\\xds\\grpc\\xds_cluster.cc " +
+ "src\\core\\xds\\grpc\\xds_cluster_specifier_plugin.cc " +
+ "src\\core\\xds\\grpc\\xds_common_types.cc " +
+ "src\\core\\xds\\grpc\\xds_endpoint.cc " +
+ "src\\core\\xds\\grpc\\xds_health_status.cc " +
+ "src\\core\\xds\\grpc\\xds_http_fault_filter.cc " +
+ "src\\core\\xds\\grpc\\xds_http_filters.cc " +
+ "src\\core\\xds\\grpc\\xds_http_rbac_filter.cc " +
+ "src\\core\\xds\\grpc\\xds_http_stateful_session_filter.cc " +
+ "src\\core\\xds\\grpc\\xds_lb_policy_registry.cc " +
+ "src\\core\\xds\\grpc\\xds_listener.cc " +
+ "src\\core\\xds\\grpc\\xds_route_config.cc " +
+ "src\\core\\xds\\grpc\\xds_routing.cc " +
+ "src\\core\\xds\\grpc\\xds_transport_grpc.cc " +
+ "src\\core\\xds\\xds_client\\xds_api.cc " +
+ "src\\core\\xds\\xds_client\\xds_bootstrap.cc " +
+ "src\\core\\xds\\xds_client\\xds_client.cc " +
+ "src\\core\\xds\\xds_client\\xds_client_stats.cc " +
"src\\php\\ext\\grpc\\byte_buffer.c " +
"src\\php\\ext\\grpc\\call.c " +
"src\\php\\ext\\grpc\\call_credentials.c " +
@@ -1642,7 +1642,6 @@ if (PHP_GRPC != "no") {
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\xds\\type\\matcher");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\xds\\type\\matcher\\v3");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\xds\\type\\v3");
- FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\xds");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\handshaker");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\handshaker\\endpoint_info");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\handshaker\\http_connect");
@@ -1746,6 +1745,9 @@ if (PHP_GRPC != "no") {
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\tsi\\ssl");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\tsi\\ssl\\key_logging");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\tsi\\ssl\\session_cache");
+ FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\xds");
+ FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\xds\\grpc");
+ FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\xds\\xds_client");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\php");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\php\\ext");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\php\\ext\\grpc");
diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec
index d075e053e37..5cdc9a2287d 100644
--- a/gRPC-C++.podspec
+++ b/gRPC-C++.podspec
@@ -855,37 +855,6 @@ Pod::Spec.new do |s|
'src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.h',
'src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.h',
'src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.h',
- 'src/core/ext/xds/certificate_provider_store.h',
- 'src/core/ext/xds/file_watcher_certificate_provider_factory.h',
- 'src/core/ext/xds/upb_utils.h',
- 'src/core/ext/xds/xds_api.h',
- 'src/core/ext/xds/xds_audit_logger_registry.h',
- 'src/core/ext/xds/xds_bootstrap.h',
- 'src/core/ext/xds/xds_bootstrap_grpc.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_grpc.h',
- 'src/core/ext/xds/xds_client_stats.h',
- 'src/core/ext/xds/xds_cluster.h',
- 'src/core/ext/xds/xds_cluster_specifier_plugin.h',
- 'src/core/ext/xds/xds_common_types.h',
- 'src/core/ext/xds/xds_enabled_server.h',
- 'src/core/ext/xds/xds_endpoint.h',
- 'src/core/ext/xds/xds_health_status.h',
- 'src/core/ext/xds/xds_http_fault_filter.h',
- 'src/core/ext/xds/xds_http_filters.h',
- 'src/core/ext/xds/xds_http_rbac_filter.h',
- 'src/core/ext/xds/xds_http_stateful_session_filter.h',
- 'src/core/ext/xds/xds_lb_policy_registry.h',
- 'src/core/ext/xds/xds_listener.h',
- 'src/core/ext/xds/xds_metrics.h',
- 'src/core/ext/xds/xds_resource_type.h',
- 'src/core/ext/xds/xds_resource_type_impl.h',
- 'src/core/ext/xds/xds_route_config.h',
- 'src/core/ext/xds/xds_routing.h',
- 'src/core/ext/xds/xds_transport.h',
- 'src/core/ext/xds/xds_transport_grpc.h',
'src/core/handshaker/endpoint_info/endpoint_info_handshaker.h',
'src/core/handshaker/handshaker.h',
'src/core/handshaker/handshaker_factory.h',
@@ -1345,6 +1314,37 @@ Pod::Spec.new do |s|
'src/core/tsi/transport_security.h',
'src/core/tsi/transport_security_grpc.h',
'src/core/tsi/transport_security_interface.h',
+ 'src/core/xds/grpc/certificate_provider_store.h',
+ 'src/core/xds/grpc/file_watcher_certificate_provider_factory.h',
+ 'src/core/xds/grpc/upb_utils.h',
+ 'src/core/xds/grpc/xds_audit_logger_registry.h',
+ 'src/core/xds/grpc/xds_bootstrap_grpc.h',
+ 'src/core/xds/grpc/xds_certificate_provider.h',
+ 'src/core/xds/grpc/xds_client_grpc.h',
+ 'src/core/xds/grpc/xds_cluster.h',
+ 'src/core/xds/grpc/xds_cluster_specifier_plugin.h',
+ 'src/core/xds/grpc/xds_common_types.h',
+ 'src/core/xds/grpc/xds_enabled_server.h',
+ 'src/core/xds/grpc/xds_endpoint.h',
+ 'src/core/xds/grpc/xds_health_status.h',
+ 'src/core/xds/grpc/xds_http_fault_filter.h',
+ 'src/core/xds/grpc/xds_http_filters.h',
+ 'src/core/xds/grpc/xds_http_rbac_filter.h',
+ 'src/core/xds/grpc/xds_http_stateful_session_filter.h',
+ 'src/core/xds/grpc/xds_lb_policy_registry.h',
+ 'src/core/xds/grpc/xds_listener.h',
+ 'src/core/xds/grpc/xds_route_config.h',
+ 'src/core/xds/grpc/xds_routing.h',
+ 'src/core/xds/grpc/xds_transport_grpc.h',
+ 'src/core/xds/xds_client/xds_api.h',
+ 'src/core/xds/xds_client/xds_bootstrap.h',
+ 'src/core/xds/xds_client/xds_channel_args.h',
+ 'src/core/xds/xds_client/xds_client.h',
+ 'src/core/xds/xds_client/xds_client_stats.h',
+ 'src/core/xds/xds_client/xds_metrics.h',
+ 'src/core/xds/xds_client/xds_resource_type.h',
+ 'src/core/xds/xds_client/xds_resource_type_impl.h',
+ 'src/core/xds/xds_client/xds_transport.h',
'src/cpp/client/call_credentials.cc',
'src/cpp/client/channel_cc.cc',
'src/cpp/client/channel_credentials.cc',
@@ -2124,37 +2124,6 @@ Pod::Spec.new do |s|
'src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.h',
'src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.h',
'src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.h',
- 'src/core/ext/xds/certificate_provider_store.h',
- 'src/core/ext/xds/file_watcher_certificate_provider_factory.h',
- 'src/core/ext/xds/upb_utils.h',
- 'src/core/ext/xds/xds_api.h',
- 'src/core/ext/xds/xds_audit_logger_registry.h',
- 'src/core/ext/xds/xds_bootstrap.h',
- 'src/core/ext/xds/xds_bootstrap_grpc.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_grpc.h',
- 'src/core/ext/xds/xds_client_stats.h',
- 'src/core/ext/xds/xds_cluster.h',
- 'src/core/ext/xds/xds_cluster_specifier_plugin.h',
- 'src/core/ext/xds/xds_common_types.h',
- 'src/core/ext/xds/xds_enabled_server.h',
- 'src/core/ext/xds/xds_endpoint.h',
- 'src/core/ext/xds/xds_health_status.h',
- 'src/core/ext/xds/xds_http_fault_filter.h',
- 'src/core/ext/xds/xds_http_filters.h',
- 'src/core/ext/xds/xds_http_rbac_filter.h',
- 'src/core/ext/xds/xds_http_stateful_session_filter.h',
- 'src/core/ext/xds/xds_lb_policy_registry.h',
- 'src/core/ext/xds/xds_listener.h',
- 'src/core/ext/xds/xds_metrics.h',
- 'src/core/ext/xds/xds_resource_type.h',
- 'src/core/ext/xds/xds_resource_type_impl.h',
- 'src/core/ext/xds/xds_route_config.h',
- 'src/core/ext/xds/xds_routing.h',
- 'src/core/ext/xds/xds_transport.h',
- 'src/core/ext/xds/xds_transport_grpc.h',
'src/core/handshaker/endpoint_info/endpoint_info_handshaker.h',
'src/core/handshaker/handshaker.h',
'src/core/handshaker/handshaker_factory.h',
@@ -2614,6 +2583,37 @@ Pod::Spec.new do |s|
'src/core/tsi/transport_security.h',
'src/core/tsi/transport_security_grpc.h',
'src/core/tsi/transport_security_interface.h',
+ 'src/core/xds/grpc/certificate_provider_store.h',
+ 'src/core/xds/grpc/file_watcher_certificate_provider_factory.h',
+ 'src/core/xds/grpc/upb_utils.h',
+ 'src/core/xds/grpc/xds_audit_logger_registry.h',
+ 'src/core/xds/grpc/xds_bootstrap_grpc.h',
+ 'src/core/xds/grpc/xds_certificate_provider.h',
+ 'src/core/xds/grpc/xds_client_grpc.h',
+ 'src/core/xds/grpc/xds_cluster.h',
+ 'src/core/xds/grpc/xds_cluster_specifier_plugin.h',
+ 'src/core/xds/grpc/xds_common_types.h',
+ 'src/core/xds/grpc/xds_enabled_server.h',
+ 'src/core/xds/grpc/xds_endpoint.h',
+ 'src/core/xds/grpc/xds_health_status.h',
+ 'src/core/xds/grpc/xds_http_fault_filter.h',
+ 'src/core/xds/grpc/xds_http_filters.h',
+ 'src/core/xds/grpc/xds_http_rbac_filter.h',
+ 'src/core/xds/grpc/xds_http_stateful_session_filter.h',
+ 'src/core/xds/grpc/xds_lb_policy_registry.h',
+ 'src/core/xds/grpc/xds_listener.h',
+ 'src/core/xds/grpc/xds_route_config.h',
+ 'src/core/xds/grpc/xds_routing.h',
+ 'src/core/xds/grpc/xds_transport_grpc.h',
+ 'src/core/xds/xds_client/xds_api.h',
+ 'src/core/xds/xds_client/xds_bootstrap.h',
+ 'src/core/xds/xds_client/xds_channel_args.h',
+ 'src/core/xds/xds_client/xds_client.h',
+ 'src/core/xds/xds_client/xds_client_stats.h',
+ 'src/core/xds/xds_client/xds_metrics.h',
+ 'src/core/xds/xds_client/xds_resource_type.h',
+ 'src/core/xds/xds_client/xds_resource_type_impl.h',
+ 'src/core/xds/xds_client/xds_transport.h',
'src/cpp/client/client_stats_interceptor.h',
'src/cpp/client/create_channel_internal.h',
'src/cpp/client/secure_credentials.h',
diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec
index 173742c4f21..ab6c7a53455 100644
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@@ -1178,60 +1178,6 @@ Pod::Spec.new do |s|
'src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.h',
'src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.c',
'src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.h',
- 'src/core/ext/xds/certificate_provider_store.cc',
- 'src/core/ext/xds/certificate_provider_store.h',
- 'src/core/ext/xds/file_watcher_certificate_provider_factory.cc',
- 'src/core/ext/xds/file_watcher_certificate_provider_factory.h',
- 'src/core/ext/xds/upb_utils.h',
- 'src/core/ext/xds/xds_api.cc',
- 'src/core/ext/xds/xds_api.h',
- 'src/core/ext/xds/xds_audit_logger_registry.cc',
- 'src/core/ext/xds/xds_audit_logger_registry.h',
- 'src/core/ext/xds/xds_bootstrap.cc',
- 'src/core/ext/xds/xds_bootstrap.h',
- 'src/core/ext/xds/xds_bootstrap_grpc.cc',
- 'src/core/ext/xds/xds_bootstrap_grpc.h',
- 'src/core/ext/xds/xds_certificate_provider.cc',
- 'src/core/ext/xds/xds_certificate_provider.h',
- 'src/core/ext/xds/xds_channel_args.h',
- 'src/core/ext/xds/xds_client.cc',
- 'src/core/ext/xds/xds_client.h',
- 'src/core/ext/xds/xds_client_grpc.cc',
- 'src/core/ext/xds/xds_client_grpc.h',
- 'src/core/ext/xds/xds_client_stats.cc',
- 'src/core/ext/xds/xds_client_stats.h',
- 'src/core/ext/xds/xds_cluster.cc',
- 'src/core/ext/xds/xds_cluster.h',
- 'src/core/ext/xds/xds_cluster_specifier_plugin.cc',
- 'src/core/ext/xds/xds_cluster_specifier_plugin.h',
- 'src/core/ext/xds/xds_common_types.cc',
- 'src/core/ext/xds/xds_common_types.h',
- 'src/core/ext/xds/xds_endpoint.cc',
- 'src/core/ext/xds/xds_endpoint.h',
- 'src/core/ext/xds/xds_health_status.cc',
- 'src/core/ext/xds/xds_health_status.h',
- 'src/core/ext/xds/xds_http_fault_filter.cc',
- 'src/core/ext/xds/xds_http_fault_filter.h',
- 'src/core/ext/xds/xds_http_filters.cc',
- 'src/core/ext/xds/xds_http_filters.h',
- 'src/core/ext/xds/xds_http_rbac_filter.cc',
- 'src/core/ext/xds/xds_http_rbac_filter.h',
- 'src/core/ext/xds/xds_http_stateful_session_filter.cc',
- 'src/core/ext/xds/xds_http_stateful_session_filter.h',
- 'src/core/ext/xds/xds_lb_policy_registry.cc',
- 'src/core/ext/xds/xds_lb_policy_registry.h',
- 'src/core/ext/xds/xds_listener.cc',
- 'src/core/ext/xds/xds_listener.h',
- 'src/core/ext/xds/xds_metrics.h',
- 'src/core/ext/xds/xds_resource_type.h',
- 'src/core/ext/xds/xds_resource_type_impl.h',
- 'src/core/ext/xds/xds_route_config.cc',
- 'src/core/ext/xds/xds_route_config.h',
- 'src/core/ext/xds/xds_routing.cc',
- 'src/core/ext/xds/xds_routing.h',
- 'src/core/ext/xds/xds_transport.h',
- 'src/core/ext/xds/xds_transport_grpc.cc',
- 'src/core/ext/xds/xds_transport_grpc.h',
'src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc',
'src/core/handshaker/endpoint_info/endpoint_info_handshaker.h',
'src/core/handshaker/handshaker.cc',
@@ -2121,6 +2067,60 @@ Pod::Spec.new do |s|
'src/core/tsi/transport_security_grpc.cc',
'src/core/tsi/transport_security_grpc.h',
'src/core/tsi/transport_security_interface.h',
+ 'src/core/xds/grpc/certificate_provider_store.cc',
+ 'src/core/xds/grpc/certificate_provider_store.h',
+ 'src/core/xds/grpc/file_watcher_certificate_provider_factory.cc',
+ 'src/core/xds/grpc/file_watcher_certificate_provider_factory.h',
+ 'src/core/xds/grpc/upb_utils.h',
+ 'src/core/xds/grpc/xds_audit_logger_registry.cc',
+ 'src/core/xds/grpc/xds_audit_logger_registry.h',
+ 'src/core/xds/grpc/xds_bootstrap_grpc.cc',
+ 'src/core/xds/grpc/xds_bootstrap_grpc.h',
+ 'src/core/xds/grpc/xds_certificate_provider.cc',
+ 'src/core/xds/grpc/xds_certificate_provider.h',
+ 'src/core/xds/grpc/xds_client_grpc.cc',
+ 'src/core/xds/grpc/xds_client_grpc.h',
+ 'src/core/xds/grpc/xds_cluster.cc',
+ 'src/core/xds/grpc/xds_cluster.h',
+ 'src/core/xds/grpc/xds_cluster_specifier_plugin.cc',
+ 'src/core/xds/grpc/xds_cluster_specifier_plugin.h',
+ 'src/core/xds/grpc/xds_common_types.cc',
+ 'src/core/xds/grpc/xds_common_types.h',
+ 'src/core/xds/grpc/xds_endpoint.cc',
+ 'src/core/xds/grpc/xds_endpoint.h',
+ 'src/core/xds/grpc/xds_health_status.cc',
+ 'src/core/xds/grpc/xds_health_status.h',
+ 'src/core/xds/grpc/xds_http_fault_filter.cc',
+ 'src/core/xds/grpc/xds_http_fault_filter.h',
+ 'src/core/xds/grpc/xds_http_filters.cc',
+ 'src/core/xds/grpc/xds_http_filters.h',
+ 'src/core/xds/grpc/xds_http_rbac_filter.cc',
+ 'src/core/xds/grpc/xds_http_rbac_filter.h',
+ 'src/core/xds/grpc/xds_http_stateful_session_filter.cc',
+ 'src/core/xds/grpc/xds_http_stateful_session_filter.h',
+ 'src/core/xds/grpc/xds_lb_policy_registry.cc',
+ 'src/core/xds/grpc/xds_lb_policy_registry.h',
+ 'src/core/xds/grpc/xds_listener.cc',
+ 'src/core/xds/grpc/xds_listener.h',
+ 'src/core/xds/grpc/xds_route_config.cc',
+ 'src/core/xds/grpc/xds_route_config.h',
+ 'src/core/xds/grpc/xds_routing.cc',
+ 'src/core/xds/grpc/xds_routing.h',
+ 'src/core/xds/grpc/xds_transport_grpc.cc',
+ 'src/core/xds/grpc/xds_transport_grpc.h',
+ 'src/core/xds/xds_client/xds_api.cc',
+ 'src/core/xds/xds_client/xds_api.h',
+ 'src/core/xds/xds_client/xds_bootstrap.cc',
+ 'src/core/xds/xds_client/xds_bootstrap.h',
+ 'src/core/xds/xds_client/xds_channel_args.h',
+ 'src/core/xds/xds_client/xds_client.cc',
+ 'src/core/xds/xds_client/xds_client.h',
+ 'src/core/xds/xds_client/xds_client_stats.cc',
+ 'src/core/xds/xds_client/xds_client_stats.h',
+ 'src/core/xds/xds_client/xds_metrics.h',
+ 'src/core/xds/xds_client/xds_resource_type.h',
+ 'src/core/xds/xds_client/xds_resource_type_impl.h',
+ 'src/core/xds/xds_client/xds_transport.h',
'third_party/re2/re2/bitmap256.h',
'third_party/re2/re2/bitstate.cc',
'third_party/re2/re2/compile.cc',
@@ -2903,36 +2903,6 @@ Pod::Spec.new do |s|
'src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.h',
'src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.h',
'src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.h',
- 'src/core/ext/xds/certificate_provider_store.h',
- 'src/core/ext/xds/file_watcher_certificate_provider_factory.h',
- 'src/core/ext/xds/upb_utils.h',
- 'src/core/ext/xds/xds_api.h',
- 'src/core/ext/xds/xds_audit_logger_registry.h',
- 'src/core/ext/xds/xds_bootstrap.h',
- 'src/core/ext/xds/xds_bootstrap_grpc.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_grpc.h',
- 'src/core/ext/xds/xds_client_stats.h',
- 'src/core/ext/xds/xds_cluster.h',
- 'src/core/ext/xds/xds_cluster_specifier_plugin.h',
- 'src/core/ext/xds/xds_common_types.h',
- 'src/core/ext/xds/xds_endpoint.h',
- 'src/core/ext/xds/xds_health_status.h',
- 'src/core/ext/xds/xds_http_fault_filter.h',
- 'src/core/ext/xds/xds_http_filters.h',
- 'src/core/ext/xds/xds_http_rbac_filter.h',
- 'src/core/ext/xds/xds_http_stateful_session_filter.h',
- 'src/core/ext/xds/xds_lb_policy_registry.h',
- 'src/core/ext/xds/xds_listener.h',
- 'src/core/ext/xds/xds_metrics.h',
- 'src/core/ext/xds/xds_resource_type.h',
- 'src/core/ext/xds/xds_resource_type_impl.h',
- 'src/core/ext/xds/xds_route_config.h',
- 'src/core/ext/xds/xds_routing.h',
- 'src/core/ext/xds/xds_transport.h',
- 'src/core/ext/xds/xds_transport_grpc.h',
'src/core/handshaker/endpoint_info/endpoint_info_handshaker.h',
'src/core/handshaker/handshaker.h',
'src/core/handshaker/handshaker_factory.h',
@@ -3392,6 +3362,36 @@ Pod::Spec.new do |s|
'src/core/tsi/transport_security.h',
'src/core/tsi/transport_security_grpc.h',
'src/core/tsi/transport_security_interface.h',
+ 'src/core/xds/grpc/certificate_provider_store.h',
+ 'src/core/xds/grpc/file_watcher_certificate_provider_factory.h',
+ 'src/core/xds/grpc/upb_utils.h',
+ 'src/core/xds/grpc/xds_audit_logger_registry.h',
+ 'src/core/xds/grpc/xds_bootstrap_grpc.h',
+ 'src/core/xds/grpc/xds_certificate_provider.h',
+ 'src/core/xds/grpc/xds_client_grpc.h',
+ 'src/core/xds/grpc/xds_cluster.h',
+ 'src/core/xds/grpc/xds_cluster_specifier_plugin.h',
+ 'src/core/xds/grpc/xds_common_types.h',
+ 'src/core/xds/grpc/xds_endpoint.h',
+ 'src/core/xds/grpc/xds_health_status.h',
+ 'src/core/xds/grpc/xds_http_fault_filter.h',
+ 'src/core/xds/grpc/xds_http_filters.h',
+ 'src/core/xds/grpc/xds_http_rbac_filter.h',
+ 'src/core/xds/grpc/xds_http_stateful_session_filter.h',
+ 'src/core/xds/grpc/xds_lb_policy_registry.h',
+ 'src/core/xds/grpc/xds_listener.h',
+ 'src/core/xds/grpc/xds_route_config.h',
+ 'src/core/xds/grpc/xds_routing.h',
+ 'src/core/xds/grpc/xds_transport_grpc.h',
+ 'src/core/xds/xds_client/xds_api.h',
+ 'src/core/xds/xds_client/xds_bootstrap.h',
+ 'src/core/xds/xds_client/xds_channel_args.h',
+ 'src/core/xds/xds_client/xds_client.h',
+ 'src/core/xds/xds_client/xds_client_stats.h',
+ 'src/core/xds/xds_client/xds_metrics.h',
+ 'src/core/xds/xds_client/xds_resource_type.h',
+ 'src/core/xds/xds_client/xds_resource_type_impl.h',
+ 'src/core/xds/xds_client/xds_transport.h',
'third_party/re2/re2/bitmap256.h',
'third_party/re2/re2/filtered_re2.h',
'third_party/re2/re2/pod_array.h',
diff --git a/grpc.gemspec b/grpc.gemspec
index 1247adbae75..53f5845e405 100644
--- a/grpc.gemspec
+++ b/grpc.gemspec
@@ -1065,60 +1065,6 @@ Gem::Specification.new do |s|
s.files += %w( src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.h )
s.files += %w( src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.c )
s.files += %w( src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.h )
- s.files += %w( src/core/ext/xds/certificate_provider_store.cc )
- s.files += %w( src/core/ext/xds/certificate_provider_store.h )
- s.files += %w( src/core/ext/xds/file_watcher_certificate_provider_factory.cc )
- s.files += %w( src/core/ext/xds/file_watcher_certificate_provider_factory.h )
- s.files += %w( src/core/ext/xds/upb_utils.h )
- s.files += %w( src/core/ext/xds/xds_api.cc )
- s.files += %w( src/core/ext/xds/xds_api.h )
- s.files += %w( src/core/ext/xds/xds_audit_logger_registry.cc )
- s.files += %w( src/core/ext/xds/xds_audit_logger_registry.h )
- s.files += %w( src/core/ext/xds/xds_bootstrap.cc )
- s.files += %w( src/core/ext/xds/xds_bootstrap.h )
- s.files += %w( src/core/ext/xds/xds_bootstrap_grpc.cc )
- s.files += %w( src/core/ext/xds/xds_bootstrap_grpc.h )
- s.files += %w( src/core/ext/xds/xds_certificate_provider.cc )
- s.files += %w( src/core/ext/xds/xds_certificate_provider.h )
- s.files += %w( src/core/ext/xds/xds_channel_args.h )
- s.files += %w( src/core/ext/xds/xds_client.cc )
- s.files += %w( src/core/ext/xds/xds_client.h )
- s.files += %w( src/core/ext/xds/xds_client_grpc.cc )
- s.files += %w( src/core/ext/xds/xds_client_grpc.h )
- s.files += %w( src/core/ext/xds/xds_client_stats.cc )
- s.files += %w( src/core/ext/xds/xds_client_stats.h )
- s.files += %w( src/core/ext/xds/xds_cluster.cc )
- s.files += %w( src/core/ext/xds/xds_cluster.h )
- s.files += %w( src/core/ext/xds/xds_cluster_specifier_plugin.cc )
- s.files += %w( src/core/ext/xds/xds_cluster_specifier_plugin.h )
- s.files += %w( src/core/ext/xds/xds_common_types.cc )
- s.files += %w( src/core/ext/xds/xds_common_types.h )
- s.files += %w( src/core/ext/xds/xds_endpoint.cc )
- s.files += %w( src/core/ext/xds/xds_endpoint.h )
- s.files += %w( src/core/ext/xds/xds_health_status.cc )
- s.files += %w( src/core/ext/xds/xds_health_status.h )
- s.files += %w( src/core/ext/xds/xds_http_fault_filter.cc )
- s.files += %w( src/core/ext/xds/xds_http_fault_filter.h )
- s.files += %w( src/core/ext/xds/xds_http_filters.cc )
- s.files += %w( src/core/ext/xds/xds_http_filters.h )
- s.files += %w( src/core/ext/xds/xds_http_rbac_filter.cc )
- s.files += %w( src/core/ext/xds/xds_http_rbac_filter.h )
- s.files += %w( src/core/ext/xds/xds_http_stateful_session_filter.cc )
- s.files += %w( src/core/ext/xds/xds_http_stateful_session_filter.h )
- s.files += %w( src/core/ext/xds/xds_lb_policy_registry.cc )
- s.files += %w( src/core/ext/xds/xds_lb_policy_registry.h )
- s.files += %w( src/core/ext/xds/xds_listener.cc )
- s.files += %w( src/core/ext/xds/xds_listener.h )
- s.files += %w( src/core/ext/xds/xds_metrics.h )
- s.files += %w( src/core/ext/xds/xds_resource_type.h )
- s.files += %w( src/core/ext/xds/xds_resource_type_impl.h )
- s.files += %w( src/core/ext/xds/xds_route_config.cc )
- s.files += %w( src/core/ext/xds/xds_route_config.h )
- s.files += %w( src/core/ext/xds/xds_routing.cc )
- s.files += %w( src/core/ext/xds/xds_routing.h )
- s.files += %w( src/core/ext/xds/xds_transport.h )
- s.files += %w( src/core/ext/xds/xds_transport_grpc.cc )
- s.files += %w( src/core/ext/xds/xds_transport_grpc.h )
s.files += %w( src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc )
s.files += %w( src/core/handshaker/endpoint_info/endpoint_info_handshaker.h )
s.files += %w( src/core/handshaker/handshaker.cc )
@@ -2008,6 +1954,60 @@ Gem::Specification.new do |s|
s.files += %w( src/core/tsi/transport_security_grpc.cc )
s.files += %w( src/core/tsi/transport_security_grpc.h )
s.files += %w( src/core/tsi/transport_security_interface.h )
+ s.files += %w( src/core/xds/grpc/certificate_provider_store.cc )
+ s.files += %w( src/core/xds/grpc/certificate_provider_store.h )
+ s.files += %w( src/core/xds/grpc/file_watcher_certificate_provider_factory.cc )
+ s.files += %w( src/core/xds/grpc/file_watcher_certificate_provider_factory.h )
+ s.files += %w( src/core/xds/grpc/upb_utils.h )
+ s.files += %w( src/core/xds/grpc/xds_audit_logger_registry.cc )
+ s.files += %w( src/core/xds/grpc/xds_audit_logger_registry.h )
+ s.files += %w( src/core/xds/grpc/xds_bootstrap_grpc.cc )
+ s.files += %w( src/core/xds/grpc/xds_bootstrap_grpc.h )
+ s.files += %w( src/core/xds/grpc/xds_certificate_provider.cc )
+ s.files += %w( src/core/xds/grpc/xds_certificate_provider.h )
+ s.files += %w( src/core/xds/grpc/xds_client_grpc.cc )
+ s.files += %w( src/core/xds/grpc/xds_client_grpc.h )
+ s.files += %w( src/core/xds/grpc/xds_cluster.cc )
+ s.files += %w( src/core/xds/grpc/xds_cluster.h )
+ s.files += %w( src/core/xds/grpc/xds_cluster_specifier_plugin.cc )
+ s.files += %w( src/core/xds/grpc/xds_cluster_specifier_plugin.h )
+ s.files += %w( src/core/xds/grpc/xds_common_types.cc )
+ s.files += %w( src/core/xds/grpc/xds_common_types.h )
+ s.files += %w( src/core/xds/grpc/xds_endpoint.cc )
+ s.files += %w( src/core/xds/grpc/xds_endpoint.h )
+ s.files += %w( src/core/xds/grpc/xds_health_status.cc )
+ s.files += %w( src/core/xds/grpc/xds_health_status.h )
+ s.files += %w( src/core/xds/grpc/xds_http_fault_filter.cc )
+ s.files += %w( src/core/xds/grpc/xds_http_fault_filter.h )
+ s.files += %w( src/core/xds/grpc/xds_http_filters.cc )
+ s.files += %w( src/core/xds/grpc/xds_http_filters.h )
+ s.files += %w( src/core/xds/grpc/xds_http_rbac_filter.cc )
+ s.files += %w( src/core/xds/grpc/xds_http_rbac_filter.h )
+ s.files += %w( src/core/xds/grpc/xds_http_stateful_session_filter.cc )
+ s.files += %w( src/core/xds/grpc/xds_http_stateful_session_filter.h )
+ s.files += %w( src/core/xds/grpc/xds_lb_policy_registry.cc )
+ s.files += %w( src/core/xds/grpc/xds_lb_policy_registry.h )
+ s.files += %w( src/core/xds/grpc/xds_listener.cc )
+ s.files += %w( src/core/xds/grpc/xds_listener.h )
+ s.files += %w( src/core/xds/grpc/xds_route_config.cc )
+ s.files += %w( src/core/xds/grpc/xds_route_config.h )
+ s.files += %w( src/core/xds/grpc/xds_routing.cc )
+ s.files += %w( src/core/xds/grpc/xds_routing.h )
+ s.files += %w( src/core/xds/grpc/xds_transport_grpc.cc )
+ s.files += %w( src/core/xds/grpc/xds_transport_grpc.h )
+ s.files += %w( src/core/xds/xds_client/xds_api.cc )
+ s.files += %w( src/core/xds/xds_client/xds_api.h )
+ s.files += %w( src/core/xds/xds_client/xds_bootstrap.cc )
+ s.files += %w( src/core/xds/xds_client/xds_bootstrap.h )
+ s.files += %w( src/core/xds/xds_client/xds_channel_args.h )
+ s.files += %w( src/core/xds/xds_client/xds_client.cc )
+ s.files += %w( src/core/xds/xds_client/xds_client.h )
+ s.files += %w( src/core/xds/xds_client/xds_client_stats.cc )
+ s.files += %w( src/core/xds/xds_client/xds_client_stats.h )
+ s.files += %w( src/core/xds/xds_client/xds_metrics.h )
+ s.files += %w( src/core/xds/xds_client/xds_resource_type.h )
+ s.files += %w( src/core/xds/xds_client/xds_resource_type_impl.h )
+ s.files += %w( src/core/xds/xds_client/xds_transport.h )
s.files += %w( third_party/abseil-cpp/absl/algorithm/algorithm.h )
s.files += %w( third_party/abseil-cpp/absl/algorithm/container.h )
s.files += %w( third_party/abseil-cpp/absl/base/attributes.h )
diff --git a/package.xml b/package.xml
index f95df49ac37..98267c82e92 100644
--- a/package.xml
+++ b/package.xml
@@ -1047,60 +1047,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1990,6 +1936,60 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/core/BUILD b/src/core/BUILD
index fb16f2b8eea..e76dc300ace 100644
--- a/src/core/BUILD
+++ b/src/core/BUILD
@@ -5005,7 +5005,7 @@ grpc_cc_library(
grpc_cc_library(
name = "upb_utils",
hdrs = [
- "ext/xds/upb_utils.h",
+ "xds/grpc/upb_utils.h",
],
external_deps = [
"absl/strings",
@@ -5018,7 +5018,7 @@ grpc_cc_library(
grpc_cc_library(
name = "xds_enabled_server",
hdrs = [
- "ext/xds/xds_enabled_server.h",
+ "xds/grpc/xds_enabled_server.h",
],
language = "c++",
)
@@ -5026,50 +5026,50 @@ grpc_cc_library(
grpc_cc_library(
name = "grpc_xds_client",
srcs = [
- "ext/xds/certificate_provider_store.cc",
- "ext/xds/file_watcher_certificate_provider_factory.cc",
- "ext/xds/xds_audit_logger_registry.cc",
- "ext/xds/xds_bootstrap_grpc.cc",
- "ext/xds/xds_certificate_provider.cc",
- "ext/xds/xds_client_grpc.cc",
- "ext/xds/xds_cluster.cc",
- "ext/xds/xds_cluster_specifier_plugin.cc",
- "ext/xds/xds_common_types.cc",
- "ext/xds/xds_endpoint.cc",
- "ext/xds/xds_health_status.cc",
- "ext/xds/xds_http_fault_filter.cc",
- "ext/xds/xds_http_filters.cc",
- "ext/xds/xds_http_rbac_filter.cc",
- "ext/xds/xds_http_stateful_session_filter.cc",
- "ext/xds/xds_lb_policy_registry.cc",
- "ext/xds/xds_listener.cc",
- "ext/xds/xds_route_config.cc",
- "ext/xds/xds_routing.cc",
- "ext/xds/xds_transport_grpc.cc",
"lib/security/credentials/xds/xds_credentials.cc",
+ "xds/grpc/certificate_provider_store.cc",
+ "xds/grpc/file_watcher_certificate_provider_factory.cc",
+ "xds/grpc/xds_audit_logger_registry.cc",
+ "xds/grpc/xds_bootstrap_grpc.cc",
+ "xds/grpc/xds_certificate_provider.cc",
+ "xds/grpc/xds_client_grpc.cc",
+ "xds/grpc/xds_cluster.cc",
+ "xds/grpc/xds_cluster_specifier_plugin.cc",
+ "xds/grpc/xds_common_types.cc",
+ "xds/grpc/xds_endpoint.cc",
+ "xds/grpc/xds_health_status.cc",
+ "xds/grpc/xds_http_fault_filter.cc",
+ "xds/grpc/xds_http_filters.cc",
+ "xds/grpc/xds_http_rbac_filter.cc",
+ "xds/grpc/xds_http_stateful_session_filter.cc",
+ "xds/grpc/xds_lb_policy_registry.cc",
+ "xds/grpc/xds_listener.cc",
+ "xds/grpc/xds_route_config.cc",
+ "xds/grpc/xds_routing.cc",
+ "xds/grpc/xds_transport_grpc.cc",
],
hdrs = [
- "ext/xds/certificate_provider_store.h",
- "ext/xds/file_watcher_certificate_provider_factory.h",
- "ext/xds/xds_audit_logger_registry.h",
- "ext/xds/xds_bootstrap_grpc.h",
- "ext/xds/xds_certificate_provider.h",
- "ext/xds/xds_client_grpc.h",
- "ext/xds/xds_cluster.h",
- "ext/xds/xds_cluster_specifier_plugin.h",
- "ext/xds/xds_common_types.h",
- "ext/xds/xds_endpoint.h",
- "ext/xds/xds_health_status.h",
- "ext/xds/xds_http_fault_filter.h",
- "ext/xds/xds_http_filters.h",
- "ext/xds/xds_http_rbac_filter.h",
- "ext/xds/xds_http_stateful_session_filter.h",
- "ext/xds/xds_lb_policy_registry.h",
- "ext/xds/xds_listener.h",
- "ext/xds/xds_route_config.h",
- "ext/xds/xds_routing.h",
- "ext/xds/xds_transport_grpc.h",
"lib/security/credentials/xds/xds_credentials.h",
+ "xds/grpc/certificate_provider_store.h",
+ "xds/grpc/file_watcher_certificate_provider_factory.h",
+ "xds/grpc/xds_audit_logger_registry.h",
+ "xds/grpc/xds_bootstrap_grpc.h",
+ "xds/grpc/xds_certificate_provider.h",
+ "xds/grpc/xds_client_grpc.h",
+ "xds/grpc/xds_cluster.h",
+ "xds/grpc/xds_cluster_specifier_plugin.h",
+ "xds/grpc/xds_common_types.h",
+ "xds/grpc/xds_endpoint.h",
+ "xds/grpc/xds_health_status.h",
+ "xds/grpc/xds_http_fault_filter.h",
+ "xds/grpc/xds_http_filters.h",
+ "xds/grpc/xds_http_rbac_filter.h",
+ "xds/grpc/xds_http_stateful_session_filter.h",
+ "xds/grpc/xds_lb_policy_registry.h",
+ "xds/grpc/xds_listener.h",
+ "xds/grpc/xds_route_config.h",
+ "xds/grpc/xds_routing.h",
+ "xds/grpc/xds_transport_grpc.h",
],
external_deps = [
"absl/base:core_headers",
diff --git a/src/core/lib/security/credentials/xds/xds_credentials.cc b/src/core/lib/security/credentials/xds/xds_credentials.cc
index c170b218632..d04cf39f335 100644
--- a/src/core/lib/security/credentials/xds/xds_credentials.cc
+++ b/src/core/lib/security/credentials/xds/xds_credentials.cc
@@ -26,7 +26,6 @@
#include
#include
-#include "src/core/ext/xds/xds_certificate_provider.h"
#include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/gpr/useful.h"
#include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h"
@@ -34,6 +33,7 @@
#include "src/core/lib/security/credentials/tls/tls_credentials.h"
#include "src/core/lib/security/credentials/tls/tls_utils.h"
#include "src/core/load_balancing/xds/xds_channel_args.h"
+#include "src/core/xds/grpc/xds_certificate_provider.h"
namespace grpc_core {
diff --git a/src/core/lib/security/credentials/xds/xds_credentials.h b/src/core/lib/security/credentials/xds/xds_credentials.h
index 09762d30276..dc363ac52b2 100644
--- a/src/core/lib/security/credentials/xds/xds_credentials.h
+++ b/src/core/lib/security/credentials/xds/xds_credentials.h
@@ -33,7 +33,6 @@
#include
#include
-#include "src/core/ext/xds/xds_certificate_provider.h"
#include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/gprpp/ref_counted_ptr.h"
#include "src/core/lib/gprpp/unique_type_name.h"
@@ -41,6 +40,7 @@
#include "src/core/lib/security/credentials/credentials.h"
#include "src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.h"
#include "src/core/lib/security/security_connector/security_connector.h"
+#include "src/core/xds/grpc/xds_certificate_provider.h"
namespace grpc_core {
diff --git a/src/core/load_balancing/xds/cds.cc b/src/core/load_balancing/xds/cds.cc
index 96a6f6ae2e0..be516ce09c9 100644
--- a/src/core/load_balancing/xds/cds.cc
+++ b/src/core/load_balancing/xds/cds.cc
@@ -37,9 +37,6 @@
#include
#include
-#include "src/core/ext/xds/xds_cluster.h"
-#include "src/core/ext/xds/xds_common_types.h"
-#include "src/core/ext/xds/xds_health_status.h"
#include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/config/core_configuration.h"
#include "src/core/lib/debug/trace.h"
@@ -64,6 +61,9 @@
#include "src/core/load_balancing/outlier_detection/outlier_detection.h"
#include "src/core/load_balancing/xds/xds_channel_args.h"
#include "src/core/resolver/xds/xds_dependency_manager.h"
+#include "src/core/xds/grpc/xds_cluster.h"
+#include "src/core/xds/grpc/xds_common_types.h"
+#include "src/core/xds/grpc/xds_health_status.h"
namespace grpc_core {
diff --git a/src/core/load_balancing/xds/xds_cluster_impl.cc b/src/core/load_balancing/xds/xds_cluster_impl.cc
index 40edefa7d15..0554e28b4e7 100644
--- a/src/core/load_balancing/xds/xds_cluster_impl.cc
+++ b/src/core/load_balancing/xds/xds_cluster_impl.cc
@@ -38,12 +38,6 @@
#include
#include "src/core/client_channel/client_channel_internal.h"
-#include "src/core/ext/xds/xds_bootstrap.h"
-#include "src/core/ext/xds/xds_bootstrap_grpc.h"
-#include "src/core/ext/xds/xds_client.h"
-#include "src/core/ext/xds/xds_client_grpc.h"
-#include "src/core/ext/xds/xds_client_stats.h"
-#include "src/core/ext/xds/xds_endpoint.h"
#include "src/core/lib/channel/call_tracer.h"
#include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/config/core_configuration.h"
@@ -73,6 +67,12 @@
#include "src/core/load_balancing/xds/xds_channel_args.h"
#include "src/core/resolver/endpoint_addresses.h"
#include "src/core/resolver/xds/xds_dependency_manager.h"
+#include "src/core/xds/grpc/xds_bootstrap_grpc.h"
+#include "src/core/xds/grpc/xds_client_grpc.h"
+#include "src/core/xds/grpc/xds_endpoint.h"
+#include "src/core/xds/xds_client/xds_bootstrap.h"
+#include "src/core/xds/xds_client/xds_client.h"
+#include "src/core/xds/xds_client/xds_client_stats.h"
namespace grpc_core {
diff --git a/src/core/load_balancing/xds/xds_override_host.cc b/src/core/load_balancing/xds/xds_override_host.cc
index e29c9fde9f7..c8821ca0a91 100644
--- a/src/core/load_balancing/xds/xds_override_host.cc
+++ b/src/core/load_balancing/xds/xds_override_host.cc
@@ -49,7 +49,6 @@
#include "src/core/client_channel/client_channel_internal.h"
#include "src/core/ext/filters/stateful_session/stateful_session_filter.h"
-#include "src/core/ext/xds/xds_health_status.h"
#include "src/core/lib/address_utils/parse_address.h"
#include "src/core/lib/address_utils/sockaddr_utils.h"
#include "src/core/lib/channel/channel_args.h"
@@ -82,6 +81,7 @@
#include "src/core/load_balancing/subchannel_interface.h"
#include "src/core/resolver/endpoint_addresses.h"
#include "src/core/resolver/xds/xds_dependency_manager.h"
+#include "src/core/xds/grpc/xds_health_status.h"
namespace grpc_core {
diff --git a/src/core/load_balancing/xds/xds_wrr_locality.cc b/src/core/load_balancing/xds/xds_wrr_locality.cc
index 6aa2194d7b7..ac79f69f417 100644
--- a/src/core/load_balancing/xds/xds_wrr_locality.cc
+++ b/src/core/load_balancing/xds/xds_wrr_locality.cc
@@ -31,7 +31,6 @@
#include
#include
-#include "src/core/ext/xds/xds_client_stats.h"
#include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/config/core_configuration.h"
#include "src/core/lib/debug/trace.h"
@@ -51,6 +50,7 @@
#include "src/core/load_balancing/lb_policy_registry.h"
#include "src/core/load_balancing/xds/xds_channel_args.h"
#include "src/core/resolver/endpoint_addresses.h"
+#include "src/core/xds/xds_client/xds_client_stats.h"
namespace grpc_core {
diff --git a/src/core/resolver/google_c2p/google_c2p_resolver.cc b/src/core/resolver/google_c2p/google_c2p_resolver.cc
index a86e6d85603..0fb3744a3e8 100644
--- a/src/core/resolver/google_c2p/google_c2p_resolver.cc
+++ b/src/core/resolver/google_c2p/google_c2p_resolver.cc
@@ -33,8 +33,6 @@
#include
#include "src/core/ext/gcp/metadata_query.h"
-#include "src/core/ext/xds/xds_bootstrap.h"
-#include "src/core/ext/xds/xds_client_grpc.h"
#include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/config/core_configuration.h"
#include "src/core/lib/gprpp/debug_location.h"
@@ -52,6 +50,8 @@
#include "src/core/resolver/resolver.h"
#include "src/core/resolver/resolver_factory.h"
#include "src/core/resolver/resolver_registry.h"
+#include "src/core/xds/grpc/xds_client_grpc.h"
+#include "src/core/xds/xds_client/xds_bootstrap.h"
namespace grpc_core {
diff --git a/src/core/resolver/xds/xds_dependency_manager.cc b/src/core/resolver/xds/xds_dependency_manager.cc
index 0f51062e8f5..566e16059ce 100644
--- a/src/core/resolver/xds/xds_dependency_manager.cc
+++ b/src/core/resolver/xds/xds_dependency_manager.cc
@@ -23,12 +23,12 @@
#include
-#include "src/core/ext/xds/xds_routing.h"
#include "src/core/lib/config/core_configuration.h"
#include "src/core/lib/gprpp/match.h"
#include "src/core/load_balancing/xds/xds_channel_args.h"
#include "src/core/resolver/fake/fake_resolver.h"
#include "src/core/resolver/xds/xds_resolver_trace.h"
+#include "src/core/xds/grpc/xds_routing.h"
namespace grpc_core {
diff --git a/src/core/resolver/xds/xds_dependency_manager.h b/src/core/resolver/xds/xds_dependency_manager.h
index 903c8b95e89..9b2a5580601 100644
--- a/src/core/resolver/xds/xds_dependency_manager.h
+++ b/src/core/resolver/xds/xds_dependency_manager.h
@@ -23,13 +23,13 @@
#include
-#include "src/core/ext/xds/xds_client_grpc.h"
-#include "src/core/ext/xds/xds_cluster.h"
-#include "src/core/ext/xds/xds_endpoint.h"
-#include "src/core/ext/xds/xds_listener.h"
-#include "src/core/ext/xds/xds_route_config.h"
#include "src/core/lib/gprpp/ref_counted.h"
#include "src/core/resolver/resolver.h"
+#include "src/core/xds/grpc/xds_client_grpc.h"
+#include "src/core/xds/grpc/xds_cluster.h"
+#include "src/core/xds/grpc/xds_endpoint.h"
+#include "src/core/xds/grpc/xds_listener.h"
+#include "src/core/xds/grpc/xds_route_config.h"
namespace grpc_core {
diff --git a/src/core/resolver/xds/xds_resolver.cc b/src/core/resolver/xds/xds_resolver.cc
index d64da628eed..1b062981a2d 100644
--- a/src/core/resolver/xds/xds_resolver.cc
+++ b/src/core/resolver/xds/xds_resolver.cc
@@ -50,13 +50,6 @@
#include "src/core/client_channel/client_channel_internal.h"
#include "src/core/client_channel/config_selector.h"
-#include "src/core/ext/xds/xds_bootstrap.h"
-#include "src/core/ext/xds/xds_bootstrap_grpc.h"
-#include "src/core/ext/xds/xds_client_grpc.h"
-#include "src/core/ext/xds/xds_http_filters.h"
-#include "src/core/ext/xds/xds_listener.h"
-#include "src/core/ext/xds/xds_route_config.h"
-#include "src/core/ext/xds/xds_routing.h"
#include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/channel/channel_fwd.h"
#include "src/core/lib/channel/channel_stack.h"
@@ -93,6 +86,13 @@
#include "src/core/resolver/xds/xds_resolver_trace.h"
#include "src/core/service_config/service_config.h"
#include "src/core/service_config/service_config_impl.h"
+#include "src/core/xds/grpc/xds_bootstrap_grpc.h"
+#include "src/core/xds/grpc/xds_client_grpc.h"
+#include "src/core/xds/grpc/xds_http_filters.h"
+#include "src/core/xds/grpc/xds_listener.h"
+#include "src/core/xds/grpc/xds_route_config.h"
+#include "src/core/xds/grpc/xds_routing.h"
+#include "src/core/xds/xds_client/xds_bootstrap.h"
namespace grpc_core {
diff --git a/src/core/server/xds_server_config_fetcher.cc b/src/core/server/xds_server_config_fetcher.cc
index edb46e9bd3d..885e21120ba 100644
--- a/src/core/server/xds_server_config_fetcher.cc
+++ b/src/core/server/xds_server_config_fetcher.cc
@@ -47,16 +47,6 @@
#include
#include
-#include "src/core/ext/xds/certificate_provider_store.h"
-#include "src/core/ext/xds/xds_bootstrap_grpc.h"
-#include "src/core/ext/xds/xds_certificate_provider.h"
-#include "src/core/ext/xds/xds_client.h"
-#include "src/core/ext/xds/xds_client_grpc.h"
-#include "src/core/ext/xds/xds_common_types.h"
-#include "src/core/ext/xds/xds_http_filters.h"
-#include "src/core/ext/xds/xds_listener.h"
-#include "src/core/ext/xds/xds_route_config.h"
-#include "src/core/ext/xds/xds_routing.h"
#include "src/core/lib/address_utils/parse_address.h"
#include "src/core/lib/address_utils/sockaddr_utils.h"
#include "src/core/lib/channel/channel_args.h"
@@ -89,6 +79,16 @@
#include "src/core/server/xds_channel_stack_modifier.h"
#include "src/core/service_config/service_config.h"
#include "src/core/service_config/service_config_impl.h"
+#include "src/core/xds/grpc/certificate_provider_store.h"
+#include "src/core/xds/grpc/xds_bootstrap_grpc.h"
+#include "src/core/xds/grpc/xds_certificate_provider.h"
+#include "src/core/xds/grpc/xds_client_grpc.h"
+#include "src/core/xds/grpc/xds_common_types.h"
+#include "src/core/xds/grpc/xds_http_filters.h"
+#include "src/core/xds/grpc/xds_listener.h"
+#include "src/core/xds/grpc/xds_route_config.h"
+#include "src/core/xds/grpc/xds_routing.h"
+#include "src/core/xds/xds_client/xds_client.h"
namespace grpc_core {
namespace {
diff --git a/src/core/ext/xds/certificate_provider_store.cc b/src/core/xds/grpc/certificate_provider_store.cc
similarity index 98%
rename from src/core/ext/xds/certificate_provider_store.cc
rename to src/core/xds/grpc/certificate_provider_store.cc
index 9bfd22428e7..9915780957f 100644
--- a/src/core/ext/xds/certificate_provider_store.cc
+++ b/src/core/xds/grpc/certificate_provider_store.cc
@@ -16,7 +16,7 @@
//
//
-#include "src/core/ext/xds/certificate_provider_store.h"
+#include "src/core/xds/grpc/certificate_provider_store.h"
#include "absl/strings/str_cat.h"
diff --git a/src/core/ext/xds/certificate_provider_store.h b/src/core/xds/grpc/certificate_provider_store.h
similarity index 96%
rename from src/core/ext/xds/certificate_provider_store.h
rename to src/core/xds/grpc/certificate_provider_store.h
index 643f1019c6f..3099886f415 100644
--- a/src/core/ext/xds/certificate_provider_store.h
+++ b/src/core/xds/grpc/certificate_provider_store.h
@@ -16,8 +16,8 @@
//
//
-#ifndef GRPC_SRC_CORE_EXT_XDS_CERTIFICATE_PROVIDER_STORE_H
-#define GRPC_SRC_CORE_EXT_XDS_CERTIFICATE_PROVIDER_STORE_H
+#ifndef GRPC_SRC_CORE_XDS_GRPC_CERTIFICATE_PROVIDER_STORE_H
+#define GRPC_SRC_CORE_XDS_GRPC_CERTIFICATE_PROVIDER_STORE_H
#include