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 e4d7a953d46..daff7f0d857 100644
--- a/BUILD
+++ b/BUILD
@@ -242,11 +242,11 @@ config_setting(
python_config_settings()
# This should be updated along with build_handwritten.yaml
-g_stands_for = "grateful" # @unused
+g_stands_for = "gnarly" # @unused
core_version = "41.0.0" # @unused
-version = "1.64.0-dev" # @unused
+version = "1.65.0-dev" # @unused
GPR_PUBLIC_HDRS = [
"include/grpc/support/alloc.h",
@@ -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 406e768e5b1..16b3eb10562 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,11 +25,11 @@
cmake_minimum_required(VERSION 3.13)
set(PACKAGE_NAME "grpc")
-set(PACKAGE_VERSION "1.64.0-dev")
+set(PACKAGE_VERSION "1.65.0-dev")
set(gRPC_CORE_VERSION "41.0.0")
set(gRPC_CORE_SOVERSION "41")
-set(gRPC_CPP_VERSION "1.64.0-dev")
-set(gRPC_CPP_SOVERSION "1.64")
+set(gRPC_CPP_VERSION "1.65.0-dev")
+set(gRPC_CPP_SOVERSION "1.65")
set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
set(PACKAGE_TARNAME "${PACKAGE_NAME}-${PACKAGE_VERSION}")
set(PACKAGE_BUGREPORT "https://github.com/grpc/grpc/issues/")
@@ -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
@@ -2623,6 +2599,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 5c3d1bb452e..b8cbbb15fb6 100644
--- a/Makefile
+++ b/Makefile
@@ -368,7 +368,7 @@ Q = @
endif
CORE_VERSION = 41.0.0
-CPP_VERSION = 1.64.0-dev
+CPP_VERSION = 1.65.0-dev
CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES))
CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS)
@@ -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 \
@@ -1509,6 +1485,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 fdad051ca98..3452fbf6736 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",
@@ -2009,6 +1955,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/_metadata.py b/_metadata.py
index 7b93f833ee6..448129f21db 100644
--- a/_metadata.py
+++ b/_metadata.py
@@ -14,4 +14,4 @@
# AUTO-GENERATED FROM `$REPO_ROOT/templates/_metadata.py.template`!!!
-__version__ = """1.64.0.dev0"""
+__version__ = """1.65.0.dev0"""
diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml
index 7323f93dd14..0a00f9edd33 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
@@ -1243,6 +1213,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:
@@ -1634,30 +1634,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
@@ -2044,6 +2020,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
@@ -3856,7 +3856,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/build_handwritten.yaml b/build_handwritten.yaml
index 7088bc4db5b..e9eac935968 100644
--- a/build_handwritten.yaml
+++ b/build_handwritten.yaml
@@ -14,9 +14,9 @@ settings:
'#10': See the expand_version.py for all the quirks here
core_version: 41.0.0
csharp_major_version: 2
- g_stands_for: grateful
+ g_stands_for: gnarly
protobuf_version: 3.26.1
- version: 1.64.0-dev
+ version: 1.65.0-dev
configs:
asan:
CC: clang
diff --git a/config.m4 b/config.m4
index e03607dec0d..4b72ff9577e 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 \
@@ -884,6 +860,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 \
@@ -1384,7 +1384,7 @@ if test "$PHP_GRPC" != "no"; then
-D_HAS_EXCEPTIONS=0 -DNOMINMAX -DGRPC_ARES=0 \
-DGRPC_POSIX_FORK_ALLOW_PTHREAD_ATFORK=1 \
-DGRPC_XDS_USER_AGENT_NAME_SUFFIX='"\"PHP\""' \
- -DGRPC_XDS_USER_AGENT_VERSION_SUFFIX='"\"1.64.0dev\""')
+ -DGRPC_XDS_USER_AGENT_VERSION_SUFFIX='"\"1.65.0dev\""')
PHP_ADD_BUILD_DIR($ext_builddir/src/core/channelz)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/client_channel)
@@ -1507,7 +1507,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)
@@ -1607,6 +1606,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 b2b4e684427..f71331b6d7d 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 " +
@@ -849,6 +825,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 " +
@@ -1643,7 +1643,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");
@@ -1747,6 +1746,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/doc/g_stands_for.md b/doc/g_stands_for.md
index 22b7bcd7443..2557a2f352e 100644
--- a/doc/g_stands_for.md
+++ b/doc/g_stands_for.md
@@ -63,4 +63,5 @@
- 1.61 'g' stands for ['grand'](https://github.com/grpc/grpc/tree/v1.61.x)
- 1.62 'g' stands for ['guardian'](https://github.com/grpc/grpc/tree/v1.62.x)
- 1.63 'g' stands for ['giggle'](https://github.com/grpc/grpc/tree/v1.63.x)
-- 1.64 'g' stands for ['grateful'](https://github.com/grpc/grpc/tree/master)
+- 1.64 'g' stands for ['grateful'](https://github.com/grpc/grpc/tree/v1.64.x)
+- 1.65 'g' stands for ['gnarly'](https://github.com/grpc/grpc/tree/master)
diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec
index 2d39e5da5c7..cb31ce8929d 100644
--- a/gRPC-C++.podspec
+++ b/gRPC-C++.podspec
@@ -22,7 +22,7 @@
Pod::Spec.new do |s|
s.name = 'gRPC-C++'
# TODO (mxyan): use version that match gRPC version when pod is stabilized
- version = '1.64.0-dev'
+ version = '1.65.0-dev'
s.version = version
s.summary = 'gRPC C++ library'
s.homepage = 'https://grpc.io'
@@ -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',
@@ -1347,6 +1316,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',
@@ -2126,37 +2126,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',
@@ -2618,6 +2587,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 a0a06a3ed6e..e70fc2d7894 100644
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@@ -21,7 +21,7 @@
Pod::Spec.new do |s|
s.name = 'gRPC-Core'
- version = '1.64.0-dev'
+ version = '1.65.0-dev'
s.version = version
s.summary = 'Core cross-platform gRPC library, written in C'
s.homepage = 'https://grpc.io'
@@ -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',
@@ -2124,6 +2070,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',
@@ -2906,36 +2906,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',
@@ -3397,6 +3367,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-ProtoRPC.podspec b/gRPC-ProtoRPC.podspec
index 1e9d53cd623..1e9bab7d451 100644
--- a/gRPC-ProtoRPC.podspec
+++ b/gRPC-ProtoRPC.podspec
@@ -21,7 +21,7 @@
Pod::Spec.new do |s|
s.name = 'gRPC-ProtoRPC'
- version = '1.64.0-dev'
+ version = '1.65.0-dev'
s.version = version
s.summary = 'RPC library for Protocol Buffers, based on gRPC'
s.homepage = 'https://grpc.io'
diff --git a/gRPC-RxLibrary.podspec b/gRPC-RxLibrary.podspec
index 78653a71107..b1dd23fd87b 100644
--- a/gRPC-RxLibrary.podspec
+++ b/gRPC-RxLibrary.podspec
@@ -21,7 +21,7 @@
Pod::Spec.new do |s|
s.name = 'gRPC-RxLibrary'
- version = '1.64.0-dev'
+ version = '1.65.0-dev'
s.version = version
s.summary = 'Reactive Extensions library for iOS/OSX.'
s.homepage = 'https://grpc.io'
diff --git a/gRPC.podspec b/gRPC.podspec
index bc87111af0e..b016e73b775 100644
--- a/gRPC.podspec
+++ b/gRPC.podspec
@@ -20,7 +20,7 @@
Pod::Spec.new do |s|
s.name = 'gRPC'
- version = '1.64.0-dev'
+ version = '1.65.0-dev'
s.version = version
s.summary = 'gRPC client library for iOS/OSX'
s.homepage = 'https://grpc.io'
diff --git a/grpc.gemspec b/grpc.gemspec
index 4808bada297..4ea7d9088d6 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 )
@@ -2011,6 +1957,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/include/grpcpp/version_info.h b/include/grpcpp/version_info.h
index 5c2787ab227..0860a237de6 100644
--- a/include/grpcpp/version_info.h
+++ b/include/grpcpp/version_info.h
@@ -19,9 +19,9 @@
#define GRPCPP_VERSION_INFO_H
#define GRPC_CPP_VERSION_MAJOR 1
-#define GRPC_CPP_VERSION_MINOR 64
+#define GRPC_CPP_VERSION_MINOR 65
#define GRPC_CPP_VERSION_PATCH 0
#define GRPC_CPP_VERSION_TAG "dev"
-#define GRPC_CPP_VERSION_STRING "1.64.0-dev"
+#define GRPC_CPP_VERSION_STRING "1.65.0-dev"
#endif // GRPCPP_VERSION_INFO_H
diff --git a/package.xml b/package.xml
index a1afab47160..647d5677ee5 100644
--- a/package.xml
+++ b/package.xml
@@ -13,8 +13,8 @@
2019-09-24
- 1.64.0dev
- 1.64.0dev
+ 1.65.0dev
+ 1.65.0dev
beta
@@ -22,7 +22,7 @@
Apache 2.0
-- gRPC Core 1.64.0 update
+- gRPC Core 1.65.0 update
@@ -1047,60 +1047,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1993,6 +1939,60 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/core/BUILD b/src/core/BUILD
index effadda15cd..7b585215712 100644
--- a/src/core/BUILD
+++ b/src/core/BUILD
@@ -399,7 +399,7 @@ grpc_cc_library(
"absl/strings",
],
language = "c++",
- deps = ["//:gpr_platform"],
+ deps = ["//:gpr"],
)
grpc_cc_library(
@@ -5006,7 +5006,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",
@@ -5019,7 +5019,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++",
)
@@ -5027,50 +5027,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/gprpp/validation_errors.cc b/src/core/lib/gprpp/validation_errors.cc
index ce4f4f3a291..4cae4f814e4 100644
--- a/src/core/lib/gprpp/validation_errors.cc
+++ b/src/core/lib/gprpp/validation_errors.cc
@@ -14,6 +14,8 @@
#include "src/core/lib/gprpp/validation_errors.h"
+#include
+
#include
#include "absl/status/status.h"
@@ -21,6 +23,7 @@
#include "absl/strings/str_join.h"
#include "absl/strings/strip.h"
+#include
#include
namespace grpc_core {
@@ -34,7 +37,14 @@ void ValidationErrors::PushField(absl::string_view ext) {
void ValidationErrors::PopField() { fields_.pop_back(); }
void ValidationErrors::AddError(absl::string_view error) {
- field_errors_[absl::StrJoin(fields_, "")].emplace_back(error);
+ auto key = absl::StrJoin(fields_, "");
+ if (field_errors_[key].size() >= max_error_count_) {
+ gpr_log(GPR_DEBUG,
+ "Ignoring validation error: too many errors found (%" PRIuPTR ")",
+ max_error_count_);
+ return;
+ }
+ field_errors_[key].emplace_back(error);
}
bool ValidationErrors::FieldHasErrors() const {
diff --git a/src/core/lib/gprpp/validation_errors.h b/src/core/lib/gprpp/validation_errors.h
index f754bca3489..34a299b2ca8 100644
--- a/src/core/lib/gprpp/validation_errors.h
+++ b/src/core/lib/gprpp/validation_errors.h
@@ -63,6 +63,9 @@ namespace grpc_core {
// }
class ValidationErrors {
public:
+ // Default maximum number of errors to track per scope.
+ static constexpr size_t kMaxErrorCount = 20;
+
// Pushes a field name onto the stack at construction and pops it off
// of the stack at destruction.
class ScopedField {
@@ -93,6 +96,12 @@ class ValidationErrors {
ValidationErrors* errors_;
};
+ ValidationErrors() : ValidationErrors(kMaxErrorCount) {}
+
+ // Creates a tracker that collects at most `max_error_count` errors per field.
+ explicit ValidationErrors(size_t max_error_count)
+ : max_error_count_(max_error_count) {}
+
// Records that we've encountered an error associated with the current
// field.
void AddError(absl::string_view error) GPR_ATTRIBUTE_NOINLINE;
@@ -127,6 +136,8 @@ class ValidationErrors {
// Stack of field names indicating the field that we are currently
// validating.
std::vector fields_;
+
+ size_t max_error_count_;
};
} // namespace grpc_core
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/lib/surface/version.cc b/src/core/lib/surface/version.cc
index 152e3c14fa3..eb735f8be9d 100644
--- a/src/core/lib/surface/version.cc
+++ b/src/core/lib/surface/version.cc
@@ -24,4 +24,4 @@
const char* grpc_version_string(void) { return "41.0.0"; }
-const char* grpc_g_stands_for(void) { return "grateful"; }
+const char* grpc_g_stands_for(void) { return "gnarly"; }
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 17808406c4c..6e51ab1d856 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