update list of upbdefs files in build

5 years ago · f81650f497
parent 7d6b12fe73
commit f81650f497
15 changed files with 372 additions and 38 deletions
--- a/69
+++ b/69
@ -2670,6 +2670,7 @@ grpc_cc_library(
        ":google_api_upbdefs",
        ":proto_gen_validate_upbdefs",
        ":udpa_annotations_upbdefs",
+        ":udpa_core_upbdefs",
    ],
 )

@ -2770,12 +2771,14 @@ grpc_cc_library(
        "src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.c",
        "src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.c",
        "src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.c",
+        "src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.c",
        "src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.c",
        "src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.c",
        "src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.c",
        "src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.c",
        "src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.c",
        "src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.c",
+        "src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.c",
    ],
    hdrs = [
        "src/core/ext/upbdefs-generated/envoy/config/core/v3/address.upbdefs.h",
@ -2783,12 +2786,14 @@ grpc_cc_library(
        "src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.h",
        "src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.h",
        "src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.h",
+        "src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.h",
        "src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.h",
        "src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.h",
        "src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.h",
        "src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.h",
        "src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.h",
        "src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.h",
+        "src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.h",
    ],
    external_deps = [
        "upb_lib",
@ -2850,8 +2855,12 @@ grpc_cc_library(
 grpc_cc_library(
    name = "envoy_type_upbdefs",
    srcs = [
+        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.c",
+        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.c",
+        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.c",
        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.c",
        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.c",
+        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.c",
        "src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.c",
        "src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.c",
        "src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.c",
@ -2860,8 +2869,12 @@ grpc_cc_library(
        "src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.c",
    ],
    hdrs = [
+        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.h",
+        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.h",
+        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.h",
        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.h",
        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.h",
+        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.h",
        "src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.h",
        "src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.h",
        "src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.h",
@ -2903,11 +2916,9 @@ grpc_cc_library(
 grpc_cc_library(
    name = "proto_gen_validate_upbdefs",
    srcs = [
-        "src/core/ext/upbdefs-generated/gogoproto/gogo.upbdefs.c",
        "src/core/ext/upbdefs-generated/validate/validate.upbdefs.c",
    ],
    hdrs = [
-        "src/core/ext/upbdefs-generated/gogoproto/gogo.upbdefs.h",
        "src/core/ext/upbdefs-generated/validate/validate.upbdefs.h",
    ],
    external_deps = [
@ -2973,6 +2984,34 @@ grpc_cc_library(
    ],
 )

+grpc_cc_library(
+    name = "udpa_annotations_upbdefs",
+    srcs = [
+        "src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.c",
+        "src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.c",
+        "src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.c",
+        "src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.c",
+        "src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c",
+    ],
+    hdrs = [
+        "src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.h",
+        "src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.h",
+        "src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.h",
+        "src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.h",
+        "src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.h",
+    ],
+    external_deps = [
+        "upb_lib",
+        "upb_lib_descriptor",
+        "upb_textformat_lib",
+    ],
+    language = "c++",
+    deps = [
+        ":google_api_upbdefs",
+        ":udpa_annotations_upb",
+    ],
+)
+
 grpc_cc_library(
    name = "udpa_core_upb",
    srcs = [
@ -3003,18 +3042,22 @@ grpc_cc_library(
 )

 grpc_cc_library(
-    name = "udpa_annotations_upbdefs",
+    name = "udpa_core_upbdefs",
    srcs = [
-        "src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.c",
-        "src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.c",
-        "src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.c",
-        "src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c",
+        "src/core/ext/upbdefs-generated/udpa/core/v1/authority.upbdefs.c",
+        "src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.c",
+        "src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.c",
+        "src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.c",
+        "src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.c",
+        "src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.c",
    ],
    hdrs = [
-        "src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.h",
-        "src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.h",
-        "src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.h",
-        "src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.h",
+        "src/core/ext/upbdefs-generated/udpa/core/v1/authority.upbdefs.h",
+        "src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.h",
+        "src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.h",
+        "src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.h",
+        "src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.h",
+        "src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.h",
    ],
    external_deps = [
        "upb_lib",
@ -3024,7 +3067,9 @@ grpc_cc_library(
    language = "c++",
    deps = [
        ":google_api_upbdefs",
-        ":udpa_annotations_upb",
+        ":proto_gen_validate_upbdefs",
+        ":udpa_annotations_upbdefs",
+        ":udpa_core_upb",
    ],
 )

--- a/BUILD.gn
+++ b/BUILD.gn
@ -584,6 +584,8 @@ config("grpc_config") {
        "src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.h",
        "src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.c",
        "src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.h",
+        "src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.c",
+        "src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.h",
        "src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.c",
        "src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.h",
        "src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.c",
@ -596,6 +598,8 @@ config("grpc_config") {
        "src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.h",
        "src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.c",
        "src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.h",
+        "src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.c",
+        "src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.h",
        "src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.c",
        "src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.h",
        "src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.c",
@ -644,10 +648,18 @@ config("grpc_config") {
        "src/core/ext/upbdefs-generated/envoy/service/route/v3/rds.upbdefs.h",
        "src/core/ext/upbdefs-generated/envoy/service/route/v3/srds.upbdefs.c",
        "src/core/ext/upbdefs-generated/envoy/service/route/v3/srds.upbdefs.h",
+        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.c",
+        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.h",
+        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.c",
+        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.h",
+        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.c",
+        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.h",
        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.c",
        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.h",
        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.c",
        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.h",
+        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.c",
+        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.h",
        "src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.c",
        "src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.h",
        "src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.c",
@ -660,8 +672,6 @@ config("grpc_config") {
        "src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.h",
        "src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.c",
        "src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.h",
-        "src/core/ext/upbdefs-generated/gogoproto/gogo.upbdefs.c",
-        "src/core/ext/upbdefs-generated/gogoproto/gogo.upbdefs.h",
        "src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.c",
        "src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.h",
        "src/core/ext/upbdefs-generated/google/api/http.upbdefs.c",
@ -684,12 +694,26 @@ config("grpc_config") {
        "src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.h",
        "src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.c",
        "src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.h",
+        "src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.c",
+        "src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.h",
        "src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.c",
        "src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.h",
        "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/validate/validate.upbdefs.c",
        "src/core/ext/upbdefs-generated/validate/validate.upbdefs.h",
        "src/core/ext/xds/certificate_provider_factory.h",
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1621,12 +1621,14 @@ add_library(grpc
  src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.c
  src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.c
  src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.c
+  src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.c
  src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.c
  src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.c
  src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.c
  src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.c
  src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.c
  src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.c
+  src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.c
  src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.c
  src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.c
  src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.c
@ -1651,15 +1653,18 @@ add_library(grpc
  src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.c
  src/core/ext/upbdefs-generated/envoy/service/route/v3/rds.upbdefs.c
  src/core/ext/upbdefs-generated/envoy/service/route/v3/srds.upbdefs.c
+  src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.c
+  src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.c
+  src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.c
  src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.c
  src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.c
+  src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.c
  src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.c
  src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.c
  src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.c
  src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.c
  src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.c
  src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.c
-  src/core/ext/upbdefs-generated/gogoproto/gogo.upbdefs.c
  src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.c
  src/core/ext/upbdefs-generated/google/api/http.upbdefs.c
  src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.c
@ -1671,9 +1676,16 @@ add_library(grpc
  src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.c
  src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.c
  src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.c
+  src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.c
  src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.c
  src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.c
  src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c
+  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/validate/validate.upbdefs.c
  src/core/ext/xds/certificate_provider_registry.cc
  src/core/ext/xds/google_mesh_ca_certificate_provider_factory.cc
--- a/28
+++ b/28
@ -2022,12 +2022,14 @@ LIBGRPC_SRC = \
    src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.c \
    src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.c \
    src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.c \
+    src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.c \
    src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.c \
    src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.c \
    src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.c \
    src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.c \
    src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.c \
    src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.c \
+    src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.c \
    src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.c \
    src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.c \
    src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.c \
@ -2052,15 +2054,18 @@ LIBGRPC_SRC = \
    src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.c \
    src/core/ext/upbdefs-generated/envoy/service/route/v3/rds.upbdefs.c \
    src/core/ext/upbdefs-generated/envoy/service/route/v3/srds.upbdefs.c \
+    src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.c \
+    src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.c \
+    src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.c \
    src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.c \
    src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.c \
+    src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.c \
    src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.c \
    src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.c \
    src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.c \
    src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.c \
    src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.c \
    src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.c \
-    src/core/ext/upbdefs-generated/gogoproto/gogo.upbdefs.c \
    src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.c \
    src/core/ext/upbdefs-generated/google/api/http.upbdefs.c \
    src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.c \
@ -2072,9 +2077,16 @@ LIBGRPC_SRC = \
    src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.c \
    src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.c \
    src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.c \
+    src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.c \
    src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.c \
    src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.c \
    src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c \
+    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/validate/validate.upbdefs.c \
    src/core/ext/xds/certificate_provider_registry.cc \
    src/core/ext/xds/google_mesh_ca_certificate_provider_factory.cc \
@ -4674,12 +4686,14 @@ src/core/ext/upbdefs-generated/envoy/config/core/v3/backoff.upbdefs.c: $(OPENSSL
 src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.c: $(OPENSSL_DEP)
 src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.c: $(OPENSSL_DEP)
 src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.c: $(OPENSSL_DEP)
 src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.c: $(OPENSSL_DEP)
 src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.c: $(OPENSSL_DEP)
 src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.c: $(OPENSSL_DEP)
 src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.c: $(OPENSSL_DEP)
 src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.c: $(OPENSSL_DEP)
 src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.c: $(OPENSSL_DEP)
 src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.c: $(OPENSSL_DEP)
 src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.c: $(OPENSSL_DEP)
 src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.c: $(OPENSSL_DEP)
@ -4704,15 +4718,18 @@ src/core/ext/upbdefs-generated/envoy/service/listener/v3/lds.upbdefs.c: $(OPENSS
 src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.c: $(OPENSSL_DEP)
 src/core/ext/upbdefs-generated/envoy/service/route/v3/rds.upbdefs.c: $(OPENSSL_DEP)
 src/core/ext/upbdefs-generated/envoy/service/route/v3/srds.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.c: $(OPENSSL_DEP)
 src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.c: $(OPENSSL_DEP)
 src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.c: $(OPENSSL_DEP)
 src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.c: $(OPENSSL_DEP)
 src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.c: $(OPENSSL_DEP)
 src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.c: $(OPENSSL_DEP)
 src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.c: $(OPENSSL_DEP)
 src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.c: $(OPENSSL_DEP)
 src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/gogoproto/gogo.upbdefs.c: $(OPENSSL_DEP)
 src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.c: $(OPENSSL_DEP)
 src/core/ext/upbdefs-generated/google/api/http.upbdefs.c: $(OPENSSL_DEP)
 src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.c: $(OPENSSL_DEP)
@ -4724,9 +4741,16 @@ src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.c: $(OPENSSL_DE
 src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.c: $(OPENSSL_DEP)
 src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.c: $(OPENSSL_DEP)
 src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.c: $(OPENSSL_DEP)
 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/validate/validate.upbdefs.c: $(OPENSSL_DEP)
 src/core/ext/xds/certificate_provider_registry.cc: $(OPENSSL_DEP)
 src/core/ext/xds/google_mesh_ca_certificate_provider_factory.cc: $(OPENSSL_DEP)
--- a/build_autogenerated.yaml
+++ b/build_autogenerated.yaml
@ -556,12 +556,14 @@ libs:
  - src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.h
  - src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.h
  - src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.h
+  - src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.h
  - src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.h
  - src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.h
  - src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.h
  - src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.h
  - src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.h
  - src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.h
+  - src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.h
  - src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.h
  - src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.h
  - src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.h
@ -586,15 +588,18 @@ libs:
  - src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.h
  - src/core/ext/upbdefs-generated/envoy/service/route/v3/rds.upbdefs.h
  - src/core/ext/upbdefs-generated/envoy/service/route/v3/srds.upbdefs.h
+  - src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.h
+  - src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.h
+  - src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.h
  - src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.h
  - src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.h
+  - src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.h
  - src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.h
  - src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.h
  - src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.h
  - src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.h
  - src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.h
  - src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.h
-  - src/core/ext/upbdefs-generated/gogoproto/gogo.upbdefs.h
  - src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.h
  - src/core/ext/upbdefs-generated/google/api/http.upbdefs.h
  - src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.h
@ -606,9 +611,16 @@ libs:
  - src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.h
  - src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.h
  - src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.h
+  - src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.h
  - src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.h
  - src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.h
  - src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.h
+  - 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/validate/validate.upbdefs.h
  - src/core/ext/xds/certificate_provider_factory.h
  - src/core/ext/xds/certificate_provider_registry.h
@ -1044,12 +1056,14 @@ libs:
  - src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.c
  - src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.c
  - src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.c
+  - src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.c
  - src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.c
  - src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.c
  - src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.c
  - src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.c
  - src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.c
  - src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.c
+  - src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.c
  - src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.c
  - src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.c
  - src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.c
@ -1074,15 +1088,18 @@ libs:
  - src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.c
  - src/core/ext/upbdefs-generated/envoy/service/route/v3/rds.upbdefs.c
  - src/core/ext/upbdefs-generated/envoy/service/route/v3/srds.upbdefs.c
+  - src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.c
+  - src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.c
+  - src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.c
  - src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.c
  - src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.c
+  - src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.c
  - src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.c
  - src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.c
  - src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.c
  - src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.c
  - src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.c
  - src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.c
-  - src/core/ext/upbdefs-generated/gogoproto/gogo.upbdefs.c
  - src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.c
  - src/core/ext/upbdefs-generated/google/api/http.upbdefs.c
  - src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.c
@ -1094,9 +1111,16 @@ libs:
  - src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.c
  - src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.c
  - src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.c
+  - src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.c
  - src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.c
  - src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.c
  - src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c
+  - 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/validate/validate.upbdefs.c
  - src/core/ext/xds/certificate_provider_registry.cc
  - src/core/ext/xds/google_mesh_ca_certificate_provider_factory.cc
--- a/config.m4
+++ b/config.m4
@ -251,12 +251,14 @@ if test "$PHP_GRPC" != "no"; then
    src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.c \
    src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.c \
    src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.c \
+    src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.c \
    src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.c \
    src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.c \
    src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.c \
    src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.c \
    src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.c \
    src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.c \
+    src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.c \
    src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.c \
    src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.c \
    src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.c \
@ -281,15 +283,18 @@ if test "$PHP_GRPC" != "no"; then
    src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.c \
    src/core/ext/upbdefs-generated/envoy/service/route/v3/rds.upbdefs.c \
    src/core/ext/upbdefs-generated/envoy/service/route/v3/srds.upbdefs.c \
+    src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.c \
+    src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.c \
+    src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.c \
    src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.c \
    src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.c \
+    src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.c \
    src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.c \
    src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.c \
    src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.c \
    src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.c \
    src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.c \
    src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.c \
-    src/core/ext/upbdefs-generated/gogoproto/gogo.upbdefs.c \
    src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.c \
    src/core/ext/upbdefs-generated/google/api/http.upbdefs.c \
    src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.c \
@ -301,9 +306,16 @@ if test "$PHP_GRPC" != "no"; then
    src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.c \
    src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.c \
    src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.c \
+    src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.c \
    src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.c \
    src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.c \
    src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c \
+    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/validate/validate.upbdefs.c \
    src/core/ext/xds/certificate_provider_registry.cc \
    src/core/ext/xds/google_mesh_ca_certificate_provider_factory.cc \
@ -1069,11 +1081,11 @@ if test "$PHP_GRPC" != "no"; then
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/type/metadata/v3)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/type/tracing/v3)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/type/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/gogoproto)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/google/api)
  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/validate)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/xds)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/avl)
--- a/config.w32
+++ b/config.w32
@ -218,12 +218,14 @@ if (PHP_GRPC != "no") {
    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\core\\v3\\base.upbdefs.c " +
    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\core\\v3\\config_source.upbdefs.c " +
    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\core\\v3\\event_service_config.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\core\\v3\\extension.upbdefs.c " +
    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\core\\v3\\grpc_service.upbdefs.c " +
    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\core\\v3\\health_check.upbdefs.c " +
    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\core\\v3\\http_uri.upbdefs.c " +
    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\core\\v3\\protocol.upbdefs.c " +
    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\core\\v3\\proxy_protocol.upbdefs.c " +
    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\core\\v3\\socket_option.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\core\\v3\\substitution_format_string.upbdefs.c " +
    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\endpoint\\v3\\endpoint.upbdefs.c " +
    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\endpoint\\v3\\endpoint_components.upbdefs.c " +
    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\endpoint\\v3\\load_report.upbdefs.c " +
@ -248,15 +250,18 @@ if (PHP_GRPC != "no") {
    "src\\core\\ext\\upbdefs-generated\\envoy\\service\\load_stats\\v3\\lrs.upbdefs.c " +
    "src\\core\\ext\\upbdefs-generated\\envoy\\service\\route\\v3\\rds.upbdefs.c " +
    "src\\core\\ext\\upbdefs-generated\\envoy\\service\\route\\v3\\srds.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-generated\\envoy\\type\\matcher\\v3\\metadata.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-generated\\envoy\\type\\matcher\\v3\\number.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-generated\\envoy\\type\\matcher\\v3\\path.upbdefs.c " +
    "src\\core\\ext\\upbdefs-generated\\envoy\\type\\matcher\\v3\\regex.upbdefs.c " +
    "src\\core\\ext\\upbdefs-generated\\envoy\\type\\matcher\\v3\\string.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-generated\\envoy\\type\\matcher\\v3\\value.upbdefs.c " +
    "src\\core\\ext\\upbdefs-generated\\envoy\\type\\metadata\\v3\\metadata.upbdefs.c " +
    "src\\core\\ext\\upbdefs-generated\\envoy\\type\\tracing\\v3\\custom_tag.upbdefs.c " +
    "src\\core\\ext\\upbdefs-generated\\envoy\\type\\v3\\http.upbdefs.c " +
    "src\\core\\ext\\upbdefs-generated\\envoy\\type\\v3\\percent.upbdefs.c " +
    "src\\core\\ext\\upbdefs-generated\\envoy\\type\\v3\\range.upbdefs.c " +
    "src\\core\\ext\\upbdefs-generated\\envoy\\type\\v3\\semantic_version.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\gogoproto\\gogo.upbdefs.c " +
    "src\\core\\ext\\upbdefs-generated\\google\\api\\annotations.upbdefs.c " +
    "src\\core\\ext\\upbdefs-generated\\google\\api\\http.upbdefs.c " +
    "src\\core\\ext\\upbdefs-generated\\google\\protobuf\\any.upbdefs.c " +
@ -268,9 +273,16 @@ if (PHP_GRPC != "no") {
    "src\\core\\ext\\upbdefs-generated\\google\\protobuf\\wrappers.upbdefs.c " +
    "src\\core\\ext\\upbdefs-generated\\google\\rpc\\status.upbdefs.c " +
    "src\\core\\ext\\upbdefs-generated\\udpa\\annotations\\migrate.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-generated\\udpa\\annotations\\security.upbdefs.c " +
    "src\\core\\ext\\upbdefs-generated\\udpa\\annotations\\sensitive.upbdefs.c " +
    "src\\core\\ext\\upbdefs-generated\\udpa\\annotations\\status.upbdefs.c " +
    "src\\core\\ext\\upbdefs-generated\\udpa\\annotations\\versioning.upbdefs.c " +
+    "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\\validate\\validate.upbdefs.c " +
    "src\\core\\ext\\xds\\certificate_provider_registry.cc " +
    "src\\core\\ext\\xds\\google_mesh_ca_certificate_provider_factory.cc " +
@ -1137,13 +1149,14 @@ if (PHP_GRPC != "no") {
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\type\\tracing");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\type\\tracing\\v3");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\type\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\gogoproto");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\google");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\google\\api");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\google\\protobuf");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\google\\rpc");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\udpa");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\udpa\\annotations");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\udpa\\core");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\udpa\\core\\v1");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\validate");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\xds");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib");
--- a/gRPC-C++.podspec
+++ b/gRPC-C++.podspec
@ -382,12 +382,14 @@ Pod::Spec.new do |s|
                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.h',
                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.h',
                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.h',
+                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.h',
                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.h',
                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.h',
                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.h',
                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.h',
                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.h',
                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.h',
+                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.h',
                      'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.h',
                      'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.h',
                      'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.h',
@ -412,15 +414,18 @@ Pod::Spec.new do |s|
                      'src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.h',
                      'src/core/ext/upbdefs-generated/envoy/service/route/v3/rds.upbdefs.h',
                      'src/core/ext/upbdefs-generated/envoy/service/route/v3/srds.upbdefs.h',
+                      'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.h',
+                      'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.h',
+                      'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.h',
                      'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.h',
                      'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.h',
+                      'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.h',
                      'src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.h',
                      'src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.h',
                      'src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.h',
                      'src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.h',
                      'src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.h',
                      'src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/gogoproto/gogo.upbdefs.h',
                      'src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.h',
                      'src/core/ext/upbdefs-generated/google/api/http.upbdefs.h',
                      'src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.h',
@ -432,9 +437,16 @@ Pod::Spec.new do |s|
                      'src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.h',
                      'src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.h',
                      'src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.h',
+                      'src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.h',
                      'src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.h',
                      'src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.h',
                      'src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.h',
+                      '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/validate/validate.upbdefs.h',
                      'src/core/ext/xds/certificate_provider_factory.h',
                      'src/core/ext/xds/certificate_provider_registry.h',
@ -978,12 +990,14 @@ Pod::Spec.new do |s|
                              'src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.h',
                              'src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.h',
                              'src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.h',
+                              'src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.h',
                              'src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.h',
                              'src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.h',
                              'src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.h',
                              'src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.h',
                              'src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.h',
                              'src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.h',
+                              'src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.h',
                              'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.h',
                              'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.h',
                              'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.h',
@ -1008,15 +1022,18 @@ Pod::Spec.new do |s|
                              'src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.h',
                              'src/core/ext/upbdefs-generated/envoy/service/route/v3/rds.upbdefs.h',
                              'src/core/ext/upbdefs-generated/envoy/service/route/v3/srds.upbdefs.h',
+                              'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.h',
+                              'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.h',
+                              'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.h',
                              'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.h',
                              'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.h',
+                              'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.h',
                              'src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.h',
                              'src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.h',
                              'src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.h',
                              'src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.h',
                              'src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.h',
                              'src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/gogoproto/gogo.upbdefs.h',
                              'src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.h',
                              'src/core/ext/upbdefs-generated/google/api/http.upbdefs.h',
                              'src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.h',
@ -1028,9 +1045,16 @@ Pod::Spec.new do |s|
                              'src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.h',
                              'src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.h',
                              'src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.h',
+                              'src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.h',
                              'src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.h',
                              'src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.h',
                              'src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.h',
+                              '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/validate/validate.upbdefs.h',
                              'src/core/ext/xds/certificate_provider_factory.h',
                              'src/core/ext/xds/certificate_provider_registry.h',
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@ -585,6 +585,8 @@ Pod::Spec.new do |s|
                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.h',
                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.c',
                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.h',
+                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.c',
+                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.h',
                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.c',
                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.h',
                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.c',
@ -597,6 +599,8 @@ Pod::Spec.new do |s|
                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.h',
                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.c',
                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.h',
+                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.c',
+                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.h',
                      'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.c',
                      'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.h',
                      'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.c',
@ -645,10 +649,18 @@ Pod::Spec.new do |s|
                      'src/core/ext/upbdefs-generated/envoy/service/route/v3/rds.upbdefs.h',
                      'src/core/ext/upbdefs-generated/envoy/service/route/v3/srds.upbdefs.c',
                      'src/core/ext/upbdefs-generated/envoy/service/route/v3/srds.upbdefs.h',
+                      'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.c',
+                      'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.h',
+                      'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.c',
+                      'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.h',
+                      'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.c',
+                      'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.h',
                      'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.c',
                      'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.h',
                      'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.c',
                      'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.h',
+                      'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.c',
+                      'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.h',
                      'src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.c',
                      'src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.h',
                      'src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.c',
@ -661,8 +673,6 @@ Pod::Spec.new do |s|
                      'src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.h',
                      'src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.c',
                      'src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/gogoproto/gogo.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/gogoproto/gogo.upbdefs.h',
                      'src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.c',
                      'src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.h',
                      'src/core/ext/upbdefs-generated/google/api/http.upbdefs.c',
@ -685,12 +695,26 @@ Pod::Spec.new do |s|
                      'src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.h',
                      'src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.c',
                      'src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.h',
+                      'src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.c',
+                      'src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.h',
                      'src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.c',
                      'src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.h',
                      '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/validate/validate.upbdefs.c',
                      'src/core/ext/upbdefs-generated/validate/validate.upbdefs.h',
                      'src/core/ext/xds/certificate_provider_factory.h',
@ -1496,12 +1520,14 @@ Pod::Spec.new do |s|
                              'src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.h',
                              'src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.h',
                              'src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.h',
+                              'src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.h',
                              'src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.h',
                              'src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.h',
                              'src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.h',
                              'src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.h',
                              'src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.h',
                              'src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.h',
+                              'src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.h',
                              'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.h',
                              'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.h',
                              'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.h',
@ -1526,15 +1552,18 @@ Pod::Spec.new do |s|
                              'src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.h',
                              'src/core/ext/upbdefs-generated/envoy/service/route/v3/rds.upbdefs.h',
                              'src/core/ext/upbdefs-generated/envoy/service/route/v3/srds.upbdefs.h',
+                              'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.h',
+                              'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.h',
+                              'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.h',
                              'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.h',
                              'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.h',
+                              'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.h',
                              'src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.h',
                              'src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.h',
                              'src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.h',
                              'src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.h',
                              'src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.h',
                              'src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/gogoproto/gogo.upbdefs.h',
                              'src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.h',
                              'src/core/ext/upbdefs-generated/google/api/http.upbdefs.h',
                              'src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.h',
@ -1546,9 +1575,16 @@ Pod::Spec.new do |s|
                              'src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.h',
                              'src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.h',
                              'src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.h',
+                              'src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.h',
                              'src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.h',
                              'src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.h',
                              'src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.h',
+                              '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/validate/validate.upbdefs.h',
                              'src/core/ext/xds/certificate_provider_factory.h',
                              'src/core/ext/xds/certificate_provider_registry.h',
--- a/grpc.gemspec
+++ b/grpc.gemspec
@ -503,6 +503,8 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.h )
  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.c )
  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.h )
  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.c )
  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.h )
  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.c )
@ -515,6 +517,8 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.h )
  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.c )
  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.h )
  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.c )
  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.h )
  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.c )
@ -563,10 +567,18 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/ext/upbdefs-generated/envoy/service/route/v3/rds.upbdefs.h )
  s.files += %w( src/core/ext/upbdefs-generated/envoy/service/route/v3/srds.upbdefs.c )
  s.files += %w( src/core/ext/upbdefs-generated/envoy/service/route/v3/srds.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.h )
  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.c )
  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.h )
  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.c )
  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.h )
  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.c )
  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.h )
  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.c )
@ -579,8 +591,6 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.h )
  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.c )
  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/gogoproto/gogo.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/gogoproto/gogo.upbdefs.h )
  s.files += %w( src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.c )
  s.files += %w( src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.h )
  s.files += %w( src/core/ext/upbdefs-generated/google/api/http.upbdefs.c )
@ -603,12 +613,26 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.h )
  s.files += %w( src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.c )
  s.files += %w( src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.h )
  s.files += %w( src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.c )
  s.files += %w( src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.h )
  s.files += %w( src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.c )
  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/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 )
--- a/grpc.gyp
+++ b/grpc.gyp
@ -648,12 +648,14 @@
        'src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.c',
        'src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.c',
        'src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.c',
+        'src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.c',
        'src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.c',
        'src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.c',
        'src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.c',
        'src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.c',
        'src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.c',
        'src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.c',
+        'src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.c',
        'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.c',
        'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.c',
        'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.c',
@ -678,15 +680,18 @@
        'src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.c',
        'src/core/ext/upbdefs-generated/envoy/service/route/v3/rds.upbdefs.c',
        'src/core/ext/upbdefs-generated/envoy/service/route/v3/srds.upbdefs.c',
+        'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.c',
+        'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.c',
+        'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.c',
        'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.c',
        'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.c',
+        'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.c',
        'src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.c',
        'src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.c',
        'src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.c',
        'src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.c',
        'src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.c',
        'src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.c',
-        'src/core/ext/upbdefs-generated/gogoproto/gogo.upbdefs.c',
        'src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.c',
        'src/core/ext/upbdefs-generated/google/api/http.upbdefs.c',
        'src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.c',
@ -698,9 +703,16 @@
        'src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.c',
        'src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.c',
        'src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.c',
+        'src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.c',
        'src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.c',
        'src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.c',
        'src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c',
+        '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/validate/validate.upbdefs.c',
        'src/core/ext/xds/certificate_provider_registry.cc',
        'src/core/ext/xds/google_mesh_ca_certificate_provider_factory.cc',
--- a/package.xml
+++ b/package.xml
@ -483,6 +483,8 @@
    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.c" role="src" />
    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.c" role="src" />
    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.c" role="src" />
@ -495,6 +497,8 @@
    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.c" role="src" />
    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.c" role="src" />
    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.c" role="src" />
@ -543,10 +547,18 @@
    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/service/route/v3/rds.upbdefs.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/service/route/v3/srds.upbdefs.c" role="src" />
    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/service/route/v3/srds.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.c" role="src" />
    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.c" role="src" />
    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.c" role="src" />
    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.c" role="src" />
@ -559,8 +571,6 @@
    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.c" role="src" />
    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/gogoproto/gogo.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/gogoproto/gogo.upbdefs.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.c" role="src" />
    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/google/api/http.upbdefs.c" role="src" />
@ -583,12 +593,26 @@
    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.c" role="src" />
    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.c" role="src" />
    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.c" role="src" />
    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c" role="src" />
    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/udpa/core/v1/authority.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/udpa/core/v1/authority.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/validate/validate.upbdefs.c" role="src" />
    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/validate/validate.upbdefs.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/xds/certificate_provider_factory.h" role="src" />
--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@ -227,12 +227,14 @@ CORE_SOURCE_FILES = [
    'src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.c',
    'src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.c',
    'src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.c',
+    'src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.c',
    'src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.c',
    'src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.c',
    'src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.c',
    'src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.c',
    'src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.c',
    'src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.c',
+    'src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.c',
    'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.c',
    'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.c',
    'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.c',
@ -257,15 +259,18 @@ CORE_SOURCE_FILES = [
    'src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.c',
    'src/core/ext/upbdefs-generated/envoy/service/route/v3/rds.upbdefs.c',
    'src/core/ext/upbdefs-generated/envoy/service/route/v3/srds.upbdefs.c',
+    'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.c',
+    'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.c',
+    'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.c',
    'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.c',
    'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.c',
+    'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.c',
    'src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.c',
    'src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.c',
    'src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.c',
    'src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.c',
    'src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.c',
    'src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.c',
-    'src/core/ext/upbdefs-generated/gogoproto/gogo.upbdefs.c',
    'src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.c',
    'src/core/ext/upbdefs-generated/google/api/http.upbdefs.c',
    'src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.c',
@ -277,9 +282,16 @@ CORE_SOURCE_FILES = [
    'src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.c',
    'src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.c',
    'src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.c',
+    'src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.c',
    'src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.c',
    'src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.c',
    'src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c',
+    '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/validate/validate.upbdefs.c',
    'src/core/ext/xds/certificate_provider_registry.cc',
    'src/core/ext/xds/google_mesh_ca_certificate_provider_factory.cc',
--- a/tools/doxygen/Doxyfile.c++.internal
+++ b/tools/doxygen/Doxyfile.c++.internal
@ -1420,6 +1420,8 @@ src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.c \
 src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.h \
 src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.c \
 src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.h \
+src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.c \
+src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.h \
 src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.c \
 src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.h \
 src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.c \
@ -1432,6 +1434,8 @@ src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.c \
 src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.h \
 src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.c \
 src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.h \
+src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.c \
+src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.h \
 src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.c \
 src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.h \
 src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.c \
@ -1480,10 +1484,18 @@ src/core/ext/upbdefs-generated/envoy/service/route/v3/rds.upbdefs.c \
 src/core/ext/upbdefs-generated/envoy/service/route/v3/rds.upbdefs.h \
 src/core/ext/upbdefs-generated/envoy/service/route/v3/srds.upbdefs.c \
 src/core/ext/upbdefs-generated/envoy/service/route/v3/srds.upbdefs.h \
+src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.c \
+src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.h \
+src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.c \
+src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.h \
+src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.c \
+src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.h \
 src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.c \
 src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.h \
 src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.c \
 src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.h \
+src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.c \
+src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.h \
 src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.c \
 src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.h \
 src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.c \
@ -1496,8 +1508,6 @@ src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.c \
 src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.h \
 src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.c \
 src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.h \
-src/core/ext/upbdefs-generated/gogoproto/gogo.upbdefs.c \
-src/core/ext/upbdefs-generated/gogoproto/gogo.upbdefs.h \
 src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.c \
 src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.h \
 src/core/ext/upbdefs-generated/google/api/http.upbdefs.c \
@ -1520,12 +1530,26 @@ src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.c \
 src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.h \
 src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.c \
 src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.h \
+src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.c \
+src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.h \
 src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.c \
 src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.h \
 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/validate/validate.upbdefs.c \
 src/core/ext/upbdefs-generated/validate/validate.upbdefs.h \
 src/core/ext/xds/certificate_provider_factory.h \
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@ -1258,6 +1258,8 @@ src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.c \
 src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.h \
 src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.c \
 src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.h \
+src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.c \
+src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.h \
 src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.c \
 src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.h \
 src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.c \
@ -1270,6 +1272,8 @@ src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.c \
 src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.h \
 src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.c \
 src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.h \
+src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.c \
+src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.h \
 src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.c \
 src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.h \
 src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.c \
@ -1318,10 +1322,18 @@ src/core/ext/upbdefs-generated/envoy/service/route/v3/rds.upbdefs.c \
 src/core/ext/upbdefs-generated/envoy/service/route/v3/rds.upbdefs.h \
 src/core/ext/upbdefs-generated/envoy/service/route/v3/srds.upbdefs.c \
 src/core/ext/upbdefs-generated/envoy/service/route/v3/srds.upbdefs.h \
+src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.c \
+src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.h \
+src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.c \
+src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.h \
+src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.c \
+src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.h \
 src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.c \
 src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.h \
 src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.c \
 src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.h \
+src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.c \
+src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.h \
 src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.c \
 src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.h \
 src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.c \
@ -1334,8 +1346,6 @@ src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.c \
 src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.h \
 src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.c \
 src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.h \
-src/core/ext/upbdefs-generated/gogoproto/gogo.upbdefs.c \
-src/core/ext/upbdefs-generated/gogoproto/gogo.upbdefs.h \
 src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.c \
 src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.h \
 src/core/ext/upbdefs-generated/google/api/http.upbdefs.c \
@ -1358,12 +1368,26 @@ src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.c \
 src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.h \
 src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.c \
 src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.h \
+src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.c \
+src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.h \
 src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.c \
 src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.h \
 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/validate/validate.upbdefs.c \
 src/core/ext/upbdefs-generated/validate/validate.upbdefs.h \
 src/core/ext/xds/certificate_provider_factory.h \