cleanup

markdroth · Oct 11, 2024 · 69313da · 69313da
1 parent 210303f
commit 69313da
Show file tree

Hide file tree

Showing 7 changed files with 4,792 additions and 1,342 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml
diff --git a/test/core/xds/BUILD b/test/core/xds/BUILD
@@ -119,11 +119,11 @@ grpc_cc_test(
     uses_polling = False,
     deps = [
         "//:envoy_config_rbac_cc_proto",
-        "//:envoy_extensions_rbac_audit_loggers_stream_cc_proto",
         "//:envoy_extensions_filters_http_rbac_cc_proto",
-        "//:xds_type_cc_proto",
+        "//:envoy_extensions_rbac_audit_loggers_stream_cc_proto",
         "//:gpr",
         "//:grpc",
+        "//:xds_type_cc_proto",
         "//src/core:grpc_audit_logging",
         "//test/core/test_util:grpc_test_util",
         "//test/cpp/util:grpc_cli_utils",
@@ -185,6 +185,8 @@ grpc_cc_test(
     ],
 )
 
+# TODO(roth): Convert this to use the real xDS protos instead of our
+# local copies.
 grpc_proto_fuzzer(
     name = "xds_client_fuzzer",
     srcs = ["xds_client_fuzzer.cc"],
@@ -193,8 +195,6 @@ grpc_proto_fuzzer(
     language = "C++",
     proto = "xds_client_fuzzer.proto",
     proto_deps = [
-# FIXME: need to convert this to "@envoy-api//...", but that will
-# require more grpc_build_system.bzl changes
         "//src/proto/grpc/testing/xds/v3:discovery_proto",
         "//test/core/event_engine/fuzzing_event_engine:fuzzing_event_engine_proto",
     ],
@@ -228,10 +228,10 @@ grpc_cc_test(
     uses_event_engine = False,
     uses_polling = False,
     deps = [
-        "//:gpr",
-        "//:grpc",
         "//:envoy_extensions_transport_sockets_tls_cc_proto",
         "//:envoy_type_matcher_cc_proto",
+        "//:gpr",
+        "//:grpc",
         "//:udpa_type_cc_proto",
         "//:xds_type_cc_proto",
         "//src/core:grpc_xds_client",
@@ -249,10 +249,10 @@ grpc_cc_test(
     uses_event_engine = False,
     uses_polling = False,
     deps = [
-        "//:gpr",
-        "//:grpc",
         "//:envoy_config_core_cc_proto",
         "//:envoy_extensions_filters_http_gcp_authn_cc_proto",
+        "//:gpr",
+        "//:grpc",
         "//src/core:grpc_xds_client",
         "//test/core/test_util:grpc_test_util",
         "//test/core/test_util:scoped_env_var",
@@ -270,8 +270,6 @@ grpc_cc_test(
     uses_event_engine = False,
     uses_polling = False,
     deps = [
-        "//:gpr",
-        "//:grpc",
         "//:envoy_config_rbac_cc_proto",
         "//:envoy_extensions_filters_common_fault_cc_proto",
         "//:envoy_extensions_filters_http_fault_cc_proto",
@@ -282,6 +280,8 @@ grpc_cc_test(
         "//:envoy_extensions_http_stateful_session_cookie_cc_proto",
         "//:envoy_type_cc_proto",
         "//:envoy_type_http_cc_proto",
+        "//:gpr",
+        "//:grpc",
         "//:xds_type_cc_proto",
         "//test/core/test_util:grpc_test_util",
         "//test/core/test_util:scoped_env_var",
@@ -297,14 +297,14 @@ grpc_cc_test(
     uses_event_engine = False,
     uses_polling = False,
     deps = [
-        "//:gpr",
-        "//:grpc",
         "//:envoy_config_listener_cc_proto",
         "//:envoy_extensions_filters_http_fault_cc_proto",
         "//:envoy_extensions_filters_http_rbac_cc_proto",
         "//:envoy_extensions_filters_http_router_cc_proto",
         "//:envoy_extensions_filters_network_http_connection_manager_cc_proto",
         "//:envoy_extensions_transport_sockets_tls_cc_proto",
+        "//:gpr",
+        "//:grpc",
         "//:xds_type_cc_proto",
         "//src/core:grpc_xds_client",
         "//test/core/test_util:grpc_test_util",
@@ -321,14 +321,14 @@ grpc_cc_test(
     uses_event_engine = False,
     uses_polling = False,
     deps = [
+        "//:envoy_config_route_cc_proto",
+        "//:envoy_extensions_filters_http_fault_cc_proto",
+        "//:envoy_extensions_filters_http_rbac_cc_proto",
+        "//:envoy_type_cc_proto",
         "//:gpr",
         "//:grpc",
         "//src/core:grpc_xds_client",
         "//src/proto/grpc/lookup/v1:rls_config_proto",
-        "//:envoy_extensions_filters_http_fault_cc_proto",
-        "//:envoy_extensions_filters_http_rbac_cc_proto",
-        "//:envoy_config_route_cc_proto",
-        "//:envoy_type_cc_proto",
         "//test/core/test_util:grpc_test_util",
         "//test/core/test_util:scoped_env_var",
         "//test/cpp/util:grpc_cli_utils",
@@ -343,18 +343,18 @@ grpc_cc_test(
     uses_event_engine = False,
     uses_polling = False,
     deps = [
-        "//:gpr",
-        "//:grpc",
-        "//src/core:grpc_xds_client",
-        "//src/core:xds_health_status",
-        "//:envoy_extensions_clusters_aggregate_cc_proto",
         "//:envoy_config_cluster_cc_proto",
+        "//:envoy_extensions_clusters_aggregate_cc_proto",
         "//:envoy_extensions_filters_http_gcp_authn_cc_proto",
-        "//:envoy_extensions_upstreams_http_cc_proto",
         "//:envoy_extensions_load_balancing_policies_round_robin_cc_proto",
+        "//:envoy_extensions_load_balancing_policies_wrr_locality_cc_proto",
         "//:envoy_extensions_transport_sockets_tls_cc_proto",
+        "//:envoy_extensions_upstreams_http_cc_proto",
         "//:envoy_type_cc_proto",
-        "//:envoy_extensions_load_balancing_policies_wrr_locality_cc_proto",
+        "//:gpr",
+        "//:grpc",
+        "//src/core:grpc_xds_client",
+        "//src/core:xds_health_status",
         "//test/core/test_util:grpc_test_util",
         "//test/core/test_util:scoped_env_var",
     ],
@@ -368,12 +368,12 @@ grpc_cc_test(
     uses_event_engine = False,
     uses_polling = False,
     deps = [
+        "//:envoy_config_endpoint_cc_proto",
         "//:gpr",
         "//:grpc",
         "//src/core:channel_args",
         "//src/core:grpc_xds_client",
         "//src/core:xds_health_status",
-        "//:envoy_config_endpoint_cc_proto",
         "//test/core/test_util:grpc_test_util",
         "//test/core/test_util:scoped_env_var",
     ],

diff --git a/test/core/xds/xds_cluster_resource_type_test.cc b/test/core/xds/xds_cluster_resource_type_test.cc
@@ -29,6 +29,20 @@
 #include "absl/strings/str_format.h"
 #include "absl/types/optional.h"
 #include "absl/types/variant.h"
+#include "envoy/config/cluster/v3/cluster.pb.h"
+#include "envoy/config/cluster/v3/outlier_detection.pb.h"
+#include "envoy/config/core/v3/address.pb.h"
+#include "envoy/config/core/v3/base.pb.h"
+#include "envoy/config/core/v3/config_source.pb.h"
+#include "envoy/config/core/v3/extension.pb.h"
+#include "envoy/config/core/v3/health_check.pb.h"
+#include "envoy/config/endpoint/v3/endpoint.pb.h"
+#include "envoy/extensions/clusters/aggregate/v3/cluster.pb.h"
+#include "envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.pb.h"
+#include "envoy/extensions/load_balancing_policies/round_robin/v3/round_robin.pb.h"
+#include "envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.pb.h"
+#include "envoy/extensions/transport_sockets/tls/v3/tls.pb.h"
+#include "envoy/extensions/upstreams/http/v3/http_protocol_options.pb.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 #include "src/core/lib/debug/trace.h"
@@ -47,25 +61,11 @@
 #include "src/core/xds/xds_client/xds_bootstrap.h"
 #include "src/core/xds/xds_client/xds_client.h"
 #include "src/core/xds/xds_client/xds_resource_type.h"
-#include "envoy/config/core/v3/address.pb.h"
-#include "envoy/extensions/clusters/aggregate/v3/cluster.pb.h"
-#include "envoy/config/core/v3/base.pb.h"
-#include "envoy/config/cluster/v3/cluster.pb.h"
-#include "envoy/config/core/v3/config_source.pb.h"
-#include "envoy/config/endpoint/v3/endpoint.pb.h"
-#include "envoy/config/core/v3/extension.pb.h"
-#include "envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.pb.h"
-#include "envoy/config/core/v3/health_check.pb.h"
-#include "envoy/extensions/upstreams/http/v3/http_protocol_options.pb.h"
-#include "envoy/config/cluster/v3/outlier_detection.pb.h"
-#include "envoy/extensions/load_balancing_policies/round_robin/v3/round_robin.pb.h"
-#include "envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.pb.h"
-#include "envoy/extensions/transport_sockets/tls/v3/tls.pb.h"
-#include "xds/type/v3/typed_struct.pb.h"
 #include "test/core/test_util/scoped_env_var.h"
 #include "test/core/test_util/test_config.h"
 #include "upb/mem/arena.hpp"
 #include "upb/reflection/def.hpp"
+#include "xds/type/v3/typed_struct.pb.h"
 
 using envoy::config::cluster::v3::Cluster;
 using envoy::extensions::clusters::aggregate::v3::ClusterConfig;

diff --git a/test/core/xds/xds_endpoint_resource_type_test.cc b/test/core/xds/xds_endpoint_resource_type_test.cc
@@ -29,6 +29,11 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/str_format.h"
 #include "absl/types/optional.h"
+#include "envoy/config/core/v3/address.pb.h"
+#include "envoy/config/core/v3/base.pb.h"
+#include "envoy/config/core/v3/health_check.pb.h"
+#include "envoy/config/endpoint/v3/endpoint.pb.h"
+#include "envoy/type/v3/percent.pb.h"
 #include "gtest/gtest.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/channel/channel_args.h"
@@ -46,11 +51,6 @@
 #include "src/core/xds/xds_client/xds_client.h"
 #include "src/core/xds/xds_client/xds_locality.h"
 #include "src/core/xds/xds_client/xds_resource_type.h"
-#include "envoy/config/core/v3/address.pb.h"
-#include "envoy/config/core/v3/base.pb.h"
-#include "envoy/config/endpoint/v3/endpoint.pb.h"
-#include "envoy/config/core/v3/health_check.pb.h"
-#include "envoy/type/v3/percent.pb.h"
 #include "test/core/test_util/scoped_env_var.h"
 #include "test/core/test_util/test_config.h"
 #include "upb/mem/arena.hpp"

diff --git a/test/core/xds/xds_lb_policy_registry_test.cc b/test/core/xds/xds_lb_policy_registry_test.cc
@@ -28,6 +28,13 @@
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
+#include "envoy/config/cluster/v3/cluster.pb.h"
+#include "envoy/config/core/v3/extension.pb.h"
+#include "envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.pb.h"
+#include "envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.pb.h"
+#include "envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.pb.h"
+#include "envoy/extensions/load_balancing_policies/round_robin/v3/round_robin.pb.h"
+#include "envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.pb.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 #include "src/core/lib/config/core_configuration.h"
@@ -39,17 +46,10 @@
 #include "src/core/util/ref_counted_ptr.h"
 #include "src/core/util/validation_errors.h"
 #include "src/core/xds/grpc/xds_bootstrap_grpc.h"
-#include "envoy/config/cluster/v3/cluster.pb.h"
-#include "envoy/config/core/v3/extension.pb.h"
-#include "envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.pb.h"
-#include "envoy/extensions/load_balancing_policies/round_robin/v3/round_robin.pb.h"
-#include "envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.pb.h"
-#include "envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.pb.h"
-#include "envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.pb.h"
-#include "xds/type/v3/typed_struct.pb.h"
 #include "test/core/test_util/test_config.h"
 #include "upb/mem/arena.hpp"
 #include "upb/reflection/def.hpp"
+#include "xds/type/v3/typed_struct.pb.h"
 
 namespace grpc_core {
 namespace testing {

diff --git a/test/core/xds/xds_route_config_resource_type_test.cc b/test/core/xds/xds_route_config_resource_type_test.cc
@@ -35,6 +35,14 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 #include "absl/types/variant.h"
+#include "envoy/config/core/v3/base.pb.h"
+#include "envoy/config/core/v3/extension.pb.h"
+#include "envoy/config/route/v3/route.pb.h"
+#include "envoy/extensions/filters/http/fault/v3/fault.pb.h"
+#include "envoy/type/matcher/v3/regex.pb.h"
+#include "envoy/type/matcher/v3/string.pb.h"
+#include "envoy/type/v3/percent.pb.h"
+#include "envoy/type/v3/range.pb.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 #include "re2/re2.h"
@@ -53,19 +61,11 @@
 #include "src/core/xds/xds_client/xds_client.h"
 #include "src/core/xds/xds_client/xds_resource_type.h"
 #include "src/proto/grpc/lookup/v1/rls_config.pb.h"
-#include "envoy/config/core/v3/base.pb.h"
-#include "envoy/config/core/v3/extension.pb.h"
-#include "envoy/extensions/filters/http/fault/v3/fault.pb.h"
-#include "envoy/type/v3/percent.pb.h"
-#include "envoy/type/v3/range.pb.h"
-#include "envoy/type/matcher/v3/regex.pb.h"
-#include "envoy/config/route/v3/route.pb.h"
-#include "envoy/type/matcher/v3/string.pb.h"
-#include "xds/type/v3/typed_struct.pb.h"
 #include "test/core/test_util/scoped_env_var.h"
 #include "test/core/test_util/test_config.h"
 #include "upb/mem/arena.hpp"
 #include "upb/reflection/def.hpp"
+#include "xds/type/v3/typed_struct.pb.h"
 
 using envoy::config::route::v3::RouteConfiguration;
 using grpc::lookup::v1::RouteLookupClusterSpecifier;