diff --git a/BUILD b/BUILD
index c36c371f8c3..8fa95063a08 100644
--- a/BUILD
+++ b/BUILD
@@ -3134,20 +3134,20 @@ grpc_cc_library(
grpc_cc_library(
name = "udpa_core_upb",
srcs = [
- "src/core/ext/upb-generated/udpa/core/v1/authority.upb.c",
- "src/core/ext/upb-generated/udpa/core/v1/collection_entry.upb.c",
- "src/core/ext/upb-generated/udpa/core/v1/context_params.upb.c",
- "src/core/ext/upb-generated/udpa/core/v1/resource.upb.c",
- "src/core/ext/upb-generated/udpa/core/v1/resource_locator.upb.c",
- "src/core/ext/upb-generated/udpa/core/v1/resource_name.upb.c",
+ "src/core/ext/upb-generated/xds/core/v3/authority.upb.c",
+ "src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.c",
+ "src/core/ext/upb-generated/xds/core/v3/context_params.upb.c",
+ "src/core/ext/upb-generated/xds/core/v3/resource.upb.c",
+ "src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.c",
+ "src/core/ext/upb-generated/xds/core/v3/resource_name.upb.c",
],
hdrs = [
- "src/core/ext/upb-generated/udpa/core/v1/authority.upb.h",
- "src/core/ext/upb-generated/udpa/core/v1/collection_entry.upb.h",
- "src/core/ext/upb-generated/udpa/core/v1/context_params.upb.h",
- "src/core/ext/upb-generated/udpa/core/v1/resource.upb.h",
- "src/core/ext/upb-generated/udpa/core/v1/resource_locator.upb.h",
- "src/core/ext/upb-generated/udpa/core/v1/resource_name.upb.h",
+ "src/core/ext/upb-generated/xds/core/v3/authority.upb.h",
+ "src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.h",
+ "src/core/ext/upb-generated/xds/core/v3/context_params.upb.h",
+ "src/core/ext/upb-generated/xds/core/v3/resource.upb.h",
+ "src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.h",
+ "src/core/ext/upb-generated/xds/core/v3/resource_name.upb.h",
],
external_deps = [
"upb_lib",
@@ -3164,20 +3164,20 @@ grpc_cc_library(
grpc_cc_library(
name = "udpa_core_upbdefs",
srcs = [
- "src/core/ext/upbdefs-generated/udpa/core/v1/authority.upbdefs.c",
- "src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.c",
- "src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.c",
- "src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.c",
- "src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.c",
- "src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.c",
+ "src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.c",
+ "src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.c",
+ "src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.c",
+ "src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.c",
+ "src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.c",
+ "src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.c",
],
hdrs = [
- "src/core/ext/upbdefs-generated/udpa/core/v1/authority.upbdefs.h",
- "src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.h",
- "src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.h",
- "src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.h",
- "src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.h",
- "src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.h",
+ "src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.h",
+ "src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.h",
+ "src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.h",
+ "src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.h",
+ "src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.h",
+ "src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.h",
],
external_deps = [
"upb_lib",
diff --git a/BUILD.gn b/BUILD.gn
index eb38bc542e0..5a94ce2e466 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -554,18 +554,18 @@ config("grpc_config") {
"src/core/ext/upb-generated/udpa/annotations/status.upb.h",
"src/core/ext/upb-generated/udpa/annotations/versioning.upb.c",
"src/core/ext/upb-generated/udpa/annotations/versioning.upb.h",
- "src/core/ext/upb-generated/udpa/core/v1/authority.upb.c",
- "src/core/ext/upb-generated/udpa/core/v1/authority.upb.h",
- "src/core/ext/upb-generated/udpa/core/v1/collection_entry.upb.c",
- "src/core/ext/upb-generated/udpa/core/v1/collection_entry.upb.h",
- "src/core/ext/upb-generated/udpa/core/v1/context_params.upb.c",
- "src/core/ext/upb-generated/udpa/core/v1/context_params.upb.h",
- "src/core/ext/upb-generated/udpa/core/v1/resource.upb.c",
- "src/core/ext/upb-generated/udpa/core/v1/resource.upb.h",
- "src/core/ext/upb-generated/udpa/core/v1/resource_locator.upb.c",
- "src/core/ext/upb-generated/udpa/core/v1/resource_locator.upb.h",
- "src/core/ext/upb-generated/udpa/core/v1/resource_name.upb.c",
- "src/core/ext/upb-generated/udpa/core/v1/resource_name.upb.h",
+ "src/core/ext/upb-generated/xds/core/v3/authority.upb.c",
+ "src/core/ext/upb-generated/xds/core/v3/authority.upb.h",
+ "src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.c",
+ "src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.h",
+ "src/core/ext/upb-generated/xds/core/v3/context_params.upb.c",
+ "src/core/ext/upb-generated/xds/core/v3/context_params.upb.h",
+ "src/core/ext/upb-generated/xds/core/v3/resource.upb.c",
+ "src/core/ext/upb-generated/xds/core/v3/resource.upb.h",
+ "src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.c",
+ "src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.h",
+ "src/core/ext/upb-generated/xds/core/v3/resource_name.upb.c",
+ "src/core/ext/upb-generated/xds/core/v3/resource_name.upb.h",
"src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c",
"src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h",
"src/core/ext/upb-generated/validate/validate.upb.c",
@@ -712,18 +712,18 @@ config("grpc_config") {
"src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.h",
"src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c",
"src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.h",
- "src/core/ext/upbdefs-generated/udpa/core/v1/authority.upbdefs.c",
- "src/core/ext/upbdefs-generated/udpa/core/v1/authority.upbdefs.h",
- "src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.c",
- "src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.h",
- "src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.c",
- "src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.h",
- "src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.c",
- "src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.h",
- "src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.c",
- "src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.h",
- "src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.c",
- "src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.h",
+ "src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.c",
+ "src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.h",
+ "src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.c",
+ "src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.h",
+ "src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.c",
+ "src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.h",
+ "src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.c",
+ "src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.h",
+ "src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.c",
+ "src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.h",
+ "src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.c",
+ "src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.h",
"src/core/ext/upbdefs-generated/validate/validate.upbdefs.c",
"src/core/ext/upbdefs-generated/validate/validate.upbdefs.h",
"src/core/ext/xds/certificate_provider_factory.h",
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8f65b541298..65ac75941da 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1635,12 +1635,12 @@ add_library(grpc
src/core/ext/upb-generated/udpa/annotations/sensitive.upb.c
src/core/ext/upb-generated/udpa/annotations/status.upb.c
src/core/ext/upb-generated/udpa/annotations/versioning.upb.c
- src/core/ext/upb-generated/udpa/core/v1/authority.upb.c
- src/core/ext/upb-generated/udpa/core/v1/collection_entry.upb.c
- src/core/ext/upb-generated/udpa/core/v1/context_params.upb.c
- src/core/ext/upb-generated/udpa/core/v1/resource.upb.c
- src/core/ext/upb-generated/udpa/core/v1/resource_locator.upb.c
- src/core/ext/upb-generated/udpa/core/v1/resource_name.upb.c
+ src/core/ext/upb-generated/xds/core/v3/authority.upb.c
+ src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.c
+ src/core/ext/upb-generated/xds/core/v3/context_params.upb.c
+ src/core/ext/upb-generated/xds/core/v3/resource.upb.c
+ src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.c
+ src/core/ext/upb-generated/xds/core/v3/resource_name.upb.c
src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c
src/core/ext/upb-generated/validate/validate.upb.c
src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.c
@@ -1714,12 +1714,12 @@ add_library(grpc
src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.c
src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.c
src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c
- src/core/ext/upbdefs-generated/udpa/core/v1/authority.upbdefs.c
- src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.c
- src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.c
- src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.c
- src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.c
- src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.c
+ src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.c
+ src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.c
+ src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.c
+ src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.c
+ src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.c
+ src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.c
src/core/ext/upbdefs-generated/validate/validate.upbdefs.c
src/core/ext/xds/certificate_provider_registry.cc
src/core/ext/xds/certificate_provider_store.cc
diff --git a/Makefile b/Makefile
index 9fed6748ef9..5f1058ca4c6 100644
--- a/Makefile
+++ b/Makefile
@@ -1218,12 +1218,12 @@ LIBGRPC_SRC = \
src/core/ext/upb-generated/udpa/annotations/sensitive.upb.c \
src/core/ext/upb-generated/udpa/annotations/status.upb.c \
src/core/ext/upb-generated/udpa/annotations/versioning.upb.c \
- src/core/ext/upb-generated/udpa/core/v1/authority.upb.c \
- src/core/ext/upb-generated/udpa/core/v1/collection_entry.upb.c \
- src/core/ext/upb-generated/udpa/core/v1/context_params.upb.c \
- src/core/ext/upb-generated/udpa/core/v1/resource.upb.c \
- src/core/ext/upb-generated/udpa/core/v1/resource_locator.upb.c \
- src/core/ext/upb-generated/udpa/core/v1/resource_name.upb.c \
+ src/core/ext/upb-generated/xds/core/v3/authority.upb.c \
+ src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.c \
+ src/core/ext/upb-generated/xds/core/v3/context_params.upb.c \
+ src/core/ext/upb-generated/xds/core/v3/resource.upb.c \
+ src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.c \
+ src/core/ext/upb-generated/xds/core/v3/resource_name.upb.c \
src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c \
src/core/ext/upb-generated/validate/validate.upb.c \
src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.c \
@@ -1297,12 +1297,12 @@ LIBGRPC_SRC = \
src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.c \
src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.c \
src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c \
- src/core/ext/upbdefs-generated/udpa/core/v1/authority.upbdefs.c \
- src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.c \
- src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.c \
- src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.c \
- src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.c \
- src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.c \
+ src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.c \
+ src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.c \
+ src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.c \
+ src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.c \
+ src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.c \
+ src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.c \
src/core/ext/upbdefs-generated/validate/validate.upbdefs.c \
src/core/ext/xds/certificate_provider_registry.cc \
src/core/ext/xds/certificate_provider_store.cc \
@@ -2730,12 +2730,12 @@ src/core/ext/upb-generated/udpa/annotations/security.upb.c: $(OPENSSL_DEP)
src/core/ext/upb-generated/udpa/annotations/sensitive.upb.c: $(OPENSSL_DEP)
src/core/ext/upb-generated/udpa/annotations/status.upb.c: $(OPENSSL_DEP)
src/core/ext/upb-generated/udpa/annotations/versioning.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/udpa/core/v1/authority.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/udpa/core/v1/collection_entry.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/udpa/core/v1/context_params.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/udpa/core/v1/resource.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/udpa/core/v1/resource_locator.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/udpa/core/v1/resource_name.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/xds/core/v3/authority.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/xds/core/v3/context_params.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/xds/core/v3/resource.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/xds/core/v3/resource_name.upb.c: $(OPENSSL_DEP)
src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.c: $(OPENSSL_DEP)
src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.c: $(OPENSSL_DEP)
src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.c: $(OPENSSL_DEP)
@@ -2807,12 +2807,12 @@ src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.c: $(OPENSSL_DE
src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.c: $(OPENSSL_DEP)
src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.c: $(OPENSSL_DEP)
src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/udpa/core/v1/authority.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.c: $(OPENSSL_DEP)
src/core/ext/upbdefs-generated/validate/validate.upbdefs.c: $(OPENSSL_DEP)
src/core/ext/xds/certificate_provider_registry.cc: $(OPENSSL_DEP)
src/core/ext/xds/certificate_provider_store.cc: $(OPENSSL_DEP)
diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml
index 4873cfe4814..4cec4a28dcb 100644
--- a/build_autogenerated.yaml
+++ b/build_autogenerated.yaml
@@ -546,12 +546,12 @@ libs:
- src/core/ext/upb-generated/udpa/annotations/sensitive.upb.h
- src/core/ext/upb-generated/udpa/annotations/status.upb.h
- src/core/ext/upb-generated/udpa/annotations/versioning.upb.h
- - src/core/ext/upb-generated/udpa/core/v1/authority.upb.h
- - src/core/ext/upb-generated/udpa/core/v1/collection_entry.upb.h
- - src/core/ext/upb-generated/udpa/core/v1/context_params.upb.h
- - src/core/ext/upb-generated/udpa/core/v1/resource.upb.h
- - src/core/ext/upb-generated/udpa/core/v1/resource_locator.upb.h
- - src/core/ext/upb-generated/udpa/core/v1/resource_name.upb.h
+ - src/core/ext/upb-generated/xds/core/v3/authority.upb.h
+ - src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.h
+ - src/core/ext/upb-generated/xds/core/v3/context_params.upb.h
+ - src/core/ext/upb-generated/xds/core/v3/resource.upb.h
+ - src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.h
+ - src/core/ext/upb-generated/xds/core/v3/resource_name.upb.h
- src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h
- src/core/ext/upb-generated/validate/validate.upb.h
- src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.h
@@ -625,12 +625,12 @@ libs:
- src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.h
- src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.h
- src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.h
- - src/core/ext/upbdefs-generated/udpa/core/v1/authority.upbdefs.h
- - src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.h
- - src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.h
- - src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.h
- - src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.h
- - src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.h
+ - src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.h
+ - src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.h
+ - src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.h
+ - src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.h
+ - src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.h
+ - src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.h
- src/core/ext/upbdefs-generated/validate/validate.upbdefs.h
- src/core/ext/xds/certificate_provider_factory.h
- src/core/ext/xds/certificate_provider_registry.h
@@ -1052,12 +1052,12 @@ libs:
- src/core/ext/upb-generated/udpa/annotations/sensitive.upb.c
- src/core/ext/upb-generated/udpa/annotations/status.upb.c
- src/core/ext/upb-generated/udpa/annotations/versioning.upb.c
- - src/core/ext/upb-generated/udpa/core/v1/authority.upb.c
- - src/core/ext/upb-generated/udpa/core/v1/collection_entry.upb.c
- - src/core/ext/upb-generated/udpa/core/v1/context_params.upb.c
- - src/core/ext/upb-generated/udpa/core/v1/resource.upb.c
- - src/core/ext/upb-generated/udpa/core/v1/resource_locator.upb.c
- - src/core/ext/upb-generated/udpa/core/v1/resource_name.upb.c
+ - src/core/ext/upb-generated/xds/core/v3/authority.upb.c
+ - src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.c
+ - src/core/ext/upb-generated/xds/core/v3/context_params.upb.c
+ - src/core/ext/upb-generated/xds/core/v3/resource.upb.c
+ - src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.c
+ - src/core/ext/upb-generated/xds/core/v3/resource_name.upb.c
- src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c
- src/core/ext/upb-generated/validate/validate.upb.c
- src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.c
@@ -1131,12 +1131,12 @@ libs:
- src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.c
- src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.c
- src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c
- - src/core/ext/upbdefs-generated/udpa/core/v1/authority.upbdefs.c
- - src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.c
- - src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.c
- - src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.c
- - src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.c
- - src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.c
+ - src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.c
+ - src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.c
+ - src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.c
+ - src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.c
+ - src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.c
+ - src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.c
- src/core/ext/upbdefs-generated/validate/validate.upbdefs.c
- src/core/ext/xds/certificate_provider_registry.cc
- src/core/ext/xds/certificate_provider_store.cc
diff --git a/config.m4 b/config.m4
index e9f24adaeba..9a0da2dc6dd 100644
--- a/config.m4
+++ b/config.m4
@@ -224,12 +224,12 @@ if test "$PHP_GRPC" != "no"; then
src/core/ext/upb-generated/udpa/annotations/sensitive.upb.c \
src/core/ext/upb-generated/udpa/annotations/status.upb.c \
src/core/ext/upb-generated/udpa/annotations/versioning.upb.c \
- src/core/ext/upb-generated/udpa/core/v1/authority.upb.c \
- src/core/ext/upb-generated/udpa/core/v1/collection_entry.upb.c \
- src/core/ext/upb-generated/udpa/core/v1/context_params.upb.c \
- src/core/ext/upb-generated/udpa/core/v1/resource.upb.c \
- src/core/ext/upb-generated/udpa/core/v1/resource_locator.upb.c \
- src/core/ext/upb-generated/udpa/core/v1/resource_name.upb.c \
+ src/core/ext/upb-generated/xds/core/v3/authority.upb.c \
+ src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.c \
+ src/core/ext/upb-generated/xds/core/v3/context_params.upb.c \
+ src/core/ext/upb-generated/xds/core/v3/resource.upb.c \
+ src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.c \
+ src/core/ext/upb-generated/xds/core/v3/resource_name.upb.c \
src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c \
src/core/ext/upb-generated/validate/validate.upb.c \
src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.c \
@@ -304,12 +304,12 @@ if test "$PHP_GRPC" != "no"; then
src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.c \
src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.c \
src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c \
- src/core/ext/upbdefs-generated/udpa/core/v1/authority.upbdefs.c \
- src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.c \
- src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.c \
- src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.c \
- src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.c \
- src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.c \
+ src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.c \
+ src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.c \
+ src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.c \
+ src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.c \
+ src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.c \
+ src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.c \
src/core/ext/upbdefs-generated/validate/validate.upbdefs.c \
src/core/ext/xds/certificate_provider_registry.cc \
src/core/ext/xds/certificate_provider_store.cc \
@@ -1072,7 +1072,7 @@ if test "$PHP_GRPC" != "no"; then
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/src/proto/grpc/health/v1)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/src/proto/grpc/lb/v1)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/udpa/annotations)
- PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/udpa/core/v1)
+ PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/xds/core/v3)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/udpa/data/orca/v1)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/validate)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/annotations)
@@ -1100,7 +1100,7 @@ if test "$PHP_GRPC" != "no"; then
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/google/protobuf)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/google/rpc)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/udpa/annotations)
- PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/udpa/core/v1)
+ PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/xds/core/v3)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/validate)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/xds)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/avl)
diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec
index 015d7e577b3..32f9c205a1b 100644
--- a/gRPC-C++.podspec
+++ b/gRPC-C++.podspec
@@ -362,12 +362,12 @@ Pod::Spec.new do |s|
'src/core/ext/upb-generated/udpa/annotations/sensitive.upb.h',
'src/core/ext/upb-generated/udpa/annotations/status.upb.h',
'src/core/ext/upb-generated/udpa/annotations/versioning.upb.h',
- 'src/core/ext/upb-generated/udpa/core/v1/authority.upb.h',
- 'src/core/ext/upb-generated/udpa/core/v1/collection_entry.upb.h',
- 'src/core/ext/upb-generated/udpa/core/v1/context_params.upb.h',
- 'src/core/ext/upb-generated/udpa/core/v1/resource.upb.h',
- 'src/core/ext/upb-generated/udpa/core/v1/resource_locator.upb.h',
- 'src/core/ext/upb-generated/udpa/core/v1/resource_name.upb.h',
+ 'src/core/ext/upb-generated/xds/core/v3/authority.upb.h',
+ 'src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.h',
+ 'src/core/ext/upb-generated/xds/core/v3/context_params.upb.h',
+ 'src/core/ext/upb-generated/xds/core/v3/resource.upb.h',
+ 'src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.h',
+ 'src/core/ext/upb-generated/xds/core/v3/resource_name.upb.h',
'src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h',
'src/core/ext/upb-generated/validate/validate.upb.h',
'src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.h',
@@ -442,12 +442,12 @@ Pod::Spec.new do |s|
'src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.h',
'src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.h',
'src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.h',
- 'src/core/ext/upbdefs-generated/udpa/core/v1/authority.upbdefs.h',
- 'src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.h',
- 'src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.h',
- 'src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.h',
- 'src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.h',
- 'src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.h',
+ 'src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.h',
+ 'src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.h',
+ 'src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.h',
+ 'src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.h',
+ 'src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.h',
+ 'src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.h',
'src/core/ext/upbdefs-generated/validate/validate.upbdefs.h',
'src/core/ext/xds/certificate_provider_factory.h',
'src/core/ext/xds/certificate_provider_registry.h',
@@ -983,12 +983,12 @@ Pod::Spec.new do |s|
'src/core/ext/upb-generated/udpa/annotations/sensitive.upb.h',
'src/core/ext/upb-generated/udpa/annotations/status.upb.h',
'src/core/ext/upb-generated/udpa/annotations/versioning.upb.h',
- 'src/core/ext/upb-generated/udpa/core/v1/authority.upb.h',
- 'src/core/ext/upb-generated/udpa/core/v1/collection_entry.upb.h',
- 'src/core/ext/upb-generated/udpa/core/v1/context_params.upb.h',
- 'src/core/ext/upb-generated/udpa/core/v1/resource.upb.h',
- 'src/core/ext/upb-generated/udpa/core/v1/resource_locator.upb.h',
- 'src/core/ext/upb-generated/udpa/core/v1/resource_name.upb.h',
+ 'src/core/ext/upb-generated/xds/core/v3/authority.upb.h',
+ 'src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.h',
+ 'src/core/ext/upb-generated/xds/core/v3/context_params.upb.h',
+ 'src/core/ext/upb-generated/xds/core/v3/resource.upb.h',
+ 'src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.h',
+ 'src/core/ext/upb-generated/xds/core/v3/resource_name.upb.h',
'src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h',
'src/core/ext/upb-generated/validate/validate.upb.h',
'src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.h',
@@ -1063,12 +1063,12 @@ Pod::Spec.new do |s|
'src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.h',
'src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.h',
'src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.h',
- 'src/core/ext/upbdefs-generated/udpa/core/v1/authority.upbdefs.h',
- 'src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.h',
- 'src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.h',
- 'src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.h',
- 'src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.h',
- 'src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.h',
+ 'src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.h',
+ 'src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.h',
+ 'src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.h',
+ 'src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.h',
+ 'src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.h',
+ 'src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.h',
'src/core/ext/upbdefs-generated/validate/validate.upbdefs.h',
'src/core/ext/xds/certificate_provider_factory.h',
'src/core/ext/xds/certificate_provider_registry.h',
diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec
index 781f82aaf80..987bf65144f 100644
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@@ -536,18 +536,18 @@ Pod::Spec.new do |s|
'src/core/ext/upb-generated/udpa/annotations/status.upb.h',
'src/core/ext/upb-generated/udpa/annotations/versioning.upb.c',
'src/core/ext/upb-generated/udpa/annotations/versioning.upb.h',
- 'src/core/ext/upb-generated/udpa/core/v1/authority.upb.c',
- 'src/core/ext/upb-generated/udpa/core/v1/authority.upb.h',
- 'src/core/ext/upb-generated/udpa/core/v1/collection_entry.upb.c',
- 'src/core/ext/upb-generated/udpa/core/v1/collection_entry.upb.h',
- 'src/core/ext/upb-generated/udpa/core/v1/context_params.upb.c',
- 'src/core/ext/upb-generated/udpa/core/v1/context_params.upb.h',
- 'src/core/ext/upb-generated/udpa/core/v1/resource.upb.c',
- 'src/core/ext/upb-generated/udpa/core/v1/resource.upb.h',
- 'src/core/ext/upb-generated/udpa/core/v1/resource_locator.upb.c',
- 'src/core/ext/upb-generated/udpa/core/v1/resource_locator.upb.h',
- 'src/core/ext/upb-generated/udpa/core/v1/resource_name.upb.c',
- 'src/core/ext/upb-generated/udpa/core/v1/resource_name.upb.h',
+ 'src/core/ext/upb-generated/xds/core/v3/authority.upb.c',
+ 'src/core/ext/upb-generated/xds/core/v3/authority.upb.h',
+ 'src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.c',
+ 'src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.h',
+ 'src/core/ext/upb-generated/xds/core/v3/context_params.upb.c',
+ 'src/core/ext/upb-generated/xds/core/v3/context_params.upb.h',
+ 'src/core/ext/upb-generated/xds/core/v3/resource.upb.c',
+ 'src/core/ext/upb-generated/xds/core/v3/resource.upb.h',
+ 'src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.c',
+ 'src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.h',
+ 'src/core/ext/upb-generated/xds/core/v3/resource_name.upb.c',
+ 'src/core/ext/upb-generated/xds/core/v3/resource_name.upb.h',
'src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c',
'src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h',
'src/core/ext/upb-generated/validate/validate.upb.c',
@@ -696,18 +696,18 @@ Pod::Spec.new do |s|
'src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.h',
'src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c',
'src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.h',
- 'src/core/ext/upbdefs-generated/udpa/core/v1/authority.upbdefs.c',
- 'src/core/ext/upbdefs-generated/udpa/core/v1/authority.upbdefs.h',
- 'src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.c',
- 'src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.h',
- 'src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.c',
- 'src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.h',
- 'src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.c',
- 'src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.h',
- 'src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.c',
- 'src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.h',
- 'src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.c',
- 'src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.h',
+ 'src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.c',
+ 'src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.h',
+ 'src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.c',
+ 'src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.h',
+ 'src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.c',
+ 'src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.h',
+ 'src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.c',
+ 'src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.h',
+ 'src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.c',
+ 'src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.h',
+ 'src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.c',
+ 'src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.h',
'src/core/ext/upbdefs-generated/validate/validate.upbdefs.c',
'src/core/ext/upbdefs-generated/validate/validate.upbdefs.h',
'src/core/ext/xds/certificate_provider_factory.h',
@@ -1519,12 +1519,12 @@ Pod::Spec.new do |s|
'src/core/ext/upb-generated/udpa/annotations/sensitive.upb.h',
'src/core/ext/upb-generated/udpa/annotations/status.upb.h',
'src/core/ext/upb-generated/udpa/annotations/versioning.upb.h',
- 'src/core/ext/upb-generated/udpa/core/v1/authority.upb.h',
- 'src/core/ext/upb-generated/udpa/core/v1/collection_entry.upb.h',
- 'src/core/ext/upb-generated/udpa/core/v1/context_params.upb.h',
- 'src/core/ext/upb-generated/udpa/core/v1/resource.upb.h',
- 'src/core/ext/upb-generated/udpa/core/v1/resource_locator.upb.h',
- 'src/core/ext/upb-generated/udpa/core/v1/resource_name.upb.h',
+ 'src/core/ext/upb-generated/xds/core/v3/authority.upb.h',
+ 'src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.h',
+ 'src/core/ext/upb-generated/xds/core/v3/context_params.upb.h',
+ 'src/core/ext/upb-generated/xds/core/v3/resource.upb.h',
+ 'src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.h',
+ 'src/core/ext/upb-generated/xds/core/v3/resource_name.upb.h',
'src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h',
'src/core/ext/upb-generated/validate/validate.upb.h',
'src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.h',
@@ -1599,12 +1599,12 @@ Pod::Spec.new do |s|
'src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.h',
'src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.h',
'src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.h',
- 'src/core/ext/upbdefs-generated/udpa/core/v1/authority.upbdefs.h',
- 'src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.h',
- 'src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.h',
- 'src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.h',
- 'src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.h',
- 'src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.h',
+ 'src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.h',
+ 'src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.h',
+ 'src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.h',
+ 'src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.h',
+ 'src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.h',
+ 'src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.h',
'src/core/ext/upbdefs-generated/validate/validate.upbdefs.h',
'src/core/ext/xds/certificate_provider_factory.h',
'src/core/ext/xds/certificate_provider_registry.h',
diff --git a/grpc.gemspec b/grpc.gemspec
index 0f9169d66fa..cd5282ebd37 100644
--- a/grpc.gemspec
+++ b/grpc.gemspec
@@ -451,18 +451,18 @@ Gem::Specification.new do |s|
s.files += %w( src/core/ext/upb-generated/udpa/annotations/status.upb.h )
s.files += %w( src/core/ext/upb-generated/udpa/annotations/versioning.upb.c )
s.files += %w( src/core/ext/upb-generated/udpa/annotations/versioning.upb.h )
- s.files += %w( src/core/ext/upb-generated/udpa/core/v1/authority.upb.c )
- s.files += %w( src/core/ext/upb-generated/udpa/core/v1/authority.upb.h )
- s.files += %w( src/core/ext/upb-generated/udpa/core/v1/collection_entry.upb.c )
- s.files += %w( src/core/ext/upb-generated/udpa/core/v1/collection_entry.upb.h )
- s.files += %w( src/core/ext/upb-generated/udpa/core/v1/context_params.upb.c )
- s.files += %w( src/core/ext/upb-generated/udpa/core/v1/context_params.upb.h )
- s.files += %w( src/core/ext/upb-generated/udpa/core/v1/resource.upb.c )
- s.files += %w( src/core/ext/upb-generated/udpa/core/v1/resource.upb.h )
- s.files += %w( src/core/ext/upb-generated/udpa/core/v1/resource_locator.upb.c )
- s.files += %w( src/core/ext/upb-generated/udpa/core/v1/resource_locator.upb.h )
- s.files += %w( src/core/ext/upb-generated/udpa/core/v1/resource_name.upb.c )
- s.files += %w( src/core/ext/upb-generated/udpa/core/v1/resource_name.upb.h )
+ s.files += %w( src/core/ext/upb-generated/xds/core/v3/authority.upb.c )
+ s.files += %w( src/core/ext/upb-generated/xds/core/v3/authority.upb.h )
+ s.files += %w( src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.c )
+ s.files += %w( src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.h )
+ s.files += %w( src/core/ext/upb-generated/xds/core/v3/context_params.upb.c )
+ s.files += %w( src/core/ext/upb-generated/xds/core/v3/context_params.upb.h )
+ s.files += %w( src/core/ext/upb-generated/xds/core/v3/resource.upb.c )
+ s.files += %w( src/core/ext/upb-generated/xds/core/v3/resource.upb.h )
+ s.files += %w( src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.c )
+ s.files += %w( src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.h )
+ s.files += %w( src/core/ext/upb-generated/xds/core/v3/resource_name.upb.c )
+ s.files += %w( src/core/ext/upb-generated/xds/core/v3/resource_name.upb.h )
s.files += %w( src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c )
s.files += %w( src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h )
s.files += %w( src/core/ext/upb-generated/validate/validate.upb.c )
@@ -611,18 +611,18 @@ Gem::Specification.new do |s|
s.files += %w( src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.h )
s.files += %w( src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c )
s.files += %w( src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.h )
- s.files += %w( src/core/ext/upbdefs-generated/udpa/core/v1/authority.upbdefs.c )
- s.files += %w( src/core/ext/upbdefs-generated/udpa/core/v1/authority.upbdefs.h )
- s.files += %w( src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.c )
- s.files += %w( src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.h )
- s.files += %w( src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.c )
- s.files += %w( src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.h )
- s.files += %w( src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.c )
- s.files += %w( src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.h )
- s.files += %w( src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.c )
- s.files += %w( src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.h )
- s.files += %w( src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.c )
- s.files += %w( src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.h )
+ s.files += %w( src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.c )
+ s.files += %w( src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.h )
+ s.files += %w( src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.c )
+ s.files += %w( src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.h )
+ s.files += %w( src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.c )
+ s.files += %w( src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.h )
+ s.files += %w( src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.c )
+ s.files += %w( src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.h )
+ s.files += %w( src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.c )
+ s.files += %w( src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.h )
+ s.files += %w( src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.c )
+ s.files += %w( src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.h )
s.files += %w( src/core/ext/upbdefs-generated/validate/validate.upbdefs.c )
s.files += %w( src/core/ext/upbdefs-generated/validate/validate.upbdefs.h )
s.files += %w( src/core/ext/xds/certificate_provider_factory.h )
diff --git a/grpc.gyp b/grpc.gyp
index c140299019a..25342d7a2c9 100644
--- a/grpc.gyp
+++ b/grpc.gyp
@@ -637,12 +637,12 @@
'src/core/ext/upb-generated/udpa/annotations/sensitive.upb.c',
'src/core/ext/upb-generated/udpa/annotations/status.upb.c',
'src/core/ext/upb-generated/udpa/annotations/versioning.upb.c',
- 'src/core/ext/upb-generated/udpa/core/v1/authority.upb.c',
- 'src/core/ext/upb-generated/udpa/core/v1/collection_entry.upb.c',
- 'src/core/ext/upb-generated/udpa/core/v1/context_params.upb.c',
- 'src/core/ext/upb-generated/udpa/core/v1/resource.upb.c',
- 'src/core/ext/upb-generated/udpa/core/v1/resource_locator.upb.c',
- 'src/core/ext/upb-generated/udpa/core/v1/resource_name.upb.c',
+ 'src/core/ext/upb-generated/xds/core/v3/authority.upb.c',
+ 'src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.c',
+ 'src/core/ext/upb-generated/xds/core/v3/context_params.upb.c',
+ 'src/core/ext/upb-generated/xds/core/v3/resource.upb.c',
+ 'src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.c',
+ 'src/core/ext/upb-generated/xds/core/v3/resource_name.upb.c',
'src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c',
'src/core/ext/upb-generated/validate/validate.upb.c',
'src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.c',
@@ -716,12 +716,12 @@
'src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.c',
'src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.c',
'src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c',
- 'src/core/ext/upbdefs-generated/udpa/core/v1/authority.upbdefs.c',
- 'src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.c',
- 'src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.c',
- 'src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.c',
- 'src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.c',
- 'src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.c',
+ 'src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.c',
+ 'src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.c',
+ 'src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.c',
+ 'src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.c',
+ 'src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.c',
+ 'src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.c',
'src/core/ext/upbdefs-generated/validate/validate.upbdefs.c',
'src/core/ext/xds/certificate_provider_registry.cc',
'src/core/ext/xds/certificate_provider_store.cc',
diff --git a/package.xml b/package.xml
index fd094995511..6fea2665ac7 100644
--- a/package.xml
+++ b/package.xml
@@ -431,18 +431,18 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -591,18 +591,18 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py
index 266b31e3a2a..1072b2cdd61 100644
--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@@ -200,12 +200,12 @@ CORE_SOURCE_FILES = [
'src/core/ext/upb-generated/udpa/annotations/sensitive.upb.c',
'src/core/ext/upb-generated/udpa/annotations/status.upb.c',
'src/core/ext/upb-generated/udpa/annotations/versioning.upb.c',
- 'src/core/ext/upb-generated/udpa/core/v1/authority.upb.c',
- 'src/core/ext/upb-generated/udpa/core/v1/collection_entry.upb.c',
- 'src/core/ext/upb-generated/udpa/core/v1/context_params.upb.c',
- 'src/core/ext/upb-generated/udpa/core/v1/resource.upb.c',
- 'src/core/ext/upb-generated/udpa/core/v1/resource_locator.upb.c',
- 'src/core/ext/upb-generated/udpa/core/v1/resource_name.upb.c',
+ 'src/core/ext/upb-generated/xds/core/v3/authority.upb.c',
+ 'src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.c',
+ 'src/core/ext/upb-generated/xds/core/v3/context_params.upb.c',
+ 'src/core/ext/upb-generated/xds/core/v3/resource.upb.c',
+ 'src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.c',
+ 'src/core/ext/upb-generated/xds/core/v3/resource_name.upb.c',
'src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c',
'src/core/ext/upb-generated/validate/validate.upb.c',
'src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.c',
@@ -280,12 +280,12 @@ CORE_SOURCE_FILES = [
'src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.c',
'src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.c',
'src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c',
- 'src/core/ext/upbdefs-generated/udpa/core/v1/authority.upbdefs.c',
- 'src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.c',
- 'src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.c',
- 'src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.c',
- 'src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.c',
- 'src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.c',
+ 'src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.c',
+ 'src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.c',
+ 'src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.c',
+ 'src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.c',
+ 'src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.c',
+ 'src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.c',
'src/core/ext/upbdefs-generated/validate/validate.upbdefs.c',
'src/core/ext/xds/certificate_provider_registry.cc',
'src/core/ext/xds/certificate_provider_store.cc',
diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal
index 261e8a87506..d212cdbbb5c 100644
--- a/tools/doxygen/Doxyfile.c++.internal
+++ b/tools/doxygen/Doxyfile.c++.internal
@@ -1384,18 +1384,18 @@ src/core/ext/upb-generated/udpa/annotations/status.upb.c \
src/core/ext/upb-generated/udpa/annotations/status.upb.h \
src/core/ext/upb-generated/udpa/annotations/versioning.upb.c \
src/core/ext/upb-generated/udpa/annotations/versioning.upb.h \
-src/core/ext/upb-generated/udpa/core/v1/authority.upb.c \
-src/core/ext/upb-generated/udpa/core/v1/authority.upb.h \
-src/core/ext/upb-generated/udpa/core/v1/collection_entry.upb.c \
-src/core/ext/upb-generated/udpa/core/v1/collection_entry.upb.h \
-src/core/ext/upb-generated/udpa/core/v1/context_params.upb.c \
-src/core/ext/upb-generated/udpa/core/v1/context_params.upb.h \
-src/core/ext/upb-generated/udpa/core/v1/resource.upb.c \
-src/core/ext/upb-generated/udpa/core/v1/resource.upb.h \
-src/core/ext/upb-generated/udpa/core/v1/resource_locator.upb.c \
-src/core/ext/upb-generated/udpa/core/v1/resource_locator.upb.h \
-src/core/ext/upb-generated/udpa/core/v1/resource_name.upb.c \
-src/core/ext/upb-generated/udpa/core/v1/resource_name.upb.h \
+src/core/ext/upb-generated/xds/core/v3/authority.upb.c \
+src/core/ext/upb-generated/xds/core/v3/authority.upb.h \
+src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.c \
+src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.h \
+src/core/ext/upb-generated/xds/core/v3/context_params.upb.c \
+src/core/ext/upb-generated/xds/core/v3/context_params.upb.h \
+src/core/ext/upb-generated/xds/core/v3/resource.upb.c \
+src/core/ext/upb-generated/xds/core/v3/resource.upb.h \
+src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.c \
+src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.h \
+src/core/ext/upb-generated/xds/core/v3/resource_name.upb.c \
+src/core/ext/upb-generated/xds/core/v3/resource_name.upb.h \
src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c \
src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h \
src/core/ext/upb-generated/validate/validate.upb.c \
@@ -1542,18 +1542,18 @@ src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.c \
src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.h \
src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c \
src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.h \
-src/core/ext/upbdefs-generated/udpa/core/v1/authority.upbdefs.c \
-src/core/ext/upbdefs-generated/udpa/core/v1/authority.upbdefs.h \
-src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.c \
-src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.h \
-src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.c \
-src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.h \
-src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.c \
-src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.h \
-src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.c \
-src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.h \
-src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.c \
-src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.h \
+src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.c \
+src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.h \
+src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.c \
+src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.h \
+src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.c \
+src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.h \
+src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.c \
+src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.h \
+src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.c \
+src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.h \
+src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.c \
+src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.h \
src/core/ext/upbdefs-generated/validate/validate.upbdefs.c \
src/core/ext/upbdefs-generated/validate/validate.upbdefs.h \
src/core/ext/xds/certificate_provider_factory.h \
diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal
index f2d8871520d..822af941d5c 100644
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@@ -1220,18 +1220,18 @@ src/core/ext/upb-generated/udpa/annotations/status.upb.c \
src/core/ext/upb-generated/udpa/annotations/status.upb.h \
src/core/ext/upb-generated/udpa/annotations/versioning.upb.c \
src/core/ext/upb-generated/udpa/annotations/versioning.upb.h \
-src/core/ext/upb-generated/udpa/core/v1/authority.upb.c \
-src/core/ext/upb-generated/udpa/core/v1/authority.upb.h \
-src/core/ext/upb-generated/udpa/core/v1/collection_entry.upb.c \
-src/core/ext/upb-generated/udpa/core/v1/collection_entry.upb.h \
-src/core/ext/upb-generated/udpa/core/v1/context_params.upb.c \
-src/core/ext/upb-generated/udpa/core/v1/context_params.upb.h \
-src/core/ext/upb-generated/udpa/core/v1/resource.upb.c \
-src/core/ext/upb-generated/udpa/core/v1/resource.upb.h \
-src/core/ext/upb-generated/udpa/core/v1/resource_locator.upb.c \
-src/core/ext/upb-generated/udpa/core/v1/resource_locator.upb.h \
-src/core/ext/upb-generated/udpa/core/v1/resource_name.upb.c \
-src/core/ext/upb-generated/udpa/core/v1/resource_name.upb.h \
+src/core/ext/upb-generated/xds/core/v3/authority.upb.c \
+src/core/ext/upb-generated/xds/core/v3/authority.upb.h \
+src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.c \
+src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.h \
+src/core/ext/upb-generated/xds/core/v3/context_params.upb.c \
+src/core/ext/upb-generated/xds/core/v3/context_params.upb.h \
+src/core/ext/upb-generated/xds/core/v3/resource.upb.c \
+src/core/ext/upb-generated/xds/core/v3/resource.upb.h \
+src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.c \
+src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.h \
+src/core/ext/upb-generated/xds/core/v3/resource_name.upb.c \
+src/core/ext/upb-generated/xds/core/v3/resource_name.upb.h \
src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c \
src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h \
src/core/ext/upb-generated/validate/validate.upb.c \
@@ -1378,18 +1378,18 @@ src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.c \
src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.h \
src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c \
src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.h \
-src/core/ext/upbdefs-generated/udpa/core/v1/authority.upbdefs.c \
-src/core/ext/upbdefs-generated/udpa/core/v1/authority.upbdefs.h \
-src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.c \
-src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.h \
-src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.c \
-src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.h \
-src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.c \
-src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.h \
-src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.c \
-src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.h \
-src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.c \
-src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.h \
+src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.c \
+src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.h \
+src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.c \
+src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.h \
+src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.c \
+src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.h \
+src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.c \
+src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.h \
+src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.c \
+src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.h \
+src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.c \
+src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.h \
src/core/ext/upbdefs-generated/validate/validate.upbdefs.c \
src/core/ext/upbdefs-generated/validate/validate.upbdefs.h \
src/core/ext/xds/certificate_provider_factory.h \