From f02c5dbfa66504eb7a7d57fe4dfb54ee7b5c4f02 Mon Sep 17 00:00:00 2001 From: Harvey Tuch Date: Wed, 19 Apr 2017 20:03:33 -0400 Subject: [PATCH] build: eliminate precompiled headers from bazel build. Since Bazel doesn't support precompiled headers (https://github.com/bazelbuild/bazel/issues/1215), we actually suffer a slowdown rather than speedup by having all files implicitly include precompiled.h in the Bazel build. I found ~10% performance improvement on my workstation, going from 181s to 163s for a "bazel build //test/..." from a "bazel clean" state. This patch makes all includes now explicit. This will slowdown the cmake build, but since this is not long for this world it seems alright. The header reordering in this patch was achieved using #793. The addition of the missing headers in each file was done using a modified version of the tool in #793, which substituted in headers based on simple substring matches (e.g. whenever it saw std::string in a file, it added #include ). Here's the patterns I ended up using that seemed to work: sys_extra_includes = [ ('std::runtime_error', 'stdexcept'), ('strcmp', 'string.h'), ('strcasecmp', 'strings.h'), ('std::unique_ptr', 'memory'), ('std::shared_ptr', 'memory'), ('std::unordered_set', 'unordered_set'), ('std::transform', 'algorithm'), ('std::vector', 'vector'), ('std::regex', 'regex'), ('spdlog::', 'spdlog/spdlog.h'), ('fmt::format', 'spdlog/spdlog.h'), ('std::string', 'string'), ('uint32_t', 'cstdint'), ('uint64_t', 'cstdint'), ('std::array', 'array'), ('sockaddr_un', 'sys/un.h'), ('sockaddr_in', 'netinet/ip.h'), ('std::chrono', 'chrono'), ('std::list', 'list'), ('std::multimap', 'map'), ('std::unordered_map', 'unordered_map'), ('std::stringstream', 'sstream'), ('std::condition_variable', 'condition_variable'), ('std::mutex', 'mutex'), (' ::close', 'unistd.h'), ('inet_ntop', 'arpa/inet.h'), ('inet_pton', 'arpa/inet.h'), ('htonl', 'arpa/inet.h'), ('setsockopt', 'sys/types.h'), ('setsockopt', 'sys/socket.h'), ('TCP_NODELAY', 'netinet/tcp.h'), ('SIGTERM', 'signal.h'), ('SIGPIPE', 'signal.h'), ('std::function', 'functional'), ('std::ifstream', 'fstream'), ('std::ofstream', 'fstream'), ('std::forward_list', 'forward_list'), ('std::atomic', 'atomic'), ('std::cerr', 'iostream'), ('hostent', 'netdb.h'), (' bind(', 'sys/types.h'), (' bind(', 'sys/socket.h'), ('std::ostream', 'iostream'), ] extra_includes = [ ('MOCK_METHOD', 'gmock/gmock.h'), ('MOCK_CONST_METHOD', 'gmock/gmock.h'), ('MATCHER_P', 'gmock/gmock.h'), ('ON_CALL', 'gmock/gmock.h'), ('using testing::_', 'gmock/gmock.h'), ('testing::Test', 'gtest/gtest.h'), ('EXPECT_', 'gtest/gtest.h'), ('\nTEST(', 'gtest/gtest.h'), ('\nTEST_F(', 'gtest/gtest.h'), ('\nTEST_P(', 'gtest/gtest.h'), ('HeaderMapImpl', 'test/test_common/printers.h'), ('Buffer::', 'test/test_common/printers.h'), ('RespValue', 'test/test_common/printers.h'), ] --- CMakeLists.txt | 2 +- bazel/envoy_build_system.bzl | 13 +++++-------- bazel/gen_sh_test_runner.sh | 2 ++ include/envoy/access_log/access_log.h | 3 +++ include/envoy/api/api.h | 3 +++ include/envoy/buffer/buffer.h | 4 ++++ include/envoy/common/exception.h | 3 +++ include/envoy/common/time.h | 2 ++ include/envoy/event/deferred_deletable.h | 2 ++ include/envoy/event/dispatcher.h | 4 ++++ include/envoy/event/file_event.h | 4 ++++ include/envoy/event/signal.h | 3 +++ include/envoy/event/timer.h | 4 ++++ include/envoy/filesystem/filesystem.h | 5 +++++ include/envoy/grpc/rpc_channel.h | 5 +++++ include/envoy/http/access_log.h | 5 +++++ include/envoy/http/async_client.h | 3 +++ include/envoy/http/codec.h | 3 +++ include/envoy/http/conn_pool.h | 3 +++ include/envoy/http/filter.h | 5 +++++ include/envoy/http/header_map.h | 7 +++++++ include/envoy/http/message.h | 3 +++ include/envoy/init/init.h | 2 ++ include/envoy/json/json_object.h | 6 ++++++ include/envoy/local_info/local_info.h | 2 ++ include/envoy/mongo/bson.h | 5 +++++ include/envoy/mongo/codec.h | 5 +++++ include/envoy/network/address.h | 8 ++++++++ include/envoy/network/connection.h | 4 ++++ include/envoy/network/connection_handler.h | 3 +++ include/envoy/network/dns.h | 5 +++++ include/envoy/network/filter.h | 2 ++ include/envoy/network/listen_socket.h | 2 ++ include/envoy/network/listener.h | 4 ++++ include/envoy/ratelimit/ratelimit.h | 5 +++++ include/envoy/redis/codec.h | 4 ++++ include/envoy/redis/command_splitter.h | 2 ++ include/envoy/redis/conn_pool.h | 4 ++++ include/envoy/router/rds.h | 2 ++ include/envoy/router/router.h | 8 ++++++++ include/envoy/router/router_ratelimit.h | 5 +++++ include/envoy/router/shadow_writer.h | 4 ++++ include/envoy/runtime/runtime.h | 4 ++++ include/envoy/server/admin.h | 3 +++ include/envoy/server/configuration.h | 7 +++++++ include/envoy/server/drain_manager.h | 2 ++ include/envoy/server/hot_restart.h | 3 +++ include/envoy/server/instance.h | 4 ++++ include/envoy/server/options.h | 6 ++++++ include/envoy/server/watchdog.h | 2 ++ include/envoy/ssl/connection.h | 2 ++ include/envoy/ssl/context.h | 3 +++ include/envoy/ssl/context_config.h | 3 +++ include/envoy/ssl/context_manager.h | 2 ++ include/envoy/stats/stats.h | 6 ++++++ include/envoy/stats/stats_macros.h | 2 ++ include/envoy/thread_local/thread_local.h | 4 ++++ include/envoy/tracing/context.h | 3 ++- include/envoy/tracing/http_tracer.h | 4 ++++ include/envoy/upstream/cluster_manager.h | 6 ++++++ include/envoy/upstream/health_checker.h | 3 +++ include/envoy/upstream/host_description.h | 3 +++ include/envoy/upstream/load_balancer.h | 3 +++ include/envoy/upstream/outlier_detection.h | 5 +++++ include/envoy/upstream/resource_manager.h | 2 ++ include/envoy/upstream/upstream.h | 8 ++++++++ source/common/access_log/access_log_manager_impl.cc | 2 ++ source/common/access_log/access_log_manager_impl.h | 3 +++ source/common/api/api_impl.cc | 3 +++ source/common/api/api_impl.h | 3 +++ source/common/buffer/buffer_impl.cc | 3 +++ source/common/buffer/buffer_impl.h | 3 +++ source/common/common/base64.cc | 3 +++ source/common/common/base64.h | 3 +++ source/common/common/c_smart_ptr.h | 2 ++ source/common/common/empty_string.h | 2 ++ source/common/common/enum_to_int.h | 2 ++ source/common/common/hex.cc | 6 ++++++ source/common/common/hex.h | 3 +++ source/common/common/linked_object.h | 3 +++ source/common/common/logger.cc | 7 +++++++ source/common/common/logger.h | 7 +++++++ source/common/common/thread.cc | 2 ++ source/common/common/thread.h | 4 ++++ source/common/common/utility.cc | 8 ++++++++ source/common/common/utility.h | 7 +++++++ source/common/common/version.cc | 4 ++++ source/common/common/version.h | 2 ++ source/common/dynamo/dynamo_filter.cc | 7 +++++++ source/common/dynamo/dynamo_filter.h | 3 +++ source/common/dynamo/dynamo_request_parser.cc | 4 ++++ source/common/dynamo/dynamo_request_parser.h | 4 ++++ source/common/dynamo/dynamo_utility.cc | 4 ++++ source/common/dynamo/dynamo_utility.h | 2 ++ source/common/event/dispatcher_impl.cc | 6 ++++++ source/common/event/dispatcher_impl.h | 6 ++++++ source/common/event/file_event_impl.cc | 2 ++ source/common/event/file_event_impl.h | 2 ++ source/common/event/libevent.cc | 2 ++ source/common/event/timer_impl.cc | 2 ++ source/common/event/timer_impl.h | 2 ++ source/common/filesystem/filesystem_impl.cc | 8 ++++++++ source/common/filesystem/filesystem_impl.h | 7 +++++++ source/common/filesystem/watcher_impl.cc | 4 ++++ source/common/filesystem/watcher_impl.h | 5 +++++ source/common/filter/auth/client_ssl.cc | 6 ++++++ source/common/filter/auth/client_ssl.h | 5 +++++ source/common/filter/ratelimit.cc | 5 +++++ source/common/filter/ratelimit.h | 5 +++++ source/common/filter/tcp_proxy.cc | 5 +++++ source/common/filter/tcp_proxy.h | 5 +++++ source/common/grpc/codec.cc | 4 ++++ source/common/grpc/codec.h | 4 ++++ source/common/grpc/common.cc | 6 ++++++ source/common/grpc/common.h | 3 +++ source/common/grpc/http1_bridge_filter.cc | 4 ++++ source/common/grpc/http1_bridge_filter.h | 2 ++ source/common/grpc/rpc_channel_impl.cc | 3 +++ source/common/grpc/rpc_channel_impl.h | 4 ++++ .../common/http/access_log/access_log_formatter.cc | 6 ++++++ .../common/http/access_log/access_log_formatter.h | 4 ++++ source/common/http/access_log/access_log_impl.cc | 3 +++ source/common/http/access_log/access_log_impl.h | 4 ++++ source/common/http/access_log/request_info_impl.h | 3 +++ source/common/http/async_client_impl.cc | 6 ++++++ source/common/http/async_client_impl.h | 9 +++++++++ source/common/http/codec_client.cc | 2 ++ source/common/http/codec_client.h | 4 ++++ source/common/http/codec_helper.h | 2 ++ source/common/http/codes.cc | 5 +++++ source/common/http/codes.h | 4 ++++ source/common/http/conn_manager_impl.cc | 8 ++++++++ source/common/http/conn_manager_impl.h | 8 ++++++++ source/common/http/conn_manager_utility.cc | 4 ++++ source/common/http/conn_manager_utility.h | 3 +++ source/common/http/date_provider_impl.cc | 3 +++ source/common/http/date_provider_impl.h | 3 +++ source/common/http/exception.h | 2 ++ source/common/http/filter/buffer_filter.cc | 2 ++ source/common/http/filter/buffer_filter.h | 5 +++++ source/common/http/filter/fault_filter.cc | 5 +++++ source/common/http/filter/fault_filter.h | 5 +++++ source/common/http/filter/ratelimit.cc | 5 +++++ source/common/http/filter/ratelimit.h | 5 +++++ source/common/http/header_map_impl.cc | 4 ++++ source/common/http/header_map_impl.h | 6 ++++++ source/common/http/headers.h | 2 ++ source/common/http/http1/codec_impl.cc | 5 +++++ source/common/http/http1/codec_impl.h | 6 ++++++ source/common/http/http1/conn_pool.cc | 3 +++ source/common/http/http1/conn_pool.h | 4 ++++ source/common/http/http2/codec_impl.cc | 6 ++++++ source/common/http/http2/codec_impl.h | 6 ++++++ source/common/http/http2/conn_pool.cc | 2 ++ source/common/http/http2/conn_pool.h | 4 ++++ source/common/http/message_impl.cc | 3 +++ source/common/http/message_impl.h | 2 ++ source/common/http/rest_api_fetcher.cc | 4 ++++ source/common/http/rest_api_fetcher.h | 3 +++ source/common/http/user_agent.cc | 3 +++ source/common/http/user_agent.h | 4 ++++ source/common/http/utility.cc | 6 ++++++ source/common/http/utility.h | 3 +++ source/common/json/config_schemas.cc | 2 ++ source/common/json/config_schemas.h | 2 ++ source/common/json/json_loader.cc | 7 +++++++ source/common/json/json_loader.h | 2 ++ source/common/json/json_validator.h | 2 ++ source/common/local_info/local_info_impl.h | 2 ++ source/common/memory/stats.cc | 2 ++ source/common/memory/stats.h | 2 ++ source/common/mongo/bson_impl.cc | 6 ++++++ source/common/mongo/bson_impl.h | 4 ++++ source/common/mongo/codec_impl.cc | 8 ++++++++ source/common/mongo/codec_impl.h | 5 +++++ source/common/mongo/proxy.cc | 6 ++++++ source/common/mongo/proxy.h | 6 ++++++ source/common/mongo/utility.cc | 2 ++ source/common/mongo/utility.h | 2 ++ source/common/network/address_impl.cc | 10 ++++++++++ source/common/network/address_impl.h | 7 +++++++ source/common/network/cidr_range.cc | 10 ++++++++++ source/common/network/cidr_range.h | 2 ++ source/common/network/connection_impl.cc | 8 ++++++++ source/common/network/connection_impl.h | 6 ++++++ source/common/network/dns_impl.cc | 10 ++++++++++ source/common/network/dns_impl.h | 6 ++++++ source/common/network/filter_manager_impl.cc | 2 ++ source/common/network/filter_manager_impl.h | 3 +++ source/common/network/listen_socket_impl.cc | 6 ++++++ source/common/network/listen_socket_impl.h | 5 +++++ source/common/network/listener_impl.cc | 3 +++ source/common/network/proxy_protocol.cc | 6 ++++++ source/common/network/proxy_protocol.h | 4 ++++ source/common/network/utility.cc | 10 ++++++++++ source/common/network/utility.h | 5 +++++ source/common/profiler/profiler.cc | 2 ++ source/common/profiler/profiler.h | 2 ++ source/common/ratelimit/ratelimit_impl.cc | 7 +++++++ source/common/ratelimit/ratelimit_impl.h | 5 +++++ source/common/redis/codec_impl.cc | 6 ++++++ source/common/redis/codec_impl.h | 5 +++++ source/common/redis/command_splitter_impl.cc | 7 +++++++ source/common/redis/command_splitter_impl.h | 5 +++++ source/common/redis/conn_pool_impl.cc | 5 +++++ source/common/redis/conn_pool_impl.h | 8 ++++++++ source/common/redis/proxy_filter.cc | 5 +++++ source/common/redis/proxy_filter.h | 5 +++++ source/common/router/config_impl.cc | 10 ++++++++++ source/common/router/config_impl.h | 10 ++++++++++ source/common/router/config_utility.cc | 4 ++++ source/common/router/config_utility.h | 4 ++++ source/common/router/rds_impl.cc | 7 +++++++ source/common/router/rds_impl.h | 4 ++++ source/common/router/retry_state_impl.cc | 5 +++++ source/common/router/retry_state_impl.h | 3 +++ source/common/router/router.cc | 4 ++++ source/common/router/router.h | 5 +++++ source/common/router/router_ratelimit.cc | 5 +++++ source/common/router/router_ratelimit.h | 5 +++++ source/common/router/shadow_writer_impl.cc | 3 +++ source/common/router/shadow_writer_impl.h | 3 +++ source/common/runtime/runtime_impl.cc | 4 ++++ source/common/runtime/runtime_impl.h | 7 +++++++ source/common/runtime/uuid_util.cc | 3 +++ source/common/runtime/uuid_util.h | 2 ++ source/common/ssl/connection_impl.cc | 4 ++++ source/common/ssl/connection_impl.h | 3 +++ source/common/ssl/context_config_impl.cc | 2 ++ source/common/ssl/context_config_impl.h | 3 +++ source/common/ssl/context_impl.cc | 7 +++++++ source/common/ssl/context_impl.h | 3 +++ source/common/ssl/context_manager_impl.cc | 3 +++ source/common/ssl/context_manager_impl.h | 4 ++++ source/common/ssl/openssl.cc | 3 +++ source/common/ssl/openssl.h | 3 +++ source/common/stats/stats_impl.cc | 5 +++++ source/common/stats/stats_impl.h | 9 +++++++++ source/common/stats/statsd.cc | 6 ++++++ source/common/stats/statsd.h | 4 ++++ source/common/stats/thread_local_store.cc | 8 ++++++++ source/common/stats/thread_local_store.h | 9 +++++++++ source/common/thread_local/thread_local_impl.cc | 4 ++++ source/common/thread_local/thread_local_impl.h | 5 +++++ source/common/tracing/http_tracer_impl.cc | 4 ++++ source/common/tracing/http_tracer_impl.h | 2 ++ source/common/tracing/lightstep_tracer_impl.cc | 7 +++++++ source/common/tracing/lightstep_tracer_impl.h | 4 ++++ source/common/upstream/cds_api_impl.cc | 6 ++++++ source/common/upstream/cds_api_impl.h | 2 ++ source/common/upstream/cluster_manager_impl.cc | 9 +++++++++ source/common/upstream/cluster_manager_impl.h | 9 +++++++++ source/common/upstream/health_checker_impl.cc | 5 +++++ source/common/upstream/health_checker_impl.h | 8 ++++++++ source/common/upstream/host_utility.cc | 2 ++ source/common/upstream/host_utility.h | 2 ++ source/common/upstream/load_balancer_impl.cc | 4 ++++ source/common/upstream/load_balancer_impl.h | 3 +++ source/common/upstream/logical_dns_cluster.cc | 5 +++++ source/common/upstream/logical_dns_cluster.h | 5 +++++ source/common/upstream/outlier_detection_impl.cc | 8 ++++++++ source/common/upstream/outlier_detection_impl.h | 9 +++++++++ source/common/upstream/resource_manager_impl.h | 5 +++++ source/common/upstream/ring_hash_lb.cc | 4 ++++ source/common/upstream/ring_hash_lb.h | 3 +++ source/common/upstream/sds.cc | 4 ++++ source/common/upstream/sds.h | 3 +++ source/common/upstream/upstream_impl.cc | 10 ++++++++++ source/common/upstream/upstream_impl.h | 10 ++++++++++ source/exe/hot_restart.cc | 8 ++++++++ source/exe/hot_restart.h | 5 +++++ source/exe/main.cc | 5 +++++ source/precompiled/BUILD | 11 +---------- source/server/config/http/buffer.cc | 4 ++++ source/server/config/http/buffer.h | 2 ++ source/server/config/http/dynamo.cc | 2 ++ source/server/config/http/dynamo.h | 2 ++ source/server/config/http/fault.cc | 2 ++ source/server/config/http/fault.h | 2 ++ source/server/config/http/grpc_http1_bridge.cc | 2 ++ source/server/config/http/grpc_http1_bridge.h | 2 ++ source/server/config/http/ratelimit.cc | 3 +++ source/server/config/http/ratelimit.h | 2 ++ source/server/config/http/router.cc | 2 ++ source/server/config/http/router.h | 2 ++ source/server/config/network/client_ssl_auth.cc | 2 ++ source/server/config/network/client_ssl_auth.h | 2 ++ source/server/config/network/echo.cc | 2 ++ .../config/network/http_connection_manager.cc | 7 +++++++ .../server/config/network/http_connection_manager.h | 6 ++++++ source/server/config/network/mongo_proxy.cc | 2 ++ source/server/config/network/mongo_proxy.h | 2 ++ source/server/config/network/ratelimit.cc | 3 +++ source/server/config/network/ratelimit.h | 2 ++ source/server/config/network/redis_proxy.cc | 3 +++ source/server/config/network/redis_proxy.h | 2 ++ source/server/config/network/tcp_proxy.cc | 2 ++ source/server/config/network/tcp_proxy.h | 2 ++ source/server/configuration_impl.cc | 8 ++++++++ source/server/configuration_impl.h | 7 +++++++ source/server/connection_handler_impl.cc | 2 ++ source/server/connection_handler_impl.h | 7 +++++++ source/server/drain_manager_impl.cc | 3 +++ source/server/drain_manager_impl.h | 2 ++ source/server/guarddog_impl.cc | 5 +++++ source/server/guarddog_impl.h | 5 +++++ source/server/http/admin.cc | 6 ++++++ source/server/http/admin.h | 4 ++++ source/server/http/health_check.cc | 3 +++ source/server/http/health_check.h | 5 +++++ source/server/options_impl.cc | 7 +++++++ source/server/options_impl.h | 6 ++++++ source/server/server.cc | 7 +++++++ source/server/server.h | 7 +++++++ source/server/watchdog_impl.h | 3 +++ source/server/worker.cc | 2 ++ source/server/worker.h | 3 +++ test/BUILD | 1 - .../access_log/access_log_manager_impl_test.cc | 5 +++++ test/common/api/api_impl_test.cc | 6 ++++++ test/common/common/base64_test.cc | 6 ++++++ test/common/common/hex_test.cc | 5 +++++ test/common/common/optional_test.cc | 2 ++ test/common/common/utility_test.cc | 7 +++++++ test/common/dynamo/dynamo_filter_test.cc | 7 +++++++ test/common/dynamo/dynamo_request_parser_test.cc | 6 ++++++ test/common/dynamo/dynamo_utility_test.cc | 5 +++++ test/common/event/dispatcher_impl_test.cc | 5 +++++ test/common/event/file_event_impl_test.cc | 4 ++++ test/common/filesystem/filesystem_impl_test.cc | 7 +++++++ test/common/filesystem/watcher_impl_test.cc | 6 ++++++ test/common/filter/auth/client_ssl_test.cc | 8 ++++++++ test/common/filter/ratelimit_test.cc | 8 ++++++++ test/common/filter/tcp_proxy_test.cc | 8 ++++++++ test/common/grpc/codec_test.cc | 9 +++++++++ test/common/grpc/common_test.cc | 2 ++ test/common/grpc/http1_bridge_filter_test.cc | 4 ++++ test/common/grpc/rpc_channel_impl_test.cc | 9 +++++++++ .../http/access_log/access_log_formatter_test.cc | 9 +++++++++ test/common/http/access_log/access_log_impl_test.cc | 9 +++++++++ test/common/http/async_client_impl_test.cc | 8 ++++++++ test/common/http/codec_client_test.cc | 6 ++++++ test/common/http/codes_test.cc | 9 +++++++++ test/common/http/common.cc | 2 ++ test/common/http/common.h | 2 ++ test/common/http/conn_manager_impl_test.cc | 10 ++++++++++ test/common/http/conn_manager_utility_test.cc | 6 ++++++ test/common/http/date_provider_impl_test.cc | 6 ++++++ test/common/http/filter/buffer_filter_test.cc | 7 +++++++ test/common/http/filter/fault_filter_test.cc | 9 +++++++++ test/common/http/filter/ratelimit_test.cc | 8 ++++++++ test/common/http/header_map_impl_test.cc | 5 +++++ test/common/http/http1/codec_impl_test.cc | 6 ++++++ test/common/http/http1/conn_pool_test.cc | 7 +++++++ test/common/http/http2/codec_impl_test.cc | 7 +++++++ test/common/http/http2/conn_pool_test.cc | 8 ++++++++ test/common/http/user_agent_test.cc | 3 +++ test/common/http/utility_test.cc | 8 ++++++++ test/common/json/config_schemas_test.cc | 8 ++++++++ test/common/json/json_loader_test.cc | 5 +++++ test/common/mongo/bson_impl_test.cc | 6 ++++++ test/common/mongo/codec_impl_test.cc | 7 +++++++ test/common/mongo/proxy_test.cc | 9 +++++++++ test/common/mongo/utility_test.cc | 4 ++++ test/common/network/address_impl_test.cc | 7 +++++++ test/common/network/cidr_range_test.cc | 6 ++++++ test/common/network/connection_impl_test.cc | 8 ++++++++ test/common/network/dns_impl_test.cc | 9 +++++++++ test/common/network/filter_manager_impl_test.cc | 7 +++++++ test/common/network/listen_socket_impl_test.cc | 2 ++ test/common/network/listener_impl_test.cc | 3 +++ test/common/network/proxy_protocol_test.cc | 7 +++++++ test/common/network/utility_test.cc | 6 ++++++ test/common/ratelimit/ratelimit_impl_test.cc | 8 ++++++++ test/common/redis/codec_impl_test.cc | 5 +++++ test/common/redis/command_splitter_impl_test.cc | 9 +++++++++ test/common/redis/conn_pool_impl_test.cc | 7 +++++++ test/common/redis/proxy_filter_test.cc | 7 +++++++ test/common/router/config_impl_test.cc | 10 ++++++++++ test/common/router/rds_impl_test.cc | 7 +++++++ test/common/router/retry_state_impl_test.cc | 6 ++++++ test/common/router/router_ratelimit_test.cc | 8 ++++++++ test/common/router/router_test.cc | 8 ++++++++ test/common/router/shadow_writer_impl_test.cc | 6 ++++++ test/common/runtime/runtime_impl_test.cc | 6 ++++++ test/common/runtime/uuid_util_test.cc | 4 ++++ test/common/ssl/connection_impl_test.cc | 8 ++++++++ test/common/ssl/context_impl_test.cc | 5 +++++ test/common/ssl/ssl_certs_test.h | 2 ++ test/common/stats/stats_impl_test.cc | 4 ++++ test/common/stats/statsd_test.cc | 6 ++++++ test/common/stats/thread_local_store_test.cc | 8 ++++++++ test/common/tracing/http_tracer_impl_test.cc | 8 ++++++++ test/common/tracing/lightstep_tracer_impl_test.cc | 8 ++++++++ test/common/upstream/cds_api_impl_test.cc | 8 ++++++++ test/common/upstream/cluster_manager_impl_test.cc | 6 ++++++ test/common/upstream/health_checker_impl_test.cc | 9 +++++++++ test/common/upstream/host_utility_test.cc | 2 ++ test/common/upstream/load_balancer_impl_test.cc | 8 ++++++++ .../upstream/load_balancer_simulation_test.cc | 9 +++++++++ test/common/upstream/logical_dns_cluster_test.cc | 8 ++++++++ test/common/upstream/outlier_detection_impl_test.cc | 9 +++++++++ test/common/upstream/resource_manager_impl_test.cc | 3 +++ test/common/upstream/ring_hash_lb_test.cc | 6 ++++++ test/common/upstream/sds_test.cc | 10 ++++++++++ test/common/upstream/upstream_impl_test.cc | 9 +++++++++ test/config_test/config_test.cc | 8 ++++++++ test/config_test/config_test.h | 3 +++ test/config_test/example_configs_test.cc | 2 ++ test/integration/fake_upstream.cc | 7 +++++++ test/integration/fake_upstream.h | 8 ++++++++ test/integration/http2_integration_test.cc | 5 +++++ test/integration/http2_integration_test.h | 2 ++ test/integration/http2_upstream_integration_test.cc | 3 +++ test/integration/http2_upstream_integration_test.h | 2 ++ test/integration/integration.cc | 13 +++++++++++++ test/integration/integration.h | 10 ++++++++++ test/integration/integration_admin_test.cc | 4 ++++ test/integration/integration_test.cc | 5 +++++ test/integration/integration_test.h | 2 ++ test/integration/proxy_proto_integration_test.cc | 4 ++++ test/integration/proxy_proto_integration_test.h | 2 ++ test/integration/server.cc | 4 ++++ test/integration/server.h | 9 +++++++++ test/integration/ssl_integration_test.cc | 5 +++++ test/integration/ssl_integration_test.h | 6 ++++++ test/integration/uds_integration_test.cc | 2 ++ test/integration/uds_integration_test.h | 2 ++ test/integration/utility.cc | 8 ++++++++ test/integration/utility.h | 7 +++++++ test/mocks/access_log/mocks.cc | 3 +++ test/mocks/access_log/mocks.h | 5 +++++ test/mocks/api/mocks.cc | 3 +++ test/mocks/api/mocks.h | 5 +++++ test/mocks/buffer/mocks.h | 3 +++ test/mocks/common.h | 2 +- test/mocks/event/mocks.cc | 3 +++ test/mocks/event/mocks.h | 7 +++++++ test/mocks/filesystem/mocks.cc | 2 ++ test/mocks/filesystem/mocks.h | 6 ++++++ test/mocks/grpc/mocks.h | 5 +++++ test/mocks/http/mocks.cc | 3 +++ test/mocks/http/mocks.h | 10 ++++++++++ test/mocks/init/mocks.cc | 5 +++++ test/mocks/init/mocks.h | 5 +++++ test/mocks/local_info/mocks.cc | 3 +++ test/mocks/local_info/mocks.h | 4 ++++ test/mocks/network/mocks.cc | 7 +++++++ test/mocks/network/mocks.h | 7 +++++++ test/mocks/ratelimit/mocks.h | 5 +++++ test/mocks/redis/mocks.cc | 7 +++++++ test/mocks/redis/mocks.h | 8 ++++++++ test/mocks/router/mocks.cc | 5 +++++ test/mocks/router/mocks.h | 10 ++++++++++ test/mocks/runtime/mocks.cc | 3 +++ test/mocks/runtime/mocks.h | 5 +++++ test/mocks/server/mocks.cc | 5 +++++ test/mocks/server/mocks.h | 10 ++++++++++ test/mocks/ssl/mocks.h | 5 +++++ test/mocks/stats/mocks.cc | 3 +++ test/mocks/stats/mocks.h | 7 +++++++ test/mocks/thread_local/mocks.cc | 3 +++ test/mocks/thread_local/mocks.h | 5 +++++ test/mocks/tracing/mocks.cc | 3 +++ test/mocks/tracing/mocks.h | 5 +++++ test/mocks/upstream/cluster_info.h | 8 ++++++++ test/mocks/upstream/host.h | 7 +++++++ test/mocks/upstream/mocks.cc | 6 ++++++ test/mocks/upstream/mocks.h | 8 ++++++++ test/precompiled/BUILD | 13 +------------ test/server/config/http/config_test.cc | 5 +++++ test/server/config/network/config_test.cc | 5 +++++ .../config/network/http_connection_manager_test.cc | 4 ++++ test/server/configuration_impl_test.cc | 7 +++++++ test/server/connection_handler_test.cc | 3 +++ test/server/drain_manager_impl_test.cc | 5 +++++ test/server/guarddog_impl_test.cc | 7 +++++++ test/server/http/admin_test.cc | 4 ++++ test/server/http/health_check_test.cc | 7 +++++++ test/server/options_impl_test.cc | 9 +++++++++ test/server/server_test.cc | 3 +++ test/test_common/environment.cc | 11 +++++++++++ test/test_common/environment.h | 5 +++++ test/test_common/network_utility.cc | 7 +++++++ test/test_common/network_utility.h | 2 ++ test/test_common/network_utility_test.cc | 4 ++++ test/test_common/printers.cc | 3 +++ test/test_common/printers.h | 5 +++++ test/test_common/utility.cc | 13 +++++++++++++ test/test_common/utility.h | 10 ++++++++++ test/tools/router_check/json/tool_config_schemas.cc | 2 ++ test/tools/router_check/json/tool_config_schemas.h | 2 ++ test/tools/router_check/router.cc | 7 +++++++ test/tools/router_check/router.h | 4 ++++ test/tools/router_check/router_check.cc | 3 +++ 495 files changed, 2396 insertions(+), 34 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a76a1fb39a073..fe7c8d0344f46 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,7 @@ set(CMAKE_EXE_LINKER_FLAGS "-Wl,--build-id=0x${GIT_COMMIT} -static-libstdc++ -st include_directories(${PROJECT_SOURCE_DIR}/include) include_directories(${PROJECT_BINARY_DIR}/source) include_directories(${PROJECT_SOURCE_DIR}/source) -include_directories(${ENVOY_SPDLOG_INCLUDE_DIR}) +include_directories(SYSTEM ${ENVOY_SPDLOG_INCLUDE_DIR}) include_directories(SYSTEM ${ENVOY_PROTOBUF_INCLUDE_DIR}) add_subdirectory(source) diff --git a/bazel/envoy_build_system.bzl b/bazel/envoy_build_system.bzl index 2b1e1938fc8fa..7432dd6dcfda0 100644 --- a/bazel/envoy_build_system.bzl +++ b/bazel/envoy_build_system.bzl @@ -12,7 +12,6 @@ def envoy_copts(repository): "-Woverloaded-virtual", "-Wold-style-cast", "-std=c++0x", - "-includeprecompiled/precompiled.h", ] + select({ # Bazel adds an implicit -DNDEBUG for opt. repository + "//bazel:opt_build": [], @@ -75,7 +74,7 @@ def envoy_cc_library(name, visibility = visibility, deps = deps + [envoy_external_dep_path(dep) for dep in external_deps] + [ repository + "//include/envoy/common:base_includes", - repository + "//source/precompiled:precompiled_includes", + envoy_external_dep_path('spdlog'), ], include_prefix = envoy_include_prefix(PACKAGE_NAME), alwayslink = 1, @@ -142,9 +141,7 @@ def envoy_cc_binary(name, malloc = tcmalloc_external_dep(repository), # See above comment on MD5 hash. stamp = 0, - deps = deps + [ - repository + "//source/precompiled:precompiled_includes", - ], + deps = deps, ) # Envoy C++ test targets should be specified with this function. @@ -197,11 +194,11 @@ def envoy_cc_test_library(name, srcs = srcs, hdrs = hdrs, data = data, - copts = envoy_copts(repository) + ["-includetest/precompiled/precompiled_test.h"], + copts = envoy_copts(repository), testonly = 1, deps = deps + [envoy_external_dep_path(dep) for dep in external_deps] + [ - repository + "//source/precompiled:precompiled_includes", - repository + "//test/precompiled:precompiled_includes", + envoy_external_dep_path('googletest'), + repository + "//test/test_common:printers_includes", ], tags = tags, alwayslink = 1, diff --git a/bazel/gen_sh_test_runner.sh b/bazel/gen_sh_test_runner.sh index f8de5f00af7cd..2386ce0453f41 100755 --- a/bazel/gen_sh_test_runner.sh +++ b/bazel/gen_sh_test_runner.sh @@ -18,6 +18,8 @@ done cat << EOF #include "test/test_common/environment.h" +#include "gtest/gtest.h" + TEST(ShTest, ${TEST_NAME}) { TestEnvironment::exec({${EXEC_ARGS}}); } diff --git a/include/envoy/access_log/access_log.h b/include/envoy/access_log/access_log.h index b83b370c3f212..f7fba6eddb44f 100644 --- a/include/envoy/access_log/access_log.h +++ b/include/envoy/access_log/access_log.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + #include "envoy/common/pure.h" #include "envoy/filesystem/filesystem.h" diff --git a/include/envoy/api/api.h b/include/envoy/api/api.h index dda965ca087c9..41b852ebb1e66 100644 --- a/include/envoy/api/api.h +++ b/include/envoy/api/api.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + #include "envoy/event/dispatcher.h" #include "envoy/filesystem/filesystem.h" #include "envoy/thread/thread.h" diff --git a/include/envoy/buffer/buffer.h b/include/envoy/buffer/buffer.h index a874168b1d930..42ab1cacd8cd0 100644 --- a/include/envoy/buffer/buffer.h +++ b/include/envoy/buffer/buffer.h @@ -1,5 +1,9 @@ #pragma once +#include +#include +#include + #include "envoy/common/pure.h" namespace Buffer { diff --git a/include/envoy/common/exception.h b/include/envoy/common/exception.h index ebd7a2123d580..04f889aed146f 100644 --- a/include/envoy/common/exception.h +++ b/include/envoy/common/exception.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + /** * Base class for all envoy exceptions. */ diff --git a/include/envoy/common/time.h b/include/envoy/common/time.h index c9e298e115160..b4529173654b9 100644 --- a/include/envoy/common/time.h +++ b/include/envoy/common/time.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "envoy/common/pure.h" /** diff --git a/include/envoy/event/deferred_deletable.h b/include/envoy/event/deferred_deletable.h index fe5723a9d1ca4..9c00f6026b1a1 100644 --- a/include/envoy/event/deferred_deletable.h +++ b/include/envoy/event/deferred_deletable.h @@ -1,5 +1,7 @@ #pragma once +#include + namespace Event { /** diff --git a/include/envoy/event/dispatcher.h b/include/envoy/event/dispatcher.h index ea0d1b6e4a521..7fa04959fd892 100644 --- a/include/envoy/event/dispatcher.h +++ b/include/envoy/event/dispatcher.h @@ -1,5 +1,9 @@ #pragma once +#include +#include +#include + #include "envoy/event/file_event.h" #include "envoy/event/signal.h" #include "envoy/event/timer.h" diff --git a/include/envoy/event/file_event.h b/include/envoy/event/file_event.h index 93ef3869b62b0..67af608156856 100644 --- a/include/envoy/event/file_event.h +++ b/include/envoy/event/file_event.h @@ -1,5 +1,9 @@ #pragma once +#include +#include +#include + #include "envoy/common/pure.h" namespace Event { diff --git a/include/envoy/event/signal.h b/include/envoy/event/signal.h index aff802817e5e4..253740d484731 100644 --- a/include/envoy/event/signal.h +++ b/include/envoy/event/signal.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + namespace Event { /** diff --git a/include/envoy/event/timer.h b/include/envoy/event/timer.h index 510e4ef62f4f9..2f723ddbf137c 100644 --- a/include/envoy/event/timer.h +++ b/include/envoy/event/timer.h @@ -1,5 +1,9 @@ #pragma once +#include +#include +#include + #include "envoy/common/pure.h" namespace Event { diff --git a/include/envoy/filesystem/filesystem.h b/include/envoy/filesystem/filesystem.h index 28d8781d280b2..8c16ddfcf63b6 100644 --- a/include/envoy/filesystem/filesystem.h +++ b/include/envoy/filesystem/filesystem.h @@ -1,5 +1,10 @@ #pragma once +#include +#include +#include +#include + #include "envoy/common/pure.h" namespace Filesystem { diff --git a/include/envoy/grpc/rpc_channel.h b/include/envoy/grpc/rpc_channel.h index ef6a2b269f5aa..a0b1775fccdf4 100644 --- a/include/envoy/grpc/rpc_channel.h +++ b/include/envoy/grpc/rpc_channel.h @@ -1,5 +1,10 @@ #pragma once +#include +#include +#include +#include + #include "envoy/common/optional.h" #include "envoy/common/pure.h" #include "envoy/http/header_map.h" diff --git a/include/envoy/http/access_log.h b/include/envoy/http/access_log.h index 968b56a6fd986..47e28ff7ffffd 100644 --- a/include/envoy/http/access_log.h +++ b/include/envoy/http/access_log.h @@ -1,5 +1,10 @@ #pragma once +#include +#include +#include +#include + #include "envoy/common/optional.h" #include "envoy/common/pure.h" #include "envoy/common/time.h" diff --git a/include/envoy/http/async_client.h b/include/envoy/http/async_client.h index 964301f09568c..5e04c0b311d6d 100644 --- a/include/envoy/http/async_client.h +++ b/include/envoy/http/async_client.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + #include "envoy/common/optional.h" #include "envoy/http/message.h" diff --git a/include/envoy/http/codec.h b/include/envoy/http/codec.h index 78d0a772cbc5b..a5b29cc6bd2e9 100644 --- a/include/envoy/http/codec.h +++ b/include/envoy/http/codec.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + #include "envoy/buffer/buffer.h" #include "envoy/common/pure.h" #include "envoy/http/header_map.h" diff --git a/include/envoy/http/conn_pool.h b/include/envoy/http/conn_pool.h index 7f9b5bb79de20..dbe4d6e95a605 100644 --- a/include/envoy/http/conn_pool.h +++ b/include/envoy/http/conn_pool.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + #include "envoy/common/pure.h" #include "envoy/event/deferred_deletable.h" #include "envoy/http/codec.h" diff --git a/include/envoy/http/filter.h b/include/envoy/http/filter.h index fdd20827f7987..038f28336ac81 100644 --- a/include/envoy/http/filter.h +++ b/include/envoy/http/filter.h @@ -1,5 +1,10 @@ #pragma once +#include +#include +#include +#include + #include "envoy/event/dispatcher.h" #include "envoy/http/access_log.h" #include "envoy/http/codec.h" diff --git a/include/envoy/http/header_map.h b/include/envoy/http/header_map.h index 42658f2c87ad5..447853f8a1248 100644 --- a/include/envoy/http/header_map.h +++ b/include/envoy/http/header_map.h @@ -1,5 +1,12 @@ #pragma once +#include + +#include +#include +#include +#include + #include "envoy/common/pure.h" namespace Http { diff --git a/include/envoy/http/message.h b/include/envoy/http/message.h index c53eb9f939857..0f943391c0bcb 100644 --- a/include/envoy/http/message.h +++ b/include/envoy/http/message.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + #include "envoy/buffer/buffer.h" #include "envoy/http/header_map.h" diff --git a/include/envoy/init/init.h b/include/envoy/init/init.h index 1db3957bafd29..f11b22a735279 100644 --- a/include/envoy/init/init.h +++ b/include/envoy/init/init.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "envoy/common/pure.h" namespace Init { diff --git a/include/envoy/json/json_object.h b/include/envoy/json/json_object.h index e4daf77eb7089..265903c11abd4 100644 --- a/include/envoy/json/json_object.h +++ b/include/envoy/json/json_object.h @@ -1,5 +1,11 @@ #pragma once +#include +#include +#include +#include +#include + #include "envoy/common/exception.h" #include "envoy/common/pure.h" diff --git a/include/envoy/local_info/local_info.h b/include/envoy/local_info/local_info.h index 8bebb644dbbdc..1874c03acc5cd 100644 --- a/include/envoy/local_info/local_info.h +++ b/include/envoy/local_info/local_info.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "envoy/common/pure.h" #include "envoy/network/address.h" diff --git a/include/envoy/mongo/bson.h b/include/envoy/mongo/bson.h index 8216740bf2cda..2273dfd148c75 100644 --- a/include/envoy/mongo/bson.h +++ b/include/envoy/mongo/bson.h @@ -1,5 +1,10 @@ #pragma once +#include +#include +#include +#include + #include "envoy/buffer/buffer.h" #include "envoy/common/pure.h" diff --git a/include/envoy/mongo/codec.h b/include/envoy/mongo/codec.h index 06bcb305c2af7..eb71914e1b9eb 100644 --- a/include/envoy/mongo/codec.h +++ b/include/envoy/mongo/codec.h @@ -1,5 +1,10 @@ #pragma once +#include +#include +#include +#include + #include "envoy/mongo/bson.h" /** diff --git a/include/envoy/network/address.h b/include/envoy/network/address.h index 7fd166f2fb609..0cfda90be5433 100644 --- a/include/envoy/network/address.h +++ b/include/envoy/network/address.h @@ -1,5 +1,13 @@ #pragma once +#include +#include + +#include +#include +#include +#include + #include "envoy/common/pure.h" namespace Network { diff --git a/include/envoy/network/connection.h b/include/envoy/network/connection.h index f209822605c63..2d3d0cc8d329a 100644 --- a/include/envoy/network/connection.h +++ b/include/envoy/network/connection.h @@ -1,5 +1,9 @@ #pragma once +#include +#include +#include + #include "envoy/buffer/buffer.h" #include "envoy/common/pure.h" #include "envoy/event/deferred_deletable.h" diff --git a/include/envoy/network/connection_handler.h b/include/envoy/network/connection_handler.h index 21c7c8da96c8d..3671731fcbf0b 100644 --- a/include/envoy/network/connection_handler.h +++ b/include/envoy/network/connection_handler.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + #include "envoy/network/connection.h" #include "envoy/network/filter.h" #include "envoy/network/listen_socket.h" diff --git a/include/envoy/network/dns.h b/include/envoy/network/dns.h index 88c00598576c9..c486b8acfaff1 100644 --- a/include/envoy/network/dns.h +++ b/include/envoy/network/dns.h @@ -1,5 +1,10 @@ #pragma once +#include +#include +#include +#include + #include "envoy/common/pure.h" #include "envoy/network/address.h" diff --git a/include/envoy/network/filter.h b/include/envoy/network/filter.h index ff53637b804bc..59a4b675018fc 100644 --- a/include/envoy/network/filter.h +++ b/include/envoy/network/filter.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "envoy/buffer/buffer.h" #include "envoy/upstream/host_description.h" diff --git a/include/envoy/network/listen_socket.h b/include/envoy/network/listen_socket.h index ecead9404ba63..a5c941b479863 100644 --- a/include/envoy/network/listen_socket.h +++ b/include/envoy/network/listen_socket.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "envoy/common/pure.h" #include "envoy/network/address.h" diff --git a/include/envoy/network/listener.h b/include/envoy/network/listener.h index c77c3966fdb19..c30ccb3dd1e5c 100644 --- a/include/envoy/network/listener.h +++ b/include/envoy/network/listener.h @@ -1,5 +1,9 @@ #pragma once +#include +#include +#include + #include "envoy/common/exception.h" #include "envoy/network/connection.h" diff --git a/include/envoy/ratelimit/ratelimit.h b/include/envoy/ratelimit/ratelimit.h index aac36f916d35e..f360766c0a3ce 100644 --- a/include/envoy/ratelimit/ratelimit.h +++ b/include/envoy/ratelimit/ratelimit.h @@ -1,5 +1,10 @@ #pragma once +#include +#include +#include +#include + #include "envoy/common/optional.h" #include "envoy/common/pure.h" #include "envoy/tracing/context.h" diff --git a/include/envoy/redis/codec.h b/include/envoy/redis/codec.h index c4ca0cd3560bd..760c552f8a6fd 100644 --- a/include/envoy/redis/codec.h +++ b/include/envoy/redis/codec.h @@ -1,5 +1,9 @@ #pragma once +#include +#include +#include + #include "envoy/buffer/buffer.h" #include "envoy/common/exception.h" diff --git a/include/envoy/redis/command_splitter.h b/include/envoy/redis/command_splitter.h index 8fae618cb3df5..8756422e7c2c6 100644 --- a/include/envoy/redis/command_splitter.h +++ b/include/envoy/redis/command_splitter.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "envoy/common/pure.h" #include "envoy/redis/codec.h" diff --git a/include/envoy/redis/conn_pool.h b/include/envoy/redis/conn_pool.h index b4fc2b7498108..45d578db04880 100644 --- a/include/envoy/redis/conn_pool.h +++ b/include/envoy/redis/conn_pool.h @@ -1,5 +1,9 @@ #pragma once +#include +#include +#include + #include "envoy/redis/codec.h" #include "envoy/upstream/cluster_manager.h" diff --git a/include/envoy/router/rds.h b/include/envoy/router/rds.h index 5531b50190e44..258c56dafab33 100644 --- a/include/envoy/router/rds.h +++ b/include/envoy/router/rds.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "envoy/router/router.h" namespace Router { diff --git a/include/envoy/router/router.h b/include/envoy/router/router.h index a86604fe5c86d..229f9b5ea654a 100644 --- a/include/envoy/router/router.h +++ b/include/envoy/router/router.h @@ -1,5 +1,13 @@ #pragma once +#include +#include +#include +#include +#include +#include +#include + #include "envoy/common/optional.h" #include "envoy/http/codec.h" #include "envoy/http/header_map.h" diff --git a/include/envoy/router/router_ratelimit.h b/include/envoy/router/router_ratelimit.h index 4fcd0f2f3a138..cbdfa0c8fbb44 100644 --- a/include/envoy/router/router_ratelimit.h +++ b/include/envoy/router/router_ratelimit.h @@ -1,5 +1,10 @@ #pragma once +#include +#include +#include +#include + #include "envoy/http/filter.h" #include "envoy/http/header_map.h" #include "envoy/ratelimit/ratelimit.h" diff --git a/include/envoy/router/shadow_writer.h b/include/envoy/router/shadow_writer.h index 36fddddaaffce..65972386cf50a 100644 --- a/include/envoy/router/shadow_writer.h +++ b/include/envoy/router/shadow_writer.h @@ -1,5 +1,9 @@ #pragma once +#include +#include +#include + #include "envoy/http/message.h" namespace Router { diff --git a/include/envoy/runtime/runtime.h b/include/envoy/runtime/runtime.h index c846de7f0972d..2051897a604ee 100644 --- a/include/envoy/runtime/runtime.h +++ b/include/envoy/runtime/runtime.h @@ -1,5 +1,9 @@ #pragma once +#include +#include +#include + #include "envoy/common/pure.h" namespace Runtime { diff --git a/include/envoy/server/admin.h b/include/envoy/server/admin.h index a54e69e41ac50..f8fe5f23f75c8 100644 --- a/include/envoy/server/admin.h +++ b/include/envoy/server/admin.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + #include "envoy/buffer/buffer.h" #include "envoy/common/pure.h" #include "envoy/http/codes.h" diff --git a/include/envoy/server/configuration.h b/include/envoy/server/configuration.h index fcbe973e90b8a..0ba41da122b69 100644 --- a/include/envoy/server/configuration.h +++ b/include/envoy/server/configuration.h @@ -1,5 +1,12 @@ #pragma once +#include +#include +#include +#include +#include +#include + #include "envoy/common/optional.h" #include "envoy/ratelimit/ratelimit.h" #include "envoy/ssl/context.h" diff --git a/include/envoy/server/drain_manager.h b/include/envoy/server/drain_manager.h index 3952145e2b17e..6f3439927d564 100644 --- a/include/envoy/server/drain_manager.h +++ b/include/envoy/server/drain_manager.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "envoy/network/drain_decision.h" namespace Server { diff --git a/include/envoy/server/hot_restart.h b/include/envoy/server/hot_restart.h index a1d80b2967279..3624dfdfa2215 100644 --- a/include/envoy/server/hot_restart.h +++ b/include/envoy/server/hot_restart.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + #include "envoy/common/pure.h" #include "envoy/event/dispatcher.h" diff --git a/include/envoy/server/instance.h b/include/envoy/server/instance.h index 92691a62111a6..25df0b5a68907 100644 --- a/include/envoy/server/instance.h +++ b/include/envoy/server/instance.h @@ -1,5 +1,9 @@ #pragma once +#include +#include +#include + #include "envoy/access_log/access_log.h" #include "envoy/api/api.h" #include "envoy/init/init.h" diff --git a/include/envoy/server/options.h b/include/envoy/server/options.h index 11f0631273989..d3939310b8dfe 100644 --- a/include/envoy/server/options.h +++ b/include/envoy/server/options.h @@ -1,5 +1,11 @@ #pragma once +#include + +#include +#include +#include + #include "envoy/common/pure.h" namespace Server { diff --git a/include/envoy/server/watchdog.h b/include/envoy/server/watchdog.h index 91ec25ccaf1ee..8ab5868fc076f 100644 --- a/include/envoy/server/watchdog.h +++ b/include/envoy/server/watchdog.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "envoy/common/pure.h" #include "envoy/event/dispatcher.h" diff --git a/include/envoy/ssl/connection.h b/include/envoy/ssl/connection.h index edf37c54c260f..e2e32791f3da3 100644 --- a/include/envoy/ssl/connection.h +++ b/include/envoy/ssl/connection.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "envoy/common/pure.h" namespace Ssl { diff --git a/include/envoy/ssl/context.h b/include/envoy/ssl/context.h index afc65bf2c43d7..256c54724c108 100644 --- a/include/envoy/ssl/context.h +++ b/include/envoy/ssl/context.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + #include "envoy/common/pure.h" namespace Ssl { diff --git a/include/envoy/ssl/context_config.h b/include/envoy/ssl/context_config.h index 414cc99b66eaa..c3c172345a472 100644 --- a/include/envoy/ssl/context_config.h +++ b/include/envoy/ssl/context_config.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + #include "envoy/common/pure.h" namespace Ssl { diff --git a/include/envoy/ssl/context_manager.h b/include/envoy/ssl/context_manager.h index 95e3fd81293e3..c649b08b23796 100644 --- a/include/envoy/ssl/context_manager.h +++ b/include/envoy/ssl/context_manager.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "envoy/ssl/context.h" #include "envoy/ssl/context_config.h" #include "envoy/stats/stats.h" diff --git a/include/envoy/stats/stats.h b/include/envoy/stats/stats.h index e04e2c973798d..b2b962c74ecf6 100644 --- a/include/envoy/stats/stats.h +++ b/include/envoy/stats/stats.h @@ -1,5 +1,11 @@ #pragma once +#include +#include +#include +#include +#include + #include "envoy/common/pure.h" namespace Event { diff --git a/include/envoy/stats/stats_macros.h b/include/envoy/stats/stats_macros.h index f4e0cce66225f..7f9919bd974e2 100644 --- a/include/envoy/stats/stats_macros.h +++ b/include/envoy/stats/stats_macros.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "envoy/stats/stats.h" /** diff --git a/include/envoy/thread_local/thread_local.h b/include/envoy/thread_local/thread_local.h index e175d36094e8e..08bf8a004c3c9 100644 --- a/include/envoy/thread_local/thread_local.h +++ b/include/envoy/thread_local/thread_local.h @@ -1,5 +1,9 @@ #pragma once +#include +#include +#include + #include "envoy/common/pure.h" #include "envoy/event/dispatcher.h" diff --git a/include/envoy/tracing/context.h b/include/envoy/tracing/context.h index 034f470a1be65..6f5b7da251bf0 100644 --- a/include/envoy/tracing/context.h +++ b/include/envoy/tracing/context.h @@ -9,4 +9,5 @@ struct TransportContext { static const TransportContext EMPTY_CONTEXT = {"", ""}; -} // Tracing \ No newline at end of file +} // Tracing +#include diff --git a/include/envoy/tracing/http_tracer.h b/include/envoy/tracing/http_tracer.h index ef2ed8ee9a6b7..295d24c9bca45 100644 --- a/include/envoy/tracing/http_tracer.h +++ b/include/envoy/tracing/http_tracer.h @@ -1,5 +1,9 @@ #pragma once +#include +#include +#include + #include "envoy/common/pure.h" #include "envoy/http/access_log.h" #include "envoy/http/header_map.h" diff --git a/include/envoy/upstream/cluster_manager.h b/include/envoy/upstream/cluster_manager.h index 74ad3c461f161..4c60cc973078c 100644 --- a/include/envoy/upstream/cluster_manager.h +++ b/include/envoy/upstream/cluster_manager.h @@ -1,5 +1,11 @@ #pragma once +#include +#include +#include +#include +#include + #include "envoy/http/async_client.h" #include "envoy/http/conn_pool.h" #include "envoy/json/json_object.h" diff --git a/include/envoy/upstream/health_checker.h b/include/envoy/upstream/health_checker.h index 07d4b981d8ce2..17b800ac51c4b 100644 --- a/include/envoy/upstream/health_checker.h +++ b/include/envoy/upstream/health_checker.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + #include "envoy/upstream/upstream.h" namespace Upstream { diff --git a/include/envoy/upstream/host_description.h b/include/envoy/upstream/host_description.h index 4fecf92ed128a..58fc926f55512 100644 --- a/include/envoy/upstream/host_description.h +++ b/include/envoy/upstream/host_description.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + #include "envoy/network/address.h" #include "envoy/stats/stats_macros.h" #include "envoy/upstream/outlier_detection.h" diff --git a/include/envoy/upstream/load_balancer.h b/include/envoy/upstream/load_balancer.h index ba0cc41fd2411..58fd44635621d 100644 --- a/include/envoy/upstream/load_balancer.h +++ b/include/envoy/upstream/load_balancer.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + #include "envoy/common/pure.h" #include "envoy/upstream/upstream.h" diff --git a/include/envoy/upstream/outlier_detection.h b/include/envoy/upstream/outlier_detection.h index 6c82525fb9a84..b1fe49e80c847 100644 --- a/include/envoy/upstream/outlier_detection.h +++ b/include/envoy/upstream/outlier_detection.h @@ -1,5 +1,10 @@ #pragma once +#include +#include +#include +#include + #include "envoy/common/optional.h" #include "envoy/common/pure.h" #include "envoy/common/time.h" diff --git a/include/envoy/upstream/resource_manager.h b/include/envoy/upstream/resource_manager.h index 74a2b115aa1fa..1abe728fc1458 100644 --- a/include/envoy/upstream/resource_manager.h +++ b/include/envoy/upstream/resource_manager.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "envoy/common/pure.h" namespace Upstream { diff --git a/include/envoy/upstream/upstream.h b/include/envoy/upstream/upstream.h index 95051d47cf783..d9feda87f44f8 100644 --- a/include/envoy/upstream/upstream.h +++ b/include/envoy/upstream/upstream.h @@ -1,5 +1,13 @@ #pragma once +#include +#include +#include +#include +#include +#include +#include + #include "envoy/common/optional.h" #include "envoy/network/connection.h" #include "envoy/ssl/context.h" diff --git a/source/common/access_log/access_log_manager_impl.cc b/source/common/access_log/access_log_manager_impl.cc index 8ebf4c256fc03..e0092a56b2567 100644 --- a/source/common/access_log/access_log_manager_impl.cc +++ b/source/common/access_log/access_log_manager_impl.cc @@ -1,5 +1,7 @@ #include "common/access_log/access_log_manager_impl.h" +#include + namespace AccessLog { void AccessLogManagerImpl::reopen() { diff --git a/source/common/access_log/access_log_manager_impl.h b/source/common/access_log/access_log_manager_impl.h index 8d315f1098a63..8f6c6f0a09759 100644 --- a/source/common/access_log/access_log_manager_impl.h +++ b/source/common/access_log/access_log_manager_impl.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + #include "envoy/access_log/access_log.h" #include "envoy/api/api.h" diff --git a/source/common/api/api_impl.cc b/source/common/api/api_impl.cc index 9f74855b97c1d..11081378e2f41 100644 --- a/source/common/api/api_impl.cc +++ b/source/common/api/api_impl.cc @@ -1,5 +1,8 @@ #include "common/api/api_impl.h" +#include +#include + #include "common/event/dispatcher_impl.h" #include "common/filesystem/filesystem_impl.h" diff --git a/source/common/api/api_impl.h b/source/common/api/api_impl.h index 35f88530845f0..fd9cfed74b410 100644 --- a/source/common/api/api_impl.h +++ b/source/common/api/api_impl.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + #include "envoy/api/api.h" #include "envoy/filesystem/filesystem.h" diff --git a/source/common/buffer/buffer_impl.cc b/source/common/buffer/buffer_impl.cc index eeb6563167732..911916fd13dee 100644 --- a/source/common/buffer/buffer_impl.cc +++ b/source/common/buffer/buffer_impl.cc @@ -1,5 +1,8 @@ #include "common/buffer/buffer_impl.h" +#include +#include + #include "common/common/assert.h" #include "event2/buffer.h" diff --git a/source/common/buffer/buffer_impl.h b/source/common/buffer/buffer_impl.h index 63c7d02ddee10..627ee054a33e0 100644 --- a/source/common/buffer/buffer_impl.h +++ b/source/common/buffer/buffer_impl.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + #include "envoy/buffer/buffer.h" #include "common/event/libevent.h" diff --git a/source/common/common/base64.cc b/source/common/common/base64.cc index 7fd1b8e339390..b5297cbe0fb5d 100644 --- a/source/common/common/base64.cc +++ b/source/common/common/base64.cc @@ -1,5 +1,8 @@ #include "common/common/base64.h" +#include +#include + #include "common/common/empty_string.h" static constexpr char CHAR_TABLE[] = diff --git a/source/common/common/base64.h b/source/common/common/base64.h index 19b2fe30ca657..27d2668e84bfe 100644 --- a/source/common/common/base64.h +++ b/source/common/common/base64.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + #include "envoy/buffer/buffer.h" class Base64 { diff --git a/source/common/common/c_smart_ptr.h b/source/common/common/c_smart_ptr.h index 64901b5fa4ae4..fcb70e8e959e6 100644 --- a/source/common/common/c_smart_ptr.h +++ b/source/common/common/c_smart_ptr.h @@ -1,5 +1,7 @@ #pragma once +#include + /** * This is a helper that wraps C style API objects that need to be deleted with a smart pointer. */ diff --git a/source/common/common/empty_string.h b/source/common/common/empty_string.h index 6cd381522fd63..49b68af3eda25 100644 --- a/source/common/common/empty_string.h +++ b/source/common/common/empty_string.h @@ -1,3 +1,5 @@ #pragma once static const std::string EMPTY_STRING = ""; + +#include diff --git a/source/common/common/enum_to_int.h b/source/common/common/enum_to_int.h index 6abf999a43b5b..6929d364b127c 100644 --- a/source/common/common/enum_to_int.h +++ b/source/common/common/enum_to_int.h @@ -4,3 +4,5 @@ * Convert an int based enum to an int. */ template uint32_t enumToInt(T val) { return static_cast(val); } + +#include diff --git a/source/common/common/hex.cc b/source/common/common/hex.cc index d1d500416cad4..79cd14d805e03 100644 --- a/source/common/common/hex.cc +++ b/source/common/common/hex.cc @@ -1,5 +1,11 @@ #include "common/common/hex.h" +#include + +#include +#include +#include + #include "envoy/common/exception.h" #include "common/common/utility.h" diff --git a/source/common/common/hex.h b/source/common/common/hex.h index b426db2e850de..84d90b02fb854 100644 --- a/source/common/common/hex.h +++ b/source/common/common/hex.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + /** * Hex encoder/decoder. Produces lowercase hex digits. Can consume either lowercase or uppercase * digits. diff --git a/source/common/common/linked_object.h b/source/common/common/linked_object.h index 488f9ed5a3b40..76b2572ebcfa2 100644 --- a/source/common/common/linked_object.h +++ b/source/common/common/linked_object.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + #include "common/common/assert.h" /** diff --git a/source/common/common/logger.cc b/source/common/common/logger.cc index 80b9bb5bbdb7b..b5f14098f0e8b 100644 --- a/source/common/common/logger.cc +++ b/source/common/common/logger.cc @@ -1,5 +1,12 @@ #include "common/common/logger.h" +#include + +#include +#include +#include +#include + #include "envoy/thread/thread.h" namespace Logger { diff --git a/source/common/common/logger.h b/source/common/common/logger.h index 2dbbbe117e205..1149e6a37c830 100644 --- a/source/common/common/logger.h +++ b/source/common/common/logger.h @@ -1,5 +1,12 @@ #pragma once +#include + +#include +#include +#include +#include + #include "envoy/thread/thread.h" #include "common/common/macros.h" diff --git a/source/common/common/thread.cc b/source/common/common/thread.cc index 5123a7f05687c..bd8fd4cca755d 100644 --- a/source/common/common/thread.cc +++ b/source/common/common/thread.cc @@ -2,6 +2,8 @@ #include +#include + #include "common/common/assert.h" #include "common/common/macros.h" diff --git a/source/common/common/thread.h b/source/common/common/thread.h index 3cf124e95c90e..42b02e017fb76 100644 --- a/source/common/common/thread.h +++ b/source/common/common/thread.h @@ -1,5 +1,9 @@ #pragma once +#include +#include +#include + #include "envoy/thread/thread.h" namespace Thread { diff --git a/source/common/common/utility.cc b/source/common/common/utility.cc index fa248ee535d34..9ddde2793fbf5 100644 --- a/source/common/common/utility.cc +++ b/source/common/common/utility.cc @@ -1,5 +1,13 @@ #include "common/common/utility.h" +#include + +#include +#include +#include +#include +#include + std::string DateFormatter::fromTime(const SystemTime& time) { return fromTimeT(std::chrono::system_clock::to_time_t(time)); } diff --git a/source/common/common/utility.h b/source/common/common/utility.h index 1bfbc203a8ef6..5145beb2e8e4f 100644 --- a/source/common/common/utility.h +++ b/source/common/common/utility.h @@ -1,5 +1,12 @@ #pragma once +#include + +#include +#include +#include +#include + #include "envoy/common/time.h" /** diff --git a/source/common/common/version.cc b/source/common/common/version.cc index 7efc184746799..dac0deba32332 100644 --- a/source/common/common/version.cc +++ b/source/common/common/version.cc @@ -1,5 +1,9 @@ #include "common/common/version.h" +#include + +#include + std::string VersionInfo::version() { return fmt::format("{}/{}", GIT_SHA.substr(0, 6), #ifdef NDEBUG diff --git a/source/common/common/version.h b/source/common/common/version.h index 0b75ddaf5d716..860175420ef29 100644 --- a/source/common/common/version.h +++ b/source/common/common/version.h @@ -1,5 +1,7 @@ #pragma once +#include + /** * Wraps compiled in code versioning. * NOTE: The GIT_SHA is generated into version_generated.cc and is not present in the source tree. diff --git a/source/common/dynamo/dynamo_filter.cc b/source/common/dynamo/dynamo_filter.cc index 96fd87e9dedbc..b599380ee4aa1 100644 --- a/source/common/dynamo/dynamo_filter.cc +++ b/source/common/dynamo/dynamo_filter.cc @@ -1,5 +1,12 @@ #include "common/dynamo/dynamo_filter.h" +#include + +#include +#include +#include +#include + #include "common/buffer/buffer_impl.h" #include "common/dynamo/dynamo_request_parser.h" #include "common/dynamo/dynamo_utility.h" diff --git a/source/common/dynamo/dynamo_filter.h b/source/common/dynamo/dynamo_filter.h index 39d6f39a4bc3e..bcd4e44c7a520 100644 --- a/source/common/dynamo/dynamo_filter.h +++ b/source/common/dynamo/dynamo_filter.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + #include "envoy/http/filter.h" #include "envoy/runtime/runtime.h" #include "envoy/stats/stats.h" diff --git a/source/common/dynamo/dynamo_request_parser.cc b/source/common/dynamo/dynamo_request_parser.cc index 6eb13f5b5459b..eab050889b4ba 100644 --- a/source/common/dynamo/dynamo_request_parser.cc +++ b/source/common/dynamo/dynamo_request_parser.cc @@ -1,5 +1,9 @@ #include "common/dynamo/dynamo_request_parser.h" +#include +#include +#include + #include "common/common/utility.h" namespace Dynamo { diff --git a/source/common/dynamo/dynamo_request_parser.h b/source/common/dynamo/dynamo_request_parser.h index 8505f9fcae251..3a4c0b983764d 100644 --- a/source/common/dynamo/dynamo_request_parser.h +++ b/source/common/dynamo/dynamo_request_parser.h @@ -1,5 +1,9 @@ #pragma once +#include +#include +#include + #include "envoy/http/header_map.h" #include "common/json/json_loader.h" diff --git a/source/common/dynamo/dynamo_utility.cc b/source/common/dynamo/dynamo_utility.cc index 443cd70005076..a55fbba3a4df5 100644 --- a/source/common/dynamo/dynamo_utility.cc +++ b/source/common/dynamo/dynamo_utility.cc @@ -1,5 +1,9 @@ #include "common/dynamo/dynamo_utility.h" +#include + +#include + #include "common/stats/stats_impl.h" namespace Dynamo { diff --git a/source/common/dynamo/dynamo_utility.h b/source/common/dynamo/dynamo_utility.h index b0c159cfb2c7a..5e4556bdb10c4 100644 --- a/source/common/dynamo/dynamo_utility.h +++ b/source/common/dynamo/dynamo_utility.h @@ -1,5 +1,7 @@ #pragma once +#include + namespace Dynamo { class Utility { diff --git a/source/common/event/dispatcher_impl.cc b/source/common/event/dispatcher_impl.cc index 9c8cd643c3669..aa4762351b79b 100644 --- a/source/common/event/dispatcher_impl.cc +++ b/source/common/event/dispatcher_impl.cc @@ -1,5 +1,11 @@ #include "common/event/dispatcher_impl.h" +#include +#include +#include +#include +#include + #include "envoy/network/listen_socket.h" #include "envoy/network/listener.h" diff --git a/source/common/event/dispatcher_impl.h b/source/common/event/dispatcher_impl.h index 09757b4a8455d..161ba22074d1c 100644 --- a/source/common/event/dispatcher_impl.h +++ b/source/common/event/dispatcher_impl.h @@ -1,5 +1,11 @@ #pragma once +#include +#include +#include +#include +#include + #include "envoy/event/deferred_deletable.h" #include "envoy/event/dispatcher.h" #include "envoy/network/connection_handler.h" diff --git a/source/common/event/file_event_impl.cc b/source/common/event/file_event_impl.cc index 24ac7bb3b0794..060e9d15c67e3 100644 --- a/source/common/event/file_event_impl.cc +++ b/source/common/event/file_event_impl.cc @@ -1,5 +1,7 @@ #include "common/event/file_event_impl.h" +#include + #include "common/common/assert.h" #include "common/event/dispatcher_impl.h" diff --git a/source/common/event/file_event_impl.h b/source/common/event/file_event_impl.h index 1100f77cbc99e..1aee7db02e9a3 100644 --- a/source/common/event/file_event_impl.h +++ b/source/common/event/file_event_impl.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "envoy/event/file_event.h" #include "common/event/dispatcher_impl.h" diff --git a/source/common/event/libevent.cc b/source/common/event/libevent.cc index 8d28c35580e2b..188a3b3de09e9 100644 --- a/source/common/event/libevent.cc +++ b/source/common/event/libevent.cc @@ -1,5 +1,7 @@ #include "common/event/libevent.h" +#include + #include "common/common/assert.h" #include "event2/thread.h" diff --git a/source/common/event/timer_impl.cc b/source/common/event/timer_impl.cc index 05f8f623cde89..9c3317d63e8b6 100644 --- a/source/common/event/timer_impl.cc +++ b/source/common/event/timer_impl.cc @@ -1,5 +1,7 @@ #include "common/event/timer_impl.h" +#include + #include "common/common/assert.h" #include "common/event/dispatcher_impl.h" diff --git a/source/common/event/timer_impl.h b/source/common/event/timer_impl.h index 7b5a468b53c5b..651abded060b5 100644 --- a/source/common/event/timer_impl.h +++ b/source/common/event/timer_impl.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "envoy/event/timer.h" #include "common/event/dispatcher_impl.h" diff --git a/source/common/filesystem/filesystem_impl.cc b/source/common/filesystem/filesystem_impl.cc index ab20895bd8263..fa6d162951978 100644 --- a/source/common/filesystem/filesystem_impl.cc +++ b/source/common/filesystem/filesystem_impl.cc @@ -2,8 +2,16 @@ #include #include +#include +#include +#include +#include +#include #include +#include +#include +#include #include "envoy/common/exception.h" #include "envoy/event/dispatcher.h" diff --git a/source/common/filesystem/filesystem_impl.h b/source/common/filesystem/filesystem_impl.h index 1bbb1b40a139b..0abaae351f515 100644 --- a/source/common/filesystem/filesystem_impl.h +++ b/source/common/filesystem/filesystem_impl.h @@ -1,5 +1,12 @@ #pragma once +#include +#include +#include +#include +#include +#include + #include "envoy/event/dispatcher.h" #include "envoy/filesystem/filesystem.h" #include "envoy/stats/stats_macros.h" diff --git a/source/common/filesystem/watcher_impl.cc b/source/common/filesystem/watcher_impl.cc index a75a3747996c8..31fcaa0cb1243 100644 --- a/source/common/filesystem/watcher_impl.cc +++ b/source/common/filesystem/watcher_impl.cc @@ -1,7 +1,11 @@ #include "common/filesystem/watcher_impl.h" +#include #include +#include +#include + #include "envoy/common/exception.h" #include "envoy/event/dispatcher.h" #include "envoy/event/file_event.h" diff --git a/source/common/filesystem/watcher_impl.h b/source/common/filesystem/watcher_impl.h index 5544738db6d7a..3384576c80ffa 100644 --- a/source/common/filesystem/watcher_impl.h +++ b/source/common/filesystem/watcher_impl.h @@ -1,5 +1,10 @@ #pragma once +#include +#include +#include +#include + #include "envoy/event/dispatcher.h" #include "envoy/filesystem/filesystem.h" diff --git a/source/common/filter/auth/client_ssl.cc b/source/common/filter/auth/client_ssl.cc index b3f65d907bd7d..607329a1157ab 100644 --- a/source/common/filter/auth/client_ssl.cc +++ b/source/common/filter/auth/client_ssl.cc @@ -1,5 +1,11 @@ #include "common/filter/auth/client_ssl.h" +#include + +#include +#include +#include + #include "envoy/network/connection.h" #include "common/common/assert.h" diff --git a/source/common/filter/auth/client_ssl.h b/source/common/filter/auth/client_ssl.h index 843601c24f8e7..2159d19fc4c34 100644 --- a/source/common/filter/auth/client_ssl.h +++ b/source/common/filter/auth/client_ssl.h @@ -1,5 +1,10 @@ #pragma once +#include +#include +#include +#include + #include "envoy/network/filter.h" #include "envoy/runtime/runtime.h" #include "envoy/stats/stats_macros.h" diff --git a/source/common/filter/ratelimit.cc b/source/common/filter/ratelimit.cc index 79c437ed2bdda..b39c2a0385423 100644 --- a/source/common/filter/ratelimit.cc +++ b/source/common/filter/ratelimit.cc @@ -1,5 +1,10 @@ #include "common/filter/ratelimit.h" +#include + +#include +#include + #include "common/common/empty_string.h" #include "common/json/config_schemas.h" diff --git a/source/common/filter/ratelimit.h b/source/common/filter/ratelimit.h index bd19b11f5d663..60f793fc7ec9b 100644 --- a/source/common/filter/ratelimit.h +++ b/source/common/filter/ratelimit.h @@ -1,5 +1,10 @@ #pragma once +#include +#include +#include +#include + #include "envoy/network/connection.h" #include "envoy/network/filter.h" #include "envoy/ratelimit/ratelimit.h" diff --git a/source/common/filter/tcp_proxy.cc b/source/common/filter/tcp_proxy.cc index 57f50f093d565..f9fff5af9e958 100644 --- a/source/common/filter/tcp_proxy.cc +++ b/source/common/filter/tcp_proxy.cc @@ -1,5 +1,10 @@ #include "common/filter/tcp_proxy.h" +#include + +#include +#include + #include "envoy/buffer/buffer.h" #include "envoy/event/dispatcher.h" #include "envoy/event/timer.h" diff --git a/source/common/filter/tcp_proxy.h b/source/common/filter/tcp_proxy.h index 7e2b0d4cbb25e..d20b2b518c5fa 100644 --- a/source/common/filter/tcp_proxy.h +++ b/source/common/filter/tcp_proxy.h @@ -1,5 +1,10 @@ #pragma once +#include +#include +#include +#include + #include "envoy/event/timer.h" #include "envoy/network/connection.h" #include "envoy/network/filter.h" diff --git a/source/common/grpc/codec.cc b/source/common/grpc/codec.cc index 4335ef72421a7..fd976a19e0ed6 100644 --- a/source/common/grpc/codec.cc +++ b/source/common/grpc/codec.cc @@ -1,5 +1,9 @@ #include "common/grpc/codec.h" +#include +#include +#include + #include "common/buffer/buffer_impl.h" namespace Grpc { diff --git a/source/common/grpc/codec.h b/source/common/grpc/codec.h index 21d9bdd1636f9..fb343397da273 100644 --- a/source/common/grpc/codec.h +++ b/source/common/grpc/codec.h @@ -1,5 +1,9 @@ #pragma once +#include +#include +#include + #include "envoy/buffer/buffer.h" namespace Grpc { diff --git a/source/common/grpc/common.cc b/source/common/grpc/common.cc index 0a092e610cb2c..a80b5c63448a5 100644 --- a/source/common/grpc/common.cc +++ b/source/common/grpc/common.cc @@ -1,5 +1,11 @@ #include "common/grpc/common.h" +#include +#include + +#include +#include + #include "common/buffer/buffer_impl.h" #include "common/common/assert.h" #include "common/common/empty_string.h" diff --git a/source/common/grpc/common.h b/source/common/grpc/common.h index 1e9bb5a9efd8c..72b3026e71886 100644 --- a/source/common/grpc/common.h +++ b/source/common/grpc/common.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + #include "envoy/common/exception.h" #include "envoy/common/optional.h" #include "envoy/http/header_map.h" diff --git a/source/common/grpc/http1_bridge_filter.cc b/source/common/grpc/http1_bridge_filter.cc index c066af5fd5154..98d8539b0bc4a 100644 --- a/source/common/grpc/http1_bridge_filter.cc +++ b/source/common/grpc/http1_bridge_filter.cc @@ -1,5 +1,9 @@ #include "common/grpc/http1_bridge_filter.h" +#include +#include +#include + #include "envoy/http/codes.h" #include "common/common/enum_to_int.h" diff --git a/source/common/grpc/http1_bridge_filter.h b/source/common/grpc/http1_bridge_filter.h index dcf7f3cac24d2..92d92c3053743 100644 --- a/source/common/grpc/http1_bridge_filter.h +++ b/source/common/grpc/http1_bridge_filter.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "envoy/http/filter.h" #include "envoy/upstream/cluster_manager.h" diff --git a/source/common/grpc/rpc_channel_impl.cc b/source/common/grpc/rpc_channel_impl.cc index 18d5c5139054e..b2e63b1035ca1 100644 --- a/source/common/grpc/rpc_channel_impl.cc +++ b/source/common/grpc/rpc_channel_impl.cc @@ -1,5 +1,8 @@ #include "common/grpc/rpc_channel_impl.h" +#include +#include + #include "common/common/enum_to_int.h" #include "common/common/utility.h" #include "common/grpc/common.h" diff --git a/source/common/grpc/rpc_channel_impl.h b/source/common/grpc/rpc_channel_impl.h index 0ea7c1d9c51a7..6b7b6f572d49a 100644 --- a/source/common/grpc/rpc_channel_impl.h +++ b/source/common/grpc/rpc_channel_impl.h @@ -1,5 +1,9 @@ #pragma once +#include +#include +#include + #include "envoy/grpc/rpc_channel.h" #include "envoy/upstream/cluster_manager.h" diff --git a/source/common/http/access_log/access_log_formatter.cc b/source/common/http/access_log/access_log_formatter.cc index 6954e97ffd34d..0a93b12cb653a 100644 --- a/source/common/http/access_log/access_log_formatter.cc +++ b/source/common/http/access_log/access_log_formatter.cc @@ -1,5 +1,11 @@ #include "common/http/access_log/access_log_formatter.h" +#include + +#include +#include +#include + #include "common/common/assert.h" #include "common/common/utility.h" diff --git a/source/common/http/access_log/access_log_formatter.h b/source/common/http/access_log/access_log_formatter.h index d7a39e14e52b4..a9f381cc7bdd9 100644 --- a/source/common/http/access_log/access_log_formatter.h +++ b/source/common/http/access_log/access_log_formatter.h @@ -1,5 +1,9 @@ #pragma once +#include +#include +#include + #include "envoy/http/access_log.h" namespace Http { diff --git a/source/common/http/access_log/access_log_impl.cc b/source/common/http/access_log/access_log_impl.cc index bb52f4da87f00..f75e564adcdd5 100644 --- a/source/common/http/access_log/access_log_impl.cc +++ b/source/common/http/access_log/access_log_impl.cc @@ -1,5 +1,8 @@ #include "common/http/access_log/access_log_impl.h" +#include +#include + #include "envoy/filesystem/filesystem.h" #include "envoy/http/header_map.h" #include "envoy/runtime/runtime.h" diff --git a/source/common/http/access_log/access_log_impl.h b/source/common/http/access_log/access_log_impl.h index af9515cb1f86d..475934260ea01 100644 --- a/source/common/http/access_log/access_log_impl.h +++ b/source/common/http/access_log/access_log_impl.h @@ -1,5 +1,9 @@ #pragma once +#include +#include +#include + #include "envoy/access_log/access_log.h" #include "envoy/http/access_log.h" #include "envoy/runtime/runtime.h" diff --git a/source/common/http/access_log/request_info_impl.h b/source/common/http/access_log/request_info_impl.h index 5c8bebf9b76b0..029a82efb878f 100644 --- a/source/common/http/access_log/request_info_impl.h +++ b/source/common/http/access_log/request_info_impl.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + #include "envoy/http/access_log.h" namespace Http { diff --git a/source/common/http/async_client_impl.cc b/source/common/http/async_client_impl.cc index c48cf6587889d..c5433714d4643 100644 --- a/source/common/http/async_client_impl.cc +++ b/source/common/http/async_client_impl.cc @@ -1,5 +1,11 @@ #include "common/http/async_client_impl.h" +#include +#include +#include +#include +#include + #include "common/http/utility.h" namespace Http { diff --git a/source/common/http/async_client_impl.h b/source/common/http/async_client_impl.h index 5427ecb053c29..b3aaadb28d692 100644 --- a/source/common/http/async_client_impl.h +++ b/source/common/http/async_client_impl.h @@ -1,5 +1,14 @@ #pragma once +#include +#include +#include +#include +#include +#include +#include +#include + #include "envoy/event/dispatcher.h" #include "envoy/http/async_client.h" #include "envoy/http/codec.h" diff --git a/source/common/http/codec_client.cc b/source/common/http/codec_client.cc index 59cc798e88824..8bc7521599a4d 100644 --- a/source/common/http/codec_client.cc +++ b/source/common/http/codec_client.cc @@ -1,5 +1,7 @@ #include "common/http/codec_client.h" +#include + #include "common/common/enum_to_int.h" #include "common/http/exception.h" #include "common/http/http1/codec_impl.h" diff --git a/source/common/http/codec_client.h b/source/common/http/codec_client.h index 45b939bf47d64..5fad0a6199de9 100644 --- a/source/common/http/codec_client.h +++ b/source/common/http/codec_client.h @@ -1,5 +1,9 @@ #pragma once +#include +#include +#include + #include "envoy/event/deferred_deletable.h" #include "envoy/http/codec.h" #include "envoy/network/connection.h" diff --git a/source/common/http/codec_helper.h b/source/common/http/codec_helper.h index 90ba96eac57d1..9dea7e65a3039 100644 --- a/source/common/http/codec_helper.h +++ b/source/common/http/codec_helper.h @@ -44,3 +44,5 @@ class StreamCallbackHelper { }; } // Http + +#include diff --git a/source/common/http/codes.cc b/source/common/http/codes.cc index 10ef1ba14927d..e2b6ddb7b8e86 100644 --- a/source/common/http/codes.cc +++ b/source/common/http/codes.cc @@ -1,5 +1,10 @@ #include "common/http/codes.h" +#include + +#include +#include + #include "envoy/http/header_map.h" #include "envoy/stats/stats.h" diff --git a/source/common/http/codes.h b/source/common/http/codes.h index 8701b44c47ff7..ed5414d6a6954 100644 --- a/source/common/http/codes.h +++ b/source/common/http/codes.h @@ -1,5 +1,9 @@ #pragma once +#include +#include +#include + #include "envoy/http/codes.h" #include "envoy/http/header_map.h" #include "envoy/stats/stats.h" diff --git a/source/common/http/conn_manager_impl.cc b/source/common/http/conn_manager_impl.cc index b90acc3332ea2..ade3f3f653c5a 100644 --- a/source/common/http/conn_manager_impl.cc +++ b/source/common/http/conn_manager_impl.cc @@ -1,5 +1,13 @@ #include "common/http/conn_manager_impl.h" +#include + +#include +#include +#include +#include +#include + #include "envoy/buffer/buffer.h" #include "envoy/event/dispatcher.h" #include "envoy/event/timer.h" diff --git a/source/common/http/conn_manager_impl.h b/source/common/http/conn_manager_impl.h index bf8d014621ab4..99ff729529a48 100644 --- a/source/common/http/conn_manager_impl.h +++ b/source/common/http/conn_manager_impl.h @@ -1,5 +1,13 @@ #pragma once +#include +#include +#include +#include +#include +#include +#include + #include "envoy/event/deferred_deletable.h" #include "envoy/http/access_log.h" #include "envoy/http/codec.h" diff --git a/source/common/http/conn_manager_utility.cc b/source/common/http/conn_manager_utility.cc index fda7dcfbae018..3e7733e2db4b1 100644 --- a/source/common/http/conn_manager_utility.cc +++ b/source/common/http/conn_manager_utility.cc @@ -1,5 +1,9 @@ #include "common/http/conn_manager_utility.h" +#include +#include +#include + #include "common/common/empty_string.h" #include "common/http/access_log/access_log_formatter.h" #include "common/http/headers.h" diff --git a/source/common/http/conn_manager_utility.h b/source/common/http/conn_manager_utility.h index 7cf678ff4bc3c..7f8b885dc89bb 100644 --- a/source/common/http/conn_manager_utility.h +++ b/source/common/http/conn_manager_utility.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + #include "envoy/http/header_map.h" #include "envoy/network/connection.h" diff --git a/source/common/http/date_provider_impl.cc b/source/common/http/date_provider_impl.cc index 12d341dfb3e64..14c1ff7e6f8de 100644 --- a/source/common/http/date_provider_impl.cc +++ b/source/common/http/date_provider_impl.cc @@ -1,5 +1,8 @@ #include "common/http/date_provider_impl.h" +#include +#include + namespace Http { DateFormatter DateProviderImplBase::date_formatter_("%a, %d %b %Y %H:%M:%S GMT"); diff --git a/source/common/http/date_provider_impl.h b/source/common/http/date_provider_impl.h index 6f7fa95c1146d..04b1f222a3e14 100644 --- a/source/common/http/date_provider_impl.h +++ b/source/common/http/date_provider_impl.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + #include "envoy/event/dispatcher.h" #include "envoy/thread_local/thread_local.h" diff --git a/source/common/http/exception.h b/source/common/http/exception.h index c1a28d2116077..fb8f014272daf 100644 --- a/source/common/http/exception.h +++ b/source/common/http/exception.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "envoy/common/exception.h" #include "envoy/http/header_map.h" diff --git a/source/common/http/filter/buffer_filter.cc b/source/common/http/filter/buffer_filter.cc index 10c0a724fc4a2..afb8da2d817f9 100644 --- a/source/common/http/filter/buffer_filter.cc +++ b/source/common/http/filter/buffer_filter.cc @@ -1,5 +1,7 @@ #include "common/http/filter/buffer_filter.h" +#include + #include "envoy/event/dispatcher.h" #include "envoy/event/timer.h" #include "envoy/http/codes.h" diff --git a/source/common/http/filter/buffer_filter.h b/source/common/http/filter/buffer_filter.h index e57fd7fdbf217..1fb181f17b241 100644 --- a/source/common/http/filter/buffer_filter.h +++ b/source/common/http/filter/buffer_filter.h @@ -1,5 +1,10 @@ #pragma once +#include +#include +#include +#include + #include "envoy/http/filter.h" #include "envoy/stats/stats_macros.h" diff --git a/source/common/http/filter/fault_filter.cc b/source/common/http/filter/fault_filter.cc index 3588104ba04da..fc0cf34c7db6c 100644 --- a/source/common/http/filter/fault_filter.cc +++ b/source/common/http/filter/fault_filter.cc @@ -1,5 +1,10 @@ #include "common/http/filter/fault_filter.h" +#include +#include +#include +#include + #include "envoy/event/timer.h" #include "envoy/http/codes.h" #include "envoy/http/header_map.h" diff --git a/source/common/http/filter/fault_filter.h b/source/common/http/filter/fault_filter.h index 4c0cb5bfecb28..abf5eca8130b8 100644 --- a/source/common/http/filter/fault_filter.h +++ b/source/common/http/filter/fault_filter.h @@ -1,5 +1,10 @@ #pragma once +#include +#include +#include +#include + #include "envoy/http/filter.h" #include "envoy/runtime/runtime.h" #include "envoy/stats/stats_macros.h" diff --git a/source/common/http/filter/ratelimit.cc b/source/common/http/filter/ratelimit.cc index 4b62fad5d74c3..a10f747841602 100644 --- a/source/common/http/filter/ratelimit.cc +++ b/source/common/http/filter/ratelimit.cc @@ -1,5 +1,10 @@ #include "common/http/filter/ratelimit.h" +#include + +#include +#include + #include "envoy/http/codes.h" #include "common/common/assert.h" diff --git a/source/common/http/filter/ratelimit.h b/source/common/http/filter/ratelimit.h index fcfa935a6029b..ca2c717dbe9b1 100644 --- a/source/common/http/filter/ratelimit.h +++ b/source/common/http/filter/ratelimit.h @@ -1,5 +1,10 @@ #pragma once +#include +#include +#include +#include + #include "envoy/http/filter.h" #include "envoy/local_info/local_info.h" #include "envoy/ratelimit/ratelimit.h" diff --git a/source/common/http/header_map_impl.cc b/source/common/http/header_map_impl.cc index 931ac3d37b600..ae794f1edfa5b 100644 --- a/source/common/http/header_map_impl.cc +++ b/source/common/http/header_map_impl.cc @@ -1,5 +1,9 @@ #include "common/http/header_map_impl.h" +#include +#include +#include + #include "common/common/assert.h" #include "common/common/empty_string.h" #include "common/common/utility.h" diff --git a/source/common/http/header_map_impl.h b/source/common/http/header_map_impl.h index 30d316a02239c..d52036dca031e 100644 --- a/source/common/http/header_map_impl.h +++ b/source/common/http/header_map_impl.h @@ -1,5 +1,11 @@ #pragma once +#include +#include +#include +#include +#include + #include "envoy/http/header_map.h" #include "common/common/non_copyable.h" diff --git a/source/common/http/headers.h b/source/common/http/headers.h index 29564da73cbac..6c1e438abf637 100644 --- a/source/common/http/headers.h +++ b/source/common/http/headers.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "envoy/http/header_map.h" namespace Http { diff --git a/source/common/http/http1/codec_impl.cc b/source/common/http/http1/codec_impl.cc index b4cd9becdb020..3eb8fee904427 100644 --- a/source/common/http/http1/codec_impl.cc +++ b/source/common/http/http1/codec_impl.cc @@ -1,5 +1,10 @@ #include "common/http/http1/codec_impl.h" +#include + +#include +#include + #include "envoy/buffer/buffer.h" #include "envoy/http/header_map.h" #include "envoy/network/connection.h" diff --git a/source/common/http/http1/codec_impl.h b/source/common/http/http1/codec_impl.h index f816d4053e30d..8584eeeff6985 100644 --- a/source/common/http/http1/codec_impl.h +++ b/source/common/http/http1/codec_impl.h @@ -1,5 +1,11 @@ #pragma once +#include +#include +#include +#include +#include + #include "envoy/http/codec.h" #include "envoy/network/connection.h" diff --git a/source/common/http/http1/conn_pool.cc b/source/common/http/http1/conn_pool.cc index 08ebe33b2182d..b88a22fd3e607 100644 --- a/source/common/http/http1/conn_pool.cc +++ b/source/common/http/http1/conn_pool.cc @@ -1,5 +1,8 @@ #include "common/http/http1/conn_pool.h" +#include +#include + #include "envoy/event/dispatcher.h" #include "envoy/event/timer.h" #include "envoy/http/header_map.h" diff --git a/source/common/http/http1/conn_pool.h b/source/common/http/http1/conn_pool.h index 5aa2b8aeeda69..f4f45ef2cd634 100644 --- a/source/common/http/http1/conn_pool.h +++ b/source/common/http/http1/conn_pool.h @@ -1,5 +1,9 @@ #pragma once +#include +#include +#include + #include "envoy/common/optional.h" #include "envoy/event/deferred_deletable.h" #include "envoy/event/timer.h" diff --git a/source/common/http/http2/codec_impl.cc b/source/common/http/http2/codec_impl.cc index 01b718b7875a1..3f0d5a06d27bf 100644 --- a/source/common/http/http2/codec_impl.cc +++ b/source/common/http/http2/codec_impl.cc @@ -1,5 +1,11 @@ #include "common/http/http2/codec_impl.h" +#include + +#include +#include +#include + #include "envoy/event/dispatcher.h" #include "envoy/http/codes.h" #include "envoy/http/header_map.h" diff --git a/source/common/http/http2/codec_impl.h b/source/common/http/http2/codec_impl.h index 06d9b23e43d16..e58319b78b810 100644 --- a/source/common/http/http2/codec_impl.h +++ b/source/common/http/http2/codec_impl.h @@ -1,5 +1,11 @@ #pragma once +#include +#include +#include +#include +#include + #include "envoy/common/optional.h" #include "envoy/event/deferred_deletable.h" #include "envoy/http/codec.h" diff --git a/source/common/http/http2/conn_pool.cc b/source/common/http/http2/conn_pool.cc index dd94aedb69164..29fd9ee47fef3 100644 --- a/source/common/http/http2/conn_pool.cc +++ b/source/common/http/http2/conn_pool.cc @@ -1,5 +1,7 @@ #include "common/http/http2/conn_pool.h" +#include + #include "envoy/event/dispatcher.h" #include "envoy/event/timer.h" #include "envoy/upstream/upstream.h" diff --git a/source/common/http/http2/conn_pool.h b/source/common/http/http2/conn_pool.h index a990c8b8ab1e2..1524e121497dd 100644 --- a/source/common/http/http2/conn_pool.h +++ b/source/common/http/http2/conn_pool.h @@ -1,5 +1,9 @@ #pragma once +#include +#include +#include + #include "envoy/event/timer.h" #include "envoy/http/conn_pool.h" #include "envoy/network/connection.h" diff --git a/source/common/http/message_impl.cc b/source/common/http/message_impl.cc index 60302f0257661..779d27423378d 100644 --- a/source/common/http/message_impl.cc +++ b/source/common/http/message_impl.cc @@ -1,5 +1,8 @@ #include "common/http/message_impl.h" +#include +#include + namespace Http { std::string MessageImpl::bodyAsString() const { diff --git a/source/common/http/message_impl.h b/source/common/http/message_impl.h index bf32919a549a9..697378843a6d2 100644 --- a/source/common/http/message_impl.h +++ b/source/common/http/message_impl.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "envoy/http/header_map.h" #include "envoy/http/message.h" diff --git a/source/common/http/rest_api_fetcher.cc b/source/common/http/rest_api_fetcher.cc index a62e3b5b33664..a03821f0e2585 100644 --- a/source/common/http/rest_api_fetcher.cc +++ b/source/common/http/rest_api_fetcher.cc @@ -1,5 +1,9 @@ #include "common/http/rest_api_fetcher.h" +#include +#include +#include + #include "common/common/enum_to_int.h" #include "common/http/message_impl.h" #include "common/http/utility.h" diff --git a/source/common/http/rest_api_fetcher.h b/source/common/http/rest_api_fetcher.h index 87f420e488fcf..8b3ebee72c71c 100644 --- a/source/common/http/rest_api_fetcher.h +++ b/source/common/http/rest_api_fetcher.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + #include "envoy/event/dispatcher.h" #include "envoy/runtime/runtime.h" #include "envoy/upstream/cluster_manager.h" diff --git a/source/common/http/user_agent.cc b/source/common/http/user_agent.cc index 2297777539d0f..a31b77c2d8acd 100644 --- a/source/common/http/user_agent.cc +++ b/source/common/http/user_agent.cc @@ -1,5 +1,8 @@ #include "common/http/user_agent.h" +#include +#include + #include "envoy/network/connection.h" #include "envoy/stats/stats.h" diff --git a/source/common/http/user_agent.h b/source/common/http/user_agent.h index cf78b62b0122c..cea1efa91183a 100644 --- a/source/common/http/user_agent.h +++ b/source/common/http/user_agent.h @@ -1,5 +1,9 @@ #pragma once +#include +#include +#include + #include "envoy/http/header_map.h" #include "envoy/stats/stats_macros.h" diff --git a/source/common/http/utility.cc b/source/common/http/utility.cc index 09bb9a9273694..cd4b06b26d1cf 100644 --- a/source/common/http/utility.cc +++ b/source/common/http/utility.cc @@ -1,5 +1,11 @@ #include "common/http/utility.h" +#include + +#include +#include +#include + #include "envoy/http/header_map.h" #include "common/buffer/buffer_impl.h" diff --git a/source/common/http/utility.h b/source/common/http/utility.h index 15b5c72b03fff..ee2731d276138 100644 --- a/source/common/http/utility.h +++ b/source/common/http/utility.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + #include "envoy/http/codes.h" #include "envoy/http/filter.h" diff --git a/source/common/json/config_schemas.cc b/source/common/json/config_schemas.cc index edb8663c56ae4..63e22e0b06c05 100644 --- a/source/common/json/config_schemas.cc +++ b/source/common/json/config_schemas.cc @@ -1,5 +1,7 @@ #include "common/json/config_schemas.h" +#include + const std::string Json::Schema::LISTENER_SCHEMA(R"EOF( { "$schema": "http://json-schema.org/schema#", diff --git a/source/common/json/config_schemas.h b/source/common/json/config_schemas.h index b6886ea02da53..32174f88002bf 100644 --- a/source/common/json/config_schemas.h +++ b/source/common/json/config_schemas.h @@ -1,5 +1,7 @@ #pragma once +#include + namespace Json { class Schema { diff --git a/source/common/json/json_loader.cc b/source/common/json/json_loader.cc index b4f173d4f527d..cc96df8d61cda 100644 --- a/source/common/json/json_loader.cc +++ b/source/common/json/json_loader.cc @@ -1,5 +1,12 @@ #include "common/json/json_loader.h" +#include + +#include +#include +#include +#include + // Do not let RapidJson leak outside of this file. #include "rapidjson/document.h" #include "rapidjson/error/en.h" diff --git a/source/common/json/json_loader.h b/source/common/json/json_loader.h index 5e905d8b41822..205d455df042c 100644 --- a/source/common/json/json_loader.h +++ b/source/common/json/json_loader.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "envoy/json/json_object.h" namespace Json { diff --git a/source/common/json/json_validator.h b/source/common/json/json_validator.h index 0e957746ec932..dc7e28e6b2fbd 100644 --- a/source/common/json/json_validator.h +++ b/source/common/json/json_validator.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "envoy/json/json_object.h" namespace Json { diff --git a/source/common/local_info/local_info_impl.h b/source/common/local_info/local_info_impl.h index 2ab839662b51d..b0d284a41def8 100644 --- a/source/common/local_info/local_info_impl.h +++ b/source/common/local_info/local_info_impl.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "envoy/local_info/local_info.h" namespace LocalInfo { diff --git a/source/common/memory/stats.cc b/source/common/memory/stats.cc index 6fa2f01f1a5a3..f96c1cf1baaeb 100644 --- a/source/common/memory/stats.cc +++ b/source/common/memory/stats.cc @@ -1,5 +1,7 @@ #include "common/memory/stats.h" +#include + #ifdef TCMALLOC #include "gperftools/malloc_extension.h" diff --git a/source/common/memory/stats.h b/source/common/memory/stats.h index eb04b5306cfbd..a706f9a0d5ec7 100644 --- a/source/common/memory/stats.h +++ b/source/common/memory/stats.h @@ -1,5 +1,7 @@ #pragma once +#include + namespace Memory { /** diff --git a/source/common/mongo/bson_impl.cc b/source/common/mongo/bson_impl.cc index 3b6bfe2c3fd47..d3cc3a9e0ddec 100644 --- a/source/common/mongo/bson_impl.cc +++ b/source/common/mongo/bson_impl.cc @@ -1,5 +1,11 @@ #include "common/mongo/bson_impl.h" +#include + +#include +#include +#include + #include "common/common/assert.h" #include "common/common/hex.h" diff --git a/source/common/mongo/bson_impl.h b/source/common/mongo/bson_impl.h index 6383c3c742b90..2a5831f803395 100644 --- a/source/common/mongo/bson_impl.h +++ b/source/common/mongo/bson_impl.h @@ -1,5 +1,9 @@ #pragma once +#include +#include +#include + #include "envoy/buffer/buffer.h" #include "envoy/common/exception.h" #include "envoy/mongo/bson.h" diff --git a/source/common/mongo/codec_impl.cc b/source/common/mongo/codec_impl.cc index b1b025bbf0ebc..5ede1dbdf20b5 100644 --- a/source/common/mongo/codec_impl.cc +++ b/source/common/mongo/codec_impl.cc @@ -1,5 +1,13 @@ #include "common/mongo/codec_impl.h" +#include + +#include +#include +#include +#include +#include + #include "envoy/buffer/buffer.h" #include "envoy/common/exception.h" diff --git a/source/common/mongo/codec_impl.h b/source/common/mongo/codec_impl.h index 3da64a7397370..f2f234379fdee 100644 --- a/source/common/mongo/codec_impl.h +++ b/source/common/mongo/codec_impl.h @@ -1,5 +1,10 @@ #pragma once +#include +#include +#include +#include + #include "envoy/mongo/codec.h" #include "common/common/logger.h" diff --git a/source/common/mongo/proxy.cc b/source/common/mongo/proxy.cc index 95a6082154362..340d2404c8e66 100644 --- a/source/common/mongo/proxy.cc +++ b/source/common/mongo/proxy.cc @@ -1,5 +1,11 @@ #include "common/mongo/proxy.h" +#include + +#include +#include +#include + #include "envoy/common/exception.h" #include "envoy/filesystem/filesystem.h" #include "envoy/runtime/runtime.h" diff --git a/source/common/mongo/proxy.h b/source/common/mongo/proxy.h index c254ad4d849d5..102b22cacbd84 100644 --- a/source/common/mongo/proxy.h +++ b/source/common/mongo/proxy.h @@ -1,5 +1,11 @@ #pragma once +#include +#include +#include +#include +#include + #include "envoy/access_log/access_log.h" #include "envoy/common/time.h" #include "envoy/mongo/codec.h" diff --git a/source/common/mongo/utility.cc b/source/common/mongo/utility.cc index 7faacfc98e3e2..c7a5474aeda56 100644 --- a/source/common/mongo/utility.cc +++ b/source/common/mongo/utility.cc @@ -1,5 +1,7 @@ #include "common/mongo/utility.h" +#include + #include "envoy/common/exception.h" #include "common/json/json_loader.h" diff --git a/source/common/mongo/utility.h b/source/common/mongo/utility.h index c5ddd33d6e469..8176c0038cd66 100644 --- a/source/common/mongo/utility.h +++ b/source/common/mongo/utility.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "envoy/mongo/codec.h" namespace Mongo { diff --git a/source/common/network/address_impl.cc b/source/common/network/address_impl.cc index 94ce1432cbfbf..7a40a0d372719 100644 --- a/source/common/network/address_impl.cc +++ b/source/common/network/address_impl.cc @@ -1,5 +1,15 @@ #include "common/network/address_impl.h" +#include +#include +#include +#include +#include + +#include +#include +#include + #include "envoy/common/exception.h" #include "common/common/assert.h" diff --git a/source/common/network/address_impl.h b/source/common/network/address_impl.h index ef3f297d27546..2a91176738408 100644 --- a/source/common/network/address_impl.h +++ b/source/common/network/address_impl.h @@ -1,7 +1,14 @@ #pragma once +#include +#include +#include #include +#include +#include +#include + #include "envoy/network/address.h" namespace Network { diff --git a/source/common/network/cidr_range.cc b/source/common/network/cidr_range.cc index cb490b08308d2..46fa406e2c7fe 100644 --- a/source/common/network/cidr_range.cc +++ b/source/common/network/cidr_range.cc @@ -1,5 +1,15 @@ #include "common/network/cidr_range.h" +#include +#include +#include +#include + +#include +#include +#include +#include + #include "envoy/common/exception.h" #include "common/common/assert.h" diff --git a/source/common/network/cidr_range.h b/source/common/network/cidr_range.h index 059d7882313df..08e7ebfe6e951 100644 --- a/source/common/network/cidr_range.h +++ b/source/common/network/cidr_range.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "envoy/network/address.h" namespace Network { diff --git a/source/common/network/connection_impl.cc b/source/common/network/connection_impl.cc index f7c900ea28e72..906d75e20baca 100644 --- a/source/common/network/connection_impl.cc +++ b/source/common/network/connection_impl.cc @@ -1,5 +1,13 @@ #include "common/network/connection_impl.h" +#include +#include +#include +#include + +#include +#include + #include "envoy/common/exception.h" #include "envoy/event/timer.h" #include "envoy/network/filter.h" diff --git a/source/common/network/connection_impl.h b/source/common/network/connection_impl.h index 6d6e2031be8ee..78e3f1f02fc73 100644 --- a/source/common/network/connection_impl.h +++ b/source/common/network/connection_impl.h @@ -1,5 +1,11 @@ #pragma once +#include +#include +#include +#include +#include + #include "envoy/network/connection.h" #include "common/buffer/buffer_impl.h" diff --git a/source/common/network/dns_impl.cc b/source/common/network/dns_impl.cc index 68e225f7e9491..3aa27b6353c1d 100644 --- a/source/common/network/dns_impl.cc +++ b/source/common/network/dns_impl.cc @@ -1,5 +1,15 @@ #include "common/network/dns_impl.h" +#include +#include +#include + +#include +#include +#include +#include +#include + #include "common/common/assert.h" #include "common/network/address_impl.h" #include "common/network/utility.h" diff --git a/source/common/network/dns_impl.h b/source/common/network/dns_impl.h index 1863d5481fa88..d56d5ac80d779 100644 --- a/source/common/network/dns_impl.h +++ b/source/common/network/dns_impl.h @@ -1,5 +1,11 @@ #pragma once +#include + +#include +#include +#include + #include "envoy/event/dispatcher.h" #include "envoy/event/file_event.h" #include "envoy/network/dns.h" diff --git a/source/common/network/filter_manager_impl.cc b/source/common/network/filter_manager_impl.cc index 543909e57c5ca..1fe684e7418ae 100644 --- a/source/common/network/filter_manager_impl.cc +++ b/source/common/network/filter_manager_impl.cc @@ -1,5 +1,7 @@ #include "common/network/filter_manager_impl.h" +#include + #include "envoy/network/connection.h" #include "common/common/assert.h" diff --git a/source/common/network/filter_manager_impl.h b/source/common/network/filter_manager_impl.h index bf6ae99dda653..cdb7e9820b2db 100644 --- a/source/common/network/filter_manager_impl.h +++ b/source/common/network/filter_manager_impl.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + #include "envoy/network/filter.h" #include "common/common/linked_object.h" diff --git a/source/common/network/listen_socket_impl.cc b/source/common/network/listen_socket_impl.cc index 42a0e444b878d..99a5a1526b5e0 100644 --- a/source/common/network/listen_socket_impl.cc +++ b/source/common/network/listen_socket_impl.cc @@ -1,5 +1,11 @@ #include "common/network/listen_socket_impl.h" +#include +#include +#include + +#include + #include "envoy/common/exception.h" #include "common/common/assert.h" diff --git a/source/common/network/listen_socket_impl.h b/source/common/network/listen_socket_impl.h index bdc1f5ba505c5..3ae018240ea76 100644 --- a/source/common/network/listen_socket_impl.h +++ b/source/common/network/listen_socket_impl.h @@ -1,5 +1,10 @@ #pragma once +#include + +#include +#include + #include "envoy/network/listen_socket.h" #include "common/ssl/context_impl.h" diff --git a/source/common/network/listener_impl.cc b/source/common/network/listener_impl.cc index aafeed364ad1c..0db663abd15ba 100644 --- a/source/common/network/listener_impl.cc +++ b/source/common/network/listener_impl.cc @@ -1,5 +1,8 @@ #include "common/network/listener_impl.h" +#include +#include + #include "envoy/common/exception.h" #include "envoy/network/connection_handler.h" diff --git a/source/common/network/proxy_protocol.cc b/source/common/network/proxy_protocol.cc index 70a69ba0d1b71..4e82d970c6eee 100644 --- a/source/common/network/proxy_protocol.cc +++ b/source/common/network/proxy_protocol.cc @@ -1,5 +1,11 @@ #include "common/network/proxy_protocol.h" +#include + +#include +#include +#include + #include "envoy/common/exception.h" #include "envoy/event/dispatcher.h" #include "envoy/event/file_event.h" diff --git a/source/common/network/proxy_protocol.h b/source/common/network/proxy_protocol.h index 276d325041f13..1f92a64c9f8bc 100644 --- a/source/common/network/proxy_protocol.h +++ b/source/common/network/proxy_protocol.h @@ -1,5 +1,9 @@ #pragma once +#include +#include +#include + #include "envoy/event/dispatcher.h" #include "envoy/stats/stats_macros.h" diff --git a/source/common/network/utility.cc b/source/common/network/utility.cc index b268f7b73c85a..bc7499b3bb020 100644 --- a/source/common/network/utility.cc +++ b/source/common/network/utility.cc @@ -1,7 +1,17 @@ #include "common/network/utility.h" +#include #include #include +#include +#include +#include + +#include +#include +#include +#include +#include #include "envoy/common/exception.h" #include "envoy/network/connection.h" diff --git a/source/common/network/utility.h b/source/common/network/utility.h index 309e1e52d4b6e..6c7ed9f400490 100644 --- a/source/common/network/utility.h +++ b/source/common/network/utility.h @@ -1,5 +1,10 @@ #pragma once +#include +#include +#include +#include + #include "envoy/json/json_object.h" #include "envoy/network/connection.h" #include "envoy/stats/stats.h" diff --git a/source/common/profiler/profiler.cc b/source/common/profiler/profiler.cc index e24339b33f3b5..bba8f01dfb70e 100644 --- a/source/common/profiler/profiler.cc +++ b/source/common/profiler/profiler.cc @@ -1,5 +1,7 @@ #include "common/profiler/profiler.h" +#include + #ifdef TCMALLOC #include "gperftools/heap-profiler.h" diff --git a/source/common/profiler/profiler.h b/source/common/profiler/profiler.h index 1944ac27d1dd1..ce39549288203 100644 --- a/source/common/profiler/profiler.h +++ b/source/common/profiler/profiler.h @@ -1,5 +1,7 @@ #pragma once +#include + namespace Profiler { /** diff --git a/source/common/ratelimit/ratelimit_impl.cc b/source/common/ratelimit/ratelimit_impl.cc index 3410f9467dd2d..7c81348709958 100644 --- a/source/common/ratelimit/ratelimit_impl.cc +++ b/source/common/ratelimit/ratelimit_impl.cc @@ -1,5 +1,12 @@ #include "common/ratelimit/ratelimit_impl.h" +#include + +#include +#include +#include +#include + #include "envoy/tracing/context.h" #include "common/common/assert.h" diff --git a/source/common/ratelimit/ratelimit_impl.h b/source/common/ratelimit/ratelimit_impl.h index 4ce3ef493670a..9e868d360e6a5 100644 --- a/source/common/ratelimit/ratelimit_impl.h +++ b/source/common/ratelimit/ratelimit_impl.h @@ -1,5 +1,10 @@ #pragma once +#include +#include +#include +#include + #include "envoy/grpc/rpc_channel.h" #include "envoy/ratelimit/ratelimit.h" #include "envoy/tracing/context.h" diff --git a/source/common/redis/codec_impl.cc b/source/common/redis/codec_impl.cc index 50f85bdc4f0f9..5d753bc6ce203 100644 --- a/source/common/redis/codec_impl.cc +++ b/source/common/redis/codec_impl.cc @@ -1,5 +1,11 @@ #include "common/redis/codec_impl.h" +#include + +#include +#include +#include + #include "common/common/assert.h" #include "common/common/utility.h" diff --git a/source/common/redis/codec_impl.h b/source/common/redis/codec_impl.h index d59ad939db676..2fe18955342a4 100644 --- a/source/common/redis/codec_impl.h +++ b/source/common/redis/codec_impl.h @@ -1,5 +1,10 @@ #pragma once +#include +#include +#include +#include + #include "envoy/redis/codec.h" #include "common/common/logger.h" diff --git a/source/common/redis/command_splitter_impl.cc b/source/common/redis/command_splitter_impl.cc index 02a395fe6de40..e87d9a946dcc9 100644 --- a/source/common/redis/command_splitter_impl.cc +++ b/source/common/redis/command_splitter_impl.cc @@ -1,5 +1,12 @@ #include "common/redis/command_splitter_impl.h" +#include + +#include +#include +#include +#include + #include "common/common/assert.h" namespace Redis { diff --git a/source/common/redis/command_splitter_impl.h b/source/common/redis/command_splitter_impl.h index 1a003a730c08d..3bc63d81ad6cc 100644 --- a/source/common/redis/command_splitter_impl.h +++ b/source/common/redis/command_splitter_impl.h @@ -1,5 +1,10 @@ #pragma once +#include +#include +#include +#include + #include "envoy/redis/command_splitter.h" #include "envoy/redis/conn_pool.h" diff --git a/source/common/redis/conn_pool_impl.cc b/source/common/redis/conn_pool_impl.cc index ef3d97efb0c0b..0daea90ba175f 100644 --- a/source/common/redis/conn_pool_impl.cc +++ b/source/common/redis/conn_pool_impl.cc @@ -1,5 +1,10 @@ #include "common/redis/conn_pool_impl.h" +#include +#include +#include +#include + #include "common/common/assert.h" #include "common/json/config_schemas.h" diff --git a/source/common/redis/conn_pool_impl.h b/source/common/redis/conn_pool_impl.h index 1e6269bdb83ed..114563b2cf5b8 100644 --- a/source/common/redis/conn_pool_impl.h +++ b/source/common/redis/conn_pool_impl.h @@ -1,5 +1,13 @@ #pragma once +#include +#include +#include +#include +#include +#include +#include + #include "envoy/redis/conn_pool.h" #include "envoy/thread_local/thread_local.h" #include "envoy/upstream/cluster_manager.h" diff --git a/source/common/redis/proxy_filter.cc b/source/common/redis/proxy_filter.cc index e854446e71ffb..66950235cfd9d 100644 --- a/source/common/redis/proxy_filter.cc +++ b/source/common/redis/proxy_filter.cc @@ -1,5 +1,10 @@ #include "common/redis/proxy_filter.h" +#include + +#include +#include + #include "common/common/assert.h" #include "common/json/config_schemas.h" diff --git a/source/common/redis/proxy_filter.h b/source/common/redis/proxy_filter.h index 23150b9576a68..660c9bceafb0f 100644 --- a/source/common/redis/proxy_filter.h +++ b/source/common/redis/proxy_filter.h @@ -1,5 +1,10 @@ #pragma once +#include +#include +#include +#include + #include "envoy/network/filter.h" #include "envoy/redis/codec.h" #include "envoy/redis/command_splitter.h" diff --git a/source/common/router/config_impl.cc b/source/common/router/config_impl.cc index 5a971f3844879..99ca17a0b4b49 100644 --- a/source/common/router/config_impl.cc +++ b/source/common/router/config_impl.cc @@ -1,5 +1,15 @@ #include "common/router/config_impl.h" +#include + +#include +#include +#include +#include +#include +#include +#include + #include "envoy/http/header_map.h" #include "envoy/runtime/runtime.h" #include "envoy/upstream/cluster_manager.h" diff --git a/source/common/router/config_impl.h b/source/common/router/config_impl.h index 5ed1959c1665d..0d58b27fe6711 100644 --- a/source/common/router/config_impl.h +++ b/source/common/router/config_impl.h @@ -1,5 +1,15 @@ #pragma once +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include "envoy/common/optional.h" #include "envoy/router/router.h" #include "envoy/runtime/runtime.h" diff --git a/source/common/router/config_utility.cc b/source/common/router/config_utility.cc index 340e035d569b8..e783dd2bcc23d 100644 --- a/source/common/router/config_utility.cc +++ b/source/common/router/config_utility.cc @@ -1,5 +1,9 @@ #include "common/router/config_utility.h" +#include +#include +#include + #include "common/common/assert.h" namespace Router { diff --git a/source/common/router/config_utility.h b/source/common/router/config_utility.h index 54ddfd9ab77f9..5c10826322e2b 100644 --- a/source/common/router/config_utility.h +++ b/source/common/router/config_utility.h @@ -1,5 +1,9 @@ #pragma once +#include +#include +#include + #include "envoy/json/json_object.h" #include "envoy/upstream/resource_manager.h" diff --git a/source/common/router/rds_impl.cc b/source/common/router/rds_impl.cc index f706b455c5ceb..2f333d37d1971 100644 --- a/source/common/router/rds_impl.cc +++ b/source/common/router/rds_impl.cc @@ -1,5 +1,12 @@ #include "common/router/rds_impl.h" +#include + +#include +#include +#include +#include + #include "common/common/assert.h" #include "common/json/config_schemas.h" #include "common/router/config_impl.h" diff --git a/source/common/router/rds_impl.h b/source/common/router/rds_impl.h index 95eea7b21e613..b08cfce6c1d82 100644 --- a/source/common/router/rds_impl.h +++ b/source/common/router/rds_impl.h @@ -1,5 +1,9 @@ #pragma once +#include +#include +#include + #include "envoy/init/init.h" #include "envoy/json/json_object.h" #include "envoy/local_info/local_info.h" diff --git a/source/common/router/retry_state_impl.cc b/source/common/router/retry_state_impl.cc index 457b42a895a7f..bbd48c39526ce 100644 --- a/source/common/router/retry_state_impl.cc +++ b/source/common/router/retry_state_impl.cc @@ -1,5 +1,10 @@ #include "common/router/retry_state_impl.h" +#include +#include +#include +#include + #include "common/common/assert.h" #include "common/common/utility.h" #include "common/http/codes.h" diff --git a/source/common/router/retry_state_impl.h b/source/common/router/retry_state_impl.h index 018dd8423ee50..c1b7211b93f3a 100644 --- a/source/common/router/retry_state_impl.h +++ b/source/common/router/retry_state_impl.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + #include "envoy/common/optional.h" #include "envoy/event/timer.h" #include "envoy/http/codec.h" diff --git a/source/common/router/router.cc b/source/common/router/router.cc index 2e7369ef40a15..c6d8e509dfea5 100644 --- a/source/common/router/router.cc +++ b/source/common/router/router.cc @@ -1,5 +1,9 @@ #include "common/router/router.h" +#include +#include +#include + #include "envoy/event/dispatcher.h" #include "envoy/event/timer.h" #include "envoy/http/conn_pool.h" diff --git a/source/common/router/router.h b/source/common/router/router.h index dad1323f3cf1b..9a2299a13a7f4 100644 --- a/source/common/router/router.h +++ b/source/common/router/router.h @@ -1,5 +1,10 @@ #pragma once +#include +#include +#include +#include + #include "envoy/http/codec.h" #include "envoy/http/codes.h" #include "envoy/http/filter.h" diff --git a/source/common/router/router_ratelimit.cc b/source/common/router/router_ratelimit.cc index c853786f4f0d8..ef4d61527e6ab 100644 --- a/source/common/router/router_ratelimit.cc +++ b/source/common/router/router_ratelimit.cc @@ -1,5 +1,10 @@ #include "common/router/router_ratelimit.h" +#include +#include +#include +#include + #include "common/common/assert.h" #include "common/common/empty_string.h" #include "common/json/config_schemas.h" diff --git a/source/common/router/router_ratelimit.h b/source/common/router/router_ratelimit.h index 79133b7f77fc9..9fe5ff2662185 100644 --- a/source/common/router/router_ratelimit.h +++ b/source/common/router/router_ratelimit.h @@ -1,5 +1,10 @@ #pragma once +#include +#include +#include +#include + #include "envoy/router/router.h" #include "envoy/router/router_ratelimit.h" diff --git a/source/common/router/shadow_writer_impl.cc b/source/common/router/shadow_writer_impl.cc index 574d83f854326..b058e1f3748ec 100644 --- a/source/common/router/shadow_writer_impl.cc +++ b/source/common/router/shadow_writer_impl.cc @@ -1,5 +1,8 @@ #include "common/router/shadow_writer_impl.h" +#include +#include + #include "common/common/assert.h" #include "common/http/headers.h" diff --git a/source/common/router/shadow_writer_impl.h b/source/common/router/shadow_writer_impl.h index 658c3375d9545..18fcb9112a402 100644 --- a/source/common/router/shadow_writer_impl.h +++ b/source/common/router/shadow_writer_impl.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + #include "envoy/router/shadow_writer.h" #include "envoy/upstream/cluster_manager.h" diff --git a/source/common/runtime/runtime_impl.cc b/source/common/runtime/runtime_impl.cc index a22c1a422cc8f..a14d415e621bf 100644 --- a/source/common/runtime/runtime_impl.cc +++ b/source/common/runtime/runtime_impl.cc @@ -1,8 +1,12 @@ #include "common/runtime/runtime_impl.h" #include +#include #include +#include +#include + #include "envoy/event/dispatcher.h" #include "envoy/stats/stats.h" #include "envoy/thread_local/thread_local.h" diff --git a/source/common/runtime/runtime_impl.h b/source/common/runtime/runtime_impl.h index 097bfc7a5f59d..85e954bce2aad 100644 --- a/source/common/runtime/runtime_impl.h +++ b/source/common/runtime/runtime_impl.h @@ -1,6 +1,13 @@ #pragma once #include +#include + +#include +#include +#include +#include +#include #include "envoy/common/exception.h" #include "envoy/common/optional.h" diff --git a/source/common/runtime/uuid_util.cc b/source/common/runtime/uuid_util.cc index 847856f6dfefc..3cf37b821b6dd 100644 --- a/source/common/runtime/uuid_util.cc +++ b/source/common/runtime/uuid_util.cc @@ -1,5 +1,8 @@ #include "common/runtime/uuid_util.h" +#include +#include + #include "common/common/utility.h" #include "common/runtime/runtime_impl.h" diff --git a/source/common/runtime/uuid_util.h b/source/common/runtime/uuid_util.h index c4b9210435970..78fd8982b72f0 100644 --- a/source/common/runtime/uuid_util.h +++ b/source/common/runtime/uuid_util.h @@ -1,5 +1,7 @@ #pragma once +#include + enum class UuidTraceStatus { NoTrace, Sampled, Client, Forced }; /* diff --git a/source/common/ssl/connection_impl.cc b/source/common/ssl/connection_impl.cc index a4d185ee00b00..83fefc0fd2082 100644 --- a/source/common/ssl/connection_impl.cc +++ b/source/common/ssl/connection_impl.cc @@ -1,5 +1,9 @@ #include "common/ssl/connection_impl.h" +#include +#include +#include + #include "common/common/assert.h" #include "common/common/empty_string.h" #include "common/common/hex.h" diff --git a/source/common/ssl/connection_impl.h b/source/common/ssl/connection_impl.h index a130b6c5f19c1..86e73e659c82a 100644 --- a/source/common/ssl/connection_impl.h +++ b/source/common/ssl/connection_impl.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + #include "common/network/connection_impl.h" #include "common/ssl/context_impl.h" diff --git a/source/common/ssl/context_config_impl.cc b/source/common/ssl/context_config_impl.cc index 003fd5492b211..fa45a07ddb910 100644 --- a/source/common/ssl/context_config_impl.cc +++ b/source/common/ssl/context_config_impl.cc @@ -1,5 +1,7 @@ #include "common/ssl/context_config_impl.h" +#include + #include "openssl/ssl.h" namespace Ssl { diff --git a/source/common/ssl/context_config_impl.h b/source/common/ssl/context_config_impl.h index c4c8b39da8827..5d7b167ecb4ed 100644 --- a/source/common/ssl/context_config_impl.h +++ b/source/common/ssl/context_config_impl.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + #include "envoy/ssl/context_config.h" #include "common/json/json_loader.h" diff --git a/source/common/ssl/context_impl.cc b/source/common/ssl/context_impl.cc index c5fcff60e5e8d..db6bddff0bdd9 100644 --- a/source/common/ssl/context_impl.cc +++ b/source/common/ssl/context_impl.cc @@ -1,5 +1,12 @@ #include "common/ssl/context_impl.h" +#include + +#include +#include +#include +#include + #include "envoy/common/exception.h" #include "envoy/runtime/runtime.h" diff --git a/source/common/ssl/context_impl.h b/source/common/ssl/context_impl.h index ebe3257404245..9cace7bee7404 100644 --- a/source/common/ssl/context_impl.h +++ b/source/common/ssl/context_impl.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + #include "envoy/runtime/runtime.h" #include "envoy/ssl/context.h" #include "envoy/ssl/context_config.h" diff --git a/source/common/ssl/context_manager_impl.cc b/source/common/ssl/context_manager_impl.cc index 7d89881f22290..8583b1c0167a4 100644 --- a/source/common/ssl/context_manager_impl.cc +++ b/source/common/ssl/context_manager_impl.cc @@ -1,5 +1,8 @@ #include "common/ssl/context_manager_impl.h" +#include +#include + #include "common/common/assert.h" #include "common/ssl/context_impl.h" diff --git a/source/common/ssl/context_manager_impl.h b/source/common/ssl/context_manager_impl.h index 9272a3feba51c..94b3a6fa89fcf 100644 --- a/source/common/ssl/context_manager_impl.h +++ b/source/common/ssl/context_manager_impl.h @@ -1,5 +1,9 @@ #pragma once +#include +#include +#include + #include "envoy/runtime/runtime.h" #include "envoy/ssl/context_manager.h" diff --git a/source/common/ssl/openssl.cc b/source/common/ssl/openssl.cc index 8d6352a751366..28dd7a0b511b9 100644 --- a/source/common/ssl/openssl.cc +++ b/source/common/ssl/openssl.cc @@ -1,5 +1,8 @@ #include "common/ssl/openssl.h" +#include +#include + #include "common/common/assert.h" #include "openssl/rand.h" diff --git a/source/common/ssl/openssl.h b/source/common/ssl/openssl.h index 6ff7dc5129081..c0ef68478c460 100644 --- a/source/common/ssl/openssl.h +++ b/source/common/ssl/openssl.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + #include "common/common/c_smart_ptr.h" #include "openssl/ssl.h" diff --git a/source/common/stats/stats_impl.cc b/source/common/stats/stats_impl.cc index 961ed73afb8a3..122881eb3ff20 100644 --- a/source/common/stats/stats_impl.cc +++ b/source/common/stats/stats_impl.cc @@ -1,5 +1,10 @@ #include "common/stats/stats_impl.h" +#include + +#include +#include + #include "common/common/utility.h" namespace Stats { diff --git a/source/common/stats/stats_impl.h b/source/common/stats/stats_impl.h index 936cd639af434..5a9adf32fd636 100644 --- a/source/common/stats/stats_impl.h +++ b/source/common/stats/stats_impl.h @@ -1,5 +1,14 @@ #pragma once +#include +#include +#include +#include +#include +#include +#include +#include + #include "envoy/common/time.h" #include "envoy/stats/stats.h" diff --git a/source/common/stats/statsd.cc b/source/common/stats/statsd.cc index 2f57a0d4e7d9a..40dc056589adf 100644 --- a/source/common/stats/statsd.cc +++ b/source/common/stats/statsd.cc @@ -1,5 +1,11 @@ #include "common/stats/statsd.h" +#include + +#include +#include +#include + #include "envoy/common/exception.h" #include "envoy/event/dispatcher.h" #include "envoy/upstream/cluster_manager.h" diff --git a/source/common/stats/statsd.h b/source/common/stats/statsd.h index 0f8a7fc55f660..43e4e7b271903 100644 --- a/source/common/stats/statsd.h +++ b/source/common/stats/statsd.h @@ -1,5 +1,9 @@ #pragma once +#include +#include +#include + #include "envoy/local_info/local_info.h" #include "envoy/network/connection.h" #include "envoy/stats/stats.h" diff --git a/source/common/stats/thread_local_store.cc b/source/common/stats/thread_local_store.cc index 8bd65556ac188..d9b340e86ba50 100644 --- a/source/common/stats/thread_local_store.cc +++ b/source/common/stats/thread_local_store.cc @@ -1,5 +1,13 @@ #include "common/stats/thread_local_store.h" +#include +#include +#include +#include +#include +#include +#include + namespace Stats { ThreadLocalStoreImpl::ThreadLocalStoreImpl(RawStatDataAllocator& alloc) diff --git a/source/common/stats/thread_local_store.h b/source/common/stats/thread_local_store.h index 228529dc147e7..7602e1d4a2057 100644 --- a/source/common/stats/thread_local_store.h +++ b/source/common/stats/thread_local_store.h @@ -1,5 +1,14 @@ #pragma once +#include +#include +#include +#include +#include +#include +#include +#include + #include "envoy/thread_local/thread_local.h" #include "common/stats/stats_impl.h" diff --git a/source/common/thread_local/thread_local_impl.cc b/source/common/thread_local/thread_local_impl.cc index b36f1b33624db..f4e05c7ee250f 100644 --- a/source/common/thread_local/thread_local_impl.cc +++ b/source/common/thread_local/thread_local_impl.cc @@ -1,5 +1,9 @@ #include "common/thread_local/thread_local_impl.h" +#include +#include +#include + #include "envoy/event/dispatcher.h" #include "common/common/assert.h" diff --git a/source/common/thread_local/thread_local_impl.h b/source/common/thread_local/thread_local_impl.h index dbe2544e37667..1031cfcee552e 100644 --- a/source/common/thread_local/thread_local_impl.h +++ b/source/common/thread_local/thread_local_impl.h @@ -1,5 +1,10 @@ #pragma once +#include +#include +#include +#include + #include "envoy/thread_local/thread_local.h" #include "common/common/logger.h" diff --git a/source/common/tracing/http_tracer_impl.cc b/source/common/tracing/http_tracer_impl.cc index 6d4ad6e90f04a..8482656dc8481 100644 --- a/source/common/tracing/http_tracer_impl.cc +++ b/source/common/tracing/http_tracer_impl.cc @@ -1,5 +1,9 @@ #include "common/tracing/http_tracer_impl.h" +#include + +#include + #include "common/common/assert.h" #include "common/common/macros.h" #include "common/common/utility.h" diff --git a/source/common/tracing/http_tracer_impl.h b/source/common/tracing/http_tracer_impl.h index a2615e67bcc55..5b5e71620aac5 100644 --- a/source/common/tracing/http_tracer_impl.h +++ b/source/common/tracing/http_tracer_impl.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "envoy/local_info/local_info.h" #include "envoy/runtime/runtime.h" #include "envoy/thread_local/thread_local.h" diff --git a/source/common/tracing/lightstep_tracer_impl.cc b/source/common/tracing/lightstep_tracer_impl.cc index 56f9ccf20d397..13c2b9e6d9932 100644 --- a/source/common/tracing/lightstep_tracer_impl.cc +++ b/source/common/tracing/lightstep_tracer_impl.cc @@ -1,5 +1,12 @@ #include "common/tracing/lightstep_tracer_impl.h" +#include + +#include +#include +#include +#include + #include "common/common/base64.h" #include "common/grpc/common.h" #include "common/http/message_impl.h" diff --git a/source/common/tracing/lightstep_tracer_impl.h b/source/common/tracing/lightstep_tracer_impl.h index 68925f2f08fc0..741979383597f 100644 --- a/source/common/tracing/lightstep_tracer_impl.h +++ b/source/common/tracing/lightstep_tracer_impl.h @@ -1,5 +1,9 @@ #pragma once +#include +#include +#include + #include "envoy/runtime/runtime.h" #include "envoy/thread_local/thread_local.h" #include "envoy/tracing/http_tracer.h" diff --git a/source/common/upstream/cds_api_impl.cc b/source/common/upstream/cds_api_impl.cc index 93ed43e9f8a2e..c0f6922dcafa3 100644 --- a/source/common/upstream/cds_api_impl.cc +++ b/source/common/upstream/cds_api_impl.cc @@ -1,5 +1,11 @@ #include "common/upstream/cds_api_impl.h" +#include + +#include +#include +#include + #include "common/common/assert.h" #include "common/http/headers.h" #include "common/json/config_schemas.h" diff --git a/source/common/upstream/cds_api_impl.h b/source/common/upstream/cds_api_impl.h index 0955478bc40a8..05c7b495b2fee 100644 --- a/source/common/upstream/cds_api_impl.h +++ b/source/common/upstream/cds_api_impl.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "envoy/event/dispatcher.h" #include "envoy/json/json_object.h" #include "envoy/local_info/local_info.h" diff --git a/source/common/upstream/cluster_manager_impl.cc b/source/common/upstream/cluster_manager_impl.cc index e2517e341e637..49771a590dbd9 100644 --- a/source/common/upstream/cluster_manager_impl.cc +++ b/source/common/upstream/cluster_manager_impl.cc @@ -1,5 +1,14 @@ #include "common/upstream/cluster_manager_impl.h" +#include + +#include +#include +#include +#include +#include +#include + #include "envoy/event/dispatcher.h" #include "envoy/network/dns.h" #include "envoy/runtime/runtime.h" diff --git a/source/common/upstream/cluster_manager_impl.h b/source/common/upstream/cluster_manager_impl.h index 8f53e8c92418e..7cb7f194cde1c 100644 --- a/source/common/upstream/cluster_manager_impl.h +++ b/source/common/upstream/cluster_manager_impl.h @@ -1,5 +1,14 @@ #pragma once +#include +#include +#include +#include +#include +#include +#include +#include + #include "envoy/http/codes.h" #include "envoy/local_info/local_info.h" #include "envoy/runtime/runtime.h" diff --git a/source/common/upstream/health_checker_impl.cc b/source/common/upstream/health_checker_impl.cc index 053b3dffecff2..ff41cfe0e7246 100644 --- a/source/common/upstream/health_checker_impl.cc +++ b/source/common/upstream/health_checker_impl.cc @@ -1,5 +1,10 @@ #include "common/upstream/health_checker_impl.h" +#include +#include +#include +#include + #include "envoy/event/dispatcher.h" #include "envoy/event/timer.h" #include "envoy/http/codes.h" diff --git a/source/common/upstream/health_checker_impl.h b/source/common/upstream/health_checker_impl.h index 2aefa2b6579d2..792a59cba5966 100644 --- a/source/common/upstream/health_checker_impl.h +++ b/source/common/upstream/health_checker_impl.h @@ -1,5 +1,13 @@ #pragma once +#include +#include +#include +#include +#include +#include +#include + #include "envoy/event/timer.h" #include "envoy/http/codec.h" #include "envoy/network/connection.h" diff --git a/source/common/upstream/host_utility.cc b/source/common/upstream/host_utility.cc index 0f970db151b4b..b30fbc69e400b 100644 --- a/source/common/upstream/host_utility.cc +++ b/source/common/upstream/host_utility.cc @@ -1,5 +1,7 @@ #include "common/upstream/host_utility.h" +#include + namespace Upstream { std::string HostUtility::healthFlagsToString(const Host& host) { diff --git a/source/common/upstream/host_utility.h b/source/common/upstream/host_utility.h index ff9b9946cda26..eaa31a05fab30 100644 --- a/source/common/upstream/host_utility.h +++ b/source/common/upstream/host_utility.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "envoy/upstream/upstream.h" namespace Upstream { diff --git a/source/common/upstream/load_balancer_impl.cc b/source/common/upstream/load_balancer_impl.cc index 9e5401a0c1e71..a20f7c619bcb4 100644 --- a/source/common/upstream/load_balancer_impl.cc +++ b/source/common/upstream/load_balancer_impl.cc @@ -1,5 +1,9 @@ #include "common/upstream/load_balancer_impl.h" +#include +#include +#include + #include "envoy/runtime/runtime.h" #include "envoy/stats/stats.h" #include "envoy/upstream/upstream.h" diff --git a/source/common/upstream/load_balancer_impl.h b/source/common/upstream/load_balancer_impl.h index c1c4140821b4e..2f2c59cd44d06 100644 --- a/source/common/upstream/load_balancer_impl.h +++ b/source/common/upstream/load_balancer_impl.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + #include "envoy/runtime/runtime.h" #include "envoy/upstream/load_balancer.h" #include "envoy/upstream/upstream.h" diff --git a/source/common/upstream/logical_dns_cluster.cc b/source/common/upstream/logical_dns_cluster.cc index 25ae7a75440bb..39474b390e293 100644 --- a/source/common/upstream/logical_dns_cluster.cc +++ b/source/common/upstream/logical_dns_cluster.cc @@ -1,5 +1,10 @@ #include "common/upstream/logical_dns_cluster.h" +#include +#include +#include +#include + #include "common/network/address_impl.h" #include "common/network/utility.h" diff --git a/source/common/upstream/logical_dns_cluster.h b/source/common/upstream/logical_dns_cluster.h index 7602b1b80d585..477be7e0b4aee 100644 --- a/source/common/upstream/logical_dns_cluster.h +++ b/source/common/upstream/logical_dns_cluster.h @@ -1,5 +1,10 @@ #pragma once +#include +#include +#include +#include + #include "envoy/thread_local/thread_local.h" #include "common/common/empty_string.h" diff --git a/source/common/upstream/outlier_detection_impl.cc b/source/common/upstream/outlier_detection_impl.cc index b77e5a8913b13..702ca1d4848b5 100644 --- a/source/common/upstream/outlier_detection_impl.cc +++ b/source/common/upstream/outlier_detection_impl.cc @@ -1,5 +1,13 @@ #include "common/upstream/outlier_detection_impl.h" +#include + +#include +#include +#include +#include +#include + #include "envoy/event/dispatcher.h" #include "common/common/assert.h" diff --git a/source/common/upstream/outlier_detection_impl.h b/source/common/upstream/outlier_detection_impl.h index fc391d78c5908..efa1ead89cdd4 100644 --- a/source/common/upstream/outlier_detection_impl.h +++ b/source/common/upstream/outlier_detection_impl.h @@ -1,5 +1,14 @@ #pragma once +#include +#include +#include +#include +#include +#include +#include +#include + #include "envoy/access_log/access_log.h" #include "envoy/event/timer.h" #include "envoy/runtime/runtime.h" diff --git a/source/common/upstream/resource_manager_impl.h b/source/common/upstream/resource_manager_impl.h index 11dfe45eba35f..ad0f28fdd078f 100644 --- a/source/common/upstream/resource_manager_impl.h +++ b/source/common/upstream/resource_manager_impl.h @@ -1,5 +1,10 @@ #pragma once +#include +#include +#include +#include + #include "envoy/runtime/runtime.h" #include "envoy/upstream/resource_manager.h" diff --git a/source/common/upstream/ring_hash_lb.cc b/source/common/upstream/ring_hash_lb.cc index 6c5fa1344823d..535b1b00dc17a 100644 --- a/source/common/upstream/ring_hash_lb.cc +++ b/source/common/upstream/ring_hash_lb.cc @@ -1,5 +1,9 @@ #include "common/upstream/ring_hash_lb.h" +#include +#include +#include + #include "common/common/assert.h" #include "common/upstream/load_balancer_impl.h" diff --git a/source/common/upstream/ring_hash_lb.h b/source/common/upstream/ring_hash_lb.h index c19e4f0b755b4..0ed24ecd0ee72 100644 --- a/source/common/upstream/ring_hash_lb.h +++ b/source/common/upstream/ring_hash_lb.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + #include "envoy/runtime/runtime.h" #include "envoy/upstream/load_balancer.h" diff --git a/source/common/upstream/sds.cc b/source/common/upstream/sds.cc index eab52cf78a8a6..442a5588e97c1 100644 --- a/source/common/upstream/sds.cc +++ b/source/common/upstream/sds.cc @@ -1,5 +1,9 @@ #include "common/upstream/sds.h" +#include +#include +#include + #include "common/http/headers.h" #include "common/json/config_schemas.h" #include "common/network/address_impl.h" diff --git a/source/common/upstream/sds.h b/source/common/upstream/sds.h index 838da76066298..80e93efa7b459 100644 --- a/source/common/upstream/sds.h +++ b/source/common/upstream/sds.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + #include "envoy/local_info/local_info.h" #include "common/http/rest_api_fetcher.h" diff --git a/source/common/upstream/upstream_impl.cc b/source/common/upstream/upstream_impl.cc index 821ecd6cea3bd..dace59e6fb402 100644 --- a/source/common/upstream/upstream_impl.cc +++ b/source/common/upstream/upstream_impl.cc @@ -1,5 +1,15 @@ #include "common/upstream/upstream_impl.h" +#include + +#include +#include +#include +#include +#include +#include +#include + #include "envoy/event/dispatcher.h" #include "envoy/event/timer.h" #include "envoy/network/dns.h" diff --git a/source/common/upstream/upstream_impl.h b/source/common/upstream/upstream_impl.h index fa239944ce908..13cab2346e35e 100644 --- a/source/common/upstream/upstream_impl.h +++ b/source/common/upstream/upstream_impl.h @@ -1,5 +1,15 @@ #pragma once +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include "envoy/event/timer.h" #include "envoy/local_info/local_info.h" #include "envoy/network/dns.h" diff --git a/source/exe/hot_restart.cc b/source/exe/hot_restart.cc index 8f582768ebbdd..f46453bb1ec95 100644 --- a/source/exe/hot_restart.cc +++ b/source/exe/hot_restart.cc @@ -1,7 +1,15 @@ #include "exe/hot_restart.h" +#include +#include #include #include +#include +#include +#include + +#include +#include #include "envoy/event/dispatcher.h" #include "envoy/event/file_event.h" diff --git a/source/exe/hot_restart.h b/source/exe/hot_restart.h index 1e059cc824cc4..c3ef3abf61823 100644 --- a/source/exe/hot_restart.h +++ b/source/exe/hot_restart.h @@ -3,6 +3,11 @@ #include #include +#include +#include +#include +#include + #include "envoy/server/hot_restart.h" #include "envoy/server/options.h" diff --git a/source/exe/main.cc b/source/exe/main.cc index 0458735332357..e9f2996a651d2 100644 --- a/source/exe/main.cc +++ b/source/exe/main.cc @@ -1,3 +1,8 @@ +#include + +#include +#include + #include "common/event/libevent.h" #include "common/local_info/local_info_impl.h" #include "common/network/utility.h" diff --git a/source/precompiled/BUILD b/source/precompiled/BUILD index 5bb7ded5484c1..bb61ff2049832 100644 --- a/source/precompiled/BUILD +++ b/source/precompiled/BUILD @@ -1,10 +1 @@ -package(default_visibility = ["//visibility:public"]) - -load("//bazel:envoy_build_system.bzl", "envoy_external_dep_path") - -cc_library( - name = "precompiled_includes", - hdrs = ["precompiled.h"], - include_prefix = "precompiled", - deps = [envoy_external_dep_path("spdlog")], -) +# TODO(htuch): Nuke this directory when cmake is no more. diff --git a/source/server/config/http/buffer.cc b/source/server/config/http/buffer.cc index 225275de73c97..c659795d464fe 100644 --- a/source/server/config/http/buffer.cc +++ b/source/server/config/http/buffer.cc @@ -1,5 +1,9 @@ #include "server/config/http/buffer.h" +#include +#include +#include + #include "common/http/filter/buffer_filter.h" #include "common/json/config_schemas.h" diff --git a/source/server/config/http/buffer.h b/source/server/config/http/buffer.h index 3749d62169f7d..9d95bc0ed7af9 100644 --- a/source/server/config/http/buffer.h +++ b/source/server/config/http/buffer.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "envoy/server/instance.h" #include "server/config/network/http_connection_manager.h" diff --git a/source/server/config/http/dynamo.cc b/source/server/config/http/dynamo.cc index 4e0aa9af4b20f..1758b890761fb 100644 --- a/source/server/config/http/dynamo.cc +++ b/source/server/config/http/dynamo.cc @@ -1,5 +1,7 @@ #include "server/config/http/dynamo.h" +#include + #include "common/dynamo/dynamo_filter.h" namespace Server { diff --git a/source/server/config/http/dynamo.h b/source/server/config/http/dynamo.h index affb4284db6fb..469b31131e5b8 100644 --- a/source/server/config/http/dynamo.h +++ b/source/server/config/http/dynamo.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "server/config/network/http_connection_manager.h" namespace Server { diff --git a/source/server/config/http/fault.cc b/source/server/config/http/fault.cc index 3f97d8cec7d93..53eb1dff890b6 100644 --- a/source/server/config/http/fault.cc +++ b/source/server/config/http/fault.cc @@ -1,5 +1,7 @@ #include "server/config/http/fault.h" +#include + #include "common/http/filter/fault_filter.h" #include "common/json/config_schemas.h" diff --git a/source/server/config/http/fault.h b/source/server/config/http/fault.h index 064d06ed06302..0007f01b34929 100644 --- a/source/server/config/http/fault.h +++ b/source/server/config/http/fault.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "envoy/server/instance.h" #include "server/config/network/http_connection_manager.h" diff --git a/source/server/config/http/grpc_http1_bridge.cc b/source/server/config/http/grpc_http1_bridge.cc index 61e42d6866f8f..929f03db13fb6 100644 --- a/source/server/config/http/grpc_http1_bridge.cc +++ b/source/server/config/http/grpc_http1_bridge.cc @@ -1,5 +1,7 @@ #include "server/config/http/grpc_http1_bridge.h" +#include + #include "common/grpc/http1_bridge_filter.h" namespace Server { diff --git a/source/server/config/http/grpc_http1_bridge.h b/source/server/config/http/grpc_http1_bridge.h index 8347e2f9dbc1b..eeee5f147dddb 100644 --- a/source/server/config/http/grpc_http1_bridge.h +++ b/source/server/config/http/grpc_http1_bridge.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "envoy/server/instance.h" #include "server/config/network/http_connection_manager.h" diff --git a/source/server/config/http/ratelimit.cc b/source/server/config/http/ratelimit.cc index 4e7657b40b7dc..19871692da804 100644 --- a/source/server/config/http/ratelimit.cc +++ b/source/server/config/http/ratelimit.cc @@ -1,5 +1,8 @@ #include "server/config/http/ratelimit.h" +#include +#include + #include "common/http/filter/ratelimit.h" namespace Server { diff --git a/source/server/config/http/ratelimit.h b/source/server/config/http/ratelimit.h index 19678efee3510..5cee3ceae2ffe 100644 --- a/source/server/config/http/ratelimit.h +++ b/source/server/config/http/ratelimit.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "envoy/server/instance.h" #include "server/config/network/http_connection_manager.h" diff --git a/source/server/config/http/router.cc b/source/server/config/http/router.cc index 1e0b72f08b8bf..c796acaf4f79f 100644 --- a/source/server/config/http/router.cc +++ b/source/server/config/http/router.cc @@ -1,5 +1,7 @@ #include "server/config/http/router.h" +#include + #include "common/json/config_schemas.h" #include "common/router/router.h" #include "common/router/shadow_writer_impl.h" diff --git a/source/server/config/http/router.h b/source/server/config/http/router.h index e4c8867a24e9f..e890ed16e08d9 100644 --- a/source/server/config/http/router.h +++ b/source/server/config/http/router.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "envoy/server/instance.h" #include "server/config/network/http_connection_manager.h" diff --git a/source/server/config/network/client_ssl_auth.cc b/source/server/config/network/client_ssl_auth.cc index 08e573a031620..f53ad66d25ec4 100644 --- a/source/server/config/network/client_ssl_auth.cc +++ b/source/server/config/network/client_ssl_auth.cc @@ -1,5 +1,7 @@ #include "server/config/network/client_ssl_auth.h" +#include + #include "envoy/network/connection.h" #include "envoy/server/instance.h" diff --git a/source/server/config/network/client_ssl_auth.h b/source/server/config/network/client_ssl_auth.h index 3afab83106c36..7bdb77dfa88fd 100644 --- a/source/server/config/network/client_ssl_auth.h +++ b/source/server/config/network/client_ssl_auth.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "server/configuration_impl.h" namespace Server { diff --git a/source/server/config/network/echo.cc b/source/server/config/network/echo.cc index 57aaa46cd73a5..bcf915e35c505 100644 --- a/source/server/config/network/echo.cc +++ b/source/server/config/network/echo.cc @@ -1,3 +1,5 @@ +#include + #include "envoy/network/connection.h" #include "common/filter/echo.h" diff --git a/source/server/config/network/http_connection_manager.cc b/source/server/config/network/http_connection_manager.cc index 4fe5b6180e617..bebc554dcd20e 100644 --- a/source/server/config/network/http_connection_manager.cc +++ b/source/server/config/network/http_connection_manager.cc @@ -1,5 +1,12 @@ #include "server/config/network/http_connection_manager.h" +#include + +#include +#include +#include +#include + #include "envoy/filesystem/filesystem.h" #include "envoy/network/connection.h" #include "envoy/server/instance.h" diff --git a/source/server/config/network/http_connection_manager.h b/source/server/config/network/http_connection_manager.h index ea4c4b0baba7a..fbfe861f89c2e 100644 --- a/source/server/config/network/http_connection_manager.h +++ b/source/server/config/network/http_connection_manager.h @@ -1,5 +1,11 @@ #pragma once +#include +#include +#include +#include +#include + #include "envoy/http/filter.h" #include "envoy/server/instance.h" diff --git a/source/server/config/network/mongo_proxy.cc b/source/server/config/network/mongo_proxy.cc index d82f7e2e75432..2998179f466be 100644 --- a/source/server/config/network/mongo_proxy.cc +++ b/source/server/config/network/mongo_proxy.cc @@ -1,5 +1,7 @@ #include "server/config/network/mongo_proxy.h" +#include + #include "envoy/network/connection.h" #include "envoy/server/instance.h" diff --git a/source/server/config/network/mongo_proxy.h b/source/server/config/network/mongo_proxy.h index 21a4f82de9680..f181ee21c273f 100644 --- a/source/server/config/network/mongo_proxy.h +++ b/source/server/config/network/mongo_proxy.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "server/configuration_impl.h" namespace Server { diff --git a/source/server/config/network/ratelimit.cc b/source/server/config/network/ratelimit.cc index b754c3f362c42..5d0310970fc65 100644 --- a/source/server/config/network/ratelimit.cc +++ b/source/server/config/network/ratelimit.cc @@ -1,5 +1,8 @@ #include "server/config/network/ratelimit.h" +#include +#include + #include "envoy/network/connection.h" #include "common/filter/ratelimit.h" diff --git a/source/server/config/network/ratelimit.h b/source/server/config/network/ratelimit.h index 7c21bfd1a7054..e8f52eea775e9 100644 --- a/source/server/config/network/ratelimit.h +++ b/source/server/config/network/ratelimit.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "server/configuration_impl.h" namespace Server { diff --git a/source/server/config/network/redis_proxy.cc b/source/server/config/network/redis_proxy.cc index 3c4ae582ae3a2..6092a6ffdc9af 100644 --- a/source/server/config/network/redis_proxy.cc +++ b/source/server/config/network/redis_proxy.cc @@ -1,5 +1,8 @@ #include "server/config/network/redis_proxy.h" +#include +#include + #include "common/redis/codec_impl.h" #include "common/redis/command_splitter_impl.h" #include "common/redis/conn_pool_impl.h" diff --git a/source/server/config/network/redis_proxy.h b/source/server/config/network/redis_proxy.h index 77e67d0e91aff..8fc060bb1a1df 100644 --- a/source/server/config/network/redis_proxy.h +++ b/source/server/config/network/redis_proxy.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "server/configuration_impl.h" namespace Server { diff --git a/source/server/config/network/tcp_proxy.cc b/source/server/config/network/tcp_proxy.cc index 6322abde0e0c5..5f7f2b87c7a2f 100644 --- a/source/server/config/network/tcp_proxy.cc +++ b/source/server/config/network/tcp_proxy.cc @@ -1,5 +1,7 @@ #include "server/config/network/tcp_proxy.h" +#include + #include "envoy/network/connection.h" #include "envoy/server/instance.h" diff --git a/source/server/config/network/tcp_proxy.h b/source/server/config/network/tcp_proxy.h index dbf97a6b7fe82..771fb74fb517c 100644 --- a/source/server/config/network/tcp_proxy.h +++ b/source/server/config/network/tcp_proxy.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "server/configuration_impl.h" namespace Server { diff --git a/source/server/configuration_impl.cc b/source/server/configuration_impl.cc index 4565c76a70d73..8888e8a0ae074 100644 --- a/source/server/configuration_impl.cc +++ b/source/server/configuration_impl.cc @@ -1,5 +1,13 @@ #include "server/configuration_impl.h" +#include + +#include +#include +#include +#include +#include + #include "envoy/network/connection.h" #include "envoy/runtime/runtime.h" #include "envoy/server/instance.h" diff --git a/source/server/configuration_impl.h b/source/server/configuration_impl.h index 5ada822297fe8..4aca1d9d10fc4 100644 --- a/source/server/configuration_impl.h +++ b/source/server/configuration_impl.h @@ -1,5 +1,12 @@ #pragma once +#include +#include +#include +#include +#include +#include + #include "envoy/http/filter.h" #include "envoy/network/filter.h" #include "envoy/server/configuration.h" diff --git a/source/server/connection_handler_impl.cc b/source/server/connection_handler_impl.cc index 01d3176e99018..b429a39318282 100644 --- a/source/server/connection_handler_impl.cc +++ b/source/server/connection_handler_impl.cc @@ -1,5 +1,7 @@ #include "server/connection_handler_impl.h" +#include + #include "envoy/event/dispatcher.h" #include "envoy/event/timer.h" #include "envoy/network/filter.h" diff --git a/source/server/connection_handler_impl.h b/source/server/connection_handler_impl.h index cd11baa32a8a9..ef9fb8445a493 100644 --- a/source/server/connection_handler_impl.h +++ b/source/server/connection_handler_impl.h @@ -1,5 +1,12 @@ #pragma once +#include + +#include +#include +#include +#include + #include "envoy/api/api.h" #include "envoy/common/time.h" #include "envoy/event/deferred_deletable.h" diff --git a/source/server/drain_manager_impl.cc b/source/server/drain_manager_impl.cc index 5981f4f54a931..54ca227b09da9 100644 --- a/source/server/drain_manager_impl.cc +++ b/source/server/drain_manager_impl.cc @@ -1,5 +1,8 @@ #include "server/drain_manager_impl.h" +#include +#include + #include "envoy/event/dispatcher.h" #include "envoy/event/timer.h" #include "envoy/runtime/runtime.h" diff --git a/source/server/drain_manager_impl.h b/source/server/drain_manager_impl.h index 238f96804a30c..486790d403e83 100644 --- a/source/server/drain_manager_impl.h +++ b/source/server/drain_manager_impl.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "envoy/server/drain_manager.h" #include "envoy/server/instance.h" diff --git a/source/server/guarddog_impl.cc b/source/server/guarddog_impl.cc index 09cd2934f5761..e4d9781dccae5 100644 --- a/source/server/guarddog_impl.cc +++ b/source/server/guarddog_impl.cc @@ -1,5 +1,10 @@ #include "server/guarddog_impl.h" +#include + +#include +#include + #include "common/common/assert.h" #include "server/watchdog_impl.h" diff --git a/source/server/guarddog_impl.h b/source/server/guarddog_impl.h index 991dd640e123f..7f9f3d7b4b0e3 100644 --- a/source/server/guarddog_impl.h +++ b/source/server/guarddog_impl.h @@ -1,5 +1,10 @@ #pragma once +#include +#include +#include +#include + #include "envoy/server/configuration.h" #include "envoy/server/guarddog.h" #include "envoy/server/watchdog.h" diff --git a/source/server/http/admin.cc b/source/server/http/admin.cc index d4d063aa87c28..91ed092fb08be 100644 --- a/source/server/http/admin.cc +++ b/source/server/http/admin.cc @@ -1,5 +1,11 @@ #include "server/http/admin.h" +#include + +#include +#include +#include + #include "envoy/filesystem/filesystem.h" #include "envoy/server/hot_restart.h" #include "envoy/server/instance.h" diff --git a/source/server/http/admin.h b/source/server/http/admin.h index d83713c4b13a7..32fcd6ecf4be2 100644 --- a/source/server/http/admin.h +++ b/source/server/http/admin.h @@ -1,5 +1,9 @@ #pragma once +#include +#include +#include + #include "envoy/http/filter.h" #include "envoy/network/listen_socket.h" #include "envoy/server/admin.h" diff --git a/source/server/http/health_check.cc b/source/server/http/health_check.cc index b54909740af99..74b7bc40d9b4b 100644 --- a/source/server/http/health_check.cc +++ b/source/server/http/health_check.cc @@ -1,5 +1,8 @@ #include "server/http/health_check.h" +#include +#include + #include "envoy/event/dispatcher.h" #include "envoy/event/timer.h" #include "envoy/http/header_map.h" diff --git a/source/server/http/health_check.h b/source/server/http/health_check.h index f84aac1bbfdcc..67ee4d007d5f0 100644 --- a/source/server/http/health_check.h +++ b/source/server/http/health_check.h @@ -1,5 +1,10 @@ #pragma once +#include +#include +#include +#include + #include "envoy/http/codes.h" #include "envoy/http/filter.h" diff --git a/source/server/options_impl.cc b/source/server/options_impl.cc index 696200d5e8124..23cccf42d997c 100644 --- a/source/server/options_impl.cc +++ b/source/server/options_impl.cc @@ -1,5 +1,12 @@ #include "server/options_impl.h" +#include + +#include +#include +#include +#include + #include "common/common/macros.h" #include "common/common/version.h" diff --git a/source/server/options_impl.h b/source/server/options_impl.h index 0832ce4093692..bf5f00d102869 100644 --- a/source/server/options_impl.h +++ b/source/server/options_impl.h @@ -1,5 +1,11 @@ #pragma once +#include + +#include +#include +#include + #include "envoy/server/options.h" /** diff --git a/source/server/server.cc b/source/server/server.cc index 187b5089fa730..34daa729806b3 100644 --- a/source/server/server.cc +++ b/source/server/server.cc @@ -1,5 +1,12 @@ #include "server/server.h" +#include +#include + +#include +#include +#include + #include "envoy/event/dispatcher.h" #include "envoy/event/signal.h" #include "envoy/event/timer.h" diff --git a/source/server/server.h b/source/server/server.h index 6f2d06bba116f..2e4b378de5c2f 100644 --- a/source/server/server.h +++ b/source/server/server.h @@ -1,5 +1,12 @@ #pragma once +#include +#include +#include +#include +#include +#include + #include "envoy/common/optional.h" #include "envoy/server/drain_manager.h" #include "envoy/server/instance.h" diff --git a/source/server/watchdog_impl.h b/source/server/watchdog_impl.h index 5b48f05cccedb..4a597300dad54 100644 --- a/source/server/watchdog_impl.h +++ b/source/server/watchdog_impl.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + #include "envoy/common/time.h" #include "envoy/event/dispatcher.h" #include "envoy/server/watchdog.h" diff --git a/source/server/worker.cc b/source/server/worker.cc index 52f87a857026b..8c9fc9d6e990e 100644 --- a/source/server/worker.cc +++ b/source/server/worker.cc @@ -1,5 +1,7 @@ #include "server/worker.h" +#include + #include "envoy/event/dispatcher.h" #include "envoy/event/timer.h" #include "envoy/server/configuration.h" diff --git a/source/server/worker.h b/source/server/worker.h index 9683c00240407..bae49f60aeca6 100644 --- a/source/server/worker.h +++ b/source/server/worker.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + #include "envoy/server/configuration.h" #include "envoy/server/guarddog.h" #include "envoy/thread_local/thread_local.h" diff --git a/test/BUILD b/test/BUILD index e742c94003bf3..cda59de6468f4 100644 --- a/test/BUILD +++ b/test/BUILD @@ -6,7 +6,6 @@ envoy_cc_test_library( name = "main", srcs = ["main.cc"], external_deps = [ - "googletest", "protobuf", ], deps = [ diff --git a/test/common/access_log/access_log_manager_impl_test.cc b/test/common/access_log/access_log_manager_impl_test.cc index 09a613589cc38..1a683e715e847 100644 --- a/test/common/access_log/access_log_manager_impl_test.cc +++ b/test/common/access_log/access_log_manager_impl_test.cc @@ -1,3 +1,5 @@ +#include + #include "common/access_log/access_log_manager_impl.h" #include "common/stats/stats_impl.h" @@ -6,6 +8,9 @@ #include "test/mocks/event/mocks.h" #include "test/mocks/filesystem/mocks.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::_; using testing::Return; diff --git a/test/common/api/api_impl_test.cc b/test/common/api/api_impl_test.cc index 2ae295d662fc5..15527d5ae0121 100644 --- a/test/common/api/api_impl_test.cc +++ b/test/common/api/api_impl_test.cc @@ -1,7 +1,13 @@ +#include +#include +#include + #include "common/api/api_impl.h" #include "test/test_common/environment.h" +#include "gtest/gtest.h" + namespace Api { TEST(ApiImplTest, readFileToEnd) { diff --git a/test/common/common/base64_test.cc b/test/common/common/base64_test.cc index e119f6843ad41..ee19d07bf62ca 100644 --- a/test/common/common/base64_test.cc +++ b/test/common/common/base64_test.cc @@ -1,6 +1,12 @@ +#include + #include "common/buffer/buffer_impl.h" #include "common/common/base64.h" +#include "test/test_common/printers.h" + +#include "gtest/gtest.h" + TEST(Base64Test, EmptyBufferEncode) { { Buffer::OwnedImpl buffer; diff --git a/test/common/common/hex_test.cc b/test/common/common/hex_test.cc index 6cdde7e7ffec2..e3f190a4fe8ae 100644 --- a/test/common/common/hex_test.cc +++ b/test/common/common/hex_test.cc @@ -1,7 +1,12 @@ +#include +#include + #include "envoy/common/exception.h" #include "common/common/hex.h" +#include "gtest/gtest.h" + TEST(Hex, SimpleEncode) { std::vector bytes = {0x01, 0x02, 0x03, 0x0a, 0x0b, 0x0c}; EXPECT_EQ("0102030a0b0c", Hex::encode(bytes)); diff --git a/test/common/common/optional_test.cc b/test/common/common/optional_test.cc index ca1e8f1bf38ef..4ab3a66b3cf82 100644 --- a/test/common/common/optional_test.cc +++ b/test/common/common/optional_test.cc @@ -1,5 +1,7 @@ #include "envoy/common/optional.h" +#include "gtest/gtest.h" + TEST(Optional, All) { Optional optional; EXPECT_FALSE(optional.valid()); diff --git a/test/common/common/utility_test.cc b/test/common/common/utility_test.cc index 2b6afb714be73..a35d8a3723e2c 100644 --- a/test/common/common/utility_test.cc +++ b/test/common/common/utility_test.cc @@ -1,5 +1,12 @@ +#include +#include +#include +#include + #include "common/common/utility.h" +#include "gtest/gtest.h" + TEST(StringUtil, atoul) { uint64_t out; EXPECT_FALSE(StringUtil::atoul("123b", out)); diff --git a/test/common/dynamo/dynamo_filter_test.cc b/test/common/dynamo/dynamo_filter_test.cc index aff301ec6fded..d1f5cad1c70e1 100644 --- a/test/common/dynamo/dynamo_filter_test.cc +++ b/test/common/dynamo/dynamo_filter_test.cc @@ -1,3 +1,6 @@ +#include +#include + #include "common/buffer/buffer_impl.h" #include "common/dynamo/dynamo_filter.h" #include "common/http/header_map_impl.h" @@ -5,8 +8,12 @@ #include "test/mocks/http/mocks.h" #include "test/mocks/runtime/mocks.h" #include "test/mocks/stats/mocks.h" +#include "test/test_common/printers.h" #include "test/test_common/utility.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::_; using testing::NiceMock; using testing::Return; diff --git a/test/common/dynamo/dynamo_request_parser_test.cc b/test/common/dynamo/dynamo_request_parser_test.cc index fa4de34bff072..4ba1a9854e810 100644 --- a/test/common/dynamo/dynamo_request_parser_test.cc +++ b/test/common/dynamo/dynamo_request_parser_test.cc @@ -1,9 +1,15 @@ +#include +#include + #include "common/dynamo/dynamo_request_parser.h" #include "common/http/header_map_impl.h" #include "common/json/json_loader.h" +#include "test/test_common/printers.h" #include "test/test_common/utility.h" +#include "gtest/gtest.h" + namespace Dynamo { TEST(DynamoRequestParser, parseOperation) { diff --git a/test/common/dynamo/dynamo_utility_test.cc b/test/common/dynamo/dynamo_utility_test.cc index bea71125e5d02..03ead27b99ae9 100644 --- a/test/common/dynamo/dynamo_utility_test.cc +++ b/test/common/dynamo/dynamo_utility_test.cc @@ -1,6 +1,11 @@ +#include + #include "common/dynamo/dynamo_utility.h" #include "common/stats/stats_impl.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::_; namespace Dynamo { diff --git a/test/common/event/dispatcher_impl_test.cc b/test/common/event/dispatcher_impl_test.cc index df12b0aa533e1..d21be8ab684c0 100644 --- a/test/common/event/dispatcher_impl_test.cc +++ b/test/common/event/dispatcher_impl_test.cc @@ -1,7 +1,12 @@ +#include + #include "common/event/dispatcher_impl.h" #include "test/mocks/common.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::InSequence; namespace Event { diff --git a/test/common/event/file_event_impl_test.cc b/test/common/event/file_event_impl_test.cc index db9fc8f54e294..c14032892a7b7 100644 --- a/test/common/event/file_event_impl_test.cc +++ b/test/common/event/file_event_impl_test.cc @@ -1,9 +1,13 @@ +#include + #include "envoy/event/file_event.h" #include "common/event/dispatcher_impl.h" #include "test/mocks/common.h" +#include "gtest/gtest.h" + namespace Event { class FileEventImplTest : public testing::Test { diff --git a/test/common/filesystem/filesystem_impl_test.cc b/test/common/filesystem/filesystem_impl_test.cc index 4421291fbfdf9..d4c55646ec822 100644 --- a/test/common/filesystem/filesystem_impl_test.cc +++ b/test/common/filesystem/filesystem_impl_test.cc @@ -1,3 +1,7 @@ +#include +#include +#include + #include "common/common/thread.h" #include "common/event/dispatcher_impl.h" #include "common/filesystem/filesystem_impl.h" @@ -7,6 +11,9 @@ #include "test/mocks/filesystem/mocks.h" #include "test/test_common/environment.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::_; using testing::InSequence; using testing::Invoke; diff --git a/test/common/filesystem/watcher_impl_test.cc b/test/common/filesystem/watcher_impl_test.cc index 68a4286cc835c..a0223304dfcff 100644 --- a/test/common/filesystem/watcher_impl_test.cc +++ b/test/common/filesystem/watcher_impl_test.cc @@ -1,9 +1,15 @@ +#include +#include + #include "common/common/assert.h" #include "common/event/dispatcher_impl.h" #include "common/filesystem/watcher_impl.h" #include "test/test_common/environment.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + namespace Filesystem { class WatchCallback { diff --git a/test/common/filter/auth/client_ssl_test.cc b/test/common/filter/auth/client_ssl_test.cc index 6ae9e93d64d27..9cb1724670558 100644 --- a/test/common/filter/auth/client_ssl_test.cc +++ b/test/common/filter/auth/client_ssl_test.cc @@ -1,3 +1,7 @@ +#include +#include +#include + #include "common/filesystem/filesystem_impl.h" #include "common/filter/auth/client_ssl.h" #include "common/http/message_impl.h" @@ -8,8 +12,12 @@ #include "test/mocks/ssl/mocks.h" #include "test/mocks/thread_local/mocks.h" #include "test/mocks/upstream/mocks.h" +#include "test/test_common/printers.h" #include "test/test_common/utility.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::_; using testing::InSequence; using testing::Invoke; diff --git a/test/common/filter/ratelimit_test.cc b/test/common/filter/ratelimit_test.cc index 83b3de5e17306..60ac5bb9ccd68 100644 --- a/test/common/filter/ratelimit_test.cc +++ b/test/common/filter/ratelimit_test.cc @@ -1,3 +1,7 @@ +#include +#include +#include + #include "common/buffer/buffer_impl.h" #include "common/filter/ratelimit.h" #include "common/stats/stats_impl.h" @@ -6,6 +10,10 @@ #include "test/mocks/ratelimit/mocks.h" #include "test/mocks/runtime/mocks.h" #include "test/mocks/tracing/mocks.h" +#include "test/test_common/printers.h" + +#include "gmock/gmock.h" +#include "gtest/gtest.h" using testing::_; using testing::InSequence; diff --git a/test/common/filter/tcp_proxy_test.cc b/test/common/filter/tcp_proxy_test.cc index ad1d779e1fd53..d6efbffdbd2d9 100644 --- a/test/common/filter/tcp_proxy_test.cc +++ b/test/common/filter/tcp_proxy_test.cc @@ -1,3 +1,7 @@ +#include +#include +#include + #include "common/buffer/buffer_impl.h" #include "common/filter/tcp_proxy.h" #include "common/network/address_impl.h" @@ -9,6 +13,10 @@ #include "test/mocks/runtime/mocks.h" #include "test/mocks/upstream/host.h" #include "test/mocks/upstream/mocks.h" +#include "test/test_common/printers.h" + +#include "gmock/gmock.h" +#include "gtest/gtest.h" using testing::_; using testing::NiceMock; diff --git a/test/common/grpc/codec_test.cc b/test/common/grpc/codec_test.cc index 1aad26eeb9c89..76fb2d39a6b94 100644 --- a/test/common/grpc/codec_test.cc +++ b/test/common/grpc/codec_test.cc @@ -1,6 +1,15 @@ +#include +#include +#include +#include + #include "common/buffer/buffer_impl.h" #include "common/grpc/codec.h" +#include "test/test_common/printers.h" + +#include "gtest/gtest.h" + #ifdef BAZEL_BRINGUP #include "test/proto/helloworld.pb.h" #else diff --git a/test/common/grpc/common_test.cc b/test/common/grpc/common_test.cc index bdc27432e266f..7788e682d17ad 100644 --- a/test/common/grpc/common_test.cc +++ b/test/common/grpc/common_test.cc @@ -1,6 +1,8 @@ #include "common/grpc/common.h" #include "common/http/headers.h" +#include "gtest/gtest.h" + #ifdef BAZEL_BRINGUP #include "test/proto/helloworld.pb.h" #else diff --git a/test/common/grpc/http1_bridge_filter_test.cc b/test/common/grpc/http1_bridge_filter_test.cc index 014036773c7ce..20ee6cbc9c9cb 100644 --- a/test/common/grpc/http1_bridge_filter_test.cc +++ b/test/common/grpc/http1_bridge_filter_test.cc @@ -4,8 +4,12 @@ #include "test/mocks/http/mocks.h" #include "test/mocks/upstream/mocks.h" +#include "test/test_common/printers.h" #include "test/test_common/utility.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::_; using testing::NiceMock; using testing::Return; diff --git a/test/common/grpc/rpc_channel_impl_test.cc b/test/common/grpc/rpc_channel_impl_test.cc index 3b0dddaef43a1..16c7f4de8d441 100644 --- a/test/common/grpc/rpc_channel_impl_test.cc +++ b/test/common/grpc/rpc_channel_impl_test.cc @@ -1,7 +1,16 @@ +#include +#include +#include + #include "common/grpc/common.h" #include "common/grpc/rpc_channel_impl.h" #include "common/http/message_impl.h" +#include "test/test_common/printers.h" + +#include "gmock/gmock.h" +#include "gtest/gtest.h" + #ifdef BAZEL_BRINGUP #include "test/proto/helloworld.pb.h" #else diff --git a/test/common/http/access_log/access_log_formatter_test.cc b/test/common/http/access_log/access_log_formatter_test.cc index 814bd363e1426..849792a868464 100644 --- a/test/common/http/access_log/access_log_formatter_test.cc +++ b/test/common/http/access_log/access_log_formatter_test.cc @@ -1,11 +1,20 @@ +#include +#include +#include +#include + #include "common/common/utility.h" #include "common/http/access_log/access_log_formatter.h" #include "common/http/header_map_impl.h" #include "test/mocks/http/mocks.h" #include "test/mocks/upstream/mocks.h" +#include "test/test_common/printers.h" #include "test/test_common/utility.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::_; using testing::NiceMock; using testing::Return; diff --git a/test/common/http/access_log/access_log_impl_test.cc b/test/common/http/access_log/access_log_impl_test.cc index 318a253d8fed9..74c1fdf5449a7 100644 --- a/test/common/http/access_log/access_log_impl_test.cc +++ b/test/common/http/access_log/access_log_impl_test.cc @@ -1,3 +1,8 @@ +#include +#include +#include +#include + #include "envoy/upstream/cluster_manager.h" #include "envoy/upstream/upstream.h" @@ -16,8 +21,12 @@ #include "test/mocks/filesystem/mocks.h" #include "test/mocks/runtime/mocks.h" #include "test/mocks/upstream/mocks.h" +#include "test/test_common/printers.h" #include "test/test_common/utility.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::_; using testing::NiceMock; using testing::Return; diff --git a/test/common/http/async_client_impl_test.cc b/test/common/http/async_client_impl_test.cc index b6246a93928e4..e65b017c6b041 100644 --- a/test/common/http/async_client_impl_test.cc +++ b/test/common/http/async_client_impl_test.cc @@ -1,3 +1,7 @@ +#include +#include +#include + #include "common/buffer/buffer_impl.h" #include "common/http/async_client_impl.h" #include "common/http/headers.h" @@ -12,6 +16,10 @@ #include "test/mocks/runtime/mocks.h" #include "test/mocks/stats/mocks.h" #include "test/mocks/upstream/mocks.h" +#include "test/test_common/printers.h" + +#include "gmock/gmock.h" +#include "gtest/gtest.h" using testing::_; using testing::Invoke; diff --git a/test/common/http/codec_client_test.cc b/test/common/http/codec_client_test.cc index 1b0cfef578ae1..1ceb09779c031 100644 --- a/test/common/http/codec_client_test.cc +++ b/test/common/http/codec_client_test.cc @@ -1,3 +1,5 @@ +#include + #include "common/buffer/buffer_impl.h" #include "common/http/codec_client.h" #include "common/http/exception.h" @@ -10,8 +12,12 @@ #include "test/mocks/http/mocks.h" #include "test/mocks/network/mocks.h" #include "test/mocks/upstream/mocks.h" +#include "test/test_common/printers.h" #include "test/test_common/utility.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::_; using testing::Invoke; using testing::NiceMock; diff --git a/test/common/http/codes_test.cc b/test/common/http/codes_test.cc index 1072637439058..4990b03026384 100644 --- a/test/common/http/codes_test.cc +++ b/test/common/http/codes_test.cc @@ -1,11 +1,20 @@ +#include +#include +#include +#include + #include "common/common/empty_string.h" #include "common/http/codes.h" #include "common/http/header_map_impl.h" #include "common/stats/stats_impl.h" #include "test/mocks/stats/mocks.h" +#include "test/test_common/printers.h" #include "test/test_common/utility.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::_; namespace Http { diff --git a/test/common/http/common.cc b/test/common/http/common.cc index 1cf927ec19e67..e9adb8414e7f4 100644 --- a/test/common/http/common.cc +++ b/test/common/http/common.cc @@ -1,5 +1,7 @@ #include "common.h" +#include + #include "envoy/http/header_map.h" void HttpTestUtility::addDefaultHeaders(Http::HeaderMap& headers) { diff --git a/test/common/http/common.h b/test/common/http/common.h index 8bbbaa28a5600..ec8957156037b 100644 --- a/test/common/http/common.h +++ b/test/common/http/common.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "envoy/http/conn_pool.h" #include "common/http/codec_client.h" diff --git a/test/common/http/conn_manager_impl_test.cc b/test/common/http/conn_manager_impl_test.cc index fae1b0838817c..587e627c866ae 100644 --- a/test/common/http/conn_manager_impl_test.cc +++ b/test/common/http/conn_manager_impl_test.cc @@ -1,3 +1,9 @@ +#include +#include +#include +#include +#include + #include "envoy/buffer/buffer.h" #include "envoy/event/dispatcher.h" #include "envoy/http/access_log.h" @@ -21,6 +27,10 @@ #include "test/mocks/runtime/mocks.h" #include "test/mocks/ssl/mocks.h" #include "test/mocks/tracing/mocks.h" +#include "test/test_common/printers.h" + +#include "gmock/gmock.h" +#include "gtest/gtest.h" using testing::_; using testing::InSequence; diff --git a/test/common/http/conn_manager_utility_test.cc b/test/common/http/conn_manager_utility_test.cc index adc4aa015b5fa..53dfc81a022fb 100644 --- a/test/common/http/conn_manager_utility_test.cc +++ b/test/common/http/conn_manager_utility_test.cc @@ -1,3 +1,5 @@ +#include + #include "common/http/conn_manager_utility.h" #include "common/http/headers.h" #include "common/network/address_impl.h" @@ -8,8 +10,12 @@ #include "test/mocks/http/mocks.h" #include "test/mocks/network/mocks.h" #include "test/mocks/runtime/mocks.h" +#include "test/test_common/printers.h" #include "test/test_common/utility.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::_; using testing::InSequence; using testing::NiceMock; diff --git a/test/common/http/date_provider_impl_test.cc b/test/common/http/date_provider_impl_test.cc index 768fde07d204c..6840274a10ea9 100644 --- a/test/common/http/date_provider_impl_test.cc +++ b/test/common/http/date_provider_impl_test.cc @@ -1,8 +1,14 @@ +#include + #include "common/http/date_provider_impl.h" #include "common/http/header_map_impl.h" #include "test/mocks/event/mocks.h" #include "test/mocks/thread_local/mocks.h" +#include "test/test_common/printers.h" + +#include "gmock/gmock.h" +#include "gtest/gtest.h" using testing::NiceMock; diff --git a/test/common/http/filter/buffer_filter_test.cc b/test/common/http/filter/buffer_filter_test.cc index ec1777da461ce..b4136d7700470 100644 --- a/test/common/http/filter/buffer_filter_test.cc +++ b/test/common/http/filter/buffer_filter_test.cc @@ -1,3 +1,6 @@ +#include +#include + #include "envoy/event/dispatcher.h" #include "common/http/filter/buffer_filter.h" @@ -6,6 +9,10 @@ #include "test/mocks/buffer/mocks.h" #include "test/mocks/http/mocks.h" +#include "test/test_common/printers.h" + +#include "gmock/gmock.h" +#include "gtest/gtest.h" using testing::_; using testing::DoAll; diff --git a/test/common/http/filter/fault_filter_test.cc b/test/common/http/filter/fault_filter_test.cc index 0070c2e9bdb03..22ce64ce0e7a5 100644 --- a/test/common/http/filter/fault_filter_test.cc +++ b/test/common/http/filter/fault_filter_test.cc @@ -1,3 +1,8 @@ +#include +#include +#include +#include + #include "envoy/event/dispatcher.h" #include "common/buffer/buffer_impl.h" @@ -10,8 +15,12 @@ #include "test/common/http/common.h" #include "test/mocks/http/mocks.h" #include "test/mocks/runtime/mocks.h" +#include "test/test_common/printers.h" #include "test/test_common/utility.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::_; using testing::DoAll; using testing::Invoke; diff --git a/test/common/http/filter/ratelimit_test.cc b/test/common/http/filter/ratelimit_test.cc index 1dfa10dc2dc44..4cee94bc2e282 100644 --- a/test/common/http/filter/ratelimit_test.cc +++ b/test/common/http/filter/ratelimit_test.cc @@ -1,3 +1,7 @@ +#include +#include +#include + #include "common/buffer/buffer_impl.h" #include "common/common/empty_string.h" #include "common/http/filter/ratelimit.h" @@ -9,8 +13,12 @@ #include "test/mocks/runtime/mocks.h" #include "test/mocks/tracing/mocks.h" #include "test/mocks/upstream/mocks.h" +#include "test/test_common/printers.h" #include "test/test_common/utility.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::_; using testing::InSequence; using testing::Invoke; diff --git a/test/common/http/header_map_impl_test.cc b/test/common/http/header_map_impl_test.cc index 73adefff17de5..f6bee2b4e8c56 100644 --- a/test/common/http/header_map_impl_test.cc +++ b/test/common/http/header_map_impl_test.cc @@ -1,7 +1,12 @@ +#include + #include "common/http/header_map_impl.h" +#include "test/test_common/printers.h" #include "test/test_common/utility.h" +#include "gtest/gtest.h" + namespace Http { TEST(HeaderStringTest, All) { diff --git a/test/common/http/http1/codec_impl_test.cc b/test/common/http/http1/codec_impl_test.cc index 9722210e0c5ee..79ede8692773a 100644 --- a/test/common/http/http1/codec_impl_test.cc +++ b/test/common/http/http1/codec_impl_test.cc @@ -1,3 +1,5 @@ +#include + #include "envoy/buffer/buffer.h" #include "envoy/event/dispatcher.h" @@ -9,6 +11,10 @@ #include "test/mocks/buffer/mocks.h" #include "test/mocks/http/mocks.h" #include "test/mocks/network/mocks.h" +#include "test/test_common/printers.h" + +#include "gmock/gmock.h" +#include "gtest/gtest.h" using testing::_; using testing::InSequence; diff --git a/test/common/http/http1/conn_pool_test.cc b/test/common/http/http1/conn_pool_test.cc index c14d9ad14068f..56aeef10126f9 100644 --- a/test/common/http/http1/conn_pool_test.cc +++ b/test/common/http/http1/conn_pool_test.cc @@ -1,3 +1,6 @@ +#include +#include + #include "common/buffer/buffer_impl.h" #include "common/http/codec_client.h" #include "common/http/http1/conn_pool.h" @@ -10,8 +13,12 @@ #include "test/mocks/network/mocks.h" #include "test/mocks/runtime/mocks.h" #include "test/mocks/upstream/mocks.h" +#include "test/test_common/printers.h" #include "test/test_common/utility.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::_; using testing::DoAll; using testing::InSequence; diff --git a/test/common/http/http2/codec_impl_test.cc b/test/common/http/http2/codec_impl_test.cc index 993985f8afed2..56f1efa80e2ad 100644 --- a/test/common/http/http2/codec_impl_test.cc +++ b/test/common/http/http2/codec_impl_test.cc @@ -1,3 +1,6 @@ +#include +#include + #include "common/http/exception.h" #include "common/http/header_map_impl.h" #include "common/http/http2/codec_impl.h" @@ -6,8 +9,12 @@ #include "test/common/http/common.h" #include "test/mocks/http/mocks.h" #include "test/mocks/network/mocks.h" +#include "test/test_common/printers.h" #include "test/test_common/utility.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::_; using testing::AtLeast; using testing::InSequence; diff --git a/test/common/http/http2/conn_pool_test.cc b/test/common/http/http2/conn_pool_test.cc index ee37dfcaa6e67..91d222a458d9f 100644 --- a/test/common/http/http2/conn_pool_test.cc +++ b/test/common/http/http2/conn_pool_test.cc @@ -1,3 +1,7 @@ +#include +#include +#include + #include "common/http/http2/conn_pool.h" #include "common/network/utility.h" #include "common/upstream/upstream_impl.h" @@ -8,6 +12,10 @@ #include "test/mocks/network/mocks.h" #include "test/mocks/runtime/mocks.h" #include "test/mocks/upstream/mocks.h" +#include "test/test_common/printers.h" + +#include "gmock/gmock.h" +#include "gtest/gtest.h" using testing::_; using testing::DoAll; diff --git a/test/common/http/user_agent_test.cc b/test/common/http/user_agent_test.cc index 456b1a43f86a3..475da1522aa48 100644 --- a/test/common/http/user_agent_test.cc +++ b/test/common/http/user_agent_test.cc @@ -2,8 +2,11 @@ #include "common/http/user_agent.h" #include "test/mocks/stats/mocks.h" +#include "test/test_common/printers.h" #include "test/test_common/utility.h" +#include "gtest/gtest.h" + namespace Http { TEST(UserAgentTest, All) { diff --git a/test/common/http/utility_test.cc b/test/common/http/utility_test.cc index 173763408ce1b..ceaaf25c11728 100644 --- a/test/common/http/utility_test.cc +++ b/test/common/http/utility_test.cc @@ -1,10 +1,18 @@ +#include + +#include +#include + #include "common/http/exception.h" #include "common/http/header_map_impl.h" #include "common/http/utility.h" #include "common/network/address_impl.h" +#include "test/test_common/printers.h" #include "test/test_common/utility.h" +#include "gtest/gtest.h" + namespace Http { // Satisfy linker diff --git a/test/common/json/config_schemas_test.cc b/test/common/json/config_schemas_test.cc index 2408a58aca583..f876a50f9b923 100644 --- a/test/common/json/config_schemas_test.cc +++ b/test/common/json/config_schemas_test.cc @@ -1,9 +1,17 @@ +#include + +#include +#include + #include "common/json/config_schemas.h" #include "common/json/json_loader.h" #include "test/test_common/environment.h" #include "test/test_common/utility.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::_; namespace Json { diff --git a/test/common/json/json_loader_test.cc b/test/common/json/json_loader_test.cc index 4f5159a1fc4ce..3af55a5dbf86e 100644 --- a/test/common/json/json_loader_test.cc +++ b/test/common/json/json_loader_test.cc @@ -1,5 +1,10 @@ +#include +#include + #include "common/json/json_loader.h" +#include "gtest/gtest.h" + namespace Json { TEST(JsonLoaderTest, Basic) { diff --git a/test/common/mongo/bson_impl_test.cc b/test/common/mongo/bson_impl_test.cc index dfcf49faaa789..bdfb8e7da6928 100644 --- a/test/common/mongo/bson_impl_test.cc +++ b/test/common/mongo/bson_impl_test.cc @@ -1,6 +1,12 @@ +#include + #include "common/buffer/buffer_impl.h" #include "common/mongo/bson_impl.h" +#include "test/test_common/printers.h" + +#include "gtest/gtest.h" + namespace Bson { TEST(BsonImplTest, BadCast) { diff --git a/test/common/mongo/codec_impl_test.cc b/test/common/mongo/codec_impl_test.cc index d2ec06a68e501..1ca2a68ed5f19 100644 --- a/test/common/mongo/codec_impl_test.cc +++ b/test/common/mongo/codec_impl_test.cc @@ -1,7 +1,14 @@ +#include + #include "common/buffer/buffer_impl.h" #include "common/mongo/bson_impl.h" #include "common/mongo/codec_impl.h" +#include "test/test_common/printers.h" + +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::Eq; using testing::NiceMock; using testing::Pointee; diff --git a/test/common/mongo/proxy_test.cc b/test/common/mongo/proxy_test.cc index 7beedd2751fb8..21d7914e62333 100644 --- a/test/common/mongo/proxy_test.cc +++ b/test/common/mongo/proxy_test.cc @@ -1,3 +1,8 @@ +#include +#include +#include +#include + #include "common/mongo/bson_impl.h" #include "common/mongo/codec_impl.h" #include "common/mongo/proxy.h" @@ -8,6 +13,10 @@ #include "test/mocks/filesystem/mocks.h" #include "test/mocks/network/mocks.h" #include "test/mocks/runtime/mocks.h" +#include "test/test_common/printers.h" + +#include "gmock/gmock.h" +#include "gtest/gtest.h" using testing::_; using testing::AtLeast; diff --git a/test/common/mongo/utility_test.cc b/test/common/mongo/utility_test.cc index a0b24032248cb..f44744064d918 100644 --- a/test/common/mongo/utility_test.cc +++ b/test/common/mongo/utility_test.cc @@ -1,7 +1,11 @@ +#include + #include "common/mongo/bson_impl.h" #include "common/mongo/codec_impl.h" #include "common/mongo/utility.h" +#include "gtest/gtest.h" + namespace Mongo { TEST(QueryMessageInfoTest, FindCommand) { diff --git a/test/common/network/address_impl_test.cc b/test/common/network/address_impl_test.cc index 069d765c9dbd6..7225d18d3858e 100644 --- a/test/common/network/address_impl_test.cc +++ b/test/common/network/address_impl_test.cc @@ -1,7 +1,12 @@ +#include #include +#include +#include #include #include +#include + #include "envoy/common/exception.h" #include "common/common/utility.h" @@ -10,6 +15,8 @@ #include "test/test_common/network_utility.h" #include "test/test_common/utility.h" +#include "gtest/gtest.h" + namespace Network { namespace Address { namespace { diff --git a/test/common/network/cidr_range_test.cc b/test/common/network/cidr_range_test.cc index d0969f204325f..9c471ddf5dec5 100644 --- a/test/common/network/cidr_range_test.cc +++ b/test/common/network/cidr_range_test.cc @@ -1,10 +1,16 @@ +#include #include +#include +#include + #include "envoy/common/exception.h" #include "common/network/address_impl.h" #include "common/network/cidr_range.h" +#include "gtest/gtest.h" + // We are adding things into the std namespace. // Note that this is technically undefined behavior! namespace std { diff --git a/test/common/network/connection_impl_test.cc b/test/common/network/connection_impl_test.cc index 7cd3ffe839601..c248925d57238 100644 --- a/test/common/network/connection_impl_test.cc +++ b/test/common/network/connection_impl_test.cc @@ -1,3 +1,7 @@ +#include +#include +#include + #include "common/buffer/buffer_impl.h" #include "common/common/empty_string.h" #include "common/event/dispatcher_impl.h" @@ -10,6 +14,10 @@ #include "test/mocks/network/mocks.h" #include "test/mocks/server/mocks.h" #include "test/mocks/stats/mocks.h" +#include "test/test_common/printers.h" + +#include "gmock/gmock.h" +#include "gtest/gtest.h" using testing::_; using testing::Sequence; diff --git a/test/common/network/dns_impl_test.cc b/test/common/network/dns_impl_test.cc index 1229bc535bf02..107543d74f30c 100644 --- a/test/common/network/dns_impl_test.cc +++ b/test/common/network/dns_impl_test.cc @@ -1,6 +1,13 @@ +#include #include #include +#include +#include +#include +#include +#include + #include "envoy/event/dispatcher.h" #include "envoy/network/dns.h" @@ -13,9 +20,11 @@ #include "common/stats/stats_impl.h" #include "test/mocks/network/mocks.h" +#include "test/test_common/printers.h" #include "ares.h" #include "ares_dns.h" +#include "gtest/gtest.h" namespace Network { diff --git a/test/common/network/filter_manager_impl_test.cc b/test/common/network/filter_manager_impl_test.cc index 0452ef7de681a..917b40914eebb 100644 --- a/test/common/network/filter_manager_impl_test.cc +++ b/test/common/network/filter_manager_impl_test.cc @@ -1,3 +1,6 @@ +#include +#include + #include "common/buffer/buffer_impl.h" #include "common/filter/ratelimit.h" #include "common/filter/tcp_proxy.h" @@ -12,6 +15,10 @@ #include "test/mocks/tracing/mocks.h" #include "test/mocks/upstream/host.h" #include "test/mocks/upstream/mocks.h" +#include "test/test_common/printers.h" + +#include "gmock/gmock.h" +#include "gtest/gtest.h" using testing::_; using testing::InSequence; diff --git a/test/common/network/listen_socket_impl_test.cc b/test/common/network/listen_socket_impl_test.cc index e3112e784bd5c..d5ae681aa8d68 100644 --- a/test/common/network/listen_socket_impl_test.cc +++ b/test/common/network/listen_socket_impl_test.cc @@ -5,6 +5,8 @@ #include "test/test_common/network_utility.h" +#include "gtest/gtest.h" + namespace Network { class ListenSocketImplTest : public testing::TestWithParam { diff --git a/test/common/network/listener_impl_test.cc b/test/common/network/listener_impl_test.cc index 5c39080bc59ae..846293f3f2775 100644 --- a/test/common/network/listener_impl_test.cc +++ b/test/common/network/listener_impl_test.cc @@ -7,6 +7,9 @@ #include "test/mocks/server/mocks.h" #include "test/test_common/network_utility.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::_; using testing::ByRef; using testing::Eq; diff --git a/test/common/network/proxy_protocol_test.cc b/test/common/network/proxy_protocol_test.cc index 5574604bae8f7..48f5f5b895917 100644 --- a/test/common/network/proxy_protocol_test.cc +++ b/test/common/network/proxy_protocol_test.cc @@ -1,3 +1,6 @@ +#include +#include + #include "common/buffer/buffer_impl.h" #include "common/event/dispatcher_impl.h" #include "common/network/listener_impl.h" @@ -8,6 +11,10 @@ #include "test/mocks/network/mocks.h" #include "test/mocks/server/mocks.h" #include "test/test_common/network_utility.h" +#include "test/test_common/printers.h" + +#include "gmock/gmock.h" +#include "gtest/gtest.h" using testing::_; using testing::Invoke; diff --git a/test/common/network/utility_test.cc b/test/common/network/utility_test.cc index 737e33a056291..dd6e9c0bebe54 100644 --- a/test/common/network/utility_test.cc +++ b/test/common/network/utility_test.cc @@ -1,9 +1,15 @@ +#include +#include +#include + #include "envoy/common/exception.h" #include "common/json/json_loader.h" #include "common/network/address_impl.h" #include "common/network/utility.h" +#include "gtest/gtest.h" + namespace Network { TEST(IpListTest, Errors) { diff --git a/test/common/ratelimit/ratelimit_impl_test.cc b/test/common/ratelimit/ratelimit_impl_test.cc index df738e02a0f60..7e024a426db72 100644 --- a/test/common/ratelimit/ratelimit_impl_test.cc +++ b/test/common/ratelimit/ratelimit_impl_test.cc @@ -1,9 +1,17 @@ +#include +#include +#include + #include "common/http/header_map_impl.h" #include "common/http/headers.h" #include "common/ratelimit/ratelimit_impl.h" #include "test/mocks/grpc/mocks.h" #include "test/mocks/upstream/mocks.h" +#include "test/test_common/printers.h" + +#include "gmock/gmock.h" +#include "gtest/gtest.h" using testing::_; using testing::AtLeast; diff --git a/test/common/redis/codec_impl_test.cc b/test/common/redis/codec_impl_test.cc index 4c2d986f86ede..ceace05bd9b31 100644 --- a/test/common/redis/codec_impl_test.cc +++ b/test/common/redis/codec_impl_test.cc @@ -1,10 +1,15 @@ +#include + #include "common/buffer/buffer_impl.h" #include "common/common/assert.h" #include "common/redis/codec_impl.h" #include "test/mocks/redis/mocks.h" +#include "test/test_common/printers.h" #include "test/test_common/utility.h" +#include "gtest/gtest.h" + namespace Redis { class RedisEncoderDecoderImplTest : public testing::Test, public DecoderCallbacks { diff --git a/test/common/redis/command_splitter_impl_test.cc b/test/common/redis/command_splitter_impl_test.cc index 59c55a1167578..fe248fe043f50 100644 --- a/test/common/redis/command_splitter_impl_test.cc +++ b/test/common/redis/command_splitter_impl_test.cc @@ -1,8 +1,17 @@ +#include +#include +#include +#include + #include "common/redis/command_splitter_impl.h" #include "common/stats/stats_impl.h" #include "test/mocks/common.h" #include "test/mocks/redis/mocks.h" +#include "test/test_common/printers.h" + +#include "gmock/gmock.h" +#include "gtest/gtest.h" using testing::_; using testing::ByRef; diff --git a/test/common/redis/conn_pool_impl_test.cc b/test/common/redis/conn_pool_impl_test.cc index dc9498d805a35..284192d0b7961 100644 --- a/test/common/redis/conn_pool_impl_test.cc +++ b/test/common/redis/conn_pool_impl_test.cc @@ -1,3 +1,6 @@ +#include +#include + #include "common/network/utility.h" #include "common/redis/conn_pool_impl.h" #include "common/upstream/upstream_impl.h" @@ -6,6 +9,10 @@ #include "test/mocks/redis/mocks.h" #include "test/mocks/thread_local/mocks.h" #include "test/mocks/upstream/mocks.h" +#include "test/test_common/printers.h" + +#include "gmock/gmock.h" +#include "gtest/gtest.h" using testing::_; using testing::Eq; diff --git a/test/common/redis/proxy_filter_test.cc b/test/common/redis/proxy_filter_test.cc index eefce339fdfc7..7f8899cd15194 100644 --- a/test/common/redis/proxy_filter_test.cc +++ b/test/common/redis/proxy_filter_test.cc @@ -1,9 +1,16 @@ +#include +#include + #include "common/redis/proxy_filter.h" #include "test/mocks/common.h" #include "test/mocks/network/mocks.h" #include "test/mocks/redis/mocks.h" #include "test/mocks/upstream/mocks.h" +#include "test/test_common/printers.h" + +#include "gmock/gmock.h" +#include "gtest/gtest.h" using testing::_; using testing::ByRef; diff --git a/test/common/router/config_impl_test.cc b/test/common/router/config_impl_test.cc index 1e96e34d46ed3..42f239a902c22 100644 --- a/test/common/router/config_impl_test.cc +++ b/test/common/router/config_impl_test.cc @@ -1,3 +1,9 @@ +#include +#include +#include +#include +#include + #include "common/http/header_map_impl.h" #include "common/http/headers.h" #include "common/json/json_loader.h" @@ -5,8 +11,12 @@ #include "test/mocks/runtime/mocks.h" #include "test/mocks/upstream/mocks.h" +#include "test/test_common/printers.h" #include "test/test_common/utility.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::_; using testing::ContainerEq; using testing::NiceMock; diff --git a/test/common/router/rds_impl_test.cc b/test/common/router/rds_impl_test.cc index fedf1b86d26d6..08420a580b867 100644 --- a/test/common/router/rds_impl_test.cc +++ b/test/common/router/rds_impl_test.cc @@ -1,3 +1,6 @@ +#include +#include + #include "common/http/message_impl.h" #include "common/json/json_loader.h" #include "common/router/rds_impl.h" @@ -6,8 +9,12 @@ #include "test/mocks/local_info/mocks.h" #include "test/mocks/thread_local/mocks.h" #include "test/mocks/upstream/mocks.h" +#include "test/test_common/printers.h" #include "test/test_common/utility.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::_; using testing::InSequence; using testing::Invoke; diff --git a/test/common/router/retry_state_impl_test.cc b/test/common/router/retry_state_impl_test.cc index 3b30fac1f2c03..c8a759c7d4e7f 100644 --- a/test/common/router/retry_state_impl_test.cc +++ b/test/common/router/retry_state_impl_test.cc @@ -1,3 +1,5 @@ +#include + #include "common/http/header_map_impl.h" #include "common/router/retry_state_impl.h" #include "common/upstream/resource_manager_impl.h" @@ -5,8 +7,12 @@ #include "test/mocks/router/mocks.h" #include "test/mocks/runtime/mocks.h" #include "test/mocks/upstream/mocks.h" +#include "test/test_common/printers.h" #include "test/test_common/utility.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::_; using testing::NiceMock; using testing::Return; diff --git a/test/common/router/router_ratelimit_test.cc b/test/common/router/router_ratelimit_test.cc index c10925ccd3137..9082a80e1cae0 100644 --- a/test/common/router/router_ratelimit_test.cc +++ b/test/common/router/router_ratelimit_test.cc @@ -1,3 +1,7 @@ +#include +#include +#include + #include "common/http/header_map_impl.h" #include "common/json/json_loader.h" #include "common/router/config_impl.h" @@ -7,8 +11,12 @@ #include "test/mocks/ratelimit/mocks.h" #include "test/mocks/router/mocks.h" #include "test/mocks/upstream/mocks.h" +#include "test/test_common/printers.h" #include "test/test_common/utility.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::_; using testing::NiceMock; using testing::ReturnRef; diff --git a/test/common/router/router_test.cc b/test/common/router/router_test.cc index 326819eb58674..2026068565db7 100644 --- a/test/common/router/router_test.cc +++ b/test/common/router/router_test.cc @@ -1,3 +1,7 @@ +#include +#include +#include + #include "common/buffer/buffer_impl.h" #include "common/network/utility.h" #include "common/router/router.h" @@ -10,8 +14,12 @@ #include "test/mocks/runtime/mocks.h" #include "test/mocks/ssl/mocks.h" #include "test/mocks/upstream/mocks.h" +#include "test/test_common/printers.h" #include "test/test_common/utility.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::_; using testing::AtLeast; using testing::Invoke; diff --git a/test/common/router/shadow_writer_impl_test.cc b/test/common/router/shadow_writer_impl_test.cc index 4c4fd353ba925..a8cb7b0545dbe 100644 --- a/test/common/router/shadow_writer_impl_test.cc +++ b/test/common/router/shadow_writer_impl_test.cc @@ -1,9 +1,15 @@ +#include +#include + #include "common/http/headers.h" #include "common/http/message_impl.h" #include "common/router/shadow_writer_impl.h" #include "test/mocks/upstream/mocks.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::_; using testing::Invoke; diff --git a/test/common/runtime/runtime_impl_test.cc b/test/common/runtime/runtime_impl_test.cc index 9540972d10830..6873a14b545f9 100644 --- a/test/common/runtime/runtime_impl_test.cc +++ b/test/common/runtime/runtime_impl_test.cc @@ -1,3 +1,6 @@ +#include +#include + #include "common/runtime/runtime_impl.h" #include "common/stats/stats_impl.h" @@ -7,6 +10,9 @@ #include "test/mocks/thread_local/mocks.h" #include "test/test_common/environment.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::NiceMock; using testing::Return; using testing::ReturnNew; diff --git a/test/common/runtime/uuid_util_test.cc b/test/common/runtime/uuid_util_test.cc index b8cdf9a080c4f..999ecaa74e043 100644 --- a/test/common/runtime/uuid_util_test.cc +++ b/test/common/runtime/uuid_util_test.cc @@ -1,6 +1,10 @@ +#include + #include "common/runtime/runtime_impl.h" #include "common/runtime/uuid_util.h" +#include "gtest/gtest.h" + TEST(UUIDUtilsTest, mod) { uint16_t result; EXPECT_TRUE(UuidUtils::uuidModBy("00000000-0000-0000-0000-000000000000", result, 100)); diff --git a/test/common/ssl/connection_impl_test.cc b/test/common/ssl/connection_impl_test.cc index face9e9b368b3..a91730fcaa978 100644 --- a/test/common/ssl/connection_impl_test.cc +++ b/test/common/ssl/connection_impl_test.cc @@ -1,3 +1,7 @@ +#include +#include +#include + #include "common/buffer/buffer_impl.h" #include "common/event/dispatcher_impl.h" #include "common/json/json_loader.h" @@ -14,6 +18,10 @@ #include "test/mocks/server/mocks.h" #include "test/mocks/stats/mocks.h" #include "test/test_common/environment.h" +#include "test/test_common/printers.h" + +#include "gmock/gmock.h" +#include "gtest/gtest.h" using testing::_; using testing::Invoke; diff --git a/test/common/ssl/context_impl_test.cc b/test/common/ssl/context_impl_test.cc index d7057781ec08a..d9cacdc4f22dd 100644 --- a/test/common/ssl/context_impl_test.cc +++ b/test/common/ssl/context_impl_test.cc @@ -1,3 +1,6 @@ +#include +#include + #include "common/json/json_loader.h" #include "common/ssl/context_config_impl.h" #include "common/ssl/context_impl.h" @@ -7,6 +10,8 @@ #include "test/mocks/runtime/mocks.h" #include "test/test_common/environment.h" +#include "gtest/gtest.h" + namespace Ssl { class SslContextImplTest : public SslCertsTest {}; diff --git a/test/common/ssl/ssl_certs_test.h b/test/common/ssl/ssl_certs_test.h index 3a10544e69582..b6ab8110d87fb 100644 --- a/test/common/ssl/ssl_certs_test.h +++ b/test/common/ssl/ssl_certs_test.h @@ -2,6 +2,8 @@ #include "test/test_common/environment.h" +#include "gtest/gtest.h" + class SslCertsTest : public testing::Test { public: static void SetUpTestCase() { diff --git a/test/common/stats/stats_impl_test.cc b/test/common/stats/stats_impl_test.cc index 4f8c9759ae004..8e765fe016090 100644 --- a/test/common/stats/stats_impl_test.cc +++ b/test/common/stats/stats_impl_test.cc @@ -1,5 +1,9 @@ +#include + #include "common/stats/stats_impl.h" +#include "gtest/gtest.h" + namespace Stats { TEST(StatsIsolatedStoreImplTest, All) { diff --git a/test/common/stats/statsd_test.cc b/test/common/stats/statsd_test.cc index 2dba212c119da..31b82602a475d 100644 --- a/test/common/stats/statsd_test.cc +++ b/test/common/stats/statsd_test.cc @@ -1,3 +1,6 @@ +#include +#include + #include "common/network/utility.h" #include "common/stats/statsd.h" #include "common/upstream/upstream_impl.h" @@ -8,6 +11,9 @@ #include "test/mocks/thread_local/mocks.h" #include "test/mocks/upstream/mocks.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::_; using testing::NiceMock; using testing::Return; diff --git a/test/common/stats/thread_local_store_test.cc b/test/common/stats/thread_local_store_test.cc index cf23074872e62..3008fea9ec7ae 100644 --- a/test/common/stats/thread_local_store_test.cc +++ b/test/common/stats/thread_local_store_test.cc @@ -1,9 +1,17 @@ +#include +#include +#include +#include + #include "common/stats/thread_local_store.h" #include "test/mocks/event/mocks.h" #include "test/mocks/stats/mocks.h" #include "test/mocks/thread_local/mocks.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::_; using testing::InSequence; using testing::Invoke; diff --git a/test/common/tracing/http_tracer_impl_test.cc b/test/common/tracing/http_tracer_impl_test.cc index 422f1e1684f27..c598f437045b6 100644 --- a/test/common/tracing/http_tracer_impl_test.cc +++ b/test/common/tracing/http_tracer_impl_test.cc @@ -1,3 +1,7 @@ +#include +#include +#include + #include "common/common/base64.h" #include "common/http/header_map_impl.h" #include "common/http/headers.h" @@ -14,8 +18,12 @@ #include "test/mocks/thread_local/mocks.h" #include "test/mocks/tracing/mocks.h" #include "test/mocks/upstream/mocks.h" +#include "test/test_common/printers.h" #include "test/test_common/utility.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::_; using testing::Invoke; using testing::NiceMock; diff --git a/test/common/tracing/lightstep_tracer_impl_test.cc b/test/common/tracing/lightstep_tracer_impl_test.cc index 83dc724ceac16..ddc421f657395 100644 --- a/test/common/tracing/lightstep_tracer_impl_test.cc +++ b/test/common/tracing/lightstep_tracer_impl_test.cc @@ -1,3 +1,7 @@ +#include +#include +#include + #include "common/common/base64.h" #include "common/http/header_map_impl.h" #include "common/http/headers.h" @@ -14,8 +18,12 @@ #include "test/mocks/thread_local/mocks.h" #include "test/mocks/tracing/mocks.h" #include "test/mocks/upstream/mocks.h" +#include "test/test_common/printers.h" #include "test/test_common/utility.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::_; using testing::Invoke; using testing::NiceMock; diff --git a/test/common/upstream/cds_api_impl_test.cc b/test/common/upstream/cds_api_impl_test.cc index 1dffd2ae8fc7e..042b10442d920 100644 --- a/test/common/upstream/cds_api_impl_test.cc +++ b/test/common/upstream/cds_api_impl_test.cc @@ -1,11 +1,19 @@ +#include +#include +#include + #include "common/http/message_impl.h" #include "common/json/json_loader.h" #include "common/upstream/cds_api_impl.h" #include "test/mocks/local_info/mocks.h" #include "test/mocks/upstream/mocks.h" +#include "test/test_common/printers.h" #include "test/test_common/utility.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::_; using testing::InSequence; using testing::Invoke; diff --git a/test/common/upstream/cluster_manager_impl_test.cc b/test/common/upstream/cluster_manager_impl_test.cc index 8a9787d58d429..510a4e5ff6080 100644 --- a/test/common/upstream/cluster_manager_impl_test.cc +++ b/test/common/upstream/cluster_manager_impl_test.cc @@ -1,3 +1,6 @@ +#include +#include + #include "envoy/upstream/upstream.h" #include "common/network/utility.h" @@ -14,6 +17,9 @@ #include "test/mocks/upstream/mocks.h" #include "test/test_common/utility.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::_; using testing::InSequence; using testing::Invoke; diff --git a/test/common/upstream/health_checker_impl_test.cc b/test/common/upstream/health_checker_impl_test.cc index a32f297b4d659..e756808d4a80b 100644 --- a/test/common/upstream/health_checker_impl_test.cc +++ b/test/common/upstream/health_checker_impl_test.cc @@ -1,3 +1,8 @@ +#include +#include +#include +#include + #include "common/buffer/buffer_impl.h" #include "common/http/headers.h" #include "common/json/json_loader.h" @@ -9,8 +14,12 @@ #include "test/mocks/network/mocks.h" #include "test/mocks/runtime/mocks.h" #include "test/mocks/upstream/mocks.h" +#include "test/test_common/printers.h" #include "test/test_common/utility.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::_; using testing::Invoke; using testing::NiceMock; diff --git a/test/common/upstream/host_utility_test.cc b/test/common/upstream/host_utility_test.cc index e17d7d6016abd..5fa92d32c9791 100644 --- a/test/common/upstream/host_utility_test.cc +++ b/test/common/upstream/host_utility_test.cc @@ -4,6 +4,8 @@ #include "test/mocks/upstream/mocks.h" +#include "gtest/gtest.h" + namespace Upstream { TEST(HostUtilityTest, All) { diff --git a/test/common/upstream/load_balancer_impl_test.cc b/test/common/upstream/load_balancer_impl_test.cc index 3ed1ed52e7334..49ade3c5eb146 100644 --- a/test/common/upstream/load_balancer_impl_test.cc +++ b/test/common/upstream/load_balancer_impl_test.cc @@ -1,3 +1,8 @@ +#include +#include +#include +#include + #include "common/network/utility.h" #include "common/upstream/load_balancer_impl.h" #include "common/upstream/upstream_impl.h" @@ -5,6 +10,9 @@ #include "test/mocks/runtime/mocks.h" #include "test/mocks/upstream/mocks.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::NiceMock; using testing::Return; diff --git a/test/common/upstream/load_balancer_simulation_test.cc b/test/common/upstream/load_balancer_simulation_test.cc index 34c7905e5e2d5..26b996d7e8409 100644 --- a/test/common/upstream/load_balancer_simulation_test.cc +++ b/test/common/upstream/load_balancer_simulation_test.cc @@ -1,3 +1,9 @@ +#include + +#include +#include +#include + #include "common/network/utility.h" #include "common/runtime/runtime_impl.h" #include "common/upstream/load_balancer_impl.h" @@ -6,6 +12,9 @@ #include "test/mocks/runtime/mocks.h" #include "test/mocks/upstream/mocks.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::NiceMock; using testing::Return; diff --git a/test/common/upstream/logical_dns_cluster_test.cc b/test/common/upstream/logical_dns_cluster_test.cc index 9daada7138225..dcc94b72e2718 100644 --- a/test/common/upstream/logical_dns_cluster_test.cc +++ b/test/common/upstream/logical_dns_cluster_test.cc @@ -1,3 +1,8 @@ +#include +#include +#include +#include + #include "common/network/utility.h" #include "common/upstream/logical_dns_cluster.h" @@ -8,6 +13,9 @@ #include "test/mocks/thread_local/mocks.h" #include "test/test_common/utility.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::_; using testing::Invoke; using testing::NiceMock; diff --git a/test/common/upstream/outlier_detection_impl_test.cc b/test/common/upstream/outlier_detection_impl_test.cc index 3cb892846fceb..1ab3d860704e4 100644 --- a/test/common/upstream/outlier_detection_impl_test.cc +++ b/test/common/upstream/outlier_detection_impl_test.cc @@ -1,3 +1,9 @@ +#include +#include +#include +#include +#include + #include "envoy/common/optional.h" #include "envoy/common/time.h" @@ -10,6 +16,9 @@ #include "test/mocks/runtime/mocks.h" #include "test/mocks/upstream/mocks.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::_; using testing::NiceMock; using testing::Return; diff --git a/test/common/upstream/resource_manager_impl_test.cc b/test/common/upstream/resource_manager_impl_test.cc index 0d72bf6cb6bab..8df3da53b6a9c 100644 --- a/test/common/upstream/resource_manager_impl_test.cc +++ b/test/common/upstream/resource_manager_impl_test.cc @@ -2,6 +2,9 @@ #include "test/mocks/runtime/mocks.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::NiceMock; using testing::Return; diff --git a/test/common/upstream/ring_hash_lb_test.cc b/test/common/upstream/ring_hash_lb_test.cc index 633b819c3a2ef..2bb5b80de9a7c 100644 --- a/test/common/upstream/ring_hash_lb_test.cc +++ b/test/common/upstream/ring_hash_lb_test.cc @@ -1,3 +1,6 @@ +#include +#include + #include "common/network/utility.h" #include "common/upstream/ring_hash_lb.h" #include "common/upstream/upstream_impl.h" @@ -5,6 +8,9 @@ #include "test/mocks/runtime/mocks.h" #include "test/mocks/upstream/mocks.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::_; using testing::NiceMock; using testing::Return; diff --git a/test/common/upstream/sds_test.cc b/test/common/upstream/sds_test.cc index c55d43c48206f..23c75e4a42ba3 100644 --- a/test/common/upstream/sds_test.cc +++ b/test/common/upstream/sds_test.cc @@ -1,3 +1,9 @@ +#include +#include +#include +#include +#include + #include "common/filesystem/filesystem_impl.h" #include "common/http/message_impl.h" #include "common/json/json_loader.h" @@ -8,8 +14,12 @@ #include "test/mocks/runtime/mocks.h" #include "test/mocks/ssl/mocks.h" #include "test/mocks/upstream/mocks.h" +#include "test/test_common/printers.h" #include "test/test_common/utility.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::_; using testing::DoAll; using testing::Invoke; diff --git a/test/common/upstream/upstream_impl_test.cc b/test/common/upstream/upstream_impl_test.cc index 04cf5ddb5849c..80ebc20fa3240 100644 --- a/test/common/upstream/upstream_impl_test.cc +++ b/test/common/upstream/upstream_impl_test.cc @@ -1,3 +1,9 @@ +#include +#include +#include +#include +#include + #include "envoy/api/api.h" #include "envoy/http/codec.h" #include "envoy/upstream/cluster_manager.h" @@ -14,6 +20,9 @@ #include "test/mocks/upstream/mocks.h" #include "test/test_common/utility.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::_; using testing::ContainerEq; using testing::Invoke; diff --git a/test/config_test/config_test.cc b/test/config_test/config_test.cc index 37ffe47d6c4c3..ec1f4e340e9f1 100644 --- a/test/config_test/config_test.cc +++ b/test/config_test/config_test.cc @@ -1,3 +1,8 @@ +#include + +#include +#include + #include "server/configuration_impl.h" #include "test/integration/server.h" @@ -5,6 +10,9 @@ #include "test/mocks/ssl/mocks.h" #include "test/test_common/utility.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::_; using testing::Invoke; using testing::NiceMock; diff --git a/test/config_test/config_test.h b/test/config_test/config_test.h index 6af1f2c56d640..2f315071be5a9 100644 --- a/test/config_test/config_test.h +++ b/test/config_test/config_test.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + namespace ConfigTest { /** diff --git a/test/config_test/example_configs_test.cc b/test/config_test/example_configs_test.cc index 7fa636651f299..2e1138a5aca4c 100644 --- a/test/config_test/example_configs_test.cc +++ b/test/config_test/example_configs_test.cc @@ -2,6 +2,8 @@ #include "test/test_common/environment.h" #include "test/test_common/utility.h" +#include "gtest/gtest.h" + TEST(ExampleConfigsTest, All) { TestEnvironment::exec( {TestEnvironment::runfilesPath("test/config_test/example_configs_test_setup.sh")}); diff --git a/test/integration/fake_upstream.cc b/test/integration/fake_upstream.cc index 2cf7fcc56e349..19dabb7a73788 100644 --- a/test/integration/fake_upstream.cc +++ b/test/integration/fake_upstream.cc @@ -1,5 +1,11 @@ #include "fake_upstream.h" +#include +#include +#include +#include +#include + #include "envoy/event/dispatcher.h" #include "common/api/api_impl.h" @@ -10,6 +16,7 @@ #include "common/network/address_impl.h" #include "common/network/listen_socket_impl.h" +#include "test/test_common/printers.h" #include "test/test_common/utility.h" FakeStream::FakeStream(FakeHttpConnection& parent, Http::StreamEncoder& encoder) diff --git a/test/integration/fake_upstream.h b/test/integration/fake_upstream.h index 5c7f7a51cb4c4..c13696a6d1438 100644 --- a/test/integration/fake_upstream.h +++ b/test/integration/fake_upstream.h @@ -1,5 +1,12 @@ #pragma once +#include +#include +#include +#include +#include +#include + #include "envoy/http/codec.h" #include "envoy/network/connection.h" #include "envoy/network/filter.h" @@ -13,6 +20,7 @@ #include "server/connection_handler_impl.h" +#include "test/test_common/printers.h" #include "test/test_common/utility.h" class FakeHttpConnection; diff --git a/test/integration/http2_integration_test.cc b/test/integration/http2_integration_test.cc index ce484ae92e50d..2e46f5947a980 100644 --- a/test/integration/http2_integration_test.cc +++ b/test/integration/http2_integration_test.cc @@ -1,12 +1,17 @@ #include "test/integration/http2_integration_test.h" +#include + #include "common/buffer/buffer_impl.h" #include "common/http/header_map_impl.h" #include "test/integration/utility.h" #include "test/mocks/http/mocks.h" +#include "test/test_common/printers.h" #include "test/test_common/utility.h" +#include "gtest/gtest.h" + TEST_F(Http2IntegrationTest, RouterNotFound) { testRouterNotFound(Http::CodecClient::Type::HTTP2); } TEST_F(Http2IntegrationTest, RouterNotFoundBodyNoBuffer) { diff --git a/test/integration/http2_integration_test.h b/test/integration/http2_integration_test.h index f0dbddf55e728..44d62cc22d125 100644 --- a/test/integration/http2_integration_test.h +++ b/test/integration/http2_integration_test.h @@ -2,6 +2,8 @@ #include "test/integration/integration.h" +#include "gtest/gtest.h" + class Http2IntegrationTest : public BaseIntegrationTest, public testing::Test { public: /** diff --git a/test/integration/http2_upstream_integration_test.cc b/test/integration/http2_upstream_integration_test.cc index eec7a7c56538b..d638d1b4afba5 100644 --- a/test/integration/http2_upstream_integration_test.cc +++ b/test/integration/http2_upstream_integration_test.cc @@ -2,8 +2,11 @@ #include "common/http/header_map_impl.h" +#include "test/test_common/printers.h" #include "test/test_common/utility.h" +#include "gtest/gtest.h" + TEST_F(Http2UpstreamIntegrationTest, RouterNotFound) { testRouterNotFound(Http::CodecClient::Type::HTTP2); } diff --git a/test/integration/http2_upstream_integration_test.h b/test/integration/http2_upstream_integration_test.h index 4170ccc770b6f..497382c886842 100644 --- a/test/integration/http2_upstream_integration_test.h +++ b/test/integration/http2_upstream_integration_test.h @@ -2,6 +2,8 @@ #include "test/integration/integration.h" +#include "gtest/gtest.h" + class Http2UpstreamIntegrationTest : public BaseIntegrationTest, public testing::Test { public: /** diff --git a/test/integration/integration.cc b/test/integration/integration.cc index ed0a36ac09a0a..ddce6a462a796 100644 --- a/test/integration/integration.cc +++ b/test/integration/integration.cc @@ -1,5 +1,15 @@ #include "test/integration/integration.h" +#include + +#include +#include +#include +#include +#include +#include +#include + #include "envoy/buffer/buffer.h" #include "envoy/event/dispatcher.h" #include "envoy/http/header_map.h" @@ -13,8 +23,11 @@ #include "test/integration/utility.h" #include "test/mocks/upstream/mocks.h" #include "test/test_common/environment.h" +#include "test/test_common/printers.h" #include "test/test_common/utility.h" +#include "gtest/gtest.h" + IntegrationTestServerPtr BaseIntegrationTest::test_server_; std::vector> BaseIntegrationTest::fake_upstreams_; diff --git a/test/integration/integration.h b/test/integration/integration.h index b52061847dfd7..fe4550f5b2175 100644 --- a/test/integration/integration.h +++ b/test/integration/integration.h @@ -1,5 +1,14 @@ #pragma once +#include + +#include +#include +#include +#include +#include +#include + #include "common/http/codec_client.h" #include "common/network/filter_impl.h" #include "common/stats/stats_impl.h" @@ -7,6 +16,7 @@ #include "test/integration/fake_upstream.h" #include "test/integration/server.h" #include "test/test_common/environment.h" +#include "test/test_common/printers.h" /** * Stream decoder wrapper used during integration testing. diff --git a/test/integration/integration_admin_test.cc b/test/integration/integration_admin_test.cc index bf1ce5719d1a7..c6e15288cf63b 100644 --- a/test/integration/integration_admin_test.cc +++ b/test/integration/integration_admin_test.cc @@ -1,8 +1,12 @@ +#include + #include "envoy/http/header_map.h" #include "test/integration/integration_test.h" #include "test/integration/utility.h" +#include "gtest/gtest.h" + TEST_F(IntegrationTest, HealthCheck) { BufferingStreamDecoderPtr response = IntegrationUtil::makeSingleRequest( lookupPort("http"), "GET", "/healthcheck", "", Http::CodecClient::Type::HTTP1); diff --git a/test/integration/integration_test.cc b/test/integration/integration_test.cc index 9b3e7de3a83e7..db2e3132b1469 100644 --- a/test/integration/integration_test.cc +++ b/test/integration/integration_test.cc @@ -1,10 +1,15 @@ #include "test/integration/integration_test.h" +#include + #include "common/http/header_map_impl.h" #include "test/integration/utility.h" +#include "test/test_common/printers.h" #include "test/test_common/utility.h" +#include "gtest/gtest.h" + TEST_F(IntegrationTest, Echo) { Buffer::OwnedImpl buffer("hello"); std::string response; diff --git a/test/integration/integration_test.h b/test/integration/integration_test.h index 7445435e8b118..9384fe6ac0473 100644 --- a/test/integration/integration_test.h +++ b/test/integration/integration_test.h @@ -2,6 +2,8 @@ #include "test/integration/integration.h" +#include "gtest/gtest.h" + class IntegrationTest : public BaseIntegrationTest, public testing::Test { public: /** diff --git a/test/integration/proxy_proto_integration_test.cc b/test/integration/proxy_proto_integration_test.cc index 28bfa740638e7..020b791977400 100644 --- a/test/integration/proxy_proto_integration_test.cc +++ b/test/integration/proxy_proto_integration_test.cc @@ -2,6 +2,10 @@ #include "common/buffer/buffer_impl.h" +#include "test/test_common/printers.h" + +#include "gtest/gtest.h" + TEST_F(ProxyProtoIntegrationTest, RouterRequestAndResponseWithBodyNoBuffer) { Network::ClientConnectionPtr conn = makeClientConnection(lookupPort("http")); diff --git a/test/integration/proxy_proto_integration_test.h b/test/integration/proxy_proto_integration_test.h index 8e77ae30bea29..579da91d9fe1c 100644 --- a/test/integration/proxy_proto_integration_test.h +++ b/test/integration/proxy_proto_integration_test.h @@ -7,6 +7,8 @@ #include "test/integration/integration.h" #include "test/integration/server.h" +#include "gtest/gtest.h" + class ProxyProtoIntegrationTest : public BaseIntegrationTest, public testing::Test { public: /** diff --git a/test/integration/server.cc b/test/integration/server.cc index 469652f8e0501..76cbe7fa828e3 100644 --- a/test/integration/server.cc +++ b/test/integration/server.cc @@ -1,5 +1,7 @@ #include "test/integration/server.h" +#include + #include "envoy/http/header_map.h" #include "envoy/server/hot_restart.h" @@ -10,6 +12,8 @@ #include "test/integration/utility.h" #include "test/test_common/environment.h" +#include "gtest/gtest.h" + namespace Server { class TestHotRestart : public HotRestart { diff --git a/test/integration/server.h b/test/integration/server.h index d256f002fe681..68a0d412f11d1 100644 --- a/test/integration/server.h +++ b/test/integration/server.h @@ -1,5 +1,14 @@ #pragma once +#include + +#include +#include +#include +#include +#include +#include + #include "envoy/server/options.h" #include "common/common/assert.h" diff --git a/test/integration/ssl_integration_test.cc b/test/integration/ssl_integration_test.cc index 5bf7ceddfea31..ac91bf8e8f156 100644 --- a/test/integration/ssl_integration_test.cc +++ b/test/integration/ssl_integration_test.cc @@ -1,10 +1,15 @@ #include "ssl_integration_test.h" +#include +#include + #include "common/event/dispatcher_impl.h" #include "common/network/utility.h" #include "common/ssl/context_config_impl.h" #include "common/ssl/context_manager_impl.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" #include "integration.h" #include "utility.h" diff --git a/test/integration/ssl_integration_test.h b/test/integration/ssl_integration_test.h index 16eed80c05545..aea89823ef919 100644 --- a/test/integration/ssl_integration_test.h +++ b/test/integration/ssl_integration_test.h @@ -1,9 +1,15 @@ #pragma once +#include +#include + #include "test/integration/integration.h" #include "test/integration/server.h" #include "test/mocks/runtime/mocks.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::NiceMock; namespace Ssl { diff --git a/test/integration/uds_integration_test.cc b/test/integration/uds_integration_test.cc index 214433c5bfbbe..b3d34e86c3e60 100644 --- a/test/integration/uds_integration_test.cc +++ b/test/integration/uds_integration_test.cc @@ -2,6 +2,8 @@ #include "common/event/dispatcher_impl.h" +#include "gtest/gtest.h" + TEST_F(UdsIntegrationTest, RouterRequestAndResponseWithBodyNoBuffer) { testRouterRequestAndResponseWithBody(makeClientConnection(lookupPort("http")), Http::CodecClient::Type::HTTP1, 1024, 512, false); diff --git a/test/integration/uds_integration_test.h b/test/integration/uds_integration_test.h index cfbb87fd596c0..fb75829c0ff3d 100644 --- a/test/integration/uds_integration_test.h +++ b/test/integration/uds_integration_test.h @@ -8,6 +8,8 @@ #include "test/integration/server.h" #include "test/test_common/environment.h" +#include "gtest/gtest.h" + class UdsIntegrationTest : public BaseIntegrationTest, public testing::Test { public: /** diff --git a/test/integration/utility.cc b/test/integration/utility.cc index 7aca598300f6b..ef4542900bb8b 100644 --- a/test/integration/utility.cc +++ b/test/integration/utility.cc @@ -1,5 +1,12 @@ #include "utility.h" +#include + +#include +#include +#include +#include + #include "envoy/event/dispatcher.h" #include "envoy/network/connection.h" @@ -12,6 +19,7 @@ #include "common/upstream/upstream_impl.h" #include "test/mocks/upstream/mocks.h" +#include "test/test_common/printers.h" #include "test/test_common/utility.h" void BufferingStreamDecoder::decodeHeaders(Http::HeaderMapPtr&& headers, bool end_stream) { diff --git a/test/integration/utility.h b/test/integration/utility.h index 0a38d02a44d13..7b5fd49c9c103 100644 --- a/test/integration/utility.h +++ b/test/integration/utility.h @@ -1,5 +1,10 @@ #pragma once +#include +#include +#include +#include + #include "envoy/api/api.h" #include "envoy/http/codec.h" #include "envoy/http/header_map.h" @@ -7,6 +12,8 @@ #include "common/http/codec_client.h" +#include "test/test_common/printers.h" + /** * A buffering response decoder used for testing. */ diff --git a/test/mocks/access_log/mocks.cc b/test/mocks/access_log/mocks.cc index db1a44a201a47..2bae5f579f1e1 100644 --- a/test/mocks/access_log/mocks.cc +++ b/test/mocks/access_log/mocks.cc @@ -1,5 +1,8 @@ #include "test/mocks/access_log/mocks.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::_; using testing::Return; diff --git a/test/mocks/access_log/mocks.h b/test/mocks/access_log/mocks.h index 850daadb1f95c..210ff8f1d397a 100644 --- a/test/mocks/access_log/mocks.h +++ b/test/mocks/access_log/mocks.h @@ -1,9 +1,14 @@ #pragma once +#include +#include + #include "envoy/access_log/access_log.h" #include "test/mocks/filesystem/mocks.h" +#include "gmock/gmock.h" + namespace AccessLog { class MockAccessLogManager : public AccessLogManager { diff --git a/test/mocks/api/mocks.cc b/test/mocks/api/mocks.cc index dd789f43550e1..7a8d54d19d67a 100644 --- a/test/mocks/api/mocks.cc +++ b/test/mocks/api/mocks.cc @@ -1,5 +1,8 @@ #include "mocks.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::_; using testing::Return; diff --git a/test/mocks/api/mocks.h b/test/mocks/api/mocks.h index 0834b322ab946..0556411b449ee 100644 --- a/test/mocks/api/mocks.h +++ b/test/mocks/api/mocks.h @@ -1,10 +1,15 @@ #pragma once +#include +#include + #include "envoy/api/api.h" #include "envoy/event/dispatcher.h" #include "test/mocks/filesystem/mocks.h" +#include "gmock/gmock.h" + namespace Api { class MockApi : public Api { diff --git a/test/mocks/buffer/mocks.h b/test/mocks/buffer/mocks.h index 8372c551b6768..153850000176a 100644 --- a/test/mocks/buffer/mocks.h +++ b/test/mocks/buffer/mocks.h @@ -2,8 +2,11 @@ #include "common/buffer/buffer_impl.h" +#include "test/test_common/printers.h" #include "test/test_common/utility.h" +#include "gmock/gmock.h" + MATCHER_P(BufferEqual, rhs, testing::PrintToString(*rhs)) { return TestUtility::buffersEqual(arg, *rhs); } diff --git a/test/mocks/common.h b/test/mocks/common.h index 31275712507cc..7691ccce1b35c 100644 --- a/test/mocks/common.h +++ b/test/mocks/common.h @@ -2,7 +2,7 @@ #include "envoy/common/time.h" -#include "test/precompiled/precompiled_test.h" +#include "gmock/gmock.h" /** * This action allows us to save a reference parameter to a pointer target. diff --git a/test/mocks/event/mocks.cc b/test/mocks/event/mocks.cc index a3465a91fad54..1a1546c6a4a7b 100644 --- a/test/mocks/event/mocks.cc +++ b/test/mocks/event/mocks.cc @@ -3,6 +3,9 @@ #include "common/network/listen_socket_impl.h" #include "common/stats/stats_impl.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::_; using testing::Invoke; using testing::NiceMock; diff --git a/test/mocks/event/mocks.h b/test/mocks/event/mocks.h index db74fb699db9b..75dafe77924f8 100644 --- a/test/mocks/event/mocks.h +++ b/test/mocks/event/mocks.h @@ -1,5 +1,10 @@ #pragma once +#include +#include +#include +#include + #include "envoy/event/deferred_deletable.h" #include "envoy/event/dispatcher.h" #include "envoy/event/file_event.h" @@ -11,6 +16,8 @@ #include "envoy/network/listener.h" #include "envoy/ssl/context.h" +#include "gmock/gmock.h" + namespace Event { class MockDispatcher : public Dispatcher { diff --git a/test/mocks/filesystem/mocks.cc b/test/mocks/filesystem/mocks.cc index f60d15c8699dd..d564bc5eefea3 100644 --- a/test/mocks/filesystem/mocks.cc +++ b/test/mocks/filesystem/mocks.cc @@ -1,5 +1,7 @@ #include "test/mocks/filesystem/mocks.h" +#include + namespace Filesystem { MockOsSysCalls::MockOsSysCalls() { num_writes_ = num_open_ = 0; } diff --git a/test/mocks/filesystem/mocks.h b/test/mocks/filesystem/mocks.h index b5c0de9427319..41e6f23c940ca 100644 --- a/test/mocks/filesystem/mocks.h +++ b/test/mocks/filesystem/mocks.h @@ -1,9 +1,15 @@ #pragma once +#include +#include +#include + #include "envoy/filesystem/filesystem.h" #include "common/common/thread.h" +#include "gmock/gmock.h" + namespace Filesystem { class MockOsSysCalls : public OsSysCalls { diff --git a/test/mocks/grpc/mocks.h b/test/mocks/grpc/mocks.h index 65a3671f23370..9defdf56d19f5 100644 --- a/test/mocks/grpc/mocks.h +++ b/test/mocks/grpc/mocks.h @@ -1,7 +1,12 @@ #pragma once +#include +#include + #include "envoy/grpc/rpc_channel.h" +#include "gmock/gmock.h" + namespace Grpc { class MockRpcChannelCallbacks : public RpcChannelCallbacks { diff --git a/test/mocks/http/mocks.cc b/test/mocks/http/mocks.cc index 0c05c58d189eb..48c42b6acd1f9 100644 --- a/test/mocks/http/mocks.cc +++ b/test/mocks/http/mocks.cc @@ -3,6 +3,9 @@ #include "envoy/buffer/buffer.h" #include "envoy/event/dispatcher.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::_; using testing::Invoke; using testing::Return; diff --git a/test/mocks/http/mocks.h b/test/mocks/http/mocks.h index 8bed8375ddb5b..1a7d8992dab95 100644 --- a/test/mocks/http/mocks.h +++ b/test/mocks/http/mocks.h @@ -1,5 +1,12 @@ #pragma once +#include +#include +#include +#include +#include +#include + #include "envoy/http/access_log.h" #include "envoy/http/async_client.h" #include "envoy/http/codec.h" @@ -14,6 +21,9 @@ #include "test/mocks/event/mocks.h" #include "test/mocks/router/mocks.h" #include "test/mocks/upstream/host.h" +#include "test/test_common/printers.h" + +#include "gmock/gmock.h" namespace Http { namespace AccessLog { diff --git a/test/mocks/init/mocks.cc b/test/mocks/init/mocks.cc index 07f4e0b9564f4..d97fa42c1b114 100644 --- a/test/mocks/init/mocks.cc +++ b/test/mocks/init/mocks.cc @@ -1,5 +1,10 @@ #include "mocks.h" +#include + +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::_; using testing::Invoke; diff --git a/test/mocks/init/mocks.h b/test/mocks/init/mocks.h index 400786ca94128..f41c1385cbf4e 100644 --- a/test/mocks/init/mocks.h +++ b/test/mocks/init/mocks.h @@ -1,9 +1,14 @@ #pragma once +#include +#include + #include "envoy/init/init.h" #include "test/mocks/common.h" +#include "gmock/gmock.h" + namespace Init { class MockTarget : public Target { diff --git a/test/mocks/local_info/mocks.cc b/test/mocks/local_info/mocks.cc index 7a25c57d1173c..72fc86003a7e4 100644 --- a/test/mocks/local_info/mocks.cc +++ b/test/mocks/local_info/mocks.cc @@ -2,6 +2,9 @@ #include "common/network/address_impl.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::Return; using testing::ReturnRef; diff --git a/test/mocks/local_info/mocks.h b/test/mocks/local_info/mocks.h index bc9678e23c6b9..4abfa1ef8f522 100644 --- a/test/mocks/local_info/mocks.h +++ b/test/mocks/local_info/mocks.h @@ -1,7 +1,11 @@ #pragma once +#include + #include "envoy/local_info/local_info.h" +#include "gmock/gmock.h" + namespace LocalInfo { class MockLocalInfo : public LocalInfo { diff --git a/test/mocks/network/mocks.cc b/test/mocks/network/mocks.cc index bedef03218be1..196bb54c76962 100644 --- a/test/mocks/network/mocks.cc +++ b/test/mocks/network/mocks.cc @@ -1,10 +1,17 @@ #include "mocks.h" +#include + #include "envoy/buffer/buffer.h" #include "common/network/address_impl.h" #include "common/network/utility.h" +#include "test/test_common/printers.h" + +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::_; using testing::Invoke; using testing::Return; diff --git a/test/mocks/network/mocks.h b/test/mocks/network/mocks.h index 3a4a58ca73348..1e57a37d34aac 100644 --- a/test/mocks/network/mocks.h +++ b/test/mocks/network/mocks.h @@ -1,5 +1,9 @@ #pragma once +#include +#include +#include + #include "envoy/network/connection.h" #include "envoy/network/drain_decision.h" #include "envoy/network/filter.h" @@ -7,6 +11,9 @@ #include "common/network/proxy_protocol.h" #include "test/mocks/event/mocks.h" +#include "test/test_common/printers.h" + +#include "gmock/gmock.h" namespace Network { diff --git a/test/mocks/ratelimit/mocks.h b/test/mocks/ratelimit/mocks.h index 477cf2632db8c..306c4e1dfba26 100644 --- a/test/mocks/ratelimit/mocks.h +++ b/test/mocks/ratelimit/mocks.h @@ -1,8 +1,13 @@ #pragma once +#include +#include + #include "envoy/ratelimit/ratelimit.h" #include "envoy/tracing/context.h" +#include "gmock/gmock.h" + namespace RateLimit { class MockClient : public Client { diff --git a/test/mocks/redis/mocks.cc b/test/mocks/redis/mocks.cc index e0ca6ad6a1788..c60b0253ec5ec 100644 --- a/test/mocks/redis/mocks.cc +++ b/test/mocks/redis/mocks.cc @@ -1,7 +1,14 @@ #include "mocks.h" +#include + #include "common/common/assert.h" +#include "test/test_common/printers.h" + +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::_; using testing::Invoke; diff --git a/test/mocks/redis/mocks.h b/test/mocks/redis/mocks.h index e0da90d1c93dc..5461c7be993f3 100644 --- a/test/mocks/redis/mocks.h +++ b/test/mocks/redis/mocks.h @@ -1,10 +1,18 @@ #pragma once +#include +#include +#include + #include "envoy/redis/command_splitter.h" #include "envoy/redis/conn_pool.h" #include "common/redis/codec_impl.h" +#include "test/test_common/printers.h" + +#include "gmock/gmock.h" + namespace Redis { bool operator==(const RespValue& lhs, const RespValue& rhs); diff --git a/test/mocks/router/mocks.cc b/test/mocks/router/mocks.cc index 17457ac242e7e..07aaabb2841e5 100644 --- a/test/mocks/router/mocks.cc +++ b/test/mocks/router/mocks.cc @@ -1,5 +1,10 @@ #include "mocks.h" +#include + +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::_; using testing::NiceMock; using testing::Return; diff --git a/test/mocks/router/mocks.h b/test/mocks/router/mocks.h index c6cb18f69937b..92f5bb799596f 100644 --- a/test/mocks/router/mocks.h +++ b/test/mocks/router/mocks.h @@ -1,9 +1,19 @@ #pragma once +#include +#include +#include +#include +#include +#include +#include + #include "envoy/router/router.h" #include "envoy/router/router_ratelimit.h" #include "envoy/router/shadow_writer.h" +#include "gmock/gmock.h" + namespace Router { class MockRedirectEntry : public RedirectEntry { diff --git a/test/mocks/runtime/mocks.cc b/test/mocks/runtime/mocks.cc index f729fda18bf10..8f000e647d939 100644 --- a/test/mocks/runtime/mocks.cc +++ b/test/mocks/runtime/mocks.cc @@ -1,5 +1,8 @@ #include "mocks.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::_; using testing::ReturnArg; diff --git a/test/mocks/runtime/mocks.h b/test/mocks/runtime/mocks.h index 064490e040d7e..24ea37b1d20d8 100644 --- a/test/mocks/runtime/mocks.h +++ b/test/mocks/runtime/mocks.h @@ -1,7 +1,12 @@ #pragma once +#include +#include + #include "envoy/runtime/runtime.h" +#include "gmock/gmock.h" + namespace Runtime { class MockRandomGenerator : public RandomGenerator { diff --git a/test/mocks/server/mocks.cc b/test/mocks/server/mocks.cc index 7d604dcc80afe..7856d91ade510 100644 --- a/test/mocks/server/mocks.cc +++ b/test/mocks/server/mocks.cc @@ -1,5 +1,10 @@ #include "mocks.h" +#include + +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::_; using testing::Return; using testing::ReturnNew; diff --git a/test/mocks/server/mocks.h b/test/mocks/server/mocks.h index 1d2840b30a4f0..c96d38ef91b89 100644 --- a/test/mocks/server/mocks.h +++ b/test/mocks/server/mocks.h @@ -1,5 +1,12 @@ #pragma once +#include + +#include +#include +#include +#include + #include "envoy/server/admin.h" #include "envoy/server/configuration.h" #include "envoy/server/drain_manager.h" @@ -23,6 +30,9 @@ #include "test/mocks/tracing/mocks.h" #include "test/mocks/upstream/mocks.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::NiceMock; namespace Server { diff --git a/test/mocks/ssl/mocks.h b/test/mocks/ssl/mocks.h index c2a82b4762d3b..08cd58cbb0b19 100755 --- a/test/mocks/ssl/mocks.h +++ b/test/mocks/ssl/mocks.h @@ -1,11 +1,16 @@ #pragma once +#include +#include + #include "envoy/ssl/connection.h" #include "envoy/ssl/context.h" #include "envoy/ssl/context_config.h" #include "envoy/ssl/context_manager.h" #include "envoy/stats/stats.h" +#include "gmock/gmock.h" + namespace Ssl { class MockContextManager : public ContextManager { diff --git a/test/mocks/stats/mocks.cc b/test/mocks/stats/mocks.cc index 11df1c7e14d53..6ab8c1d7774f1 100644 --- a/test/mocks/stats/mocks.cc +++ b/test/mocks/stats/mocks.cc @@ -1,5 +1,8 @@ #include "mocks.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::_; namespace Stats { diff --git a/test/mocks/stats/mocks.h b/test/mocks/stats/mocks.h index e7c58ac78e192..1f56e5706c2ca 100644 --- a/test/mocks/stats/mocks.h +++ b/test/mocks/stats/mocks.h @@ -1,10 +1,17 @@ #pragma once +#include +#include +#include +#include + #include "envoy/stats/stats.h" #include "envoy/thread_local/thread_local.h" #include "common/stats/stats_impl.h" +#include "gmock/gmock.h" + namespace Stats { class MockCounter : public Counter { diff --git a/test/mocks/thread_local/mocks.cc b/test/mocks/thread_local/mocks.cc index 33bf12afeca85..ca1b9a8b19a2a 100644 --- a/test/mocks/thread_local/mocks.cc +++ b/test/mocks/thread_local/mocks.cc @@ -1,5 +1,8 @@ #include "mocks.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::_; using testing::Invoke; diff --git a/test/mocks/thread_local/mocks.h b/test/mocks/thread_local/mocks.h index 9a5eea06c6e6b..69871cb920fc3 100644 --- a/test/mocks/thread_local/mocks.h +++ b/test/mocks/thread_local/mocks.h @@ -1,9 +1,14 @@ #pragma once +#include +#include + #include "envoy/thread_local/thread_local.h" #include "test/mocks/event/mocks.h" +#include "gmock/gmock.h" + namespace ThreadLocal { class MockInstance : public Instance { diff --git a/test/mocks/tracing/mocks.cc b/test/mocks/tracing/mocks.cc index a83c394cb4c99..0a497518b74d3 100644 --- a/test/mocks/tracing/mocks.cc +++ b/test/mocks/tracing/mocks.cc @@ -1,5 +1,8 @@ #include "mocks.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::Return; using testing::ReturnRef; diff --git a/test/mocks/tracing/mocks.h b/test/mocks/tracing/mocks.h index 489a80604244b..c0181932f32af 100644 --- a/test/mocks/tracing/mocks.h +++ b/test/mocks/tracing/mocks.h @@ -1,8 +1,13 @@ #pragma once +#include +#include + #include "envoy/tracing/context.h" #include "envoy/tracing/http_tracer.h" +#include "gmock/gmock.h" + namespace Tracing { inline bool operator==(const TransportContext& lhs, const TransportContext& rhs) { diff --git a/test/mocks/upstream/cluster_info.h b/test/mocks/upstream/cluster_info.h index eb0545fbee7c7..667802f631c98 100644 --- a/test/mocks/upstream/cluster_info.h +++ b/test/mocks/upstream/cluster_info.h @@ -1,5 +1,10 @@ #pragma once +#include +#include +#include +#include + #include "envoy/upstream/cluster_manager.h" #include "envoy/upstream/upstream.h" @@ -8,6 +13,9 @@ #include "test/mocks/runtime/mocks.h" #include "test/mocks/stats/mocks.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::NiceMock; namespace Upstream { diff --git a/test/mocks/upstream/host.h b/test/mocks/upstream/host.h index f674bf717cfe7..35be3ed55c3be 100644 --- a/test/mocks/upstream/host.h +++ b/test/mocks/upstream/host.h @@ -1,11 +1,18 @@ #pragma once +#include +#include +#include +#include + #include "envoy/upstream/upstream.h" #include "common/stats/stats_impl.h" #include "test/mocks/upstream/cluster_info.h" +#include "gmock/gmock.h" + namespace Upstream { namespace Outlier { diff --git a/test/mocks/upstream/mocks.cc b/test/mocks/upstream/mocks.cc index c85cedaa52d73..0efe02cb37f30 100644 --- a/test/mocks/upstream/mocks.cc +++ b/test/mocks/upstream/mocks.cc @@ -1,10 +1,16 @@ #include "test/mocks/upstream/mocks.h" +#include +#include + #include "envoy/upstream/load_balancer.h" #include "common/network/utility.h" #include "common/upstream/upstream_impl.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::_; using testing::Invoke; using testing::Return; diff --git a/test/mocks/upstream/mocks.h b/test/mocks/upstream/mocks.h index 30945b29d1a84..2d7e404aa641f 100644 --- a/test/mocks/upstream/mocks.h +++ b/test/mocks/upstream/mocks.h @@ -1,5 +1,11 @@ #pragma once +#include +#include +#include +#include +#include + #include "envoy/http/async_client.h" #include "envoy/upstream/cluster_manager.h" #include "envoy/upstream/health_checker.h" @@ -12,6 +18,8 @@ #include "test/mocks/stats/mocks.h" #include "cluster_info.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" using testing::NiceMock; diff --git a/test/precompiled/BUILD b/test/precompiled/BUILD index 214b32a3e4718..bb61ff2049832 100644 --- a/test/precompiled/BUILD +++ b/test/precompiled/BUILD @@ -1,12 +1 @@ -package(default_visibility = ["//visibility:public"]) - -load("//bazel:envoy_build_system.bzl", "envoy_cc_library") - -envoy_cc_library( - name = "precompiled_includes", - hdrs = ["precompiled_test.h"], - external_deps = ["googletest"], - deps = [ - "//test/test_common:printers_includes", - ], -) +# TODO(htuch): Nuke this directory when cmake is no more. diff --git a/test/server/config/http/config_test.cc b/test/server/config/http/config_test.cc index 8a8c311a0e2b3..4e5518d8214ea 100644 --- a/test/server/config/http/config_test.cc +++ b/test/server/config/http/config_test.cc @@ -1,3 +1,5 @@ +#include + #include "server/config/http/buffer.h" #include "server/config/http/dynamo.h" #include "server/config/http/fault.h" @@ -8,6 +10,9 @@ #include "test/mocks/server/mocks.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::_; using testing::NiceMock; diff --git a/test/server/config/network/config_test.cc b/test/server/config/network/config_test.cc index 6a27309c1ca18..eb9aaa4c1b475 100644 --- a/test/server/config/network/config_test.cc +++ b/test/server/config/network/config_test.cc @@ -1,3 +1,5 @@ +#include + #include "server/config/network/client_ssl_auth.h" #include "server/config/network/http_connection_manager.h" #include "server/config/network/mongo_proxy.h" @@ -7,6 +9,9 @@ #include "test/mocks/server/mocks.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::_; using testing::NiceMock; diff --git a/test/server/config/network/http_connection_manager_test.cc b/test/server/config/network/http_connection_manager_test.cc index 65ab210244957..25dff28f3e660 100644 --- a/test/server/config/network/http_connection_manager_test.cc +++ b/test/server/config/network/http_connection_manager_test.cc @@ -3,6 +3,10 @@ #include "server/config/network/http_connection_manager.h" #include "test/mocks/network/mocks.h" +#include "test/test_common/printers.h" + +#include "gmock/gmock.h" +#include "gtest/gtest.h" using testing::Return; diff --git a/test/server/configuration_impl_test.cc b/test/server/configuration_impl_test.cc index 9637d3d4cb439..e56ddabcd7df2 100644 --- a/test/server/configuration_impl_test.cc +++ b/test/server/configuration_impl_test.cc @@ -1,9 +1,16 @@ +#include +#include +#include + #include "server/configuration_impl.h" #include "test/mocks/common.h" #include "test/mocks/network/mocks.h" #include "test/mocks/server/mocks.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::InSequence; using testing::Return; using testing::ReturnRef; diff --git a/test/server/connection_handler_test.cc b/test/server/connection_handler_test.cc index 4d830661173d9..b7ca802c3af56 100644 --- a/test/server/connection_handler_test.cc +++ b/test/server/connection_handler_test.cc @@ -8,6 +8,9 @@ #include "test/mocks/network/mocks.h" #include "test/mocks/server/mocks.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::_; using testing::ByRef; using testing::InSequence; diff --git a/test/server/drain_manager_impl_test.cc b/test/server/drain_manager_impl_test.cc index 6e3ec787463c2..b7aad04e718bb 100644 --- a/test/server/drain_manager_impl_test.cc +++ b/test/server/drain_manager_impl_test.cc @@ -1,7 +1,12 @@ +#include + #include "server/drain_manager_impl.h" #include "test/mocks/server/mocks.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::_; using testing::Return; using testing::SaveArg; diff --git a/test/server/guarddog_impl_test.cc b/test/server/guarddog_impl_test.cc index 3b7d0811fcb9f..55a709f0eedb9 100644 --- a/test/server/guarddog_impl_test.cc +++ b/test/server/guarddog_impl_test.cc @@ -1,3 +1,7 @@ +#include +#include +#include + #include "envoy/common/time.h" #include "common/common/utility.h" @@ -9,6 +13,9 @@ #include "test/mocks/server/mocks.h" #include "test/mocks/stats/mocks.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::InSequence; using testing::NiceMock; diff --git a/test/server/http/admin_test.cc b/test/server/http/admin_test.cc index 05b10513b2b92..cb66bc0f3c21f 100644 --- a/test/server/http/admin_test.cc +++ b/test/server/http/admin_test.cc @@ -5,8 +5,12 @@ #include "test/mocks/server/mocks.h" #include "test/test_common/environment.h" +#include "test/test_common/printers.h" #include "test/test_common/utility.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::_; using testing::NiceMock; diff --git a/test/server/http/health_check_test.cc b/test/server/http/health_check_test.cc index e5082d47d7d3c..e6c83008113ad 100644 --- a/test/server/http/health_check_test.cc +++ b/test/server/http/health_check_test.cc @@ -1,10 +1,17 @@ +#include +#include + #include "common/buffer/buffer_impl.h" #include "server/http/health_check.h" #include "test/mocks/server/mocks.h" +#include "test/test_common/printers.h" #include "test/test_common/utility.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::_; using testing::DoAll; using testing::Invoke; diff --git a/test/server/options_impl_test.cc b/test/server/options_impl_test.cc index 2d7ad481fa138..987abbb99dec8 100644 --- a/test/server/options_impl_test.cc +++ b/test/server/options_impl_test.cc @@ -1,7 +1,16 @@ +#include + +#include +#include +#include +#include + #include "common/common/utility.h" #include "server/options_impl.h" +#include "gtest/gtest.h" + // Do the ugly work of turning a std::string into a char** and create an OptionsImpl. Args are // separated by a single space: no fancy quoting or escaping. std::unique_ptr createOptionsImpl(const std::string& args) { diff --git a/test/server/server_test.cc b/test/server/server_test.cc index 4c3d2f499b0b2..56a44b38d2ac4 100644 --- a/test/server/server_test.cc +++ b/test/server/server_test.cc @@ -7,6 +7,9 @@ #include "test/mocks/stats/mocks.h" #include "test/test_common/environment.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + using testing::_; using testing::InSequence; diff --git a/test/test_common/environment.cc b/test/test_common/environment.cc index 63cb24eeb57fc..33639977d74d6 100644 --- a/test/test_common/environment.cc +++ b/test/test_common/environment.cc @@ -1,5 +1,16 @@ #include "test/test_common/environment.h" +#include +#include + +#include +#include +#include +#include +#include +#include +#include + #include "common/common/assert.h" #include "server/options_impl.h" diff --git a/test/test_common/environment.h b/test/test_common/environment.h index fc595711c32ad..db6dd118b7b5d 100644 --- a/test/test_common/environment.h +++ b/test/test_common/environment.h @@ -1,5 +1,10 @@ #pragma once +#include +#include +#include +#include + #include "envoy/server/options.h" #include "common/json/json_loader.h" diff --git a/test/test_common/network_utility.cc b/test/test_common/network_utility.cc index 70d129684e23a..a1b11853d8396 100644 --- a/test/test_common/network_utility.cc +++ b/test/test_common/network_utility.cc @@ -1,5 +1,12 @@ #include "test/test_common/network_utility.h" +#include +#include +#include + +#include +#include + #include "common/common/assert.h" #include "common/network/address_impl.h" #include "common/network/utility.h" diff --git a/test/test_common/network_utility.h b/test/test_common/network_utility.h index 4e3e145a621a9..2da5b4dc01e2a 100644 --- a/test/test_common/network_utility.h +++ b/test/test_common/network_utility.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "envoy/network/address.h" namespace Network { diff --git a/test/test_common/network_utility_test.cc b/test/test_common/network_utility_test.cc index a0837b3816804..516817f91845c 100644 --- a/test/test_common/network_utility_test.cc +++ b/test/test_common/network_utility_test.cc @@ -1,5 +1,9 @@ +#include + #include "test/test_common/network_utility.h" +#include "gtest/gtest.h" + namespace Network { namespace Test { diff --git a/test/test_common/printers.cc b/test/test_common/printers.cc index ef0308efbe196..16de3ef15f4cc 100644 --- a/test/test_common/printers.cc +++ b/test/test_common/printers.cc @@ -1,4 +1,7 @@ #include "printers.h" +#include "test/test_common/printers.h" + +#include #include "envoy/redis/codec.h" diff --git a/test/test_common/printers.h b/test/test_common/printers.h index ba62cd170d340..54fedf33c28b4 100644 --- a/test/test_common/printers.h +++ b/test/test_common/printers.h @@ -1,5 +1,10 @@ #pragma once +#include +#include + +#include "test/test_common/printers.h" + namespace Http { /** * Pretty print const HeaderMapImpl& diff --git a/test/test_common/utility.cc b/test/test_common/utility.cc index 60cb6d4bc602b..ddef9aa8b5da4 100644 --- a/test/test_common/utility.cc +++ b/test/test_common/utility.cc @@ -1,12 +1,25 @@ #include "utility.h" #include +#include +#include + +#include +#include +#include +#include +#include +#include #include "envoy/buffer/buffer.h" #include "common/common/empty_string.h" #include "common/network/address_impl.h" +#include "test/test_common/printers.h" + +#include "gtest/gtest.h" + bool TestUtility::buffersEqual(const Buffer::Instance& lhs, const Buffer::Instance& rhs) { if (lhs.length() != rhs.length()) { return false; diff --git a/test/test_common/utility.h b/test/test_common/utility.h index 689b431abe2fa..1d0b0f2ddc9b8 100644 --- a/test/test_common/utility.h +++ b/test/test_common/utility.h @@ -1,10 +1,20 @@ #pragma once +#include +#include +#include +#include +#include + #include "envoy/buffer/buffer.h" #include "envoy/network/address.h" #include "common/http/header_map_impl.h" +#include "test/test_common/printers.h" + +#include "gtest/gtest.h" + #define EXPECT_THROW_WITH_MESSAGE(statement, expected_exception, message) \ try { \ statement; \ diff --git a/test/tools/router_check/json/tool_config_schemas.cc b/test/tools/router_check/json/tool_config_schemas.cc index b090c531c784a..1f3dfd74b6e04 100644 --- a/test/tools/router_check/json/tool_config_schemas.cc +++ b/test/tools/router_check/json/tool_config_schemas.cc @@ -1,5 +1,7 @@ #include "test/tools/router_check/json/tool_config_schemas.h" +#include + const std::string& Json::ToolSchema::routerCheckSchema() { static const std::string* router_check_schema = new std::string(R"EOF( { diff --git a/test/tools/router_check/json/tool_config_schemas.h b/test/tools/router_check/json/tool_config_schemas.h index dd759c9d5d1bb..8103f044243f9 100644 --- a/test/tools/router_check/json/tool_config_schemas.h +++ b/test/tools/router_check/json/tool_config_schemas.h @@ -1,5 +1,7 @@ #pragma once +#include + namespace Json { class ToolSchema { diff --git a/test/tools/router_check/router.cc b/test/tools/router_check/router.cc index 9be92d4c75149..4fbc1095293de 100644 --- a/test/tools/router_check/router.cc +++ b/test/tools/router_check/router.cc @@ -1,5 +1,12 @@ #include "test/tools/router_check/router.h" +#include +#include +#include +#include + +#include "test/test_common/printers.h" + // static ToolConfig ToolConfig::create(const Json::ObjectPtr& check_config) { Json::ObjectPtr input = check_config->getObject("input"); diff --git a/test/tools/router_check/router.h b/test/tools/router_check/router.h index eff7116352157..5274f15a5252e 100644 --- a/test/tools/router_check/router.h +++ b/test/tools/router_check/router.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + #include "common/common/logger.h" #include "common/common/utility.h" #include "common/http/header_map_impl.h" @@ -9,6 +12,7 @@ #include "test/mocks/runtime/mocks.h" #include "test/mocks/upstream/mocks.h" +#include "test/test_common/printers.h" #include "test/test_common/utility.h" #include "test/tools/router_check/json/tool_config_schemas.h" diff --git a/test/tools/router_check/router_check.cc b/test/tools/router_check/router_check.cc index 94c9446960c57..26e06d71676a1 100644 --- a/test/tools/router_check/router_check.cc +++ b/test/tools/router_check/router_check.cc @@ -1,3 +1,6 @@ +#include +#include + #include "test/tools/router_check/router.h" int main(int argc, char* argv[]) {