From d597faa604688ba6bb2b04190b230b3c97e7e792 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Thu, 11 Apr 2024 09:27:04 -0700 Subject: [PATCH] [clang-format] Remove requirement that port_platform.h is at the top (#36285) Closes #36285 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/36285 from ctiller:port_platform-src-core-ext-clang-format 3cd9dbda0e65c300b24f82ed68f4b5c8524acfd4 PiperOrigin-RevId: 623849679 --- src/core/ext/.clang-format | 3 --- src/core/ext/gcp/metadata_query.cc | 3 +-- src/core/ext/gcp/metadata_query.h | 4 ++-- src/core/ext/xds/certificate_provider_store.cc | 3 +-- src/core/ext/xds/certificate_provider_store.h | 3 +-- src/core/ext/xds/file_watcher_certificate_provider_factory.cc | 3 +-- src/core/ext/xds/file_watcher_certificate_provider_factory.h | 3 +-- src/core/ext/xds/upb_utils.h | 4 ++-- src/core/ext/xds/xds_api.cc | 3 +-- src/core/ext/xds/xds_api.h | 4 ++-- src/core/ext/xds/xds_audit_logger_registry.cc | 4 ++-- src/core/ext/xds/xds_audit_logger_registry.h | 4 ++-- src/core/ext/xds/xds_bootstrap.cc | 4 ++-- src/core/ext/xds/xds_bootstrap.h | 4 ++-- src/core/ext/xds/xds_bootstrap_grpc.cc | 3 +-- src/core/ext/xds/xds_bootstrap_grpc.h | 4 ++-- src/core/ext/xds/xds_certificate_provider.cc | 3 +-- src/core/ext/xds/xds_certificate_provider.h | 3 +-- src/core/ext/xds/xds_channel_stack_modifier.cc | 4 ++-- src/core/ext/xds/xds_channel_stack_modifier.h | 3 +-- src/core/ext/xds/xds_client.cc | 3 +-- src/core/ext/xds/xds_client.h | 3 +-- src/core/ext/xds/xds_client_grpc.cc | 3 +-- src/core/ext/xds/xds_client_grpc.h | 3 +-- src/core/ext/xds/xds_client_stats.cc | 3 +-- src/core/ext/xds/xds_client_stats.h | 4 ++-- src/core/ext/xds/xds_cluster.cc | 3 +-- src/core/ext/xds/xds_cluster.h | 3 +-- src/core/ext/xds/xds_cluster_specifier_plugin.cc | 3 +-- src/core/ext/xds/xds_cluster_specifier_plugin.h | 4 ++-- src/core/ext/xds/xds_common_types.cc | 3 +-- src/core/ext/xds/xds_common_types.h | 4 ++-- src/core/ext/xds/xds_endpoint.cc | 3 +-- src/core/ext/xds/xds_endpoint.h | 4 ++-- src/core/ext/xds/xds_health_status.cc | 4 ++-- src/core/ext/xds/xds_health_status.h | 4 ++-- src/core/ext/xds/xds_http_fault_filter.cc | 3 +-- src/core/ext/xds/xds_http_fault_filter.h | 4 ++-- src/core/ext/xds/xds_http_filters.cc | 3 +-- src/core/ext/xds/xds_http_filters.h | 4 ++-- src/core/ext/xds/xds_http_rbac_filter.cc | 3 +-- src/core/ext/xds/xds_http_rbac_filter.h | 4 ++-- src/core/ext/xds/xds_http_stateful_session_filter.cc | 3 +-- src/core/ext/xds/xds_http_stateful_session_filter.h | 4 ++-- src/core/ext/xds/xds_lb_policy_registry.cc | 3 +-- src/core/ext/xds/xds_lb_policy_registry.h | 4 ++-- src/core/ext/xds/xds_listener.cc | 3 +-- src/core/ext/xds/xds_listener.h | 4 ++-- src/core/ext/xds/xds_metrics.h | 4 ++-- src/core/ext/xds/xds_resource_type.h | 4 ++-- src/core/ext/xds/xds_resource_type_impl.h | 4 ++-- src/core/ext/xds/xds_route_config.cc | 3 +-- src/core/ext/xds/xds_route_config.h | 4 ++-- src/core/ext/xds/xds_routing.cc | 3 +-- src/core/ext/xds/xds_routing.h | 4 ++-- src/core/ext/xds/xds_server_config_fetcher.cc | 3 +-- src/core/ext/xds/xds_transport.h | 4 ++-- src/core/ext/xds/xds_transport_grpc.cc | 3 +-- src/core/ext/xds/xds_transport_grpc.h | 3 +-- 59 files changed, 85 insertions(+), 119 deletions(-) diff --git a/src/core/ext/.clang-format b/src/core/ext/.clang-format index 64387e9e515..5f150ef6edb 100644 --- a/src/core/ext/.clang-format +++ b/src/core/ext/.clang-format @@ -5,9 +5,6 @@ DerivePointerAlignment: false PointerAlignment: Left IncludeBlocks: Regroup IncludeCategories: - # port_platform.h is before almost everything - - Regex: '^' - Priority: -100 # ruby.h is even more first if it's included - Regex: '^' Priority: -200 diff --git a/src/core/ext/gcp/metadata_query.cc b/src/core/ext/gcp/metadata_query.cc index 273a7732ab2..9edbabfde49 100644 --- a/src/core/ext/gcp/metadata_query.cc +++ b/src/core/ext/gcp/metadata_query.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/ext/gcp/metadata_query.h" #include @@ -33,6 +31,7 @@ #include #include #include +#include #include "src/core/lib/debug/trace.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" diff --git a/src/core/ext/gcp/metadata_query.h b/src/core/ext/gcp/metadata_query.h index 278a1f7a528..9e3f6931da5 100644 --- a/src/core/ext/gcp/metadata_query.h +++ b/src/core/ext/gcp/metadata_query.h @@ -17,13 +17,13 @@ #ifndef GRPC_SRC_CORE_EXT_GCP_METADATA_QUERY_H #define GRPC_SRC_CORE_EXT_GCP_METADATA_QUERY_H -#include - #include #include "absl/functional/any_invocable.h" #include "absl/status/statusor.h" +#include + #include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/gprpp/time.h" #include "src/core/lib/http/httpcli.h" diff --git a/src/core/ext/xds/certificate_provider_store.cc b/src/core/ext/xds/certificate_provider_store.cc index ed631dabcfb..9bfd22428e7 100644 --- a/src/core/ext/xds/certificate_provider_store.cc +++ b/src/core/ext/xds/certificate_provider_store.cc @@ -16,14 +16,13 @@ // // -#include - #include "src/core/ext/xds/certificate_provider_store.h" #include "absl/strings/str_cat.h" #include #include +#include #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/security/certificate_provider/certificate_provider_registry.h" diff --git a/src/core/ext/xds/certificate_provider_store.h b/src/core/ext/xds/certificate_provider_store.h index 963bd490039..643f1019c6f 100644 --- a/src/core/ext/xds/certificate_provider_store.h +++ b/src/core/ext/xds/certificate_provider_store.h @@ -19,8 +19,6 @@ #ifndef GRPC_SRC_CORE_EXT_XDS_CERTIFICATE_PROVIDER_STORE_H #define GRPC_SRC_CORE_EXT_XDS_CERTIFICATE_PROVIDER_STORE_H -#include - #include #include #include @@ -29,6 +27,7 @@ #include "absl/strings/string_view.h" #include +#include #include "src/core/lib/gpr/useful.h" #include "src/core/lib/gprpp/orphanable.h" diff --git a/src/core/ext/xds/file_watcher_certificate_provider_factory.cc b/src/core/ext/xds/file_watcher_certificate_provider_factory.cc index 3f5c17461ae..8671ac4c6d5 100644 --- a/src/core/ext/xds/file_watcher_certificate_provider_factory.cc +++ b/src/core/ext/xds/file_watcher_certificate_provider_factory.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/ext/xds/file_watcher_certificate_provider_factory.h" #include @@ -29,6 +27,7 @@ #include "absl/strings/str_join.h" #include +#include #include #include "src/core/lib/config/core_configuration.h" diff --git a/src/core/ext/xds/file_watcher_certificate_provider_factory.h b/src/core/ext/xds/file_watcher_certificate_provider_factory.h index 8c12e3867f5..94871771e88 100644 --- a/src/core/ext/xds/file_watcher_certificate_provider_factory.h +++ b/src/core/ext/xds/file_watcher_certificate_provider_factory.h @@ -19,13 +19,12 @@ #ifndef GRPC_SRC_CORE_EXT_XDS_FILE_WATCHER_CERTIFICATE_PROVIDER_FACTORY_H #define GRPC_SRC_CORE_EXT_XDS_FILE_WATCHER_CERTIFICATE_PROVIDER_FACTORY_H -#include - #include #include "absl/strings/string_view.h" #include +#include #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/time.h" diff --git a/src/core/ext/xds/upb_utils.h b/src/core/ext/xds/upb_utils.h index fd901278189..3c994cdd5ee 100644 --- a/src/core/ext/xds/upb_utils.h +++ b/src/core/ext/xds/upb_utils.h @@ -17,13 +17,13 @@ #ifndef GRPC_SRC_CORE_EXT_XDS_UPB_UTILS_H #define GRPC_SRC_CORE_EXT_XDS_UPB_UTILS_H -#include - #include #include "absl/strings/string_view.h" #include "upb/base/string_view.h" +#include + namespace grpc_core { // Works for both std::string and absl::string_view. diff --git a/src/core/ext/xds/xds_api.cc b/src/core/ext/xds/xds_api.cc index 937428edf66..4d4f5a1de1a 100644 --- a/src/core/ext/xds/xds_api.cc +++ b/src/core/ext/xds/xds_api.cc @@ -14,8 +14,6 @@ // limitations under the License. // -#include - #include "src/core/ext/xds/xds_api.h" #include @@ -46,6 +44,7 @@ #include #include +#include #include #include "src/core/ext/xds/upb_utils.h" diff --git a/src/core/ext/xds/xds_api.h b/src/core/ext/xds/xds_api.h index ad3192389a9..25b47fb1ed6 100644 --- a/src/core/ext/xds/xds_api.h +++ b/src/core/ext/xds/xds_api.h @@ -17,8 +17,6 @@ #ifndef GRPC_SRC_CORE_EXT_XDS_XDS_API_H #define GRPC_SRC_CORE_EXT_XDS_XDS_API_H -#include - #include #include @@ -34,6 +32,8 @@ #include "upb/mem/arena.h" #include "upb/reflection/def.hpp" +#include + #include "src/core/ext/xds/xds_bootstrap.h" #include "src/core/ext/xds/xds_client_stats.h" #include "src/core/lib/debug/trace.h" diff --git a/src/core/ext/xds/xds_audit_logger_registry.cc b/src/core/ext/xds/xds_audit_logger_registry.cc index 914365c6868..ac76cac13d0 100644 --- a/src/core/ext/xds/xds_audit_logger_registry.cc +++ b/src/core/ext/xds/xds_audit_logger_registry.cc @@ -14,8 +14,6 @@ // limitations under the License. // -#include - #include "src/core/ext/xds/xds_audit_logger_registry.h" #include @@ -28,6 +26,8 @@ #include "envoy/config/core/v3/extension.upb.h" #include "envoy/config/rbac/v3/rbac.upb.h" +#include + #include "src/core/ext/xds/xds_common_types.h" #include "src/core/lib/gprpp/match.h" #include "src/core/lib/gprpp/validation_errors.h" diff --git a/src/core/ext/xds/xds_audit_logger_registry.h b/src/core/ext/xds/xds_audit_logger_registry.h index c42452cfa51..c9b0b6f4cb5 100644 --- a/src/core/ext/xds/xds_audit_logger_registry.h +++ b/src/core/ext/xds/xds_audit_logger_registry.h @@ -17,14 +17,14 @@ #ifndef GRPC_SRC_CORE_EXT_XDS_XDS_AUDIT_LOGGER_REGISTRY_H #define GRPC_SRC_CORE_EXT_XDS_XDS_AUDIT_LOGGER_REGISTRY_H -#include - #include #include #include "absl/strings/string_view.h" #include "envoy/config/rbac/v3/rbac.upb.h" +#include + #include "src/core/ext/xds/xds_resource_type.h" #include "src/core/lib/gprpp/validation_errors.h" #include "src/core/lib/json/json.h" diff --git a/src/core/ext/xds/xds_bootstrap.cc b/src/core/ext/xds/xds_bootstrap.cc index 72263a720af..11c318d2e8c 100644 --- a/src/core/ext/xds/xds_bootstrap.cc +++ b/src/core/ext/xds/xds_bootstrap.cc @@ -14,12 +14,12 @@ // limitations under the License. // -#include - #include "src/core/ext/xds/xds_bootstrap.h" #include "absl/types/optional.h" +#include + #include "src/core/lib/gpr/string.h" #include "src/core/lib/gprpp/env.h" diff --git a/src/core/ext/xds/xds_bootstrap.h b/src/core/ext/xds/xds_bootstrap.h index 5754319ccfd..23a826d6eb0 100644 --- a/src/core/ext/xds/xds_bootstrap.h +++ b/src/core/ext/xds/xds_bootstrap.h @@ -17,10 +17,10 @@ #ifndef GRPC_SRC_CORE_EXT_XDS_XDS_BOOTSTRAP_H #define GRPC_SRC_CORE_EXT_XDS_XDS_BOOTSTRAP_H -#include - #include +#include + #include "src/core/lib/json/json.h" namespace grpc_core { diff --git a/src/core/ext/xds/xds_bootstrap_grpc.cc b/src/core/ext/xds/xds_bootstrap_grpc.cc index 3988423985d..b5b0642cfa7 100644 --- a/src/core/ext/xds/xds_bootstrap_grpc.cc +++ b/src/core/ext/xds/xds_bootstrap_grpc.cc @@ -14,8 +14,6 @@ // limitations under the License. // -#include - #include "src/core/ext/xds/xds_bootstrap_grpc.h" #include @@ -36,6 +34,7 @@ #include "absl/types/optional.h" #include +#include #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/gpr/string.h" diff --git a/src/core/ext/xds/xds_bootstrap_grpc.h b/src/core/ext/xds/xds_bootstrap_grpc.h index 1aa0652983c..7134cac22ee 100644 --- a/src/core/ext/xds/xds_bootstrap_grpc.h +++ b/src/core/ext/xds/xds_bootstrap_grpc.h @@ -17,8 +17,6 @@ #ifndef GRPC_SRC_CORE_EXT_XDS_XDS_BOOTSTRAP_GRPC_H #define GRPC_SRC_CORE_EXT_XDS_XDS_BOOTSTRAP_GRPC_H -#include - #include #include #include @@ -29,6 +27,8 @@ #include "absl/strings/string_view.h" #include "absl/types/optional.h" +#include + #include "src/core/ext/xds/certificate_provider_store.h" #include "src/core/ext/xds/xds_audit_logger_registry.h" #include "src/core/ext/xds/xds_bootstrap.h" diff --git a/src/core/ext/xds/xds_certificate_provider.cc b/src/core/ext/xds/xds_certificate_provider.cc index b2c5ce5d892..365294923de 100644 --- a/src/core/ext/xds/xds_certificate_provider.cc +++ b/src/core/ext/xds/xds_certificate_provider.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/ext/xds/xds_certificate_provider.h" #include @@ -26,6 +24,7 @@ #include "absl/types/optional.h" #include +#include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/error.h" diff --git a/src/core/ext/xds/xds_certificate_provider.h b/src/core/ext/xds/xds_certificate_provider.h index 0f8e00e8db6..d5afc6dfcb0 100644 --- a/src/core/ext/xds/xds_certificate_provider.h +++ b/src/core/ext/xds/xds_certificate_provider.h @@ -19,8 +19,6 @@ #ifndef GRPC_SRC_CORE_EXT_XDS_XDS_CERTIFICATE_PROVIDER_H #define GRPC_SRC_CORE_EXT_XDS_XDS_CERTIFICATE_PROVIDER_H -#include - #include #include #include @@ -31,6 +29,7 @@ #include #include +#include #include "src/core/lib/gpr/useful.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" diff --git a/src/core/ext/xds/xds_channel_stack_modifier.cc b/src/core/ext/xds/xds_channel_stack_modifier.cc index 15f0c5210fb..eeb1f26809d 100644 --- a/src/core/ext/xds/xds_channel_stack_modifier.cc +++ b/src/core/ext/xds/xds_channel_stack_modifier.cc @@ -16,14 +16,14 @@ // // -#include - #include "src/core/ext/xds/xds_channel_stack_modifier.h" #include #include #include +#include + #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/config/core_configuration.h" diff --git a/src/core/ext/xds/xds_channel_stack_modifier.h b/src/core/ext/xds/xds_channel_stack_modifier.h index 323f0083a63..740c2aefc5d 100644 --- a/src/core/ext/xds/xds_channel_stack_modifier.h +++ b/src/core/ext/xds/xds_channel_stack_modifier.h @@ -19,14 +19,13 @@ #ifndef GRPC_SRC_CORE_EXT_XDS_XDS_CHANNEL_STACK_MODIFIER_H #define GRPC_SRC_CORE_EXT_XDS_XDS_CHANNEL_STACK_MODIFIER_H -#include - #include #include #include "absl/strings/string_view.h" #include +#include #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack_builder.h" diff --git a/src/core/ext/xds/xds_client.cc b/src/core/ext/xds/xds_client.cc index 819649b596c..44a989d80a3 100644 --- a/src/core/ext/xds/xds_client.cc +++ b/src/core/ext/xds/xds_client.cc @@ -14,8 +14,6 @@ // limitations under the License. // -#include - #include "src/core/ext/xds/xds_client.h" #include @@ -45,6 +43,7 @@ #include #include +#include #include "src/core/ext/xds/upb_utils.h" #include "src/core/ext/xds/xds_api.h" diff --git a/src/core/ext/xds/xds_client.h b/src/core/ext/xds/xds_client.h index d39bf7ad23e..2dc1acb3b2f 100644 --- a/src/core/ext/xds/xds_client.h +++ b/src/core/ext/xds/xds_client.h @@ -17,8 +17,6 @@ #ifndef GRPC_SRC_CORE_EXT_XDS_XDS_CLIENT_H #define GRPC_SRC_CORE_EXT_XDS_XDS_CLIENT_H -#include - #include #include #include @@ -33,6 +31,7 @@ #include "upb/reflection/def.hpp" #include +#include #include "src/core/ext/xds/xds_api.h" #include "src/core/ext/xds/xds_bootstrap.h" diff --git a/src/core/ext/xds/xds_client_grpc.cc b/src/core/ext/xds/xds_client_grpc.cc index 1d9a6b157d0..647929b9751 100644 --- a/src/core/ext/xds/xds_client_grpc.cc +++ b/src/core/ext/xds/xds_client_grpc.cc @@ -14,8 +14,6 @@ // limitations under the License. // -#include - #include "src/core/ext/xds/xds_client_grpc.h" #include @@ -38,6 +36,7 @@ #include #include #include +#include #include #include "src/core/ext/xds/upb_utils.h" diff --git a/src/core/ext/xds/xds_client_grpc.h b/src/core/ext/xds/xds_client_grpc.h index 26c0e1044a7..0aa17bf50c0 100644 --- a/src/core/ext/xds/xds_client_grpc.h +++ b/src/core/ext/xds/xds_client_grpc.h @@ -17,14 +17,13 @@ #ifndef GRPC_SRC_CORE_EXT_XDS_XDS_CLIENT_GRPC_H #define GRPC_SRC_CORE_EXT_XDS_XDS_CLIENT_GRPC_H -#include - #include #include "absl/status/statusor.h" #include "absl/strings/string_view.h" #include +#include #include "src/core/ext/xds/certificate_provider_store.h" #include "src/core/ext/xds/xds_bootstrap_grpc.h" diff --git a/src/core/ext/xds/xds_client_stats.cc b/src/core/ext/xds/xds_client_stats.cc index 3d4730a4965..2fb29968228 100644 --- a/src/core/ext/xds/xds_client_stats.cc +++ b/src/core/ext/xds/xds_client_stats.cc @@ -16,11 +16,10 @@ // // -#include - #include "src/core/ext/xds/xds_client_stats.h" #include +#include #include "src/core/ext/xds/xds_client.h" #include "src/core/lib/debug/trace.h" diff --git a/src/core/ext/xds/xds_client_stats.h b/src/core/ext/xds/xds_client_stats.h index 6cffcb76ba5..7aa3c0112bb 100644 --- a/src/core/ext/xds/xds_client_stats.h +++ b/src/core/ext/xds/xds_client_stats.h @@ -19,8 +19,6 @@ #ifndef GRPC_SRC_CORE_EXT_XDS_XDS_CLIENT_STATS_H #define GRPC_SRC_CORE_EXT_XDS_XDS_CLIENT_STATS_H -#include - #include #include #include @@ -31,6 +29,8 @@ #include "absl/strings/str_format.h" #include "absl/strings/string_view.h" +#include + #include "src/core/ext/xds/xds_bootstrap.h" #include "src/core/lib/channel/call_tracer.h" #include "src/core/lib/gpr/useful.h" diff --git a/src/core/ext/xds/xds_cluster.cc b/src/core/ext/xds/xds_cluster.cc index 572ce831c53..194a88d5e49 100644 --- a/src/core/ext/xds/xds_cluster.cc +++ b/src/core/ext/xds/xds_cluster.cc @@ -14,8 +14,6 @@ // limitations under the License. // -#include - #include "src/core/ext/xds/xds_cluster.h" #include @@ -55,6 +53,7 @@ #include #include +#include #include "src/core/ext/xds/upb_utils.h" #include "src/core/ext/xds/xds_client.h" diff --git a/src/core/ext/xds/xds_cluster.h b/src/core/ext/xds/xds_cluster.h index 445c443a8e5..2780da27b83 100644 --- a/src/core/ext/xds/xds_cluster.h +++ b/src/core/ext/xds/xds_cluster.h @@ -17,8 +17,6 @@ #ifndef GRPC_SRC_CORE_EXT_XDS_XDS_CLUSTER_H #define GRPC_SRC_CORE_EXT_XDS_XDS_CLUSTER_H -#include - #include #include @@ -35,6 +33,7 @@ #include "upb/reflection/def.h" #include +#include #include "src/core/ext/xds/xds_bootstrap.h" #include "src/core/ext/xds/xds_bootstrap_grpc.h" diff --git a/src/core/ext/xds/xds_cluster_specifier_plugin.cc b/src/core/ext/xds/xds_cluster_specifier_plugin.cc index 08e1ceb894d..2e3e2f511ce 100644 --- a/src/core/ext/xds/xds_cluster_specifier_plugin.cc +++ b/src/core/ext/xds/xds_cluster_specifier_plugin.cc @@ -14,8 +14,6 @@ // limitations under the License. // -#include - #include "src/core/ext/xds/xds_cluster_specifier_plugin.h" #include @@ -32,6 +30,7 @@ #include #include +#include #include "src/core/lib/json/json.h" #include "src/core/lib/json/json_reader.h" diff --git a/src/core/ext/xds/xds_cluster_specifier_plugin.h b/src/core/ext/xds/xds_cluster_specifier_plugin.h index 434f894281e..acc0041cdc9 100644 --- a/src/core/ext/xds/xds_cluster_specifier_plugin.h +++ b/src/core/ext/xds/xds_cluster_specifier_plugin.h @@ -17,8 +17,6 @@ #ifndef GRPC_SRC_CORE_EXT_XDS_XDS_CLUSTER_SPECIFIER_PLUGIN_H #define GRPC_SRC_CORE_EXT_XDS_XDS_CLUSTER_SPECIFIER_PLUGIN_H -#include - #include #include #include @@ -27,6 +25,8 @@ #include "upb/mem/arena.h" #include "upb/reflection/def.h" +#include + #include "src/core/ext/xds/xds_common_types.h" #include "src/core/lib/gprpp/validation_errors.h" #include "src/core/lib/json/json.h" diff --git a/src/core/ext/xds/xds_common_types.cc b/src/core/ext/xds/xds_common_types.cc index d91e19d569d..aac36bb4f5e 100644 --- a/src/core/ext/xds/xds_common_types.cc +++ b/src/core/ext/xds/xds_common_types.cc @@ -14,8 +14,6 @@ // limitations under the License. // -#include - #include "src/core/ext/xds/xds_common_types.h" #include @@ -44,6 +42,7 @@ #include "xds/type/v3/typed_struct.upb.h" #include +#include #include "src/core/ext/xds/upb_utils.h" #include "src/core/ext/xds/xds_bootstrap_grpc.h" diff --git a/src/core/ext/xds/xds_common_types.h b/src/core/ext/xds/xds_common_types.h index 4ddc1b8ab84..038c24de897 100644 --- a/src/core/ext/xds/xds_common_types.h +++ b/src/core/ext/xds/xds_common_types.h @@ -17,8 +17,6 @@ #ifndef GRPC_SRC_CORE_EXT_XDS_XDS_COMMON_TYPES_H #define GRPC_SRC_CORE_EXT_XDS_XDS_COMMON_TYPES_H -#include - #include #include @@ -29,6 +27,8 @@ #include "google/protobuf/any.upb.h" #include "google/protobuf/duration.upb.h" +#include + #include "src/core/ext/xds/xds_resource_type.h" #include "src/core/lib/gprpp/time.h" #include "src/core/lib/gprpp/validation_errors.h" diff --git a/src/core/ext/xds/xds_endpoint.cc b/src/core/ext/xds/xds_endpoint.cc index 18236f51720..fb0e53bef5c 100644 --- a/src/core/ext/xds/xds_endpoint.cc +++ b/src/core/ext/xds/xds_endpoint.cc @@ -14,8 +14,6 @@ // limitations under the License. // -#include - #include "src/core/ext/xds/xds_endpoint.h" #include @@ -42,6 +40,7 @@ #include "upb/text/encode.h" #include +#include #include "src/core/ext/xds/upb_utils.h" #include "src/core/ext/xds/xds_health_status.h" diff --git a/src/core/ext/xds/xds_endpoint.h b/src/core/ext/xds/xds_endpoint.h index 3e26f669e2b..d5d9c1106ee 100644 --- a/src/core/ext/xds/xds_endpoint.h +++ b/src/core/ext/xds/xds_endpoint.h @@ -17,8 +17,6 @@ #ifndef GRPC_SRC_CORE_EXT_XDS_XDS_ENDPOINT_H #define GRPC_SRC_CORE_EXT_XDS_XDS_ENDPOINT_H -#include - #include #include @@ -33,6 +31,8 @@ #include "envoy/config/endpoint/v3/endpoint.upbdefs.h" #include "upb/reflection/def.h" +#include + #include "src/core/ext/xds/xds_client.h" #include "src/core/ext/xds/xds_client_stats.h" #include "src/core/ext/xds/xds_resource_type.h" diff --git a/src/core/ext/xds/xds_health_status.cc b/src/core/ext/xds/xds_health_status.cc index ad504ad91d0..5df84147b40 100644 --- a/src/core/ext/xds/xds_health_status.cc +++ b/src/core/ext/xds/xds_health_status.cc @@ -14,8 +14,6 @@ // limitations under the License. // -#include - #include "src/core/ext/xds/xds_health_status.h" #include @@ -24,6 +22,8 @@ #include "absl/strings/str_join.h" #include "envoy/config/core/v3/health_check.upb.h" +#include + namespace grpc_core { absl::optional XdsHealthStatus::FromUpb(uint32_t status) { diff --git a/src/core/ext/xds/xds_health_status.h b/src/core/ext/xds/xds_health_status.h index 53e706c432e..593aa681b71 100644 --- a/src/core/ext/xds/xds_health_status.h +++ b/src/core/ext/xds/xds_health_status.h @@ -17,14 +17,14 @@ #ifndef GRPC_SRC_CORE_EXT_XDS_XDS_HEALTH_STATUS_H #define GRPC_SRC_CORE_EXT_XDS_XDS_HEALTH_STATUS_H -#include - #include #include "absl/strings/string_view.h" #include "absl/types/optional.h" #include "absl/types/span.h" +#include + #include "src/core/resolver/endpoint_addresses.h" // Channel arg key for xDS health status. diff --git a/src/core/ext/xds/xds_http_fault_filter.cc b/src/core/ext/xds/xds_http_fault_filter.cc index 4c460daef58..74fb67b3075 100644 --- a/src/core/ext/xds/xds_http_fault_filter.cc +++ b/src/core/ext/xds/xds_http_fault_filter.cc @@ -14,8 +14,6 @@ // limitations under the License. // -#include - #include "src/core/ext/xds/xds_http_fault_filter.h" #include @@ -35,6 +33,7 @@ #include #include +#include #include "src/core/ext/filters/fault_injection/fault_injection_filter.h" #include "src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h" diff --git a/src/core/ext/xds/xds_http_fault_filter.h b/src/core/ext/xds/xds_http_fault_filter.h index 3bd8b2d9c79..23373f2e84d 100644 --- a/src/core/ext/xds/xds_http_fault_filter.h +++ b/src/core/ext/xds/xds_http_fault_filter.h @@ -17,13 +17,13 @@ #ifndef GRPC_SRC_CORE_EXT_XDS_XDS_HTTP_FAULT_FILTER_H #define GRPC_SRC_CORE_EXT_XDS_XDS_HTTP_FAULT_FILTER_H -#include - #include "absl/status/statusor.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" #include "upb/reflection/def.h" +#include + #include "src/core/ext/xds/xds_common_types.h" #include "src/core/ext/xds/xds_http_filters.h" #include "src/core/ext/xds/xds_resource_type.h" diff --git a/src/core/ext/xds/xds_http_filters.cc b/src/core/ext/xds/xds_http_filters.cc index b724b5facdd..65103380e1b 100644 --- a/src/core/ext/xds/xds_http_filters.cc +++ b/src/core/ext/xds/xds_http_filters.cc @@ -14,8 +14,6 @@ // limitations under the License. // -#include - #include "src/core/ext/xds/xds_http_filters.h" #include @@ -27,6 +25,7 @@ #include "envoy/extensions/filters/http/router/v3/router.upbdefs.h" #include +#include #include "src/core/ext/xds/xds_http_fault_filter.h" #include "src/core/ext/xds/xds_http_rbac_filter.h" diff --git a/src/core/ext/xds/xds_http_filters.h b/src/core/ext/xds/xds_http_filters.h index fd5148d2b3e..db673cdf6af 100644 --- a/src/core/ext/xds/xds_http_filters.h +++ b/src/core/ext/xds/xds_http_filters.h @@ -17,8 +17,6 @@ #ifndef GRPC_SRC_CORE_EXT_XDS_XDS_HTTP_FILTERS_H #define GRPC_SRC_CORE_EXT_XDS_XDS_HTTP_FILTERS_H -#include - #include #include #include @@ -32,6 +30,8 @@ #include "absl/types/optional.h" #include "upb/reflection/def.h" +#include + #include "src/core/ext/xds/xds_common_types.h" #include "src/core/ext/xds/xds_resource_type.h" #include "src/core/lib/channel/channel_args.h" diff --git a/src/core/ext/xds/xds_http_rbac_filter.cc b/src/core/ext/xds/xds_http_rbac_filter.cc index 7ceb4a13e6e..6ecdf1f23d6 100644 --- a/src/core/ext/xds/xds_http_rbac_filter.cc +++ b/src/core/ext/xds/xds_http_rbac_filter.cc @@ -14,8 +14,6 @@ // limitations under the License. // -#include - #include "src/core/ext/xds/xds_http_rbac_filter.h" #include @@ -43,6 +41,7 @@ #include "upb/message/map.h" #include +#include #include "src/core/ext/filters/rbac/rbac_filter.h" #include "src/core/ext/filters/rbac/rbac_service_config_parser.h" diff --git a/src/core/ext/xds/xds_http_rbac_filter.h b/src/core/ext/xds/xds_http_rbac_filter.h index 20053342070..e4ba45ed45d 100644 --- a/src/core/ext/xds/xds_http_rbac_filter.h +++ b/src/core/ext/xds/xds_http_rbac_filter.h @@ -17,13 +17,13 @@ #ifndef GRPC_SRC_CORE_EXT_XDS_XDS_HTTP_RBAC_FILTER_H #define GRPC_SRC_CORE_EXT_XDS_XDS_HTTP_RBAC_FILTER_H -#include - #include "absl/status/statusor.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" #include "upb/reflection/def.h" +#include + #include "src/core/ext/xds/xds_common_types.h" #include "src/core/ext/xds/xds_http_filters.h" #include "src/core/ext/xds/xds_resource_type.h" diff --git a/src/core/ext/xds/xds_http_stateful_session_filter.cc b/src/core/ext/xds/xds_http_stateful_session_filter.cc index 6680fa583df..8df2d5bc978 100644 --- a/src/core/ext/xds/xds_http_stateful_session_filter.cc +++ b/src/core/ext/xds/xds_http_stateful_session_filter.cc @@ -14,8 +14,6 @@ // limitations under the License. // -#include - #include "src/core/ext/xds/xds_http_stateful_session_filter.h" #include @@ -32,6 +30,7 @@ #include "envoy/type/http/v3/cookie.upb.h" #include +#include #include "src/core/ext/filters/stateful_session/stateful_session_filter.h" #include "src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h" diff --git a/src/core/ext/xds/xds_http_stateful_session_filter.h b/src/core/ext/xds/xds_http_stateful_session_filter.h index 660b3660f7e..e1f69c4e1ac 100644 --- a/src/core/ext/xds/xds_http_stateful_session_filter.h +++ b/src/core/ext/xds/xds_http_stateful_session_filter.h @@ -17,13 +17,13 @@ #ifndef GRPC_SRC_CORE_EXT_XDS_XDS_HTTP_STATEFUL_SESSION_FILTER_H #define GRPC_SRC_CORE_EXT_XDS_XDS_HTTP_STATEFUL_SESSION_FILTER_H -#include - #include "absl/status/statusor.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" #include "upb/reflection/def.h" +#include + #include "src/core/ext/xds/xds_common_types.h" #include "src/core/ext/xds/xds_http_filters.h" #include "src/core/ext/xds/xds_resource_type.h" diff --git a/src/core/ext/xds/xds_lb_policy_registry.cc b/src/core/ext/xds/xds_lb_policy_registry.cc index d36a4f22eaf..a49e203349d 100644 --- a/src/core/ext/xds/xds_lb_policy_registry.cc +++ b/src/core/ext/xds/xds_lb_policy_registry.cc @@ -14,8 +14,6 @@ // limitations under the License. // -#include - #include "src/core/ext/xds/xds_lb_policy_registry.h" #include @@ -35,6 +33,7 @@ #include "google/protobuf/wrappers.upb.h" #include +#include #include "src/core/ext/xds/xds_common_types.h" #include "src/core/lib/config/core_configuration.h" diff --git a/src/core/ext/xds/xds_lb_policy_registry.h b/src/core/ext/xds/xds_lb_policy_registry.h index e1a5a01bdc7..b7e03923fd4 100644 --- a/src/core/ext/xds/xds_lb_policy_registry.h +++ b/src/core/ext/xds/xds_lb_policy_registry.h @@ -17,14 +17,14 @@ #ifndef GRPC_SRC_CORE_EXT_XDS_XDS_LB_POLICY_REGISTRY_H #define GRPC_SRC_CORE_EXT_XDS_XDS_LB_POLICY_REGISTRY_H -#include - #include #include #include "absl/strings/string_view.h" #include "envoy/config/cluster/v3/cluster.upb.h" +#include + #include "src/core/ext/xds/xds_resource_type.h" #include "src/core/lib/gprpp/validation_errors.h" #include "src/core/lib/json/json.h" diff --git a/src/core/ext/xds/xds_listener.cc b/src/core/ext/xds/xds_listener.cc index df7bf59e02c..b79ec4c9803 100644 --- a/src/core/ext/xds/xds_listener.cc +++ b/src/core/ext/xds/xds_listener.cc @@ -14,8 +14,6 @@ // limitations under the License. // -#include - #include "src/core/ext/xds/xds_listener.h" #include @@ -46,6 +44,7 @@ #include "upb/text/encode.h" #include +#include #include "src/core/ext/xds/upb_utils.h" #include "src/core/ext/xds/xds_common_types.h" diff --git a/src/core/ext/xds/xds_listener.h b/src/core/ext/xds/xds_listener.h index 625ea7af110..d0440c8b19b 100644 --- a/src/core/ext/xds/xds_listener.h +++ b/src/core/ext/xds/xds_listener.h @@ -17,8 +17,6 @@ #ifndef GRPC_SRC_CORE_EXT_XDS_XDS_LISTENER_H #define GRPC_SRC_CORE_EXT_XDS_XDS_LISTENER_H -#include - #include #include @@ -36,6 +34,8 @@ #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h" #include "upb/reflection/def.h" +#include + #include "src/core/ext/xds/xds_bootstrap_grpc.h" #include "src/core/ext/xds/xds_client.h" #include "src/core/ext/xds/xds_common_types.h" diff --git a/src/core/ext/xds/xds_metrics.h b/src/core/ext/xds/xds_metrics.h index f30e9dbe962..b2e55230649 100644 --- a/src/core/ext/xds/xds_metrics.h +++ b/src/core/ext/xds/xds_metrics.h @@ -17,10 +17,10 @@ #ifndef GRPC_SRC_CORE_EXT_XDS_XDS_METRICS_H #define GRPC_SRC_CORE_EXT_XDS_XDS_METRICS_H -#include - #include "absl/strings/string_view.h" +#include + namespace grpc_core { // An interface for XdsClient to report metrics. diff --git a/src/core/ext/xds/xds_resource_type.h b/src/core/ext/xds/xds_resource_type.h index 4ff941e0f47..e4a8c2d9440 100644 --- a/src/core/ext/xds/xds_resource_type.h +++ b/src/core/ext/xds/xds_resource_type.h @@ -16,8 +16,6 @@ #ifndef GRPC_SRC_CORE_EXT_XDS_XDS_RESOURCE_TYPE_H #define GRPC_SRC_CORE_EXT_XDS_XDS_RESOURCE_TYPE_H -#include - #include #include @@ -27,6 +25,8 @@ #include "upb/mem/arena.h" #include "upb/reflection/def.h" +#include + #include "src/core/ext/xds/xds_bootstrap.h" #include "src/core/lib/debug/trace.h" diff --git a/src/core/ext/xds/xds_resource_type_impl.h b/src/core/ext/xds/xds_resource_type_impl.h index ed3d2d6387b..49cc43ea45a 100644 --- a/src/core/ext/xds/xds_resource_type_impl.h +++ b/src/core/ext/xds/xds_resource_type_impl.h @@ -16,13 +16,13 @@ #ifndef GRPC_SRC_CORE_EXT_XDS_XDS_RESOURCE_TYPE_IMPL_H #define GRPC_SRC_CORE_EXT_XDS_XDS_RESOURCE_TYPE_IMPL_H -#include - #include #include #include "absl/strings/string_view.h" +#include + #include "src/core/ext/xds/xds_client.h" #include "src/core/ext/xds/xds_resource_type.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" diff --git a/src/core/ext/xds/xds_route_config.cc b/src/core/ext/xds/xds_route_config.cc index d248721b333..81f07ec9da3 100644 --- a/src/core/ext/xds/xds_route_config.cc +++ b/src/core/ext/xds/xds_route_config.cc @@ -14,8 +14,6 @@ // limitations under the License. // -#include - #include "src/core/ext/xds/xds_route_config.h" #include @@ -57,6 +55,7 @@ #include #include +#include #include "src/core/ext/xds/upb_utils.h" #include "src/core/ext/xds/xds_cluster_specifier_plugin.h" diff --git a/src/core/ext/xds/xds_route_config.h b/src/core/ext/xds/xds_route_config.h index eb7e0b1b70f..b70c7334dbb 100644 --- a/src/core/ext/xds/xds_route_config.h +++ b/src/core/ext/xds/xds_route_config.h @@ -17,8 +17,6 @@ #ifndef GRPC_SRC_CORE_EXT_XDS_XDS_ROUTE_CONFIG_H #define GRPC_SRC_CORE_EXT_XDS_XDS_ROUTE_CONFIG_H -#include - #include #include @@ -35,6 +33,8 @@ #include "re2/re2.h" #include "upb/reflection/def.h" +#include + #include "src/core/ext/xds/xds_bootstrap_grpc.h" #include "src/core/ext/xds/xds_client.h" #include "src/core/ext/xds/xds_cluster_specifier_plugin.h" diff --git a/src/core/ext/xds/xds_routing.cc b/src/core/ext/xds/xds_routing.cc index e59d6b9d50e..3c620e7ca7b 100644 --- a/src/core/ext/xds/xds_routing.cc +++ b/src/core/ext/xds/xds_routing.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/ext/xds/xds_routing.h" #include @@ -33,6 +31,7 @@ #include "absl/strings/str_cat.h" #include +#include #include "src/core/ext/xds/xds_http_filters.h" #include "src/core/lib/channel/channel_args.h" diff --git a/src/core/ext/xds/xds_routing.h b/src/core/ext/xds/xds_routing.h index a6f383fd0f8..618045c5505 100644 --- a/src/core/ext/xds/xds_routing.h +++ b/src/core/ext/xds/xds_routing.h @@ -19,8 +19,6 @@ #ifndef GRPC_SRC_CORE_EXT_XDS_XDS_ROUTING_H #define GRPC_SRC_CORE_EXT_XDS_XDS_ROUTING_H -#include - #include #include @@ -31,6 +29,8 @@ #include "absl/strings/string_view.h" #include "absl/types/optional.h" +#include + #include "src/core/ext/xds/xds_http_filters.h" #include "src/core/ext/xds/xds_listener.h" #include "src/core/ext/xds/xds_route_config.h" diff --git a/src/core/ext/xds/xds_server_config_fetcher.cc b/src/core/ext/xds/xds_server_config_fetcher.cc index c861dc61a2c..75f4e704aba 100644 --- a/src/core/ext/xds/xds_server_config_fetcher.cc +++ b/src/core/ext/xds/xds_server_config_fetcher.cc @@ -16,8 +16,6 @@ // // -#include - #include #include @@ -45,6 +43,7 @@ #include #include #include +#include #include "src/core/ext/filters/server_config_selector/server_config_selector.h" #include "src/core/ext/filters/server_config_selector/server_config_selector_filter.h" diff --git a/src/core/ext/xds/xds_transport.h b/src/core/ext/xds/xds_transport.h index 66155475903..751af812038 100644 --- a/src/core/ext/xds/xds_transport.h +++ b/src/core/ext/xds/xds_transport.h @@ -17,8 +17,6 @@ #ifndef GRPC_SRC_CORE_EXT_XDS_XDS_TRANSPORT_H #define GRPC_SRC_CORE_EXT_XDS_XDS_TRANSPORT_H -#include - #include #include #include @@ -26,6 +24,8 @@ #include "absl/status/status.h" #include "absl/strings/string_view.h" +#include + #include "src/core/ext/xds/xds_bootstrap.h" #include "src/core/lib/gprpp/orphanable.h" diff --git a/src/core/ext/xds/xds_transport_grpc.cc b/src/core/ext/xds/xds_transport_grpc.cc index da65a663279..55cd32776ca 100644 --- a/src/core/ext/xds/xds_transport_grpc.cc +++ b/src/core/ext/xds/xds_transport_grpc.cc @@ -14,8 +14,6 @@ // limitations under the License. // -#include - #include "src/core/ext/xds/xds_transport_grpc.h" #include @@ -36,6 +34,7 @@ #include #include #include +#include #include "src/core/client_channel/client_channel_filter.h" #include "src/core/ext/xds/xds_bootstrap.h" diff --git a/src/core/ext/xds/xds_transport_grpc.h b/src/core/ext/xds/xds_transport_grpc.h index 55498442643..a23b7641d95 100644 --- a/src/core/ext/xds/xds_transport_grpc.h +++ b/src/core/ext/xds/xds_transport_grpc.h @@ -17,8 +17,6 @@ #ifndef GRPC_SRC_CORE_EXT_XDS_XDS_TRANSPORT_GRPC_H #define GRPC_SRC_CORE_EXT_XDS_XDS_TRANSPORT_GRPC_H -#include - #include #include #include @@ -28,6 +26,7 @@ #include #include #include +#include #include "src/core/ext/xds/xds_bootstrap.h" #include "src/core/ext/xds/xds_transport.h"