Revert "CSDS Implementation (grpc#25038)" (grpc#25745)

This reverts commit 27de24a.
lidizheng · Mar 17, 2021 · 98fd4e1 · 98fd4e1
1 parent 5f8b529
commit 98fd4e1
Show file tree

Hide file tree

Showing 61 changed files with 72 additions and 9,670 deletions.
diff --git a/BUILD b/BUILD
@@ -1436,7 +1436,6 @@ grpc_cc_library(
         "absl/functional:bind_front",
         "upb_lib",
         "upb_textformat_lib",
-        "upb_json_lib",
         "re2",
     ],
     language = "c++",
@@ -2613,24 +2612,6 @@ grpc_cc_library(
     alwayslink = 1,
 )
 
-grpc_cc_library(
-    name = "grpcpp_csds",
-    srcs = [
-        "src/cpp/server/csds/csds.cc",
-    ],
-    hdrs = [
-        "src/cpp/server/csds/csds.h",
-    ],
-    language = "c++",
-    public_hdrs = [
-    ],
-    deps = [
-        ":grpc++",
-        "//src/proto/grpc/testing/xds/v3:csds_proto",
-    ],
-    alwayslink = 1,
-)
-
 grpc_cc_library(
     name = "grpc++_test",
     srcs = [
@@ -2764,9 +2745,7 @@ grpc_cc_library(
 grpc_cc_library(
     name = "envoy_ads_upb",
     srcs = [
-        "src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.c",
         "src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.c",
-        "src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.c",
         "src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.c",
         "src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.c",
         "src/core/ext/upb-generated/envoy/config/cluster/v3/filter.upb.c",
@@ -2778,8 +2757,6 @@ grpc_cc_library(
         "src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.c",
         "src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.c",
         "src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.c",
-        "src/core/ext/upb-generated/envoy/config/metrics/v3/stats.upb.c",
-        "src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.c",
         "src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.c",
         "src/core/ext/upb-generated/envoy/config/route/v3/route.upb.c",
         "src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.c",
@@ -2802,12 +2779,9 @@ grpc_cc_library(
         "src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.c",
         "src/core/ext/upb-generated/envoy/service/route/v3/rds.upb.c",
         "src/core/ext/upb-generated/envoy/service/route/v3/srds.upb.c",
-        "src/core/ext/upb-generated/envoy/service/status/v3/csds.upb.c",
     ],
     hdrs = [
-        "src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.h",
         "src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.h",
-        "src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.h",
         "src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.h",
         "src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.h",
         "src/core/ext/upb-generated/envoy/config/cluster/v3/filter.upb.h",
@@ -2819,8 +2793,6 @@ grpc_cc_library(
         "src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.h",
         "src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.h",
         "src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.h",
-        "src/core/ext/upb-generated/envoy/config/metrics/v3/stats.upb.h",
-        "src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.h",
         "src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.h",
         "src/core/ext/upb-generated/envoy/config/route/v3/route.upb.h",
         "src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.h",
@@ -2843,7 +2815,6 @@ grpc_cc_library(
         "src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.h",
         "src/core/ext/upb-generated/envoy/service/route/v3/rds.upb.h",
         "src/core/ext/upb-generated/envoy/service/route/v3/srds.upb.h",
-        "src/core/ext/upb-generated/envoy/service/status/v3/csds.upb.h",
     ],
     external_deps = [
         "upb_lib",
@@ -2864,9 +2835,7 @@ grpc_cc_library(
 grpc_cc_library(
     name = "envoy_ads_upbdefs",
     srcs = [
-        "src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump.upbdefs.c",
         "src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/bootstrap/v3/bootstrap.upbdefs.c",
         "src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.c",
         "src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.c",
         "src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.c",
@@ -2878,8 +2847,6 @@ grpc_cc_library(
         "src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.c",
         "src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.c",
         "src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/metrics/v3/stats.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/overload/v3/overload.upbdefs.c",
         "src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.c",
         "src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.c",
         "src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.c",
@@ -2901,12 +2868,9 @@ grpc_cc_library(
         "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/service/status/v3/csds.upbdefs.c",
     ],
     hdrs = [
-        "src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump.upbdefs.h",
         "src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/bootstrap/v3/bootstrap.upbdefs.h",
         "src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.h",
         "src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.h",
         "src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.h",
@@ -2918,8 +2882,6 @@ grpc_cc_library(
         "src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.h",
         "src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.h",
         "src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/metrics/v3/stats.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/overload/v3/overload.upbdefs.h",
         "src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.h",
         "src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.h",
         "src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.h",
@@ -2941,7 +2903,6 @@ grpc_cc_library(
         "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/service/status/v3/csds.upbdefs.h",
     ],
     external_deps = [
         "upb_lib",
@@ -3100,12 +3061,10 @@ grpc_cc_library(
     name = "envoy_type_upb",
     srcs = [
         "src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.c",
-        "src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.c",
         "src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.c",
         "src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.c",
         "src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.c",
         "src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.c",
-        "src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.c",
         "src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.c",
         "src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.c",
         "src/core/ext/upb-generated/envoy/type/tracing/v3/custom_tag.upb.c",
@@ -3116,12 +3075,10 @@ grpc_cc_library(
     ],
     hdrs = [
         "src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.h",
-        "src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.h",
         "src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.h",
         "src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.h",
         "src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.h",
         "src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.h",
-        "src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.h",
         "src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.h",
         "src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.h",
         "src/core/ext/upb-generated/envoy/type/tracing/v3/custom_tag.upb.h",
@@ -3147,12 +3104,10 @@ 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/node.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/struct.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",
@@ -3163,12 +3118,10 @@ grpc_cc_library(
     ],
     hdrs = [
         "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/node.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/struct.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",

diff --git a/BUILD.gn b/BUILD.gn
@@ -402,16 +402,12 @@ config("grpc_config") {
         "src/core/ext/transport/inproc/inproc_plugin.cc",
         "src/core/ext/transport/inproc/inproc_transport.cc",
         "src/core/ext/transport/inproc/inproc_transport.h",
-        "src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.c",
-        "src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.h",
         "src/core/ext/upb-generated/envoy/annotations/deprecation.upb.c",
         "src/core/ext/upb-generated/envoy/annotations/deprecation.upb.h",
         "src/core/ext/upb-generated/envoy/annotations/resource.upb.c",
         "src/core/ext/upb-generated/envoy/annotations/resource.upb.h",
         "src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.c",
         "src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.h",
-        "src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.c",
-        "src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.h",
         "src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.c",
         "src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.h",
         "src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.c",
@@ -460,10 +456,6 @@ config("grpc_config") {
         "src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.h",
         "src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.c",
         "src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.h",
-        "src/core/ext/upb-generated/envoy/config/metrics/v3/stats.upb.c",
-        "src/core/ext/upb-generated/envoy/config/metrics/v3/stats.upb.h",
-        "src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.c",
-        "src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.h",
         "src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.c",
         "src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.h",
         "src/core/ext/upb-generated/envoy/config/route/v3/route.upb.c",
@@ -508,12 +500,8 @@ config("grpc_config") {
         "src/core/ext/upb-generated/envoy/service/route/v3/rds.upb.h",
         "src/core/ext/upb-generated/envoy/service/route/v3/srds.upb.c",
         "src/core/ext/upb-generated/envoy/service/route/v3/srds.upb.h",
-        "src/core/ext/upb-generated/envoy/service/status/v3/csds.upb.c",
-        "src/core/ext/upb-generated/envoy/service/status/v3/csds.upb.h",
         "src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.c",
         "src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.h",
-        "src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.c",
-        "src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.h",
         "src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.c",
         "src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.h",
         "src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.c",
@@ -522,8 +510,6 @@ config("grpc_config") {
         "src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.h",
         "src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.c",
         "src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.h",
-        "src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.c",
-        "src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.h",
         "src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.c",
         "src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.h",
         "src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.c",
@@ -598,16 +584,12 @@ config("grpc_config") {
         "src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.h",
         "src/core/ext/upb-generated/xds/core/v3/resource_name.upb.c",
         "src/core/ext/upb-generated/xds/core/v3/resource_name.upb.h",
-        "src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump.upbdefs.h",
         "src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.c",
         "src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.h",
         "src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.c",
         "src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.h",
         "src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.c",
         "src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/bootstrap/v3/bootstrap.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/bootstrap/v3/bootstrap.upbdefs.h",
         "src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.c",
         "src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.h",
         "src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.c",
@@ -656,10 +638,6 @@ config("grpc_config") {
         "src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.h",
         "src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.c",
         "src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/metrics/v3/stats.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/metrics/v3/stats.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/overload/v3/overload.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/overload/v3/overload.upbdefs.h",
         "src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.c",
         "src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.h",
         "src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.c",
@@ -702,12 +680,8 @@ 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/service/status/v3/csds.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/service/status/v3/csds.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/node.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/node.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",
@@ -716,8 +690,6 @@ config("grpc_config") {
         "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/struct.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/struct.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",