diff --git a/.gitignore b/.gitignore index 5878246ab0a85..02cb2460a2888 100644 --- a/.gitignore +++ b/.gitignore @@ -19,7 +19,7 @@ cscope.* *.pyc **/pyformat SOURCE_VERSION -source/common/config/api_type_db.generated.pb_text +api_type_db.generated.pb_text .settings/ *.sw* tags diff --git a/include/envoy/grpc/status.h b/include/envoy/grpc/status.h index 027ecd19f5dbf..b967d3e291645 100644 --- a/include/envoy/grpc/status.h +++ b/include/envoy/grpc/status.h @@ -1,5 +1,7 @@ #pragma once +#include + namespace Envoy { namespace Grpc { diff --git a/include/envoy/network/BUILD b/include/envoy/network/BUILD index c5469f5ee22c6..c4c89fee0caab 100644 --- a/include/envoy/network/BUILD +++ b/include/envoy/network/BUILD @@ -118,6 +118,7 @@ envoy_cc_library( ":connection_interface", ":listen_socket_interface", "//include/envoy/stats:stats_interface", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) diff --git a/include/envoy/network/hash_policy.h b/include/envoy/network/hash_policy.h index adb02dafd7a1a..49a38da8c14d4 100644 --- a/include/envoy/network/hash_policy.h +++ b/include/envoy/network/hash_policy.h @@ -24,4 +24,4 @@ class HashPolicy { const Network::Address::Instance* upstream_address) const PURE; }; } // namespace Network -} // namespace Envoy \ No newline at end of file +} // namespace Envoy diff --git a/include/envoy/network/listener.h b/include/envoy/network/listener.h index f5538c15c9834..5d57b9cd6c7dd 100644 --- a/include/envoy/network/listener.h +++ b/include/envoy/network/listener.h @@ -5,6 +5,7 @@ #include #include "envoy/api/io_error.h" +#include "envoy/api/v2/core/base.pb.h" #include "envoy/common/exception.h" #include "envoy/network/connection.h" #include "envoy/network/connection_balancer.h" diff --git a/include/envoy/router/BUILD b/include/envoy/router/BUILD index 17625722f7fbd..09236c3c7e1de 100644 --- a/include/envoy/router/BUILD +++ b/include/envoy/router/BUILD @@ -30,6 +30,7 @@ envoy_cc_library( "//include/envoy/stats:stats_interface", "//include/envoy/thread_local:thread_local_interface", "//include/envoy/upstream:cluster_manager_interface", + "@envoy_api//envoy/api/v2:pkg_cc_proto", "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto", ], ) @@ -42,6 +43,7 @@ envoy_cc_library( ":rds_interface", "//include/envoy/common:time_interface", "//source/common/protobuf", + "@envoy_api//envoy/api/v2:pkg_cc_proto", ], ) @@ -63,6 +65,7 @@ envoy_cc_library( "//source/common/protobuf", "//source/common/protobuf:utility_lib", "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/type:pkg_cc_proto", ], ) diff --git a/include/envoy/router/route_config_provider_manager.h b/include/envoy/router/route_config_provider_manager.h index 9912aa4603564..485083500e440 100644 --- a/include/envoy/router/route_config_provider_manager.h +++ b/include/envoy/router/route_config_provider_manager.h @@ -2,6 +2,7 @@ #include +#include "envoy/api/v2/rds.pb.h" #include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.h" #include "envoy/event/dispatcher.h" #include "envoy/json/json_object.h" diff --git a/include/envoy/router/route_config_update_receiver.h b/include/envoy/router/route_config_update_receiver.h index 6e4d492b1676d..33826cfd93559 100644 --- a/include/envoy/router/route_config_update_receiver.h +++ b/include/envoy/router/route_config_update_receiver.h @@ -2,6 +2,8 @@ #include +#include "envoy/api/v2/discovery.pb.h" +#include "envoy/api/v2/rds.pb.h" #include "envoy/common/pure.h" #include "envoy/common/time.h" #include "envoy/router/rds.h" diff --git a/include/envoy/router/router.h b/include/envoy/router/router.h index fb398503f7b7b..6fd2ff10136c5 100644 --- a/include/envoy/router/router.h +++ b/include/envoy/router/router.h @@ -17,6 +17,7 @@ #include "envoy/http/hash_policy.h" #include "envoy/http/header_map.h" #include "envoy/tracing/http_tracer.h" +#include "envoy/type/percent.pb.h" #include "envoy/upstream/resource_manager.h" #include "envoy/upstream/retry.h" diff --git a/include/envoy/secret/BUILD b/include/envoy/secret/BUILD index e6d613716342d..dd4bca3280913 100644 --- a/include/envoy/secret/BUILD +++ b/include/envoy/secret/BUILD @@ -31,5 +31,6 @@ envoy_cc_library( deps = [ ":secret_provider_interface", "@envoy_api//envoy/api/v2/auth:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) diff --git a/include/envoy/secret/secret_manager.h b/include/envoy/secret/secret_manager.h index 4cbcfc5a920df..e8cf0994f17b6 100644 --- a/include/envoy/secret/secret_manager.h +++ b/include/envoy/secret/secret_manager.h @@ -3,6 +3,7 @@ #include #include "envoy/api/v2/auth/cert.pb.h" +#include "envoy/api/v2/core/config_source.pb.h" #include "envoy/secret/secret_provider.h" namespace Envoy { diff --git a/include/envoy/server/BUILD b/include/envoy/server/BUILD index d52d03ae0876c..657643e74a866 100644 --- a/include/envoy/server/BUILD +++ b/include/envoy/server/BUILD @@ -40,6 +40,7 @@ envoy_cc_library( "//include/envoy/ratelimit:ratelimit_interface", "//include/envoy/tracing:http_tracer_interface", "//include/envoy/upstream:cluster_manager_interface", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", ], ) @@ -71,7 +72,10 @@ envoy_cc_library( envoy_cc_library( name = "health_checker_config_interface", hdrs = ["health_checker_config.h"], - deps = ["//include/envoy/upstream:health_checker_interface"], + deps = [ + "//include/envoy/upstream:health_checker_interface", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + ], ) envoy_cc_library( @@ -191,6 +195,8 @@ envoy_cc_library( "//include/envoy/ssl:context_interface", "//source/common/protobuf", "@envoy_api//envoy/admin/v2alpha:pkg_cc_proto", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", "@envoy_api//envoy/api/v2/listener:pkg_cc_proto", ], ) diff --git a/include/envoy/server/configuration.h b/include/envoy/server/configuration.h index 21a2e583fbadf..0c7d6dc969da3 100644 --- a/include/envoy/server/configuration.h +++ b/include/envoy/server/configuration.h @@ -7,6 +7,7 @@ #include #include +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" #include "envoy/stats/sink.h" #include "envoy/tracing/http_tracer.h" #include "envoy/upstream/cluster_manager.h" diff --git a/include/envoy/server/health_checker_config.h b/include/envoy/server/health_checker_config.h index f639ea3581a1f..4fe695e929d6f 100644 --- a/include/envoy/server/health_checker_config.h +++ b/include/envoy/server/health_checker_config.h @@ -1,5 +1,6 @@ #pragma once +#include "envoy/api/v2/core/health_check.pb.h" #include "envoy/runtime/runtime.h" #include "envoy/upstream/health_checker.h" diff --git a/include/envoy/server/listener_manager.h b/include/envoy/server/listener_manager.h index 2e093fb8f5566..6709adcfc8753 100644 --- a/include/envoy/server/listener_manager.h +++ b/include/envoy/server/listener_manager.h @@ -3,6 +3,8 @@ #include #include "envoy/admin/v2alpha/config_dump.pb.h" +#include "envoy/api/v2/core/config_source.pb.h" +#include "envoy/api/v2/lds.pb.h" #include "envoy/api/v2/listener/listener.pb.h" #include "envoy/network/filter.h" #include "envoy/network/listen_socket.h" diff --git a/include/envoy/upstream/BUILD b/include/envoy/upstream/BUILD index d06b43f1f9970..cb30f9994bc41 100644 --- a/include/envoy/upstream/BUILD +++ b/include/envoy/upstream/BUILD @@ -30,6 +30,7 @@ envoy_cc_library( "//include/envoy/tcp:conn_pool_interface", "//include/envoy/thread_local:thread_local_interface", "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", ], ) @@ -149,6 +150,7 @@ envoy_cc_library( "//include/envoy/ssl:context_interface", "//include/envoy/ssl:context_manager_interface", "//include/envoy/upstream:types_interface", + "@envoy_api//envoy/api/v2:pkg_cc_proto", "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -171,6 +173,6 @@ envoy_cc_library( "//include/envoy/runtime:runtime_interface", "//include/envoy/ssl:context_interface", "//include/envoy/ssl:context_manager_interface", - "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/api/v2:pkg_cc_proto", ], ) diff --git a/include/envoy/upstream/cluster_factory.h b/include/envoy/upstream/cluster_factory.h index 01ecedafaa3bc..5c6ee9787ed80 100644 --- a/include/envoy/upstream/cluster_factory.h +++ b/include/envoy/upstream/cluster_factory.h @@ -10,7 +10,7 @@ #include "envoy/access_log/access_log.h" #include "envoy/api/api.h" -#include "envoy/api/v2/core/base.pb.h" +#include "envoy/api/v2/cds.pb.h" #include "envoy/event/dispatcher.h" #include "envoy/local_info/local_info.h" #include "envoy/network/dns.h" diff --git a/include/envoy/upstream/cluster_manager.h b/include/envoy/upstream/cluster_manager.h index d7c52af32baf6..1993ef0672b19 100644 --- a/include/envoy/upstream/cluster_manager.h +++ b/include/envoy/upstream/cluster_manager.h @@ -9,6 +9,8 @@ #include "envoy/access_log/access_log.h" #include "envoy/api/api.h" #include "envoy/api/v2/cds.pb.h" +#include "envoy/api/v2/core/address.pb.h" +#include "envoy/api/v2/core/config_source.pb.h" #include "envoy/config/bootstrap/v2/bootstrap.pb.h" #include "envoy/config/grpc_mux.h" #include "envoy/config/subscription_factory.h" diff --git a/include/envoy/upstream/upstream.h b/include/envoy/upstream/upstream.h index 656d1eca1c2c4..30193e3edf82b 100644 --- a/include/envoy/upstream/upstream.h +++ b/include/envoy/upstream/upstream.h @@ -8,6 +8,7 @@ #include #include +#include "envoy/api/v2/cds.pb.h" #include "envoy/api/v2/core/base.pb.h" #include "envoy/common/callback.h" #include "envoy/config/typed_metadata.h" diff --git a/source/common/access_log/BUILD b/source/common/access_log/BUILD index aa3267ebf8690..76c225d52c4d7 100644 --- a/source/common/access_log/BUILD +++ b/source/common/access_log/BUILD @@ -32,6 +32,7 @@ envoy_cc_library( "//source/common/stream_info:stream_info_lib", "//source/common/tracing:http_tracer_lib", "@envoy_api//envoy/config/filter/accesslog/v2:pkg_cc_proto", + "@envoy_api//envoy/type:pkg_cc_proto", ], ) @@ -49,6 +50,7 @@ envoy_cc_library( "//source/common/http:utility_lib", "//source/common/protobuf:message_validator_lib", "//source/common/stream_info:utility_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) diff --git a/source/common/access_log/access_log_formatter.cc b/source/common/access_log/access_log_formatter.cc index 83de403e3b5df..53c991a6701f1 100644 --- a/source/common/access_log/access_log_formatter.cc +++ b/source/common/access_log/access_log_formatter.cc @@ -5,6 +5,8 @@ #include #include +#include "envoy/api/v2/core/base.pb.h" + #include "common/common/assert.h" #include "common/common/fmt.h" #include "common/common/utility.h" diff --git a/source/common/access_log/access_log_formatter.h b/source/common/access_log/access_log_formatter.h index 741a17272aceb..a48d21d0de465 100644 --- a/source/common/access_log/access_log_formatter.h +++ b/source/common/access_log/access_log_formatter.h @@ -6,6 +6,7 @@ #include #include "envoy/access_log/access_log.h" +#include "envoy/api/v2/core/base.pb.h" #include "envoy/common/time.h" #include "envoy/stream_info/stream_info.h" diff --git a/source/common/access_log/access_log_impl.cc b/source/common/access_log/access_log_impl.cc index 7613e3ba9ae07..8b4a0f3b75122 100644 --- a/source/common/access_log/access_log_impl.cc +++ b/source/common/access_log/access_log_impl.cc @@ -4,6 +4,7 @@ #include #include "envoy/common/time.h" +#include "envoy/config/filter/accesslog/v2/accesslog.pb.h" #include "envoy/config/filter/accesslog/v2/accesslog.pb.validate.h" #include "envoy/filesystem/filesystem.h" #include "envoy/http/header_map.h" diff --git a/source/common/access_log/access_log_impl.h b/source/common/access_log/access_log_impl.h index f8d8cd0dfa42b..fae56dcf09449 100644 --- a/source/common/access_log/access_log_impl.h +++ b/source/common/access_log/access_log_impl.h @@ -9,6 +9,7 @@ #include "envoy/config/filter/accesslog/v2/accesslog.pb.h" #include "envoy/runtime/runtime.h" #include "envoy/server/access_log_config.h" +#include "envoy/type/percent.pb.h" #include "common/grpc/status.h" #include "common/http/header_utility.h" diff --git a/source/common/api/os_sys_calls_impl_hot_restart.h b/source/common/api/os_sys_calls_impl_hot_restart.h index d46833d17700c..59ce2cb6bed9c 100644 --- a/source/common/api/os_sys_calls_impl_hot_restart.h +++ b/source/common/api/os_sys_calls_impl_hot_restart.h @@ -17,4 +17,4 @@ class HotRestartOsSysCallsImpl : public HotRestartOsSysCalls { using HotRestartOsSysCallsSingleton = ThreadSafeSingleton; } // namespace Api -} // namespace Envoy \ No newline at end of file +} // namespace Envoy diff --git a/source/common/common/BUILD b/source/common/common/BUILD index f3616c60f9bf9..189cf3560a704 100644 --- a/source/common/common/BUILD +++ b/source/common/common/BUILD @@ -91,6 +91,7 @@ envoy_basic_cc_library( "fmtlib", ], include_prefix = envoy_include_prefix(package_name()), + deps = ["//include/envoy/common:base_includes"], ) envoy_cc_library( diff --git a/source/common/common/matchers.cc b/source/common/common/matchers.cc index 4c648ebe8eb6a..cce97a2636e0f 100644 --- a/source/common/common/matchers.cc +++ b/source/common/common/matchers.cc @@ -1,6 +1,10 @@ #include "common/common/matchers.h" #include "envoy/api/v2/core/base.pb.h" +#include "envoy/type/matcher/metadata.pb.h" +#include "envoy/type/matcher/number.pb.h" +#include "envoy/type/matcher/string.pb.h" +#include "envoy/type/matcher/value.pb.h" #include "common/common/regex.h" #include "common/config/metadata.h" diff --git a/source/common/common/posix/thread_impl.h b/source/common/common/posix/thread_impl.h old mode 100755 new mode 100644 diff --git a/source/common/common/regex.cc b/source/common/common/regex.cc index fc1d0505c1519..50a37431da5eb 100644 --- a/source/common/common/regex.cc +++ b/source/common/common/regex.cc @@ -1,6 +1,7 @@ #include "common/common/regex.h" #include "envoy/common/exception.h" +#include "envoy/type/matcher/regex.pb.h" #include "common/common/assert.h" #include "common/common/fmt.h" diff --git a/source/common/config/BUILD b/source/common/config/BUILD index 807ba1d47d3b7..c8bbe5a647813 100644 --- a/source/common/config/BUILD +++ b/source/common/config/BUILD @@ -70,6 +70,7 @@ envoy_cc_library( "//source/common/common:minimal_logger_lib", "//source/common/common:token_bucket_impl_lib", "//source/common/protobuf", + "@envoy_api//envoy/api/v2:pkg_cc_proto", ], ) @@ -104,7 +105,7 @@ envoy_cc_library( "//source/common/protobuf", "//source/common/protobuf:message_validator_lib", "//source/common/protobuf:utility_lib", - "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/api/v2:pkg_cc_proto", ], ) @@ -137,6 +138,7 @@ envoy_cc_library( "//include/envoy/upstream:cluster_manager_interface", "//source/common/common:minimal_logger_lib", "//source/common/protobuf", + "@envoy_api//envoy/api/v2:pkg_cc_proto", ], ) @@ -152,7 +154,6 @@ envoy_cc_library( "//source/common/common:minimal_logger_lib", "//source/common/grpc:common_lib", "//source/common/protobuf", - "@envoy_api//envoy/api/v2:pkg_cc_proto", ], ) @@ -165,7 +166,6 @@ envoy_cc_library( "//include/envoy/config:subscription_interface", "//include/envoy/event:dispatcher_interface", "//include/envoy/grpc:async_client_interface", - "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -201,7 +201,7 @@ envoy_cc_library( "//source/common/http:rest_api_fetcher_lib", "//source/common/protobuf", "//source/common/protobuf:utility_lib", - "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/api/v2:pkg_cc_proto", ], ) @@ -226,7 +226,7 @@ envoy_cc_library( hdrs = ["pausable_ack_queue.h"], deps = [ "//source/common/common:assert_lib", - "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@com_google_googleapis//google/rpc:status_cc_proto", ], ) @@ -293,6 +293,8 @@ envoy_cc_library( "//source/common/grpc:common_lib", "//source/common/protobuf", "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/auth:pkg_cc_proto", + "@envoy_api//envoy/api/v2/route:pkg_cc_proto", "@envoy_api//envoy/service/discovery/v2:pkg_cc_proto", ], ) @@ -323,10 +325,10 @@ envoy_cc_library( "//source/common/stats:stats_matcher_lib", "//source/common/stats:tag_producer_lib", "@com_github_cncf_udpa//udpa/type/v1:pkg_cc_proto", + "@envoy_api//envoy/api/v2:pkg_cc_proto", "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/api/v2/endpoint:pkg_cc_proto", "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", - "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto", - "@envoy_api//envoy/config/metrics/v2:pkg_cc_proto", ], ) @@ -349,6 +351,7 @@ envoy_cc_library( "//source/common/common:assert_lib", "//source/common/common:minimal_logger_lib", "//source/common/protobuf", + "@envoy_api//envoy/api/v2:pkg_cc_proto", ], ) diff --git a/source/common/config/datasource.cc b/source/common/config/datasource.cc index a03b1718c1a2c..b527ec88c6d6a 100644 --- a/source/common/config/datasource.cc +++ b/source/common/config/datasource.cc @@ -1,5 +1,7 @@ #include "common/config/datasource.h" +#include "envoy/api/v2/core/base.pb.h" + #include "fmt/format.h" namespace Envoy { diff --git a/source/common/config/delta_subscription_impl.cc b/source/common/config/delta_subscription_impl.cc index ed34dac39bea0..537929bc5f340 100644 --- a/source/common/config/delta_subscription_impl.cc +++ b/source/common/config/delta_subscription_impl.cc @@ -1,5 +1,7 @@ #include "common/config/delta_subscription_impl.h" +#include "envoy/api/v2/discovery.pb.h" + namespace Envoy { namespace Config { diff --git a/source/common/config/delta_subscription_impl.h b/source/common/config/delta_subscription_impl.h index b45be7c4da85f..cbc53fb25484c 100644 --- a/source/common/config/delta_subscription_impl.h +++ b/source/common/config/delta_subscription_impl.h @@ -1,5 +1,6 @@ #pragma once +#include "envoy/api/v2/discovery.pb.h" #include "envoy/config/subscription.h" #include "common/config/new_grpc_mux_impl.h" diff --git a/source/common/config/delta_subscription_state.cc b/source/common/config/delta_subscription_state.cc index 8fdfdca0ffca6..cebfbb3cc5c74 100644 --- a/source/common/config/delta_subscription_state.cc +++ b/source/common/config/delta_subscription_state.cc @@ -1,5 +1,7 @@ #include "common/config/delta_subscription_state.h" +#include "envoy/api/v2/discovery.pb.h" + #include "common/common/assert.h" #include "common/common/hash.h" diff --git a/source/common/config/filesystem_subscription_impl.cc b/source/common/config/filesystem_subscription_impl.cc index 4fae62266b349..83d060a53871a 100644 --- a/source/common/config/filesystem_subscription_impl.cc +++ b/source/common/config/filesystem_subscription_impl.cc @@ -1,5 +1,7 @@ #include "common/config/filesystem_subscription_impl.h" +#include "envoy/api/v2/discovery.pb.h" + #include "common/common/macros.h" #include "common/config/utility.h" #include "common/protobuf/protobuf.h" diff --git a/source/common/config/filesystem_subscription_impl.h b/source/common/config/filesystem_subscription_impl.h index 6937a8ecf6df4..39c86f1654da2 100644 --- a/source/common/config/filesystem_subscription_impl.h +++ b/source/common/config/filesystem_subscription_impl.h @@ -1,7 +1,6 @@ #pragma once #include "envoy/api/api.h" -#include "envoy/api/v2/core/base.pb.h" #include "envoy/config/subscription.h" #include "envoy/event/dispatcher.h" #include "envoy/filesystem/filesystem.h" diff --git a/source/common/config/grpc_mux_impl.cc b/source/common/config/grpc_mux_impl.cc index 3246dfbbd189d..f1d4dc1c7b0f3 100644 --- a/source/common/config/grpc_mux_impl.cc +++ b/source/common/config/grpc_mux_impl.cc @@ -2,6 +2,8 @@ #include +#include "envoy/api/v2/discovery.pb.h" + #include "common/config/utility.h" #include "common/protobuf/protobuf.h" diff --git a/source/common/config/grpc_mux_impl.h b/source/common/config/grpc_mux_impl.h index 3f55178f4e1e2..d37826a4a8710 100644 --- a/source/common/config/grpc_mux_impl.h +++ b/source/common/config/grpc_mux_impl.h @@ -3,6 +3,7 @@ #include #include +#include "envoy/api/v2/discovery.pb.h" #include "envoy/common/time.h" #include "envoy/config/grpc_mux.h" #include "envoy/config/subscription.h" diff --git a/source/common/config/grpc_mux_subscription_impl.h b/source/common/config/grpc_mux_subscription_impl.h index 299aa4f1480ee..1353728a5bc6a 100644 --- a/source/common/config/grpc_mux_subscription_impl.h +++ b/source/common/config/grpc_mux_subscription_impl.h @@ -1,6 +1,5 @@ #pragma once -#include "envoy/api/v2/discovery.pb.h" #include "envoy/config/grpc_mux.h" #include "envoy/config/subscription.h" #include "envoy/event/dispatcher.h" diff --git a/source/common/config/grpc_subscription_impl.h b/source/common/config/grpc_subscription_impl.h index 8914519746f21..16edffded0b6e 100644 --- a/source/common/config/grpc_subscription_impl.h +++ b/source/common/config/grpc_subscription_impl.h @@ -1,6 +1,5 @@ #pragma once -#include "envoy/api/v2/core/base.pb.h" #include "envoy/config/subscription.h" #include "envoy/event/dispatcher.h" #include "envoy/grpc/async_client.h" diff --git a/source/common/config/http_subscription_impl.cc b/source/common/config/http_subscription_impl.cc index 5f32bba0c4ab9..5fe413a12da70 100644 --- a/source/common/config/http_subscription_impl.cc +++ b/source/common/config/http_subscription_impl.cc @@ -2,6 +2,8 @@ #include +#include "envoy/api/v2/discovery.pb.h" + #include "common/buffer/buffer_impl.h" #include "common/common/assert.h" #include "common/common/macros.h" diff --git a/source/common/config/http_subscription_impl.h b/source/common/config/http_subscription_impl.h index 727cc90e6db20..14af5d8240c13 100644 --- a/source/common/config/http_subscription_impl.h +++ b/source/common/config/http_subscription_impl.h @@ -1,6 +1,6 @@ #pragma once -#include "envoy/api/v2/core/base.pb.h" +#include "envoy/api/v2/discovery.pb.h" #include "envoy/config/subscription.h" #include "envoy/event/dispatcher.h" diff --git a/source/common/config/metadata.cc b/source/common/config/metadata.cc index 167057d17ce71..48b9c08f2f082 100644 --- a/source/common/config/metadata.cc +++ b/source/common/config/metadata.cc @@ -1,5 +1,8 @@ #include "common/config/metadata.h" +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/type/metadata/v2/metadata.pb.h" + #include "common/protobuf/utility.h" namespace Envoy { diff --git a/source/common/config/new_grpc_mux_impl.cc b/source/common/config/new_grpc_mux_impl.cc index d22593d0bf997..9c468e35e6a2f 100644 --- a/source/common/config/new_grpc_mux_impl.cc +++ b/source/common/config/new_grpc_mux_impl.cc @@ -1,5 +1,7 @@ #include "common/config/new_grpc_mux_impl.h" +#include "envoy/api/v2/discovery.pb.h" + #include "common/common/assert.h" #include "common/common/backoff_strategy.h" #include "common/common/token_bucket_impl.h" diff --git a/source/common/config/pausable_ack_queue.h b/source/common/config/pausable_ack_queue.h index 46222a8b2e3ce..f4a5d42ce8f96 100644 --- a/source/common/config/pausable_ack_queue.h +++ b/source/common/config/pausable_ack_queue.h @@ -2,9 +2,8 @@ #include -#include "envoy/api/v2/discovery.pb.h" - #include "absl/container/flat_hash_map.h" +#include "google/rpc/status.pb.h" namespace Envoy { namespace Config { diff --git a/source/common/config/remote_data_fetcher.cc b/source/common/config/remote_data_fetcher.cc index 687187887c648..1993b522ceaa5 100644 --- a/source/common/config/remote_data_fetcher.cc +++ b/source/common/config/remote_data_fetcher.cc @@ -1,5 +1,7 @@ #include "common/config/remote_data_fetcher.h" +#include "envoy/api/v2/core/http_uri.pb.h" + #include "common/common/enum_to_int.h" #include "common/common/hex.h" #include "common/crypto/utility.h" diff --git a/source/common/config/remote_data_fetcher.h b/source/common/config/remote_data_fetcher.h index 2ef6b39a3c4f8..280e37b893307 100644 --- a/source/common/config/remote_data_fetcher.h +++ b/source/common/config/remote_data_fetcher.h @@ -79,4 +79,4 @@ using RemoteDataFetcherPtr = std::unique_ptr; } // namespace DataFetcher } // namespace Config -} // namespace Envoy \ No newline at end of file +} // namespace Envoy diff --git a/source/common/config/runtime_utility.cc b/source/common/config/runtime_utility.cc index ef1f8e45ca15e..500f2439e48c5 100644 --- a/source/common/config/runtime_utility.cc +++ b/source/common/config/runtime_utility.cc @@ -1,5 +1,7 @@ #include "common/config/runtime_utility.h" +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" + namespace Envoy { namespace Config { diff --git a/source/common/config/subscription_factory_impl.cc b/source/common/config/subscription_factory_impl.cc index 9217b612b18d6..601efc7903355 100644 --- a/source/common/config/subscription_factory_impl.cc +++ b/source/common/config/subscription_factory_impl.cc @@ -1,5 +1,7 @@ #include "common/config/subscription_factory_impl.h" +#include "envoy/api/v2/core/config_source.pb.h" + #include "common/config/delta_subscription_impl.h" #include "common/config/filesystem_subscription_impl.h" #include "common/config/grpc_mux_subscription_impl.h" diff --git a/source/common/config/subscription_factory_impl.h b/source/common/config/subscription_factory_impl.h index 3a7f0ba1e31c8..60ddaf549aa0c 100644 --- a/source/common/config/subscription_factory_impl.h +++ b/source/common/config/subscription_factory_impl.h @@ -1,7 +1,7 @@ #pragma once #include "envoy/api/api.h" -#include "envoy/api/v2/core/base.pb.h" +#include "envoy/api/v2/core/config_source.pb.h" #include "envoy/config/subscription.h" #include "envoy/config/subscription_factory.h" #include "envoy/stats/scope.h" diff --git a/source/common/config/type_to_endpoint.cc b/source/common/config/type_to_endpoint.cc index 800d04271435f..ec8a8c7c610a4 100644 --- a/source/common/config/type_to_endpoint.cc +++ b/source/common/config/type_to_endpoint.cc @@ -1,9 +1,11 @@ #include "common/config/type_to_endpoint.h" +#include "envoy/api/v2/auth/cert.pb.h" #include "envoy/api/v2/cds.pb.h" #include "envoy/api/v2/eds.pb.h" #include "envoy/api/v2/lds.pb.h" #include "envoy/api/v2/rds.pb.h" +#include "envoy/api/v2/route/route.pb.h" #include "envoy/api/v2/srds.pb.h" #include "envoy/service/discovery/v2/rtds.pb.h" diff --git a/source/common/config/utility.cc b/source/common/config/utility.cc index bc4322a151860..f0abdce9e2494 100644 --- a/source/common/config/utility.cc +++ b/source/common/config/utility.cc @@ -2,7 +2,13 @@ #include -#include "envoy/config/metrics/v2/stats.pb.h" +#include "envoy/api/v2/cds.pb.h" +#include "envoy/api/v2/core/address.pb.h" +#include "envoy/api/v2/core/config_source.pb.h" +#include "envoy/api/v2/core/grpc_service.pb.h" +#include "envoy/api/v2/eds.pb.h" +#include "envoy/api/v2/endpoint/endpoint.pb.h" +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" #include "envoy/stats/scope.h" #include "common/common/assert.h" diff --git a/source/common/config/utility.h b/source/common/config/utility.h index 8e8c25a522936..bbd25757d3e1a 100644 --- a/source/common/config/utility.h +++ b/source/common/config/utility.h @@ -1,9 +1,11 @@ #pragma once #include "envoy/api/api.h" -#include "envoy/api/v2/core/base.pb.h" +#include "envoy/api/v2/cds.pb.h" +#include "envoy/api/v2/core/address.pb.h" +#include "envoy/api/v2/core/config_source.pb.h" +#include "envoy/api/v2/eds.pb.h" #include "envoy/config/bootstrap/v2/bootstrap.pb.h" -#include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.h" #include "envoy/config/grpc_mux.h" #include "envoy/config/subscription.h" #include "envoy/json/json_object.h" diff --git a/source/common/config/watch_map.cc b/source/common/config/watch_map.cc index 7cab1efa98870..53a06f94864ac 100644 --- a/source/common/config/watch_map.cc +++ b/source/common/config/watch_map.cc @@ -1,5 +1,7 @@ #include "common/config/watch_map.h" +#include "envoy/api/v2/discovery.pb.h" + namespace Envoy { namespace Config { diff --git a/source/common/config/watch_map.h b/source/common/config/watch_map.h index 9df852c7f7127..4119f31aa6c13 100644 --- a/source/common/config/watch_map.h +++ b/source/common/config/watch_map.h @@ -4,6 +4,7 @@ #include #include +#include "envoy/api/v2/discovery.pb.h" #include "envoy/config/subscription.h" #include "common/common/assert.h" diff --git a/source/common/grpc/BUILD b/source/common/grpc/BUILD index 39a3dc27e7826..7e3e8c21a0e8d 100644 --- a/source/common/grpc/BUILD +++ b/source/common/grpc/BUILD @@ -34,6 +34,7 @@ envoy_cc_library( "//include/envoy/grpc:async_client_interface", "//source/common/buffer:zero_copy_input_stream_lib", "//source/common/http:async_client_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -157,6 +158,7 @@ envoy_cc_library( "//source/common/common:linked_object", "//source/common/common:thread_annotations", "//source/common/tracing:http_tracer_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) diff --git a/source/common/grpc/async_client_impl.cc b/source/common/grpc/async_client_impl.cc index c4f99bc988521..a2ed465c39bd4 100644 --- a/source/common/grpc/async_client_impl.cc +++ b/source/common/grpc/async_client_impl.cc @@ -1,5 +1,7 @@ #include "common/grpc/async_client_impl.h" +#include "envoy/api/v2/core/grpc_service.pb.h" + #include "common/buffer/zero_copy_input_stream_impl.h" #include "common/common/enum_to_int.h" #include "common/common/utility.h" diff --git a/source/common/grpc/async_client_impl.h b/source/common/grpc/async_client_impl.h index 1e9eddbe9e635..a0c88e1428474 100644 --- a/source/common/grpc/async_client_impl.h +++ b/source/common/grpc/async_client_impl.h @@ -1,5 +1,7 @@ #pragma once +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/api/v2/core/grpc_service.pb.h" #include "envoy/grpc/async_client.h" #include "common/common/linked_object.h" diff --git a/source/common/grpc/async_client_manager_impl.cc b/source/common/grpc/async_client_manager_impl.cc index 4d511bf4670a6..d198d8a4a7baf 100644 --- a/source/common/grpc/async_client_manager_impl.cc +++ b/source/common/grpc/async_client_manager_impl.cc @@ -1,5 +1,6 @@ #include "common/grpc/async_client_manager_impl.h" +#include "envoy/api/v2/core/grpc_service.pb.h" #include "envoy/stats/scope.h" #include "common/grpc/async_client_impl.h" diff --git a/source/common/grpc/async_client_manager_impl.h b/source/common/grpc/async_client_manager_impl.h index 07536adf24dbd..59bfba3bb974c 100644 --- a/source/common/grpc/async_client_manager_impl.h +++ b/source/common/grpc/async_client_manager_impl.h @@ -1,6 +1,7 @@ #pragma once #include "envoy/api/api.h" +#include "envoy/api/v2/core/grpc_service.pb.h" #include "envoy/grpc/async_client_manager.h" #include "envoy/singleton/manager.h" #include "envoy/stats/scope.h" diff --git a/source/common/grpc/google_async_client_impl.cc b/source/common/grpc/google_async_client_impl.cc index 17007ba260c24..58856ead1e970 100644 --- a/source/common/grpc/google_async_client_impl.cc +++ b/source/common/grpc/google_async_client_impl.cc @@ -1,5 +1,6 @@ #include "common/grpc/google_async_client_impl.h" +#include "envoy/api/v2/core/grpc_service.pb.h" #include "envoy/stats/scope.h" #include "common/common/base64.h" diff --git a/source/common/grpc/google_async_client_impl.h b/source/common/grpc/google_async_client_impl.h index 1026780cdba6d..5157fc18e6b7b 100644 --- a/source/common/grpc/google_async_client_impl.h +++ b/source/common/grpc/google_async_client_impl.h @@ -3,6 +3,8 @@ #include #include "envoy/api/api.h" +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/api/v2/core/grpc_service.pb.h" #include "envoy/common/platform.h" #include "envoy/grpc/async_client.h" #include "envoy/stats/scope.h" diff --git a/source/common/http/BUILD b/source/common/http/BUILD index effd5cfa0d83a..f82cad602bf73 100644 --- a/source/common/http/BUILD +++ b/source/common/http/BUILD @@ -29,6 +29,9 @@ envoy_cc_library( "//source/common/router:router_lib", "//source/common/stream_info:stream_info_lib", "//source/common/tracing:http_tracer_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/api/v2/route:pkg_cc_proto", + "@envoy_api//envoy/type:pkg_cc_proto", ], ) @@ -127,6 +130,7 @@ envoy_cc_library( "//include/envoy/router:rds_interface", "//source/common/network:utility_lib", "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto", + "@envoy_api//envoy/type:pkg_cc_proto", ], ) @@ -194,6 +198,8 @@ envoy_cc_library( "//source/common/stats:timespan_lib", "//source/common/stream_info:stream_info_lib", "//source/common/tracing:http_tracer_lib", + "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto", + "@envoy_api//envoy/type:pkg_cc_proto", ], ) diff --git a/source/common/http/async_client_impl.cc b/source/common/http/async_client_impl.cc index c02858b19370d..83848ab72c2ce 100644 --- a/source/common/http/async_client_impl.cc +++ b/source/common/http/async_client_impl.cc @@ -6,6 +6,8 @@ #include #include +#include "envoy/api/v2/core/base.pb.h" + #include "common/grpc/common.h" #include "common/http/utility.h" #include "common/tracing/http_tracer_impl.h" diff --git a/source/common/http/async_client_impl.h b/source/common/http/async_client_impl.h index 57f98a9d9e8fb..4b3edc3d125d4 100644 --- a/source/common/http/async_client_impl.h +++ b/source/common/http/async_client_impl.h @@ -1,3 +1,7 @@ +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/api/v2/route/route.pb.h" +#include "envoy/type/percent.pb.h" + #pragma once #include diff --git a/source/common/http/conn_manager_config.h b/source/common/http/conn_manager_config.h index 8a8f1661663be..9e57082c7ad03 100644 --- a/source/common/http/conn_manager_config.h +++ b/source/common/http/conn_manager_config.h @@ -1,7 +1,9 @@ +#include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.h" +#include "envoy/type/percent.pb.h" + #pragma once #include "envoy/config/config_provider.h" -#include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.h" #include "envoy/http/filter.h" #include "envoy/router/rds.h" #include "envoy/stats/scope.h" diff --git a/source/common/http/conn_manager_impl.cc b/source/common/http/conn_manager_impl.cc index 28fe39559a4b9..4496031238622 100644 --- a/source/common/http/conn_manager_impl.cc +++ b/source/common/http/conn_manager_impl.cc @@ -9,6 +9,7 @@ #include "envoy/buffer/buffer.h" #include "envoy/common/time.h" +#include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.h" #include "envoy/event/dispatcher.h" #include "envoy/network/drain_decision.h" #include "envoy/router/router.h" @@ -16,6 +17,7 @@ #include "envoy/stats/scope.h" #include "envoy/stream_info/filter_state.h" #include "envoy/tracing/http_tracer.h" +#include "envoy/type/percent.pb.h" #include "common/buffer/buffer_impl.h" #include "common/common/assert.h" diff --git a/source/common/http/conn_manager_utility.cc b/source/common/http/conn_manager_utility.cc index 69e594bc6998e..c60efd3988492 100644 --- a/source/common/http/conn_manager_utility.cc +++ b/source/common/http/conn_manager_utility.cc @@ -4,6 +4,8 @@ #include #include +#include "envoy/type/percent.pb.h" + #include "common/access_log/access_log_formatter.h" #include "common/common/empty_string.h" #include "common/common/utility.h" diff --git a/source/common/http/hash_policy.cc b/source/common/http/hash_policy.cc index b2cc447e4aabb..4a9bd9cceb456 100644 --- a/source/common/http/hash_policy.cc +++ b/source/common/http/hash_policy.cc @@ -1,5 +1,7 @@ #include "common/http/hash_policy.h" +#include "envoy/api/v2/route/route.pb.h" + #include "common/http/utility.h" namespace Envoy { diff --git a/source/common/http/hash_policy.h b/source/common/http/hash_policy.h index 9dd0f510f71e1..1ba1f7142e8b1 100644 --- a/source/common/http/hash_policy.h +++ b/source/common/http/hash_policy.h @@ -1,6 +1,7 @@ +#include "envoy/api/v2/route/route.pb.h" + #pragma once -#include "envoy/api/v2/route/route.pb.h" #include "envoy/http/hash_policy.h" namespace Envoy { diff --git a/source/common/http/header_utility.cc b/source/common/http/header_utility.cc index 7bb74e0ea9324..36213f1dedc17 100644 --- a/source/common/http/header_utility.cc +++ b/source/common/http/header_utility.cc @@ -1,5 +1,7 @@ #include "common/http/header_utility.h" +#include "envoy/api/v2/route/route.pb.h" + #include "common/common/regex.h" #include "common/common/utility.h" #include "common/http/header_map_impl.h" diff --git a/source/common/http/header_utility.h b/source/common/http/header_utility.h index aa2a92e3ece30..83b637ea24e58 100644 --- a/source/common/http/header_utility.h +++ b/source/common/http/header_utility.h @@ -1,12 +1,13 @@ +#include "envoy/api/v2/route/route.pb.h" +#include "envoy/type/range.pb.h" + #pragma once #include -#include "envoy/api/v2/route/route.pb.h" #include "envoy/common/regex.h" #include "envoy/http/header_map.h" #include "envoy/json/json_object.h" -#include "envoy/type/range.pb.h" #include "common/protobuf/protobuf.h" diff --git a/source/common/http/http3/BUILD b/source/common/http/http3/BUILD index 086a4f4b902d2..67a18855fe7ff 100644 --- a/source/common/http/http3/BUILD +++ b/source/common/http/http3/BUILD @@ -11,7 +11,10 @@ envoy_package() envoy_cc_library( name = "quic_codec_factory_lib", hdrs = ["quic_codec_factory.h"], - deps = ["//include/envoy/http:codec_interface"], + deps = [ + "//include/envoy/http:codec_interface", + "//include/envoy/network:connection_interface", + ], ) envoy_cc_library( diff --git a/source/common/http/utility.cc b/source/common/http/utility.cc index 2ac769ee2fce8..3b4d514bce8cf 100644 --- a/source/common/http/utility.cc +++ b/source/common/http/utility.cc @@ -6,6 +6,8 @@ #include #include +#include "envoy/api/v2/core/http_uri.pb.h" +#include "envoy/api/v2/core/protocol.pb.h" #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 420f20dad1422..b46197e3cbbf1 100644 --- a/source/common/http/utility.h +++ b/source/common/http/utility.h @@ -1,11 +1,12 @@ +#include "envoy/api/v2/core/http_uri.pb.h" +#include "envoy/api/v2/core/protocol.pb.h" + #pragma once #include #include #include -#include "envoy/api/v2/core/http_uri.pb.h" -#include "envoy/api/v2/core/protocol.pb.h" #include "envoy/grpc/status.h" #include "envoy/http/codes.h" #include "envoy/http/filter.h" diff --git a/source/common/local_info/BUILD b/source/common/local_info/BUILD index 76334e2d44ead..0016d66e9f7a5 100644 --- a/source/common/local_info/BUILD +++ b/source/common/local_info/BUILD @@ -11,5 +11,8 @@ envoy_package() envoy_cc_library( name = "local_info_lib", hdrs = ["local_info_impl.h"], - deps = ["//include/envoy/local_info:local_info_interface"], + deps = [ + "//include/envoy/local_info:local_info_interface", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + ], ) diff --git a/source/common/local_info/local_info_impl.h b/source/common/local_info/local_info_impl.h index a9e1ee97eef74..6ab957e384742 100644 --- a/source/common/local_info/local_info_impl.h +++ b/source/common/local_info/local_info_impl.h @@ -2,6 +2,7 @@ #include +#include "envoy/api/v2/core/base.pb.h" #include "envoy/local_info/local_info.h" namespace Envoy { diff --git a/source/common/network/BUILD b/source/common/network/BUILD index 28954514e8f45..080c77c44d1b6 100644 --- a/source/common/network/BUILD +++ b/source/common/network/BUILD @@ -98,6 +98,7 @@ envoy_cc_library( "//source/common/event:libevent_lib", "//source/common/network:listen_socket_lib", "//source/common/stream_info:stream_info_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -179,6 +180,7 @@ envoy_cc_library( ":utility_lib", "//include/envoy/network:listen_socket_interface", "//source/common/common:assert_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -208,6 +210,7 @@ envoy_cc_library( "//source/common/common:linked_object", "//source/common/event:dispatcher_includes", "//source/common/event:libevent_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -254,6 +257,7 @@ envoy_cc_library( "//source/common/api:os_sys_calls_lib", "//source/common/common:assert_lib", "//source/common/common:minimal_logger_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -269,6 +273,7 @@ envoy_cc_library( "//source/common/api:os_sys_calls_lib", "//source/common/common:assert_lib", "//source/common/common:logger_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) diff --git a/source/common/network/addr_family_aware_socket_option_impl.cc b/source/common/network/addr_family_aware_socket_option_impl.cc index ffa31a96f5655..b7552f4162f1a 100644 --- a/source/common/network/addr_family_aware_socket_option_impl.cc +++ b/source/common/network/addr_family_aware_socket_option_impl.cc @@ -1,5 +1,6 @@ #include "common/network/addr_family_aware_socket_option_impl.h" +#include "envoy/api/v2/core/base.pb.h" #include "envoy/common/exception.h" #include "envoy/common/platform.h" diff --git a/source/common/network/addr_family_aware_socket_option_impl.h b/source/common/network/addr_family_aware_socket_option_impl.h index 1e8b463dbd4a0..202e56779416a 100644 --- a/source/common/network/addr_family_aware_socket_option_impl.h +++ b/source/common/network/addr_family_aware_socket_option_impl.h @@ -1,5 +1,6 @@ #pragma once +#include "envoy/api/v2/core/base.pb.h" #include "envoy/common/platform.h" #include "envoy/network/listen_socket.h" diff --git a/source/common/network/cidr_range.cc b/source/common/network/cidr_range.cc index 1901c267824ab..4be927a43edfc 100644 --- a/source/common/network/cidr_range.cc +++ b/source/common/network/cidr_range.cc @@ -5,6 +5,8 @@ #include #include +#include "envoy/api/v2/core/address.pb.h" +#include "envoy/api/v3alpha/core/address.pb.h" #include "envoy/common/exception.h" #include "envoy/common/platform.h" diff --git a/source/common/network/connection_impl.cc b/source/common/network/connection_impl.cc index 0c0c2757b0927..6070f8587fd64 100644 --- a/source/common/network/connection_impl.cc +++ b/source/common/network/connection_impl.cc @@ -4,6 +4,7 @@ #include #include +#include "envoy/api/v2/core/base.pb.h" #include "envoy/common/exception.h" #include "envoy/common/platform.h" #include "envoy/event/timer.h" diff --git a/source/common/network/hash_policy.cc b/source/common/network/hash_policy.cc index d2b33085a2890..77cc9a0a32525 100644 --- a/source/common/network/hash_policy.cc +++ b/source/common/network/hash_policy.cc @@ -1,6 +1,7 @@ #include "common/network/hash_policy.h" #include "envoy/common/exception.h" +#include "envoy/type/hash_policy.pb.h" #include "common/common/assert.h" diff --git a/source/common/network/hash_policy.h b/source/common/network/hash_policy.h index ca843c24c3de3..0880d8bce386c 100644 --- a/source/common/network/hash_policy.h +++ b/source/common/network/hash_policy.h @@ -33,4 +33,4 @@ class HashPolicyImpl : public Network::HashPolicy { HashMethodPtr hash_impl_; }; } // namespace Network -} // namespace Envoy \ No newline at end of file +} // namespace Envoy diff --git a/source/common/network/listen_socket_impl.cc b/source/common/network/listen_socket_impl.cc index aac2196dc98d6..2126a1676a1e2 100644 --- a/source/common/network/listen_socket_impl.cc +++ b/source/common/network/listen_socket_impl.cc @@ -4,6 +4,7 @@ #include +#include "envoy/api/v2/core/base.pb.h" #include "envoy/common/exception.h" #include "envoy/common/platform.h" diff --git a/source/common/network/listener_impl.cc b/source/common/network/listener_impl.cc index 98d825f9c7494..c25d82c9f6d1a 100644 --- a/source/common/network/listener_impl.cc +++ b/source/common/network/listener_impl.cc @@ -1,5 +1,6 @@ #include "common/network/listener_impl.h" +#include "envoy/api/v2/core/base.pb.h" #include "envoy/common/exception.h" #include "envoy/common/platform.h" diff --git a/source/common/network/socket_option_factory.cc b/source/common/network/socket_option_factory.cc index 8cac03b61b216..12fca95088fdd 100644 --- a/source/common/network/socket_option_factory.cc +++ b/source/common/network/socket_option_factory.cc @@ -1,5 +1,7 @@ #include "common/network/socket_option_factory.h" +#include "envoy/api/v2/core/base.pb.h" + #include "common/common/fmt.h" #include "common/network/addr_family_aware_socket_option_impl.h" #include "common/network/socket_option_impl.h" diff --git a/source/common/network/socket_option_factory.h b/source/common/network/socket_option_factory.h index bcaabda831217..ff7c9b962c802 100644 --- a/source/common/network/socket_option_factory.h +++ b/source/common/network/socket_option_factory.h @@ -1,6 +1,6 @@ #pragma once -#include "envoy/api/v2/core/address.pb.h" +#include "envoy/api/v2/core/base.pb.h" #include "envoy/common/platform.h" #include "envoy/network/listen_socket.h" diff --git a/source/common/network/socket_option_impl.cc b/source/common/network/socket_option_impl.cc index dbf8aa1533011..b8439976009a0 100644 --- a/source/common/network/socket_option_impl.cc +++ b/source/common/network/socket_option_impl.cc @@ -1,5 +1,6 @@ #include "common/network/socket_option_impl.h" +#include "envoy/api/v2/core/base.pb.h" #include "envoy/common/exception.h" #include "common/api/os_sys_calls_impl.h" diff --git a/source/common/network/socket_option_impl.h b/source/common/network/socket_option_impl.h index 688e42dbd1dc3..9262131c4dafb 100644 --- a/source/common/network/socket_option_impl.h +++ b/source/common/network/socket_option_impl.h @@ -1,6 +1,7 @@ #pragma once #include "envoy/api/os_sys_calls.h" +#include "envoy/api/v2/core/base.pb.h" #include "envoy/common/platform.h" #include "envoy/network/listen_socket.h" diff --git a/source/common/network/udp_listener_impl.cc b/source/common/network/udp_listener_impl.cc index d864c85032a7d..87e4df71a468e 100644 --- a/source/common/network/udp_listener_impl.cc +++ b/source/common/network/udp_listener_impl.cc @@ -4,6 +4,7 @@ #include #include +#include "envoy/api/v2/core/base.pb.h" #include "envoy/buffer/buffer.h" #include "envoy/common/exception.h" #include "envoy/common/platform.h" diff --git a/source/common/network/utility.cc b/source/common/network/utility.cc index b288bf41a93da..6e9e9f1b0bdfa 100644 --- a/source/common/network/utility.cc +++ b/source/common/network/utility.cc @@ -6,6 +6,7 @@ #include #include +#include "envoy/api/v2/core/address.pb.h" #include "envoy/common/exception.h" #include "envoy/common/platform.h" #include "envoy/network/connection.h" diff --git a/source/common/protobuf/utility.cc b/source/common/protobuf/utility.cc index 9bc3a6ccc7fff..561e424206b3f 100644 --- a/source/common/protobuf/utility.cc +++ b/source/common/protobuf/utility.cc @@ -4,6 +4,7 @@ #include #include "envoy/protobuf/message_validator.h" +#include "envoy/type/percent.pb.h" #include "common/common/assert.h" #include "common/common/fmt.h" diff --git a/source/common/router/BUILD b/source/common/router/BUILD index abb15b4895ee4..1034f252c0395 100644 --- a/source/common/router/BUILD +++ b/source/common/router/BUILD @@ -62,8 +62,10 @@ envoy_cc_library( "//source/common/tracing:http_tracer_lib", "//source/extensions/filters/http:well_known_names", "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", "@envoy_api//envoy/api/v2/route:pkg_cc_proto", "@envoy_api//envoy/type:pkg_cc_proto", + "@envoy_api//envoy/type/matcher:pkg_cc_proto", ], ) @@ -80,7 +82,9 @@ envoy_cc_library( "//source/common/http:headers_lib", "//source/common/http:utility_lib", "//source/common/protobuf:utility_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", "@envoy_api//envoy/api/v2/route:pkg_cc_proto", + "@envoy_api//envoy/type/matcher:pkg_cc_proto", ], ) @@ -106,6 +110,7 @@ envoy_cc_library( "//source/common/common:assert_lib", "//source/common/common:minimal_logger_lib", "//source/common/protobuf:utility_lib", + "@envoy_api//envoy/api/v2:pkg_cc_proto", "@envoy_api//envoy/api/v2/route:pkg_cc_proto", ], ) @@ -131,8 +136,8 @@ envoy_cc_library( "//source/common/protobuf:utility_lib", "//source/common/router:route_config_update_impl_lib", "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", "@envoy_api//envoy/api/v2/route:pkg_cc_proto", - "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto", ], ) @@ -165,7 +170,6 @@ envoy_cc_library( "//source/common/router:vhds_lib", "@envoy_api//envoy/admin/v2alpha:pkg_cc_proto", "@envoy_api//envoy/api/v2:pkg_cc_proto", - "@envoy_api//envoy/api/v2/route:pkg_cc_proto", "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto", ], ) @@ -206,6 +210,7 @@ envoy_cc_library( "//source/common/init:watcher_lib", "@envoy_api//envoy/admin/v2alpha:pkg_cc_proto", "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto", ], ) @@ -230,6 +235,7 @@ envoy_cc_library( "//source/common/http:header_utility_lib", "//source/common/http:headers_lib", "//source/common/http:utility_lib", + "@envoy_api//envoy/api/v2/route:pkg_cc_proto", ], ) @@ -295,6 +301,7 @@ envoy_cc_library( "//source/common/common:empty_string", "//source/common/http:header_utility_lib", "//source/common/protobuf:utility_lib", + "@envoy_api//envoy/api/v2/route:pkg_cc_proto", ], ) diff --git a/source/common/router/config_impl.cc b/source/common/router/config_impl.cc index 6b6bf0fe72947..0eabbf1a310d2 100644 --- a/source/common/router/config_impl.cc +++ b/source/common/router/config_impl.cc @@ -8,9 +8,13 @@ #include #include +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/api/v2/rds.pb.h" +#include "envoy/api/v2/route/route.pb.h" #include "envoy/http/header_map.h" #include "envoy/runtime/runtime.h" -#include "envoy/type/percent.pb.validate.h" +#include "envoy/type/matcher/string.pb.h" +#include "envoy/type/percent.pb.h" #include "envoy/upstream/cluster_manager.h" #include "envoy/upstream/upstream.h" diff --git a/source/common/router/config_impl.h b/source/common/router/config_impl.h index 21258c90eec72..0f14937c7ba5e 100644 --- a/source/common/router/config_impl.h +++ b/source/common/router/config_impl.h @@ -10,11 +10,13 @@ #include #include +#include "envoy/api/v2/core/base.pb.h" #include "envoy/api/v2/rds.pb.h" #include "envoy/api/v2/route/route.pb.h" #include "envoy/router/router.h" #include "envoy/runtime/runtime.h" #include "envoy/server/filter_config.h" +#include "envoy/type/percent.pb.h" #include "envoy/upstream/cluster_manager.h" #include "common/config/metadata.h" diff --git a/source/common/router/config_utility.cc b/source/common/router/config_utility.cc index 09dc85db59cc5..93150c379ef46 100644 --- a/source/common/router/config_utility.cc +++ b/source/common/router/config_utility.cc @@ -3,6 +3,10 @@ #include #include +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/api/v2/route/route.pb.h" +#include "envoy/type/matcher/string.pb.h" + #include "common/common/assert.h" #include "common/common/regex.h" diff --git a/source/common/router/config_utility.h b/source/common/router/config_utility.h index d03866203bc26..58ebe215c6f0e 100644 --- a/source/common/router/config_utility.h +++ b/source/common/router/config_utility.h @@ -4,6 +4,7 @@ #include #include +#include "envoy/api/v2/core/base.pb.h" #include "envoy/api/v2/route/route.pb.h" #include "envoy/http/codes.h" #include "envoy/json/json_object.h" diff --git a/source/common/router/header_parser.cc b/source/common/router/header_parser.cc index e5d71aa9ef1f1..d9aa1080cdf85 100644 --- a/source/common/router/header_parser.cc +++ b/source/common/router/header_parser.cc @@ -4,6 +4,8 @@ #include #include +#include "envoy/api/v2/core/base.pb.h" + #include "common/common/assert.h" #include "common/http/headers.h" #include "common/protobuf/utility.h" diff --git a/source/common/router/rds_impl.cc b/source/common/router/rds_impl.cc index 6164b39a7d17d..825bb3d476945 100644 --- a/source/common/router/rds_impl.cc +++ b/source/common/router/rds_impl.cc @@ -6,8 +6,10 @@ #include #include "envoy/admin/v2alpha/config_dump.pb.h" +#include "envoy/api/v2/discovery.pb.h" +#include "envoy/api/v2/rds.pb.h" #include "envoy/api/v2/rds.pb.validate.h" -#include "envoy/api/v2/route/route.pb.validate.h" +#include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.h" #include "common/common/assert.h" #include "common/common/fmt.h" diff --git a/source/common/router/rds_impl.h b/source/common/router/rds_impl.h index 7b9812e2bb612..b5ba5481bfaf2 100644 --- a/source/common/router/rds_impl.h +++ b/source/common/router/rds_impl.h @@ -7,8 +7,8 @@ #include #include "envoy/admin/v2alpha/config_dump.pb.h" +#include "envoy/api/v2/discovery.pb.h" #include "envoy/api/v2/rds.pb.h" -#include "envoy/api/v2/route/route.pb.h" #include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.h" #include "envoy/config/subscription.h" #include "envoy/http/codes.h" diff --git a/source/common/router/retry_state_impl.cc b/source/common/router/retry_state_impl.cc index 63e879e333e55..de3787d9bfa68 100644 --- a/source/common/router/retry_state_impl.cc +++ b/source/common/router/retry_state_impl.cc @@ -5,6 +5,8 @@ #include #include +#include "envoy/api/v2/route/route.pb.h" + #include "common/common/assert.h" #include "common/common/utility.h" #include "common/grpc/common.h" diff --git a/source/common/router/route_config_update_receiver_impl.cc b/source/common/router/route_config_update_receiver_impl.cc index 81931e482c909..4738c72cd570f 100644 --- a/source/common/router/route_config_update_receiver_impl.cc +++ b/source/common/router/route_config_update_receiver_impl.cc @@ -2,6 +2,9 @@ #include +#include "envoy/api/v2/discovery.pb.h" +#include "envoy/api/v2/rds.pb.h" +#include "envoy/api/v2/route/route.pb.h" #include "envoy/api/v2/route/route.pb.validate.h" #include "common/common/assert.h" diff --git a/source/common/router/route_config_update_receiver_impl.h b/source/common/router/route_config_update_receiver_impl.h index cff6dd59a80a4..80ae2d407fa54 100644 --- a/source/common/router/route_config_update_receiver_impl.h +++ b/source/common/router/route_config_update_receiver_impl.h @@ -3,6 +3,8 @@ #include #include +#include "envoy/api/v2/discovery.pb.h" +#include "envoy/api/v2/rds.pb.h" #include "envoy/api/v2/route/route.pb.h" #include "envoy/router/rds.h" #include "envoy/router/route_config_update_receiver.h" diff --git a/source/common/router/router_ratelimit.cc b/source/common/router/router_ratelimit.cc index 28519851ea834..ab3510ae514b1 100644 --- a/source/common/router/router_ratelimit.cc +++ b/source/common/router/router_ratelimit.cc @@ -5,6 +5,8 @@ #include #include +#include "envoy/api/v2/route/route.pb.h" + #include "common/common/assert.h" #include "common/common/empty_string.h" #include "common/protobuf/utility.h" diff --git a/source/common/router/router_ratelimit.h b/source/common/router/router_ratelimit.h index d99b946f81abc..031954fc33fc4 100644 --- a/source/common/router/router_ratelimit.h +++ b/source/common/router/router_ratelimit.h @@ -5,6 +5,7 @@ #include #include +#include "envoy/api/v2/route/route.pb.h" #include "envoy/router/router.h" #include "envoy/router/router_ratelimit.h" diff --git a/source/common/router/scoped_config_impl.cc b/source/common/router/scoped_config_impl.cc index c6f00f58ea1e1..268318978a377 100644 --- a/source/common/router/scoped_config_impl.cc +++ b/source/common/router/scoped_config_impl.cc @@ -1,5 +1,8 @@ #include "common/router/scoped_config_impl.h" +#include "envoy/api/v2/srds.pb.h" +#include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.h" + namespace Envoy { namespace Router { diff --git a/source/common/router/scoped_rds.cc b/source/common/router/scoped_rds.cc index b97c5f3405f4b..d134d75f0670f 100644 --- a/source/common/router/scoped_rds.cc +++ b/source/common/router/scoped_rds.cc @@ -3,7 +3,11 @@ #include #include "envoy/admin/v2alpha/config_dump.pb.h" +#include "envoy/api/v2/core/config_source.pb.h" +#include "envoy/api/v2/discovery.pb.h" +#include "envoy/api/v2/srds.pb.h" #include "envoy/api/v2/srds.pb.validate.h" +#include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.h" #include "common/common/assert.h" #include "common/common/cleanup.h" diff --git a/source/common/router/scoped_rds.h b/source/common/router/scoped_rds.h index 422551449acdb..9726c94afeabb 100644 --- a/source/common/router/scoped_rds.h +++ b/source/common/router/scoped_rds.h @@ -2,6 +2,8 @@ #include +#include "envoy/api/v2/core/config_source.pb.h" +#include "envoy/api/v2/discovery.pb.h" #include "envoy/api/v2/srds.pb.h" #include "envoy/common/callback.h" #include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.h" diff --git a/source/common/router/tls_context_match_criteria_impl.cc b/source/common/router/tls_context_match_criteria_impl.cc index 7abbb9b26d648..28d586419b35e 100644 --- a/source/common/router/tls_context_match_criteria_impl.cc +++ b/source/common/router/tls_context_match_criteria_impl.cc @@ -1,5 +1,7 @@ #include "common/router/tls_context_match_criteria_impl.h" +#include "envoy/api/v2/route/route.pb.h" + namespace Envoy { namespace Router { diff --git a/source/common/router/vhds.cc b/source/common/router/vhds.cc index d5a57cd2159a8..11efea2d49015 100644 --- a/source/common/router/vhds.cc +++ b/source/common/router/vhds.cc @@ -5,8 +5,9 @@ #include #include -#include "envoy/api/v2/rds.pb.validate.h" -#include "envoy/api/v2/route/route.pb.validate.h" +#include "envoy/api/v2/core/config_source.pb.h" +#include "envoy/api/v2/discovery.pb.h" +#include "envoy/api/v2/route/route.pb.h" #include "common/common/assert.h" #include "common/common/fmt.h" diff --git a/source/common/router/vhds.h b/source/common/router/vhds.h index 62c305f129822..7db4ebd04e502 100644 --- a/source/common/router/vhds.h +++ b/source/common/router/vhds.h @@ -6,9 +6,8 @@ #include #include -#include "envoy/api/v2/rds.pb.h" +#include "envoy/api/v2/discovery.pb.h" #include "envoy/api/v2/route/route.pb.h" -#include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.h" #include "envoy/config/subscription.h" #include "envoy/http/codes.h" #include "envoy/local_info/local_info.h" diff --git a/source/common/runtime/BUILD b/source/common/runtime/BUILD index 5d08de997df5b..d92492af69e2b 100644 --- a/source/common/runtime/BUILD +++ b/source/common/runtime/BUILD @@ -37,6 +37,7 @@ envoy_cc_library( "//source/common/init:target_lib", "//source/common/protobuf:message_validator_lib", "//source/common/protobuf:utility_lib", + "@envoy_api//envoy/api/v2:pkg_cc_proto", "@envoy_api//envoy/api/v2/core:pkg_cc_proto", "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", "@envoy_api//envoy/service/discovery/v2:pkg_cc_proto", diff --git a/source/common/runtime/runtime_features.h b/source/common/runtime/runtime_features.h index 2f7cce929f680..40a9a5da244b0 100644 --- a/source/common/runtime/runtime_features.h +++ b/source/common/runtime/runtime_features.h @@ -4,6 +4,7 @@ #include "envoy/api/v2/core/base.pb.h" #include "envoy/runtime/runtime.h" +#include "envoy/type/percent.pb.h" #include "common/protobuf/utility.h" #include "common/singleton/const_singleton.h" diff --git a/source/common/runtime/runtime_impl.cc b/source/common/runtime/runtime_impl.cc index 6ce1638ca4fb3..25349fc2757cf 100644 --- a/source/common/runtime/runtime_impl.cc +++ b/source/common/runtime/runtime_impl.cc @@ -5,8 +5,13 @@ #include #include +#include "envoy/api/v2/discovery.pb.h" +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" #include "envoy/event/dispatcher.h" +#include "envoy/service/discovery/v2/rtds.pb.h" +#include "envoy/service/discovery/v2/rtds.pb.validate.h" #include "envoy/thread_local/thread_local.h" +#include "envoy/type/percent.pb.h" #include "envoy/type/percent.pb.validate.h" #include "common/common/assert.h" diff --git a/source/common/runtime/runtime_impl.h b/source/common/runtime/runtime_impl.h index 1ee1fe97c66e0..26c7d7c1eb0bd 100644 --- a/source/common/runtime/runtime_impl.h +++ b/source/common/runtime/runtime_impl.h @@ -6,16 +6,18 @@ #include #include "envoy/api/api.h" +#include "envoy/api/v2/core/config_source.pb.h" +#include "envoy/api/v2/discovery.pb.h" #include "envoy/common/exception.h" #include "envoy/config/bootstrap/v2/bootstrap.pb.h" #include "envoy/config/subscription.h" #include "envoy/init/manager.h" #include "envoy/runtime/runtime.h" -#include "envoy/service/discovery/v2/rtds.pb.validate.h" +#include "envoy/service/discovery/v2/rtds.pb.h" #include "envoy/stats/stats_macros.h" #include "envoy/stats/store.h" #include "envoy/thread_local/thread_local.h" -#include "envoy/type/percent.pb.validate.h" +#include "envoy/type/percent.pb.h" #include "envoy/upstream/cluster_manager.h" #include "common/common/assert.h" diff --git a/source/common/secret/BUILD b/source/common/secret/BUILD index e08a8c1c1bd66..db35adccc31a2 100644 --- a/source/common/secret/BUILD +++ b/source/common/secret/BUILD @@ -20,6 +20,8 @@ envoy_cc_library( "//source/common/common:assert_lib", "//source/common/common:minimal_logger_lib", "@envoy_api//envoy/admin/v2alpha:pkg_cc_proto", + "@envoy_api//envoy/api/v2/auth:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -57,6 +59,7 @@ envoy_cc_library( "//source/common/protobuf:utility_lib", "//source/common/ssl:certificate_validation_context_config_impl_lib", "//source/common/ssl:tls_certificate_config_impl_lib", + "@envoy_api//envoy/api/v2:pkg_cc_proto", "@envoy_api//envoy/api/v2/auth:pkg_cc_proto", "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], diff --git a/source/common/secret/sds_api.cc b/source/common/secret/sds_api.cc index 4514f5ce07922..53d495f9d84a6 100644 --- a/source/common/secret/sds_api.cc +++ b/source/common/secret/sds_api.cc @@ -2,7 +2,10 @@ #include +#include "envoy/api/v2/auth/cert.pb.h" #include "envoy/api/v2/auth/cert.pb.validate.h" +#include "envoy/api/v2/core/config_source.pb.h" +#include "envoy/api/v2/discovery.pb.h" #include "common/config/resources.h" #include "common/protobuf/utility.h" diff --git a/source/common/secret/sds_api.h b/source/common/secret/sds_api.h index 695ecd02e8af5..c7f1d32ced06b 100644 --- a/source/common/secret/sds_api.h +++ b/source/common/secret/sds_api.h @@ -5,6 +5,7 @@ #include "envoy/api/api.h" #include "envoy/api/v2/auth/cert.pb.h" #include "envoy/api/v2/core/config_source.pb.h" +#include "envoy/api/v2/discovery.pb.h" #include "envoy/config/subscription.h" #include "envoy/config/subscription_factory.h" #include "envoy/event/dispatcher.h" diff --git a/source/common/secret/secret_manager_impl.cc b/source/common/secret/secret_manager_impl.cc index c63af2f50ac54..a672f202d2164 100644 --- a/source/common/secret/secret_manager_impl.cc +++ b/source/common/secret/secret_manager_impl.cc @@ -1,6 +1,9 @@ #include "common/secret/secret_manager_impl.h" #include "envoy/admin/v2alpha/config_dump.pb.h" +#include "envoy/api/v2/auth/cert.pb.h" +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/api/v2/core/config_source.pb.h" #include "envoy/common/exception.h" #include "common/common/assert.h" diff --git a/source/common/secret/secret_manager_impl.h b/source/common/secret/secret_manager_impl.h index 2237a49d2c4fa..1f1018df30c7a 100644 --- a/source/common/secret/secret_manager_impl.h +++ b/source/common/secret/secret_manager_impl.h @@ -2,6 +2,8 @@ #include +#include "envoy/api/v2/auth/cert.pb.h" +#include "envoy/api/v2/core/config_source.pb.h" #include "envoy/secret/secret_manager.h" #include "envoy/secret/secret_provider.h" #include "envoy/server/transport_socket_config.h" diff --git a/source/common/secret/secret_provider_impl.cc b/source/common/secret/secret_provider_impl.cc index dc0af8d2b6453..879f22866a1d9 100644 --- a/source/common/secret/secret_provider_impl.cc +++ b/source/common/secret/secret_provider_impl.cc @@ -1,5 +1,7 @@ #include "common/secret/secret_provider_impl.h" +#include "envoy/api/v2/auth/cert.pb.h" + #include "common/common/assert.h" #include "common/ssl/certificate_validation_context_config_impl.h" #include "common/ssl/tls_certificate_config_impl.h" diff --git a/source/common/ssl/certificate_validation_context_config_impl.cc b/source/common/ssl/certificate_validation_context_config_impl.cc index 5eb7b4aca38df..0cd962aa245b6 100644 --- a/source/common/ssl/certificate_validation_context_config_impl.cc +++ b/source/common/ssl/certificate_validation_context_config_impl.cc @@ -1,5 +1,6 @@ #include "common/ssl/certificate_validation_context_config_impl.h" +#include "envoy/api/v2/auth/cert.pb.h" #include "envoy/common/exception.h" #include "common/common/empty_string.h" diff --git a/source/common/ssl/certificate_validation_context_config_impl.h b/source/common/ssl/certificate_validation_context_config_impl.h index aa70b7046ce0b..67d267c2a1290 100644 --- a/source/common/ssl/certificate_validation_context_config_impl.h +++ b/source/common/ssl/certificate_validation_context_config_impl.h @@ -45,4 +45,4 @@ class CertificateValidationContextConfigImpl : public CertificateValidationConte }; } // namespace Ssl -} // namespace Envoy \ No newline at end of file +} // namespace Envoy diff --git a/source/common/ssl/tls_certificate_config_impl.cc b/source/common/ssl/tls_certificate_config_impl.cc index 5b28c3568e091..2a2dea0a0ee8d 100644 --- a/source/common/ssl/tls_certificate_config_impl.cc +++ b/source/common/ssl/tls_certificate_config_impl.cc @@ -1,5 +1,6 @@ #include "common/ssl/tls_certificate_config_impl.h" +#include "envoy/api/v2/auth/cert.pb.h" #include "envoy/common/exception.h" #include "envoy/server/transport_socket_config.h" diff --git a/source/common/stats/stats_matcher_impl.cc b/source/common/stats/stats_matcher_impl.cc index bd73c46adf5ce..e334ffe7d624b 100644 --- a/source/common/stats/stats_matcher_impl.cc +++ b/source/common/stats/stats_matcher_impl.cc @@ -3,6 +3,8 @@ #include #include +#include "envoy/config/metrics/v2/stats.pb.h" + #include "common/common/utility.h" namespace Envoy { diff --git a/source/common/stats/tag_producer_impl.cc b/source/common/stats/tag_producer_impl.cc index f03a4b6553e3e..752a22a631040 100644 --- a/source/common/stats/tag_producer_impl.cc +++ b/source/common/stats/tag_producer_impl.cc @@ -3,6 +3,7 @@ #include #include "envoy/common/exception.h" +#include "envoy/config/metrics/v2/stats.pb.h" #include "common/common/utility.h" #include "common/stats/tag_extractor_impl.h" diff --git a/source/common/stream_info/BUILD b/source/common/stream_info/BUILD index b80bdc6d4c063..f7f96eb3ad751 100644 --- a/source/common/stream_info/BUILD +++ b/source/common/stream_info/BUILD @@ -16,6 +16,7 @@ envoy_cc_library( "//include/envoy/stream_info:stream_info_interface", "//source/common/common:assert_lib", "//source/common/common:dump_state_utils", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) diff --git a/source/common/stream_info/stream_info_impl.h b/source/common/stream_info/stream_info_impl.h index d07c96bd729c3..6f23a183f388a 100644 --- a/source/common/stream_info/stream_info_impl.h +++ b/source/common/stream_info/stream_info_impl.h @@ -3,6 +3,7 @@ #include #include +#include "envoy/api/v2/core/base.pb.h" #include "envoy/common/time.h" #include "envoy/http/header_map.h" #include "envoy/stream_info/stream_info.h" diff --git a/source/common/tcp_proxy/BUILD b/source/common/tcp_proxy/BUILD index 7117a900d25b6..504ced2b864c1 100644 --- a/source/common/tcp_proxy/BUILD +++ b/source/common/tcp_proxy/BUILD @@ -43,7 +43,7 @@ envoy_cc_library( "//source/common/router:metadatamatchcriteria_lib", "//source/common/stream_info:stream_info_lib", "//source/common/upstream:load_balancer_lib", - "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto", + "@envoy_api//envoy/config/filter/accesslog/v2:pkg_cc_proto", "@envoy_api//envoy/config/filter/network/tcp_proxy/v2:pkg_cc_proto", ], ) diff --git a/source/common/tcp_proxy/tcp_proxy.cc b/source/common/tcp_proxy/tcp_proxy.cc index a80eaa4ebcea5..8a71036e1eeb7 100644 --- a/source/common/tcp_proxy/tcp_proxy.cc +++ b/source/common/tcp_proxy/tcp_proxy.cc @@ -4,7 +4,8 @@ #include #include "envoy/buffer/buffer.h" -#include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.h" +#include "envoy/config/filter/accesslog/v2/accesslog.pb.h" +#include "envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.pb.h" #include "envoy/event/dispatcher.h" #include "envoy/event/timer.h" #include "envoy/stats/scope.h" diff --git a/source/common/tracing/BUILD b/source/common/tracing/BUILD index f3e31d3e3c2e7..d69373394f05b 100644 --- a/source/common/tracing/BUILD +++ b/source/common/tracing/BUILD @@ -39,6 +39,7 @@ envoy_cc_library( "//source/common/runtime:uuid_util_lib", "//source/common/stream_info:utility_lib", "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/type/metadata/v2:pkg_cc_proto", "@envoy_api//envoy/type/tracing/v2:pkg_cc_proto", ], ) diff --git a/source/common/tracing/http_tracer_impl.cc b/source/common/tracing/http_tracer_impl.cc index a8a90107afa87..d5e9d63257f89 100644 --- a/source/common/tracing/http_tracer_impl.cc +++ b/source/common/tracing/http_tracer_impl.cc @@ -2,6 +2,10 @@ #include +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/type/metadata/v2/metadata.pb.h" +#include "envoy/type/tracing/v2/custom_tag.pb.h" + #include "common/access_log/access_log_formatter.h" #include "common/common/assert.h" #include "common/common/fmt.h" diff --git a/source/common/tracing/http_tracer_impl.h b/source/common/tracing/http_tracer_impl.h index c9cfb856194a7..02f4c0478956b 100644 --- a/source/common/tracing/http_tracer_impl.h +++ b/source/common/tracing/http_tracer_impl.h @@ -8,6 +8,7 @@ #include "envoy/runtime/runtime.h" #include "envoy/thread_local/thread_local.h" #include "envoy/tracing/http_tracer.h" +#include "envoy/type/metadata/v2/metadata.pb.h" #include "envoy/type/tracing/v2/custom_tag.pb.h" #include "envoy/upstream/cluster_manager.h" diff --git a/source/common/upstream/BUILD b/source/common/upstream/BUILD index b44d89ed75c88..6993b0d28fa91 100644 --- a/source/common/upstream/BUILD +++ b/source/common/upstream/BUILD @@ -22,7 +22,7 @@ envoy_cc_library( "//source/common/config:utility_lib", "//source/common/protobuf:utility_lib", "@envoy_api//envoy/api/v2:pkg_cc_proto", - "@envoy_api//envoy/api/v2/cluster:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -63,6 +63,8 @@ envoy_cc_library( "//source/common/upstream:priority_conn_pool_map_impl_lib", "//source/common/upstream:upstream_lib", "@envoy_api//envoy/admin/v2alpha:pkg_cc_proto", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", ], ) @@ -135,6 +137,8 @@ envoy_cc_library( deps = [ ":health_checker_base_lib", "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/data/core/v2alpha:pkg_cc_proto", + "@envoy_api//envoy/type:pkg_cc_proto", # TODO(dio): Remove dependency to server. "//include/envoy/server:health_checker_config_interface", "//source/common/grpc:codec_lib", @@ -205,6 +209,9 @@ envoy_cc_library( "//source/common/network:resolver_lib", "//source/extensions/transport_sockets:well_known_names", "//source/server:transport_socket_config_lib", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/api/v2/endpoint:pkg_cc_proto", "@envoy_api//envoy/service/discovery/v2:pkg_cc_proto", ], ) @@ -215,6 +222,8 @@ envoy_cc_library( hdrs = ["logical_host.h"], deps = [ ":upstream_includes", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/api/v2/endpoint:pkg_cc_proto", ], ) @@ -235,6 +244,8 @@ envoy_cc_library( "//source/common/protobuf:utility_lib", "//source/extensions/clusters:well_known_names", "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/api/v2/endpoint:pkg_cc_proto", ], ) @@ -251,6 +262,9 @@ envoy_cc_library( "//source/common/network:address_lib", "//source/common/network:utility_lib", "//source/extensions/clusters:well_known_names", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/api/v2/endpoint:pkg_cc_proto", ], ) @@ -269,6 +283,7 @@ envoy_cc_library( "//source/common/common:utility_lib", "//source/common/http:codes_lib", "//source/common/protobuf", + "@envoy_api//envoy/api/v2:pkg_cc_proto", "@envoy_api//envoy/api/v2/cluster:pkg_cc_proto", "@envoy_api//envoy/data/cluster/v2alpha:pkg_cc_proto", ], @@ -292,6 +307,7 @@ envoy_cc_library( external_deps = ["abseil_synchronization"], deps = [ ":load_balancer_lib", + "@envoy_api//envoy/api/v2:pkg_cc_proto", ], ) @@ -302,6 +318,7 @@ envoy_cc_library( deps = [ ":thread_aware_lb_lib", ":upstream_lib", + "@envoy_api//envoy/api/v2:pkg_cc_proto", ], ) @@ -312,6 +329,7 @@ envoy_cc_library( deps = [ ":thread_aware_lb_lib", "//source/common/common:minimal_logger_lib", + "@envoy_api//envoy/api/v2:pkg_cc_proto", ], ) @@ -359,6 +377,7 @@ envoy_cc_library( "//source/common/protobuf", "//source/common/protobuf:utility_lib", "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -375,6 +394,10 @@ envoy_cc_library( ":strict_dns_cluster_lib", ":upstream_includes", ":transport_socket_match_lib", + "@envoy_api//envoy/api/v2/cluster:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/api/v2/endpoint:pkg_cc_proto", + "@envoy_api//envoy/api/v2:pkg_cc_proto", "//include/envoy/event:dispatcher_interface", "//include/envoy/event:timer_interface", "//include/envoy/network:dns_interface", @@ -406,6 +429,8 @@ envoy_cc_library( "//source/common/protobuf", "//source/common/protobuf:utility_lib", "//source/extensions/transport_sockets:well_known_names", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -416,6 +441,7 @@ envoy_cc_library( deps = [ ":cluster_factory_includes", ":upstream_includes", + "@envoy_api//envoy/api/v2:pkg_cc_proto", ], ) @@ -426,6 +452,8 @@ envoy_cc_library( deps = [ ":cluster_factory_includes", ":upstream_includes", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/endpoint:pkg_cc_proto", ], ) @@ -493,6 +521,7 @@ envoy_cc_library( "//source/extensions/clusters:well_known_names", "//source/extensions/transport_sockets:well_known_names", "//source/server:transport_socket_config_lib", + "@envoy_api//envoy/api/v2:pkg_cc_proto", ], ) @@ -528,7 +557,6 @@ envoy_cc_library( "//source/common/stats:stats_lib", "//source/extensions/clusters:well_known_names", "//source/server:transport_socket_config_lib", - "@envoy_api//envoy/api/v2/core:pkg_cc_proto", - "@envoy_api//envoy/api/v2/endpoint:pkg_cc_proto", + "@envoy_api//envoy/api/v2:pkg_cc_proto", ], ) diff --git a/source/common/upstream/cds_api_impl.cc b/source/common/upstream/cds_api_impl.cc index 99fa95f8286fe..26bb6de76f64a 100644 --- a/source/common/upstream/cds_api_impl.cc +++ b/source/common/upstream/cds_api_impl.cc @@ -2,8 +2,10 @@ #include +#include "envoy/api/v2/cds.pb.h" #include "envoy/api/v2/cds.pb.validate.h" -#include "envoy/api/v2/cluster/outlier_detection.pb.validate.h" +#include "envoy/api/v2/core/config_source.pb.h" +#include "envoy/api/v2/discovery.pb.h" #include "envoy/stats/scope.h" #include "common/common/cleanup.h" diff --git a/source/common/upstream/cds_api_impl.h b/source/common/upstream/cds_api_impl.h index b17d4bbc9989d..ba5cd4977cf3f 100644 --- a/source/common/upstream/cds_api_impl.h +++ b/source/common/upstream/cds_api_impl.h @@ -4,6 +4,8 @@ #include "envoy/api/api.h" #include "envoy/api/v2/cds.pb.h" +#include "envoy/api/v2/core/config_source.pb.h" +#include "envoy/api/v2/discovery.pb.h" #include "envoy/config/subscription.h" #include "envoy/event/dispatcher.h" #include "envoy/local_info/local_info.h" diff --git a/source/common/upstream/cluster_factory_impl.cc b/source/common/upstream/cluster_factory_impl.cc index ad557eab6d0b1..9c2f5da1b8f8b 100644 --- a/source/common/upstream/cluster_factory_impl.cc +++ b/source/common/upstream/cluster_factory_impl.cc @@ -1,5 +1,7 @@ #include "common/upstream/cluster_factory_impl.h" +#include "envoy/api/v2/cds.pb.h" + #include "common/http/utility.h" #include "common/network/address_impl.h" #include "common/network/resolver_impl.h" diff --git a/source/common/upstream/cluster_factory_impl.h b/source/common/upstream/cluster_factory_impl.h index 41759e66d3903..07ea992b47368 100644 --- a/source/common/upstream/cluster_factory_impl.h +++ b/source/common/upstream/cluster_factory_impl.h @@ -11,8 +11,7 @@ #include #include -#include "envoy/api/v2/core/base.pb.h" -#include "envoy/api/v2/endpoint/endpoint.pb.h" +#include "envoy/api/v2/cds.pb.h" #include "envoy/config/typed_metadata.h" #include "envoy/event/timer.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 398e47edc97ff..a478ecbb2eda2 100644 --- a/source/common/upstream/cluster_manager_impl.cc +++ b/source/common/upstream/cluster_manager_impl.cc @@ -9,6 +9,9 @@ #include #include "envoy/admin/v2alpha/config_dump.pb.h" +#include "envoy/api/v2/cds.pb.h" +#include "envoy/api/v2/core/config_source.pb.h" +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" #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 83f463afd777b..79cc6d83257a8 100644 --- a/source/common/upstream/cluster_manager_impl.h +++ b/source/common/upstream/cluster_manager_impl.h @@ -10,6 +10,9 @@ #include #include "envoy/api/api.h" +#include "envoy/api/v2/cds.pb.h" +#include "envoy/api/v2/core/address.pb.h" +#include "envoy/api/v2/core/config_source.pb.h" #include "envoy/config/bootstrap/v2/bootstrap.pb.h" #include "envoy/http/codes.h" #include "envoy/local_info/local_info.h" diff --git a/source/common/upstream/eds.cc b/source/common/upstream/eds.cc index 5851445763c18..285e9ea158ce1 100644 --- a/source/common/upstream/eds.cc +++ b/source/common/upstream/eds.cc @@ -1,5 +1,9 @@ #include "common/upstream/eds.h" +#include "envoy/api/v2/cds.pb.h" +#include "envoy/api/v2/core/config_source.pb.h" +#include "envoy/api/v2/discovery.pb.h" +#include "envoy/api/v2/eds.pb.h" #include "envoy/api/v2/eds.pb.validate.h" #include "common/common/utility.h" diff --git a/source/common/upstream/eds.h b/source/common/upstream/eds.h index a19859add5b71..c84df480b0180 100644 --- a/source/common/upstream/eds.h +++ b/source/common/upstream/eds.h @@ -1,6 +1,8 @@ #pragma once +#include "envoy/api/v2/cds.pb.h" #include "envoy/api/v2/core/base.pb.h" +#include "envoy/api/v2/discovery.pb.h" #include "envoy/api/v2/eds.pb.h" #include "envoy/config/subscription.h" #include "envoy/config/subscription_factory.h" diff --git a/source/common/upstream/health_checker_base_impl.cc b/source/common/upstream/health_checker_base_impl.cc index 5858fdbadc31e..17811a97bd9ec 100644 --- a/source/common/upstream/health_checker_base_impl.cc +++ b/source/common/upstream/health_checker_base_impl.cc @@ -1,5 +1,7 @@ #include "common/upstream/health_checker_base_impl.h" +#include "envoy/api/v2/core/address.pb.h" +#include "envoy/api/v2/core/health_check.pb.h" #include "envoy/data/core/v2alpha/health_check_event.pb.h" #include "envoy/stats/scope.h" diff --git a/source/common/upstream/health_checker_base_impl.h b/source/common/upstream/health_checker_base_impl.h index 5008cf9d39070..9616c2db426f7 100644 --- a/source/common/upstream/health_checker_base_impl.h +++ b/source/common/upstream/health_checker_base_impl.h @@ -2,6 +2,7 @@ #include "envoy/access_log/access_log.h" #include "envoy/api/v2/core/health_check.pb.h" +#include "envoy/data/core/v2alpha/health_check_event.pb.h" #include "envoy/event/timer.h" #include "envoy/runtime/runtime.h" #include "envoy/stats/scope.h" diff --git a/source/common/upstream/health_checker_impl.cc b/source/common/upstream/health_checker_impl.cc index c1aad5a96ca2e..624707d28cdaa 100644 --- a/source/common/upstream/health_checker_impl.cc +++ b/source/common/upstream/health_checker_impl.cc @@ -1,6 +1,10 @@ #include "common/upstream/health_checker_impl.h" +#include "envoy/api/v2/core/health_check.pb.h" +#include "envoy/data/core/v2alpha/health_check_event.pb.h" #include "envoy/server/health_checker_config.h" +#include "envoy/type/http.pb.h" +#include "envoy/type/range.pb.h" #include "common/buffer/zero_copy_input_stream_impl.h" #include "common/common/empty_string.h" diff --git a/source/common/upstream/health_checker_impl.h b/source/common/upstream/health_checker_impl.h index 63b4b0c142cc8..1bc64bdcdf169 100644 --- a/source/common/upstream/health_checker_impl.h +++ b/source/common/upstream/health_checker_impl.h @@ -3,7 +3,10 @@ #include "envoy/access_log/access_log.h" #include "envoy/api/api.h" #include "envoy/api/v2/core/health_check.pb.h" +#include "envoy/data/core/v2alpha/health_check_event.pb.h" #include "envoy/grpc/status.h" +#include "envoy/type/http.pb.h" +#include "envoy/type/range.pb.h" #include "common/common/logger.h" #include "common/grpc/codec.h" diff --git a/source/common/upstream/health_discovery_service.cc b/source/common/upstream/health_discovery_service.cc index 8579620c48bee..f8ef0e46bb926 100644 --- a/source/common/upstream/health_discovery_service.cc +++ b/source/common/upstream/health_discovery_service.cc @@ -1,5 +1,11 @@ #include "common/upstream/health_discovery_service.h" +#include "envoy/api/v2/cds.pb.h" +#include "envoy/api/v2/core/address.pb.h" +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/api/v2/core/health_check.pb.h" +#include "envoy/api/v2/endpoint/endpoint.pb.h" +#include "envoy/service/discovery/v2/hds.pb.h" #include "envoy/stats/scope.h" #include "common/protobuf/protobuf.h" diff --git a/source/common/upstream/health_discovery_service.h b/source/common/upstream/health_discovery_service.h index b393190f3b47d..5456520920255 100644 --- a/source/common/upstream/health_discovery_service.h +++ b/source/common/upstream/health_discovery_service.h @@ -1,6 +1,8 @@ #pragma once #include "envoy/api/api.h" +#include "envoy/api/v2/cds.pb.h" +#include "envoy/api/v2/core/address.pb.h" #include "envoy/event/dispatcher.h" #include "envoy/server/transport_socket_config.h" #include "envoy/service/discovery/v2/hds.pb.h" diff --git a/source/common/upstream/load_balancer_impl.cc b/source/common/upstream/load_balancer_impl.cc index 185652b660cdd..4f2ae7dbbe702 100644 --- a/source/common/upstream/load_balancer_impl.cc +++ b/source/common/upstream/load_balancer_impl.cc @@ -5,6 +5,7 @@ #include #include +#include "envoy/api/v2/cds.pb.h" #include "envoy/runtime/runtime.h" #include "envoy/upstream/upstream.h" diff --git a/source/common/upstream/load_stats_reporter.cc b/source/common/upstream/load_stats_reporter.cc index 57a9f2411a9b7..1f0b1c21b7273 100644 --- a/source/common/upstream/load_stats_reporter.cc +++ b/source/common/upstream/load_stats_reporter.cc @@ -1,5 +1,6 @@ #include "common/upstream/load_stats_reporter.h" +#include "envoy/service/load_stats/v2/lrs.pb.h" #include "envoy/stats/scope.h" #include "common/protobuf/protobuf.h" diff --git a/source/common/upstream/logical_dns_cluster.cc b/source/common/upstream/logical_dns_cluster.cc index bf73083e0e355..9141b580c5e69 100644 --- a/source/common/upstream/logical_dns_cluster.cc +++ b/source/common/upstream/logical_dns_cluster.cc @@ -5,6 +5,8 @@ #include #include +#include "envoy/api/v2/cds.pb.h" +#include "envoy/api/v2/core/address.pb.h" #include "envoy/api/v2/eds.pb.h" #include "envoy/common/exception.h" #include "envoy/stats/scope.h" diff --git a/source/common/upstream/logical_dns_cluster.h b/source/common/upstream/logical_dns_cluster.h index b1f7026aa3121..a9fe16159d313 100644 --- a/source/common/upstream/logical_dns_cluster.h +++ b/source/common/upstream/logical_dns_cluster.h @@ -5,6 +5,9 @@ #include #include +#include "envoy/api/v2/cds.pb.h" +#include "envoy/api/v2/eds.pb.h" +#include "envoy/api/v2/endpoint/endpoint.pb.h" #include "envoy/stats/scope.h" #include "common/common/empty_string.h" diff --git a/source/common/upstream/logical_host.h b/source/common/upstream/logical_host.h index f08df466d29c5..07f5bd8e67cdb 100644 --- a/source/common/upstream/logical_host.h +++ b/source/common/upstream/logical_host.h @@ -1,5 +1,8 @@ #pragma once +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/api/v2/endpoint/endpoint.pb.h" + #include "common/upstream/upstream_impl.h" namespace Envoy { diff --git a/source/common/upstream/maglev_lb.cc b/source/common/upstream/maglev_lb.cc index 2fba318f88302..e726766da9e2a 100644 --- a/source/common/upstream/maglev_lb.cc +++ b/source/common/upstream/maglev_lb.cc @@ -1,5 +1,7 @@ #include "common/upstream/maglev_lb.h" +#include "envoy/api/v2/cds.pb.h" + namespace Envoy { namespace Upstream { diff --git a/source/common/upstream/maglev_lb.h b/source/common/upstream/maglev_lb.h index d48849ac3efce..e181fd990965b 100644 --- a/source/common/upstream/maglev_lb.h +++ b/source/common/upstream/maglev_lb.h @@ -1,5 +1,6 @@ #pragma once +#include "envoy/api/v2/cds.pb.h" #include "envoy/stats/scope.h" #include "envoy/stats/stats_macros.h" diff --git a/source/common/upstream/original_dst_cluster.cc b/source/common/upstream/original_dst_cluster.cc index 04b91f58f236b..35e995789fdbd 100644 --- a/source/common/upstream/original_dst_cluster.cc +++ b/source/common/upstream/original_dst_cluster.cc @@ -5,6 +5,10 @@ #include #include +#include "envoy/api/v2/cds.pb.h" +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/api/v2/core/health_check.pb.h" +#include "envoy/api/v2/endpoint/endpoint.pb.h" #include "envoy/stats/scope.h" #include "common/http/headers.h" diff --git a/source/common/upstream/original_dst_cluster.h b/source/common/upstream/original_dst_cluster.h index 1a88dfb1c61c2..e911a3184a455 100644 --- a/source/common/upstream/original_dst_cluster.h +++ b/source/common/upstream/original_dst_cluster.h @@ -5,6 +5,7 @@ #include #include +#include "envoy/api/v2/cds.pb.h" #include "envoy/secret/secret_manager.h" #include "envoy/server/transport_socket_config.h" #include "envoy/stats/scope.h" diff --git a/source/common/upstream/outlier_detection_impl.cc b/source/common/upstream/outlier_detection_impl.cc index 5ff3d9f6a71c6..87ed6593f03f3 100644 --- a/source/common/upstream/outlier_detection_impl.cc +++ b/source/common/upstream/outlier_detection_impl.cc @@ -6,6 +6,8 @@ #include #include +#include "envoy/api/v2/cds.pb.h" +#include "envoy/api/v2/cluster/outlier_detection.pb.h" #include "envoy/data/cluster/v2alpha/outlier_detection_event.pb.h" #include "envoy/event/dispatcher.h" #include "envoy/stats/scope.h" diff --git a/source/common/upstream/outlier_detection_impl.h b/source/common/upstream/outlier_detection_impl.h index b10bc8571003c..72793d14845f5 100644 --- a/source/common/upstream/outlier_detection_impl.h +++ b/source/common/upstream/outlier_detection_impl.h @@ -10,8 +10,10 @@ #include #include "envoy/access_log/access_log.h" +#include "envoy/api/v2/cds.pb.h" #include "envoy/api/v2/cluster/outlier_detection.pb.h" #include "envoy/common/time.h" +#include "envoy/data/cluster/v2alpha/outlier_detection_event.pb.h" #include "envoy/event/timer.h" #include "envoy/http/codes.h" #include "envoy/runtime/runtime.h" diff --git a/source/common/upstream/ring_hash_lb.cc b/source/common/upstream/ring_hash_lb.cc index 2489b8e44cd91..264b471c182d6 100644 --- a/source/common/upstream/ring_hash_lb.cc +++ b/source/common/upstream/ring_hash_lb.cc @@ -5,6 +5,8 @@ #include #include +#include "envoy/api/v2/cds.pb.h" + #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 76bb1923b07bf..4a61d39023ae4 100644 --- a/source/common/upstream/ring_hash_lb.h +++ b/source/common/upstream/ring_hash_lb.h @@ -2,6 +2,7 @@ #include +#include "envoy/api/v2/cds.pb.h" #include "envoy/runtime/runtime.h" #include "envoy/stats/scope.h" #include "envoy/stats/stats_macros.h" diff --git a/source/common/upstream/static_cluster.cc b/source/common/upstream/static_cluster.cc index 37feab2ea41a7..2b5997d73d6d4 100644 --- a/source/common/upstream/static_cluster.cc +++ b/source/common/upstream/static_cluster.cc @@ -1,5 +1,7 @@ #include "common/upstream/static_cluster.h" +#include "envoy/api/v2/cds.pb.h" +#include "envoy/api/v2/eds.pb.h" #include "envoy/common/exception.h" namespace Envoy { diff --git a/source/common/upstream/static_cluster.h b/source/common/upstream/static_cluster.h index f8a440d72f126..b588084dd58e4 100644 --- a/source/common/upstream/static_cluster.h +++ b/source/common/upstream/static_cluster.h @@ -1,5 +1,7 @@ #pragma once +#include "envoy/api/v2/cds.pb.h" + #include "common/upstream/cluster_factory_impl.h" #include "common/upstream/upstream_impl.h" diff --git a/source/common/upstream/strict_dns_cluster.cc b/source/common/upstream/strict_dns_cluster.cc index a676059857f4f..e6e58f9781381 100644 --- a/source/common/upstream/strict_dns_cluster.cc +++ b/source/common/upstream/strict_dns_cluster.cc @@ -1,5 +1,8 @@ #include "common/upstream/strict_dns_cluster.h" +#include "envoy/api/v2/cds.pb.h" +#include "envoy/api/v2/eds.pb.h" +#include "envoy/api/v2/endpoint/endpoint.pb.h" #include "envoy/common/exception.h" namespace Envoy { diff --git a/source/common/upstream/strict_dns_cluster.h b/source/common/upstream/strict_dns_cluster.h index 9dab1adb631d3..e8c944203c043 100644 --- a/source/common/upstream/strict_dns_cluster.h +++ b/source/common/upstream/strict_dns_cluster.h @@ -1,5 +1,8 @@ #pragma once +#include "envoy/api/v2/cds.pb.h" +#include "envoy/api/v2/endpoint/endpoint.pb.h" + #include "common/upstream/cluster_factory_impl.h" #include "common/upstream/upstream_impl.h" diff --git a/source/common/upstream/subset_lb.cc b/source/common/upstream/subset_lb.cc index db5f5d5eb99ee..aac75a2dfe017 100644 --- a/source/common/upstream/subset_lb.cc +++ b/source/common/upstream/subset_lb.cc @@ -4,6 +4,7 @@ #include #include "envoy/api/v2/cds.pb.h" +#include "envoy/api/v2/core/base.pb.h" #include "envoy/runtime/runtime.h" #include "common/common/assert.h" diff --git a/source/common/upstream/subset_lb.h b/source/common/upstream/subset_lb.h index ea9b1aaccf595..7cdcb4139771d 100644 --- a/source/common/upstream/subset_lb.h +++ b/source/common/upstream/subset_lb.h @@ -6,6 +6,7 @@ #include #include +#include "envoy/api/v2/cds.pb.h" #include "envoy/runtime/runtime.h" #include "envoy/stats/scope.h" #include "envoy/upstream/load_balancer.h" diff --git a/source/common/upstream/thread_aware_lb_impl.h b/source/common/upstream/thread_aware_lb_impl.h index 3f68d1afbbaf6..efe4d117c4e07 100644 --- a/source/common/upstream/thread_aware_lb_impl.h +++ b/source/common/upstream/thread_aware_lb_impl.h @@ -1,5 +1,7 @@ #pragma once +#include "envoy/api/v2/cds.pb.h" + #include "common/upstream/load_balancer_impl.h" #include "absl/synchronization/mutex.h" diff --git a/source/common/upstream/transport_socket_match_impl.cc b/source/common/upstream/transport_socket_match_impl.cc index 1b99435cb0d08..3077d01834e4e 100644 --- a/source/common/upstream/transport_socket_match_impl.cc +++ b/source/common/upstream/transport_socket_match_impl.cc @@ -1,5 +1,7 @@ #include "common/upstream/transport_socket_match_impl.h" +#include "envoy/api/v2/cds.pb.h" +#include "envoy/api/v2/core/base.pb.h" #include "envoy/server/transport_socket_config.h" #include "common/config/utility.h" diff --git a/source/common/upstream/transport_socket_match_impl.h b/source/common/upstream/transport_socket_match_impl.h index 742643f6f2ed3..dab8cf531adeb 100644 --- a/source/common/upstream/transport_socket_match_impl.h +++ b/source/common/upstream/transport_socket_match_impl.h @@ -3,8 +3,8 @@ #include #include +#include "envoy/api/v2/cds.pb.h" #include "envoy/api/v2/core/base.pb.h" -#include "envoy/api/v2/endpoint/endpoint.pb.h" #include "envoy/config/typed_metadata.h" #include "envoy/server/transport_socket_config.h" #include "envoy/stats/scope.h" diff --git a/source/common/upstream/upstream_impl.cc b/source/common/upstream/upstream_impl.cc index 26f51bd8b7ae2..7d285162637de 100644 --- a/source/common/upstream/upstream_impl.cc +++ b/source/common/upstream/upstream_impl.cc @@ -9,6 +9,12 @@ #include #include +#include "envoy/api/v2/cds.pb.h" +#include "envoy/api/v2/cluster/circuit_breaker.pb.h" +#include "envoy/api/v2/core/address.pb.h" +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/api/v2/core/health_check.pb.h" +#include "envoy/api/v2/endpoint/endpoint.pb.h" #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 642e916184eb7..4eeed9a7597c3 100644 --- a/source/common/upstream/upstream_impl.h +++ b/source/common/upstream/upstream_impl.h @@ -11,8 +11,10 @@ #include #include +#include "envoy/api/v2/cds.pb.h" +#include "envoy/api/v2/core/address.pb.h" #include "envoy/api/v2/core/base.pb.h" -#include "envoy/api/v2/eds.pb.h" +#include "envoy/api/v2/core/health_check.pb.h" #include "envoy/api/v2/endpoint/endpoint.pb.h" #include "envoy/config/typed_metadata.h" #include "envoy/event/timer.h" diff --git a/source/extensions/access_loggers/common/BUILD b/source/extensions/access_loggers/common/BUILD index dce4fdbe8b534..daa8a198e578d 100644 --- a/source/extensions/access_loggers/common/BUILD +++ b/source/extensions/access_loggers/common/BUILD @@ -19,6 +19,5 @@ envoy_cc_library( "//source/common/access_log:access_log_lib", "//source/common/http:header_map_lib", "//source/common/singleton:const_singleton", - "@envoy_api//envoy/config/filter/accesslog/v2:pkg_cc_proto", ], ) diff --git a/source/extensions/access_loggers/common/access_log_base.h b/source/extensions/access_loggers/common/access_log_base.h index 9a6d6caa6668a..3f75f5e8e503e 100644 --- a/source/extensions/access_loggers/common/access_log_base.h +++ b/source/extensions/access_loggers/common/access_log_base.h @@ -6,7 +6,6 @@ #include #include "envoy/access_log/access_log.h" -#include "envoy/config/filter/accesslog/v2/accesslog.pb.h" #include "envoy/runtime/runtime.h" #include "envoy/server/access_log_config.h" diff --git a/source/extensions/access_loggers/file/config.cc b/source/extensions/access_loggers/file/config.cc index 714a5fb4eb6da..556037f5f65a2 100644 --- a/source/extensions/access_loggers/file/config.cc +++ b/source/extensions/access_loggers/file/config.cc @@ -3,6 +3,7 @@ #include #include +#include "envoy/config/accesslog/v2/file.pb.h" #include "envoy/config/accesslog/v2/file.pb.validate.h" #include "envoy/registry/registry.h" #include "envoy/server/filter_config.h" diff --git a/source/extensions/access_loggers/grpc/BUILD b/source/extensions/access_loggers/grpc/BUILD index 3fa3e01b0e941..3c28905d976d4 100644 --- a/source/extensions/access_loggers/grpc/BUILD +++ b/source/extensions/access_loggers/grpc/BUILD @@ -38,7 +38,7 @@ envoy_cc_library( "//source/common/grpc:typed_async_client_lib", "//source/extensions/access_loggers/common:access_log_base", "@envoy_api//envoy/config/accesslog/v2:pkg_cc_proto", - "@envoy_api//envoy/config/filter/accesslog/v2:pkg_cc_proto", + "@envoy_api//envoy/data/accesslog/v2:pkg_cc_proto", "@envoy_api//envoy/service/accesslog/v2:pkg_cc_proto", ], ) @@ -64,9 +64,9 @@ envoy_cc_library( deps = [ ":grpc_access_log_lib", ":grpc_access_log_utils", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", "@envoy_api//envoy/config/accesslog/v2:pkg_cc_proto", - "@envoy_api//envoy/config/filter/accesslog/v2:pkg_cc_proto", - "@envoy_api//envoy/service/accesslog/v2:pkg_cc_proto", + "@envoy_api//envoy/data/accesslog/v2:pkg_cc_proto", ], ) @@ -78,8 +78,7 @@ envoy_cc_library( ":grpc_access_log_lib", ":grpc_access_log_utils", "@envoy_api//envoy/config/accesslog/v2:pkg_cc_proto", - "@envoy_api//envoy/config/filter/accesslog/v2:pkg_cc_proto", - "@envoy_api//envoy/service/accesslog/v2:pkg_cc_proto", + "@envoy_api//envoy/data/accesslog/v2:pkg_cc_proto", ], ) @@ -90,7 +89,6 @@ envoy_cc_library( deps = [ "//source/common/common:assert_lib", "//source/common/protobuf", - "@envoy_api//envoy/service/accesslog/v2:pkg_cc_proto", ], ) @@ -108,7 +106,6 @@ envoy_cc_extension( "//source/extensions/access_loggers/grpc:grpc_access_log_proto_descriptors_lib", "//source/extensions/access_loggers/grpc:http_grpc_access_log_lib", "@envoy_api//envoy/config/accesslog/v2:pkg_cc_proto", - "@envoy_api//envoy/config/filter/accesslog/v2:pkg_cc_proto", ], ) @@ -126,6 +123,5 @@ envoy_cc_extension( "//source/extensions/access_loggers/grpc:grpc_access_log_proto_descriptors_lib", "//source/extensions/access_loggers/grpc:tcp_grpc_access_log_lib", "@envoy_api//envoy/config/accesslog/v2:pkg_cc_proto", - "@envoy_api//envoy/config/filter/accesslog/v2:pkg_cc_proto", ], ) diff --git a/source/extensions/access_loggers/grpc/config_utils.cc b/source/extensions/access_loggers/grpc/config_utils.cc index 5d2a648a0f5d9..e950aea731fbb 100644 --- a/source/extensions/access_loggers/grpc/config_utils.cc +++ b/source/extensions/access_loggers/grpc/config_utils.cc @@ -22,4 +22,4 @@ getGrpcAccessLoggerCacheSingleton(Server::Configuration::FactoryContext& context } // namespace GrpcCommon } // namespace AccessLoggers } // namespace Extensions -} // namespace Envoy \ No newline at end of file +} // namespace Envoy diff --git a/source/extensions/access_loggers/grpc/config_utils.h b/source/extensions/access_loggers/grpc/config_utils.h index f95b53f6a790f..5df42e71814a7 100644 --- a/source/extensions/access_loggers/grpc/config_utils.h +++ b/source/extensions/access_loggers/grpc/config_utils.h @@ -15,4 +15,4 @@ getGrpcAccessLoggerCacheSingleton(Server::Configuration::FactoryContext& context } // namespace GrpcCommon } // namespace AccessLoggers } // namespace Extensions -} // namespace Envoy \ No newline at end of file +} // namespace Envoy diff --git a/source/extensions/access_loggers/grpc/grpc_access_log_impl.cc b/source/extensions/access_loggers/grpc/grpc_access_log_impl.cc index 3f96ba308b5b6..6c3cc10e13896 100644 --- a/source/extensions/access_loggers/grpc/grpc_access_log_impl.cc +++ b/source/extensions/access_loggers/grpc/grpc_access_log_impl.cc @@ -1,5 +1,7 @@ #include "extensions/access_loggers/grpc/grpc_access_log_impl.h" +#include "envoy/config/accesslog/v2/als.pb.h" +#include "envoy/data/accesslog/v2/accesslog.pb.h" #include "envoy/upstream/upstream.h" #include "common/common/assert.h" diff --git a/source/extensions/access_loggers/grpc/grpc_access_log_impl.h b/source/extensions/access_loggers/grpc/grpc_access_log_impl.h index 8c254e47bca0c..ddaadb883c85e 100644 --- a/source/extensions/access_loggers/grpc/grpc_access_log_impl.h +++ b/source/extensions/access_loggers/grpc/grpc_access_log_impl.h @@ -4,7 +4,7 @@ #include #include "envoy/config/accesslog/v2/als.pb.h" -#include "envoy/config/filter/accesslog/v2/accesslog.pb.h" +#include "envoy/data/accesslog/v2/accesslog.pb.h" #include "envoy/grpc/async_client.h" #include "envoy/grpc/async_client_manager.h" #include "envoy/local_info/local_info.h" @@ -143,4 +143,4 @@ class GrpcAccessLoggerCacheImpl : public Singleton::Instance, public GrpcAccessL } // namespace GrpcCommon } // namespace AccessLoggers } // namespace Extensions -} // namespace Envoy \ No newline at end of file +} // namespace Envoy diff --git a/source/extensions/access_loggers/grpc/grpc_access_log_proto_descriptors.cc b/source/extensions/access_loggers/grpc/grpc_access_log_proto_descriptors.cc index 6936800be0ff0..67dd0585bc557 100644 --- a/source/extensions/access_loggers/grpc/grpc_access_log_proto_descriptors.cc +++ b/source/extensions/access_loggers/grpc/grpc_access_log_proto_descriptors.cc @@ -1,7 +1,5 @@ #include "extensions/access_loggers/grpc/grpc_access_log_proto_descriptors.h" -#include "envoy/service/accesslog/v2/als.pb.h" - #include "common/common/assert.h" #include "common/common/fmt.h" #include "common/protobuf/protobuf.h" diff --git a/source/extensions/access_loggers/grpc/grpc_access_log_utils.cc b/source/extensions/access_loggers/grpc/grpc_access_log_utils.cc index a42354ccd7a1a..0eae355075cfa 100644 --- a/source/extensions/access_loggers/grpc/grpc_access_log_utils.cc +++ b/source/extensions/access_loggers/grpc/grpc_access_log_utils.cc @@ -1,5 +1,7 @@ #include "extensions/access_loggers/grpc/grpc_access_log_utils.h" +#include "envoy/config/accesslog/v2/als.pb.h" +#include "envoy/data/accesslog/v2/accesslog.pb.h" #include "envoy/upstream/upstream.h" #include "common/network/utility.h" diff --git a/source/extensions/access_loggers/grpc/grpc_access_log_utils.h b/source/extensions/access_loggers/grpc/grpc_access_log_utils.h index 555481a2efc88..c6e74bfcbbaab 100644 --- a/source/extensions/access_loggers/grpc/grpc_access_log_utils.h +++ b/source/extensions/access_loggers/grpc/grpc_access_log_utils.h @@ -24,4 +24,4 @@ class Utility { } // namespace GrpcCommon } // namespace AccessLoggers } // namespace Extensions -} // namespace Envoy \ No newline at end of file +} // namespace Envoy diff --git a/source/extensions/access_loggers/grpc/http_config.cc b/source/extensions/access_loggers/grpc/http_config.cc index e8f6992600cd0..89a050985b799 100644 --- a/source/extensions/access_loggers/grpc/http_config.cc +++ b/source/extensions/access_loggers/grpc/http_config.cc @@ -1,7 +1,7 @@ #include "extensions/access_loggers/grpc/http_config.h" +#include "envoy/config/accesslog/v2/als.pb.h" #include "envoy/config/accesslog/v2/als.pb.validate.h" -#include "envoy/config/filter/accesslog/v2/accesslog.pb.validate.h" #include "envoy/registry/registry.h" #include "envoy/server/filter_config.h" diff --git a/source/extensions/access_loggers/grpc/http_grpc_access_log_impl.cc b/source/extensions/access_loggers/grpc/http_grpc_access_log_impl.cc index 1eda50f092746..e6fc6d3bb9b43 100644 --- a/source/extensions/access_loggers/grpc/http_grpc_access_log_impl.cc +++ b/source/extensions/access_loggers/grpc/http_grpc_access_log_impl.cc @@ -1,5 +1,9 @@ #include "extensions/access_loggers/grpc/http_grpc_access_log_impl.h" +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/config/accesslog/v2/als.pb.h" +#include "envoy/data/accesslog/v2/accesslog.pb.h" + #include "common/common/assert.h" #include "common/network/utility.h" #include "common/stream_info/utility.h" diff --git a/source/extensions/access_loggers/grpc/http_grpc_access_log_impl.h b/source/extensions/access_loggers/grpc/http_grpc_access_log_impl.h index be8d1e1d7d3ff..02b9c6af95aa3 100644 --- a/source/extensions/access_loggers/grpc/http_grpc_access_log_impl.h +++ b/source/extensions/access_loggers/grpc/http_grpc_access_log_impl.h @@ -4,11 +4,9 @@ #include #include "envoy/config/accesslog/v2/als.pb.h" -#include "envoy/config/filter/accesslog/v2/accesslog.pb.h" #include "envoy/grpc/async_client.h" #include "envoy/grpc/async_client_manager.h" #include "envoy/local_info/local_info.h" -#include "envoy/service/accesslog/v2/als.pb.h" #include "envoy/singleton/instance.h" #include "envoy/thread_local/thread_local.h" diff --git a/source/extensions/access_loggers/grpc/tcp_config.cc b/source/extensions/access_loggers/grpc/tcp_config.cc index b8c053ae0c44b..6af51e20b4bff 100644 --- a/source/extensions/access_loggers/grpc/tcp_config.cc +++ b/source/extensions/access_loggers/grpc/tcp_config.cc @@ -1,7 +1,7 @@ #include "extensions/access_loggers/grpc/tcp_config.h" +#include "envoy/config/accesslog/v2/als.pb.h" #include "envoy/config/accesslog/v2/als.pb.validate.h" -#include "envoy/config/filter/accesslog/v2/accesslog.pb.validate.h" #include "envoy/registry/registry.h" #include "envoy/server/filter_config.h" diff --git a/source/extensions/access_loggers/grpc/tcp_grpc_access_log_impl.cc b/source/extensions/access_loggers/grpc/tcp_grpc_access_log_impl.cc index 99eeec94f45fa..6b41141c36aff 100644 --- a/source/extensions/access_loggers/grpc/tcp_grpc_access_log_impl.cc +++ b/source/extensions/access_loggers/grpc/tcp_grpc_access_log_impl.cc @@ -1,5 +1,8 @@ #include "extensions/access_loggers/grpc/tcp_grpc_access_log_impl.h" +#include "envoy/config/accesslog/v2/als.pb.h" +#include "envoy/data/accesslog/v2/accesslog.pb.h" + #include "common/common/assert.h" #include "common/network/utility.h" #include "common/stream_info/utility.h" diff --git a/source/extensions/access_loggers/grpc/tcp_grpc_access_log_impl.h b/source/extensions/access_loggers/grpc/tcp_grpc_access_log_impl.h index 115c8a467719a..3cb96af4b9650 100644 --- a/source/extensions/access_loggers/grpc/tcp_grpc_access_log_impl.h +++ b/source/extensions/access_loggers/grpc/tcp_grpc_access_log_impl.h @@ -4,11 +4,9 @@ #include #include "envoy/config/accesslog/v2/als.pb.h" -#include "envoy/config/filter/accesslog/v2/accesslog.pb.h" #include "envoy/grpc/async_client.h" #include "envoy/grpc/async_client_manager.h" #include "envoy/local_info/local_info.h" -#include "envoy/service/accesslog/v2/als.pb.h" #include "envoy/singleton/instance.h" #include "envoy/thread_local/thread_local.h" diff --git a/source/extensions/clusters/aggregate/BUILD b/source/extensions/clusters/aggregate/BUILD index 3f6007f3b6866..e7db20184faba 100644 --- a/source/extensions/clusters/aggregate/BUILD +++ b/source/extensions/clusters/aggregate/BUILD @@ -20,6 +20,7 @@ envoy_cc_extension( "//source/common/upstream:cluster_factory_lib", "//source/common/upstream:upstream_includes", "//source/extensions/clusters:well_known_names", + "@envoy_api//envoy/api/v2:pkg_cc_proto", "@envoy_api//envoy/config/cluster/aggregate/v2alpha:pkg_cc_proto", ], ) diff --git a/source/extensions/clusters/aggregate/cluster.cc b/source/extensions/clusters/aggregate/cluster.cc index 809aac1e28dca..cdb45536f3db1 100644 --- a/source/extensions/clusters/aggregate/cluster.cc +++ b/source/extensions/clusters/aggregate/cluster.cc @@ -1,5 +1,9 @@ #include "extensions/clusters/aggregate/cluster.h" +#include "envoy/api/v2/cds.pb.h" +#include "envoy/config/cluster/aggregate/v2alpha/cluster.pb.h" +#include "envoy/config/cluster/aggregate/v2alpha/cluster.pb.validate.h" + namespace Envoy { namespace Extensions { namespace Clusters { diff --git a/source/extensions/clusters/aggregate/cluster.h b/source/extensions/clusters/aggregate/cluster.h index 23ea5b24d9bc3..296b35b77b434 100644 --- a/source/extensions/clusters/aggregate/cluster.h +++ b/source/extensions/clusters/aggregate/cluster.h @@ -1,5 +1,6 @@ #pragma once +#include "envoy/api/v2/cds.pb.h" #include "envoy/config/cluster/aggregate/v2alpha/cluster.pb.h" #include "envoy/config/cluster/aggregate/v2alpha/cluster.pb.validate.h" diff --git a/source/extensions/clusters/aggregate/lb_context.h b/source/extensions/clusters/aggregate/lb_context.h index 1e6e6a6cca48f..f1ad824d7db10 100644 --- a/source/extensions/clusters/aggregate/lb_context.h +++ b/source/extensions/clusters/aggregate/lb_context.h @@ -75,4 +75,4 @@ class AggregateLoadBalancerContext : public Upstream::LoadBalancerContext { } // namespace Aggregate } // namespace Clusters } // namespace Extensions -} // namespace Envoy \ No newline at end of file +} // namespace Envoy diff --git a/source/extensions/clusters/dynamic_forward_proxy/BUILD b/source/extensions/clusters/dynamic_forward_proxy/BUILD index 2aa9d40879873..9580cefea60b5 100644 --- a/source/extensions/clusters/dynamic_forward_proxy/BUILD +++ b/source/extensions/clusters/dynamic_forward_proxy/BUILD @@ -20,6 +20,8 @@ envoy_cc_extension( "//source/extensions/clusters:well_known_names", "//source/extensions/common/dynamic_forward_proxy:dns_cache_interface", "//source/extensions/common/dynamic_forward_proxy:dns_cache_manager_impl", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/endpoint:pkg_cc_proto", "@envoy_api//envoy/config/cluster/dynamic_forward_proxy/v2alpha:pkg_cc_proto", ], ) diff --git a/source/extensions/clusters/dynamic_forward_proxy/cluster.cc b/source/extensions/clusters/dynamic_forward_proxy/cluster.cc index 5c0568c910664..6272e1694c04f 100644 --- a/source/extensions/clusters/dynamic_forward_proxy/cluster.cc +++ b/source/extensions/clusters/dynamic_forward_proxy/cluster.cc @@ -1,5 +1,9 @@ #include "extensions/clusters/dynamic_forward_proxy/cluster.h" +#include "envoy/api/v2/cds.pb.h" +#include "envoy/config/cluster/dynamic_forward_proxy/v2alpha/cluster.pb.h" +#include "envoy/config/cluster/dynamic_forward_proxy/v2alpha/cluster.pb.validate.h" + #include "common/network/transport_socket_options_impl.h" #include "extensions/common/dynamic_forward_proxy/dns_cache_manager_impl.h" diff --git a/source/extensions/clusters/dynamic_forward_proxy/cluster.h b/source/extensions/clusters/dynamic_forward_proxy/cluster.h index 365227e141cdf..e8f7200185b9c 100644 --- a/source/extensions/clusters/dynamic_forward_proxy/cluster.h +++ b/source/extensions/clusters/dynamic_forward_proxy/cluster.h @@ -1,5 +1,7 @@ #pragma once +#include "envoy/api/v2/cds.pb.h" +#include "envoy/api/v2/endpoint/endpoint.pb.h" #include "envoy/config/cluster/dynamic_forward_proxy/v2alpha/cluster.pb.h" #include "envoy/config/cluster/dynamic_forward_proxy/v2alpha/cluster.pb.validate.h" diff --git a/source/extensions/clusters/redis/BUILD b/source/extensions/clusters/redis/BUILD index 0eb379fa9d541..a6c38edc1018f 100644 --- a/source/extensions/clusters/redis/BUILD +++ b/source/extensions/clusters/redis/BUILD @@ -71,8 +71,8 @@ envoy_cc_extension( "//source/extensions/transport_sockets/raw_buffer:config", "//source/server:transport_socket_config_lib", "@envoy_api//envoy/api/v2:pkg_cc_proto", - "@envoy_api//envoy/api/v2/core:pkg_cc_proto", "@envoy_api//envoy/api/v2/endpoint:pkg_cc_proto", "@envoy_api//envoy/config/cluster/redis:pkg_cc_proto", + "@envoy_api//envoy/config/filter/network/redis_proxy/v2:pkg_cc_proto", ], ) diff --git a/source/extensions/clusters/redis/redis_cluster.cc b/source/extensions/clusters/redis/redis_cluster.cc index 5d67ec2bb101d..634587263255c 100644 --- a/source/extensions/clusters/redis/redis_cluster.cc +++ b/source/extensions/clusters/redis/redis_cluster.cc @@ -2,6 +2,11 @@ #include +#include "envoy/api/v2/cds.pb.h" +#include "envoy/config/cluster/redis/redis_cluster.pb.h" +#include "envoy/config/cluster/redis/redis_cluster.pb.validate.h" +#include "envoy/config/filter/network/redis_proxy/v2/redis_proxy.pb.validate.h" + namespace Envoy { namespace Extensions { namespace Clusters { diff --git a/source/extensions/clusters/redis/redis_cluster.h b/source/extensions/clusters/redis/redis_cluster.h index 51077c3b652d1..f2567df97c3bf 100644 --- a/source/extensions/clusters/redis/redis_cluster.h +++ b/source/extensions/clusters/redis/redis_cluster.h @@ -14,10 +14,11 @@ #include "envoy/api/api.h" #include "envoy/api/v2/cds.pb.h" -#include "envoy/api/v2/core/base.pb.h" +#include "envoy/api/v2/eds.pb.h" #include "envoy/api/v2/endpoint/endpoint.pb.h" #include "envoy/config/cluster/redis/redis_cluster.pb.h" #include "envoy/config/cluster/redis/redis_cluster.pb.validate.h" +#include "envoy/config/filter/network/redis_proxy/v2/redis_proxy.pb.validate.h" #include "envoy/config/typed_metadata.h" #include "envoy/event/dispatcher.h" #include "envoy/event/timer.h" diff --git a/source/extensions/common/dynamic_forward_proxy/BUILD b/source/extensions/common/dynamic_forward_proxy/BUILD index 56f351d4f236b..8218e13a4de9e 100644 --- a/source/extensions/common/dynamic_forward_proxy/BUILD +++ b/source/extensions/common/dynamic_forward_proxy/BUILD @@ -26,6 +26,7 @@ envoy_cc_library( deps = [ ":dns_cache_impl", "//source/common/protobuf", + "@envoy_api//envoy/config/common/dynamic_forward_proxy/v2alpha:pkg_cc_proto", ], ) @@ -40,5 +41,6 @@ envoy_cc_library( "//source/common/common:cleanup_lib", "//source/common/network:utility_lib", "//source/common/upstream:upstream_lib", + "@envoy_api//envoy/config/common/dynamic_forward_proxy/v2alpha:pkg_cc_proto", ], ) diff --git a/source/extensions/common/dynamic_forward_proxy/dns_cache_impl.cc b/source/extensions/common/dynamic_forward_proxy/dns_cache_impl.cc index a5ff26147a386..2abaa2077b33a 100644 --- a/source/extensions/common/dynamic_forward_proxy/dns_cache_impl.cc +++ b/source/extensions/common/dynamic_forward_proxy/dns_cache_impl.cc @@ -1,5 +1,7 @@ #include "extensions/common/dynamic_forward_proxy/dns_cache_impl.h" +#include "envoy/config/common/dynamic_forward_proxy/v2alpha/dns_cache.pb.h" + #include "common/http/utility.h" #include "common/network/utility.h" diff --git a/source/extensions/common/dynamic_forward_proxy/dns_cache_impl.h b/source/extensions/common/dynamic_forward_proxy/dns_cache_impl.h index 69a69eccf7c6e..cf6e4f0ca5ee6 100644 --- a/source/extensions/common/dynamic_forward_proxy/dns_cache_impl.h +++ b/source/extensions/common/dynamic_forward_proxy/dns_cache_impl.h @@ -1,5 +1,6 @@ #pragma once +#include "envoy/config/common/dynamic_forward_proxy/v2alpha/dns_cache.pb.h" #include "envoy/network/dns.h" #include "envoy/thread_local/thread_local.h" diff --git a/source/extensions/common/dynamic_forward_proxy/dns_cache_manager_impl.cc b/source/extensions/common/dynamic_forward_proxy/dns_cache_manager_impl.cc index a895bf82fca1c..6a4fa1a95ddc6 100644 --- a/source/extensions/common/dynamic_forward_proxy/dns_cache_manager_impl.cc +++ b/source/extensions/common/dynamic_forward_proxy/dns_cache_manager_impl.cc @@ -1,5 +1,7 @@ #include "extensions/common/dynamic_forward_proxy/dns_cache_manager_impl.h" +#include "envoy/config/common/dynamic_forward_proxy/v2alpha/dns_cache.pb.h" + #include "common/protobuf/protobuf.h" #include "extensions/common/dynamic_forward_proxy/dns_cache_impl.h" diff --git a/source/extensions/common/dynamic_forward_proxy/dns_cache_manager_impl.h b/source/extensions/common/dynamic_forward_proxy/dns_cache_manager_impl.h index cdd4249a4c93f..e2a6c4c90f64c 100644 --- a/source/extensions/common/dynamic_forward_proxy/dns_cache_manager_impl.h +++ b/source/extensions/common/dynamic_forward_proxy/dns_cache_manager_impl.h @@ -1,5 +1,7 @@ #pragma once +#include "envoy/config/common/dynamic_forward_proxy/v2alpha/dns_cache.pb.h" + #include "extensions/common/dynamic_forward_proxy/dns_cache.h" #include "absl/container/flat_hash_map.h" diff --git a/source/extensions/common/tap/BUILD b/source/extensions/common/tap/BUILD index e712368827322..578f187288a14 100644 --- a/source/extensions/common/tap/BUILD +++ b/source/extensions/common/tap/BUILD @@ -28,6 +28,7 @@ envoy_cc_library( ":tap_matcher", "//source/common/common:assert_lib", "//source/common/common:stack_array", + "@envoy_api//envoy/data/tap/v2alpha:pkg_cc_proto", "@envoy_api//envoy/service/tap/v2alpha:pkg_cc_proto", ], ) @@ -52,6 +53,8 @@ envoy_cc_library( "//include/envoy/singleton:manager_interface", "//source/common/buffer:buffer_lib", "@envoy_api//envoy/admin/v2alpha:pkg_cc_proto", + "@envoy_api//envoy/data/tap/v2alpha:pkg_cc_proto", + "@envoy_api//envoy/service/tap/v2alpha:pkg_cc_proto", ], ) @@ -63,5 +66,6 @@ envoy_cc_library( "//include/envoy/thread_local:thread_local_interface", "//source/extensions/common/tap:admin", "@envoy_api//envoy/config/common/tap/v2alpha:pkg_cc_proto", + "@envoy_api//envoy/service/tap/v2alpha:pkg_cc_proto", ], ) diff --git a/source/extensions/common/tap/admin.cc b/source/extensions/common/tap/admin.cc index bf7b99e6f2d25..5d695a51fbff2 100644 --- a/source/extensions/common/tap/admin.cc +++ b/source/extensions/common/tap/admin.cc @@ -2,6 +2,8 @@ #include "envoy/admin/v2alpha/tap.pb.h" #include "envoy/admin/v2alpha/tap.pb.validate.h" +#include "envoy/data/tap/v2alpha/wrapper.pb.h" +#include "envoy/service/tap/v2alpha/common.pb.h" #include "common/buffer/buffer_impl.h" #include "common/protobuf/message_validator_impl.h" diff --git a/source/extensions/common/tap/admin.h b/source/extensions/common/tap/admin.h index be611ed0d4a6c..9feb537aa8f89 100644 --- a/source/extensions/common/tap/admin.h +++ b/source/extensions/common/tap/admin.h @@ -1,6 +1,7 @@ #pragma once #include "envoy/server/admin.h" +#include "envoy/service/tap/v2alpha/common.pb.h" #include "envoy/singleton/manager.h" #include "extensions/common/tap/tap.h" diff --git a/source/extensions/common/tap/extension_config_base.cc b/source/extensions/common/tap/extension_config_base.cc index e72ce4458a2b9..305956f8d0a1d 100644 --- a/source/extensions/common/tap/extension_config_base.cc +++ b/source/extensions/common/tap/extension_config_base.cc @@ -1,5 +1,8 @@ #include "extensions/common/tap/extension_config_base.h" +#include "envoy/config/common/tap/v2alpha/common.pb.h" +#include "envoy/service/tap/v2alpha/common.pb.h" + namespace Envoy { namespace Extensions { namespace Common { diff --git a/source/extensions/common/tap/extension_config_base.h b/source/extensions/common/tap/extension_config_base.h index 7e72447cf348c..07401e9c308f7 100644 --- a/source/extensions/common/tap/extension_config_base.h +++ b/source/extensions/common/tap/extension_config_base.h @@ -1,6 +1,7 @@ #pragma once #include "envoy/config/common/tap/v2alpha/common.pb.h" +#include "envoy/service/tap/v2alpha/common.pb.h" #include "envoy/thread_local/thread_local.h" #include "extensions/common/tap/admin.h" diff --git a/source/extensions/common/tap/tap_config_base.cc b/source/extensions/common/tap/tap_config_base.cc index f99dc4f6009a5..76bd425f085e8 100644 --- a/source/extensions/common/tap/tap_config_base.cc +++ b/source/extensions/common/tap/tap_config_base.cc @@ -1,5 +1,9 @@ #include "extensions/common/tap/tap_config_base.h" +#include "envoy/data/tap/v2alpha/common.pb.h" +#include "envoy/data/tap/v2alpha/wrapper.pb.h" +#include "envoy/service/tap/v2alpha/common.pb.h" + #include "common/common/assert.h" #include "common/common/stack_array.h" #include "common/protobuf/utility.h" diff --git a/source/extensions/common/tap/tap_config_base.h b/source/extensions/common/tap/tap_config_base.h index 36b6f8fca5567..91bed8ae57895 100644 --- a/source/extensions/common/tap/tap_config_base.h +++ b/source/extensions/common/tap/tap_config_base.h @@ -3,6 +3,8 @@ #include #include "envoy/buffer/buffer.h" +#include "envoy/data/tap/v2alpha/common.pb.h" +#include "envoy/data/tap/v2alpha/wrapper.pb.h" #include "envoy/service/tap/v2alpha/common.pb.h" #include "extensions/common/tap/tap.h" diff --git a/source/extensions/common/tap/tap_matcher.cc b/source/extensions/common/tap/tap_matcher.cc index 66511e2f88562..2f0e43d50b1cc 100644 --- a/source/extensions/common/tap/tap_matcher.cc +++ b/source/extensions/common/tap/tap_matcher.cc @@ -1,5 +1,7 @@ #include "extensions/common/tap/tap_matcher.h" +#include "envoy/service/tap/v2alpha/common.pb.h" + #include "common/common/assert.h" namespace Envoy { diff --git a/source/extensions/filters/common/expr/BUILD b/source/extensions/filters/common/expr/BUILD index 6b531f5afd572..9ff51cb02cb1b 100644 --- a/source/extensions/filters/common/expr/BUILD +++ b/source/extensions/filters/common/expr/BUILD @@ -32,5 +32,6 @@ envoy_cc_library( "//source/common/stream_info:utility_lib", "@com_google_cel_cpp//eval/public:cel_value", "@com_google_cel_cpp//eval/public:cel_value_producer", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/common/expr/context.h b/source/extensions/filters/common/expr/context.h index 8fd34742d6acf..731d679ee72a6 100644 --- a/source/extensions/filters/common/expr/context.h +++ b/source/extensions/filters/common/expr/context.h @@ -1,5 +1,6 @@ #pragma once +#include "envoy/api/v2/core/base.pb.h" #include "envoy/stream_info/stream_info.h" #include "common/http/headers.h" diff --git a/source/extensions/filters/common/ext_authz/BUILD b/source/extensions/filters/common/ext_authz/BUILD index c694fb0c1137e..f02ee5d6a74a7 100644 --- a/source/extensions/filters/common/ext_authz/BUILD +++ b/source/extensions/filters/common/ext_authz/BUILD @@ -42,6 +42,8 @@ envoy_cc_library( "//source/common/network:utility_lib", "//source/common/protobuf", "//source/common/tracing:http_tracer_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/service/auth/v2:pkg_cc_proto", ], ) @@ -58,7 +60,10 @@ envoy_cc_library( "//source/common/http:async_client_lib", "//source/common/http:codes_lib", "//source/common/tracing:http_tracer_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", "@envoy_api//envoy/config/filter/http/ext_authz/v2:pkg_cc_proto", + "@envoy_api//envoy/service/auth/v2:pkg_cc_proto", + "@envoy_api//envoy/type/matcher:pkg_cc_proto", ], ) @@ -72,6 +77,7 @@ envoy_cc_library( "//include/envoy/http:filter_interface", "//include/envoy/upstream:cluster_manager_interface", "//source/common/grpc:async_client_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", "@envoy_api//envoy/service/auth/v2:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/common/ext_authz/check_request_utils.cc b/source/extensions/filters/common/ext_authz/check_request_utils.cc index d9cb13eafd4bf..51dc8c78aba4a 100644 --- a/source/extensions/filters/common/ext_authz/check_request_utils.cc +++ b/source/extensions/filters/common/ext_authz/check_request_utils.cc @@ -5,6 +5,9 @@ #include #include +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/service/auth/v2/attribute_context.pb.h" +#include "envoy/service/auth/v2/external_auth.pb.h" #include "envoy/ssl/connection.h" #include "common/buffer/buffer_impl.h" diff --git a/source/extensions/filters/common/ext_authz/check_request_utils.h b/source/extensions/filters/common/ext_authz/check_request_utils.h index 7e27cd8189ce6..5018b0c785c3e 100644 --- a/source/extensions/filters/common/ext_authz/check_request_utils.h +++ b/source/extensions/filters/common/ext_authz/check_request_utils.h @@ -5,6 +5,7 @@ #include #include +#include "envoy/api/v2/core/base.pb.h" #include "envoy/grpc/async_client.h" #include "envoy/grpc/async_client_manager.h" #include "envoy/http/filter.h" @@ -13,6 +14,7 @@ #include "envoy/network/address.h" #include "envoy/network/connection.h" #include "envoy/network/filter.h" +#include "envoy/service/auth/v2/attribute_context.pb.h" #include "envoy/service/auth/v2/external_auth.pb.h" #include "envoy/tracing/http_tracer.h" #include "envoy/upstream/cluster_manager.h" diff --git a/source/extensions/filters/common/ext_authz/ext_authz_grpc_impl.cc b/source/extensions/filters/common/ext_authz/ext_authz_grpc_impl.cc index 749d75313c436..147d6ae803674 100644 --- a/source/extensions/filters/common/ext_authz/ext_authz_grpc_impl.cc +++ b/source/extensions/filters/common/ext_authz/ext_authz_grpc_impl.cc @@ -1,5 +1,8 @@ #include "extensions/filters/common/ext_authz/ext_authz_grpc_impl.h" +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/service/auth/v2/external_auth.pb.h" + #include "common/common/assert.h" #include "common/grpc/async_client_impl.h" #include "common/http/headers.h" diff --git a/source/extensions/filters/common/ext_authz/ext_authz_grpc_impl.h b/source/extensions/filters/common/ext_authz/ext_authz_grpc_impl.h index c5e20dea77170..328113d977bde 100644 --- a/source/extensions/filters/common/ext_authz/ext_authz_grpc_impl.h +++ b/source/extensions/filters/common/ext_authz/ext_authz_grpc_impl.h @@ -5,6 +5,7 @@ #include #include +#include "envoy/api/v2/core/base.pb.h" #include "envoy/grpc/async_client.h" #include "envoy/grpc/async_client_manager.h" #include "envoy/http/filter.h" @@ -13,6 +14,7 @@ #include "envoy/network/address.h" #include "envoy/network/connection.h" #include "envoy/network/filter.h" +#include "envoy/service/auth/v2/external_auth.pb.h" #include "envoy/tracing/http_tracer.h" #include "envoy/upstream/cluster_manager.h" diff --git a/source/extensions/filters/common/ext_authz/ext_authz_http_impl.cc b/source/extensions/filters/common/ext_authz/ext_authz_http_impl.cc index 70bf6fff9d19a..fc7538cc43a62 100644 --- a/source/extensions/filters/common/ext_authz/ext_authz_http_impl.cc +++ b/source/extensions/filters/common/ext_authz/ext_authz_http_impl.cc @@ -1,5 +1,10 @@ #include "extensions/filters/common/ext_authz/ext_authz_http_impl.h" +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/config/filter/http/ext_authz/v2/ext_authz.pb.h" +#include "envoy/service/auth/v2/external_auth.pb.h" +#include "envoy/type/matcher/string.pb.h" + #include "common/common/enum_to_int.h" #include "common/common/fmt.h" #include "common/http/async_client_impl.h" diff --git a/source/extensions/filters/common/ext_authz/ext_authz_http_impl.h b/source/extensions/filters/common/ext_authz/ext_authz_http_impl.h index a7c4c4eebcedf..2d23e1f480cf9 100644 --- a/source/extensions/filters/common/ext_authz/ext_authz_http_impl.h +++ b/source/extensions/filters/common/ext_authz/ext_authz_http_impl.h @@ -1,7 +1,10 @@ #pragma once +#include "envoy/api/v2/core/base.pb.h" #include "envoy/config/filter/http/ext_authz/v2/ext_authz.pb.h" +#include "envoy/service/auth/v2/external_auth.pb.h" #include "envoy/tracing/http_tracer.h" +#include "envoy/type/matcher/string.pb.h" #include "envoy/upstream/cluster_manager.h" #include "common/common/logger.h" diff --git a/source/extensions/filters/common/fault/BUILD b/source/extensions/filters/common/fault/BUILD index d36e361b46e0a..77da44c89a7ab 100644 --- a/source/extensions/filters/common/fault/BUILD +++ b/source/extensions/filters/common/fault/BUILD @@ -17,5 +17,6 @@ envoy_cc_library( "//source/common/http:headers_lib", "//source/common/protobuf:utility_lib", "@envoy_api//envoy/config/filter/fault/v2:pkg_cc_proto", + "@envoy_api//envoy/type:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/common/fault/fault_config.cc b/source/extensions/filters/common/fault/fault_config.cc index c4de2b1ffa546..af6f2ebc26116 100644 --- a/source/extensions/filters/common/fault/fault_config.cc +++ b/source/extensions/filters/common/fault/fault_config.cc @@ -1,5 +1,7 @@ #include "extensions/filters/common/fault/fault_config.h" +#include "envoy/config/filter/fault/v2/fault.pb.h" + #include "common/protobuf/utility.h" namespace Envoy { diff --git a/source/extensions/filters/common/fault/fault_config.h b/source/extensions/filters/common/fault/fault_config.h index 57203ebf1ad92..7f17a2ea88259 100644 --- a/source/extensions/filters/common/fault/fault_config.h +++ b/source/extensions/filters/common/fault/fault_config.h @@ -2,6 +2,7 @@ #include "envoy/config/filter/fault/v2/fault.pb.h" #include "envoy/http/header_map.h" +#include "envoy/type/percent.pb.h" #include "common/http/headers.h" #include "common/singleton/const_singleton.h" diff --git a/source/extensions/filters/common/original_src/BUILD b/source/extensions/filters/common/original_src/BUILD index 1f39f83548558..4e53b29012235 100644 --- a/source/extensions/filters/common/original_src/BUILD +++ b/source/extensions/filters/common/original_src/BUILD @@ -20,6 +20,7 @@ envoy_cc_library( "//source/common/common:minimal_logger_lib", "//source/common/network:address_lib", "//source/common/network:utility_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/common/original_src/original_src_socket_option.cc b/source/extensions/filters/common/original_src/original_src_socket_option.cc index 0a15c216bf92e..26881b9a5c510 100644 --- a/source/extensions/filters/common/original_src/original_src_socket_option.cc +++ b/source/extensions/filters/common/original_src/original_src_socket_option.cc @@ -1,5 +1,7 @@ #include "extensions/filters/common/original_src/original_src_socket_option.h" +#include "envoy/api/v2/core/base.pb.h" + #include "common/common/assert.h" namespace Envoy { diff --git a/source/extensions/filters/common/original_src/original_src_socket_option.h b/source/extensions/filters/common/original_src/original_src_socket_option.h index 3e428bf9b3298..096835e4077e2 100644 --- a/source/extensions/filters/common/original_src/original_src_socket_option.h +++ b/source/extensions/filters/common/original_src/original_src_socket_option.h @@ -1,5 +1,6 @@ #pragma once +#include "envoy/api/v2/core/base.pb.h" #include "envoy/network/address.h" #include "envoy/network/listen_socket.h" diff --git a/source/extensions/filters/common/ratelimit/BUILD b/source/extensions/filters/common/ratelimit/BUILD index 5cd8eb6e9469c..2f6ac8c9ccb5e 100644 --- a/source/extensions/filters/common/ratelimit/BUILD +++ b/source/extensions/filters/common/ratelimit/BUILD @@ -24,8 +24,8 @@ envoy_cc_library( "//source/common/grpc:typed_async_client_lib", "//source/common/http:headers_lib", "//source/common/tracing:http_tracer_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", "@envoy_api//envoy/api/v2/ratelimit:pkg_cc_proto", - "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", "@envoy_api//envoy/service/ratelimit/v2:pkg_cc_proto", ], ) @@ -39,7 +39,6 @@ envoy_cc_library( "//include/envoy/singleton:manager_interface", "//include/envoy/tracing:http_tracer_interface", "//source/common/stats:symbol_table_lib", - "@envoy_api//envoy/config/ratelimit/v2:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/common/ratelimit/ratelimit.h b/source/extensions/filters/common/ratelimit/ratelimit.h index 3145d6074437a..c13cb92771ade 100644 --- a/source/extensions/filters/common/ratelimit/ratelimit.h +++ b/source/extensions/filters/common/ratelimit/ratelimit.h @@ -6,7 +6,6 @@ #include #include "envoy/common/pure.h" -#include "envoy/config/ratelimit/v2/rls.pb.h" #include "envoy/ratelimit/ratelimit.h" #include "envoy/singleton/manager.h" #include "envoy/tracing/http_tracer.h" diff --git a/source/extensions/filters/common/ratelimit/ratelimit_impl.cc b/source/extensions/filters/common/ratelimit/ratelimit_impl.cc index 74bb9b0761bf1..964a6a490757a 100644 --- a/source/extensions/filters/common/ratelimit/ratelimit_impl.cc +++ b/source/extensions/filters/common/ratelimit/ratelimit_impl.cc @@ -5,7 +5,9 @@ #include #include +#include "envoy/api/v2/core/grpc_service.pb.h" #include "envoy/api/v2/ratelimit/ratelimit.pb.h" +#include "envoy/service/ratelimit/v2/rls.pb.h" #include "envoy/stats/scope.h" #include "common/common/assert.h" diff --git a/source/extensions/filters/common/ratelimit/ratelimit_impl.h b/source/extensions/filters/common/ratelimit/ratelimit_impl.h index fcd4cb520b1d5..6ae9cb821bd3d 100644 --- a/source/extensions/filters/common/ratelimit/ratelimit_impl.h +++ b/source/extensions/filters/common/ratelimit/ratelimit_impl.h @@ -5,7 +5,7 @@ #include #include -#include "envoy/config/bootstrap/v2/bootstrap.pb.h" +#include "envoy/api/v2/core/grpc_service.pb.h" #include "envoy/grpc/async_client.h" #include "envoy/grpc/async_client_manager.h" #include "envoy/ratelimit/ratelimit.h" diff --git a/source/extensions/filters/common/rbac/BUILD b/source/extensions/filters/common/rbac/BUILD index b5642f0bb566e..510ddccce10b1 100644 --- a/source/extensions/filters/common/rbac/BUILD +++ b/source/extensions/filters/common/rbac/BUILD @@ -16,8 +16,6 @@ envoy_cc_library( ":engine_lib", "//include/envoy/stats:stats_macros", "//source/common/singleton:const_singleton", - "@envoy_api//envoy/config/filter/http/rbac/v2:pkg_cc_proto", - "@envoy_api//envoy/config/filter/network/rbac/v2:pkg_cc_proto", ], ) @@ -35,7 +33,9 @@ envoy_cc_library( "//source/common/network:cidr_range_lib", "//source/extensions/filters/common/expr:evaluator_lib", "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/api/v2/route:pkg_cc_proto", "@envoy_api//envoy/config/rbac/v2:pkg_cc_proto", + "@envoy_api//envoy/type/matcher:pkg_cc_proto", ], ) @@ -46,7 +46,6 @@ envoy_cc_library( "//include/envoy/http:filter_interface", "//include/envoy/http:header_map_interface", "//include/envoy/network:connection_interface", - "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -57,6 +56,6 @@ envoy_cc_library( deps = [ "//source/extensions/filters/common/rbac:engine_interface", "//source/extensions/filters/common/rbac:matchers_lib", - "@envoy_api//envoy/config/filter/http/rbac/v2:pkg_cc_proto", + "@envoy_api//envoy/config/rbac/v2:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/common/rbac/engine.h b/source/extensions/filters/common/rbac/engine.h index 093eb72fb7786..34a262c89a812 100644 --- a/source/extensions/filters/common/rbac/engine.h +++ b/source/extensions/filters/common/rbac/engine.h @@ -1,6 +1,5 @@ #pragma once -#include "envoy/api/v2/core/base.pb.h" #include "envoy/http/filter.h" #include "envoy/http/header_map.h" #include "envoy/network/connection.h" diff --git a/source/extensions/filters/common/rbac/engine_impl.cc b/source/extensions/filters/common/rbac/engine_impl.cc index 4456dd6eafbb9..462c288a67945 100644 --- a/source/extensions/filters/common/rbac/engine_impl.cc +++ b/source/extensions/filters/common/rbac/engine_impl.cc @@ -1,5 +1,7 @@ #include "extensions/filters/common/rbac/engine_impl.h" +#include "envoy/config/rbac/v2/rbac.pb.h" + #include "common/http/header_map_impl.h" namespace Envoy { diff --git a/source/extensions/filters/common/rbac/engine_impl.h b/source/extensions/filters/common/rbac/engine_impl.h index 43b71fe5d8b03..600651e95865c 100644 --- a/source/extensions/filters/common/rbac/engine_impl.h +++ b/source/extensions/filters/common/rbac/engine_impl.h @@ -1,6 +1,6 @@ #pragma once -#include "envoy/config/filter/http/rbac/v2/rbac.pb.h" +#include "envoy/config/rbac/v2/rbac.pb.h" #include "extensions/filters/common/rbac/engine.h" #include "extensions/filters/common/rbac/matchers.h" diff --git a/source/extensions/filters/common/rbac/matchers.cc b/source/extensions/filters/common/rbac/matchers.cc index 6a34606da2b2e..8fc81347101ed 100644 --- a/source/extensions/filters/common/rbac/matchers.cc +++ b/source/extensions/filters/common/rbac/matchers.cc @@ -1,5 +1,7 @@ #include "extensions/filters/common/rbac/matchers.h" +#include "envoy/config/rbac/v2/rbac.pb.h" + #include "common/common/assert.h" namespace Envoy { diff --git a/source/extensions/filters/common/rbac/matchers.h b/source/extensions/filters/common/rbac/matchers.h index 8b2ef2bf10766..677d8c12e1529 100644 --- a/source/extensions/filters/common/rbac/matchers.h +++ b/source/extensions/filters/common/rbac/matchers.h @@ -2,10 +2,12 @@ #include -#include "envoy/api/v2/core/base.pb.h" +#include "envoy/api/v2/core/address.pb.h" +#include "envoy/api/v2/route/route.pb.h" #include "envoy/config/rbac/v2/rbac.pb.h" #include "envoy/http/header_map.h" #include "envoy/network/connection.h" +#include "envoy/type/matcher/string.pb.h" #include "common/common/matchers.h" #include "common/http/header_utility.h" diff --git a/source/extensions/filters/common/rbac/utility.h b/source/extensions/filters/common/rbac/utility.h index 4809e5fcb2257..a48efb813234b 100644 --- a/source/extensions/filters/common/rbac/utility.h +++ b/source/extensions/filters/common/rbac/utility.h @@ -1,7 +1,5 @@ #pragma once -#include "envoy/config/filter/http/rbac/v2/rbac.pb.h" -#include "envoy/config/filter/network/rbac/v2/rbac.pb.h" #include "envoy/stats/stats_macros.h" #include "common/singleton/const_singleton.h" diff --git a/source/extensions/filters/http/adaptive_concurrency/adaptive_concurrency_filter.cc b/source/extensions/filters/http/adaptive_concurrency/adaptive_concurrency_filter.cc index 82a85271b9a4f..6c747a91ad25c 100644 --- a/source/extensions/filters/http/adaptive_concurrency/adaptive_concurrency_filter.cc +++ b/source/extensions/filters/http/adaptive_concurrency/adaptive_concurrency_filter.cc @@ -5,6 +5,8 @@ #include #include +#include "envoy/config/filter/http/adaptive_concurrency/v2alpha/adaptive_concurrency.pb.h" + #include "common/common/assert.h" #include "common/protobuf/utility.h" diff --git a/source/extensions/filters/http/adaptive_concurrency/concurrency_controller/gradient_controller.h b/source/extensions/filters/http/adaptive_concurrency/concurrency_controller/gradient_controller.h index 6cd64144901c0..94480e318ebb6 100644 --- a/source/extensions/filters/http/adaptive_concurrency/concurrency_controller/gradient_controller.h +++ b/source/extensions/filters/http/adaptive_concurrency/concurrency_controller/gradient_controller.h @@ -4,7 +4,6 @@ #include #include "envoy/config/filter/http/adaptive_concurrency/v2alpha/adaptive_concurrency.pb.h" -#include "envoy/config/filter/http/adaptive_concurrency/v2alpha/adaptive_concurrency.pb.validate.h" #include "envoy/event/dispatcher.h" #include "envoy/runtime/runtime.h" #include "envoy/stats/stats_macros.h" diff --git a/source/extensions/filters/http/adaptive_concurrency/config.cc b/source/extensions/filters/http/adaptive_concurrency/config.cc index 1228dbfce75c6..b7598e56ff97f 100644 --- a/source/extensions/filters/http/adaptive_concurrency/config.cc +++ b/source/extensions/filters/http/adaptive_concurrency/config.cc @@ -1,5 +1,6 @@ #include "extensions/filters/http/adaptive_concurrency/config.h" +#include "envoy/config/filter/http/adaptive_concurrency/v2alpha/adaptive_concurrency.pb.h" #include "envoy/config/filter/http/adaptive_concurrency/v2alpha/adaptive_concurrency.pb.validate.h" #include "envoy/registry/registry.h" diff --git a/source/extensions/filters/http/buffer/buffer_filter.cc b/source/extensions/filters/http/buffer/buffer_filter.cc index 45bee66a691dd..77e56c61effb8 100644 --- a/source/extensions/filters/http/buffer/buffer_filter.cc +++ b/source/extensions/filters/http/buffer/buffer_filter.cc @@ -1,5 +1,6 @@ #include "extensions/filters/http/buffer/buffer_filter.h" +#include "envoy/config/filter/http/buffer/v2/buffer.pb.h" #include "envoy/event/dispatcher.h" #include "envoy/http/codes.h" diff --git a/source/extensions/filters/http/buffer/config.cc b/source/extensions/filters/http/buffer/config.cc index 6ad71f309a7d5..77239a1795dbe 100644 --- a/source/extensions/filters/http/buffer/config.cc +++ b/source/extensions/filters/http/buffer/config.cc @@ -4,6 +4,7 @@ #include #include +#include "envoy/config/filter/http/buffer/v2/buffer.pb.h" #include "envoy/config/filter/http/buffer/v2/buffer.pb.validate.h" #include "envoy/registry/registry.h" diff --git a/source/extensions/filters/http/common/aws/signer.h b/source/extensions/filters/http/common/aws/signer.h index 672c233ceaa09..8447cc7c376b3 100644 --- a/source/extensions/filters/http/common/aws/signer.h +++ b/source/extensions/filters/http/common/aws/signer.h @@ -29,4 +29,4 @@ using SignerPtr = std::unique_ptr; } // namespace Common } // namespace HttpFilters } // namespace Extensions -} // namespace Envoy \ No newline at end of file +} // namespace Envoy diff --git a/source/extensions/filters/http/common/aws/signer_impl.h b/source/extensions/filters/http/common/aws/signer_impl.h index 3b4baedd98a03..f0dc93f97fbd5 100644 --- a/source/extensions/filters/http/common/aws/signer_impl.h +++ b/source/extensions/filters/http/common/aws/signer_impl.h @@ -81,4 +81,4 @@ class SignerImpl : public Signer, public Logger::Loggable { } // namespace Common } // namespace HttpFilters } // namespace Extensions -} // namespace Envoy \ No newline at end of file +} // namespace Envoy diff --git a/source/extensions/filters/http/common/jwks_fetcher.cc b/source/extensions/filters/http/common/jwks_fetcher.cc index 7d602890009c5..bb24aa7ff527a 100644 --- a/source/extensions/filters/http/common/jwks_fetcher.cc +++ b/source/extensions/filters/http/common/jwks_fetcher.cc @@ -1,5 +1,7 @@ #include "extensions/filters/http/common/jwks_fetcher.h" +#include "envoy/api/v2/core/http_uri.pb.h" + #include "common/common/enum_to_int.h" #include "common/http/headers.h" #include "common/http/utility.h" diff --git a/source/extensions/filters/http/csrf/BUILD b/source/extensions/filters/http/csrf/BUILD index 55dcbe082de71..a4f86e7b50c84 100644 --- a/source/extensions/filters/http/csrf/BUILD +++ b/source/extensions/filters/http/csrf/BUILD @@ -24,7 +24,7 @@ envoy_cc_library( "//source/common/http:headers_lib", "//source/common/http:utility_lib", "//source/extensions/filters/http:well_known_names", - "@envoy_api//envoy/api/v2/route:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", "@envoy_api//envoy/config/filter/http/csrf/v2:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/http/csrf/config.cc b/source/extensions/filters/http/csrf/config.cc index 5b101953e8e7c..c04fce02092d8 100644 --- a/source/extensions/filters/http/csrf/config.cc +++ b/source/extensions/filters/http/csrf/config.cc @@ -1,5 +1,6 @@ #include "extensions/filters/http/csrf/config.h" +#include "envoy/config/filter/http/csrf/v2/csrf.pb.h" #include "envoy/config/filter/http/csrf/v2/csrf.pb.validate.h" #include "envoy/registry/registry.h" diff --git a/source/extensions/filters/http/csrf/csrf_filter.cc b/source/extensions/filters/http/csrf/csrf_filter.cc index e3bb6f9a26e40..a6bce63831b10 100644 --- a/source/extensions/filters/http/csrf/csrf_filter.cc +++ b/source/extensions/filters/http/csrf/csrf_filter.cc @@ -1,5 +1,6 @@ #include "extensions/filters/http/csrf/csrf_filter.h" +#include "envoy/config/filter/http/csrf/v2/csrf.pb.h" #include "envoy/stats/scope.h" #include "common/common/empty_string.h" diff --git a/source/extensions/filters/http/csrf/csrf_filter.h b/source/extensions/filters/http/csrf/csrf_filter.h index a9553129abf4b..3e7733616ccae 100644 --- a/source/extensions/filters/http/csrf/csrf_filter.h +++ b/source/extensions/filters/http/csrf/csrf_filter.h @@ -1,6 +1,6 @@ #pragma once -#include "envoy/api/v2/route/route.pb.h" +#include "envoy/api/v2/core/base.pb.h" #include "envoy/config/filter/http/csrf/v2/csrf.pb.h" #include "envoy/http/filter.h" #include "envoy/stats/scope.h" diff --git a/source/extensions/filters/http/dynamic_forward_proxy/BUILD b/source/extensions/filters/http/dynamic_forward_proxy/BUILD index 56dcddee2b035..790eda38656f0 100644 --- a/source/extensions/filters/http/dynamic_forward_proxy/BUILD +++ b/source/extensions/filters/http/dynamic_forward_proxy/BUILD @@ -18,6 +18,7 @@ envoy_cc_library( "//source/extensions/common/dynamic_forward_proxy:dns_cache_interface", "//source/extensions/filters/http:well_known_names", "//source/extensions/filters/http/common:pass_through_filter_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", "@envoy_api//envoy/config/filter/http/dynamic_forward_proxy/v2alpha:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/http/dynamic_forward_proxy/config.cc b/source/extensions/filters/http/dynamic_forward_proxy/config.cc index f95b249cbc254..a106278f7ecb9 100644 --- a/source/extensions/filters/http/dynamic_forward_proxy/config.cc +++ b/source/extensions/filters/http/dynamic_forward_proxy/config.cc @@ -1,5 +1,8 @@ #include "extensions/filters/http/dynamic_forward_proxy/config.h" +#include "envoy/config/filter/http/dynamic_forward_proxy/v2alpha/dynamic_forward_proxy.pb.h" +#include "envoy/config/filter/http/dynamic_forward_proxy/v2alpha/dynamic_forward_proxy.pb.validate.h" + #include "extensions/common/dynamic_forward_proxy/dns_cache_manager_impl.h" #include "extensions/filters/http/dynamic_forward_proxy/proxy_filter.h" diff --git a/source/extensions/filters/http/dynamic_forward_proxy/proxy_filter.cc b/source/extensions/filters/http/dynamic_forward_proxy/proxy_filter.cc index 214f11b87ce78..770d77f9cd638 100644 --- a/source/extensions/filters/http/dynamic_forward_proxy/proxy_filter.cc +++ b/source/extensions/filters/http/dynamic_forward_proxy/proxy_filter.cc @@ -1,5 +1,8 @@ #include "extensions/filters/http/dynamic_forward_proxy/proxy_filter.h" +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/config/filter/http/dynamic_forward_proxy/v2alpha/dynamic_forward_proxy.pb.h" + #include "extensions/common/dynamic_forward_proxy/dns_cache.h" #include "extensions/filters/http/well_known_names.h" diff --git a/source/extensions/filters/http/ext_authz/BUILD b/source/extensions/filters/http/ext_authz/BUILD index 703405a0e6353..854d196d031e2 100644 --- a/source/extensions/filters/http/ext_authz/BUILD +++ b/source/extensions/filters/http/ext_authz/BUILD @@ -30,8 +30,9 @@ envoy_cc_library( "//source/common/router:config_lib", "//source/extensions/filters/common/ext_authz:ext_authz_grpc_lib", "//source/extensions/filters/common/ext_authz:ext_authz_http_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", "@envoy_api//envoy/config/filter/http/ext_authz/v2:pkg_cc_proto", - "@envoy_api//envoy/type:pkg_cc_proto", + "@envoy_api//envoy/service/auth/v2:pkg_cc_proto", ], ) @@ -48,6 +49,7 @@ envoy_cc_extension( "//source/extensions/filters/common/ext_authz:ext_authz_http_lib", "//source/extensions/filters/http:well_known_names", "//source/extensions/filters/http/common:factory_base_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", "@envoy_api//envoy/config/filter/http/ext_authz/v2:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/http/ext_authz/config.cc b/source/extensions/filters/http/ext_authz/config.cc index b675ecf0d05f5..ddff58dc65c50 100644 --- a/source/extensions/filters/http/ext_authz/config.cc +++ b/source/extensions/filters/http/ext_authz/config.cc @@ -3,6 +3,8 @@ #include #include +#include "envoy/api/v2/core/grpc_service.pb.h" +#include "envoy/config/filter/http/ext_authz/v2/ext_authz.pb.h" #include "envoy/config/filter/http/ext_authz/v2/ext_authz.pb.validate.h" #include "envoy/registry/registry.h" diff --git a/source/extensions/filters/http/ext_authz/ext_authz.cc b/source/extensions/filters/http/ext_authz/ext_authz.cc index 61414ae8d2e17..92a494595d1c2 100644 --- a/source/extensions/filters/http/ext_authz/ext_authz.cc +++ b/source/extensions/filters/http/ext_authz/ext_authz.cc @@ -1,5 +1,7 @@ #include "extensions/filters/http/ext_authz/ext_authz.h" +#include "envoy/api/v2/core/base.pb.h" + #include "common/common/assert.h" #include "common/common/enum_to_int.h" #include "common/http/utility.h" diff --git a/source/extensions/filters/http/ext_authz/ext_authz.h b/source/extensions/filters/http/ext_authz/ext_authz.h index 7d1a9f40c0100..c01dcf880c01c 100644 --- a/source/extensions/filters/http/ext_authz/ext_authz.h +++ b/source/extensions/filters/http/ext_authz/ext_authz.h @@ -9,9 +9,9 @@ #include "envoy/http/filter.h" #include "envoy/local_info/local_info.h" #include "envoy/runtime/runtime.h" +#include "envoy/service/auth/v2/external_auth.pb.h" #include "envoy/stats/scope.h" #include "envoy/stats/stats_macros.h" -#include "envoy/type/http_status.pb.h" #include "envoy/upstream/cluster_manager.h" #include "common/common/assert.h" diff --git a/source/extensions/filters/http/fault/BUILD b/source/extensions/filters/http/fault/BUILD index 804d38ea6f545..dca6dedac4a2f 100644 --- a/source/extensions/filters/http/fault/BUILD +++ b/source/extensions/filters/http/fault/BUILD @@ -35,8 +35,8 @@ envoy_cc_library( "//source/common/protobuf:utility_lib", "//source/extensions/filters/common/fault:fault_config_lib", "//source/extensions/filters/http:well_known_names", - "@envoy_api//envoy/api/v2/route:pkg_cc_proto", "@envoy_api//envoy/config/filter/http/fault/v2:pkg_cc_proto", + "@envoy_api//envoy/type:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/http/fault/config.cc b/source/extensions/filters/http/fault/config.cc index 7bfeaf9d70fef..902627d8738f1 100644 --- a/source/extensions/filters/http/fault/config.cc +++ b/source/extensions/filters/http/fault/config.cc @@ -1,5 +1,6 @@ #include "extensions/filters/http/fault/config.h" +#include "envoy/config/filter/http/fault/v2/fault.pb.h" #include "envoy/config/filter/http/fault/v2/fault.pb.validate.h" #include "envoy/registry/registry.h" diff --git a/source/extensions/filters/http/fault/fault_filter.cc b/source/extensions/filters/http/fault/fault_filter.cc index 2f45628d1d29b..eeb24c52a8cd1 100644 --- a/source/extensions/filters/http/fault/fault_filter.cc +++ b/source/extensions/filters/http/fault/fault_filter.cc @@ -5,6 +5,7 @@ #include #include +#include "envoy/config/filter/http/fault/v2/fault.pb.h" #include "envoy/event/timer.h" #include "envoy/http/codes.h" #include "envoy/http/header_map.h" diff --git a/source/extensions/filters/http/fault/fault_filter.h b/source/extensions/filters/http/fault/fault_filter.h index 066e2e3fb8697..19039501e8575 100644 --- a/source/extensions/filters/http/fault/fault_filter.h +++ b/source/extensions/filters/http/fault/fault_filter.h @@ -6,12 +6,12 @@ #include #include -#include "envoy/api/v2/route/route.pb.h" #include "envoy/config/filter/http/fault/v2/fault.pb.h" #include "envoy/http/filter.h" #include "envoy/runtime/runtime.h" #include "envoy/stats/scope.h" #include "envoy/stats/stats_macros.h" +#include "envoy/type/percent.pb.h" #include "common/buffer/watermark_buffer.h" #include "common/common/token_bucket_impl.h" diff --git a/source/extensions/filters/http/grpc_http1_reverse_bridge/config.cc b/source/extensions/filters/http/grpc_http1_reverse_bridge/config.cc index 2b783781553ad..c4738020cb6a1 100644 --- a/source/extensions/filters/http/grpc_http1_reverse_bridge/config.cc +++ b/source/extensions/filters/http/grpc_http1_reverse_bridge/config.cc @@ -1,5 +1,6 @@ #include "extensions/filters/http/grpc_http1_reverse_bridge/config.h" +#include "envoy/config/filter/http/grpc_http1_reverse_bridge/v2alpha1/config.pb.h" #include "envoy/config/filter/http/grpc_http1_reverse_bridge/v2alpha1/config.pb.validate.h" #include "envoy/registry/registry.h" diff --git a/source/extensions/filters/http/grpc_json_transcoder/config.cc b/source/extensions/filters/http/grpc_json_transcoder/config.cc index 9b0e4ae87f4e9..2c799956cb411 100644 --- a/source/extensions/filters/http/grpc_json_transcoder/config.cc +++ b/source/extensions/filters/http/grpc_json_transcoder/config.cc @@ -1,5 +1,6 @@ #include "extensions/filters/http/grpc_json_transcoder/config.h" +#include "envoy/config/filter/http/transcoder/v2/transcoder.pb.h" #include "envoy/config/filter/http/transcoder/v2/transcoder.pb.validate.h" #include "envoy/registry/registry.h" diff --git a/source/extensions/filters/http/grpc_json_transcoder/json_transcoder_filter.cc b/source/extensions/filters/http/grpc_json_transcoder/json_transcoder_filter.cc index a89960942d60a..1da1b4ea1efa7 100644 --- a/source/extensions/filters/http/grpc_json_transcoder/json_transcoder_filter.cc +++ b/source/extensions/filters/http/grpc_json_transcoder/json_transcoder_filter.cc @@ -4,6 +4,7 @@ #include #include "envoy/common/exception.h" +#include "envoy/config/filter/http/transcoder/v2/transcoder.pb.h" #include "envoy/http/filter.h" #include "common/buffer/buffer_impl.h" diff --git a/source/extensions/filters/http/grpc_stats/grpc_stats_filter.cc b/source/extensions/filters/http/grpc_stats/grpc_stats_filter.cc index a15cfae09f026..9308d4f886feb 100644 --- a/source/extensions/filters/http/grpc_stats/grpc_stats_filter.cc +++ b/source/extensions/filters/http/grpc_stats/grpc_stats_filter.cc @@ -1,5 +1,7 @@ #include "extensions/filters/http/grpc_stats/grpc_stats_filter.h" +#include "envoy/config/filter/http/grpc_stats/v2alpha/config.pb.h" +#include "envoy/config/filter/http/grpc_stats/v2alpha/config.pb.validate.h" #include "envoy/registry/registry.h" #include "common/grpc/codec.h" diff --git a/source/extensions/filters/http/gzip/config.cc b/source/extensions/filters/http/gzip/config.cc index 9c1c34b2d58e0..f623472a46344 100644 --- a/source/extensions/filters/http/gzip/config.cc +++ b/source/extensions/filters/http/gzip/config.cc @@ -1,5 +1,6 @@ #include "extensions/filters/http/gzip/config.h" +#include "envoy/config/filter/http/gzip/v2/gzip.pb.h" #include "envoy/config/filter/http/gzip/v2/gzip.pb.validate.h" #include "envoy/registry/registry.h" diff --git a/source/extensions/filters/http/gzip/gzip_filter.cc b/source/extensions/filters/http/gzip/gzip_filter.cc index c201f4e3c0f35..a2cdde494488b 100644 --- a/source/extensions/filters/http/gzip/gzip_filter.cc +++ b/source/extensions/filters/http/gzip/gzip_filter.cc @@ -1,5 +1,6 @@ #include "extensions/filters/http/gzip/gzip_filter.h" +#include "envoy/config/filter/http/gzip/v2/gzip.pb.h" #include "envoy/stats/scope.h" #include "common/common/macros.h" diff --git a/source/extensions/filters/http/header_to_metadata/config.cc b/source/extensions/filters/http/header_to_metadata/config.cc index b18b2ddb63322..3c9b10471308b 100644 --- a/source/extensions/filters/http/header_to_metadata/config.cc +++ b/source/extensions/filters/http/header_to_metadata/config.cc @@ -2,6 +2,7 @@ #include +#include "envoy/config/filter/http/header_to_metadata/v2/header_to_metadata.pb.h" #include "envoy/config/filter/http/header_to_metadata/v2/header_to_metadata.pb.validate.h" #include "envoy/registry/registry.h" diff --git a/source/extensions/filters/http/header_to_metadata/header_to_metadata_filter.cc b/source/extensions/filters/http/header_to_metadata/header_to_metadata_filter.cc index 6c4379e7a9d80..8e364ae5beff5 100644 --- a/source/extensions/filters/http/header_to_metadata/header_to_metadata_filter.cc +++ b/source/extensions/filters/http/header_to_metadata/header_to_metadata_filter.cc @@ -1,5 +1,7 @@ #include "extensions/filters/http/header_to_metadata/header_to_metadata_filter.h" +#include "envoy/config/filter/http/header_to_metadata/v2/header_to_metadata.pb.h" + #include "common/common/base64.h" #include "common/config/well_known_names.h" #include "common/protobuf/protobuf.h" diff --git a/source/extensions/filters/http/health_check/config.cc b/source/extensions/filters/http/health_check/config.cc index 9ae6f3bf39c5e..80a4bfab012d4 100644 --- a/source/extensions/filters/http/health_check/config.cc +++ b/source/extensions/filters/http/health_check/config.cc @@ -1,5 +1,7 @@ #include "extensions/filters/http/health_check/config.h" +#include "envoy/config/filter/http/health_check/v2/health_check.pb.h" +#include "envoy/config/filter/http/health_check/v2/health_check.pb.validate.h" #include "envoy/registry/registry.h" #include "common/http/header_utility.h" diff --git a/source/extensions/filters/http/health_check/config.h b/source/extensions/filters/http/health_check/config.h index 659d7c3890965..18d6f6142fdd9 100644 --- a/source/extensions/filters/http/health_check/config.h +++ b/source/extensions/filters/http/health_check/config.h @@ -1,5 +1,6 @@ #pragma once +#include "envoy/config/filter/http/health_check/v2/health_check.pb.h" #include "envoy/config/filter/http/health_check/v2/health_check.pb.validate.h" #include "extensions/filters/http/common/factory_base.h" diff --git a/source/extensions/filters/http/ip_tagging/BUILD b/source/extensions/filters/http/ip_tagging/BUILD index d6baea069e27a..f08eeb7a9633a 100644 --- a/source/extensions/filters/http/ip_tagging/BUILD +++ b/source/extensions/filters/http/ip_tagging/BUILD @@ -24,6 +24,7 @@ envoy_cc_library( "//source/common/http:headers_lib", "//source/common/network:lc_trie_lib", "//source/common/stats:symbol_table_lib", + "@envoy_api//envoy/api/v3alpha/core:pkg_cc_proto", "@envoy_api//envoy/config/filter/http/ip_tagging/v3alpha:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/http/ip_tagging/config.cc b/source/extensions/filters/http/ip_tagging/config.cc index 97830b2a5f64a..0484ae09ca3b0 100644 --- a/source/extensions/filters/http/ip_tagging/config.cc +++ b/source/extensions/filters/http/ip_tagging/config.cc @@ -1,5 +1,6 @@ #include "extensions/filters/http/ip_tagging/config.h" +#include "envoy/config/filter/http/ip_tagging/v3alpha/ip_tagging.pb.h" #include "envoy/config/filter/http/ip_tagging/v3alpha/ip_tagging.pb.validate.h" #include "envoy/registry/registry.h" diff --git a/source/extensions/filters/http/ip_tagging/ip_tagging_filter.cc b/source/extensions/filters/http/ip_tagging/ip_tagging_filter.cc index 5c593083ac13f..f701e042e7808 100644 --- a/source/extensions/filters/http/ip_tagging/ip_tagging_filter.cc +++ b/source/extensions/filters/http/ip_tagging/ip_tagging_filter.cc @@ -1,5 +1,8 @@ #include "extensions/filters/http/ip_tagging/ip_tagging_filter.h" +#include "envoy/api/v3alpha/core/address.pb.h" +#include "envoy/config/filter/http/ip_tagging/v3alpha/ip_tagging.pb.h" + #include "common/http/header_map_impl.h" #include "common/http/headers.h" diff --git a/source/extensions/filters/http/jwt_authn/BUILD b/source/extensions/filters/http/jwt_authn/BUILD index 0943534255ce4..5af920b2a9b2c 100644 --- a/source/extensions/filters/http/jwt_authn/BUILD +++ b/source/extensions/filters/http/jwt_authn/BUILD @@ -88,6 +88,7 @@ envoy_cc_library( ":verifier_lib", "//source/common/http:header_utility_lib", "//source/common/router:config_lib", + "@envoy_api//envoy/api/v2/route:pkg_cc_proto", "@envoy_api//envoy/config/filter/http/jwt_authn/v2alpha:pkg_cc_proto", ], ) @@ -100,6 +101,7 @@ envoy_cc_library( ":authenticator_lib", ":extractor_lib", "//include/envoy/http:header_map_interface", + "@envoy_api//envoy/config/filter/http/jwt_authn/v2alpha:pkg_cc_proto", ], ) @@ -113,5 +115,6 @@ envoy_cc_library( "//include/envoy/server:filter_config_interface", "//include/envoy/stats:stats_macros", "//include/envoy/thread_local:thread_local_interface", + "@envoy_api//envoy/config/filter/http/jwt_authn/v2alpha:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/http/jwt_authn/extractor.cc b/source/extensions/filters/http/jwt_authn/extractor.cc index c6950a2b31c31..77284b08c938f 100644 --- a/source/extensions/filters/http/jwt_authn/extractor.cc +++ b/source/extensions/filters/http/jwt_authn/extractor.cc @@ -2,6 +2,8 @@ #include +#include "envoy/config/filter/http/jwt_authn/v2alpha/config.pb.h" + #include "common/common/utility.h" #include "common/http/headers.h" #include "common/http/utility.h" diff --git a/source/extensions/filters/http/jwt_authn/filter_config.h b/source/extensions/filters/http/jwt_authn/filter_config.h index aad41235f77b5..95eb3903130a6 100644 --- a/source/extensions/filters/http/jwt_authn/filter_config.h +++ b/source/extensions/filters/http/jwt_authn/filter_config.h @@ -1,6 +1,7 @@ #pragma once #include "envoy/api/api.h" +#include "envoy/config/filter/http/jwt_authn/v2alpha/config.pb.h" #include "envoy/router/string_accessor.h" #include "envoy/server/filter_config.h" #include "envoy/stats/scope.h" diff --git a/source/extensions/filters/http/jwt_authn/filter_factory.cc b/source/extensions/filters/http/jwt_authn/filter_factory.cc index 931507e8eaf9e..f7b84845dc15a 100644 --- a/source/extensions/filters/http/jwt_authn/filter_factory.cc +++ b/source/extensions/filters/http/jwt_authn/filter_factory.cc @@ -1,5 +1,6 @@ #include "extensions/filters/http/jwt_authn/filter_factory.h" +#include "envoy/config/filter/http/jwt_authn/v2alpha/config.pb.h" #include "envoy/config/filter/http/jwt_authn/v2alpha/config.pb.validate.h" #include "envoy/registry/registry.h" diff --git a/source/extensions/filters/http/jwt_authn/jwks_cache.cc b/source/extensions/filters/http/jwt_authn/jwks_cache.cc index 425bef1b49590..e882d240d6daa 100644 --- a/source/extensions/filters/http/jwt_authn/jwks_cache.cc +++ b/source/extensions/filters/http/jwt_authn/jwks_cache.cc @@ -4,6 +4,7 @@ #include #include "envoy/common/time.h" +#include "envoy/config/filter/http/jwt_authn/v2alpha/config.pb.h" #include "common/common/logger.h" #include "common/config/datasource.h" diff --git a/source/extensions/filters/http/jwt_authn/matcher.cc b/source/extensions/filters/http/jwt_authn/matcher.cc index 75753cdb42e17..349d822ed71b9 100644 --- a/source/extensions/filters/http/jwt_authn/matcher.cc +++ b/source/extensions/filters/http/jwt_authn/matcher.cc @@ -1,5 +1,8 @@ #include "extensions/filters/http/jwt_authn/matcher.h" +#include "envoy/api/v2/route/route.pb.h" +#include "envoy/config/filter/http/jwt_authn/v2alpha/config.pb.h" + #include "common/common/logger.h" #include "common/common/regex.h" #include "common/router/config_impl.h" diff --git a/source/extensions/filters/http/jwt_authn/verifier.cc b/source/extensions/filters/http/jwt_authn/verifier.cc index e9f0cee9bcebd..95f6bb22eaeb1 100644 --- a/source/extensions/filters/http/jwt_authn/verifier.cc +++ b/source/extensions/filters/http/jwt_authn/verifier.cc @@ -1,5 +1,7 @@ #include "extensions/filters/http/jwt_authn/verifier.h" +#include "envoy/config/filter/http/jwt_authn/v2alpha/config.pb.h" + #include "jwt_verify_lib/check_audience.h" using ::envoy::config::filter::http::jwt_authn::v2alpha::JwtProvider; diff --git a/source/extensions/filters/http/jwt_authn/verifier.h b/source/extensions/filters/http/jwt_authn/verifier.h index 0391ff4c4cd7f..4202be5838e2c 100644 --- a/source/extensions/filters/http/jwt_authn/verifier.h +++ b/source/extensions/filters/http/jwt_authn/verifier.h @@ -1,5 +1,7 @@ #pragma once +#include "envoy/config/filter/http/jwt_authn/v2alpha/config.pb.h" + #include "extensions/filters/http/jwt_authn/authenticator.h" namespace Envoy { diff --git a/source/extensions/filters/http/lua/config.cc b/source/extensions/filters/http/lua/config.cc index 686b82105c5f7..78a68485f7d33 100644 --- a/source/extensions/filters/http/lua/config.cc +++ b/source/extensions/filters/http/lua/config.cc @@ -1,5 +1,6 @@ #include "extensions/filters/http/lua/config.h" +#include "envoy/config/filter/http/lua/v2/lua.pb.h" #include "envoy/config/filter/http/lua/v2/lua.pb.validate.h" #include "envoy/registry/registry.h" diff --git a/source/extensions/filters/http/original_src/config.cc b/source/extensions/filters/http/original_src/config.cc index ae4f0e193b534..cfbacff1a2754 100644 --- a/source/extensions/filters/http/original_src/config.cc +++ b/source/extensions/filters/http/original_src/config.cc @@ -1,5 +1,7 @@ #include "extensions/filters/http/original_src/config.h" +#include "envoy/config/filter/http/original_src/v2alpha1/original_src.pb.h" + namespace Envoy { namespace Extensions { namespace HttpFilters { diff --git a/source/extensions/filters/http/original_src/original_src_config_factory.cc b/source/extensions/filters/http/original_src/original_src_config_factory.cc index 9859e9bf8f1b3..a3c3ff48c1a70 100644 --- a/source/extensions/filters/http/original_src/original_src_config_factory.cc +++ b/source/extensions/filters/http/original_src/original_src_config_factory.cc @@ -1,5 +1,7 @@ #include "extensions/filters/http/original_src/original_src_config_factory.h" +#include "envoy/config/filter/http/original_src/v2alpha1/original_src.pb.h" +#include "envoy/config/filter/http/original_src/v2alpha1/original_src.pb.validate.h" #include "envoy/registry/registry.h" #include "extensions/filters/http/original_src/config.h" diff --git a/source/extensions/filters/http/ratelimit/config.cc b/source/extensions/filters/http/ratelimit/config.cc index dce0f88aeb7c8..772b1ea225aec 100644 --- a/source/extensions/filters/http/ratelimit/config.cc +++ b/source/extensions/filters/http/ratelimit/config.cc @@ -3,6 +3,7 @@ #include #include +#include "envoy/config/filter/http/rate_limit/v2/rate_limit.pb.h" #include "envoy/config/filter/http/rate_limit/v2/rate_limit.pb.validate.h" #include "envoy/registry/registry.h" diff --git a/source/extensions/filters/http/rbac/config.cc b/source/extensions/filters/http/rbac/config.cc index f3fde289b2cae..32ac5d93c0123 100644 --- a/source/extensions/filters/http/rbac/config.cc +++ b/source/extensions/filters/http/rbac/config.cc @@ -1,5 +1,7 @@ #include "extensions/filters/http/rbac/config.h" +#include "envoy/config/filter/http/rbac/v2/rbac.pb.h" +#include "envoy/config/filter/http/rbac/v2/rbac.pb.validate.h" #include "envoy/registry/registry.h" #include "extensions/filters/http/rbac/rbac_filter.h" diff --git a/source/extensions/filters/http/rbac/rbac_filter.cc b/source/extensions/filters/http/rbac/rbac_filter.cc index a750dd47cc47c..12f885b17ddc1 100644 --- a/source/extensions/filters/http/rbac/rbac_filter.cc +++ b/source/extensions/filters/http/rbac/rbac_filter.cc @@ -1,5 +1,6 @@ #include "extensions/filters/http/rbac/rbac_filter.h" +#include "envoy/config/filter/http/rbac/v2/rbac.pb.h" #include "envoy/stats/scope.h" #include "common/http/utility.h" diff --git a/source/extensions/filters/http/router/config.cc b/source/extensions/filters/http/router/config.cc index c1ab48371466b..73f45b863c37c 100644 --- a/source/extensions/filters/http/router/config.cc +++ b/source/extensions/filters/http/router/config.cc @@ -1,5 +1,6 @@ #include "extensions/filters/http/router/config.h" +#include "envoy/config/filter/http/router/v2/router.pb.h" #include "envoy/config/filter/http/router/v2/router.pb.validate.h" #include "common/router/router.h" diff --git a/source/extensions/filters/http/squash/config.cc b/source/extensions/filters/http/squash/config.cc index 287ef5e809a7b..6143e964f9748 100644 --- a/source/extensions/filters/http/squash/config.cc +++ b/source/extensions/filters/http/squash/config.cc @@ -1,5 +1,6 @@ #include "extensions/filters/http/squash/config.h" +#include "envoy/config/filter/http/squash/v2/squash.pb.h" #include "envoy/config/filter/http/squash/v2/squash.pb.validate.h" #include "envoy/registry/registry.h" diff --git a/source/extensions/filters/http/squash/squash_filter.cc b/source/extensions/filters/http/squash/squash_filter.cc index 99d5de7349a8a..52d652b11112e 100644 --- a/source/extensions/filters/http/squash/squash_filter.cc +++ b/source/extensions/filters/http/squash/squash_filter.cc @@ -2,6 +2,7 @@ #include +#include "envoy/config/filter/http/squash/v2/squash.pb.h" #include "envoy/http/codes.h" #include "common/common/empty_string.h" diff --git a/source/extensions/filters/http/tap/BUILD b/source/extensions/filters/http/tap/BUILD index 53a766186a7cf..2b1929cbf0ad8 100644 --- a/source/extensions/filters/http/tap/BUILD +++ b/source/extensions/filters/http/tap/BUILD @@ -19,7 +19,6 @@ envoy_cc_library( "//include/envoy/buffer:buffer_interface", "//include/envoy/http:header_map_interface", "//source/extensions/common/tap:tap_interface", - "@envoy_api//envoy/service/tap/v2alpha:pkg_cc_proto", ], ) @@ -30,7 +29,9 @@ envoy_cc_library( deps = [ ":tap_config_interface", "//source/extensions/common/tap:tap_config_base", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", "@envoy_api//envoy/data/tap/v2alpha:pkg_cc_proto", + "@envoy_api//envoy/service/tap/v2alpha:pkg_cc_proto", ], ) @@ -60,5 +61,6 @@ envoy_cc_extension( "//source/extensions/filters/http:well_known_names", "//source/extensions/filters/http/common:factory_base_lib", "@envoy_api//envoy/config/filter/http/tap/v2alpha:pkg_cc_proto", + "@envoy_api//envoy/service/tap/v2alpha:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/http/tap/config.cc b/source/extensions/filters/http/tap/config.cc index bd52ef69284f5..35d95e340b992 100644 --- a/source/extensions/filters/http/tap/config.cc +++ b/source/extensions/filters/http/tap/config.cc @@ -1,6 +1,9 @@ #include "extensions/filters/http/tap/config.h" +#include "envoy/config/filter/http/tap/v2alpha/tap.pb.h" +#include "envoy/config/filter/http/tap/v2alpha/tap.pb.validate.h" #include "envoy/registry/registry.h" +#include "envoy/service/tap/v2alpha/common.pb.h" #include "extensions/filters/http/tap/tap_config_impl.h" #include "extensions/filters/http/tap/tap_filter.h" diff --git a/source/extensions/filters/http/tap/tap_config.h b/source/extensions/filters/http/tap/tap_config.h index 041544f363baa..91c437f12936e 100644 --- a/source/extensions/filters/http/tap/tap_config.h +++ b/source/extensions/filters/http/tap/tap_config.h @@ -3,7 +3,6 @@ #include "envoy/buffer/buffer.h" #include "envoy/common/pure.h" #include "envoy/http/header_map.h" -#include "envoy/service/tap/v2alpha/common.pb.h" #include "extensions/common/tap/tap.h" diff --git a/source/extensions/filters/http/tap/tap_config_impl.cc b/source/extensions/filters/http/tap/tap_config_impl.cc index 034b9f5af7dbb..9c7cef9ceaeaa 100644 --- a/source/extensions/filters/http/tap/tap_config_impl.cc +++ b/source/extensions/filters/http/tap/tap_config_impl.cc @@ -1,6 +1,8 @@ #include "extensions/filters/http/tap/tap_config_impl.h" +#include "envoy/api/v2/core/base.pb.h" #include "envoy/data/tap/v2alpha/http.pb.h" +#include "envoy/service/tap/v2alpha/common.pb.h" #include "common/common/assert.h" #include "common/protobuf/protobuf.h" diff --git a/source/extensions/filters/http/tap/tap_config_impl.h b/source/extensions/filters/http/tap/tap_config_impl.h index bc58398a2c6d8..04290595eba7d 100644 --- a/source/extensions/filters/http/tap/tap_config_impl.h +++ b/source/extensions/filters/http/tap/tap_config_impl.h @@ -1,6 +1,9 @@ #pragma once +#include "envoy/data/tap/v2alpha/common.pb.h" +#include "envoy/data/tap/v2alpha/http.pb.h" #include "envoy/http/header_map.h" +#include "envoy/service/tap/v2alpha/common.pb.h" #include "common/common/logger.h" diff --git a/source/extensions/filters/http/tap/tap_filter.cc b/source/extensions/filters/http/tap/tap_filter.cc index aba00bb9734e3..fdcc611ab0d52 100644 --- a/source/extensions/filters/http/tap/tap_filter.cc +++ b/source/extensions/filters/http/tap/tap_filter.cc @@ -1,5 +1,7 @@ #include "extensions/filters/http/tap/tap_filter.h" +#include "envoy/config/filter/http/tap/v2alpha/tap.pb.h" + namespace Envoy { namespace Extensions { namespace HttpFilters { diff --git a/source/extensions/filters/listener/original_src/config.cc b/source/extensions/filters/listener/original_src/config.cc index dc1f524a8262c..305a68e9f57a7 100644 --- a/source/extensions/filters/listener/original_src/config.cc +++ b/source/extensions/filters/listener/original_src/config.cc @@ -1,5 +1,7 @@ #include "extensions/filters/listener/original_src/config.h" +#include "envoy/config/filter/listener/original_src/v2alpha1/original_src.pb.h" + namespace Envoy { namespace Extensions { namespace ListenerFilters { diff --git a/source/extensions/filters/network/client_ssl_auth/client_ssl_auth.cc b/source/extensions/filters/network/client_ssl_auth/client_ssl_auth.cc index 8d5d6703c46b8..884a4e5e4eddc 100644 --- a/source/extensions/filters/network/client_ssl_auth/client_ssl_auth.cc +++ b/source/extensions/filters/network/client_ssl_auth/client_ssl_auth.cc @@ -4,6 +4,7 @@ #include #include +#include "envoy/config/filter/network/client_ssl_auth/v2/client_ssl_auth.pb.h" #include "envoy/network/connection.h" #include "envoy/stats/scope.h" diff --git a/source/extensions/filters/network/client_ssl_auth/config.cc b/source/extensions/filters/network/client_ssl_auth/config.cc index 131bca55d8868..a7b83bed5d445 100644 --- a/source/extensions/filters/network/client_ssl_auth/config.cc +++ b/source/extensions/filters/network/client_ssl_auth/config.cc @@ -1,5 +1,7 @@ #include "extensions/filters/network/client_ssl_auth/config.h" +#include "envoy/config/filter/network/client_ssl_auth/v2/client_ssl_auth.pb.h" +#include "envoy/config/filter/network/client_ssl_auth/v2/client_ssl_auth.pb.validate.h" #include "envoy/network/connection.h" #include "envoy/registry/registry.h" diff --git a/source/extensions/filters/network/client_ssl_auth/config.h b/source/extensions/filters/network/client_ssl_auth/config.h index 003753b54f9af..7cbb2d711a7f0 100644 --- a/source/extensions/filters/network/client_ssl_auth/config.h +++ b/source/extensions/filters/network/client_ssl_auth/config.h @@ -1,5 +1,6 @@ #pragma once +#include "envoy/config/filter/network/client_ssl_auth/v2/client_ssl_auth.pb.h" #include "envoy/config/filter/network/client_ssl_auth/v2/client_ssl_auth.pb.validate.h" #include "extensions/filters/network/common/factory_base.h" diff --git a/source/extensions/filters/network/common/redis/client_impl.cc b/source/extensions/filters/network/common/redis/client_impl.cc index cf1d8b6c98b56..716cdd0dac397 100644 --- a/source/extensions/filters/network/common/redis/client_impl.cc +++ b/source/extensions/filters/network/common/redis/client_impl.cc @@ -1,5 +1,7 @@ #include "extensions/filters/network/common/redis/client_impl.h" +#include "envoy/config/filter/network/redis_proxy/v2/redis_proxy.pb.h" + namespace Envoy { namespace Extensions { namespace NetworkFilters { diff --git a/source/extensions/filters/network/dubbo_proxy/config.cc b/source/extensions/filters/network/dubbo_proxy/config.cc index 249eaa8933f13..154915b0cbd9d 100644 --- a/source/extensions/filters/network/dubbo_proxy/config.cc +++ b/source/extensions/filters/network/dubbo_proxy/config.cc @@ -1,5 +1,7 @@ #include "extensions/filters/network/dubbo_proxy/config.h" +#include "envoy/config/filter/network/dubbo_proxy/v2alpha1/dubbo_proxy.pb.h" +#include "envoy/config/filter/network/dubbo_proxy/v2alpha1/dubbo_proxy.pb.validate.h" #include "envoy/registry/registry.h" #include "common/config/utility.h" diff --git a/source/extensions/filters/network/dubbo_proxy/conn_manager.h b/source/extensions/filters/network/dubbo_proxy/conn_manager.h index b0599cf04ebeb..32a9d8f3b88e3 100644 --- a/source/extensions/filters/network/dubbo_proxy/conn_manager.h +++ b/source/extensions/filters/network/dubbo_proxy/conn_manager.h @@ -2,7 +2,6 @@ #include "envoy/common/time.h" #include "envoy/config/filter/network/dubbo_proxy/v2alpha1/dubbo_proxy.pb.h" -#include "envoy/config/filter/network/dubbo_proxy/v2alpha1/dubbo_proxy.pb.validate.h" #include "envoy/network/connection.h" #include "envoy/network/filter.h" #include "envoy/stats/scope.h" diff --git a/source/extensions/filters/network/dubbo_proxy/dubbo_hessian2_serializer_impl.h b/source/extensions/filters/network/dubbo_proxy/dubbo_hessian2_serializer_impl.h index 5af5e5d59622f..7655d891a5544 100644 --- a/source/extensions/filters/network/dubbo_proxy/dubbo_hessian2_serializer_impl.h +++ b/source/extensions/filters/network/dubbo_proxy/dubbo_hessian2_serializer_impl.h @@ -27,4 +27,4 @@ class DubboHessian2SerializerImpl : public Serializer { } // namespace DubboProxy } // namespace NetworkFilters } // namespace Extensions -} // namespace Envoy \ No newline at end of file +} // namespace Envoy diff --git a/source/extensions/filters/network/dubbo_proxy/hessian_utils.cc b/source/extensions/filters/network/dubbo_proxy/hessian_utils.cc index c9559f1652bec..c6c5b3654bda4 100644 --- a/source/extensions/filters/network/dubbo_proxy/hessian_utils.cc +++ b/source/extensions/filters/network/dubbo_proxy/hessian_utils.cc @@ -576,4 +576,4 @@ size_t HessianUtils::writeInt(Buffer::Instance& buffer, uint8_t value) { } // namespace DubboProxy } // namespace NetworkFilters } // namespace Extensions -} // namespace Envoy \ No newline at end of file +} // namespace Envoy diff --git a/source/extensions/filters/network/dubbo_proxy/router/BUILD b/source/extensions/filters/network/dubbo_proxy/router/BUILD index 3c2aa4501c182..83808c43ffad4 100644 --- a/source/extensions/filters/network/dubbo_proxy/router/BUILD +++ b/source/extensions/filters/network/dubbo_proxy/router/BUILD @@ -44,7 +44,9 @@ envoy_cc_library( "//source/common/protobuf:utility_lib", "//source/extensions/filters/network/dubbo_proxy:metadata_lib", "//source/extensions/filters/network/dubbo_proxy:serializer_interface", + "@envoy_api//envoy/api/v2/route:pkg_cc_proto", "@envoy_api//envoy/config/filter/network/dubbo_proxy/v2alpha1:pkg_cc_proto", + "@envoy_api//envoy/type:pkg_cc_proto", ], ) @@ -80,6 +82,5 @@ envoy_cc_library( "//source/extensions/filters/network/dubbo_proxy:protocol_interface", "//source/extensions/filters/network/dubbo_proxy:serializer_interface", "//source/extensions/filters/network/dubbo_proxy/filters:filter_interface", - "@envoy_api//envoy/config/filter/network/dubbo_proxy/v2alpha1:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/network/dubbo_proxy/router/config.cc b/source/extensions/filters/network/dubbo_proxy/router/config.cc index a362dc7c86f30..74db64229dfb8 100644 --- a/source/extensions/filters/network/dubbo_proxy/router/config.cc +++ b/source/extensions/filters/network/dubbo_proxy/router/config.cc @@ -1,5 +1,7 @@ #include "extensions/filters/network/dubbo_proxy/router/config.h" +#include "envoy/config/filter/dubbo/router/v2alpha1/router.pb.h" +#include "envoy/config/filter/dubbo/router/v2alpha1/router.pb.validate.h" #include "envoy/registry/registry.h" #include "extensions/filters/network/dubbo_proxy/router/router_impl.h" diff --git a/source/extensions/filters/network/dubbo_proxy/router/route_matcher.cc b/source/extensions/filters/network/dubbo_proxy/router/route_matcher.cc index 0fcbabd4765e0..90bf6427ecd47 100644 --- a/source/extensions/filters/network/dubbo_proxy/router/route_matcher.cc +++ b/source/extensions/filters/network/dubbo_proxy/router/route_matcher.cc @@ -1,7 +1,7 @@ #include "extensions/filters/network/dubbo_proxy/router/route_matcher.h" -#include "envoy/config/filter/network/dubbo_proxy/v2alpha1/dubbo_proxy.pb.h" -#include "envoy/config/filter/network/dubbo_proxy/v2alpha1/route.pb.validate.h" +#include "envoy/api/v2/route/route.pb.h" +#include "envoy/config/filter/network/dubbo_proxy/v2alpha1/route.pb.h" #include "common/protobuf/utility.h" diff --git a/source/extensions/filters/network/dubbo_proxy/router/route_matcher.h b/source/extensions/filters/network/dubbo_proxy/router/route_matcher.h index 5414f511f3786..02ab9c57d024b 100644 --- a/source/extensions/filters/network/dubbo_proxy/router/route_matcher.h +++ b/source/extensions/filters/network/dubbo_proxy/router/route_matcher.h @@ -4,8 +4,9 @@ #include #include -#include "envoy/config/filter/network/dubbo_proxy/v2alpha1/dubbo_proxy.pb.h" +#include "envoy/api/v2/route/route.pb.h" #include "envoy/config/filter/network/dubbo_proxy/v2alpha1/route.pb.h" +#include "envoy/type/range.pb.h" #include "common/common/logger.h" #include "common/common/matchers.h" diff --git a/source/extensions/filters/network/dubbo_proxy/router/router_impl.cc b/source/extensions/filters/network/dubbo_proxy/router/router_impl.cc index 6b668af7c6049..ec26e3fb70e37 100644 --- a/source/extensions/filters/network/dubbo_proxy/router/router_impl.cc +++ b/source/extensions/filters/network/dubbo_proxy/router/router_impl.cc @@ -1,6 +1,5 @@ #include "extensions/filters/network/dubbo_proxy/router/router_impl.h" -#include "envoy/config/filter/network/dubbo_proxy/v2alpha1/dubbo_proxy.pb.h" #include "envoy/upstream/cluster_manager.h" #include "envoy/upstream/thread_local_cluster.h" diff --git a/source/extensions/filters/network/dubbo_proxy/serializer_impl.h b/source/extensions/filters/network/dubbo_proxy/serializer_impl.h index e5ddae675dc89..983843c6f7fe2 100644 --- a/source/extensions/filters/network/dubbo_proxy/serializer_impl.h +++ b/source/extensions/filters/network/dubbo_proxy/serializer_impl.h @@ -61,4 +61,4 @@ class RpcResultImpl : public RpcResult { } // namespace DubboProxy } // namespace NetworkFilters } // namespace Extensions -} // namespace Envoy \ No newline at end of file +} // namespace Envoy diff --git a/source/extensions/filters/network/ext_authz/BUILD b/source/extensions/filters/network/ext_authz/BUILD index 68b53f7dbdbac..62a27388b5b45 100644 --- a/source/extensions/filters/network/ext_authz/BUILD +++ b/source/extensions/filters/network/ext_authz/BUILD @@ -27,6 +27,7 @@ envoy_cc_library( "//source/extensions/filters/common/ext_authz:ext_authz_grpc_lib", "//source/extensions/filters/common/ext_authz:ext_authz_interface", "@envoy_api//envoy/config/filter/network/ext_authz/v2:pkg_cc_proto", + "@envoy_api//envoy/service/auth/v2:pkg_cc_proto", ], ) @@ -41,6 +42,7 @@ envoy_cc_extension( "//source/extensions/filters/network:well_known_names", "//source/extensions/filters/network/common:factory_base_lib", "//source/extensions/filters/network/ext_authz", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", "@envoy_api//envoy/config/filter/network/ext_authz/v2:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/network/ext_authz/config.cc b/source/extensions/filters/network/ext_authz/config.cc index a4e383538813e..68127be21bf5d 100644 --- a/source/extensions/filters/network/ext_authz/config.cc +++ b/source/extensions/filters/network/ext_authz/config.cc @@ -3,6 +3,8 @@ #include #include +#include "envoy/api/v2/core/grpc_service.pb.h" +#include "envoy/config/filter/network/ext_authz/v2/ext_authz.pb.h" #include "envoy/config/filter/network/ext_authz/v2/ext_authz.pb.validate.h" #include "envoy/network/connection.h" #include "envoy/registry/registry.h" diff --git a/source/extensions/filters/network/ext_authz/ext_authz.h b/source/extensions/filters/network/ext_authz/ext_authz.h index 80743c6782128..5cc4cf3f64268 100644 --- a/source/extensions/filters/network/ext_authz/ext_authz.h +++ b/source/extensions/filters/network/ext_authz/ext_authz.h @@ -9,6 +9,7 @@ #include "envoy/network/connection.h" #include "envoy/network/filter.h" #include "envoy/runtime/runtime.h" +#include "envoy/service/auth/v2/external_auth.pb.h" #include "envoy/stats/scope.h" #include "envoy/stats/stats_macros.h" #include "envoy/upstream/cluster_manager.h" diff --git a/source/extensions/filters/network/http_connection_manager/BUILD b/source/extensions/filters/network/http_connection_manager/BUILD index 7707a7ef46a9b..bcc676feed09a 100644 --- a/source/extensions/filters/network/http_connection_manager/BUILD +++ b/source/extensions/filters/network/http_connection_manager/BUILD @@ -42,6 +42,9 @@ envoy_cc_extension( "//source/common/tracing:http_tracer_lib", "//source/extensions/filters/network:well_known_names", "//source/extensions/filters/network/common:factory_base_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto", + "@envoy_api//envoy/type:pkg_cc_proto", + "@envoy_api//envoy/type/tracing/v2:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/network/http_connection_manager/config.cc b/source/extensions/filters/network/http_connection_manager/config.cc index 6ac9f27a5e394..f5662dda813e6 100644 --- a/source/extensions/filters/network/http_connection_manager/config.cc +++ b/source/extensions/filters/network/http_connection_manager/config.cc @@ -5,10 +5,14 @@ #include #include +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.h" #include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.validate.h" #include "envoy/filesystem/filesystem.h" #include "envoy/server/admin.h" #include "envoy/tracing/http_tracer.h" +#include "envoy/type/percent.pb.h" +#include "envoy/type/tracing/v2/custom_tag.pb.h" #include "common/access_log/access_log_impl.h" #include "common/common/fmt.h" diff --git a/source/extensions/filters/network/http_connection_manager/config.h b/source/extensions/filters/network/http_connection_manager/config.h index 4bce5086ad2bc..4e11003a4c496 100644 --- a/source/extensions/filters/network/http_connection_manager/config.h +++ b/source/extensions/filters/network/http_connection_manager/config.h @@ -8,6 +8,7 @@ #include #include "envoy/config/config_provider_manager.h" +#include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.h" #include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.validate.h" #include "envoy/http/filter.h" #include "envoy/router/route_config_provider_manager.h" diff --git a/source/extensions/filters/network/mongo_proxy/BUILD b/source/extensions/filters/network/mongo_proxy/BUILD index 7ac9ea6095b5c..7e5c55fb1c20b 100644 --- a/source/extensions/filters/network/mongo_proxy/BUILD +++ b/source/extensions/filters/network/mongo_proxy/BUILD @@ -79,7 +79,6 @@ envoy_cc_library( "//source/common/singleton:const_singleton", "//source/extensions/filters/common/fault:fault_config_lib", "//source/extensions/filters/network:well_known_names", - "@envoy_api//envoy/config/filter/network/mongo_proxy/v2:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/network/mongo_proxy/config.cc b/source/extensions/filters/network/mongo_proxy/config.cc index ad3a5efea0171..db8f0593f8bf5 100644 --- a/source/extensions/filters/network/mongo_proxy/config.cc +++ b/source/extensions/filters/network/mongo_proxy/config.cc @@ -1,5 +1,6 @@ #include "extensions/filters/network/mongo_proxy/config.h" +#include "envoy/config/filter/network/mongo_proxy/v2/mongo_proxy.pb.h" #include "envoy/config/filter/network/mongo_proxy/v2/mongo_proxy.pb.validate.h" #include "envoy/network/connection.h" #include "envoy/registry/registry.h" diff --git a/source/extensions/filters/network/mongo_proxy/proxy.h b/source/extensions/filters/network/mongo_proxy/proxy.h index da85af19f2817..0da6146f418e8 100644 --- a/source/extensions/filters/network/mongo_proxy/proxy.h +++ b/source/extensions/filters/network/mongo_proxy/proxy.h @@ -8,7 +8,6 @@ #include "envoy/access_log/access_log.h" #include "envoy/common/time.h" -#include "envoy/config/filter/network/mongo_proxy/v2/mongo_proxy.pb.h" #include "envoy/event/timer.h" #include "envoy/network/connection.h" #include "envoy/network/drain_decision.h" diff --git a/source/extensions/filters/network/mysql_proxy/BUILD b/source/extensions/filters/network/mysql_proxy/BUILD index a39085adfcd0e..4637fb51542a7 100644 --- a/source/extensions/filters/network/mysql_proxy/BUILD +++ b/source/extensions/filters/network/mysql_proxy/BUILD @@ -45,6 +45,7 @@ envoy_cc_library( "//source/common/buffer:buffer_lib", "//source/common/network:filter_lib", "//source/extensions/filters/network:well_known_names", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/network/mysql_proxy/mysql_config.cc b/source/extensions/filters/network/mysql_proxy/mysql_config.cc index 30ec557c2ef1f..3f47e243ecce9 100644 --- a/source/extensions/filters/network/mysql_proxy/mysql_config.cc +++ b/source/extensions/filters/network/mysql_proxy/mysql_config.cc @@ -2,6 +2,7 @@ #include +#include "envoy/config/filter/network/mysql_proxy/v1alpha1/mysql_proxy.pb.h" #include "envoy/config/filter/network/mysql_proxy/v1alpha1/mysql_proxy.pb.validate.h" #include "envoy/registry/registry.h" #include "envoy/server/filter_config.h" diff --git a/source/extensions/filters/network/mysql_proxy/mysql_filter.cc b/source/extensions/filters/network/mysql_proxy/mysql_filter.cc index e91a87ef59e8a..13b4d174d949e 100644 --- a/source/extensions/filters/network/mysql_proxy/mysql_filter.cc +++ b/source/extensions/filters/network/mysql_proxy/mysql_filter.cc @@ -1,5 +1,7 @@ #include "extensions/filters/network/mysql_proxy/mysql_filter.h" +#include "envoy/api/v2/core/base.pb.h" + #include "common/buffer/buffer_impl.h" #include "common/common/assert.h" #include "common/common/logger.h" diff --git a/source/extensions/filters/network/ratelimit/config.cc b/source/extensions/filters/network/ratelimit/config.cc index 421b9a766bb8a..f2df934a2a71e 100644 --- a/source/extensions/filters/network/ratelimit/config.cc +++ b/source/extensions/filters/network/ratelimit/config.cc @@ -3,6 +3,7 @@ #include #include +#include "envoy/config/filter/network/rate_limit/v2/rate_limit.pb.h" #include "envoy/config/filter/network/rate_limit/v2/rate_limit.pb.validate.h" #include "envoy/registry/registry.h" diff --git a/source/extensions/filters/network/ratelimit/ratelimit.cc b/source/extensions/filters/network/ratelimit/ratelimit.cc index 746b2664f2104..502f63199bf52 100644 --- a/source/extensions/filters/network/ratelimit/ratelimit.cc +++ b/source/extensions/filters/network/ratelimit/ratelimit.cc @@ -3,6 +3,7 @@ #include #include +#include "envoy/config/filter/network/rate_limit/v2/rate_limit.pb.h" #include "envoy/stats/scope.h" #include "common/common/fmt.h" diff --git a/source/extensions/filters/network/rbac/BUILD b/source/extensions/filters/network/rbac/BUILD index f1f202df90cfc..f3149e8486ff4 100644 --- a/source/extensions/filters/network/rbac/BUILD +++ b/source/extensions/filters/network/rbac/BUILD @@ -21,6 +21,7 @@ envoy_cc_extension( "//source/extensions/filters/network:well_known_names", "//source/extensions/filters/network/common:factory_base_lib", "@envoy_api//envoy/config/filter/network/rbac/v2:pkg_cc_proto", + "@envoy_api//envoy/config/rbac/v2:pkg_cc_proto", ], ) @@ -36,5 +37,6 @@ envoy_cc_library( "//source/extensions/filters/common/rbac:engine_lib", "//source/extensions/filters/common/rbac:utility_lib", "//source/extensions/filters/network:well_known_names", + "@envoy_api//envoy/config/filter/network/rbac/v2:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/network/rbac/config.cc b/source/extensions/filters/network/rbac/config.cc index 9605496bcc2d7..d377a05159b4d 100644 --- a/source/extensions/filters/network/rbac/config.cc +++ b/source/extensions/filters/network/rbac/config.cc @@ -1,5 +1,8 @@ #include "extensions/filters/network/rbac/config.h" +#include "envoy/config/filter/network/rbac/v2/rbac.pb.h" +#include "envoy/config/filter/network/rbac/v2/rbac.pb.validate.h" +#include "envoy/config/rbac/v2/rbac.pb.h" #include "envoy/network/connection.h" #include "envoy/registry/registry.h" diff --git a/source/extensions/filters/network/rbac/rbac_filter.cc b/source/extensions/filters/network/rbac/rbac_filter.cc index 9bc369f246dcd..b0337677d39c0 100644 --- a/source/extensions/filters/network/rbac/rbac_filter.cc +++ b/source/extensions/filters/network/rbac/rbac_filter.cc @@ -1,6 +1,7 @@ #include "extensions/filters/network/rbac/rbac_filter.h" #include "envoy/buffer/buffer.h" +#include "envoy/config/filter/network/rbac/v2/rbac.pb.h" #include "envoy/network/connection.h" #include "extensions/filters/network/well_known_names.h" diff --git a/source/extensions/filters/network/rbac/rbac_filter.h b/source/extensions/filters/network/rbac/rbac_filter.h index a42214004c5c6..d0e2ed6122f97 100644 --- a/source/extensions/filters/network/rbac/rbac_filter.h +++ b/source/extensions/filters/network/rbac/rbac_filter.h @@ -1,5 +1,6 @@ #pragma once +#include "envoy/config/filter/network/rbac/v2/rbac.pb.h" #include "envoy/network/connection.h" #include "envoy/network/filter.h" #include "envoy/stats/stats_macros.h" diff --git a/source/extensions/filters/network/redis_proxy/BUILD b/source/extensions/filters/network/redis_proxy/BUILD index 0331264fe4960..e3b6cbd3ada26 100644 --- a/source/extensions/filters/network/redis_proxy/BUILD +++ b/source/extensions/filters/network/redis_proxy/BUILD @@ -28,6 +28,7 @@ envoy_cc_library( "//source/common/config:datasource_lib", "//source/extensions/filters/network:well_known_names", "//source/extensions/filters/network/common:factory_base_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", "@envoy_api//envoy/config/filter/network/redis_proxy/v2:pkg_cc_proto", ], ) @@ -45,10 +46,7 @@ envoy_cc_library( envoy_cc_library( name = "router_interface", hdrs = ["router.h"], - deps = [ - ":conn_pool_interface", - "@envoy_api//envoy/config/filter/network/redis_proxy/v2:pkg_cc_proto", - ], + deps = [":conn_pool_interface"], ) envoy_cc_library( @@ -93,6 +91,8 @@ envoy_cc_library( "//source/extensions/common/redis:redirection_mgr_interface", "//source/extensions/filters/network/common/redis:client_lib", "//source/extensions/filters/network/common/redis:utility_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/api/v2/endpoint:pkg_cc_proto", "@envoy_api//envoy/config/filter/network/redis_proxy/v2:pkg_cc_proto", ], ) @@ -131,6 +131,7 @@ envoy_cc_extension( "//source/extensions/filters/network/redis_proxy:conn_pool_lib", "//source/extensions/filters/network/redis_proxy:proxy_filter_lib", "//source/extensions/filters/network/redis_proxy:router_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", "@envoy_api//envoy/config/filter/network/redis_proxy/v2:pkg_cc_proto", ], ) @@ -149,5 +150,6 @@ envoy_cc_library( "//source/extensions/filters/network/common/redis:utility_lib", "//source/extensions/filters/network/redis_proxy:conn_pool_lib", "@envoy_api//envoy/config/filter/network/redis_proxy/v2:pkg_cc_proto", + "@envoy_api//envoy/type:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/network/redis_proxy/config.cc b/source/extensions/filters/network/redis_proxy/config.cc index 82037bdb34106..b2e57a61f88ff 100644 --- a/source/extensions/filters/network/redis_proxy/config.cc +++ b/source/extensions/filters/network/redis_proxy/config.cc @@ -1,5 +1,8 @@ #include "extensions/filters/network/redis_proxy/config.h" +#include "envoy/config/filter/network/redis_proxy/v2/redis_proxy.pb.h" +#include "envoy/config/filter/network/redis_proxy/v2/redis_proxy.pb.validate.h" + #include "extensions/common/redis/redirection_mgr_impl.h" #include "extensions/filters/network/common/redis/client_impl.h" #include "extensions/filters/network/redis_proxy/command_splitter_impl.h" diff --git a/source/extensions/filters/network/redis_proxy/config.h b/source/extensions/filters/network/redis_proxy/config.h index 367d1ed0980f7..d8af1cbbfb550 100644 --- a/source/extensions/filters/network/redis_proxy/config.h +++ b/source/extensions/filters/network/redis_proxy/config.h @@ -3,6 +3,7 @@ #include #include "envoy/api/api.h" +#include "envoy/api/v2/core/base.pb.h" #include "envoy/config/filter/network/redis_proxy/v2/redis_proxy.pb.h" #include "envoy/config/filter/network/redis_proxy/v2/redis_proxy.pb.validate.h" #include "envoy/upstream/upstream.h" diff --git a/source/extensions/filters/network/redis_proxy/conn_pool_impl.cc b/source/extensions/filters/network/redis_proxy/conn_pool_impl.cc index 96b1e5ed19074..fef3d071df4c6 100644 --- a/source/extensions/filters/network/redis_proxy/conn_pool_impl.cc +++ b/source/extensions/filters/network/redis_proxy/conn_pool_impl.cc @@ -5,6 +5,12 @@ #include #include +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/api/v2/core/health_check.pb.h" +#include "envoy/api/v2/endpoint/endpoint.pb.h" +#include "envoy/config/filter/network/redis_proxy/v2/redis_proxy.pb.h" +#include "envoy/config/filter/network/redis_proxy/v2/redis_proxy.pb.validate.h" + #include "common/common/assert.h" #include "common/stats/utility.h" diff --git a/source/extensions/filters/network/redis_proxy/proxy_filter.cc b/source/extensions/filters/network/redis_proxy/proxy_filter.cc index 58628bab6f624..221fc806a6c72 100644 --- a/source/extensions/filters/network/redis_proxy/proxy_filter.cc +++ b/source/extensions/filters/network/redis_proxy/proxy_filter.cc @@ -3,6 +3,7 @@ #include #include +#include "envoy/config/filter/network/redis_proxy/v2/redis_proxy.pb.h" #include "envoy/stats/scope.h" #include "common/common/assert.h" diff --git a/source/extensions/filters/network/redis_proxy/router.h b/source/extensions/filters/network/redis_proxy/router.h index 337261945bebf..d1090be1ed8d4 100644 --- a/source/extensions/filters/network/redis_proxy/router.h +++ b/source/extensions/filters/network/redis_proxy/router.h @@ -5,7 +5,6 @@ #include #include "envoy/common/pure.h" -#include "envoy/config/filter/network/redis_proxy/v2/redis_proxy.pb.h" #include "extensions/filters/network/redis_proxy/conn_pool.h" diff --git a/source/extensions/filters/network/redis_proxy/router_impl.cc b/source/extensions/filters/network/redis_proxy/router_impl.cc index 78fabf8840adc..a5265a5e85df7 100644 --- a/source/extensions/filters/network/redis_proxy/router_impl.cc +++ b/source/extensions/filters/network/redis_proxy/router_impl.cc @@ -1,5 +1,8 @@ #include "extensions/filters/network/redis_proxy/router_impl.h" +#include "envoy/config/filter/network/redis_proxy/v2/redis_proxy.pb.h" +#include "envoy/type/percent.pb.h" + namespace Envoy { namespace Extensions { namespace NetworkFilters { diff --git a/source/extensions/filters/network/redis_proxy/router_impl.h b/source/extensions/filters/network/redis_proxy/router_impl.h index bf9e929a80052..b46cb22c435df 100644 --- a/source/extensions/filters/network/redis_proxy/router_impl.h +++ b/source/extensions/filters/network/redis_proxy/router_impl.h @@ -10,6 +10,7 @@ #include "envoy/config/filter/network/redis_proxy/v2/redis_proxy.pb.h" #include "envoy/runtime/runtime.h" #include "envoy/thread_local/thread_local.h" +#include "envoy/type/percent.pb.h" #include "envoy/upstream/cluster_manager.h" #include "common/common/to_lower_table.h" diff --git a/source/extensions/filters/network/tcp_proxy/config.cc b/source/extensions/filters/network/tcp_proxy/config.cc index e75d8c10d25e1..f8a1ad91a14c6 100644 --- a/source/extensions/filters/network/tcp_proxy/config.cc +++ b/source/extensions/filters/network/tcp_proxy/config.cc @@ -1,5 +1,7 @@ #include "extensions/filters/network/tcp_proxy/config.h" +#include "envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.pb.h" +#include "envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.pb.validate.h" #include "envoy/registry/registry.h" #include "common/tcp_proxy/tcp_proxy.h" diff --git a/source/extensions/filters/network/tcp_proxy/config.h b/source/extensions/filters/network/tcp_proxy/config.h index e034cfc160f6f..13c6571e359e1 100644 --- a/source/extensions/filters/network/tcp_proxy/config.h +++ b/source/extensions/filters/network/tcp_proxy/config.h @@ -1,5 +1,6 @@ #pragma once +#include "envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.pb.h" #include "envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.pb.validate.h" #include "extensions/filters/network/common/factory_base.h" diff --git a/source/extensions/filters/network/thrift_proxy/config.cc b/source/extensions/filters/network/thrift_proxy/config.cc index 88c8adff441b9..25ecd6e78e402 100644 --- a/source/extensions/filters/network/thrift_proxy/config.cc +++ b/source/extensions/filters/network/thrift_proxy/config.cc @@ -3,6 +3,8 @@ #include #include +#include "envoy/config/filter/network/thrift_proxy/v2alpha1/thrift_proxy.pb.h" +#include "envoy/config/filter/network/thrift_proxy/v2alpha1/thrift_proxy.pb.validate.h" #include "envoy/network/connection.h" #include "envoy/registry/registry.h" diff --git a/source/extensions/filters/network/thrift_proxy/filters/ratelimit/config.cc b/source/extensions/filters/network/thrift_proxy/filters/ratelimit/config.cc index 98a4efcd9d6b4..81531193d3b90 100644 --- a/source/extensions/filters/network/thrift_proxy/filters/ratelimit/config.cc +++ b/source/extensions/filters/network/thrift_proxy/filters/ratelimit/config.cc @@ -3,6 +3,7 @@ #include #include +#include "envoy/config/filter/thrift/rate_limit/v2alpha1/rate_limit.pb.h" #include "envoy/config/filter/thrift/rate_limit/v2alpha1/rate_limit.pb.validate.h" #include "envoy/registry/registry.h" diff --git a/source/extensions/filters/network/thrift_proxy/router/config.cc b/source/extensions/filters/network/thrift_proxy/router/config.cc index 312f8143b445e..88b11a357da2c 100644 --- a/source/extensions/filters/network/thrift_proxy/router/config.cc +++ b/source/extensions/filters/network/thrift_proxy/router/config.cc @@ -1,5 +1,7 @@ #include "extensions/filters/network/thrift_proxy/router/config.h" +#include "envoy/config/filter/thrift/router/v2alpha1/router.pb.h" +#include "envoy/config/filter/thrift/router/v2alpha1/router.pb.validate.h" #include "envoy/registry/registry.h" #include "extensions/filters/network/thrift_proxy/router/router_impl.h" diff --git a/source/extensions/filters/network/thrift_proxy/router/router_impl.cc b/source/extensions/filters/network/thrift_proxy/router/router_impl.cc index d7de50a5d6655..606dfa88516d5 100644 --- a/source/extensions/filters/network/thrift_proxy/router/router_impl.cc +++ b/source/extensions/filters/network/thrift_proxy/router/router_impl.cc @@ -2,7 +2,7 @@ #include -#include "envoy/config/filter/network/thrift_proxy/v2alpha1/thrift_proxy.pb.h" +#include "envoy/config/filter/network/thrift_proxy/v2alpha1/route.pb.h" #include "envoy/upstream/cluster_manager.h" #include "envoy/upstream/thread_local_cluster.h" diff --git a/source/extensions/filters/network/thrift_proxy/router/router_impl.h b/source/extensions/filters/network/thrift_proxy/router/router_impl.h index 14f6e310a7336..f20ee665abe2b 100644 --- a/source/extensions/filters/network/thrift_proxy/router/router_impl.h +++ b/source/extensions/filters/network/thrift_proxy/router/router_impl.h @@ -4,7 +4,7 @@ #include #include -#include "envoy/config/filter/network/thrift_proxy/v2alpha1/thrift_proxy.pb.h" +#include "envoy/config/filter/network/thrift_proxy/v2alpha1/route.pb.h" #include "envoy/router/router.h" #include "envoy/stats/scope.h" #include "envoy/stats/stats_macros.h" diff --git a/source/extensions/filters/network/thrift_proxy/router/router_ratelimit_impl.cc b/source/extensions/filters/network/thrift_proxy/router/router_ratelimit_impl.cc index a9b2b1196f16c..847de6ed4fead 100644 --- a/source/extensions/filters/network/thrift_proxy/router/router_ratelimit_impl.cc +++ b/source/extensions/filters/network/thrift_proxy/router/router_ratelimit_impl.cc @@ -1,5 +1,6 @@ #include "extensions/filters/network/thrift_proxy/router/router_ratelimit_impl.h" +#include "envoy/api/v2/route/route.pb.h" #include "envoy/common/exception.h" #include "envoy/ratelimit/ratelimit.h" diff --git a/source/extensions/filters/network/zookeeper_proxy/BUILD b/source/extensions/filters/network/zookeeper_proxy/BUILD index 66290d5def545..5bc50bfaa8a38 100644 --- a/source/extensions/filters/network/zookeeper_proxy/BUILD +++ b/source/extensions/filters/network/zookeeper_proxy/BUILD @@ -35,6 +35,7 @@ envoy_cc_library( "//source/common/stats:symbol_table_lib", "//source/common/stats:utility_lib", "//source/extensions/filters/network:well_known_names", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/network/zookeeper_proxy/config.cc b/source/extensions/filters/network/zookeeper_proxy/config.cc index 8caecadb2148d..ef3d5be585a33 100644 --- a/source/extensions/filters/network/zookeeper_proxy/config.cc +++ b/source/extensions/filters/network/zookeeper_proxy/config.cc @@ -2,6 +2,7 @@ #include +#include "envoy/config/filter/network/zookeeper_proxy/v1alpha1/zookeeper_proxy.pb.h" #include "envoy/config/filter/network/zookeeper_proxy/v1alpha1/zookeeper_proxy.pb.validate.h" #include "envoy/registry/registry.h" #include "envoy/server/filter_config.h" diff --git a/source/extensions/filters/network/zookeeper_proxy/filter.cc b/source/extensions/filters/network/zookeeper_proxy/filter.cc index bcacd5b44f88a..277d445085a77 100644 --- a/source/extensions/filters/network/zookeeper_proxy/filter.cc +++ b/source/extensions/filters/network/zookeeper_proxy/filter.cc @@ -3,6 +3,8 @@ #include #include +#include "envoy/api/v2/core/base.pb.h" + #include "common/buffer/buffer_impl.h" #include "common/common/assert.h" #include "common/common/enum_to_int.h" diff --git a/source/extensions/filters/udp/udp_proxy/config.cc b/source/extensions/filters/udp/udp_proxy/config.cc index 43324d8ced9a1..38bd4aec6e6bc 100644 --- a/source/extensions/filters/udp/udp_proxy/config.cc +++ b/source/extensions/filters/udp/udp_proxy/config.cc @@ -1,5 +1,7 @@ #include "extensions/filters/udp/udp_proxy/config.h" +#include "envoy/config/filter/udp/udp_proxy/v2alpha/udp_proxy.pb.validate.h" + namespace Envoy { namespace Extensions { namespace UdpFilters { diff --git a/source/extensions/grpc_credentials/aws_iam/config.cc b/source/extensions/grpc_credentials/aws_iam/config.cc index b711f4a844279..dbc637ce21269 100644 --- a/source/extensions/grpc_credentials/aws_iam/config.cc +++ b/source/extensions/grpc_credentials/aws_iam/config.cc @@ -2,6 +2,7 @@ #include "envoy/api/v2/core/grpc_service.pb.h" #include "envoy/common/exception.h" +#include "envoy/config/grpc_credential/v2alpha/aws_iam.pb.h" #include "envoy/config/grpc_credential/v2alpha/aws_iam.pb.validate.h" #include "envoy/grpc/google_grpc_creds.h" #include "envoy/registry/registry.h" diff --git a/source/extensions/grpc_credentials/aws_iam/config.h b/source/extensions/grpc_credentials/aws_iam/config.h index 3682a8603b8d7..68eae7fb9a891 100644 --- a/source/extensions/grpc_credentials/aws_iam/config.h +++ b/source/extensions/grpc_credentials/aws_iam/config.h @@ -1,6 +1,7 @@ #pragma once -#include "envoy/config/grpc_credential/v2alpha/aws_iam.pb.validate.h" +#include "envoy/api/v2/core/grpc_service.pb.h" +#include "envoy/config/grpc_credential/v2alpha/aws_iam.pb.h" #include "envoy/grpc/google_grpc_creds.h" #include "envoy/http/header_map.h" diff --git a/source/extensions/grpc_credentials/example/config.h b/source/extensions/grpc_credentials/example/config.h index f10557a30a557..17d3cf6da0018 100644 --- a/source/extensions/grpc_credentials/example/config.h +++ b/source/extensions/grpc_credentials/example/config.h @@ -1,5 +1,6 @@ #pragma once +#include "envoy/api/v2/core/grpc_service.pb.h" #include "envoy/grpc/google_grpc_creds.h" #include "extensions/grpc_credentials/well_known_names.h" diff --git a/source/extensions/grpc_credentials/file_based_metadata/config.cc b/source/extensions/grpc_credentials/file_based_metadata/config.cc index a5ea52a0c9236..b697b2ffb7952 100644 --- a/source/extensions/grpc_credentials/file_based_metadata/config.cc +++ b/source/extensions/grpc_credentials/file_based_metadata/config.cc @@ -1,6 +1,7 @@ #include "extensions/grpc_credentials/file_based_metadata/config.h" #include "envoy/api/v2/core/grpc_service.pb.h" +#include "envoy/config/grpc_credential/v2alpha/file_based_metadata.pb.h" #include "envoy/config/grpc_credential/v2alpha/file_based_metadata.pb.validate.h" #include "envoy/grpc/google_grpc_creds.h" #include "envoy/registry/registry.h" diff --git a/source/extensions/grpc_credentials/file_based_metadata/config.h b/source/extensions/grpc_credentials/file_based_metadata/config.h index 961688d1db31e..18dd7cba48bab 100644 --- a/source/extensions/grpc_credentials/file_based_metadata/config.h +++ b/source/extensions/grpc_credentials/file_based_metadata/config.h @@ -1,5 +1,6 @@ #pragma once +#include "envoy/api/v2/core/grpc_service.pb.h" #include "envoy/config/grpc_credential/v2alpha/file_based_metadata.pb.h" #include "envoy/grpc/google_grpc_creds.h" diff --git a/source/extensions/health_checkers/redis/BUILD b/source/extensions/health_checkers/redis/BUILD index ad7e4b9635286..b2bd340e5203b 100644 --- a/source/extensions/health_checkers/redis/BUILD +++ b/source/extensions/health_checkers/redis/BUILD @@ -20,7 +20,10 @@ envoy_cc_library( "//source/extensions/filters/network/common/redis:client_lib", "//source/extensions/filters/network/redis_proxy:config", "//source/extensions/filters/network/redis_proxy:conn_pool_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/config/filter/network/redis_proxy/v2:pkg_cc_proto", "@envoy_api//envoy/config/health_checker/redis/v2:pkg_cc_proto", + "@envoy_api//envoy/data/core/v2alpha:pkg_cc_proto", ], ) @@ -36,6 +39,9 @@ envoy_cc_extension( "//include/envoy/server:health_checker_config_interface", "//source/common/common:assert_lib", "//source/extensions/health_checkers:well_known_names", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/config/filter/network/redis_proxy/v2:pkg_cc_proto", + "@envoy_api//envoy/config/health_checker/redis/v2:pkg_cc_proto", ], ) diff --git a/source/extensions/health_checkers/redis/config.cc b/source/extensions/health_checkers/redis/config.cc index a3bdb6eab6ded..7d8ce8b653ade 100644 --- a/source/extensions/health_checkers/redis/config.cc +++ b/source/extensions/health_checkers/redis/config.cc @@ -1,5 +1,8 @@ #include "extensions/health_checkers/redis/config.h" +#include "envoy/api/v2/core/health_check.pb.h" +#include "envoy/config/filter/network/redis_proxy/v2/redis_proxy.pb.validate.h" +#include "envoy/config/health_checker/redis/v2/redis.pb.validate.h" #include "envoy/registry/registry.h" #include "common/config/utility.h" diff --git a/source/extensions/health_checkers/redis/config.h b/source/extensions/health_checkers/redis/config.h index 534496050c057..ab324e5e52a91 100644 --- a/source/extensions/health_checkers/redis/config.h +++ b/source/extensions/health_checkers/redis/config.h @@ -1,5 +1,7 @@ #pragma once +#include "envoy/api/v2/core/health_check.pb.h" +#include "envoy/config/filter/network/redis_proxy/v2/redis_proxy.pb.validate.h" #include "envoy/server/health_checker_config.h" #include "extensions/health_checkers/redis/redis.h" @@ -25,4 +27,4 @@ class RedisHealthCheckerFactory : public Server::Configuration::CustomHealthChec } // namespace RedisHealthChecker } // namespace HealthCheckers } // namespace Extensions -} // namespace Envoy \ No newline at end of file +} // namespace Envoy diff --git a/source/extensions/health_checkers/redis/redis.cc b/source/extensions/health_checkers/redis/redis.cc index 0ba52b6dbd4fe..1d7506a99dbec 100644 --- a/source/extensions/health_checkers/redis/redis.cc +++ b/source/extensions/health_checkers/redis/redis.cc @@ -1,5 +1,10 @@ #include "extensions/health_checkers/redis/redis.h" +#include "envoy/api/v2/core/health_check.pb.h" +#include "envoy/config/filter/network/redis_proxy/v2/redis_proxy.pb.validate.h" +#include "envoy/config/health_checker/redis/v2/redis.pb.h" +#include "envoy/data/core/v2alpha/health_check_event.pb.h" + namespace Envoy { namespace Extensions { namespace HealthCheckers { diff --git a/source/extensions/health_checkers/redis/redis.h b/source/extensions/health_checkers/redis/redis.h index 25f2b562134ae..b77c66f75eaac 100644 --- a/source/extensions/health_checkers/redis/redis.h +++ b/source/extensions/health_checkers/redis/redis.h @@ -3,7 +3,10 @@ #include #include "envoy/api/api.h" -#include "envoy/config/health_checker/redis/v2/redis.pb.validate.h" +#include "envoy/api/v2/core/health_check.pb.h" +#include "envoy/config/filter/network/redis_proxy/v2/redis_proxy.pb.validate.h" +#include "envoy/config/health_checker/redis/v2/redis.pb.h" +#include "envoy/data/core/v2alpha/health_check_event.pb.h" #include "common/upstream/health_checker_base_impl.h" diff --git a/source/extensions/health_checkers/redis/utility.h b/source/extensions/health_checkers/redis/utility.h index b05a1856f2732..214a7be4b0802 100644 --- a/source/extensions/health_checkers/redis/utility.h +++ b/source/extensions/health_checkers/redis/utility.h @@ -1,6 +1,7 @@ #pragma once -#include "envoy/api/v2/core/health_check.pb.validate.h" +#include "envoy/api/v2/core/health_check.pb.h" +#include "envoy/config/health_checker/redis/v2/redis.pb.h" #include "envoy/config/health_checker/redis/v2/redis.pb.validate.h" #include "common/protobuf/protobuf.h" diff --git a/source/extensions/quic_listeners/quiche/BUILD b/source/extensions/quic_listeners/quiche/BUILD index ae124d4c3cf76..747eadfb8eaf2 100644 --- a/source/extensions/quic_listeners/quiche/BUILD +++ b/source/extensions/quic_listeners/quiche/BUILD @@ -232,6 +232,7 @@ envoy_cc_library( ":envoy_quic_packet_writer_lib", "//include/envoy/event:dispatcher_interface", "//source/common/network:socket_option_factory_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -302,6 +303,7 @@ envoy_cc_library( "//source/common/network:listen_socket_lib", "//source/common/network:socket_option_factory_lib", "@com_googlesource_quiche//:quic_core_http_header_list_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_client_connection.cc b/source/extensions/quic_listeners/quiche/envoy_quic_client_connection.cc index a3bd4a92d394c..87182c456403a 100644 --- a/source/extensions/quic_listeners/quiche/envoy_quic_client_connection.cc +++ b/source/extensions/quic_listeners/quiche/envoy_quic_client_connection.cc @@ -1,5 +1,7 @@ #include "extensions/quic_listeners/quiche/envoy_quic_client_connection.h" +#include "envoy/api/v2/core/base.pb.h" + #include "common/network/listen_socket_impl.h" #include "common/network/socket_option_factory.h" diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_utils.cc b/source/extensions/quic_listeners/quiche/envoy_quic_utils.cc index b02f76c7b1ade..45b73545e9dc9 100644 --- a/source/extensions/quic_listeners/quiche/envoy_quic_utils.cc +++ b/source/extensions/quic_listeners/quiche/envoy_quic_utils.cc @@ -2,6 +2,8 @@ #include +#include "envoy/api/v2/core/base.pb.h" + #include "common/network/socket_option_factory.h" namespace Envoy { diff --git a/source/extensions/resource_monitors/fixed_heap/config.cc b/source/extensions/resource_monitors/fixed_heap/config.cc index 4411811a0d54c..a8c5e4175ec5b 100644 --- a/source/extensions/resource_monitors/fixed_heap/config.cc +++ b/source/extensions/resource_monitors/fixed_heap/config.cc @@ -1,5 +1,7 @@ #include "extensions/resource_monitors/fixed_heap/config.h" +#include "envoy/config/resource_monitor/fixed_heap/v2alpha/fixed_heap.pb.h" +#include "envoy/config/resource_monitor/fixed_heap/v2alpha/fixed_heap.pb.validate.h" #include "envoy/registry/registry.h" #include "common/protobuf/utility.h" diff --git a/source/extensions/resource_monitors/fixed_heap/config.h b/source/extensions/resource_monitors/fixed_heap/config.h index b429812e6bcfb..26be00d731be6 100644 --- a/source/extensions/resource_monitors/fixed_heap/config.h +++ b/source/extensions/resource_monitors/fixed_heap/config.h @@ -1,5 +1,6 @@ #pragma once +#include "envoy/config/resource_monitor/fixed_heap/v2alpha/fixed_heap.pb.h" #include "envoy/config/resource_monitor/fixed_heap/v2alpha/fixed_heap.pb.validate.h" #include "envoy/server/resource_monitor_config.h" diff --git a/source/extensions/resource_monitors/fixed_heap/fixed_heap_monitor.cc b/source/extensions/resource_monitors/fixed_heap/fixed_heap_monitor.cc index a968856aa04db..17bc6c95406f2 100644 --- a/source/extensions/resource_monitors/fixed_heap/fixed_heap_monitor.cc +++ b/source/extensions/resource_monitors/fixed_heap/fixed_heap_monitor.cc @@ -1,5 +1,7 @@ #include "extensions/resource_monitors/fixed_heap/fixed_heap_monitor.h" +#include "envoy/config/resource_monitor/fixed_heap/v2alpha/fixed_heap.pb.h" + #include "common/common/assert.h" #include "common/memory/stats.h" diff --git a/source/extensions/resource_monitors/fixed_heap/fixed_heap_monitor.h b/source/extensions/resource_monitors/fixed_heap/fixed_heap_monitor.h index 9576695e44d11..8ac0cee6928b4 100644 --- a/source/extensions/resource_monitors/fixed_heap/fixed_heap_monitor.h +++ b/source/extensions/resource_monitors/fixed_heap/fixed_heap_monitor.h @@ -1,6 +1,6 @@ #pragma once -#include "envoy/config/resource_monitor/fixed_heap/v2alpha/fixed_heap.pb.validate.h" +#include "envoy/config/resource_monitor/fixed_heap/v2alpha/fixed_heap.pb.h" #include "envoy/server/resource_monitor.h" namespace Envoy { diff --git a/source/extensions/resource_monitors/injected_resource/config.cc b/source/extensions/resource_monitors/injected_resource/config.cc index 12f5ea6e66de4..1b98a86cad0ae 100644 --- a/source/extensions/resource_monitors/injected_resource/config.cc +++ b/source/extensions/resource_monitors/injected_resource/config.cc @@ -1,5 +1,7 @@ #include "extensions/resource_monitors/injected_resource/config.h" +#include "envoy/config/resource_monitor/injected_resource/v2alpha/injected_resource.pb.h" +#include "envoy/config/resource_monitor/injected_resource/v2alpha/injected_resource.pb.validate.h" #include "envoy/registry/registry.h" #include "common/protobuf/utility.h" diff --git a/source/extensions/resource_monitors/injected_resource/config.h b/source/extensions/resource_monitors/injected_resource/config.h index c6f2976209d3f..95d8e77ccb6af 100644 --- a/source/extensions/resource_monitors/injected_resource/config.h +++ b/source/extensions/resource_monitors/injected_resource/config.h @@ -1,5 +1,6 @@ #pragma once +#include "envoy/config/resource_monitor/injected_resource/v2alpha/injected_resource.pb.h" #include "envoy/config/resource_monitor/injected_resource/v2alpha/injected_resource.pb.validate.h" #include "envoy/server/resource_monitor_config.h" diff --git a/source/extensions/resource_monitors/injected_resource/injected_resource_monitor.cc b/source/extensions/resource_monitors/injected_resource/injected_resource_monitor.cc index 0c6db398daecb..ccc8d24d32c54 100644 --- a/source/extensions/resource_monitors/injected_resource/injected_resource_monitor.cc +++ b/source/extensions/resource_monitors/injected_resource/injected_resource_monitor.cc @@ -1,5 +1,7 @@ #include "extensions/resource_monitors/injected_resource/injected_resource_monitor.h" +#include "envoy/config/resource_monitor/injected_resource/v2alpha/injected_resource.pb.h" + #include "common/common/assert.h" #include "absl/strings/numbers.h" diff --git a/source/extensions/resource_monitors/injected_resource/injected_resource_monitor.h b/source/extensions/resource_monitors/injected_resource/injected_resource_monitor.h index 70255267a8955..d2609f3f383a2 100644 --- a/source/extensions/resource_monitors/injected_resource/injected_resource_monitor.h +++ b/source/extensions/resource_monitors/injected_resource/injected_resource_monitor.h @@ -1,7 +1,7 @@ #pragma once #include "envoy/api/api.h" -#include "envoy/config/resource_monitor/injected_resource/v2alpha/injected_resource.pb.validate.h" +#include "envoy/config/resource_monitor/injected_resource/v2alpha/injected_resource.pb.h" #include "envoy/filesystem/filesystem.h" #include "envoy/server/resource_monitor.h" #include "envoy/server/resource_monitor_config.h" diff --git a/source/extensions/retry/priority/previous_priorities/config.cc b/source/extensions/retry/priority/previous_priorities/config.cc index d528442359f7a..de7766c0d5a66 100644 --- a/source/extensions/retry/priority/previous_priorities/config.cc +++ b/source/extensions/retry/priority/previous_priorities/config.cc @@ -1,5 +1,6 @@ #include "extensions/retry/priority/previous_priorities/config.h" +#include "envoy/config/retry/previous_priorities/previous_priorities_config.pb.h" #include "envoy/config/retry/previous_priorities/previous_priorities_config.pb.validate.h" #include "envoy/registry/registry.h" #include "envoy/upstream/retry.h" diff --git a/source/extensions/retry/priority/previous_priorities/config.h b/source/extensions/retry/priority/previous_priorities/config.h index 8fe761b3fe696..10a9156aa2084 100644 --- a/source/extensions/retry/priority/previous_priorities/config.h +++ b/source/extensions/retry/priority/previous_priorities/config.h @@ -1,6 +1,6 @@ #pragma once -#include "envoy/config/retry/previous_priorities/previous_priorities_config.pb.validate.h" +#include "envoy/config/retry/previous_priorities/previous_priorities_config.pb.h" #include "envoy/upstream/retry.h" #include "common/protobuf/protobuf.h" diff --git a/source/extensions/stat_sinks/metrics_service/BUILD b/source/extensions/stat_sinks/metrics_service/BUILD index 495877790e7a7..ec7c57b5c6d7c 100644 --- a/source/extensions/stat_sinks/metrics_service/BUILD +++ b/source/extensions/stat_sinks/metrics_service/BUILD @@ -33,7 +33,6 @@ envoy_cc_library( deps = [ "//source/common/common:assert_lib", "//source/common/protobuf", - "@envoy_api//envoy/service/metrics/v2:pkg_cc_proto", ], ) diff --git a/source/extensions/stat_sinks/metrics_service/grpc_metrics_proto_descriptors.cc b/source/extensions/stat_sinks/metrics_service/grpc_metrics_proto_descriptors.cc index d3adfeeb846fb..531fe10741cc2 100644 --- a/source/extensions/stat_sinks/metrics_service/grpc_metrics_proto_descriptors.cc +++ b/source/extensions/stat_sinks/metrics_service/grpc_metrics_proto_descriptors.cc @@ -1,7 +1,5 @@ #include "extensions/stat_sinks/metrics_service/grpc_metrics_proto_descriptors.h" -#include "envoy/service/metrics/v2/metrics_service.pb.h" - #include "common/common/assert.h" #include "common/common/fmt.h" #include "common/protobuf/protobuf.h" diff --git a/source/extensions/stat_sinks/metrics_service/grpc_metrics_service_impl.cc b/source/extensions/stat_sinks/metrics_service/grpc_metrics_service_impl.cc index 16f54c46f111a..9986848b1d87e 100644 --- a/source/extensions/stat_sinks/metrics_service/grpc_metrics_service_impl.cc +++ b/source/extensions/stat_sinks/metrics_service/grpc_metrics_service_impl.cc @@ -2,6 +2,7 @@ #include "envoy/common/exception.h" #include "envoy/event/dispatcher.h" +#include "envoy/service/metrics/v2/metrics_service.pb.h" #include "envoy/stats/histogram.h" #include "envoy/stats/stats.h" #include "envoy/upstream/cluster_manager.h" diff --git a/source/extensions/stat_sinks/metrics_service/grpc_metrics_service_impl.h b/source/extensions/stat_sinks/metrics_service/grpc_metrics_service_impl.h index 5c0473b084dc0..2a4854fd6d723 100644 --- a/source/extensions/stat_sinks/metrics_service/grpc_metrics_service_impl.h +++ b/source/extensions/stat_sinks/metrics_service/grpc_metrics_service_impl.h @@ -4,7 +4,6 @@ #include "envoy/local_info/local_info.h" #include "envoy/network/connection.h" #include "envoy/service/metrics/v2/metrics_service.pb.h" -#include "envoy/service/metrics/v2/metrics_service.pb.validate.h" #include "envoy/singleton/instance.h" #include "envoy/stats/histogram.h" #include "envoy/stats/sink.h" diff --git a/source/extensions/tracers/datadog/BUILD b/source/extensions/tracers/datadog/BUILD index be0a767fdced8..50f8c9ab53df0 100644 --- a/source/extensions/tracers/datadog/BUILD +++ b/source/extensions/tracers/datadog/BUILD @@ -25,6 +25,7 @@ envoy_cc_library( "//source/common/tracing:http_tracer_lib", "//source/extensions/tracers:well_known_names", "//source/extensions/tracers/common/ot:opentracing_driver_lib", + "@envoy_api//envoy/config/trace/v2:pkg_cc_proto", ], ) diff --git a/source/extensions/tracers/datadog/config.cc b/source/extensions/tracers/datadog/config.cc index 94bc439cef5d5..1fdc623138d6c 100644 --- a/source/extensions/tracers/datadog/config.cc +++ b/source/extensions/tracers/datadog/config.cc @@ -1,5 +1,7 @@ #include "extensions/tracers/datadog/config.h" +#include "envoy/config/trace/v2/trace.pb.h" +#include "envoy/config/trace/v2/trace.pb.validate.h" #include "envoy/registry/registry.h" #include "common/common/utility.h" diff --git a/source/extensions/tracers/datadog/config.h b/source/extensions/tracers/datadog/config.h index 1e9c77ca1f564..c452039d722cd 100644 --- a/source/extensions/tracers/datadog/config.h +++ b/source/extensions/tracers/datadog/config.h @@ -2,6 +2,7 @@ #include +#include "envoy/config/trace/v2/trace.pb.h" #include "envoy/config/trace/v2/trace.pb.validate.h" #include "extensions/tracers/common/factory_base.h" diff --git a/source/extensions/tracers/datadog/datadog_tracer_impl.cc b/source/extensions/tracers/datadog/datadog_tracer_impl.cc index 0ff6e968be7d5..9b893dd5c293c 100644 --- a/source/extensions/tracers/datadog/datadog_tracer_impl.cc +++ b/source/extensions/tracers/datadog/datadog_tracer_impl.cc @@ -1,5 +1,7 @@ #include "extensions/tracers/datadog/datadog_tracer_impl.h" +#include "envoy/config/trace/v2/trace.pb.h" + #include "common/common/enum_to_int.h" #include "common/common/fmt.h" #include "common/common/utility.h" diff --git a/source/extensions/tracers/datadog/datadog_tracer_impl.h b/source/extensions/tracers/datadog/datadog_tracer_impl.h index 41b9628487164..538c3cade275d 100644 --- a/source/extensions/tracers/datadog/datadog_tracer_impl.h +++ b/source/extensions/tracers/datadog/datadog_tracer_impl.h @@ -2,6 +2,7 @@ #include +#include "envoy/config/trace/v2/trace.pb.h" #include "envoy/local_info/local_info.h" #include "envoy/runtime/runtime.h" #include "envoy/thread_local/thread_local.h" diff --git a/source/extensions/tracers/dynamic_ot/config.cc b/source/extensions/tracers/dynamic_ot/config.cc index f5b4098a298eb..3b67c128e047f 100644 --- a/source/extensions/tracers/dynamic_ot/config.cc +++ b/source/extensions/tracers/dynamic_ot/config.cc @@ -1,5 +1,7 @@ #include "extensions/tracers/dynamic_ot/config.h" +#include "envoy/config/trace/v2/trace.pb.h" +#include "envoy/config/trace/v2/trace.pb.validate.h" #include "envoy/registry/registry.h" #include "common/common/utility.h" diff --git a/source/extensions/tracers/dynamic_ot/config.h b/source/extensions/tracers/dynamic_ot/config.h index 39e736b041753..61853f0d4c819 100644 --- a/source/extensions/tracers/dynamic_ot/config.h +++ b/source/extensions/tracers/dynamic_ot/config.h @@ -1,5 +1,6 @@ #pragma once +#include "envoy/config/trace/v2/trace.pb.h" #include "envoy/config/trace/v2/trace.pb.validate.h" #include "extensions/tracers/common/factory_base.h" diff --git a/source/extensions/tracers/lightstep/BUILD b/source/extensions/tracers/lightstep/BUILD index 5e5213c600be0..46936d2007548 100644 --- a/source/extensions/tracers/lightstep/BUILD +++ b/source/extensions/tracers/lightstep/BUILD @@ -27,6 +27,7 @@ envoy_cc_library( "//source/common/tracing:http_tracer_lib", "//source/extensions/tracers:well_known_names", "//source/extensions/tracers/common/ot:opentracing_driver_lib", + "@envoy_api//envoy/config/trace/v2:pkg_cc_proto", ], ) diff --git a/source/extensions/tracers/lightstep/config.cc b/source/extensions/tracers/lightstep/config.cc index 7b20eca964df8..b2913b8042514 100644 --- a/source/extensions/tracers/lightstep/config.cc +++ b/source/extensions/tracers/lightstep/config.cc @@ -1,5 +1,7 @@ #include "extensions/tracers/lightstep/config.h" +#include "envoy/config/trace/v2/trace.pb.h" +#include "envoy/config/trace/v2/trace.pb.validate.h" #include "envoy/registry/registry.h" #include "common/common/utility.h" diff --git a/source/extensions/tracers/lightstep/config.h b/source/extensions/tracers/lightstep/config.h index 2716221fa9c40..2d38156ce331a 100644 --- a/source/extensions/tracers/lightstep/config.h +++ b/source/extensions/tracers/lightstep/config.h @@ -1,5 +1,6 @@ #pragma once +#include "envoy/config/trace/v2/trace.pb.h" #include "envoy/config/trace/v2/trace.pb.validate.h" #include "extensions/tracers/common/factory_base.h" diff --git a/source/extensions/tracers/lightstep/lightstep_tracer_impl.cc b/source/extensions/tracers/lightstep/lightstep_tracer_impl.cc index 2ef179b8d08c6..892b459902194 100644 --- a/source/extensions/tracers/lightstep/lightstep_tracer_impl.cc +++ b/source/extensions/tracers/lightstep/lightstep_tracer_impl.cc @@ -5,6 +5,8 @@ #include #include +#include "envoy/config/trace/v2/trace.pb.h" + #include "common/buffer/zero_copy_input_stream_impl.h" #include "common/common/base64.h" #include "common/common/fmt.h" diff --git a/source/extensions/tracers/lightstep/lightstep_tracer_impl.h b/source/extensions/tracers/lightstep/lightstep_tracer_impl.h index 6988ce504bccb..a5298475a9da7 100644 --- a/source/extensions/tracers/lightstep/lightstep_tracer_impl.h +++ b/source/extensions/tracers/lightstep/lightstep_tracer_impl.h @@ -4,6 +4,7 @@ #include #include +#include "envoy/config/trace/v2/trace.pb.h" #include "envoy/runtime/runtime.h" #include "envoy/thread_local/thread_local.h" #include "envoy/tracing/http_tracer.h" diff --git a/source/extensions/tracers/opencensus/config.cc b/source/extensions/tracers/opencensus/config.cc index ec0e766e532d7..4e8e1a2aa40d8 100644 --- a/source/extensions/tracers/opencensus/config.cc +++ b/source/extensions/tracers/opencensus/config.cc @@ -1,5 +1,7 @@ #include "extensions/tracers/opencensus/config.h" +#include "envoy/config/trace/v2/trace.pb.h" +#include "envoy/config/trace/v2/trace.pb.validate.h" #include "envoy/registry/registry.h" #include "common/tracing/http_tracer_impl.h" diff --git a/source/extensions/tracers/opencensus/config.h b/source/extensions/tracers/opencensus/config.h index 20c2beea3f62d..e0d9b876373d2 100644 --- a/source/extensions/tracers/opencensus/config.h +++ b/source/extensions/tracers/opencensus/config.h @@ -2,6 +2,7 @@ #include +#include "envoy/config/trace/v2/trace.pb.h" #include "envoy/config/trace/v2/trace.pb.validate.h" #include "extensions/tracers/common/factory_base.h" diff --git a/source/extensions/tracers/opencensus/opencensus_tracer_impl.cc b/source/extensions/tracers/opencensus/opencensus_tracer_impl.cc index ffe49be821596..304b20c143161 100644 --- a/source/extensions/tracers/opencensus/opencensus_tracer_impl.cc +++ b/source/extensions/tracers/opencensus/opencensus_tracer_impl.cc @@ -2,6 +2,7 @@ #include +#include "envoy/config/trace/v2/trace.pb.h" #include "envoy/http/header_map.h" #include "common/common/base64.h" diff --git a/source/extensions/tracers/opencensus/opencensus_tracer_impl.h b/source/extensions/tracers/opencensus/opencensus_tracer_impl.h index 1b334e9281727..1805c6536303e 100644 --- a/source/extensions/tracers/opencensus/opencensus_tracer_impl.h +++ b/source/extensions/tracers/opencensus/opencensus_tracer_impl.h @@ -1,6 +1,6 @@ #pragma once -#include "envoy/config/trace/v2/trace.pb.validate.h" +#include "envoy/config/trace/v2/trace.pb.h" #include "envoy/local_info/local_info.h" #include "envoy/tracing/http_tracer.h" diff --git a/source/extensions/tracers/xray/config.cc b/source/extensions/tracers/xray/config.cc index 97209173428ed..98bafe3a57a99 100644 --- a/source/extensions/tracers/xray/config.cc +++ b/source/extensions/tracers/xray/config.cc @@ -2,6 +2,8 @@ #include +#include "envoy/config/trace/v2/trace.pb.h" +#include "envoy/config/trace/v2/trace.pb.validate.h" #include "envoy/registry/registry.h" #include "common/common/utility.h" diff --git a/source/extensions/tracers/xray/config.h b/source/extensions/tracers/xray/config.h index a02b590d9cf45..5ce7dcf390be5 100644 --- a/source/extensions/tracers/xray/config.h +++ b/source/extensions/tracers/xray/config.h @@ -1,5 +1,6 @@ #pragma once +#include "envoy/config/trace/v2/trace.pb.h" #include "envoy/config/trace/v2/trace.pb.validate.h" #include "common/common/logger.h" diff --git a/source/extensions/tracers/zipkin/config.cc b/source/extensions/tracers/zipkin/config.cc index 47ec3d2ff2992..54fa111ce61a7 100644 --- a/source/extensions/tracers/zipkin/config.cc +++ b/source/extensions/tracers/zipkin/config.cc @@ -1,5 +1,7 @@ #include "extensions/tracers/zipkin/config.h" +#include "envoy/config/trace/v2/trace.pb.h" +#include "envoy/config/trace/v2/trace.pb.validate.h" #include "envoy/registry/registry.h" #include "common/common/utility.h" diff --git a/source/extensions/tracers/zipkin/config.h b/source/extensions/tracers/zipkin/config.h index a2047594711e0..0fda006259b0c 100644 --- a/source/extensions/tracers/zipkin/config.h +++ b/source/extensions/tracers/zipkin/config.h @@ -1,5 +1,6 @@ #pragma once +#include "envoy/config/trace/v2/trace.pb.h" #include "envoy/config/trace/v2/trace.pb.validate.h" #include "extensions/tracers/common/factory_base.h" diff --git a/source/extensions/tracers/zipkin/span_buffer.cc b/source/extensions/tracers/zipkin/span_buffer.cc index 66bb96a9463b5..adec867a4d75a 100644 --- a/source/extensions/tracers/zipkin/span_buffer.cc +++ b/source/extensions/tracers/zipkin/span_buffer.cc @@ -1,5 +1,7 @@ #include "extensions/tracers/zipkin/span_buffer.h" +#include "envoy/config/trace/v2/trace.pb.h" + #include "common/protobuf/protobuf.h" #include "extensions/tracers/zipkin/util.h" diff --git a/source/extensions/tracers/zipkin/zipkin_tracer_impl.cc b/source/extensions/tracers/zipkin/zipkin_tracer_impl.cc index 46135a508313f..743e88b9beb96 100644 --- a/source/extensions/tracers/zipkin/zipkin_tracer_impl.cc +++ b/source/extensions/tracers/zipkin/zipkin_tracer_impl.cc @@ -1,5 +1,7 @@ #include "extensions/tracers/zipkin/zipkin_tracer_impl.h" +#include "envoy/config/trace/v2/trace.pb.h" + #include "common/common/enum_to_int.h" #include "common/common/fmt.h" #include "common/common/utility.h" diff --git a/source/extensions/tracers/zipkin/zipkin_tracer_impl.h b/source/extensions/tracers/zipkin/zipkin_tracer_impl.h index 4cecd015d6a31..8b708538fd1fd 100644 --- a/source/extensions/tracers/zipkin/zipkin_tracer_impl.h +++ b/source/extensions/tracers/zipkin/zipkin_tracer_impl.h @@ -1,5 +1,6 @@ #pragma once +#include "envoy/config/trace/v2/trace.pb.h" #include "envoy/local_info/local_info.h" #include "envoy/runtime/runtime.h" #include "envoy/thread_local/thread_local.h" diff --git a/source/extensions/transport_sockets/tap/BUILD b/source/extensions/transport_sockets/tap/BUILD index 81cd27b5a497e..8b01381dcc239 100644 --- a/source/extensions/transport_sockets/tap/BUILD +++ b/source/extensions/transport_sockets/tap/BUILD @@ -28,6 +28,8 @@ envoy_cc_library( ":tap_config_interface", "//source/common/network:utility_lib", "//source/extensions/common/tap:tap_config_base", + "@envoy_api//envoy/data/tap/v2alpha:pkg_cc_proto", + "@envoy_api//envoy/service/tap/v2alpha:pkg_cc_proto", ], ) @@ -41,7 +43,6 @@ envoy_cc_library( "//source/common/buffer:buffer_lib", "//source/extensions/common/tap:extension_config_base", "@envoy_api//envoy/config/transport_socket/tap/v2alpha:pkg_cc_proto", - "@envoy_api//envoy/data/tap/v2alpha:pkg_cc_proto", ], ) @@ -61,5 +62,6 @@ envoy_cc_extension( "//source/common/protobuf:utility_lib", "//source/extensions/transport_sockets:well_known_names", "@envoy_api//envoy/config/transport_socket/tap/v2alpha:pkg_cc_proto", + "@envoy_api//envoy/service/tap/v2alpha:pkg_cc_proto", ], ) diff --git a/source/extensions/transport_sockets/tap/config.cc b/source/extensions/transport_sockets/tap/config.cc index fb04ed511b265..c45f2def51a36 100644 --- a/source/extensions/transport_sockets/tap/config.cc +++ b/source/extensions/transport_sockets/tap/config.cc @@ -3,6 +3,7 @@ #include "envoy/config/transport_socket/tap/v2alpha/tap.pb.h" #include "envoy/config/transport_socket/tap/v2alpha/tap.pb.validate.h" #include "envoy/registry/registry.h" +#include "envoy/service/tap/v2alpha/common.pb.h" #include "common/config/utility.h" #include "common/protobuf/utility.h" diff --git a/source/extensions/transport_sockets/tap/tap.cc b/source/extensions/transport_sockets/tap/tap.cc index a404e6a725169..6485886aa87cd 100644 --- a/source/extensions/transport_sockets/tap/tap.cc +++ b/source/extensions/transport_sockets/tap/tap.cc @@ -1,5 +1,7 @@ #include "extensions/transport_sockets/tap/tap.h" +#include "envoy/config/transport_socket/tap/v2alpha/tap.pb.h" + #include "common/buffer/buffer_impl.h" namespace Envoy { diff --git a/source/extensions/transport_sockets/tap/tap.h b/source/extensions/transport_sockets/tap/tap.h index 6e1e6a98cd127..96480544b426f 100644 --- a/source/extensions/transport_sockets/tap/tap.h +++ b/source/extensions/transport_sockets/tap/tap.h @@ -1,7 +1,6 @@ #pragma once #include "envoy/config/transport_socket/tap/v2alpha/tap.pb.h" -#include "envoy/data/tap/v2alpha/wrapper.pb.h" #include "envoy/event/timer.h" #include "envoy/network/transport_socket.h" diff --git a/source/extensions/transport_sockets/tap/tap_config_impl.cc b/source/extensions/transport_sockets/tap/tap_config_impl.cc index 92d4e502852e6..cea959d4f3689 100644 --- a/source/extensions/transport_sockets/tap/tap_config_impl.cc +++ b/source/extensions/transport_sockets/tap/tap_config_impl.cc @@ -1,5 +1,7 @@ #include "extensions/transport_sockets/tap/tap_config_impl.h" +#include "envoy/data/tap/v2alpha/transport.pb.h" + #include "common/common/assert.h" #include "common/network/utility.h" diff --git a/source/extensions/transport_sockets/tap/tap_config_impl.h b/source/extensions/transport_sockets/tap/tap_config_impl.h index dc16dc2c96d28..af6a0f2e8784c 100644 --- a/source/extensions/transport_sockets/tap/tap_config_impl.h +++ b/source/extensions/transport_sockets/tap/tap_config_impl.h @@ -1,6 +1,8 @@ #pragma once +#include "envoy/data/tap/v2alpha/transport.pb.h" #include "envoy/event/timer.h" +#include "envoy/service/tap/v2alpha/common.pb.h" #include "extensions/common/tap/tap_config_base.h" #include "extensions/transport_sockets/tap/tap_config.h" diff --git a/source/extensions/transport_sockets/tls/BUILD b/source/extensions/transport_sockets/tls/BUILD index 6ccc256a98bfb..79271a398829c 100644 --- a/source/extensions/transport_sockets/tls/BUILD +++ b/source/extensions/transport_sockets/tls/BUILD @@ -106,6 +106,7 @@ envoy_cc_library( "//source/common/protobuf:utility_lib", "//source/common/stats:symbol_table_lib", "//source/extensions/transport_sockets/tls/private_key:private_key_manager_lib", + "@envoy_api//envoy/admin/v2alpha:pkg_cc_proto", ], ) diff --git a/source/extensions/transport_sockets/tls/context_config_impl.cc b/source/extensions/transport_sockets/tls/context_config_impl.cc index 6c8a79d60a8d6..295aab1ced5b4 100644 --- a/source/extensions/transport_sockets/tls/context_config_impl.cc +++ b/source/extensions/transport_sockets/tls/context_config_impl.cc @@ -3,6 +3,8 @@ #include #include +#include "envoy/api/v2/auth/cert.pb.h" + #include "common/common/assert.h" #include "common/common/empty_string.h" #include "common/config/datasource.h" diff --git a/source/extensions/transport_sockets/tls/context_impl.cc b/source/extensions/transport_sockets/tls/context_impl.cc index 0c3844e52b9ab..f51117dd346a0 100644 --- a/source/extensions/transport_sockets/tls/context_impl.cc +++ b/source/extensions/transport_sockets/tls/context_impl.cc @@ -5,6 +5,7 @@ #include #include +#include "envoy/admin/v2alpha/certs.pb.h" #include "envoy/common/exception.h" #include "envoy/common/platform.h" #include "envoy/stats/scope.h" diff --git a/source/extensions/transport_sockets/tls/private_key/private_key_manager_impl.cc b/source/extensions/transport_sockets/tls/private_key/private_key_manager_impl.cc index 817b9d362616f..d2008a40a5cd7 100644 --- a/source/extensions/transport_sockets/tls/private_key/private_key_manager_impl.cc +++ b/source/extensions/transport_sockets/tls/private_key/private_key_manager_impl.cc @@ -1,5 +1,6 @@ #include "extensions/transport_sockets/tls/private_key/private_key_manager_impl.h" +#include "envoy/api/v2/auth/cert.pb.h" #include "envoy/registry/registry.h" namespace Envoy { diff --git a/source/server/BUILD b/source/server/BUILD index eb35de629aa31..a165453c2cd6a 100644 --- a/source/server/BUILD +++ b/source/server/BUILD @@ -49,6 +49,7 @@ envoy_cc_library( "//source/common/protobuf:utility_lib", "//source/common/tracing:http_tracer_lib", "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", + "@envoy_api//envoy/config/metrics/v2:pkg_cc_proto", "@envoy_api//envoy/config/trace/v2:pkg_cc_proto", ], ) @@ -90,6 +91,7 @@ envoy_cc_library( "//include/envoy/server:instance_interface", "//source/common/common:assert_lib", "//source/common/common:minimal_logger_lib", + "@envoy_api//envoy/api/v2:pkg_cc_proto", ], ) @@ -254,8 +256,9 @@ envoy_cc_library( "//source/common/config:utility_lib", "//source/common/init:target_lib", "//source/common/protobuf:utility_lib", + "@envoy_api//envoy/admin/v2alpha:pkg_cc_proto", "@envoy_api//envoy/api/v2:pkg_cc_proto", - "@envoy_api//envoy/api/v2/listener:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -287,6 +290,8 @@ envoy_cc_library( "//source/common/protobuf:utility_lib", "//source/extensions/filters/listener:well_known_names", "//source/extensions/transport_sockets:well_known_names", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", "@envoy_api//envoy/api/v2/listener:pkg_cc_proto", ], ) @@ -321,6 +326,8 @@ envoy_cc_library( "//source/extensions/filters/listener:well_known_names", "//source/extensions/transport_sockets:well_known_names", "@envoy_api//envoy/admin/v2alpha:pkg_cc_proto", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", "@envoy_api//envoy/api/v2/listener:pkg_cc_proto", ], ) @@ -355,9 +362,6 @@ envoy_cc_library( "//source/common/common:assert_lib", "//source/common/config:protobuf_link_hacks", "//source/common/protobuf", - "@envoy_api//envoy/api/v2:pkg_cc_proto", - "@envoy_api//envoy/service/discovery/v2:pkg_cc_proto", - "@envoy_api//envoy/service/ratelimit/v2:pkg_cc_proto", ], ) diff --git a/source/server/config_validation/BUILD b/source/server/config_validation/BUILD index 43233ed74665f..98f62ae02a873 100644 --- a/source/server/config_validation/BUILD +++ b/source/server/config_validation/BUILD @@ -49,6 +49,8 @@ envoy_cc_library( "//source/common/common:utility_lib", "//source/common/http:context_lib", "//source/common/upstream:cluster_manager_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", ], ) @@ -107,6 +109,9 @@ envoy_cc_library( "//source/server:configuration_lib", "//source/server:server_lib", "//source/server/http:admin_lib", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/api/v2/listener:pkg_cc_proto", "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", ], ) diff --git a/source/server/config_validation/cluster_manager.cc b/source/server/config_validation/cluster_manager.cc index cf20a6c0e2217..80599afc53215 100644 --- a/source/server/config_validation/cluster_manager.cc +++ b/source/server/config_validation/cluster_manager.cc @@ -1,5 +1,8 @@ #include "server/config_validation/cluster_manager.h" +#include "envoy/api/v2/core/config_source.pb.h" +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" + #include "common/common/utility.h" namespace Envoy { diff --git a/source/server/config_validation/cluster_manager.h b/source/server/config_validation/cluster_manager.h index 0fe33294d1904..f861363a7a1e0 100644 --- a/source/server/config_validation/cluster_manager.h +++ b/source/server/config_validation/cluster_manager.h @@ -1,5 +1,7 @@ #pragma once +#include "envoy/api/v2/core/config_source.pb.h" +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" #include "envoy/secret/secret_manager.h" #include "envoy/upstream/cluster_manager.h" diff --git a/source/server/config_validation/server.cc b/source/server/config_validation/server.cc index 3c1c03dc9d746..475e563d24fc8 100644 --- a/source/server/config_validation/server.cc +++ b/source/server/config_validation/server.cc @@ -3,7 +3,6 @@ #include #include "envoy/config/bootstrap/v2/bootstrap.pb.h" -#include "envoy/config/bootstrap/v2/bootstrap.pb.validate.h" #include "common/common/utility.h" #include "common/common/version.h" diff --git a/source/server/config_validation/server.h b/source/server/config_validation/server.h index 97a6e89334dc3..71483c76ce55a 100644 --- a/source/server/config_validation/server.h +++ b/source/server/config_validation/server.h @@ -2,6 +2,9 @@ #include +#include "envoy/api/v2/core/config_source.pb.h" +#include "envoy/api/v2/lds.pb.h" +#include "envoy/api/v2/listener/listener.pb.h" #include "envoy/event/timer.h" #include "envoy/server/drain_manager.h" #include "envoy/server/instance.h" diff --git a/source/server/configuration_impl.cc b/source/server/configuration_impl.cc index d0b6315cbda2e..eeb325e2d11b2 100644 --- a/source/server/configuration_impl.cc +++ b/source/server/configuration_impl.cc @@ -6,6 +6,8 @@ #include #include +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" +#include "envoy/config/metrics/v2/stats.pb.h" #include "envoy/config/trace/v2/trace.pb.h" #include "envoy/network/connection.h" #include "envoy/runtime/runtime.h" diff --git a/source/server/configuration_impl.h b/source/server/configuration_impl.h index 4bb5b224b5756..9b167dce863cc 100644 --- a/source/server/configuration_impl.h +++ b/source/server/configuration_impl.h @@ -10,6 +10,7 @@ #include #include "envoy/config/bootstrap/v2/bootstrap.pb.h" +#include "envoy/config/trace/v2/trace.pb.h" #include "envoy/http/filter.h" #include "envoy/network/filter.h" #include "envoy/server/configuration.h" diff --git a/source/server/drain_manager_impl.cc b/source/server/drain_manager_impl.cc index 03dbf548c265c..e58944e26ee1a 100644 --- a/source/server/drain_manager_impl.cc +++ b/source/server/drain_manager_impl.cc @@ -4,6 +4,7 @@ #include #include +#include "envoy/api/v2/lds.pb.h" #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 8f44ad1cf99ae..1bee06b92d205 100644 --- a/source/server/drain_manager_impl.h +++ b/source/server/drain_manager_impl.h @@ -3,6 +3,7 @@ #include #include +#include "envoy/api/v2/lds.pb.h" #include "envoy/server/drain_manager.h" #include "envoy/server/instance.h" diff --git a/source/server/filter_chain_manager_impl.cc b/source/server/filter_chain_manager_impl.cc index 44306d43f21c7..51ad2a8e5eecf 100644 --- a/source/server/filter_chain_manager_impl.cc +++ b/source/server/filter_chain_manager_impl.cc @@ -1,5 +1,7 @@ #include "server/filter_chain_manager_impl.h" +#include "envoy/api/v2/listener/listener.pb.h" + #include "common/common/empty_string.h" #include "common/common/fmt.h" #include "common/config/utility.h" @@ -466,4 +468,4 @@ void FilterChainManagerImpl::convertIPsToTries() { } } } // namespace Server -} // namespace Envoy \ No newline at end of file +} // namespace Envoy diff --git a/source/server/http/BUILD b/source/server/http/BUILD index 0600a4174a0e8..80ad9c3934248 100644 --- a/source/server/http/BUILD +++ b/source/server/http/BUILD @@ -61,6 +61,9 @@ envoy_cc_library( "//source/common/upstream:host_utility_lib", "//source/extensions/access_loggers/file:file_access_log_lib", "@envoy_api//envoy/admin/v2alpha:pkg_cc_proto", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto", ], ) diff --git a/source/server/http/admin.cc b/source/server/http/admin.cc index 0eb99f366e724..877520f15f7ea 100644 --- a/source/server/http/admin.cc +++ b/source/server/http/admin.cc @@ -15,8 +15,10 @@ #include "envoy/admin/v2alpha/config_dump.pb.h" #include "envoy/admin/v2alpha/listeners.pb.h" #include "envoy/admin/v2alpha/memory.pb.h" +#include "envoy/admin/v2alpha/metrics.pb.h" #include "envoy/admin/v2alpha/mutex_stats.pb.h" #include "envoy/admin/v2alpha/server_info.pb.h" +#include "envoy/api/v2/core/health_check.pb.h" #include "envoy/filesystem/filesystem.h" #include "envoy/runtime/runtime.h" #include "envoy/server/hot_restart.h" diff --git a/source/server/http/admin.h b/source/server/http/admin.h index 41e3656236d8a..5b2a6f3298c00 100644 --- a/source/server/http/admin.h +++ b/source/server/http/admin.h @@ -7,8 +7,10 @@ #include #include -#include "envoy/admin/v2alpha/clusters.pb.h" -#include "envoy/admin/v2alpha/listeners.pb.h" +#include "envoy/admin/v2alpha/server_info.pb.h" +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/api/v2/rds.pb.h" +#include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.h" #include "envoy/http/filter.h" #include "envoy/network/filter.h" #include "envoy/network/listen_socket.h" diff --git a/source/server/lds_api.cc b/source/server/lds_api.cc index 13a3df9e48e10..3fadc71662bce 100644 --- a/source/server/lds_api.cc +++ b/source/server/lds_api.cc @@ -2,8 +2,11 @@ #include +#include "envoy/admin/v2alpha/config_dump.pb.h" +#include "envoy/api/v2/core/config_source.pb.h" +#include "envoy/api/v2/discovery.pb.h" +#include "envoy/api/v2/lds.pb.h" #include "envoy/api/v2/lds.pb.validate.h" -#include "envoy/api/v2/listener/listener.pb.validate.h" #include "envoy/stats/scope.h" #include "common/common/cleanup.h" diff --git a/source/server/lds_api.h b/source/server/lds_api.h index 24ca66cfe73f2..357360c851c17 100644 --- a/source/server/lds_api.h +++ b/source/server/lds_api.h @@ -2,6 +2,8 @@ #include +#include "envoy/api/v2/core/config_source.pb.h" +#include "envoy/api/v2/discovery.pb.h" #include "envoy/api/v2/lds.pb.h" #include "envoy/config/subscription.h" #include "envoy/config/subscription_factory.h" diff --git a/source/server/listener_impl.cc b/source/server/listener_impl.cc index 21c5d6c1503cc..c9b7da94f87da 100644 --- a/source/server/listener_impl.cc +++ b/source/server/listener_impl.cc @@ -1,5 +1,8 @@ #include "server/listener_impl.h" +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/api/v2/lds.pb.h" +#include "envoy/api/v2/listener/listener.pb.h" #include "envoy/registry/registry.h" #include "envoy/server/active_udp_listener_config.h" #include "envoy/server/transport_socket_config.h" diff --git a/source/server/listener_impl.h b/source/server/listener_impl.h index 013d423ed50e5..85130c3ced5ef 100644 --- a/source/server/listener_impl.h +++ b/source/server/listener_impl.h @@ -2,7 +2,8 @@ #include -#include "envoy/api/v2/listener/listener.pb.h" +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/api/v2/lds.pb.h" #include "envoy/network/filter.h" #include "envoy/server/drain_manager.h" #include "envoy/server/filter_config.h" diff --git a/source/server/listener_manager_impl.cc b/source/server/listener_manager_impl.cc index 1b1029161962b..ef03a703e8432 100644 --- a/source/server/listener_manager_impl.cc +++ b/source/server/listener_manager_impl.cc @@ -3,6 +3,10 @@ #include #include "envoy/admin/v2alpha/config_dump.pb.h" +#include "envoy/api/v2/core/address.pb.h" +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/api/v2/lds.pb.h" +#include "envoy/api/v2/listener/listener.pb.h" #include "envoy/registry/registry.h" #include "envoy/server/active_udp_listener_config.h" #include "envoy/server/transport_socket_config.h" diff --git a/source/server/listener_manager_impl.h b/source/server/listener_manager_impl.h index 40170057da8bb..3c1f8f3067f5a 100644 --- a/source/server/listener_manager_impl.h +++ b/source/server/listener_manager_impl.h @@ -3,6 +3,10 @@ #include #include "envoy/admin/v2alpha/config_dump.pb.h" +#include "envoy/api/v2/core/address.pb.h" +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/api/v2/core/config_source.pb.h" +#include "envoy/api/v2/lds.pb.h" #include "envoy/api/v2/listener/listener.pb.h" #include "envoy/network/filter.h" #include "envoy/network/listen_socket.h" diff --git a/source/server/options_impl.cc b/source/server/options_impl.cc index b12863b101127..73f1b5171d43d 100644 --- a/source/server/options_impl.cc +++ b/source/server/options_impl.cc @@ -5,6 +5,8 @@ #include #include +#include "envoy/admin/v2alpha/server_info.pb.h" + #include "common/common/fmt.h" #include "common/common/logger.h" #include "common/common/macros.h" diff --git a/source/server/overload_manager_impl.cc b/source/server/overload_manager_impl.cc index 484be6f075a99..8195502cbccd2 100644 --- a/source/server/overload_manager_impl.cc +++ b/source/server/overload_manager_impl.cc @@ -1,5 +1,6 @@ #include "server/overload_manager_impl.h" +#include "envoy/config/overload/v2alpha/overload.pb.h" #include "envoy/stats/scope.h" #include "common/common/fmt.h" diff --git a/source/server/overload_manager_impl.h b/source/server/overload_manager_impl.h index 8b55786ecdfd5..7516fe54504f2 100644 --- a/source/server/overload_manager_impl.h +++ b/source/server/overload_manager_impl.h @@ -6,7 +6,7 @@ #include #include "envoy/api/api.h" -#include "envoy/config/overload/v2alpha/overload.pb.validate.h" +#include "envoy/config/overload/v2alpha/overload.pb.h" #include "envoy/event/dispatcher.h" #include "envoy/protobuf/message_validator.h" #include "envoy/server/overload_manager.h" diff --git a/source/server/proto_descriptors.cc b/source/server/proto_descriptors.cc index 334ead1a07a9d..950c9bcf97ccf 100644 --- a/source/server/proto_descriptors.cc +++ b/source/server/proto_descriptors.cc @@ -1,14 +1,5 @@ #include "server/proto_descriptors.h" -#include "envoy/api/v2/cds.pb.h" -#include "envoy/api/v2/eds.pb.h" -#include "envoy/api/v2/lds.pb.h" -#include "envoy/api/v2/rds.pb.h" -#include "envoy/api/v2/srds.pb.h" -#include "envoy/service/discovery/v2/ads.pb.h" -#include "envoy/service/discovery/v2/hds.pb.h" -#include "envoy/service/ratelimit/v2/rls.pb.h" - #include "common/common/assert.h" #include "common/common/fmt.h" #include "common/config/protobuf_link_hacks.h" diff --git a/source/server/server.h b/source/server/server.h index 884cec832ef75..d69d4e361328f 100644 --- a/source/server/server.h +++ b/source/server/server.h @@ -8,6 +8,7 @@ #include #include +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" #include "envoy/event/timer.h" #include "envoy/server/drain_manager.h" #include "envoy/server/guarddog.h" diff --git a/source/server/ssl_context_manager.h b/source/server/ssl_context_manager.h index b337251309d4f..4b618e6e64f4e 100644 --- a/source/server/ssl_context_manager.h +++ b/source/server/ssl_context_manager.h @@ -10,4 +10,4 @@ Ssl::ContextManagerPtr createContextManager(const std::string& factory_name, TimeSource& time_source); } // namespace Server -} // namespace Envoy \ No newline at end of file +} // namespace Envoy diff --git a/test/common/access_log/BUILD b/test/common/access_log/BUILD index b0622e328933a..618dced63e169 100644 --- a/test/common/access_log/BUILD +++ b/test/common/access_log/BUILD @@ -41,6 +41,7 @@ envoy_cc_test( "//test/mocks/stream_info:stream_info_mocks", "//test/mocks/upstream:upstream_mocks", "//test/test_common:utility_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) diff --git a/test/common/access_log/access_log_formatter_test.cc b/test/common/access_log/access_log_formatter_test.cc index 9fabf6295175b..5040252e95a61 100644 --- a/test/common/access_log/access_log_formatter_test.cc +++ b/test/common/access_log/access_log_formatter_test.cc @@ -3,6 +3,8 @@ #include #include +#include "envoy/api/v2/core/base.pb.h" + #include "common/access_log/access_log_formatter.h" #include "common/common/utility.h" #include "common/http/header_map_impl.h" diff --git a/test/common/access_log/access_log_impl_test.cc b/test/common/access_log/access_log_impl_test.cc index 059d44313e8c2..9b1fcef9f55e2 100644 --- a/test/common/access_log/access_log_impl_test.cc +++ b/test/common/access_log/access_log_impl_test.cc @@ -3,6 +3,7 @@ #include #include +#include "envoy/config/filter/accesslog/v2/accesslog.pb.h" #include "envoy/config/filter/accesslog/v2/accesslog.pb.validate.h" #include "envoy/upstream/cluster_manager.h" #include "envoy/upstream/upstream.h" diff --git a/test/common/common/BUILD b/test/common/common/BUILD index a94642e72d301..056ce9ac37b41 100644 --- a/test/common/common/BUILD +++ b/test/common/common/BUILD @@ -165,6 +165,7 @@ envoy_cc_test( deps = [ "//source/common/common:regex_lib", "//test/test_common:utility_lib", + "@envoy_api//envoy/type/matcher:pkg_cc_proto", ], ) diff --git a/test/common/common/matchers_test.cc b/test/common/common/matchers_test.cc index 3c0a64f4ca053..f014b607609f0 100644 --- a/test/common/common/matchers_test.cc +++ b/test/common/common/matchers_test.cc @@ -1,7 +1,7 @@ #include "envoy/api/v2/core/base.pb.h" #include "envoy/type/matcher/metadata.pb.h" -#include "envoy/type/matcher/number.pb.h" #include "envoy/type/matcher/string.pb.h" +#include "envoy/type/matcher/value.pb.h" #include "common/common/matchers.h" #include "common/config/metadata.h" diff --git a/test/common/common/regex_test.cc b/test/common/common/regex_test.cc index 40caf6fa34e46..377442366707d 100644 --- a/test/common/common/regex_test.cc +++ b/test/common/common/regex_test.cc @@ -1,4 +1,5 @@ #include "envoy/common/exception.h" +#include "envoy/type/matcher/regex.pb.h" #include "common/common/regex.h" diff --git a/test/common/compressor/zlib_compressor_impl_test.cc b/test/common/compressor/zlib_compressor_impl_test.cc index 112325f6e3770..eaebd01a0ae54 100644 --- a/test/common/compressor/zlib_compressor_impl_test.cc +++ b/test/common/compressor/zlib_compressor_impl_test.cc @@ -206,4 +206,4 @@ TEST_F(ZlibCompressorImplTest, CompressWithNotCommonParams) { } // namespace } // namespace Compressor -} // namespace Envoy \ No newline at end of file +} // namespace Envoy diff --git a/test/common/config/BUILD b/test/common/config/BUILD index 651d43196f6eb..6e3369de52bed 100644 --- a/test/common/config/BUILD +++ b/test/common/config/BUILD @@ -34,6 +34,8 @@ envoy_cc_test( "//test/mocks/local_info:local_info_mocks", "//test/mocks/runtime:runtime_mocks", "//test/test_common:logging_lib", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -50,6 +52,7 @@ envoy_cc_test( "//test/mocks/local_info:local_info_mocks", "//test/mocks/runtime:runtime_mocks", "//test/test_common:logging_lib", + "@envoy_api//envoy/api/v2:pkg_cc_proto", ], ) @@ -61,6 +64,7 @@ envoy_cc_test( "//test/mocks/event:event_mocks", "//test/mocks/filesystem:filesystem_mocks", "//test/test_common:logging_lib", + "@envoy_api//envoy/api/v2:pkg_cc_proto", ], ) @@ -162,6 +166,7 @@ envoy_cc_test_library( "//test/mocks/upstream:upstream_mocks", "//test/test_common:utility_lib", "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -177,6 +182,8 @@ envoy_cc_test_library( "//test/mocks/grpc:grpc_mocks", "//test/mocks/local_info:local_info_mocks", "//test/mocks/runtime:runtime_mocks", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -206,6 +213,7 @@ envoy_cc_test_library( "//test/mocks/upstream:upstream_mocks", "//test/test_common:utility_lib", "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -225,6 +233,7 @@ envoy_cc_test( "//test/test_common:environment_lib", "//test/test_common:utility_lib", "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -259,6 +268,7 @@ envoy_cc_test( "//source/common/protobuf:utility_lib", "//test/test_common:registry_lib", "//test/test_common:utility_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -268,6 +278,7 @@ envoy_cc_test( deps = [ "//source/common/config:runtime_utility_lib", "//test/test_common:utility_lib", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", ], ) @@ -287,6 +298,8 @@ envoy_cc_test( "//test/test_common:utility_lib", "@com_github_cncf_udpa//udpa/type/v1:pkg_cc_proto", "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", ], ) @@ -324,6 +337,8 @@ envoy_cc_test( "//source/common/protobuf:utility_lib", "//test/mocks/server:server_mocks", "//test/test_common:simulated_time_system_lib", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) diff --git a/test/common/config/api_type_oracle_test.cc b/test/common/config/api_type_oracle_test.cc index 4b5f436fab331..7bfe4e44641c2 100644 --- a/test/common/config/api_type_oracle_test.cc +++ b/test/common/config/api_type_oracle_test.cc @@ -1,9 +1,8 @@ -#include "common/config/api_type_oracle.h" - -// For proto descriptors only #include "envoy/config/filter/http/ip_tagging/v2/ip_tagging.pb.h" #include "envoy/config/filter/http/ip_tagging/v3alpha/ip_tagging.pb.h" +#include "common/config/api_type_oracle.h" + #include "gtest/gtest.h" #include "udpa/type/v1/typed_struct.pb.h" @@ -12,6 +11,10 @@ namespace Config { namespace { TEST(ApiTypeOracleTest, All) { + // For proto descriptors only + static_cast(envoy::config::filter::http::ip_tagging::v2::IPTagging::RequestType()); + static_cast(envoy::config::filter::http::ip_tagging::v3alpha::IPTagging::RequestType()); + EXPECT_EQ(nullptr, ApiTypeOracle::inferEarlierVersionDescriptor("foo", {}, "")); EXPECT_EQ(nullptr, ApiTypeOracle::inferEarlierVersionDescriptor("envoy.ip_tagging", {}, "")); diff --git a/test/common/config/config_provider_impl_test.cc b/test/common/config/config_provider_impl_test.cc index 6bf5e0f9ce046..9e9f348d4f7ab 100644 --- a/test/common/config/config_provider_impl_test.cc +++ b/test/common/config/config_provider_impl_test.cc @@ -1,5 +1,8 @@ #include +#include "envoy/api/v2/core/config_source.pb.h" +#include "envoy/api/v2/discovery.pb.h" + #include "common/config/config_provider_impl.h" #include "common/protobuf/utility.h" diff --git a/test/common/config/datasource_test.cc b/test/common/config/datasource_test.cc index 509a00d672af3..7bf171b41213e 100644 --- a/test/common/config/datasource_test.cc +++ b/test/common/config/datasource_test.cc @@ -1,5 +1,4 @@ #include "envoy/api/v2/core/base.pb.h" -#include "envoy/api/v2/core/base.pb.validate.h" #include "common/common/empty_string.h" #include "common/config/datasource.h" @@ -427,4 +426,4 @@ TEST_F(AsyncDataSourceTest, datasourceReleasedBeforeFetchingData) { } // namespace } // namespace Config -} // namespace Envoy \ No newline at end of file +} // namespace Envoy diff --git a/test/common/config/delta_subscription_impl_test.cc b/test/common/config/delta_subscription_impl_test.cc index e6b783b6583fa..4a3694d903ff8 100644 --- a/test/common/config/delta_subscription_impl_test.cc +++ b/test/common/config/delta_subscription_impl_test.cc @@ -1,3 +1,7 @@ +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/api/v2/discovery.pb.h" +#include "envoy/api/v2/eds.pb.h" + #include "common/buffer/zero_copy_input_stream_impl.h" #include "test/common/config/delta_subscription_test_harness.h" diff --git a/test/common/config/delta_subscription_state_test.cc b/test/common/config/delta_subscription_state_test.cc index f98dfe5aa05ef..1734d97dc83c7 100644 --- a/test/common/config/delta_subscription_state_test.cc +++ b/test/common/config/delta_subscription_state_test.cc @@ -1,3 +1,6 @@ +#include "envoy/api/v2/cds.pb.h" +#include "envoy/api/v2/discovery.pb.h" + #include "common/config/delta_subscription_state.h" #include "common/config/utility.h" #include "common/stats/isolated_store_impl.h" diff --git a/test/common/config/delta_subscription_test_harness.h b/test/common/config/delta_subscription_test_harness.h index bf35490d4b901..2ed0609d72518 100644 --- a/test/common/config/delta_subscription_test_harness.h +++ b/test/common/config/delta_subscription_test_harness.h @@ -2,6 +2,10 @@ #include +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/api/v2/discovery.pb.h" +#include "envoy/api/v2/eds.pb.h" + #include "common/config/delta_subscription_impl.h" #include "common/grpc/common.h" diff --git a/test/common/config/filesystem_subscription_impl_test.cc b/test/common/config/filesystem_subscription_impl_test.cc index 8c0f19775c223..7b83c61cc59a3 100644 --- a/test/common/config/filesystem_subscription_impl_test.cc +++ b/test/common/config/filesystem_subscription_impl_test.cc @@ -1,3 +1,5 @@ +#include "envoy/api/v2/eds.pb.h" + #include "test/common/config/filesystem_subscription_test_harness.h" #include "test/mocks/event/mocks.h" #include "test/mocks/filesystem/mocks.h" diff --git a/test/common/config/filesystem_subscription_test_harness.h b/test/common/config/filesystem_subscription_test_harness.h index 1958a4270bd69..f05d36cd2479c 100644 --- a/test/common/config/filesystem_subscription_test_harness.h +++ b/test/common/config/filesystem_subscription_test_harness.h @@ -2,6 +2,7 @@ #include +#include "envoy/api/v2/discovery.pb.h" #include "envoy/api/v2/eds.pb.h" #include "common/config/filesystem_subscription_impl.h" diff --git a/test/common/config/grpc_subscription_test_harness.h b/test/common/config/grpc_subscription_test_harness.h index 476230d68cb58..25dbff0c3fb3c 100644 --- a/test/common/config/grpc_subscription_test_harness.h +++ b/test/common/config/grpc_subscription_test_harness.h @@ -2,6 +2,8 @@ #include +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/api/v2/discovery.pb.h" #include "envoy/api/v2/eds.pb.h" #include "common/common/hash.h" diff --git a/test/common/config/http_subscription_test_harness.h b/test/common/config/http_subscription_test_harness.h index 1f00c95cd87da..07862eafdae5d 100644 --- a/test/common/config/http_subscription_test_harness.h +++ b/test/common/config/http_subscription_test_harness.h @@ -2,6 +2,8 @@ #include +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/api/v2/discovery.pb.h" #include "envoy/api/v2/eds.pb.h" #include "envoy/http/async_client.h" diff --git a/test/common/config/metadata_test.cc b/test/common/config/metadata_test.cc index 885d69f821171..b856a45e82b15 100644 --- a/test/common/config/metadata_test.cc +++ b/test/common/config/metadata_test.cc @@ -1,3 +1,4 @@ +#include "envoy/api/v2/core/base.pb.h" #include "envoy/common/exception.h" #include "common/config/metadata.h" diff --git a/test/common/config/runtime_utility_test.cc b/test/common/config/runtime_utility_test.cc index 0451f1a6b9a2b..76352810b118e 100644 --- a/test/common/config/runtime_utility_test.cc +++ b/test/common/config/runtime_utility_test.cc @@ -1,3 +1,5 @@ +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" + #include "common/config/runtime_utility.h" #include "test/test_common/utility.h" diff --git a/test/common/config/subscription_factory_impl_test.cc b/test/common/config/subscription_factory_impl_test.cc index 403ad4d5f91f9..547ae7fa876ed 100644 --- a/test/common/config/subscription_factory_impl_test.cc +++ b/test/common/config/subscription_factory_impl_test.cc @@ -1,5 +1,8 @@ #include +#include "envoy/api/v2/cds.pb.h" +#include "envoy/api/v2/core/config_source.pb.h" +#include "envoy/api/v2/core/grpc_service.pb.h" #include "envoy/api/v2/eds.pb.h" #include "envoy/common/exception.h" #include "envoy/stats/scope.h" diff --git a/test/common/config/utility_test.cc b/test/common/config/utility_test.cc index 075f42828e5d3..be838813150b8 100644 --- a/test/common/config/utility_test.cc +++ b/test/common/config/utility_test.cc @@ -1,5 +1,8 @@ -#include "envoy/api/v2/eds.pb.h" +#include "envoy/api/v2/cds.pb.h" +#include "envoy/api/v2/core/config_source.pb.h" +#include "envoy/api/v2/core/grpc_service.pb.h" #include "envoy/common/exception.h" +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" #include "common/common/fmt.h" #include "common/config/utility.h" diff --git a/test/common/config/watch_map_test.cc b/test/common/config/watch_map_test.cc index 77003b2a61c5b..e70129fb51e89 100644 --- a/test/common/config/watch_map_test.cc +++ b/test/common/config/watch_map_test.cc @@ -1,5 +1,6 @@ #include +#include "envoy/api/v2/discovery.pb.h" #include "envoy/api/v2/eds.pb.h" #include "envoy/common/exception.h" #include "envoy/stats/scope.h" diff --git a/test/common/grpc/BUILD b/test/common/grpc/BUILD index 523c1d1fd2662..5bffedb3f73cc 100644 --- a/test/common/grpc/BUILD +++ b/test/common/grpc/BUILD @@ -21,6 +21,7 @@ envoy_cc_test( "//test/mocks/upstream:upstream_mocks", "//test/proto:helloworld_proto_cc_proto", "//test/test_common:test_time_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -34,6 +35,7 @@ envoy_cc_test( "//test/mocks/thread_local:thread_local_mocks", "//test/mocks/upstream:upstream_mocks", "//test/test_common:utility_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -131,6 +133,7 @@ envoy_cc_test_library( "//source/common/common:assert_lib", "//test/mocks/secret:secret_mocks", "//test/test_common:utility_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -150,6 +153,8 @@ envoy_cc_test_library( "//test/test_common:global_lib", "//test/test_common:test_time_lib", "//test/test_common:utility_lib", + "@envoy_api//envoy/api/v2/auth:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) diff --git a/test/common/grpc/async_client_impl_test.cc b/test/common/grpc/async_client_impl_test.cc index 72e5d6411584f..c50f76669ecf3 100644 --- a/test/common/grpc/async_client_impl_test.cc +++ b/test/common/grpc/async_client_impl_test.cc @@ -1,3 +1,5 @@ +#include "envoy/api/v2/core/grpc_service.pb.h" + #include "common/grpc/async_client_impl.h" #include "test/mocks/http/mocks.h" diff --git a/test/common/grpc/async_client_manager_impl_test.cc b/test/common/grpc/async_client_manager_impl_test.cc index 7678dfef41fea..c42a1528a974f 100644 --- a/test/common/grpc/async_client_manager_impl_test.cc +++ b/test/common/grpc/async_client_manager_impl_test.cc @@ -1,3 +1,5 @@ +#include "envoy/api/v2/core/grpc_service.pb.h" + #include "common/api/api_impl.h" #include "common/grpc/async_client_manager_impl.h" diff --git a/test/common/grpc/google_async_client_impl_test.cc b/test/common/grpc/google_async_client_impl_test.cc index 40a7d02da2dab..c1cfa95395379 100644 --- a/test/common/grpc/google_async_client_impl_test.cc +++ b/test/common/grpc/google_async_client_impl_test.cc @@ -1,3 +1,4 @@ +#include "envoy/api/v2/core/grpc_service.pb.h" #include "envoy/stats/scope.h" #include "common/api/api_impl.h" diff --git a/test/common/grpc/google_grpc_creds_test.cc b/test/common/grpc/google_grpc_creds_test.cc index 19b6b735dc6dd..9689c0299202c 100644 --- a/test/common/grpc/google_grpc_creds_test.cc +++ b/test/common/grpc/google_grpc_creds_test.cc @@ -1,5 +1,7 @@ #include +#include "envoy/api/v2/core/grpc_service.pb.h" + #include "common/grpc/google_grpc_creds_impl.h" #include "test/common/grpc/utility.h" diff --git a/test/common/grpc/grpc_client_integration.h b/test/common/grpc/grpc_client_integration.h index 86017cf821d15..e54805ba39663 100644 --- a/test/common/grpc/grpc_client_integration.h +++ b/test/common/grpc/grpc_client_integration.h @@ -1,5 +1,7 @@ #pragma once +#include "envoy/api/v2/core/grpc_service.pb.h" + #include "common/common/assert.h" #include "test/test_common/utility.h" diff --git a/test/common/grpc/grpc_client_integration_test.cc b/test/common/grpc/grpc_client_integration_test.cc index d2c93021882f0..6858c3fa65d90 100644 --- a/test/common/grpc/grpc_client_integration_test.cc +++ b/test/common/grpc/grpc_client_integration_test.cc @@ -1,4 +1,6 @@ #ifdef ENVOY_GOOGLE_GRPC +#include "envoy/api/v2/core/grpc_service.pb.h" + #include "common/grpc/google_async_client_impl.h" #include "extensions/grpc_credentials/well_known_names.h" diff --git a/test/common/grpc/grpc_client_integration_test_harness.h b/test/common/grpc/grpc_client_integration_test_harness.h index 8b37766adb6d8..730e4a84812d2 100644 --- a/test/common/grpc/grpc_client_integration_test_harness.h +++ b/test/common/grpc/grpc_client_integration_test_harness.h @@ -1,5 +1,8 @@ #pragma once +#include "envoy/api/v2/auth/cert.pb.h" +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/api/v2/core/grpc_service.pb.h" #include "envoy/stats/scope.h" #include "common/api/api_impl.h" diff --git a/test/common/http/BUILD b/test/common/http/BUILD index b6a6ae43810dd..edf83118d8395 100644 --- a/test/common/http/BUILD +++ b/test/common/http/BUILD @@ -31,6 +31,8 @@ envoy_cc_test( "//test/mocks/stats:stats_mocks", "//test/mocks/upstream:upstream_mocks", "//test/test_common:test_time_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/api/v2/route:pkg_cc_proto", ], ) @@ -162,6 +164,7 @@ envoy_cc_fuzz_test( "//test/mocks/tracing:tracing_mocks", "//test/mocks/upstream:upstream_mocks", "//test/test_common:simulated_time_system_lib", + "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto", ], ) @@ -203,6 +206,9 @@ envoy_cc_test( "//test/mocks/upstream:upstream_mocks", "//test/test_common:logging_lib", "//test/test_common:test_time_lib", + "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto", + "@envoy_api//envoy/type:pkg_cc_proto", + "@envoy_api//envoy/type/tracing/v2:pkg_cc_proto", ], ) @@ -225,6 +231,8 @@ envoy_cc_test( "//test/mocks/upstream:upstream_mocks", "//test/test_common:test_runtime_lib", "//test/test_common:utility_lib", + "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto", + "@envoy_api//envoy/type:pkg_cc_proto", ], ) diff --git a/test/common/http/async_client_impl_test.cc b/test/common/http/async_client_impl_test.cc index 3aa33b548100e..ad89769e17d14 100644 --- a/test/common/http/async_client_impl_test.cc +++ b/test/common/http/async_client_impl_test.cc @@ -3,6 +3,9 @@ #include #include +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/api/v2/route/route.pb.h" + #include "common/buffer/buffer_impl.h" #include "common/http/async_client_impl.h" #include "common/http/context_impl.h" diff --git a/test/common/http/conn_manager_impl_fuzz_test.cc b/test/common/http/conn_manager_impl_fuzz_test.cc index d64e24b3f1b78..5d4ac94980685 100644 --- a/test/common/http/conn_manager_impl_fuzz_test.cc +++ b/test/common/http/conn_manager_impl_fuzz_test.cc @@ -12,6 +12,8 @@ // * Idle/drain timeouts. // * HTTP 1.0 special cases // * Fuzz config settings +#include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.h" + #include "common/common/empty_string.h" #include "common/http/conn_manager_impl.h" #include "common/http/context_impl.h" diff --git a/test/common/http/conn_manager_impl_test.cc b/test/common/http/conn_manager_impl_test.cc index 86239175431e9..0765d5d4a4004 100644 --- a/test/common/http/conn_manager_impl_test.cc +++ b/test/common/http/conn_manager_impl_test.cc @@ -6,8 +6,11 @@ #include "envoy/access_log/access_log.h" #include "envoy/buffer/buffer.h" +#include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.h" #include "envoy/event/dispatcher.h" #include "envoy/tracing/http_tracer.h" +#include "envoy/type/percent.pb.h" +#include "envoy/type/tracing/v2/custom_tag.pb.h" #include "common/access_log/access_log_formatter.h" #include "common/access_log/access_log_impl.h" diff --git a/test/common/http/conn_manager_utility_test.cc b/test/common/http/conn_manager_utility_test.cc index 9b3257092b416..6177f70494de4 100644 --- a/test/common/http/conn_manager_utility_test.cc +++ b/test/common/http/conn_manager_utility_test.cc @@ -1,5 +1,8 @@ #include +#include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.h" +#include "envoy/type/percent.pb.h" + #include "common/http/conn_manager_utility.h" #include "common/http/header_utility.h" #include "common/http/headers.h" diff --git a/test/common/http/http1/header_formatter_test.cc b/test/common/http/http1/header_formatter_test.cc index 3fd7eb323093d..d5ce38f1bfcf6 100644 --- a/test/common/http/http1/header_formatter_test.cc +++ b/test/common/http/http1/header_formatter_test.cc @@ -22,4 +22,4 @@ TEST(ProperCaseHeaderKeyFormatterTest, Formatting) { } } // namespace Http1 } // namespace Http -} // namespace Envoy \ No newline at end of file +} // namespace Envoy diff --git a/test/common/http/utility_test.cc b/test/common/http/utility_test.cc index 88b7b3781ee88..f6fd886de24a7 100644 --- a/test/common/http/utility_test.cc +++ b/test/common/http/utility_test.cc @@ -2,6 +2,7 @@ #include #include +#include "envoy/api/v2/core/http_uri.pb.h" #include "envoy/api/v2/core/protocol.pb.h" #include "envoy/api/v2/core/protocol.pb.validate.h" diff --git a/test/common/network/BUILD b/test/common/network/BUILD index ac397390c95e5..5b7a2a04c7c8d 100644 --- a/test/common/network/BUILD +++ b/test/common/network/BUILD @@ -83,6 +83,7 @@ envoy_cc_test( "//test/test_common:network_utility_lib", "//test/test_common:simulated_time_system_lib", "//test/test_common:test_time_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -105,6 +106,7 @@ envoy_cc_test( "//test/test_common:environment_lib", "//test/test_common:network_utility_lib", "//test/test_common:utility_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -131,6 +133,8 @@ envoy_cc_test( "//test/mocks/upstream:host_mocks", "//test/mocks/upstream:upstream_mocks", "//test/test_common:utility_lib", + "@envoy_api//envoy/config/filter/network/rate_limit/v2:pkg_cc_proto", + "@envoy_api//envoy/config/filter/network/tcp_proxy/v2:pkg_cc_proto", ], ) @@ -157,6 +161,7 @@ envoy_cc_test( "//test/test_common:environment_lib", "//test/test_common:network_utility_lib", "//test/test_common:utility_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -175,6 +180,7 @@ envoy_cc_test( "//test/test_common:environment_lib", "//test/test_common:network_utility_lib", "//test/test_common:utility_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -195,6 +201,7 @@ envoy_cc_test( "//test/test_common:network_utility_lib", "//test/test_common:threadsafe_singleton_injector_lib", "//test/test_common:utility_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -223,6 +230,7 @@ envoy_cc_test_library( "//test/mocks/network:network_mocks", "//test/test_common:logging_lib", "//test/test_common:threadsafe_singleton_injector_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -232,6 +240,7 @@ envoy_cc_test( deps = [ ":socket_option_test", "//test/test_common:environment_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -247,6 +256,7 @@ envoy_cc_test( "//test/mocks/network:network_mocks", "//test/test_common:environment_lib", "//test/test_common:threadsafe_singleton_injector_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -257,6 +267,7 @@ envoy_cc_test( ":socket_option_test", "//source/common/network:addr_family_aware_socket_option_lib", "//source/common/network:address_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -268,6 +279,7 @@ envoy_cc_test( "//source/common/network:utility_lib", "//test/mocks/network:network_mocks", "//test/test_common:environment_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) diff --git a/test/common/network/addr_family_aware_socket_option_impl_test.cc b/test/common/network/addr_family_aware_socket_option_impl_test.cc index c6c6d97fbe78b..ef4fb9c41fdd0 100644 --- a/test/common/network/addr_family_aware_socket_option_impl_test.cc +++ b/test/common/network/addr_family_aware_socket_option_impl_test.cc @@ -1,3 +1,4 @@ +#include "envoy/api/v2/core/base.pb.h" #include "envoy/common/platform.h" #include "common/network/addr_family_aware_socket_option_impl.h" diff --git a/test/common/network/connection_impl_test.cc b/test/common/network/connection_impl_test.cc index 90493b7f7abf3..4a71e77962023 100644 --- a/test/common/network/connection_impl_test.cc +++ b/test/common/network/connection_impl_test.cc @@ -2,6 +2,7 @@ #include #include +#include "envoy/api/v2/core/base.pb.h" #include "envoy/common/platform.h" #include "common/buffer/buffer_impl.h" diff --git a/test/common/network/dns_impl_test.cc b/test/common/network/dns_impl_test.cc index ab1f4e26a21ac..388621247de17 100644 --- a/test/common/network/dns_impl_test.cc +++ b/test/common/network/dns_impl_test.cc @@ -8,6 +8,7 @@ #include #include +#include "envoy/api/v2/core/address.pb.h" #include "envoy/event/dispatcher.h" #include "envoy/network/address.h" #include "envoy/network/dns.h" diff --git a/test/common/network/filter_manager_impl_test.cc b/test/common/network/filter_manager_impl_test.cc index d9c65c83c095d..c3ce9cd193627 100644 --- a/test/common/network/filter_manager_impl_test.cc +++ b/test/common/network/filter_manager_impl_test.cc @@ -1,6 +1,9 @@ #include #include +#include "envoy/config/filter/network/rate_limit/v2/rate_limit.pb.h" +#include "envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.pb.h" + #include "common/buffer/buffer_impl.h" #include "common/network/filter_manager_impl.h" #include "common/tcp_proxy/tcp_proxy.h" diff --git a/test/common/network/listen_socket_impl_test.cc b/test/common/network/listen_socket_impl_test.cc index fa9d9160ea6c0..56adea5ef64a5 100644 --- a/test/common/network/listen_socket_impl_test.cc +++ b/test/common/network/listen_socket_impl_test.cc @@ -1,3 +1,5 @@ +#include "envoy/api/v2/core/base.pb.h" + #include "common/network/io_socket_handle_impl.h" #include "common/network/listen_socket_impl.h" #include "common/network/utility.h" diff --git a/test/common/network/listener_impl_test.cc b/test/common/network/listener_impl_test.cc index 02c9d29e672a3..9653012ddbb68 100644 --- a/test/common/network/listener_impl_test.cc +++ b/test/common/network/listener_impl_test.cc @@ -1,3 +1,5 @@ +#include "envoy/api/v2/core/base.pb.h" + #include "common/network/address_impl.h" #include "common/network/listener_impl.h" #include "common/network/utility.h" diff --git a/test/common/network/socket_option_factory_test.cc b/test/common/network/socket_option_factory_test.cc index ca5e25cc363f5..da2c441a871dd 100644 --- a/test/common/network/socket_option_factory_test.cc +++ b/test/common/network/socket_option_factory_test.cc @@ -1,3 +1,5 @@ +#include "envoy/api/v2/core/base.pb.h" + #include "common/network/address_impl.h" #include "common/network/socket_option_factory.h" #include "common/network/socket_option_impl.h" diff --git a/test/common/network/socket_option_impl_test.cc b/test/common/network/socket_option_impl_test.cc index d979d8a01098b..65031311814eb 100644 --- a/test/common/network/socket_option_impl_test.cc +++ b/test/common/network/socket_option_impl_test.cc @@ -1,3 +1,5 @@ +#include "envoy/api/v2/core/base.pb.h" + #include "test/common/network/socket_option_test.h" namespace Envoy { diff --git a/test/common/network/socket_option_test.h b/test/common/network/socket_option_test.h index c4d57591209ae..21cd2767d561a 100644 --- a/test/common/network/socket_option_test.h +++ b/test/common/network/socket_option_test.h @@ -1,5 +1,7 @@ #pragma once +#include "envoy/api/v2/core/base.pb.h" + #include "common/network/address_impl.h" #include "common/network/socket_option_impl.h" diff --git a/test/common/network/udp_listener_impl_test.cc b/test/common/network/udp_listener_impl_test.cc index 485df4fef59d4..61e648e2cf596 100644 --- a/test/common/network/udp_listener_impl_test.cc +++ b/test/common/network/udp_listener_impl_test.cc @@ -2,6 +2,8 @@ #include #include +#include "envoy/api/v2/core/base.pb.h" + #include "common/network/address_impl.h" #include "common/network/socket_option_factory.h" #include "common/network/socket_option_impl.h" diff --git a/test/common/network/utility_test.cc b/test/common/network/utility_test.cc index 3d92065481462..8ee5762bcc279 100644 --- a/test/common/network/utility_test.cc +++ b/test/common/network/utility_test.cc @@ -2,6 +2,7 @@ #include #include +#include "envoy/api/v2/core/address.pb.h" #include "envoy/common/exception.h" #include "common/common/thread.h" diff --git a/test/common/protobuf/BUILD b/test/common/protobuf/BUILD index d64b7e15c60ef..f437a1a4bac73 100644 --- a/test/common/protobuf/BUILD +++ b/test/common/protobuf/BUILD @@ -35,6 +35,7 @@ envoy_cc_test( "//test/test_common:utility_lib", "@envoy_api//envoy/api/v2:pkg_cc_proto", "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", + "@envoy_api//envoy/type:pkg_cc_proto", ], ) diff --git a/test/common/protobuf/utility_test.cc b/test/common/protobuf/utility_test.cc index 7f63b2856ba27..bb41d3e5d986d 100644 --- a/test/common/protobuf/utility_test.cc +++ b/test/common/protobuf/utility_test.cc @@ -1,8 +1,10 @@ #include +#include "envoy/api/v2/cds.pb.h" #include "envoy/api/v2/cds.pb.validate.h" #include "envoy/config/bootstrap/v2/bootstrap.pb.h" #include "envoy/config/bootstrap/v2/bootstrap.pb.validate.h" +#include "envoy/type/percent.pb.h" #include "common/common/base64.h" #include "common/protobuf/message_validator_impl.h" diff --git a/test/common/router/BUILD b/test/common/router/BUILD index ae4872656815a..66d7228729996 100644 --- a/test/common/router/BUILD +++ b/test/common/router/BUILD @@ -35,6 +35,7 @@ envoy_cc_test_library( "//test/test_common:utility_lib", "@envoy_api//envoy/api/v2:pkg_cc_proto", "@envoy_api//envoy/api/v2/route:pkg_cc_proto", + "@envoy_api//envoy/type:pkg_cc_proto", ], ) @@ -74,6 +75,8 @@ envoy_cc_test( "//test/test_common:simulated_time_system_lib", "//test/test_common:utility_lib", "@envoy_api//envoy/admin/v2alpha:pkg_cc_proto", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto", ], ) @@ -87,6 +90,8 @@ envoy_cc_test( "//source/common/router:scoped_config_lib", "//test/mocks/router:router_mocks", "//test/test_common:utility_lib", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto", ], ) @@ -111,6 +116,9 @@ envoy_cc_test( "//test/test_common:simulated_time_system_lib", "//test/test_common:utility_lib", "@envoy_api//envoy/admin/v2alpha:pkg_cc_proto", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto", ], ) @@ -130,7 +138,8 @@ envoy_cc_test( "//test/mocks/upstream:upstream_mocks", "//test/test_common:simulated_time_system_lib", "//test/test_common:utility_lib", - "@envoy_api//envoy/admin/v2alpha:pkg_cc_proto", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/route:pkg_cc_proto", ], ) @@ -145,6 +154,7 @@ envoy_cc_test( "//test/mocks/runtime:runtime_mocks", "//test/mocks/upstream:upstream_mocks", "//test/test_common:utility_lib", + "@envoy_api//envoy/api/v2/route:pkg_cc_proto", ], ) @@ -210,6 +220,7 @@ envoy_cc_fuzz_test( "//test/fuzz:utility_lib", "//test/mocks/server:server_mocks", "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/route:pkg_cc_proto", ], ) @@ -226,6 +237,7 @@ envoy_cc_test( "//test/mocks/router:router_mocks", "//test/mocks/server:server_mocks", "//test/test_common:utility_lib", + "@envoy_api//envoy/api/v2:pkg_cc_proto", "@envoy_api//envoy/api/v2/route:pkg_cc_proto", ], ) @@ -253,6 +265,8 @@ envoy_cc_test( "//test/test_common:simulated_time_system_lib", "//test/test_common:test_runtime_lib", "//test/test_common:utility_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/type:pkg_cc_proto", ], ) @@ -279,6 +293,9 @@ envoy_cc_test( "//test/mocks/ssl:ssl_mocks", "//test/mocks/upstream:upstream_mocks", "//test/test_common:utility_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/config/filter/accesslog/v2:pkg_cc_proto", + "@envoy_api//envoy/config/filter/http/router/v2:pkg_cc_proto", ], ) @@ -310,6 +327,7 @@ envoy_cc_test( "//test/test_common:utility_lib", "@envoy_api//envoy/api/v2:pkg_cc_proto", "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/api/v2/route:pkg_cc_proto", ], ) diff --git a/test/common/router/config_impl_test.cc b/test/common/router/config_impl_test.cc index 0d12eba6b2b71..5ffe51929c291 100644 --- a/test/common/router/config_impl_test.cc +++ b/test/common/router/config_impl_test.cc @@ -5,9 +5,11 @@ #include #include +#include "envoy/api/v2/rds.pb.h" #include "envoy/api/v2/rds.pb.validate.h" -#include "envoy/api/v2/route/route.pb.validate.h" +#include "envoy/api/v2/route/route.pb.h" #include "envoy/server/filter_config.h" +#include "envoy/type/percent.pb.h" #include "common/config/metadata.h" #include "common/config/well_known_names.h" diff --git a/test/common/router/header_formatter_test.cc b/test/common/router/header_formatter_test.cc index 6c210a47b145c..c910e61cccfcf 100644 --- a/test/common/router/header_formatter_test.cc +++ b/test/common/router/header_formatter_test.cc @@ -1,7 +1,9 @@ #include #include "envoy/api/v2/core/base.pb.h" +#include "envoy/api/v2/rds.pb.h" #include "envoy/api/v2/rds.pb.validate.h" +#include "envoy/api/v2/route/route.pb.h" #include "envoy/http/protocol.h" #include "common/config/metadata.h" diff --git a/test/common/router/rds_impl_test.cc b/test/common/router/rds_impl_test.cc index 4e7be26a9a8ea..ceb9ac744cd84 100644 --- a/test/common/router/rds_impl_test.cc +++ b/test/common/router/rds_impl_test.cc @@ -4,6 +4,9 @@ #include "envoy/admin/v2alpha/config_dump.pb.h" #include "envoy/admin/v2alpha/config_dump.pb.validate.h" +#include "envoy/api/v2/discovery.pb.h" +#include "envoy/api/v2/rds.pb.h" +#include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.h" #include "envoy/stats/scope.h" #include "common/config/utility.h" diff --git a/test/common/router/retry_state_impl_test.cc b/test/common/router/retry_state_impl_test.cc index 24977c5d5e4e2..095553fe27af5 100644 --- a/test/common/router/retry_state_impl_test.cc +++ b/test/common/router/retry_state_impl_test.cc @@ -1,5 +1,6 @@ #include +#include "envoy/api/v2/route/route.pb.h" #include "envoy/stats/stats.h" #include "common/http/header_map_impl.h" diff --git a/test/common/router/route_fuzz_test.cc b/test/common/router/route_fuzz_test.cc index 34df71b6b0a3a..7c2879e544c07 100644 --- a/test/common/router/route_fuzz_test.cc +++ b/test/common/router/route_fuzz_test.cc @@ -1,4 +1,6 @@ +#include "envoy/api/v2/rds.pb.h" #include "envoy/api/v2/rds.pb.validate.h" +#include "envoy/api/v2/route/route.pb.h" #include "common/router/config_impl.h" diff --git a/test/common/router/router_ratelimit_test.cc b/test/common/router/router_ratelimit_test.cc index f5f893f233737..eacf95c701cc7 100644 --- a/test/common/router/router_ratelimit_test.cc +++ b/test/common/router/router_ratelimit_test.cc @@ -2,6 +2,8 @@ #include #include +#include "envoy/api/v2/rds.pb.h" +#include "envoy/api/v2/route/route.pb.h" #include "envoy/api/v2/route/route.pb.validate.h" #include "common/http/header_map_impl.h" diff --git a/test/common/router/router_test.cc b/test/common/router/router_test.cc index 5dcddfc3bebbf..1674207e0400a 100644 --- a/test/common/router/router_test.cc +++ b/test/common/router/router_test.cc @@ -2,6 +2,9 @@ #include #include +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/type/percent.pb.h" + #include "common/buffer/buffer_impl.h" #include "common/common/empty_string.h" #include "common/config/metadata.h" diff --git a/test/common/router/router_upstream_log_test.cc b/test/common/router/router_upstream_log_test.cc index c828016a655f7..de20a867890af 100644 --- a/test/common/router/router_upstream_log_test.cc +++ b/test/common/router/router_upstream_log_test.cc @@ -1,6 +1,10 @@ #include #include +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/config/filter/accesslog/v2/accesslog.pb.h" +#include "envoy/config/filter/http/router/v2/router.pb.h" + #include "common/network/utility.h" #include "common/router/router.h" #include "common/upstream/upstream_impl.h" diff --git a/test/common/router/scoped_config_impl_test.cc b/test/common/router/scoped_config_impl_test.cc index 0decf3b2e7a3e..2d9d5922a1f03 100644 --- a/test/common/router/scoped_config_impl_test.cc +++ b/test/common/router/scoped_config_impl_test.cc @@ -1,5 +1,9 @@ #include +#include "envoy/api/v2/rds.pb.h" +#include "envoy/api/v2/srds.pb.h" +#include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.h" + #include "common/router/scoped_config_impl.h" #include "test/mocks/router/mocks.h" diff --git a/test/common/router/scoped_rds_test.cc b/test/common/router/scoped_rds_test.cc index 140b800b1c797..712731ce57113 100644 --- a/test/common/router/scoped_rds_test.cc +++ b/test/common/router/scoped_rds_test.cc @@ -2,6 +2,11 @@ #include "envoy/admin/v2alpha/config_dump.pb.h" #include "envoy/admin/v2alpha/config_dump.pb.validate.h" +#include "envoy/api/v2/core/config_source.pb.h" +#include "envoy/api/v2/discovery.pb.h" +#include "envoy/api/v2/rds.pb.h" +#include "envoy/api/v2/srds.pb.h" +#include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.h" #include "envoy/config/subscription.h" #include "envoy/init/manager.h" #include "envoy/stats/scope.h" diff --git a/test/common/router/vhds_test.cc b/test/common/router/vhds_test.cc index 7aab6ad424400..6b3950d477bdb 100644 --- a/test/common/router/vhds_test.cc +++ b/test/common/router/vhds_test.cc @@ -2,8 +2,9 @@ #include #include -#include "envoy/admin/v2alpha/config_dump.pb.h" -#include "envoy/admin/v2alpha/config_dump.pb.validate.h" +#include "envoy/api/v2/discovery.pb.h" +#include "envoy/api/v2/rds.pb.h" +#include "envoy/api/v2/route/route.pb.h" #include "envoy/stats/scope.h" #include "common/config/utility.h" diff --git a/test/common/runtime/BUILD b/test/common/runtime/BUILD index 764ff12d75791..b3f3033ca3123 100644 --- a/test/common/runtime/BUILD +++ b/test/common/runtime/BUILD @@ -34,6 +34,7 @@ envoy_cc_test( "//test/mocks/runtime:runtime_mocks", "//test/test_common:utility_lib", "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/type:pkg_cc_proto", ], ) @@ -55,6 +56,11 @@ envoy_cc_test( "//test/mocks/thread_local:thread_local_mocks", "//test/mocks/upstream:upstream_mocks", "//test/test_common:environment_lib", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", + "@envoy_api//envoy/service/discovery/v2:pkg_cc_proto", + "@envoy_api//envoy/type:pkg_cc_proto", ], ) diff --git a/test/common/runtime/runtime_features_test.cc b/test/common/runtime/runtime_features_test.cc index 86da9289a5028..282d7ab107154 100644 --- a/test/common/runtime/runtime_features_test.cc +++ b/test/common/runtime/runtime_features_test.cc @@ -1,6 +1,8 @@ #include +#include "envoy/api/v2/core/base.pb.h" #include "envoy/api/v2/core/base.pb.validate.h" +#include "envoy/type/percent.pb.h" #include "common/runtime/runtime_features.h" diff --git a/test/common/runtime/runtime_impl_test.cc b/test/common/runtime/runtime_impl_test.cc index d591e3b6d7638..7e0bf18df5558 100644 --- a/test/common/runtime/runtime_impl_test.cc +++ b/test/common/runtime/runtime_impl_test.cc @@ -1,6 +1,12 @@ #include #include +#include "envoy/api/v2/core/config_source.pb.h" +#include "envoy/api/v2/discovery.pb.h" +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" +#include "envoy/service/discovery/v2/rtds.pb.h" +#include "envoy/type/percent.pb.h" + #include "common/config/runtime_utility.h" #include "common/runtime/runtime_impl.h" #include "common/stats/isolated_store_impl.h" diff --git a/test/common/secret/BUILD b/test/common/secret/BUILD index 1c9121f005358..10f506fd050f1 100644 --- a/test/common/secret/BUILD +++ b/test/common/secret/BUILD @@ -26,6 +26,7 @@ envoy_cc_test( "//test/test_common:utility_lib", "@envoy_api//envoy/admin/v2alpha:pkg_cc_proto", "@envoy_api//envoy/api/v2/auth:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", "@envoy_api//envoy/config/grpc_credential/v2alpha:pkg_cc_proto", ], ) @@ -48,7 +49,9 @@ envoy_cc_test( "//test/test_common:environment_lib", "//test/test_common:registry_lib", "//test/test_common:utility_lib", + "@envoy_api//envoy/api/v2:pkg_cc_proto", "@envoy_api//envoy/api/v2/auth:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", "@envoy_api//envoy/service/discovery/v2:pkg_cc_proto", ], ) diff --git a/test/common/secret/sds_api_test.cc b/test/common/secret/sds_api_test.cc index bcedd9d363a30..35779ce470788 100644 --- a/test/common/secret/sds_api_test.cc +++ b/test/common/secret/sds_api_test.cc @@ -1,6 +1,8 @@ #include #include "envoy/api/v2/auth/cert.pb.h" +#include "envoy/api/v2/core/config_source.pb.h" +#include "envoy/api/v2/discovery.pb.h" #include "envoy/common/exception.h" #include "envoy/service/discovery/v2/sds.pb.h" diff --git a/test/common/secret/secret_manager_impl_test.cc b/test/common/secret/secret_manager_impl_test.cc index 9c781b9807169..3427d667dcdc1 100644 --- a/test/common/secret/secret_manager_impl_test.cc +++ b/test/common/secret/secret_manager_impl_test.cc @@ -2,6 +2,7 @@ #include "envoy/admin/v2alpha/config_dump.pb.h" #include "envoy/api/v2/auth/cert.pb.h" +#include "envoy/api/v2/core/config_source.pb.h" #include "envoy/common/exception.h" #include "envoy/config/grpc_credential/v2alpha/file_based_metadata.pb.h" diff --git a/test/common/stats/BUILD b/test/common/stats/BUILD index b39c0b6243d5e..3bb028802e23a 100644 --- a/test/common/stats/BUILD +++ b/test/common/stats/BUILD @@ -98,6 +98,7 @@ envoy_cc_test( "//source/common/stats:stats_matcher_lib", "//test/test_common:utility_lib", "@envoy_api//envoy/config/metrics/v2:pkg_cc_proto", + "@envoy_api//envoy/type/matcher:pkg_cc_proto", ], ) @@ -209,5 +210,6 @@ envoy_cc_test_binary( "//test/test_common:simulated_time_system_lib", "//test/test_common:test_time_lib", "//test/test_common:utility_lib", + "@envoy_api//envoy/config/metrics/v2:pkg_cc_proto", ], ) diff --git a/test/common/stats/stats_matcher_impl_test.cc b/test/common/stats/stats_matcher_impl_test.cc index 9277a545e16a7..427a56db06dda 100644 --- a/test/common/stats/stats_matcher_impl_test.cc +++ b/test/common/stats/stats_matcher_impl_test.cc @@ -1,4 +1,5 @@ #include "envoy/config/metrics/v2/stats.pb.h" +#include "envoy/type/matcher/string.pb.h" #include "common/stats/stats_matcher_impl.h" diff --git a/test/common/stats/thread_local_store_speed_test.cc b/test/common/stats/thread_local_store_speed_test.cc index 6ea30cb61e84d..e2f061044c6aa 100644 --- a/test/common/stats/thread_local_store_speed_test.cc +++ b/test/common/stats/thread_local_store_speed_test.cc @@ -1,6 +1,8 @@ // Note: this should be run with --compilation_mode=opt, and would benefit from a // quiescent system with disabled cstate power management. +#include "envoy/config/metrics/v2/stats.pb.h" + #include "common/common/logger.h" #include "common/common/thread.h" #include "common/event/dispatcher_impl.h" diff --git a/test/common/stream_info/BUILD b/test/common/stream_info/BUILD index 09ee831518d58..dee9a0b39c3c5 100644 --- a/test/common/stream_info/BUILD +++ b/test/common/stream_info/BUILD @@ -47,6 +47,7 @@ envoy_cc_test_library( "//source/common/common:assert_lib", "//source/common/stream_info:filter_state_lib", "//test/test_common:test_time_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) diff --git a/test/common/stream_info/test_util.h b/test/common/stream_info/test_util.h index 4f153adbdae69..4455f9bf2fb99 100644 --- a/test/common/stream_info/test_util.h +++ b/test/common/stream_info/test_util.h @@ -1,5 +1,6 @@ #pragma once +#include "envoy/api/v2/core/base.pb.h" #include "envoy/stream_info/stream_info.h" #include "common/common/assert.h" diff --git a/test/common/tcp_proxy/BUILD b/test/common/tcp_proxy/BUILD index 561cf784d555e..d86e305f0993c 100644 --- a/test/common/tcp_proxy/BUILD +++ b/test/common/tcp_proxy/BUILD @@ -34,6 +34,7 @@ envoy_cc_test( "//test/mocks/upstream:host_mocks", "//test/mocks/upstream:upstream_mocks", "@envoy_api//envoy/config/accesslog/v2:pkg_cc_proto", + "@envoy_api//envoy/config/filter/accesslog/v2:pkg_cc_proto", "@envoy_api//envoy/config/filter/network/tcp_proxy/v2:pkg_cc_proto", ], ) diff --git a/test/common/tcp_proxy/tcp_proxy_test.cc b/test/common/tcp_proxy/tcp_proxy_test.cc index 81d7096f7e0d3..762b1a16a581e 100644 --- a/test/common/tcp_proxy/tcp_proxy_test.cc +++ b/test/common/tcp_proxy/tcp_proxy_test.cc @@ -6,6 +6,7 @@ #include #include "envoy/config/accesslog/v2/file.pb.h" +#include "envoy/config/filter/accesslog/v2/accesslog.pb.h" #include "envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.pb.h" #include "envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.pb.validate.h" diff --git a/test/common/tracing/BUILD b/test/common/tracing/BUILD index 0ccd24be2adca..f08ec699acc6e 100644 --- a/test/common/tracing/BUILD +++ b/test/common/tracing/BUILD @@ -31,5 +31,7 @@ envoy_cc_test( "//test/mocks/upstream:upstream_mocks", "//test/test_common:environment_lib", "//test/test_common:utility_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/type/tracing/v2:pkg_cc_proto", ], ) diff --git a/test/common/tracing/http_tracer_impl_test.cc b/test/common/tracing/http_tracer_impl_test.cc index 9bcf20b003777..7a04da9a66678 100644 --- a/test/common/tracing/http_tracer_impl_test.cc +++ b/test/common/tracing/http_tracer_impl_test.cc @@ -2,6 +2,9 @@ #include #include +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/type/tracing/v2/custom_tag.pb.h" + #include "common/common/base64.h" #include "common/http/header_map_impl.h" #include "common/http/headers.h" diff --git a/test/common/upstream/BUILD b/test/common/upstream/BUILD index aea0dc82191af..c7436946f983d 100644 --- a/test/common/upstream/BUILD +++ b/test/common/upstream/BUILD @@ -21,6 +21,7 @@ envoy_cc_test( "//test/mocks/protobuf:protobuf_mocks", "//test/mocks/upstream:upstream_mocks", "//test/test_common:utility_lib", + "@envoy_api//envoy/api/v2:pkg_cc_proto", "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -33,6 +34,10 @@ envoy_cc_test( ], deps = [ ":test_cluster_manager", + "@envoy_api//envoy/admin/v2alpha:pkg_cc_proto", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", ], ) @@ -73,6 +78,8 @@ envoy_cc_test( "//test/mocks/upstream:upstream_mocks", "//test/test_common:utility_lib", "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/api/v2/endpoint:pkg_cc_proto", ], ) @@ -99,6 +106,8 @@ envoy_cc_test( "//test/test_common:simulated_time_system_lib", "//test/test_common:utility_lib", "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/api/v2/endpoint:pkg_cc_proto", + "@envoy_api//envoy/data/core/v2alpha:pkg_cc_proto", ], ) @@ -134,6 +143,7 @@ envoy_cc_test( "//source/common/upstream:upstream_lib", "//test/mocks/runtime:runtime_mocks", "//test/mocks/upstream:upstream_mocks", + "@envoy_api//envoy/api/v2:pkg_cc_proto", ], ) @@ -149,6 +159,9 @@ envoy_cc_test( "//source/common/upstream:upstream_lib", "//test/mocks/runtime:runtime_mocks", "//test/mocks/upstream:upstream_mocks", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/api/v2/endpoint:pkg_cc_proto", ], ) @@ -164,8 +177,8 @@ envoy_cc_test( "//test/mocks/upstream:upstream_mocks", "//test/test_common:simulated_time_system_lib", "//test/test_common:utility_lib", - "@envoy_api//envoy/api/v2:pkg_cc_proto", "@envoy_api//envoy/api/v2/endpoint:pkg_cc_proto", + "@envoy_api//envoy/service/load_stats/v2:pkg_cc_proto", ], ) @@ -185,6 +198,7 @@ envoy_cc_test( "//test/mocks/upstream:upstream_mocks", "//test/test_common:simulated_time_system_lib", "//test/test_common:utility_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", "@envoy_api//envoy/service/discovery/v2:pkg_cc_proto", ], ) @@ -210,6 +224,8 @@ envoy_cc_test( "//test/mocks/thread_local:thread_local_mocks", "//test/mocks/upstream:upstream_mocks", "//test/test_common:utility_lib", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -232,6 +248,7 @@ envoy_cc_test( "//test/mocks/ssl:ssl_mocks", "//test/mocks/upstream:upstream_mocks", "//test/test_common:utility_lib", + "@envoy_api//envoy/api/v2:pkg_cc_proto", ], ) @@ -252,6 +269,8 @@ envoy_cc_test( "//test/mocks/upstream:upstream_mocks", "//test/test_common:simulated_time_system_lib", "//test/test_common:utility_lib", + "@envoy_api//envoy/api/v2/cluster:pkg_cc_proto", + "@envoy_api//envoy/data/cluster/v2alpha:pkg_cc_proto", ], ) @@ -292,6 +311,7 @@ envoy_cc_test( "//source/common/upstream:upstream_lib", "//test/mocks/runtime:runtime_mocks", "//test/mocks/upstream:upstream_mocks", + "@envoy_api//envoy/api/v2:pkg_cc_proto", ], ) @@ -302,6 +322,7 @@ envoy_cc_test( ":utility_lib", "//source/common/upstream:maglev_lb_lib", "//test/mocks/upstream:upstream_mocks", + "@envoy_api//envoy/api/v2:pkg_cc_proto", ], ) @@ -320,6 +341,7 @@ envoy_cc_binary( "//test/common/upstream:utility_lib", "//test/mocks/upstream:upstream_mocks", "//test/test_common:printers_lib", + "@envoy_api//envoy/api/v2:pkg_cc_proto", ], ) @@ -339,6 +361,7 @@ envoy_cc_test( "//test/mocks/runtime:runtime_mocks", "//test/mocks/upstream:upstream_mocks", "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -356,6 +379,8 @@ envoy_cc_test( "//test/mocks/server:server_mocks", "//test/test_common:registry_lib", "//test/test_common:utility_lib", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -364,6 +389,9 @@ envoy_cc_test( srcs = ["upstream_impl_test.cc"], deps = [ ":utility_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/api/v2/endpoint:pkg_cc_proto", + "@envoy_api//envoy/api/v2:pkg_cc_proto", "//include/envoy/api:api_interface", "//include/envoy/http:codec_interface", "//include/envoy/upstream:cluster_manager_interface", @@ -399,6 +427,10 @@ envoy_cc_test_library( "//source/common/upstream:upstream_includes", "//source/common/upstream:upstream_lib", "//test/test_common:utility_lib", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/api/v2/endpoint:pkg_cc_proto", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", ], ) @@ -439,9 +471,9 @@ envoy_cc_test_library( "//test/test_common:simulated_time_system_lib", "//test/test_common:threadsafe_singleton_injector_lib", "//test/test_common:utility_lib", - "@envoy_api//envoy/admin/v2alpha:pkg_cc_proto", "@envoy_api//envoy/api/v2:pkg_cc_proto", "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", ], ) @@ -474,5 +506,6 @@ envoy_cc_test( "//test/mocks/upstream:upstream_mocks", "//test/test_common:registry_lib", "//test/test_common:utility_lib", + "@envoy_api//envoy/api/v2:pkg_cc_proto", ], ) diff --git a/test/common/upstream/cds_api_impl_test.cc b/test/common/upstream/cds_api_impl_test.cc index fe6b5e39ab603..1b4d729eac1fe 100644 --- a/test/common/upstream/cds_api_impl_test.cc +++ b/test/common/upstream/cds_api_impl_test.cc @@ -3,7 +3,9 @@ #include #include -#include "envoy/api/v2/core/config_source.pb.validate.h" +#include "envoy/api/v2/cds.pb.h" +#include "envoy/api/v2/core/config_source.pb.h" +#include "envoy/api/v2/discovery.pb.h" #include "common/config/utility.h" #include "common/protobuf/utility.h" diff --git a/test/common/upstream/cluster_factory_impl_test.cc b/test/common/upstream/cluster_factory_impl_test.cc index 6b4091db67aef..d1820575822c1 100644 --- a/test/common/upstream/cluster_factory_impl_test.cc +++ b/test/common/upstream/cluster_factory_impl_test.cc @@ -5,6 +5,7 @@ #include #include "envoy/api/api.h" +#include "envoy/api/v2/cds.pb.h" #include "envoy/http/codec.h" #include "envoy/upstream/cluster_manager.h" diff --git a/test/common/upstream/cluster_manager_impl_test.cc b/test/common/upstream/cluster_manager_impl_test.cc index d94b4d1a25624..478c074449feb 100644 --- a/test/common/upstream/cluster_manager_impl_test.cc +++ b/test/common/upstream/cluster_manager_impl_test.cc @@ -1,3 +1,8 @@ +#include "envoy/admin/v2alpha/config_dump.pb.h" +#include "envoy/api/v2/cds.pb.h" +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" + #include "test/common/upstream/test_cluster_manager.h" using testing::_; diff --git a/test/common/upstream/eds_test.cc b/test/common/upstream/eds_test.cc index 377471ff61adb..394603dbd3746 100644 --- a/test/common/upstream/eds_test.cc +++ b/test/common/upstream/eds_test.cc @@ -1,6 +1,10 @@ #include +#include "envoy/api/v2/cds.pb.h" +#include "envoy/api/v2/core/health_check.pb.h" +#include "envoy/api/v2/discovery.pb.h" #include "envoy/api/v2/eds.pb.h" +#include "envoy/api/v2/endpoint/endpoint.pb.h" #include "envoy/stats/scope.h" #include "common/config/utility.h" diff --git a/test/common/upstream/hds_test.cc b/test/common/upstream/hds_test.cc index 93f21232ec871..46419d2fd31e6 100644 --- a/test/common/upstream/hds_test.cc +++ b/test/common/upstream/hds_test.cc @@ -1,5 +1,7 @@ #include +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/api/v2/core/health_check.pb.h" #include "envoy/service/discovery/v2/hds.pb.h" #include "common/singleton/manager_impl.h" diff --git a/test/common/upstream/health_checker_impl_test.cc b/test/common/upstream/health_checker_impl_test.cc index fd79274142126..c2ae66f001682 100644 --- a/test/common/upstream/health_checker_impl_test.cc +++ b/test/common/upstream/health_checker_impl_test.cc @@ -3,7 +3,11 @@ #include #include +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/api/v2/core/health_check.pb.h" #include "envoy/api/v2/core/health_check.pb.validate.h" +#include "envoy/api/v2/endpoint/endpoint.pb.h" +#include "envoy/data/core/v2alpha/health_check_event.pb.h" #include "common/buffer/buffer_impl.h" #include "common/buffer/zero_copy_input_stream_impl.h" diff --git a/test/common/upstream/load_balancer_benchmark.cc b/test/common/upstream/load_balancer_benchmark.cc index edc2eb53d9d29..a11341b099d2f 100644 --- a/test/common/upstream/load_balancer_benchmark.cc +++ b/test/common/upstream/load_balancer_benchmark.cc @@ -2,6 +2,8 @@ #include +#include "envoy/api/v2/cds.pb.h" + #include "common/memory/stats.h" #include "common/runtime/runtime_impl.h" #include "common/upstream/maglev_lb.h" diff --git a/test/common/upstream/load_balancer_impl_test.cc b/test/common/upstream/load_balancer_impl_test.cc index 0b74870042494..1f200a636dd64 100644 --- a/test/common/upstream/load_balancer_impl_test.cc +++ b/test/common/upstream/load_balancer_impl_test.cc @@ -4,6 +4,8 @@ #include #include +#include "envoy/api/v2/cds.pb.h" + #include "common/network/utility.h" #include "common/upstream/load_balancer_impl.h" #include "common/upstream/upstream_impl.h" diff --git a/test/common/upstream/load_balancer_simulation_test.cc b/test/common/upstream/load_balancer_simulation_test.cc index 734e57b194c10..4cca47733fba4 100644 --- a/test/common/upstream/load_balancer_simulation_test.cc +++ b/test/common/upstream/load_balancer_simulation_test.cc @@ -2,6 +2,11 @@ #include #include +#include "envoy/api/v2/cds.pb.h" +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/api/v2/core/health_check.pb.h" +#include "envoy/api/v2/endpoint/endpoint.pb.h" + #include "common/common/fmt.h" #include "common/network/utility.h" #include "common/runtime/runtime_impl.h" diff --git a/test/common/upstream/load_stats_reporter_test.cc b/test/common/upstream/load_stats_reporter_test.cc index fe22e4a4c3567..0e6a657827eff 100644 --- a/test/common/upstream/load_stats_reporter_test.cc +++ b/test/common/upstream/load_stats_reporter_test.cc @@ -1,7 +1,7 @@ #include -#include "envoy/api/v2/eds.pb.h" #include "envoy/api/v2/endpoint/load_report.pb.h" +#include "envoy/service/load_stats/v2/lrs.pb.h" #include "common/upstream/load_stats_reporter.h" diff --git a/test/common/upstream/logical_dns_cluster_test.cc b/test/common/upstream/logical_dns_cluster_test.cc index 784d994efdae4..77de14fe34c0f 100644 --- a/test/common/upstream/logical_dns_cluster_test.cc +++ b/test/common/upstream/logical_dns_cluster_test.cc @@ -4,6 +4,8 @@ #include #include +#include "envoy/api/v2/cds.pb.h" +#include "envoy/api/v2/core/base.pb.h" #include "envoy/stats/scope.h" #include "common/network/utility.h" diff --git a/test/common/upstream/maglev_lb_test.cc b/test/common/upstream/maglev_lb_test.cc index 5742109ca7fe3..c4966c3b2229e 100644 --- a/test/common/upstream/maglev_lb_test.cc +++ b/test/common/upstream/maglev_lb_test.cc @@ -1,5 +1,7 @@ #include +#include "envoy/api/v2/cds.pb.h" + #include "common/upstream/maglev_lb.h" #include "test/common/upstream/utility.h" diff --git a/test/common/upstream/original_dst_cluster_test.cc b/test/common/upstream/original_dst_cluster_test.cc index 660d76cc8f933..81dd50fb95941 100644 --- a/test/common/upstream/original_dst_cluster_test.cc +++ b/test/common/upstream/original_dst_cluster_test.cc @@ -4,6 +4,7 @@ #include #include +#include "envoy/api/v2/cds.pb.h" #include "envoy/stats/scope.h" #include "common/network/address_impl.h" diff --git a/test/common/upstream/outlier_detection_impl_test.cc b/test/common/upstream/outlier_detection_impl_test.cc index b7c382610ac90..c6ab6692665b8 100644 --- a/test/common/upstream/outlier_detection_impl_test.cc +++ b/test/common/upstream/outlier_detection_impl_test.cc @@ -4,7 +4,9 @@ #include #include +#include "envoy/api/v2/cluster/outlier_detection.pb.h" #include "envoy/common/time.h" +#include "envoy/data/cluster/v2alpha/outlier_detection_event.pb.h" #include "common/network/utility.h" #include "common/upstream/outlier_detection_impl.h" diff --git a/test/common/upstream/ring_hash_lb_test.cc b/test/common/upstream/ring_hash_lb_test.cc index 86105360e56d5..94a5515bc0fa8 100644 --- a/test/common/upstream/ring_hash_lb_test.cc +++ b/test/common/upstream/ring_hash_lb_test.cc @@ -4,6 +4,7 @@ #include #include +#include "envoy/api/v2/cds.pb.h" #include "envoy/router/router.h" #include "common/network/utility.h" diff --git a/test/common/upstream/subset_lb_test.cc b/test/common/upstream/subset_lb_test.cc index f9ed21bcb8b35..3752f82667304 100644 --- a/test/common/upstream/subset_lb_test.cc +++ b/test/common/upstream/subset_lb_test.cc @@ -6,6 +6,7 @@ #include #include "envoy/api/v2/cds.pb.h" +#include "envoy/api/v2/core/base.pb.h" #include "common/common/logger.h" #include "common/config/metadata.h" diff --git a/test/common/upstream/test_cluster_manager.h b/test/common/upstream/test_cluster_manager.h index e59f43c1175d7..cb6c93383e73f 100644 --- a/test/common/upstream/test_cluster_manager.h +++ b/test/common/upstream/test_cluster_manager.h @@ -3,9 +3,9 @@ #include #include -#include "envoy/admin/v2alpha/config_dump.pb.h" #include "envoy/api/v2/cds.pb.h" -#include "envoy/api/v2/core/base.pb.h" +#include "envoy/api/v2/core/config_source.pb.h" +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" #include "envoy/network/listen_socket.h" #include "envoy/upstream/upstream.h" @@ -211,4 +211,4 @@ class MockedUpdatedClusterManagerImpl : public TestClusterManagerImpl { }; } // namespace Upstream -} // namespace Envoy \ No newline at end of file +} // namespace Envoy diff --git a/test/common/upstream/transport_socket_matcher_test.cc b/test/common/upstream/transport_socket_matcher_test.cc index 0b771ce1bd9b4..661a19e2d46b0 100644 --- a/test/common/upstream/transport_socket_matcher_test.cc +++ b/test/common/upstream/transport_socket_matcher_test.cc @@ -2,6 +2,9 @@ #include #include "envoy/api/api.h" +#include "envoy/api/v2/cds.pb.h" +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/api/v2/core/base.pb.validate.h" #include "envoy/network/transport_socket.h" #include "envoy/stats/scope.h" diff --git a/test/common/upstream/upstream_impl_test.cc b/test/common/upstream/upstream_impl_test.cc index a699b8360922e..b30b929d80a49 100644 --- a/test/common/upstream/upstream_impl_test.cc +++ b/test/common/upstream/upstream_impl_test.cc @@ -6,6 +6,10 @@ #include #include "envoy/api/api.h" +#include "envoy/api/v2/cds.pb.h" +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/api/v2/core/health_check.pb.h" +#include "envoy/api/v2/endpoint/endpoint.pb.h" #include "envoy/http/codec.h" #include "envoy/stats/scope.h" #include "envoy/upstream/cluster_manager.h" diff --git a/test/common/upstream/utility.h b/test/common/upstream/utility.h index b41b9cbfd2801..b8f64ee014722 100644 --- a/test/common/upstream/utility.h +++ b/test/common/upstream/utility.h @@ -1,5 +1,10 @@ #pragma once +#include "envoy/api/v2/cds.pb.h" +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/api/v2/core/health_check.pb.h" +#include "envoy/api/v2/endpoint/endpoint.pb.h" +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" #include "envoy/upstream/upstream.h" #include "common/common/utility.h" diff --git a/test/config/BUILD b/test/config/BUILD index daedb69e8a663..286e06521a6c5 100644 --- a/test/config/BUILD +++ b/test/config/BUILD @@ -27,11 +27,14 @@ envoy_cc_test_library( "//test/test_common:network_utility_lib", "//test/test_common:utility_lib", "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/auth:pkg_cc_proto", "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/api/v2/listener:pkg_cc_proto", "@envoy_api//envoy/api/v2/route:pkg_cc_proto", "@envoy_api//envoy/config/accesslog/v2:pkg_cc_proto", "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto", "@envoy_api//envoy/config/transport_socket/tap/v2alpha:pkg_cc_proto", + "@envoy_api//envoy/service/tap/v2alpha:pkg_cc_proto", ], ) diff --git a/test/config/utility.cc b/test/config/utility.cc index 6260f6e85e501..b39725eb1a389 100644 --- a/test/config/utility.cc +++ b/test/config/utility.cc @@ -1,9 +1,18 @@ #include "test/config/utility.h" +#include "envoy/api/v2/auth/cert.pb.h" +#include "envoy/api/v2/cds.pb.h" +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/api/v2/discovery.pb.h" +#include "envoy/api/v2/eds.pb.h" +#include "envoy/api/v2/listener/listener.pb.h" +#include "envoy/api/v2/route/route.pb.h" #include "envoy/config/accesslog/v2/file.pb.h" +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" #include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.h" #include "envoy/config/transport_socket/tap/v2alpha/tap.pb.h" #include "envoy/http/codec.h" +#include "envoy/service/tap/v2alpha/common.pb.h" #include "common/common/assert.h" #include "common/config/resources.h" diff --git a/test/config/utility.h b/test/config/utility.h index 2150e797b5545..39841ce95612b 100644 --- a/test/config/utility.h +++ b/test/config/utility.h @@ -6,10 +6,11 @@ #include #include "envoy/api/api.h" +#include "envoy/api/v2/auth/cert.pb.h" #include "envoy/api/v2/cds.pb.h" #include "envoy/api/v2/core/base.pb.h" -#include "envoy/api/v2/core/protocol.pb.h" #include "envoy/api/v2/eds.pb.h" +#include "envoy/api/v2/listener/listener.pb.h" #include "envoy/api/v2/route/route.pb.h" #include "envoy/config/bootstrap/v2/bootstrap.pb.h" #include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.h" diff --git a/test/config_test/config_test.cc b/test/config_test/config_test.cc index ad9461143346a..626c8482c270c 100644 --- a/test/config_test/config_test.cc +++ b/test/config_test/config_test.cc @@ -2,7 +2,9 @@ #include #include +#include "envoy/api/v2/listener/listener.pb.h" #include "envoy/common/platform.h" +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" #include "common/common/fmt.h" #include "common/protobuf/utility.h" diff --git a/test/extensions/access_loggers/file/BUILD b/test/extensions/access_loggers/file/BUILD index 68bf42752655b..64a55c5dc10a1 100644 --- a/test/extensions/access_loggers/file/BUILD +++ b/test/extensions/access_loggers/file/BUILD @@ -20,5 +20,6 @@ envoy_extension_cc_test( "//test/mocks/server:server_mocks", "//test/test_common:environment_lib", "@envoy_api//envoy/config/accesslog/v2:pkg_cc_proto", + "@envoy_api//envoy/config/filter/accesslog/v2:pkg_cc_proto", ], ) diff --git a/test/extensions/access_loggers/file/config_test.cc b/test/extensions/access_loggers/file/config_test.cc index 181c8665c4986..0b58cfd30c0fd 100644 --- a/test/extensions/access_loggers/file/config_test.cc +++ b/test/extensions/access_loggers/file/config_test.cc @@ -1,4 +1,5 @@ #include "envoy/config/accesslog/v2/file.pb.h" +#include "envoy/config/filter/accesslog/v2/accesslog.pb.h" #include "envoy/registry/registry.h" #include "common/access_log/access_log_impl.h" diff --git a/test/extensions/access_loggers/grpc/BUILD b/test/extensions/access_loggers/grpc/BUILD index 3709524fd2a3f..4e3c14d2fdaa1 100644 --- a/test/extensions/access_loggers/grpc/BUILD +++ b/test/extensions/access_loggers/grpc/BUILD @@ -23,6 +23,10 @@ envoy_extension_cc_test( "//test/mocks/ssl:ssl_mocks", "//test/mocks/stream_info:stream_info_mocks", "//test/mocks/thread_local:thread_local_mocks", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/config/accesslog/v2:pkg_cc_proto", + "@envoy_api//envoy/data/accesslog/v2:pkg_cc_proto", + "@envoy_api//envoy/service/accesslog/v2:pkg_cc_proto", ], ) @@ -52,6 +56,8 @@ envoy_extension_cc_test( "//test/mocks/ssl:ssl_mocks", "//test/mocks/stream_info:stream_info_mocks", "//test/mocks/thread_local:thread_local_mocks", + "@envoy_api//envoy/config/accesslog/v2:pkg_cc_proto", + "@envoy_api//envoy/data/accesslog/v2:pkg_cc_proto", ], ) @@ -62,6 +68,8 @@ envoy_extension_cc_test( deps = [ "//source/extensions/access_loggers/grpc:http_config", "//test/mocks/server:server_mocks", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/config/accesslog/v2:pkg_cc_proto", ], ) @@ -78,6 +86,8 @@ envoy_extension_cc_test( "//test/integration:http_integration_lib", "//test/test_common:utility_lib", "@envoy_api//envoy/config/accesslog/v2:pkg_cc_proto", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", + "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto", "@envoy_api//envoy/service/accesslog/v2:pkg_cc_proto", ], ) @@ -96,7 +106,9 @@ envoy_extension_cc_test( "//test/common/grpc:grpc_client_integration_lib", "//test/integration:http_integration_lib", "//test/test_common:utility_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", "@envoy_api//envoy/config/accesslog/v2:pkg_cc_proto", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", "@envoy_api//envoy/config/filter/network/tcp_proxy/v2:pkg_cc_proto", "@envoy_api//envoy/service/accesslog/v2:pkg_cc_proto", ], diff --git a/test/extensions/access_loggers/grpc/grpc_access_log_impl_test.cc b/test/extensions/access_loggers/grpc/grpc_access_log_impl_test.cc index befa7febbdd19..cf458f360b1c6 100644 --- a/test/extensions/access_loggers/grpc/grpc_access_log_impl_test.cc +++ b/test/extensions/access_loggers/grpc/grpc_access_log_impl_test.cc @@ -1,5 +1,10 @@ #include +#include "envoy/api/v2/core/grpc_service.pb.h" +#include "envoy/config/accesslog/v2/als.pb.h" +#include "envoy/data/accesslog/v2/accesslog.pb.h" +#include "envoy/service/accesslog/v2/als.pb.h" + #include "common/buffer/zero_copy_input_stream_impl.h" #include "common/network/address_impl.h" diff --git a/test/extensions/access_loggers/grpc/http_config_test.cc b/test/extensions/access_loggers/grpc/http_config_test.cc index 2a23658a91b70..73abc22a66b7f 100644 --- a/test/extensions/access_loggers/grpc/http_config_test.cc +++ b/test/extensions/access_loggers/grpc/http_config_test.cc @@ -1,3 +1,5 @@ +#include "envoy/api/v2/core/grpc_service.pb.h" +#include "envoy/config/accesslog/v2/als.pb.h" #include "envoy/registry/registry.h" #include "envoy/server/access_log_config.h" #include "envoy/stats/scope.h" diff --git a/test/extensions/access_loggers/grpc/http_grpc_access_log_impl_test.cc b/test/extensions/access_loggers/grpc/http_grpc_access_log_impl_test.cc index 32ccf2641eb55..9e5633c6c2fc5 100644 --- a/test/extensions/access_loggers/grpc/http_grpc_access_log_impl_test.cc +++ b/test/extensions/access_loggers/grpc/http_grpc_access_log_impl_test.cc @@ -1,5 +1,8 @@ #include +#include "envoy/config/accesslog/v2/als.pb.h" +#include "envoy/data/accesslog/v2/accesslog.pb.h" + #include "common/buffer/zero_copy_input_stream_impl.h" #include "common/network/address_impl.h" #include "common/router/string_accessor_impl.h" diff --git a/test/extensions/access_loggers/grpc/http_grpc_access_log_integration_test.cc b/test/extensions/access_loggers/grpc/http_grpc_access_log_integration_test.cc index 736b42fdc1e34..eaf17a673eb87 100644 --- a/test/extensions/access_loggers/grpc/http_grpc_access_log_integration_test.cc +++ b/test/extensions/access_loggers/grpc/http_grpc_access_log_integration_test.cc @@ -1,4 +1,6 @@ #include "envoy/config/accesslog/v2/als.pb.h" +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" +#include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.h" #include "envoy/service/accesslog/v2/als.pb.h" #include "common/buffer/zero_copy_input_stream_impl.h" diff --git a/test/extensions/access_loggers/grpc/tcp_grpc_access_log_integration_test.cc b/test/extensions/access_loggers/grpc/tcp_grpc_access_log_integration_test.cc index 2408d6326d213..7baa3bfd42b0e 100644 --- a/test/extensions/access_loggers/grpc/tcp_grpc_access_log_integration_test.cc +++ b/test/extensions/access_loggers/grpc/tcp_grpc_access_log_integration_test.cc @@ -1,5 +1,7 @@ +#include "envoy/api/v2/core/address.pb.h" #include "envoy/config/accesslog/v2/als.pb.h" -#include "envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.pb.validate.h" +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" +#include "envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.pb.h" #include "envoy/service/accesslog/v2/als.pb.h" #include "common/buffer/zero_copy_input_stream_impl.h" diff --git a/test/extensions/clusters/aggregate/BUILD b/test/extensions/clusters/aggregate/BUILD index 670023ef8cdd1..699ded2ea0e55 100644 --- a/test/extensions/clusters/aggregate/BUILD +++ b/test/extensions/clusters/aggregate/BUILD @@ -23,6 +23,8 @@ envoy_extension_cc_test( "//test/mocks/server:server_mocks", "//test/mocks/ssl:ssl_mocks", "//test/test_common:environment_lib", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/config/cluster/aggregate/v2alpha:pkg_cc_proto", ], ) @@ -42,6 +44,8 @@ envoy_extension_cc_test( "//test/mocks/ssl:ssl_mocks", "//test/test_common:environment_lib", "//test/test_common:simulated_time_system_lib", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", + "@envoy_api//envoy/config/cluster/aggregate/v2alpha:pkg_cc_proto", ], ) diff --git a/test/extensions/clusters/aggregate/cluster_integration_test.cc b/test/extensions/clusters/aggregate/cluster_integration_test.cc index 1eb82136ff55c..529fc0911a3cf 100644 --- a/test/extensions/clusters/aggregate/cluster_integration_test.cc +++ b/test/extensions/clusters/aggregate/cluster_integration_test.cc @@ -1,5 +1,4 @@ #include "envoy/api/v2/cds.pb.h" -#include "envoy/api/v2/discovery.pb.h" #include "envoy/grpc/status.h" #include "envoy/stats/scope.h" diff --git a/test/extensions/clusters/aggregate/cluster_test.cc b/test/extensions/clusters/aggregate/cluster_test.cc index bf0c2d5dd6b74..4552132c667d3 100644 --- a/test/extensions/clusters/aggregate/cluster_test.cc +++ b/test/extensions/clusters/aggregate/cluster_test.cc @@ -1,3 +1,7 @@ +#include "envoy/api/v2/cds.pb.h" +#include "envoy/config/cluster/aggregate/v2alpha/cluster.pb.h" +#include "envoy/config/cluster/aggregate/v2alpha/cluster.pb.validate.h" + #include "common/singleton/manager_impl.h" #include "extensions/clusters/aggregate/cluster.h" diff --git a/test/extensions/clusters/aggregate/cluster_update_test.cc b/test/extensions/clusters/aggregate/cluster_update_test.cc index 119eaa6138933..d29e263dda197 100644 --- a/test/extensions/clusters/aggregate/cluster_update_test.cc +++ b/test/extensions/clusters/aggregate/cluster_update_test.cc @@ -1,3 +1,6 @@ +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" +#include "envoy/config/cluster/aggregate/v2alpha/cluster.pb.validate.h" + #include "common/singleton/manager_impl.h" #include "common/upstream/cluster_factory_impl.h" #include "common/upstream/cluster_manager_impl.h" diff --git a/test/extensions/clusters/dynamic_forward_proxy/BUILD b/test/extensions/clusters/dynamic_forward_proxy/BUILD index 98fd5cfddea14..be03b0cb6a2e3 100644 --- a/test/extensions/clusters/dynamic_forward_proxy/BUILD +++ b/test/extensions/clusters/dynamic_forward_proxy/BUILD @@ -26,5 +26,7 @@ envoy_extension_cc_test( "//test/mocks/server:server_mocks", "//test/mocks/ssl:ssl_mocks", "//test/test_common:environment_lib", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/config/cluster/dynamic_forward_proxy/v2alpha:pkg_cc_proto", ], ) diff --git a/test/extensions/clusters/dynamic_forward_proxy/cluster_test.cc b/test/extensions/clusters/dynamic_forward_proxy/cluster_test.cc index 3a792f3f604c0..05f1e5c708409 100644 --- a/test/extensions/clusters/dynamic_forward_proxy/cluster_test.cc +++ b/test/extensions/clusters/dynamic_forward_proxy/cluster_test.cc @@ -1,3 +1,7 @@ +#include "envoy/api/v2/cds.pb.h" +#include "envoy/config/cluster/dynamic_forward_proxy/v2alpha/cluster.pb.h" +#include "envoy/config/cluster/dynamic_forward_proxy/v2alpha/cluster.pb.validate.h" + #include "common/singleton/manager_impl.h" #include "extensions/clusters/dynamic_forward_proxy/cluster.h" diff --git a/test/extensions/clusters/redis/BUILD b/test/extensions/clusters/redis/BUILD index ddf3a7e6cbea6..c105e66412ca3 100644 --- a/test/extensions/clusters/redis/BUILD +++ b/test/extensions/clusters/redis/BUILD @@ -41,6 +41,9 @@ envoy_extension_cc_test( "//test/mocks/thread_local:thread_local_mocks", "//test/mocks/upstream:upstream_mocks", "//test/test_common:utility_lib", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/config/cluster/redis:pkg_cc_proto", + "@envoy_api//envoy/config/filter/network/redis_proxy/v2:pkg_cc_proto", ], ) @@ -90,6 +93,7 @@ envoy_extension_cc_test( "//source/extensions/clusters/redis:redis_cluster_lb", "//source/extensions/filters/network/redis_proxy:config", "//test/integration:integration_lib", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", ], ) @@ -103,6 +107,8 @@ envoy_cc_mock( "//source/common/upstream:upstream_lib", "//source/extensions/clusters/redis:redis_cluster", "//test/mocks/upstream:upstream_mocks", + "@envoy_api//envoy/config/cluster/redis:pkg_cc_proto", + "@envoy_api//envoy/config/filter/network/redis_proxy/v2:pkg_cc_proto", ], ) diff --git a/test/extensions/clusters/redis/crc16_test.cc b/test/extensions/clusters/redis/crc16_test.cc index 7ddbd83bed45f..f5dce8457d3da 100644 --- a/test/extensions/clusters/redis/crc16_test.cc +++ b/test/extensions/clusters/redis/crc16_test.cc @@ -16,4 +16,4 @@ TEST(Hash, crc16) { } // namespace Redis } // namespace Clusters } // namespace Extensions -} // namespace Envoy \ No newline at end of file +} // namespace Envoy diff --git a/test/extensions/clusters/redis/mocks.cc b/test/extensions/clusters/redis/mocks.cc index f0ae690f29dc7..c89bb13ac3128 100644 --- a/test/extensions/clusters/redis/mocks.cc +++ b/test/extensions/clusters/redis/mocks.cc @@ -1,5 +1,8 @@ #include "test/extensions/clusters/redis/mocks.h" +#include "envoy/config/cluster/redis/redis_cluster.pb.validate.h" +#include "envoy/config/filter/network/redis_proxy/v2/redis_proxy.pb.validate.h" + using testing::_; using testing::Return; diff --git a/test/extensions/clusters/redis/mocks.h b/test/extensions/clusters/redis/mocks.h index c9cdb9841aa95..1bf68caa1f9a4 100644 --- a/test/extensions/clusters/redis/mocks.h +++ b/test/extensions/clusters/redis/mocks.h @@ -1,3 +1,5 @@ +#include "envoy/config/cluster/redis/redis_cluster.pb.validate.h" +#include "envoy/config/filter/network/redis_proxy/v2/redis_proxy.pb.validate.h" #include "envoy/upstream/upstream.h" #include "source/extensions/clusters/redis/redis_cluster.h" diff --git a/test/extensions/clusters/redis/redis_cluster_integration_test.cc b/test/extensions/clusters/redis/redis_cluster_integration_test.cc index 726637bc67c12..ea83b657c0bd9 100644 --- a/test/extensions/clusters/redis/redis_cluster_integration_test.cc +++ b/test/extensions/clusters/redis/redis_cluster_integration_test.cc @@ -1,6 +1,8 @@ #include #include +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" + #include "common/common/macros.h" #include "extensions/filters/network/redis_proxy/command_splitter_impl.h" diff --git a/test/extensions/clusters/redis/redis_cluster_test.cc b/test/extensions/clusters/redis/redis_cluster_test.cc index d377220ab05b0..46812d6ccccfa 100644 --- a/test/extensions/clusters/redis/redis_cluster_test.cc +++ b/test/extensions/clusters/redis/redis_cluster_test.cc @@ -3,6 +3,10 @@ #include #include +#include "envoy/api/v2/cds.pb.h" +#include "envoy/config/cluster/redis/redis_cluster.pb.h" +#include "envoy/config/cluster/redis/redis_cluster.pb.validate.h" +#include "envoy/config/filter/network/redis_proxy/v2/redis_proxy.pb.validate.h" #include "envoy/stats/scope.h" #include "common/network/utility.h" diff --git a/test/extensions/common/dynamic_forward_proxy/BUILD b/test/extensions/common/dynamic_forward_proxy/BUILD index c9bb27447c2ac..8b8964e1baa04 100644 --- a/test/extensions/common/dynamic_forward_proxy/BUILD +++ b/test/extensions/common/dynamic_forward_proxy/BUILD @@ -19,6 +19,8 @@ envoy_cc_test( "//test/mocks/network:network_mocks", "//test/mocks/thread_local:thread_local_mocks", "//test/test_common:simulated_time_system_lib", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/config/common/dynamic_forward_proxy/v2alpha:pkg_cc_proto", ], ) @@ -28,5 +30,6 @@ envoy_cc_mock( hdrs = ["mocks.h"], deps = [ "//source/extensions/common/dynamic_forward_proxy:dns_cache_interface", + "@envoy_api//envoy/config/common/dynamic_forward_proxy/v2alpha:pkg_cc_proto", ], ) diff --git a/test/extensions/common/dynamic_forward_proxy/dns_cache_impl_test.cc b/test/extensions/common/dynamic_forward_proxy/dns_cache_impl_test.cc index c2062232879ad..a1ded3f9476a4 100644 --- a/test/extensions/common/dynamic_forward_proxy/dns_cache_impl_test.cc +++ b/test/extensions/common/dynamic_forward_proxy/dns_cache_impl_test.cc @@ -1,3 +1,6 @@ +#include "envoy/api/v2/cds.pb.h" +#include "envoy/config/common/dynamic_forward_proxy/v2alpha/dns_cache.pb.h" + #include "extensions/common/dynamic_forward_proxy/dns_cache_impl.h" #include "extensions/common/dynamic_forward_proxy/dns_cache_manager_impl.h" diff --git a/test/extensions/common/dynamic_forward_proxy/mocks.h b/test/extensions/common/dynamic_forward_proxy/mocks.h index eb15995c2ffa1..1a48aae801de9 100644 --- a/test/extensions/common/dynamic_forward_proxy/mocks.h +++ b/test/extensions/common/dynamic_forward_proxy/mocks.h @@ -1,5 +1,7 @@ #pragma once +#include "envoy/config/common/dynamic_forward_proxy/v2alpha/dns_cache.pb.h" + #include "extensions/common/dynamic_forward_proxy/dns_cache.h" #include "gmock/gmock.h" diff --git a/test/extensions/common/tap/BUILD b/test/extensions/common/tap/BUILD index 253ba29987d46..df76b7e88aab4 100644 --- a/test/extensions/common/tap/BUILD +++ b/test/extensions/common/tap/BUILD @@ -16,6 +16,7 @@ envoy_cc_test_library( deps = [ "//source/extensions/common/tap:tap_interface", "//test/test_common:utility_lib", + "@envoy_api//envoy/data/tap/v2alpha:pkg_cc_proto", ], ) @@ -25,6 +26,7 @@ envoy_cc_test( deps = [ "//source/extensions/common/tap:admin", "//test/mocks/server:server_mocks", + "@envoy_api//envoy/service/tap/v2alpha:pkg_cc_proto", ], ) @@ -34,6 +36,7 @@ envoy_cc_test( deps = [ "//source/extensions/common/tap:tap_matcher", "//test/test_common:utility_lib", + "@envoy_api//envoy/service/tap/v2alpha:pkg_cc_proto", ], ) @@ -43,5 +46,7 @@ envoy_cc_test( deps = [ "//source/common/buffer:buffer_lib", "//source/extensions/common/tap:tap_config_base", + "@envoy_api//envoy/data/tap/v2alpha:pkg_cc_proto", + "@envoy_api//envoy/service/tap/v2alpha:pkg_cc_proto", ], ) diff --git a/test/extensions/common/tap/admin_test.cc b/test/extensions/common/tap/admin_test.cc index 4c7428a628206..d73119b23387f 100644 --- a/test/extensions/common/tap/admin_test.cc +++ b/test/extensions/common/tap/admin_test.cc @@ -1,3 +1,5 @@ +#include "envoy/service/tap/v2alpha/common.pb.h" + #include "extensions/common/tap/admin.h" #include "test/mocks/server/mocks.h" diff --git a/test/extensions/common/tap/common.cc b/test/extensions/common/tap/common.cc index 2a4cd729399dc..9aeec4649803d 100644 --- a/test/extensions/common/tap/common.cc +++ b/test/extensions/common/tap/common.cc @@ -1,5 +1,7 @@ #include "test/extensions/common/tap/common.h" +#include "envoy/data/tap/v2alpha/wrapper.pb.h" + namespace envoy { namespace data { namespace tap { diff --git a/test/extensions/common/tap/common.h b/test/extensions/common/tap/common.h index dda23a9134728..9d005b461d365 100644 --- a/test/extensions/common/tap/common.h +++ b/test/extensions/common/tap/common.h @@ -1,3 +1,5 @@ +#include "envoy/data/tap/v2alpha/wrapper.pb.h" + #include "common/protobuf/utility.h" #include "extensions/common/tap/tap.h" diff --git a/test/extensions/common/tap/tap_config_base_test.cc b/test/extensions/common/tap/tap_config_base_test.cc index e21cdcdb0b227..a381f7858894d 100644 --- a/test/extensions/common/tap/tap_config_base_test.cc +++ b/test/extensions/common/tap/tap_config_base_test.cc @@ -1,5 +1,9 @@ #include +#include "envoy/data/tap/v2alpha/common.pb.h" +#include "envoy/data/tap/v2alpha/wrapper.pb.h" +#include "envoy/service/tap/v2alpha/common.pb.h" + #include "common/buffer/buffer_impl.h" #include "extensions/common/tap/tap_config_base.h" diff --git a/test/extensions/common/tap/tap_matcher_test.cc b/test/extensions/common/tap/tap_matcher_test.cc index d896e70c22944..65702ba952b08 100644 --- a/test/extensions/common/tap/tap_matcher_test.cc +++ b/test/extensions/common/tap/tap_matcher_test.cc @@ -1,3 +1,5 @@ +#include "envoy/service/tap/v2alpha/common.pb.h" + #include "common/protobuf/utility.h" #include "extensions/common/tap/tap_matcher.h" diff --git a/test/extensions/filters/common/ext_authz/BUILD b/test/extensions/filters/common/ext_authz/BUILD index b1219d470852e..36317dc8b2f30 100644 --- a/test/extensions/filters/common/ext_authz/BUILD +++ b/test/extensions/filters/common/ext_authz/BUILD @@ -21,6 +21,8 @@ envoy_cc_test( "//test/mocks/stream_info:stream_info_mocks", "//test/mocks/upstream:upstream_mocks", "//test/test_common:utility_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/service/auth/v2:pkg_cc_proto", ], ) @@ -30,9 +32,9 @@ envoy_cc_test( deps = [ "//source/extensions/filters/common/ext_authz:ext_authz_grpc_lib", "//test/extensions/filters/common/ext_authz:ext_authz_test_common", - "@envoy_api//envoy/api/v2/core:pkg_cc_proto", "@envoy_api//envoy/service/auth/v2:pkg_cc_proto", "@envoy_api//envoy/service/auth/v2alpha:pkg_cc_proto", + "@envoy_api//envoy/type:pkg_cc_proto", ], ) @@ -42,7 +44,8 @@ envoy_cc_test( deps = [ "//source/extensions/filters/common/ext_authz:ext_authz_http_lib", "//test/extensions/filters/common/ext_authz:ext_authz_test_common", - "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/config/filter/http/ext_authz/v2:pkg_cc_proto", + "@envoy_api//envoy/service/auth/v2:pkg_cc_proto", ], ) @@ -52,6 +55,7 @@ envoy_cc_mock( hdrs = ["mocks.h"], deps = [ "//source/extensions/filters/common/ext_authz:ext_authz_interface", + "@envoy_api//envoy/service/auth/v2:pkg_cc_proto", ], ) @@ -67,5 +71,7 @@ envoy_cc_mock( "//test/mocks/grpc:grpc_mocks", "//test/mocks/upstream:upstream_mocks", "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/service/auth/v2:pkg_cc_proto", + "@envoy_api//envoy/type:pkg_cc_proto", ], ) diff --git a/test/extensions/filters/common/ext_authz/check_request_utils_test.cc b/test/extensions/filters/common/ext_authz/check_request_utils_test.cc index 60fc785c7e6c6..b5dc3cc681ae6 100644 --- a/test/extensions/filters/common/ext_authz/check_request_utils_test.cc +++ b/test/extensions/filters/common/ext_authz/check_request_utils_test.cc @@ -1,3 +1,6 @@ +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/service/auth/v2/external_auth.pb.h" + #include "common/network/address_impl.h" #include "common/protobuf/protobuf.h" diff --git a/test/extensions/filters/common/ext_authz/ext_authz_grpc_impl_test.cc b/test/extensions/filters/common/ext_authz/ext_authz_grpc_impl_test.cc index 832467749e3c7..e780537a9760e 100644 --- a/test/extensions/filters/common/ext_authz/ext_authz_grpc_impl_test.cc +++ b/test/extensions/filters/common/ext_authz/ext_authz_grpc_impl_test.cc @@ -1,6 +1,6 @@ -#include "envoy/api/v2/core/base.pb.h" -#include "envoy/service/auth/v2/external_auth.pb.h" // for proto link +#include "envoy/service/auth/v2/external_auth.pb.h" #include "envoy/service/auth/v2alpha/external_auth.pb.h" // for proto link +#include "envoy/type/http_status.pb.h" #include "common/grpc/common.h" #include "common/http/headers.h" diff --git a/test/extensions/filters/common/ext_authz/ext_authz_http_impl_test.cc b/test/extensions/filters/common/ext_authz/ext_authz_http_impl_test.cc index 9a8bd9b57c854..b896e731fb8c9 100644 --- a/test/extensions/filters/common/ext_authz/ext_authz_http_impl_test.cc +++ b/test/extensions/filters/common/ext_authz/ext_authz_http_impl_test.cc @@ -1,4 +1,5 @@ -#include "envoy/api/v2/core/base.pb.h" +#include "envoy/config/filter/http/ext_authz/v2/ext_authz.pb.h" +#include "envoy/service/auth/v2/external_auth.pb.h" #include "common/http/headers.h" #include "common/http/message_impl.h" diff --git a/test/extensions/filters/common/ext_authz/mocks.h b/test/extensions/filters/common/ext_authz/mocks.h index 8d2dd1a313657..f4401d7c46df6 100644 --- a/test/extensions/filters/common/ext_authz/mocks.h +++ b/test/extensions/filters/common/ext_authz/mocks.h @@ -3,6 +3,8 @@ #include #include +#include "envoy/service/auth/v2/external_auth.pb.h" + #include "extensions/filters/common/ext_authz/ext_authz.h" #include "gmock/gmock.h" diff --git a/test/extensions/filters/common/ext_authz/test_common.cc b/test/extensions/filters/common/ext_authz/test_common.cc index 50eaf9434ec46..4f322e01da30a 100644 --- a/test/extensions/filters/common/ext_authz/test_common.cc +++ b/test/extensions/filters/common/ext_authz/test_common.cc @@ -2,6 +2,10 @@ #include +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/service/auth/v2/external_auth.pb.h" +#include "envoy/type/http_status.pb.h" + #include "test/mocks/upstream/mocks.h" namespace Envoy { diff --git a/test/extensions/filters/common/ext_authz/test_common.h b/test/extensions/filters/common/ext_authz/test_common.h index 2ac2d0e7331d1..e784aaa2f2746 100644 --- a/test/extensions/filters/common/ext_authz/test_common.h +++ b/test/extensions/filters/common/ext_authz/test_common.h @@ -1,6 +1,8 @@ #pragma once #include "envoy/api/v2/core/base.pb.h" +#include "envoy/service/auth/v2/external_auth.pb.h" +#include "envoy/type/http_status.pb.h" #include "common/http/headers.h" diff --git a/test/extensions/filters/common/fault/BUILD b/test/extensions/filters/common/fault/BUILD index b32b0d000811f..db3d74fd34065 100644 --- a/test/extensions/filters/common/fault/BUILD +++ b/test/extensions/filters/common/fault/BUILD @@ -14,5 +14,6 @@ envoy_cc_test( deps = [ "//source/extensions/filters/common/fault:fault_config_lib", "//test/test_common:utility_lib", + "@envoy_api//envoy/config/filter/fault/v2:pkg_cc_proto", ], ) diff --git a/test/extensions/filters/common/fault/fault_config_test.cc b/test/extensions/filters/common/fault/fault_config_test.cc index a01a1c5690063..e8cbf9d8083a0 100644 --- a/test/extensions/filters/common/fault/fault_config_test.cc +++ b/test/extensions/filters/common/fault/fault_config_test.cc @@ -1,3 +1,5 @@ +#include "envoy/config/filter/fault/v2/fault.pb.h" + #include "extensions/filters/common/fault/fault_config.h" #include "test/test_common/utility.h" diff --git a/test/extensions/filters/common/lua/BUILD b/test/extensions/filters/common/lua/BUILD index 6b84cbe798cab..2a4ea815b577f 100644 --- a/test/extensions/filters/common/lua/BUILD +++ b/test/extensions/filters/common/lua/BUILD @@ -30,6 +30,7 @@ envoy_cc_test( "//test/mocks/network:network_mocks", "//test/mocks/ssl:ssl_mocks", "//test/test_common:utility_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) diff --git a/test/extensions/filters/common/lua/wrappers_test.cc b/test/extensions/filters/common/lua/wrappers_test.cc index 8d4a9af87ec2b..a64ee7c6f25d1 100644 --- a/test/extensions/filters/common/lua/wrappers_test.cc +++ b/test/extensions/filters/common/lua/wrappers_test.cc @@ -1,3 +1,5 @@ +#include "envoy/api/v2/core/base.pb.h" + #include "common/buffer/buffer_impl.h" #include "extensions/filters/common/lua/wrappers.h" diff --git a/test/extensions/filters/common/original_src/BUILD b/test/extensions/filters/common/original_src/BUILD index c1825c4e75ad4..f42ad51086181 100644 --- a/test/extensions/filters/common/original_src/BUILD +++ b/test/extensions/filters/common/original_src/BUILD @@ -17,5 +17,6 @@ envoy_cc_test( "//test/mocks:common_lib", "//test/mocks/network:network_mocks", "//test/test_common:printers_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) diff --git a/test/extensions/filters/common/original_src/original_src_socket_option_test.cc b/test/extensions/filters/common/original_src/original_src_socket_option_test.cc index c2e108cb666a5..a410f682ff8a4 100644 --- a/test/extensions/filters/common/original_src/original_src_socket_option_test.cc +++ b/test/extensions/filters/common/original_src/original_src_socket_option_test.cc @@ -1,3 +1,4 @@ +#include "envoy/api/v2/core/base.pb.h" #include "envoy/network/address.h" #include "common/network/utility.h" diff --git a/test/extensions/filters/common/ratelimit/BUILD b/test/extensions/filters/common/ratelimit/BUILD index 95ba515ee8b99..740798ba309b0 100644 --- a/test/extensions/filters/common/ratelimit/BUILD +++ b/test/extensions/filters/common/ratelimit/BUILD @@ -19,6 +19,7 @@ envoy_cc_test( "//test/mocks/grpc:grpc_mocks", "//test/mocks/upstream:upstream_mocks", "//test/test_common:utility_lib", + "@envoy_api//envoy/service/ratelimit/v2:pkg_cc_proto", ], ) diff --git a/test/extensions/filters/common/ratelimit/ratelimit_impl_test.cc b/test/extensions/filters/common/ratelimit/ratelimit_impl_test.cc index 7c392dd288739..40acdb9ec20ea 100644 --- a/test/extensions/filters/common/ratelimit/ratelimit_impl_test.cc +++ b/test/extensions/filters/common/ratelimit/ratelimit_impl_test.cc @@ -3,6 +3,7 @@ #include #include +#include "envoy/service/ratelimit/v2/rls.pb.h" #include "envoy/stats/scope.h" #include "common/http/header_map_impl.h" diff --git a/test/extensions/filters/common/rbac/BUILD b/test/extensions/filters/common/rbac/BUILD index 1620b70b5f162..e4abc56ebda1a 100644 --- a/test/extensions/filters/common/rbac/BUILD +++ b/test/extensions/filters/common/rbac/BUILD @@ -21,6 +21,10 @@ envoy_extension_cc_test( "//test/mocks/network:network_mocks", "//test/mocks/ssl:ssl_mocks", "//test/test_common:utility_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/api/v2/route:pkg_cc_proto", + "@envoy_api//envoy/config/rbac/v2:pkg_cc_proto", + "@envoy_api//envoy/type/matcher:pkg_cc_proto", ], ) @@ -34,6 +38,7 @@ envoy_extension_cc_test( "//test/mocks/ssl:ssl_mocks", "//test/mocks/stream_info:stream_info_mocks", "//test/test_common:utility_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", "@envoy_api//envoy/config/rbac/v2:pkg_cc_proto", ], ) @@ -44,5 +49,6 @@ envoy_extension_cc_mock( extension_name = "envoy.filters.http.rbac", deps = [ "//source/extensions/filters/common/rbac:engine_lib", + "@envoy_api//envoy/config/rbac/v2:pkg_cc_proto", ], ) diff --git a/test/extensions/filters/common/rbac/engine_impl_test.cc b/test/extensions/filters/common/rbac/engine_impl_test.cc index 7bbbb3e8dc9c4..2f8e1b3f1a299 100644 --- a/test/extensions/filters/common/rbac/engine_impl_test.cc +++ b/test/extensions/filters/common/rbac/engine_impl_test.cc @@ -1,3 +1,5 @@ +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/config/rbac/v2/rbac.pb.h" #include "envoy/config/rbac/v2/rbac.pb.validate.h" #include "common/network/utility.h" diff --git a/test/extensions/filters/common/rbac/matchers_test.cc b/test/extensions/filters/common/rbac/matchers_test.cc index 9b6a79ef595d2..848f7bcc4a3d5 100644 --- a/test/extensions/filters/common/rbac/matchers_test.cc +++ b/test/extensions/filters/common/rbac/matchers_test.cc @@ -1,3 +1,9 @@ +#include "envoy/api/v2/core/address.pb.h" +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/api/v2/route/route.pb.h" +#include "envoy/config/rbac/v2/rbac.pb.h" +#include "envoy/type/matcher/metadata.pb.h" + #include "common/network/utility.h" #include "extensions/filters/common/rbac/matchers.h" diff --git a/test/extensions/filters/common/rbac/mocks.h b/test/extensions/filters/common/rbac/mocks.h index 50555419dd4cd..78bafc4a3e18b 100644 --- a/test/extensions/filters/common/rbac/mocks.h +++ b/test/extensions/filters/common/rbac/mocks.h @@ -1,5 +1,7 @@ #pragma once +#include "envoy/config/rbac/v2/rbac.pb.h" + #include "extensions/filters/common/rbac/engine_impl.h" #include "gmock/gmock.h" diff --git a/test/extensions/filters/http/adaptive_concurrency/adaptive_concurrency_filter_test.cc b/test/extensions/filters/http/adaptive_concurrency/adaptive_concurrency_filter_test.cc index 07f95ee1df8a5..3ed4b4fb30a18 100644 --- a/test/extensions/filters/http/adaptive_concurrency/adaptive_concurrency_filter_test.cc +++ b/test/extensions/filters/http/adaptive_concurrency/adaptive_concurrency_filter_test.cc @@ -1,5 +1,6 @@ #include +#include "envoy/config/filter/http/adaptive_concurrency/v2alpha/adaptive_concurrency.pb.h" #include "envoy/config/filter/http/adaptive_concurrency/v2alpha/adaptive_concurrency.pb.validate.h" #include "extensions/filters/http/adaptive_concurrency/adaptive_concurrency_filter.h" diff --git a/test/extensions/filters/http/adaptive_concurrency/concurrency_controller/gradient_controller_test.cc b/test/extensions/filters/http/adaptive_concurrency/concurrency_controller/gradient_controller_test.cc index c5413bddba31a..f7b7fd11fc440 100644 --- a/test/extensions/filters/http/adaptive_concurrency/concurrency_controller/gradient_controller_test.cc +++ b/test/extensions/filters/http/adaptive_concurrency/concurrency_controller/gradient_controller_test.cc @@ -1,6 +1,7 @@ #include #include +#include "envoy/config/filter/http/adaptive_concurrency/v2alpha/adaptive_concurrency.pb.h" #include "envoy/config/filter/http/adaptive_concurrency/v2alpha/adaptive_concurrency.pb.validate.h" #include "common/stats/isolated_store_impl.h" diff --git a/test/extensions/filters/http/buffer/BUILD b/test/extensions/filters/http/buffer/BUILD index e54540a8ca5ab..546b15b392eb6 100644 --- a/test/extensions/filters/http/buffer/BUILD +++ b/test/extensions/filters/http/buffer/BUILD @@ -41,6 +41,7 @@ envoy_extension_cc_test( "//test/config:utility_lib", "//test/integration:http_protocol_integration_lib", "@envoy_api//envoy/config/filter/http/buffer/v2:pkg_cc_proto", + "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto", ], ) diff --git a/test/extensions/filters/http/buffer/buffer_filter_integration_test.cc b/test/extensions/filters/http/buffer/buffer_filter_integration_test.cc index 2160108835057..bf6720bc36498 100644 --- a/test/extensions/filters/http/buffer/buffer_filter_integration_test.cc +++ b/test/extensions/filters/http/buffer/buffer_filter_integration_test.cc @@ -1,4 +1,5 @@ #include "envoy/config/filter/http/buffer/v2/buffer.pb.h" +#include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.h" #include "common/protobuf/utility.h" diff --git a/test/extensions/filters/http/buffer/config_test.cc b/test/extensions/filters/http/buffer/config_test.cc index 53bb6b5a7b420..64ee63ca54dca 100644 --- a/test/extensions/filters/http/buffer/config_test.cc +++ b/test/extensions/filters/http/buffer/config_test.cc @@ -1,3 +1,4 @@ +#include "envoy/config/filter/http/buffer/v2/buffer.pb.h" #include "envoy/config/filter/http/buffer/v2/buffer.pb.validate.h" #include "extensions/filters/http/buffer/buffer_filter.h" diff --git a/test/extensions/filters/http/common/BUILD b/test/extensions/filters/http/common/BUILD index 4d2c0e7a5e758..cd1ac23688230 100644 --- a/test/extensions/filters/http/common/BUILD +++ b/test/extensions/filters/http/common/BUILD @@ -23,6 +23,7 @@ envoy_cc_test_library( deps = [ "//source/extensions/filters/http/common:jwks_fetcher_lib", "//test/mocks/server:server_mocks", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -37,5 +38,6 @@ envoy_extension_cc_test( "//test/extensions/filters/http/common:mock_lib", "//test/mocks/http:http_mocks", "//test/test_common:utility_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) diff --git a/test/extensions/filters/http/common/aws/utility_test.cc b/test/extensions/filters/http/common/aws/utility_test.cc index 6bacd36317bfd..e472ab7439e82 100644 --- a/test/extensions/filters/http/common/aws/utility_test.cc +++ b/test/extensions/filters/http/common/aws/utility_test.cc @@ -152,4 +152,4 @@ TEST(UtilityTest, JoinCanonicalHeaderNamesWithEmptyMap) { } // namespace Common } // namespace HttpFilters } // namespace Extensions -} // namespace Envoy \ No newline at end of file +} // namespace Envoy diff --git a/test/extensions/filters/http/common/jwks_fetcher_test.cc b/test/extensions/filters/http/common/jwks_fetcher_test.cc index ea6f9f42f8784..e449604325d60 100644 --- a/test/extensions/filters/http/common/jwks_fetcher_test.cc +++ b/test/extensions/filters/http/common/jwks_fetcher_test.cc @@ -1,6 +1,8 @@ #include #include +#include "envoy/api/v2/core/http_uri.pb.h" + #include "common/http/message_impl.h" #include "common/protobuf/utility.h" diff --git a/test/extensions/filters/http/common/mock.h b/test/extensions/filters/http/common/mock.h index 399ef18b4e501..57a01a919262a 100644 --- a/test/extensions/filters/http/common/mock.h +++ b/test/extensions/filters/http/common/mock.h @@ -1,5 +1,7 @@ #pragma once +#include "envoy/api/v2/core/http_uri.pb.h" + #include "extensions/filters/http/common/jwks_fetcher.h" #include "test/mocks/server/mocks.h" diff --git a/test/extensions/filters/http/cors/BUILD b/test/extensions/filters/http/cors/BUILD index c37f2fa038bd6..af89b52cca875 100644 --- a/test/extensions/filters/http/cors/BUILD +++ b/test/extensions/filters/http/cors/BUILD @@ -21,6 +21,7 @@ envoy_extension_cc_test( "//test/mocks/buffer:buffer_mocks", "//test/mocks/http:http_mocks", "//test/mocks/upstream:upstream_mocks", + "@envoy_api//envoy/type/matcher:pkg_cc_proto", ], ) @@ -36,5 +37,6 @@ envoy_extension_cc_test( "//test/mocks/http:http_mocks", "//test/mocks/upstream:upstream_mocks", "//test/test_common:utility_lib", + "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto", ], ) diff --git a/test/extensions/filters/http/cors/cors_filter_integration_test.cc b/test/extensions/filters/http/cors/cors_filter_integration_test.cc index 06a9120c8c4a5..a1132270586e3 100644 --- a/test/extensions/filters/http/cors/cors_filter_integration_test.cc +++ b/test/extensions/filters/http/cors/cors_filter_integration_test.cc @@ -1,3 +1,5 @@ +#include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.h" + #include "test/integration/http_integration.h" #include "test/mocks/http/mocks.h" #include "test/test_common/utility.h" diff --git a/test/extensions/filters/http/cors/cors_filter_test.cc b/test/extensions/filters/http/cors/cors_filter_test.cc index 503f624dd7418..a5663b72a23fd 100644 --- a/test/extensions/filters/http/cors/cors_filter_test.cc +++ b/test/extensions/filters/http/cors/cors_filter_test.cc @@ -1,3 +1,5 @@ +#include "envoy/type/matcher/string.pb.h" + #include "common/common/matchers.h" #include "common/http/header_map_impl.h" diff --git a/test/extensions/filters/http/csrf/BUILD b/test/extensions/filters/http/csrf/BUILD index b927d7a898739..b58f0443c0d68 100644 --- a/test/extensions/filters/http/csrf/BUILD +++ b/test/extensions/filters/http/csrf/BUILD @@ -21,6 +21,8 @@ envoy_extension_cc_test( "//test/mocks/buffer:buffer_mocks", "//test/mocks/http:http_mocks", "//test/mocks/upstream:upstream_mocks", + "@envoy_api//envoy/config/filter/http/csrf/v2:pkg_cc_proto", + "@envoy_api//envoy/type:pkg_cc_proto", ], ) diff --git a/test/extensions/filters/http/csrf/csrf_filter_test.cc b/test/extensions/filters/http/csrf/csrf_filter_test.cc index 22ab5972488f2..b5e9882913595 100644 --- a/test/extensions/filters/http/csrf/csrf_filter_test.cc +++ b/test/extensions/filters/http/csrf/csrf_filter_test.cc @@ -1,3 +1,6 @@ +#include "envoy/config/filter/http/csrf/v2/csrf.pb.h" +#include "envoy/type/percent.pb.h" + #include "common/http/header_map_impl.h" #include "extensions/filters/http/csrf/csrf_filter.h" diff --git a/test/extensions/filters/http/dynamic_forward_proxy/BUILD b/test/extensions/filters/http/dynamic_forward_proxy/BUILD index 891bbb152f43f..6c205015c4f73 100644 --- a/test/extensions/filters/http/dynamic_forward_proxy/BUILD +++ b/test/extensions/filters/http/dynamic_forward_proxy/BUILD @@ -21,6 +21,7 @@ envoy_extension_cc_test( "//test/extensions/common/dynamic_forward_proxy:mocks", "//test/mocks/http:http_mocks", "//test/mocks/upstream:upstream_mocks", + "@envoy_api//envoy/config/filter/http/dynamic_forward_proxy/v2alpha:pkg_cc_proto", ], ) @@ -35,6 +36,9 @@ envoy_extension_cc_test( "//source/extensions/clusters/dynamic_forward_proxy:cluster", "//source/extensions/filters/http/dynamic_forward_proxy:config", "//test/integration:http_integration_lib", + "@envoy_api//envoy/api/v2:pkg_cc_proto", "@envoy_api//envoy/api/v2/auth:pkg_cc_proto", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", + "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto", ], ) diff --git a/test/extensions/filters/http/dynamic_forward_proxy/proxy_filter_integration_test.cc b/test/extensions/filters/http/dynamic_forward_proxy/proxy_filter_integration_test.cc index b731a091a4051..9c26c95168bd9 100644 --- a/test/extensions/filters/http/dynamic_forward_proxy/proxy_filter_integration_test.cc +++ b/test/extensions/filters/http/dynamic_forward_proxy/proxy_filter_integration_test.cc @@ -1,4 +1,7 @@ #include "envoy/api/v2/auth/cert.pb.h" +#include "envoy/api/v2/cds.pb.h" +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" +#include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.h" #include "extensions/transport_sockets/tls/context_config_impl.h" #include "extensions/transport_sockets/tls/ssl_socket.h" diff --git a/test/extensions/filters/http/dynamic_forward_proxy/proxy_filter_test.cc b/test/extensions/filters/http/dynamic_forward_proxy/proxy_filter_test.cc index 521a14d55f736..06d72300802ab 100644 --- a/test/extensions/filters/http/dynamic_forward_proxy/proxy_filter_test.cc +++ b/test/extensions/filters/http/dynamic_forward_proxy/proxy_filter_test.cc @@ -1,3 +1,5 @@ +#include "envoy/config/filter/http/dynamic_forward_proxy/v2alpha/dynamic_forward_proxy.pb.h" + #include "extensions/filters/http/dynamic_forward_proxy/proxy_filter.h" #include "extensions/filters/http/well_known_names.h" diff --git a/test/extensions/filters/http/ext_authz/BUILD b/test/extensions/filters/http/ext_authz/BUILD index 67a50cfe3e7dd..b1cb8993f0b44 100644 --- a/test/extensions/filters/http/ext_authz/BUILD +++ b/test/extensions/filters/http/ext_authz/BUILD @@ -34,7 +34,10 @@ envoy_extension_cc_test( "//test/mocks/tracing:tracing_mocks", "//test/mocks/upstream:upstream_mocks", "//test/test_common:utility_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", "@envoy_api//envoy/config/filter/http/ext_authz/v2:pkg_cc_proto", + "@envoy_api//envoy/service/auth/v2:pkg_cc_proto", + "@envoy_api//envoy/type:pkg_cc_proto", ], ) @@ -45,6 +48,7 @@ envoy_extension_cc_test( deps = [ "//source/extensions/filters/http/ext_authz:config", "//test/mocks/server:server_mocks", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", "@envoy_api//envoy/config/filter/http/ext_authz/v2:pkg_cc_proto", ], ) @@ -57,6 +61,8 @@ envoy_extension_cc_test( "//source/extensions/filters/http/ext_authz:config", "//test/integration:http_integration_lib", "//test/test_common:utility_lib", + "@envoy_api//envoy/api/v2/listener:pkg_cc_proto", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", "@envoy_api//envoy/config/filter/http/ext_authz/v2:pkg_cc_proto", "@envoy_api//envoy/service/auth/v2:pkg_cc_proto", ], diff --git a/test/extensions/filters/http/ext_authz/config_test.cc b/test/extensions/filters/http/ext_authz/config_test.cc index 63e889ed6c17c..be228d0cf9683 100644 --- a/test/extensions/filters/http/ext_authz/config_test.cc +++ b/test/extensions/filters/http/ext_authz/config_test.cc @@ -1,3 +1,4 @@ +#include "envoy/api/v2/core/grpc_service.pb.h" #include "envoy/config/filter/http/ext_authz/v2/ext_authz.pb.validate.h" #include "envoy/stats/scope.h" diff --git a/test/extensions/filters/http/ext_authz/ext_authz_integration_test.cc b/test/extensions/filters/http/ext_authz/ext_authz_integration_test.cc index fe392d519022b..24fdd65949742 100644 --- a/test/extensions/filters/http/ext_authz/ext_authz_integration_test.cc +++ b/test/extensions/filters/http/ext_authz/ext_authz_integration_test.cc @@ -1,3 +1,5 @@ +#include "envoy/api/v2/listener/listener.pb.h" +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" #include "envoy/config/filter/http/ext_authz/v2/ext_authz.pb.h" #include "envoy/service/auth/v2/external_auth.pb.h" diff --git a/test/extensions/filters/http/ext_authz/ext_authz_test.cc b/test/extensions/filters/http/ext_authz/ext_authz_test.cc index cbd5f5f22e581..fe8f9500bd468 100644 --- a/test/extensions/filters/http/ext_authz/ext_authz_test.cc +++ b/test/extensions/filters/http/ext_authz/ext_authz_test.cc @@ -2,9 +2,12 @@ #include #include +#include "envoy/api/v2/core/base.pb.h" #include "envoy/config/filter/http/ext_authz/v2/ext_authz.pb.h" #include "envoy/config/filter/http/ext_authz/v2/ext_authz.pb.validate.h" #include "envoy/http/codes.h" +#include "envoy/service/auth/v2/external_auth.pb.h" +#include "envoy/type/percent.pb.h" #include "common/buffer/buffer_impl.h" #include "common/common/empty_string.h" diff --git a/test/extensions/filters/http/fault/BUILD b/test/extensions/filters/http/fault/BUILD index 0e7ff714f6e69..b2466b0dbd2fc 100644 --- a/test/extensions/filters/http/fault/BUILD +++ b/test/extensions/filters/http/fault/BUILD @@ -32,6 +32,7 @@ envoy_extension_cc_test( "//test/test_common:simulated_time_system_lib", "//test/test_common:utility_lib", "@envoy_api//envoy/config/filter/http/fault/v2:pkg_cc_proto", + "@envoy_api//envoy/type:pkg_cc_proto", ], ) @@ -44,6 +45,7 @@ envoy_extension_cc_test( "//source/extensions/filters/http/fault:config", "//test/mocks/server:server_mocks", "@envoy_api//envoy/config/filter/http/fault/v2:pkg_cc_proto", + "@envoy_api//envoy/type:pkg_cc_proto", ], ) diff --git a/test/extensions/filters/http/fault/config_test.cc b/test/extensions/filters/http/fault/config_test.cc index 3dfb5bc87267e..87e7c58400a83 100644 --- a/test/extensions/filters/http/fault/config_test.cc +++ b/test/extensions/filters/http/fault/config_test.cc @@ -1,4 +1,6 @@ +#include "envoy/config/filter/http/fault/v2/fault.pb.h" #include "envoy/config/filter/http/fault/v2/fault.pb.validate.h" +#include "envoy/type/percent.pb.h" #include "extensions/filters/http/fault/config.h" diff --git a/test/extensions/filters/http/fault/fault_filter_test.cc b/test/extensions/filters/http/fault/fault_filter_test.cc index ac8d4fb7d3365..7d09e4aa4be56 100644 --- a/test/extensions/filters/http/fault/fault_filter_test.cc +++ b/test/extensions/filters/http/fault/fault_filter_test.cc @@ -6,6 +6,7 @@ #include "envoy/config/filter/http/fault/v2/fault.pb.h" #include "envoy/config/filter/http/fault/v2/fault.pb.validate.h" #include "envoy/event/dispatcher.h" +#include "envoy/type/percent.pb.h" #include "common/buffer/buffer_impl.h" #include "common/common/empty_string.h" diff --git a/test/extensions/filters/http/grpc_http1_reverse_bridge/BUILD b/test/extensions/filters/http/grpc_http1_reverse_bridge/BUILD index 87abfd42c5637..c6a383ca71d29 100644 --- a/test/extensions/filters/http/grpc_http1_reverse_bridge/BUILD +++ b/test/extensions/filters/http/grpc_http1_reverse_bridge/BUILD @@ -20,6 +20,7 @@ envoy_extension_cc_test( "//source/common/http:header_map_lib", "//source/extensions/filters/http/grpc_http1_reverse_bridge:filter_lib", "//test/mocks/upstream:upstream_mocks", + "@envoy_api//envoy/config/filter/http/grpc_http1_reverse_bridge/v2alpha1:pkg_cc_proto", ], ) diff --git a/test/extensions/filters/http/grpc_http1_reverse_bridge/reverse_bridge_test.cc b/test/extensions/filters/http/grpc_http1_reverse_bridge/reverse_bridge_test.cc index e1cdbb966389d..f2bc72abd15a4 100644 --- a/test/extensions/filters/http/grpc_http1_reverse_bridge/reverse_bridge_test.cc +++ b/test/extensions/filters/http/grpc_http1_reverse_bridge/reverse_bridge_test.cc @@ -1,6 +1,8 @@ #include #include +#include "envoy/config/filter/http/grpc_http1_reverse_bridge/v2alpha1/config.pb.h" + #include "common/buffer/buffer_impl.h" #include "common/grpc/codec.h" #include "common/http/header_map_impl.h" diff --git a/test/extensions/filters/http/grpc_json_transcoder/BUILD b/test/extensions/filters/http/grpc_json_transcoder/BUILD index bed07013bdbe9..eb4e266b22e4c 100644 --- a/test/extensions/filters/http/grpc_json_transcoder/BUILD +++ b/test/extensions/filters/http/grpc_json_transcoder/BUILD @@ -26,6 +26,7 @@ envoy_extension_cc_test( "//test/proto:bookstore_proto_cc_proto", "//test/test_common:environment_lib", "//test/test_common:utility_lib", + "@envoy_api//envoy/config/filter/http/transcoder/v2:pkg_cc_proto", ], ) diff --git a/test/extensions/filters/http/grpc_json_transcoder/config_test.cc b/test/extensions/filters/http/grpc_json_transcoder/config_test.cc index b7ad9349db922..b7d92917ff4bf 100644 --- a/test/extensions/filters/http/grpc_json_transcoder/config_test.cc +++ b/test/extensions/filters/http/grpc_json_transcoder/config_test.cc @@ -1,3 +1,4 @@ +#include "envoy/config/filter/http/transcoder/v2/transcoder.pb.h" #include "envoy/config/filter/http/transcoder/v2/transcoder.pb.validate.h" #include "extensions/filters/http/grpc_json_transcoder/config.h" diff --git a/test/extensions/filters/http/grpc_json_transcoder/json_transcoder_filter_test.cc b/test/extensions/filters/http/grpc_json_transcoder/json_transcoder_filter_test.cc index a6e53da8dd5de..0d295ec1bbb00 100644 --- a/test/extensions/filters/http/grpc_json_transcoder/json_transcoder_filter_test.cc +++ b/test/extensions/filters/http/grpc_json_transcoder/json_transcoder_filter_test.cc @@ -1,6 +1,8 @@ #include #include +#include "envoy/config/filter/http/transcoder/v2/transcoder.pb.h" + #include "common/buffer/buffer_impl.h" #include "common/grpc/codec.h" #include "common/grpc/common.h" diff --git a/test/extensions/filters/http/grpc_stats/BUILD b/test/extensions/filters/http/grpc_stats/BUILD index 43dc2682af514..bbd9d4acb6331 100644 --- a/test/extensions/filters/http/grpc_stats/BUILD +++ b/test/extensions/filters/http/grpc_stats/BUILD @@ -21,5 +21,6 @@ envoy_extension_cc_test( "//test/common/buffer:utility_lib", "//test/common/stream_info:test_util", "//test/mocks/server:server_mocks", + "@envoy_api//envoy/config/filter/http/grpc_stats/v2alpha:pkg_cc_proto", ], ) diff --git a/test/extensions/filters/http/grpc_stats/config_test.cc b/test/extensions/filters/http/grpc_stats/config_test.cc index 133c0259b84c1..cab9b31075b9c 100644 --- a/test/extensions/filters/http/grpc_stats/config_test.cc +++ b/test/extensions/filters/http/grpc_stats/config_test.cc @@ -1,3 +1,6 @@ +#include "envoy/config/filter/http/grpc_stats/v2alpha/config.pb.h" +#include "envoy/config/filter/http/grpc_stats/v2alpha/config.pb.validate.h" + #include "common/grpc/common.h" #include "extensions/filters/http/grpc_stats/grpc_stats_filter.h" diff --git a/test/extensions/filters/http/gzip/BUILD b/test/extensions/filters/http/gzip/BUILD index 359507785ac60..5e644db4c2ad7 100644 --- a/test/extensions/filters/http/gzip/BUILD +++ b/test/extensions/filters/http/gzip/BUILD @@ -23,6 +23,7 @@ envoy_extension_cc_test( "//test/mocks/http:http_mocks", "//test/mocks/runtime:runtime_mocks", "//test/test_common:utility_lib", + "@envoy_api//envoy/config/filter/http/gzip/v2:pkg_cc_proto", ], ) diff --git a/test/extensions/filters/http/gzip/gzip_filter_test.cc b/test/extensions/filters/http/gzip/gzip_filter_test.cc index 2f43834a5b812..e9c908faa2eed 100644 --- a/test/extensions/filters/http/gzip/gzip_filter_test.cc +++ b/test/extensions/filters/http/gzip/gzip_filter_test.cc @@ -1,5 +1,7 @@ #include +#include "envoy/config/filter/http/gzip/v2/gzip.pb.h" + #include "common/common/hex.h" #include "common/common/stack_array.h" #include "common/compressor/zlib_compressor_impl.h" diff --git a/test/extensions/filters/http/header_to_metadata/BUILD b/test/extensions/filters/http/header_to_metadata/BUILD index 63d3020c4eb9a..959131002ee94 100644 --- a/test/extensions/filters/http/header_to_metadata/BUILD +++ b/test/extensions/filters/http/header_to_metadata/BUILD @@ -19,6 +19,7 @@ envoy_extension_cc_test( "//source/common/common:base64_lib", "//source/extensions/filters/http/header_to_metadata:header_to_metadata_filter_lib", "//test/mocks/server:server_mocks", + "@envoy_api//envoy/config/filter/http/header_to_metadata/v2:pkg_cc_proto", ], ) diff --git a/test/extensions/filters/http/header_to_metadata/config_test.cc b/test/extensions/filters/http/header_to_metadata/config_test.cc index ecc375fbcf061..3c6d091ced990 100644 --- a/test/extensions/filters/http/header_to_metadata/config_test.cc +++ b/test/extensions/filters/http/header_to_metadata/config_test.cc @@ -1,5 +1,6 @@ #include +#include "envoy/config/filter/http/header_to_metadata/v2/header_to_metadata.pb.h" #include "envoy/config/filter/http/header_to_metadata/v2/header_to_metadata.pb.validate.h" #include "extensions/filters/http/header_to_metadata/config.h" diff --git a/test/extensions/filters/http/header_to_metadata/header_to_metadata_filter_test.cc b/test/extensions/filters/http/header_to_metadata/header_to_metadata_filter_test.cc index 9674e22e8217a..909aeb2725696 100644 --- a/test/extensions/filters/http/header_to_metadata/header_to_metadata_filter_test.cc +++ b/test/extensions/filters/http/header_to_metadata/header_to_metadata_filter_test.cc @@ -1,3 +1,5 @@ +#include "envoy/config/filter/http/header_to_metadata/v2/header_to_metadata.pb.h" + #include "common/common/base64.h" #include "common/http/header_map_impl.h" #include "common/protobuf/protobuf.h" diff --git a/test/extensions/filters/http/health_check/BUILD b/test/extensions/filters/http/health_check/BUILD index c2286d67a5993..b4f5ea3c7c13a 100644 --- a/test/extensions/filters/http/health_check/BUILD +++ b/test/extensions/filters/http/health_check/BUILD @@ -21,6 +21,7 @@ envoy_extension_cc_test( "//source/extensions/filters/http/health_check:health_check_lib", "//test/mocks/server:server_mocks", "//test/test_common:utility_lib", + "@envoy_api//envoy/api/v2/route:pkg_cc_proto", ], ) @@ -32,5 +33,7 @@ envoy_extension_cc_test( "//source/extensions/filters/http/health_check:config", "//test/mocks/server:server_mocks", "//test/test_common:utility_lib", + "@envoy_api//envoy/api/v2/route:pkg_cc_proto", + "@envoy_api//envoy/config/filter/http/health_check/v2:pkg_cc_proto", ], ) diff --git a/test/extensions/filters/http/health_check/config_test.cc b/test/extensions/filters/http/health_check/config_test.cc index f323512c4eb31..faa8152465961 100644 --- a/test/extensions/filters/http/health_check/config_test.cc +++ b/test/extensions/filters/http/health_check/config_test.cc @@ -1,5 +1,9 @@ #include +#include "envoy/api/v2/route/route.pb.h" +#include "envoy/config/filter/http/health_check/v2/health_check.pb.h" +#include "envoy/config/filter/http/health_check/v2/health_check.pb.validate.h" + #include "extensions/filters/http/health_check/config.h" #include "test/mocks/server/mocks.h" diff --git a/test/extensions/filters/http/health_check/health_check_test.cc b/test/extensions/filters/http/health_check/health_check_test.cc index 5c4472e669f5c..b23aceef3e666 100644 --- a/test/extensions/filters/http/health_check/health_check_test.cc +++ b/test/extensions/filters/http/health_check/health_check_test.cc @@ -1,6 +1,8 @@ #include #include +#include "envoy/api/v2/route/route.pb.h" + #include "common/buffer/buffer_impl.h" #include "common/http/header_utility.h" #include "common/upstream/upstream_impl.h" diff --git a/test/extensions/filters/http/ip_tagging/BUILD b/test/extensions/filters/http/ip_tagging/BUILD index ee75cf8ac4b5c..3267773355881 100644 --- a/test/extensions/filters/http/ip_tagging/BUILD +++ b/test/extensions/filters/http/ip_tagging/BUILD @@ -25,5 +25,6 @@ envoy_extension_cc_test( "//test/mocks/runtime:runtime_mocks", "//test/mocks/stats:stats_mocks", "//test/test_common:utility_lib", + "@envoy_api//envoy/config/filter/http/ip_tagging/v3alpha:pkg_cc_proto", ], ) diff --git a/test/extensions/filters/http/ip_tagging/ip_tagging_filter_test.cc b/test/extensions/filters/http/ip_tagging/ip_tagging_filter_test.cc index a237eb08a1de6..285ca89979ae8 100644 --- a/test/extensions/filters/http/ip_tagging/ip_tagging_filter_test.cc +++ b/test/extensions/filters/http/ip_tagging/ip_tagging_filter_test.cc @@ -1,5 +1,7 @@ #include +#include "envoy/config/filter/http/ip_tagging/v3alpha/ip_tagging.pb.h" + #include "common/buffer/buffer_impl.h" #include "common/http/header_map_impl.h" #include "common/network/address_impl.h" diff --git a/test/extensions/filters/http/jwt_authn/BUILD b/test/extensions/filters/http/jwt_authn/BUILD index ad86785c619f8..f616ac5b654f2 100644 --- a/test/extensions/filters/http/jwt_authn/BUILD +++ b/test/extensions/filters/http/jwt_authn/BUILD @@ -36,6 +36,7 @@ envoy_extension_cc_test( "//source/extensions/filters/http/jwt_authn:extractor_lib", "//test/extensions/filters/http/jwt_authn:test_common_lib", "//test/test_common:utility_lib", + "@envoy_api//envoy/config/filter/http/jwt_authn/v2alpha:pkg_cc_proto", ], ) @@ -48,6 +49,7 @@ envoy_extension_cc_test( "//source/extensions/filters/http/jwt_authn:filter_lib", "//test/mocks/server:server_mocks", "//test/test_common:utility_lib", + "@envoy_api//envoy/config/filter/http/jwt_authn/v2alpha:pkg_cc_proto", ], ) @@ -61,6 +63,7 @@ envoy_extension_cc_test( "//source/extensions/filters/http/jwt_authn:config", "//test/extensions/filters/http/jwt_authn:test_common_lib", "//test/mocks/server:server_mocks", + "@envoy_api//envoy/config/filter/http/jwt_authn/v2alpha:pkg_cc_proto", ], ) @@ -87,6 +90,7 @@ envoy_extension_cc_test( "//test/extensions/filters/http/jwt_authn:test_common_lib", "//test/test_common:simulated_time_system_lib", "//test/test_common:utility_lib", + "@envoy_api//envoy/config/filter/http/jwt_authn/v2alpha:pkg_cc_proto", ], ) @@ -104,6 +108,8 @@ envoy_extension_cc_test( "//test/extensions/filters/http/jwt_authn:test_common_lib", "//test/mocks/server:server_mocks", "//test/test_common:utility_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/config/filter/http/jwt_authn/v2alpha:pkg_cc_proto", ], ) @@ -119,7 +125,9 @@ envoy_extension_cc_test( "//test/config:utility_lib", "//test/extensions/filters/http/jwt_authn:test_common_lib", "//test/integration:http_protocol_integration_lib", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", "@envoy_api//envoy/config/filter/http/jwt_authn/v2alpha:pkg_cc_proto", + "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto", ], ) @@ -132,6 +140,7 @@ envoy_extension_cc_test( ":test_common_lib", "//source/extensions/filters/http/jwt_authn:matchers_lib", "//test/test_common:utility_lib", + "@envoy_api//envoy/config/filter/http/jwt_authn/v2alpha:pkg_cc_proto", ], ) @@ -144,6 +153,7 @@ envoy_extension_cc_test( ":test_common_lib", "//source/extensions/filters/http/jwt_authn:verifier_lib", "//test/test_common:utility_lib", + "@envoy_api//envoy/config/filter/http/jwt_authn/v2alpha:pkg_cc_proto", ], ) @@ -161,5 +171,6 @@ envoy_extension_cc_test( "//source/extensions/filters/http/jwt_authn:matchers_lib", "//test/mocks/server:server_mocks", "//test/test_common:utility_lib", + "@envoy_api//envoy/config/filter/http/jwt_authn/v2alpha:pkg_cc_proto", ], ) diff --git a/test/extensions/filters/http/jwt_authn/all_verifier_test.cc b/test/extensions/filters/http/jwt_authn/all_verifier_test.cc index 3ac1873b1facc..2da090635675e 100644 --- a/test/extensions/filters/http/jwt_authn/all_verifier_test.cc +++ b/test/extensions/filters/http/jwt_authn/all_verifier_test.cc @@ -1,3 +1,5 @@ +#include "envoy/config/filter/http/jwt_authn/v2alpha/config.pb.h" + #include "extensions/filters/http/jwt_authn/filter_config.h" #include "extensions/filters/http/jwt_authn/verifier.h" diff --git a/test/extensions/filters/http/jwt_authn/authenticator_test.cc b/test/extensions/filters/http/jwt_authn/authenticator_test.cc index f29e5052f587d..1520043b3fb15 100644 --- a/test/extensions/filters/http/jwt_authn/authenticator_test.cc +++ b/test/extensions/filters/http/jwt_authn/authenticator_test.cc @@ -1,3 +1,6 @@ +#include "envoy/api/v2/core/http_uri.pb.h" +#include "envoy/config/filter/http/jwt_authn/v2alpha/config.pb.h" + #include "common/http/message_impl.h" #include "common/protobuf/utility.h" diff --git a/test/extensions/filters/http/jwt_authn/extractor_test.cc b/test/extensions/filters/http/jwt_authn/extractor_test.cc index 944e06bce06a8..57112e38daada 100644 --- a/test/extensions/filters/http/jwt_authn/extractor_test.cc +++ b/test/extensions/filters/http/jwt_authn/extractor_test.cc @@ -1,3 +1,5 @@ +#include "envoy/config/filter/http/jwt_authn/v2alpha/config.pb.h" + #include "common/protobuf/utility.h" #include "extensions/filters/http/jwt_authn/extractor.h" diff --git a/test/extensions/filters/http/jwt_authn/filter_config_test.cc b/test/extensions/filters/http/jwt_authn/filter_config_test.cc index a202d67c147ff..d4237206f4750 100644 --- a/test/extensions/filters/http/jwt_authn/filter_config_test.cc +++ b/test/extensions/filters/http/jwt_authn/filter_config_test.cc @@ -1,3 +1,5 @@ +#include "envoy/config/filter/http/jwt_authn/v2alpha/config.pb.h" + #include "common/router/string_accessor_impl.h" #include "common/stream_info/filter_state_impl.h" diff --git a/test/extensions/filters/http/jwt_authn/filter_factory_test.cc b/test/extensions/filters/http/jwt_authn/filter_factory_test.cc index 6b5e5900f9c05..5e4ce54adf404 100644 --- a/test/extensions/filters/http/jwt_authn/filter_factory_test.cc +++ b/test/extensions/filters/http/jwt_authn/filter_factory_test.cc @@ -1,3 +1,4 @@ +#include "envoy/config/filter/http/jwt_authn/v2alpha/config.pb.h" #include "envoy/config/filter/http/jwt_authn/v2alpha/config.pb.validate.h" #include "extensions/filters/http/jwt_authn/filter_factory.h" diff --git a/test/extensions/filters/http/jwt_authn/filter_integration_test.cc b/test/extensions/filters/http/jwt_authn/filter_integration_test.cc index f5812c904e5fb..43a30922d115d 100644 --- a/test/extensions/filters/http/jwt_authn/filter_integration_test.cc +++ b/test/extensions/filters/http/jwt_authn/filter_integration_test.cc @@ -1,4 +1,6 @@ +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" #include "envoy/config/filter/http/jwt_authn/v2alpha/config.pb.h" +#include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.h" #include "common/router/string_accessor_impl.h" diff --git a/test/extensions/filters/http/jwt_authn/filter_test.cc b/test/extensions/filters/http/jwt_authn/filter_test.cc index 5bbc021bc3187..a885737b9c444 100644 --- a/test/extensions/filters/http/jwt_authn/filter_test.cc +++ b/test/extensions/filters/http/jwt_authn/filter_test.cc @@ -1,3 +1,5 @@ +#include "envoy/config/filter/http/jwt_authn/v2alpha/config.pb.h" + #include "extensions/filters/http/jwt_authn/filter.h" #include "extensions/filters/http/well_known_names.h" diff --git a/test/extensions/filters/http/jwt_authn/group_verifier_test.cc b/test/extensions/filters/http/jwt_authn/group_verifier_test.cc index 160621d3cfaa0..2a026b53f3e4a 100644 --- a/test/extensions/filters/http/jwt_authn/group_verifier_test.cc +++ b/test/extensions/filters/http/jwt_authn/group_verifier_test.cc @@ -1,3 +1,5 @@ +#include "envoy/config/filter/http/jwt_authn/v2alpha/config.pb.h" + #include "extensions/filters/http/jwt_authn/verifier.h" #include "test/extensions/filters/http/jwt_authn/mock.h" diff --git a/test/extensions/filters/http/jwt_authn/jwks_cache_test.cc b/test/extensions/filters/http/jwt_authn/jwks_cache_test.cc index ff1f767db4e76..ea331f92974ce 100644 --- a/test/extensions/filters/http/jwt_authn/jwks_cache_test.cc +++ b/test/extensions/filters/http/jwt_authn/jwks_cache_test.cc @@ -1,6 +1,8 @@ #include #include +#include "envoy/config/filter/http/jwt_authn/v2alpha/config.pb.h" + #include "common/protobuf/utility.h" #include "common/stats/isolated_store_impl.h" diff --git a/test/extensions/filters/http/jwt_authn/matcher_test.cc b/test/extensions/filters/http/jwt_authn/matcher_test.cc index 360ac000f462e..0b899cdd5a8ec 100644 --- a/test/extensions/filters/http/jwt_authn/matcher_test.cc +++ b/test/extensions/filters/http/jwt_authn/matcher_test.cc @@ -1,3 +1,5 @@ +#include "envoy/config/filter/http/jwt_authn/v2alpha/config.pb.h" + #include "common/protobuf/utility.h" #include "extensions/filters/http/jwt_authn/matcher.h" diff --git a/test/extensions/filters/http/jwt_authn/provider_verifier_test.cc b/test/extensions/filters/http/jwt_authn/provider_verifier_test.cc index c675e0b2bb603..a2bee90b21bea 100644 --- a/test/extensions/filters/http/jwt_authn/provider_verifier_test.cc +++ b/test/extensions/filters/http/jwt_authn/provider_verifier_test.cc @@ -1,3 +1,5 @@ +#include "envoy/config/filter/http/jwt_authn/v2alpha/config.pb.h" + #include "extensions/filters/http/jwt_authn/filter_config.h" #include "extensions/filters/http/jwt_authn/verifier.h" diff --git a/test/extensions/filters/http/lua/BUILD b/test/extensions/filters/http/lua/BUILD index a23f2028dc50b..469018a1ebda0 100644 --- a/test/extensions/filters/http/lua/BUILD +++ b/test/extensions/filters/http/lua/BUILD @@ -24,6 +24,7 @@ envoy_extension_cc_test( "//test/mocks/thread_local:thread_local_mocks", "//test/mocks/upstream:upstream_mocks", "//test/test_common:utility_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -37,6 +38,7 @@ envoy_extension_cc_test( "//test/extensions/filters/common/lua:lua_wrappers_lib", "//test/mocks/stream_info:stream_info_mocks", "//test/test_common:utility_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -48,6 +50,8 @@ envoy_extension_cc_test( "//source/extensions/filters/http/lua:config", "//test/integration:http_integration_lib", "//test/test_common:utility_lib", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", + "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto", ], ) diff --git a/test/extensions/filters/http/lua/config_test.cc b/test/extensions/filters/http/lua/config_test.cc index 52678967394b6..28a756d772ef5 100644 --- a/test/extensions/filters/http/lua/config_test.cc +++ b/test/extensions/filters/http/lua/config_test.cc @@ -1,5 +1,6 @@ #include +#include "envoy/config/filter/http/lua/v2/lua.pb.h" #include "envoy/config/filter/http/lua/v2/lua.pb.validate.h" #include "extensions/filters/http/lua/config.h" diff --git a/test/extensions/filters/http/lua/lua_filter_test.cc b/test/extensions/filters/http/lua/lua_filter_test.cc index 5d96c613a8771..dc0b86197ab65 100644 --- a/test/extensions/filters/http/lua/lua_filter_test.cc +++ b/test/extensions/filters/http/lua/lua_filter_test.cc @@ -1,5 +1,7 @@ #include +#include "envoy/api/v2/core/base.pb.h" + #include "common/buffer/buffer_impl.h" #include "common/http/message_impl.h" #include "common/stream_info/stream_info_impl.h" diff --git a/test/extensions/filters/http/lua/lua_integration_test.cc b/test/extensions/filters/http/lua/lua_integration_test.cc index 043d2d33dde5f..514db3a4c5c30 100644 --- a/test/extensions/filters/http/lua/lua_integration_test.cc +++ b/test/extensions/filters/http/lua/lua_integration_test.cc @@ -1,3 +1,6 @@ +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" +#include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.h" + #include "extensions/filters/http/well_known_names.h" #include "test/integration/http_integration.h" diff --git a/test/extensions/filters/http/lua/wrappers_test.cc b/test/extensions/filters/http/lua/wrappers_test.cc index 2ce294f854d19..6f9327636767e 100644 --- a/test/extensions/filters/http/lua/wrappers_test.cc +++ b/test/extensions/filters/http/lua/wrappers_test.cc @@ -1,3 +1,5 @@ +#include "envoy/api/v2/core/base.pb.h" + #include "common/http/utility.h" #include "common/stream_info/stream_info_impl.h" diff --git a/test/extensions/filters/http/original_src/BUILD b/test/extensions/filters/http/original_src/BUILD index 4b1e3044e6991..79a6a8573fe63 100644 --- a/test/extensions/filters/http/original_src/BUILD +++ b/test/extensions/filters/http/original_src/BUILD @@ -47,6 +47,7 @@ envoy_extension_cc_test( "//test/mocks/network:network_mocks", "//test/test_common:printers_lib", "//test/test_common:utility_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", "@envoy_api//envoy/config/filter/http/original_src/v2alpha1:pkg_cc_proto", ], ) diff --git a/test/extensions/filters/http/original_src/config_test.cc b/test/extensions/filters/http/original_src/config_test.cc index dcfc34f3eeabe..e00ac0ee5a15d 100644 --- a/test/extensions/filters/http/original_src/config_test.cc +++ b/test/extensions/filters/http/original_src/config_test.cc @@ -1,7 +1,6 @@ #include #include "envoy/config/filter/http/original_src/v2alpha1/original_src.pb.h" -#include "envoy/config/filter/http/original_src/v2alpha1/original_src.pb.validate.h" #include "extensions/filters/http/original_src/config.h" diff --git a/test/extensions/filters/http/original_src/original_src_config_factory_test.cc b/test/extensions/filters/http/original_src/original_src_config_factory_test.cc index ea164cacc9714..4d05b45fabebf 100644 --- a/test/extensions/filters/http/original_src/original_src_config_factory_test.cc +++ b/test/extensions/filters/http/original_src/original_src_config_factory_test.cc @@ -1,4 +1,3 @@ -#include "envoy/config/filter/http/original_src/v2alpha1/original_src.pb.h" #include "envoy/config/filter/http/original_src/v2alpha1/original_src.pb.validate.h" #include "extensions/filters/http/original_src/config.h" diff --git a/test/extensions/filters/http/original_src/original_src_test.cc b/test/extensions/filters/http/original_src/original_src_test.cc index 9eba387591564..6f20821c72aa6 100644 --- a/test/extensions/filters/http/original_src/original_src_test.cc +++ b/test/extensions/filters/http/original_src/original_src_test.cc @@ -1,3 +1,4 @@ +#include "envoy/api/v2/core/base.pb.h" #include "envoy/config/filter/http/original_src/v2alpha1/original_src.pb.h" #include "common/network/socket_option_impl.h" diff --git a/test/extensions/filters/http/ratelimit/BUILD b/test/extensions/filters/http/ratelimit/BUILD index 3b9d2303ebc4d..a411be36e21f2 100644 --- a/test/extensions/filters/http/ratelimit/BUILD +++ b/test/extensions/filters/http/ratelimit/BUILD @@ -30,6 +30,7 @@ envoy_extension_cc_test( "//test/mocks/tracing:tracing_mocks", "//test/mocks/upstream:upstream_mocks", "//test/test_common:utility_lib", + "@envoy_api//envoy/config/filter/http/rate_limit/v2:pkg_cc_proto", ], ) @@ -40,6 +41,7 @@ envoy_extension_cc_test( deps = [ "//source/extensions/filters/http/ratelimit:config", "//test/mocks/server:server_mocks", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", "@envoy_api//envoy/config/filter/http/rate_limit/v2:pkg_cc_proto", ], ) diff --git a/test/extensions/filters/http/ratelimit/config_test.cc b/test/extensions/filters/http/ratelimit/config_test.cc index 4d876839d917f..7c78cfee2a1cb 100644 --- a/test/extensions/filters/http/ratelimit/config_test.cc +++ b/test/extensions/filters/http/ratelimit/config_test.cc @@ -1,3 +1,5 @@ +#include "envoy/api/v2/core/grpc_service.pb.h" +#include "envoy/config/filter/http/rate_limit/v2/rate_limit.pb.h" #include "envoy/config/filter/http/rate_limit/v2/rate_limit.pb.validate.h" #include "extensions/filters/http/ratelimit/config.h" diff --git a/test/extensions/filters/http/ratelimit/ratelimit_test.cc b/test/extensions/filters/http/ratelimit/ratelimit_test.cc index e6ff5c12b58df..664f90593114a 100644 --- a/test/extensions/filters/http/ratelimit/ratelimit_test.cc +++ b/test/extensions/filters/http/ratelimit/ratelimit_test.cc @@ -2,6 +2,8 @@ #include #include +#include "envoy/config/filter/http/rate_limit/v2/rate_limit.pb.h" + #include "common/buffer/buffer_impl.h" #include "common/common/empty_string.h" #include "common/http/context_impl.h" diff --git a/test/extensions/filters/http/rbac/BUILD b/test/extensions/filters/http/rbac/BUILD index e4290dc401c7f..e5edfaa2ab886 100644 --- a/test/extensions/filters/http/rbac/BUILD +++ b/test/extensions/filters/http/rbac/BUILD @@ -19,6 +19,8 @@ envoy_extension_cc_test( deps = [ "//source/extensions/filters/http/rbac:config", "//test/mocks/server:server_mocks", + "@envoy_api//envoy/config/filter/http/rbac/v2:pkg_cc_proto", + "@envoy_api//envoy/config/rbac/v2:pkg_cc_proto", ], ) @@ -33,6 +35,8 @@ envoy_extension_cc_test( "//test/extensions/filters/http/rbac:route_config_mocks", "//test/mocks/http:http_mocks", "//test/mocks/network:network_mocks", + "@envoy_api//envoy/config/filter/http/rbac/v2:pkg_cc_proto", + "@envoy_api//envoy/config/rbac/v2:pkg_cc_proto", ], ) @@ -45,6 +49,7 @@ envoy_extension_cc_test( "//test/config:utility_lib", "//test/integration:http_protocol_integration_lib", "@envoy_api//envoy/config/filter/http/rbac/v2:pkg_cc_proto", + "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto", ], ) @@ -55,5 +60,6 @@ envoy_extension_cc_mock( deps = [ "//source/extensions/filters/common/rbac:utility_lib", "//source/extensions/filters/http/rbac:rbac_filter_lib", + "@envoy_api//envoy/config/filter/http/rbac/v2:pkg_cc_proto", ], ) diff --git a/test/extensions/filters/http/rbac/config_test.cc b/test/extensions/filters/http/rbac/config_test.cc index 7ab2a39ffe0af..bc22a019f086a 100644 --- a/test/extensions/filters/http/rbac/config_test.cc +++ b/test/extensions/filters/http/rbac/config_test.cc @@ -1,3 +1,7 @@ +#include "envoy/config/filter/http/rbac/v2/rbac.pb.h" +#include "envoy/config/filter/http/rbac/v2/rbac.pb.validate.h" +#include "envoy/config/rbac/v2/rbac.pb.h" + #include "extensions/filters/common/rbac/engine.h" #include "extensions/filters/http/rbac/config.h" diff --git a/test/extensions/filters/http/rbac/mocks.h b/test/extensions/filters/http/rbac/mocks.h index eda2d202ff204..0897ddc5d5cfc 100644 --- a/test/extensions/filters/http/rbac/mocks.h +++ b/test/extensions/filters/http/rbac/mocks.h @@ -1,5 +1,7 @@ #pragma once +#include "envoy/config/filter/http/rbac/v2/rbac.pb.h" + #include "extensions/filters/common/rbac/utility.h" #include "extensions/filters/http/rbac/rbac_filter.h" diff --git a/test/extensions/filters/http/rbac/rbac_filter_integration_test.cc b/test/extensions/filters/http/rbac/rbac_filter_integration_test.cc index 2bdbe6f83af43..ac753690e4853 100644 --- a/test/extensions/filters/http/rbac/rbac_filter_integration_test.cc +++ b/test/extensions/filters/http/rbac/rbac_filter_integration_test.cc @@ -1,4 +1,5 @@ #include "envoy/config/filter/http/rbac/v2/rbac.pb.h" +#include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.h" #include "common/protobuf/utility.h" diff --git a/test/extensions/filters/http/rbac/rbac_filter_test.cc b/test/extensions/filters/http/rbac/rbac_filter_test.cc index ecc0b1dcafacf..be082a24103a6 100644 --- a/test/extensions/filters/http/rbac/rbac_filter_test.cc +++ b/test/extensions/filters/http/rbac/rbac_filter_test.cc @@ -1,3 +1,6 @@ +#include "envoy/config/filter/http/rbac/v2/rbac.pb.h" +#include "envoy/config/rbac/v2/rbac.pb.h" + #include "common/config/metadata.h" #include "common/network/utility.h" diff --git a/test/extensions/filters/http/router/config_test.cc b/test/extensions/filters/http/router/config_test.cc index e0598defdec99..607fd06bcbc75 100644 --- a/test/extensions/filters/http/router/config_test.cc +++ b/test/extensions/filters/http/router/config_test.cc @@ -1,5 +1,6 @@ #include +#include "envoy/config/filter/http/router/v2/router.pb.h" #include "envoy/config/filter/http/router/v2/router.pb.validate.h" #include "envoy/registry/registry.h" diff --git a/test/extensions/filters/http/squash/BUILD b/test/extensions/filters/http/squash/BUILD index 16e4d38335ccc..4cb807da79ec6 100644 --- a/test/extensions/filters/http/squash/BUILD +++ b/test/extensions/filters/http/squash/BUILD @@ -24,6 +24,7 @@ envoy_extension_cc_test( "//test/mocks/server:server_mocks", "//test/mocks/upstream:upstream_mocks", "//test/test_common:environment_lib", + "@envoy_api//envoy/config/filter/http/squash/v2:pkg_cc_proto", ], ) @@ -34,6 +35,7 @@ envoy_extension_cc_test( deps = [ "//source/extensions/filters/http/squash:config", "//test/integration:http_integration_lib", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", ], ) diff --git a/test/extensions/filters/http/squash/config_test.cc b/test/extensions/filters/http/squash/config_test.cc index e4f07b59d1bb1..deca536063ab5 100644 --- a/test/extensions/filters/http/squash/config_test.cc +++ b/test/extensions/filters/http/squash/config_test.cc @@ -1,3 +1,4 @@ +#include "envoy/config/filter/http/squash/v2/squash.pb.h" #include "envoy/config/filter/http/squash/v2/squash.pb.validate.h" #include "extensions/filters/http/squash/config.h" diff --git a/test/extensions/filters/http/squash/squash_filter_integration_test.cc b/test/extensions/filters/http/squash/squash_filter_integration_test.cc index 2abddb9344e94..8949459ca36e1 100644 --- a/test/extensions/filters/http/squash/squash_filter_integration_test.cc +++ b/test/extensions/filters/http/squash/squash_filter_integration_test.cc @@ -1,5 +1,7 @@ #include +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" + #include "common/protobuf/protobuf.h" #include "test/integration/autonomous_upstream.h" diff --git a/test/extensions/filters/http/squash/squash_filter_test.cc b/test/extensions/filters/http/squash/squash_filter_test.cc index 07c5ab946a3dd..ffaa170b32e8f 100644 --- a/test/extensions/filters/http/squash/squash_filter_test.cc +++ b/test/extensions/filters/http/squash/squash_filter_test.cc @@ -2,6 +2,8 @@ #include #include +#include "envoy/config/filter/http/squash/v2/squash.pb.h" + #include "common/http/message_impl.h" #include "common/protobuf/protobuf.h" diff --git a/test/extensions/filters/http/tap/BUILD b/test/extensions/filters/http/tap/BUILD index 61a6932188cb9..c8fae12275089 100644 --- a/test/extensions/filters/http/tap/BUILD +++ b/test/extensions/filters/http/tap/BUILD @@ -53,6 +53,7 @@ envoy_extension_cc_test( deps = [ "//source/extensions/filters/http/tap:config", "//test/integration:http_integration_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", "@envoy_api//envoy/data/tap/v2alpha:pkg_cc_proto", ], ) diff --git a/test/extensions/filters/http/tap/tap_filter_integration_test.cc b/test/extensions/filters/http/tap/tap_filter_integration_test.cc index 62348a93a8837..acfe538d0126d 100644 --- a/test/extensions/filters/http/tap/tap_filter_integration_test.cc +++ b/test/extensions/filters/http/tap/tap_filter_integration_test.cc @@ -1,5 +1,6 @@ #include +#include "envoy/api/v2/core/base.pb.h" #include "envoy/data/tap/v2alpha/wrapper.pb.h" #include "test/integration/http_integration.h" diff --git a/test/extensions/filters/listener/original_src/BUILD b/test/extensions/filters/listener/original_src/BUILD index ed082ce4ebb5a..9c0c2cc249ef0 100644 --- a/test/extensions/filters/listener/original_src/BUILD +++ b/test/extensions/filters/listener/original_src/BUILD @@ -30,7 +30,6 @@ envoy_extension_cc_test( "//source/extensions/filters/listener/original_src:config_lib", "//source/extensions/filters/listener/original_src:original_src_lib", "//test/mocks/server:server_mocks", - "@envoy_api//envoy/config/filter/listener/original_src/v2alpha1:pkg_cc_proto", ], ) @@ -45,6 +44,7 @@ envoy_extension_cc_test( "//test/mocks/buffer:buffer_mocks", "//test/mocks/network:network_mocks", "//test/test_common:printers_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", "@envoy_api//envoy/config/filter/listener/original_src/v2alpha1:pkg_cc_proto", ], ) diff --git a/test/extensions/filters/listener/original_src/config_test.cc b/test/extensions/filters/listener/original_src/config_test.cc index 9ec92c7be9bb0..08cdb4acfeb68 100644 --- a/test/extensions/filters/listener/original_src/config_test.cc +++ b/test/extensions/filters/listener/original_src/config_test.cc @@ -1,7 +1,6 @@ #include #include "envoy/config/filter/listener/original_src/v2alpha1/original_src.pb.h" -#include "envoy/config/filter/listener/original_src/v2alpha1/original_src.pb.validate.h" #include "extensions/filters/listener/original_src/config.h" diff --git a/test/extensions/filters/listener/original_src/original_src_config_factory_test.cc b/test/extensions/filters/listener/original_src/original_src_config_factory_test.cc index 25f758e9e6b21..9137e986d9147 100644 --- a/test/extensions/filters/listener/original_src/original_src_config_factory_test.cc +++ b/test/extensions/filters/listener/original_src/original_src_config_factory_test.cc @@ -1,6 +1,3 @@ -#include "envoy/config/filter/listener/original_src/v2alpha1/original_src.pb.h" -#include "envoy/config/filter/listener/original_src/v2alpha1/original_src.pb.validate.h" - #include "extensions/filters/listener/original_src/config.h" #include "extensions/filters/listener/original_src/original_src.h" #include "extensions/filters/listener/original_src/original_src_config_factory.h" diff --git a/test/extensions/filters/listener/original_src/original_src_test.cc b/test/extensions/filters/listener/original_src/original_src_test.cc index 9684e6e59b92e..bdad2f8f3566b 100644 --- a/test/extensions/filters/listener/original_src/original_src_test.cc +++ b/test/extensions/filters/listener/original_src/original_src_test.cc @@ -1,3 +1,4 @@ +#include "envoy/api/v2/core/base.pb.h" #include "envoy/config/filter/listener/original_src/v2alpha1/original_src.pb.h" #include "common/network/socket_option_impl.h" diff --git a/test/extensions/filters/listener/proxy_protocol/BUILD b/test/extensions/filters/listener/proxy_protocol/BUILD index 418ba831cb861..716612d0ac09d 100644 --- a/test/extensions/filters/listener/proxy_protocol/BUILD +++ b/test/extensions/filters/listener/proxy_protocol/BUILD @@ -33,5 +33,6 @@ envoy_extension_cc_test( "//test/test_common:network_utility_lib", "//test/test_common:threadsafe_singleton_injector_lib", "//test/test_common:utility_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) diff --git a/test/extensions/filters/listener/proxy_protocol/proxy_protocol_test.cc b/test/extensions/filters/listener/proxy_protocol/proxy_protocol_test.cc index 0724ceccae643..f831e3346edbf 100644 --- a/test/extensions/filters/listener/proxy_protocol/proxy_protocol_test.cc +++ b/test/extensions/filters/listener/proxy_protocol/proxy_protocol_test.cc @@ -2,6 +2,7 @@ #include #include +#include "envoy/api/v2/core/base.pb.h" #include "envoy/stats/scope.h" #include "common/buffer/buffer_impl.h" diff --git a/test/extensions/filters/network/client_ssl_auth/BUILD b/test/extensions/filters/network/client_ssl_auth/BUILD index 29461cb78d8bb..df44e6910d52b 100644 --- a/test/extensions/filters/network/client_ssl_auth/BUILD +++ b/test/extensions/filters/network/client_ssl_auth/BUILD @@ -25,6 +25,7 @@ envoy_extension_cc_test( "//test/mocks/upstream:upstream_mocks", "//test/test_common:environment_lib", "//test/test_common:utility_lib", + "@envoy_api//envoy/config/filter/network/client_ssl_auth/v2:pkg_cc_proto", ], ) @@ -36,5 +37,6 @@ envoy_extension_cc_test( "//source/common/protobuf:utility_lib", "//source/extensions/filters/network/client_ssl_auth:config", "//test/mocks/server:server_mocks", + "@envoy_api//envoy/config/filter/network/client_ssl_auth/v2:pkg_cc_proto", ], ) diff --git a/test/extensions/filters/network/client_ssl_auth/client_ssl_auth_test.cc b/test/extensions/filters/network/client_ssl_auth/client_ssl_auth_test.cc index 6a49fe9d76f1e..8f1f81b1593b2 100644 --- a/test/extensions/filters/network/client_ssl_auth/client_ssl_auth_test.cc +++ b/test/extensions/filters/network/client_ssl_auth/client_ssl_auth_test.cc @@ -2,6 +2,8 @@ #include #include +#include "envoy/config/filter/network/client_ssl_auth/v2/client_ssl_auth.pb.h" + #include "common/http/message_impl.h" #include "common/network/address_impl.h" diff --git a/test/extensions/filters/network/client_ssl_auth/config_test.cc b/test/extensions/filters/network/client_ssl_auth/config_test.cc index 567a2671a294d..02dc012014c87 100644 --- a/test/extensions/filters/network/client_ssl_auth/config_test.cc +++ b/test/extensions/filters/network/client_ssl_auth/config_test.cc @@ -1,3 +1,5 @@ +#include "envoy/config/filter/network/client_ssl_auth/v2/client_ssl_auth.pb.h" +#include "envoy/config/filter/network/client_ssl_auth/v2/client_ssl_auth.pb.validate.h" #include "envoy/registry/registry.h" #include "common/protobuf/utility.h" diff --git a/test/extensions/filters/network/common/redis/BUILD b/test/extensions/filters/network/common/redis/BUILD index 7e6890d52f487..0b7cb824a581f 100644 --- a/test/extensions/filters/network/common/redis/BUILD +++ b/test/extensions/filters/network/common/redis/BUILD @@ -56,5 +56,6 @@ envoy_cc_test( "//test/mocks/network:network_mocks", "//test/mocks/thread_local:thread_local_mocks", "//test/mocks/upstream:upstream_mocks", + "@envoy_api//envoy/config/filter/network/redis_proxy/v2:pkg_cc_proto", ], ) diff --git a/test/extensions/filters/network/common/redis/client_impl_test.cc b/test/extensions/filters/network/common/redis/client_impl_test.cc index db3f0b35d116f..144ae1f1d1fe3 100644 --- a/test/extensions/filters/network/common/redis/client_impl_test.cc +++ b/test/extensions/filters/network/common/redis/client_impl_test.cc @@ -1,5 +1,7 @@ #include +#include "envoy/config/filter/network/redis_proxy/v2/redis_proxy.pb.h" + #include "common/buffer/buffer_impl.h" #include "common/network/utility.h" #include "common/upstream/upstream_impl.h" diff --git a/test/extensions/filters/network/dubbo_proxy/dubbo_hessian2_serializer_impl_test.cc b/test/extensions/filters/network/dubbo_proxy/dubbo_hessian2_serializer_impl_test.cc index 39272bf9ddfab..17a500b4719bf 100644 --- a/test/extensions/filters/network/dubbo_proxy/dubbo_hessian2_serializer_impl_test.cc +++ b/test/extensions/filters/network/dubbo_proxy/dubbo_hessian2_serializer_impl_test.cc @@ -188,4 +188,4 @@ TEST(HessianProtocolTest, serializeRpcResult) { } // namespace DubboProxy } // namespace NetworkFilters } // namespace Extensions -} // namespace Envoy \ No newline at end of file +} // namespace Envoy diff --git a/test/extensions/filters/network/dubbo_proxy/dubbo_protocol_impl_test.cc b/test/extensions/filters/network/dubbo_proxy/dubbo_protocol_impl_test.cc index 6aa87a5f993b0..9aadf58aeffdd 100644 --- a/test/extensions/filters/network/dubbo_proxy/dubbo_protocol_impl_test.cc +++ b/test/extensions/filters/network/dubbo_proxy/dubbo_protocol_impl_test.cc @@ -241,4 +241,4 @@ TEST(DubboProtocolImplTest, decode) { } // namespace DubboProxy } // namespace NetworkFilters } // namespace Extensions -} // namespace Envoy \ No newline at end of file +} // namespace Envoy diff --git a/test/extensions/filters/network/dubbo_proxy/hessian_utils_test.cc b/test/extensions/filters/network/dubbo_proxy/hessian_utils_test.cc index 220c2d48bc3b4..cea84965b5762 100644 --- a/test/extensions/filters/network/dubbo_proxy/hessian_utils_test.cc +++ b/test/extensions/filters/network/dubbo_proxy/hessian_utils_test.cc @@ -836,4 +836,4 @@ TEST(HessianUtilsTest, writeString) { } // namespace DubboProxy } // namespace NetworkFilters } // namespace Extensions -} // namespace Envoy \ No newline at end of file +} // namespace Envoy diff --git a/test/extensions/filters/network/dubbo_proxy/router_filter_config_test.cc b/test/extensions/filters/network/dubbo_proxy/router_filter_config_test.cc index a46f43ddb10bb..86fe835183e47 100644 --- a/test/extensions/filters/network/dubbo_proxy/router_filter_config_test.cc +++ b/test/extensions/filters/network/dubbo_proxy/router_filter_config_test.cc @@ -1,3 +1,4 @@ +#include "envoy/config/filter/dubbo/router/v2alpha1/router.pb.h" #include "envoy/config/filter/dubbo/router/v2alpha1/router.pb.validate.h" #include "extensions/filters/network/dubbo_proxy/filters/well_known_names.h" diff --git a/test/extensions/filters/network/dubbo_proxy/utility.h b/test/extensions/filters/network/dubbo_proxy/utility.h index d46f21a43f131..5005a44af2cca 100644 --- a/test/extensions/filters/network/dubbo_proxy/utility.h +++ b/test/extensions/filters/network/dubbo_proxy/utility.h @@ -23,4 +23,4 @@ inline void addInt64(Buffer::Instance& buffer, uint64_t value) { } // namespace DubboProxy } // namespace NetworkFilters } // namespace Extensions -} // namespace Envoy \ No newline at end of file +} // namespace Envoy diff --git a/test/extensions/filters/network/ext_authz/BUILD b/test/extensions/filters/network/ext_authz/BUILD index a6f1757532f55..3697dc3b9fd53 100644 --- a/test/extensions/filters/network/ext_authz/BUILD +++ b/test/extensions/filters/network/ext_authz/BUILD @@ -39,6 +39,7 @@ envoy_extension_cc_test( deps = [ "//source/extensions/filters/network/ext_authz:config", "//test/mocks/server:server_mocks", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", "@envoy_api//envoy/config/filter/network/ext_authz/v2:pkg_cc_proto", ], ) diff --git a/test/extensions/filters/network/ext_authz/config_test.cc b/test/extensions/filters/network/ext_authz/config_test.cc index f98b64c1e2710..796175bb356dd 100644 --- a/test/extensions/filters/network/ext_authz/config_test.cc +++ b/test/extensions/filters/network/ext_authz/config_test.cc @@ -1,3 +1,5 @@ +#include "envoy/api/v2/core/grpc_service.pb.h" +#include "envoy/config/filter/network/ext_authz/v2/ext_authz.pb.h" #include "envoy/config/filter/network/ext_authz/v2/ext_authz.pb.validate.h" #include "envoy/stats/scope.h" diff --git a/test/extensions/filters/network/ext_authz/ext_authz_test.cc b/test/extensions/filters/network/ext_authz/ext_authz_test.cc index 0fe0ef85315ac..1ada6ef207f9f 100644 --- a/test/extensions/filters/network/ext_authz/ext_authz_test.cc +++ b/test/extensions/filters/network/ext_authz/ext_authz_test.cc @@ -2,6 +2,7 @@ #include #include +#include "envoy/config/filter/network/ext_authz/v2/ext_authz.pb.h" #include "envoy/config/filter/network/ext_authz/v2/ext_authz.pb.validate.h" #include "envoy/stats/stats.h" diff --git a/test/extensions/filters/network/http_connection_manager/BUILD b/test/extensions/filters/network/http_connection_manager/BUILD index 1d4eba695d7c4..4d3278aed0c21 100644 --- a/test/extensions/filters/network/http_connection_manager/BUILD +++ b/test/extensions/filters/network/http_connection_manager/BUILD @@ -27,6 +27,8 @@ envoy_extension_cc_test( "//test/mocks/network:network_mocks", "//test/mocks/server:server_mocks", "//test/test_common:utility_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto", + "@envoy_api//envoy/type:pkg_cc_proto", ], ) diff --git a/test/extensions/filters/network/http_connection_manager/config_test.cc b/test/extensions/filters/network/http_connection_manager/config_test.cc index 3a8689c1c404c..118a93fea2403 100644 --- a/test/extensions/filters/network/http_connection_manager/config_test.cc +++ b/test/extensions/filters/network/http_connection_manager/config_test.cc @@ -1,4 +1,7 @@ +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.h" #include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.validate.h" +#include "envoy/type/percent.pb.h" #include "common/buffer/buffer_impl.h" #include "common/http/date_provider_impl.h" diff --git a/test/extensions/filters/network/mongo_proxy/BUILD b/test/extensions/filters/network/mongo_proxy/BUILD index ff73f917c1ac2..76498c471fa46 100644 --- a/test/extensions/filters/network/mongo_proxy/BUILD +++ b/test/extensions/filters/network/mongo_proxy/BUILD @@ -49,6 +49,7 @@ envoy_extension_cc_test( "//test/mocks/network:network_mocks", "//test/mocks/runtime:runtime_mocks", "@envoy_api//envoy/config/filter/fault/v2:pkg_cc_proto", + "@envoy_api//envoy/type:pkg_cc_proto", ], ) @@ -72,5 +73,6 @@ envoy_extension_cc_test( "//test/mocks/server:server_mocks", "//test/test_common:utility_lib", "@envoy_api//envoy/config/filter/network/mongo_proxy/v2:pkg_cc_proto", + "@envoy_api//envoy/type:pkg_cc_proto", ], ) diff --git a/test/extensions/filters/network/mongo_proxy/config_test.cc b/test/extensions/filters/network/mongo_proxy/config_test.cc index 53f06c715acf4..591ca97d5d90a 100644 --- a/test/extensions/filters/network/mongo_proxy/config_test.cc +++ b/test/extensions/filters/network/mongo_proxy/config_test.cc @@ -2,6 +2,7 @@ #include "envoy/config/filter/network/mongo_proxy/v2/mongo_proxy.pb.h" #include "envoy/config/filter/network/mongo_proxy/v2/mongo_proxy.pb.validate.h" +#include "envoy/type/percent.pb.h" #include "extensions/filters/network/mongo_proxy/config.h" diff --git a/test/extensions/filters/network/mongo_proxy/proxy_test.cc b/test/extensions/filters/network/mongo_proxy/proxy_test.cc index 6dfda5703cc7d..21fcc56ed77ab 100644 --- a/test/extensions/filters/network/mongo_proxy/proxy_test.cc +++ b/test/extensions/filters/network/mongo_proxy/proxy_test.cc @@ -5,6 +5,7 @@ #include "envoy/config/filter/fault/v2/fault.pb.h" #include "envoy/stats/stats.h" +#include "envoy/type/percent.pb.h" #include "extensions/filters/network/mongo_proxy/bson_impl.h" #include "extensions/filters/network/mongo_proxy/codec_impl.h" diff --git a/test/extensions/filters/network/ratelimit/BUILD b/test/extensions/filters/network/ratelimit/BUILD index cecc0282c1d0d..7b1d3588e26d6 100644 --- a/test/extensions/filters/network/ratelimit/BUILD +++ b/test/extensions/filters/network/ratelimit/BUILD @@ -25,6 +25,7 @@ envoy_extension_cc_test( "//test/mocks/ratelimit:ratelimit_mocks", "//test/mocks/runtime:runtime_mocks", "//test/mocks/tracing:tracing_mocks", + "@envoy_api//envoy/config/filter/network/rate_limit/v2:pkg_cc_proto", ], ) @@ -36,6 +37,7 @@ envoy_extension_cc_test( "//source/extensions/filters/network/ratelimit:config", "//test/mocks/server:server_mocks", "//test/test_common:utility_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", "@envoy_api//envoy/config/filter/network/rate_limit/v2:pkg_cc_proto", ], ) diff --git a/test/extensions/filters/network/ratelimit/config_test.cc b/test/extensions/filters/network/ratelimit/config_test.cc index 24aeb7e74ee41..f446a57b37a9a 100644 --- a/test/extensions/filters/network/ratelimit/config_test.cc +++ b/test/extensions/filters/network/ratelimit/config_test.cc @@ -1,3 +1,4 @@ +#include "envoy/api/v2/core/grpc_service.pb.h" #include "envoy/config/filter/network/rate_limit/v2/rate_limit.pb.h" #include "envoy/config/filter/network/rate_limit/v2/rate_limit.pb.validate.h" diff --git a/test/extensions/filters/network/ratelimit/ratelimit_test.cc b/test/extensions/filters/network/ratelimit/ratelimit_test.cc index aa12513dc7458..e483026d84351 100644 --- a/test/extensions/filters/network/ratelimit/ratelimit_test.cc +++ b/test/extensions/filters/network/ratelimit/ratelimit_test.cc @@ -2,6 +2,7 @@ #include #include +#include "envoy/config/filter/network/rate_limit/v2/rate_limit.pb.h" #include "envoy/stats/stats.h" #include "common/buffer/buffer_impl.h" diff --git a/test/extensions/filters/network/rbac/BUILD b/test/extensions/filters/network/rbac/BUILD index a1d4b291f29ff..a4602e23d1ce8 100644 --- a/test/extensions/filters/network/rbac/BUILD +++ b/test/extensions/filters/network/rbac/BUILD @@ -19,6 +19,7 @@ envoy_extension_cc_test( "//source/extensions/filters/network/rbac:config", "//test/mocks/server:server_mocks", "@envoy_api//envoy/config/filter/network/rbac/v2:pkg_cc_proto", + "@envoy_api//envoy/config/rbac/v2:pkg_cc_proto", ], ) @@ -31,6 +32,8 @@ envoy_extension_cc_test( "//source/extensions/filters/network:well_known_names", "//source/extensions/filters/network/rbac:rbac_filter", "//test/mocks/network:network_mocks", + "@envoy_api//envoy/config/filter/network/rbac/v2:pkg_cc_proto", + "@envoy_api//envoy/config/rbac/v2:pkg_cc_proto", ], ) @@ -43,5 +46,8 @@ envoy_extension_cc_test( "//source/extensions/filters/network/rbac:config", "//test/integration:integration_lib", "//test/test_common:environment_lib", + "@envoy_api//envoy/api/v2/listener:pkg_cc_proto", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", + "@envoy_api//envoy/config/filter/network/rbac/v2:pkg_cc_proto", ], ) diff --git a/test/extensions/filters/network/rbac/config_test.cc b/test/extensions/filters/network/rbac/config_test.cc index 8577982491ab5..45931f219f374 100644 --- a/test/extensions/filters/network/rbac/config_test.cc +++ b/test/extensions/filters/network/rbac/config_test.cc @@ -1,4 +1,6 @@ +#include "envoy/config/filter/network/rbac/v2/rbac.pb.h" #include "envoy/config/filter/network/rbac/v2/rbac.pb.validate.h" +#include "envoy/config/rbac/v2/rbac.pb.h" #include "extensions/filters/network/rbac/config.h" diff --git a/test/extensions/filters/network/rbac/filter_test.cc b/test/extensions/filters/network/rbac/filter_test.cc index 8f4f91bbf5ef1..49c820307c841 100644 --- a/test/extensions/filters/network/rbac/filter_test.cc +++ b/test/extensions/filters/network/rbac/filter_test.cc @@ -1,5 +1,8 @@ #include +#include "envoy/config/filter/network/rbac/v2/rbac.pb.h" +#include "envoy/config/rbac/v2/rbac.pb.h" + #include "common/network/utility.h" #include "extensions/filters/common/rbac/utility.h" diff --git a/test/extensions/filters/network/rbac/integration_test.cc b/test/extensions/filters/network/rbac/integration_test.cc index 11ffc418de92b..97073a1761d60 100644 --- a/test/extensions/filters/network/rbac/integration_test.cc +++ b/test/extensions/filters/network/rbac/integration_test.cc @@ -1,3 +1,7 @@ +#include "envoy/api/v2/listener/listener.pb.h" +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" +#include "envoy/config/filter/network/rbac/v2/rbac.pb.validate.h" + #include "extensions/filters/network/rbac/config.h" #include "test/integration/integration.h" diff --git a/test/extensions/filters/network/redis_proxy/BUILD b/test/extensions/filters/network/redis_proxy/BUILD index 57664278043ce..2c975b038079a 100644 --- a/test/extensions/filters/network/redis_proxy/BUILD +++ b/test/extensions/filters/network/redis_proxy/BUILD @@ -50,6 +50,9 @@ envoy_extension_cc_test( "//test/mocks/network:network_mocks", "//test/mocks/thread_local:thread_local_mocks", "//test/mocks/upstream:upstream_mocks", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/config/cluster/redis:pkg_cc_proto", + "@envoy_api//envoy/config/filter/network/redis_proxy/v2:pkg_cc_proto", ], ) @@ -67,6 +70,7 @@ envoy_extension_cc_test( "//test/mocks/network:network_mocks", "//test/mocks/upstream:upstream_mocks", "//test/test_common:utility_lib", + "@envoy_api//envoy/config/filter/network/redis_proxy/v2:pkg_cc_proto", ], ) @@ -124,6 +128,8 @@ envoy_extension_cc_test( "//test/extensions/filters/network/common/redis:redis_mocks", "//test/mocks/runtime:runtime_mocks", "//test/test_common:utility_lib", + "@envoy_api//envoy/config/filter/network/redis_proxy/v2:pkg_cc_proto", + "@envoy_api//envoy/type:pkg_cc_proto", ], ) diff --git a/test/extensions/filters/network/redis_proxy/config_test.cc b/test/extensions/filters/network/redis_proxy/config_test.cc index 8c34fb502fd76..b24893593a52b 100644 --- a/test/extensions/filters/network/redis_proxy/config_test.cc +++ b/test/extensions/filters/network/redis_proxy/config_test.cc @@ -1,3 +1,4 @@ +#include "envoy/config/filter/network/redis_proxy/v2/redis_proxy.pb.h" #include "envoy/config/filter/network/redis_proxy/v2/redis_proxy.pb.validate.h" #include "common/protobuf/utility.h" diff --git a/test/extensions/filters/network/redis_proxy/conn_pool_impl_test.cc b/test/extensions/filters/network/redis_proxy/conn_pool_impl_test.cc index 221d6944aaade..a25f72e575959 100644 --- a/test/extensions/filters/network/redis_proxy/conn_pool_impl_test.cc +++ b/test/extensions/filters/network/redis_proxy/conn_pool_impl_test.cc @@ -1,5 +1,10 @@ #include +#include "envoy/api/v2/cds.pb.h" +#include "envoy/config/cluster/redis/redis_cluster.pb.validate.h" +#include "envoy/config/filter/network/redis_proxy/v2/redis_proxy.pb.h" +#include "envoy/config/filter/network/redis_proxy/v2/redis_proxy.pb.validate.h" + #include "common/network/utility.h" #include "common/upstream/upstream_impl.h" diff --git a/test/extensions/filters/network/redis_proxy/proxy_filter_test.cc b/test/extensions/filters/network/redis_proxy/proxy_filter_test.cc index cb3c22a803197..480d79e392f3d 100644 --- a/test/extensions/filters/network/redis_proxy/proxy_filter_test.cc +++ b/test/extensions/filters/network/redis_proxy/proxy_filter_test.cc @@ -1,6 +1,8 @@ #include #include +#include "envoy/config/filter/network/redis_proxy/v2/redis_proxy.pb.h" + #include "extensions/filters/network/redis_proxy/proxy_filter.h" #include "test/extensions/filters/network/common/redis/mocks.h" diff --git a/test/extensions/filters/network/redis_proxy/router_impl_test.cc b/test/extensions/filters/network/redis_proxy/router_impl_test.cc index 8cf9cbc9d2267..ad062ea38cb5b 100644 --- a/test/extensions/filters/network/redis_proxy/router_impl_test.cc +++ b/test/extensions/filters/network/redis_proxy/router_impl_test.cc @@ -1,5 +1,8 @@ #include +#include "envoy/config/filter/network/redis_proxy/v2/redis_proxy.pb.h" +#include "envoy/type/percent.pb.h" + #include "extensions/filters/network/redis_proxy/conn_pool_impl.h" #include "extensions/filters/network/redis_proxy/router_impl.h" diff --git a/test/extensions/filters/network/tcp_proxy/BUILD b/test/extensions/filters/network/tcp_proxy/BUILD index 59ef09d7d1591..ff72e8ed51eb5 100644 --- a/test/extensions/filters/network/tcp_proxy/BUILD +++ b/test/extensions/filters/network/tcp_proxy/BUILD @@ -19,5 +19,6 @@ envoy_extension_cc_test( "//source/extensions/filters/network/tcp_proxy:config", "//test/mocks/server:server_mocks", "//test/test_common:utility_lib", + "@envoy_api//envoy/config/filter/network/tcp_proxy/v2:pkg_cc_proto", ], ) diff --git a/test/extensions/filters/network/tcp_proxy/config_test.cc b/test/extensions/filters/network/tcp_proxy/config_test.cc index 4efa00f54af04..9282fa7d7e85a 100644 --- a/test/extensions/filters/network/tcp_proxy/config_test.cc +++ b/test/extensions/filters/network/tcp_proxy/config_test.cc @@ -1,5 +1,8 @@ #include +#include "envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.pb.h" +#include "envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.pb.validate.h" + #include "extensions/filters/network/tcp_proxy/config.h" #include "test/mocks/server/mocks.h" diff --git a/test/extensions/filters/network/thrift_proxy/BUILD b/test/extensions/filters/network/thrift_proxy/BUILD index 234d66cc37511..efc877bd99065 100644 --- a/test/extensions/filters/network/thrift_proxy/BUILD +++ b/test/extensions/filters/network/thrift_proxy/BUILD @@ -275,7 +275,7 @@ envoy_extension_cc_test( "//test/mocks/upstream:upstream_mocks", "//test/test_common:printers_lib", "//test/test_common:registry_lib", - "@envoy_api//envoy/config/filter/network/thrift_proxy/v2alpha1:pkg_cc_proto", + "@envoy_api//envoy/config/filter/thrift/router/v2alpha1:pkg_cc_proto", ], ) @@ -293,6 +293,7 @@ envoy_extension_cc_test( "//test/mocks/ratelimit:ratelimit_mocks", "//test/mocks/server:server_mocks", "//test/test_common:printers_lib", + "@envoy_api//envoy/api/v2/route:pkg_cc_proto", "@envoy_api//envoy/config/filter/network/thrift_proxy/v2alpha1:pkg_cc_proto", ], ) @@ -308,6 +309,7 @@ envoy_extension_cc_test( "//source/extensions/filters/network/thrift_proxy/router:router_lib", "//test/test_common:utility_lib", "@envoy_api//envoy/config/filter/network/thrift_proxy/v2alpha1:pkg_cc_proto", + "@envoy_api//envoy/config/filter/thrift/router/v2alpha1:pkg_cc_proto", ], ) @@ -336,6 +338,7 @@ envoy_extension_cc_test( ":utility_lib", "//test/test_common:network_utility_lib", "//test/test_common:printers_lib", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", ], ) @@ -351,6 +354,7 @@ envoy_extension_cc_test( ":utility_lib", "//test/test_common:network_utility_lib", "//test/test_common:printers_lib", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", "@envoy_api//envoy/config/filter/network/thrift_proxy/v2alpha1:pkg_cc_proto", ], ) diff --git a/test/extensions/filters/network/thrift_proxy/config_test.cc b/test/extensions/filters/network/thrift_proxy/config_test.cc index 5c6749bd645c7..71510591494e5 100644 --- a/test/extensions/filters/network/thrift_proxy/config_test.cc +++ b/test/extensions/filters/network/thrift_proxy/config_test.cc @@ -1,3 +1,4 @@ +#include "envoy/config/filter/network/thrift_proxy/v2alpha1/thrift_proxy.pb.h" #include "envoy/config/filter/network/thrift_proxy/v2alpha1/thrift_proxy.pb.validate.h" #include "extensions/filters/network/thrift_proxy/config.h" diff --git a/test/extensions/filters/network/thrift_proxy/conn_manager_test.cc b/test/extensions/filters/network/thrift_proxy/conn_manager_test.cc index 45e763cb009fb..13b40f281bcfb 100644 --- a/test/extensions/filters/network/thrift_proxy/conn_manager_test.cc +++ b/test/extensions/filters/network/thrift_proxy/conn_manager_test.cc @@ -1,6 +1,7 @@ #include #include "envoy/config/filter/network/thrift_proxy/v2alpha1/thrift_proxy.pb.h" +#include "envoy/config/filter/network/thrift_proxy/v2alpha1/thrift_proxy.pb.validate.h" #include "common/buffer/buffer_impl.h" diff --git a/test/extensions/filters/network/thrift_proxy/filters/ratelimit/BUILD b/test/extensions/filters/network/thrift_proxy/filters/ratelimit/BUILD index 693620bd10030..907ddf164ee46 100644 --- a/test/extensions/filters/network/thrift_proxy/filters/ratelimit/BUILD +++ b/test/extensions/filters/network/thrift_proxy/filters/ratelimit/BUILD @@ -27,6 +27,7 @@ envoy_extension_cc_test( "//test/mocks/runtime:runtime_mocks", "//test/mocks/upstream:upstream_mocks", "//test/test_common:utility_lib", + "@envoy_api//envoy/config/filter/thrift/rate_limit/v2alpha1:pkg_cc_proto", ], ) @@ -38,6 +39,7 @@ envoy_extension_cc_test( "//source/extensions/filters/network/thrift_proxy/filters/ratelimit:config", "//test/extensions/filters/network/thrift_proxy:mocks", "//test/mocks/server:server_mocks", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", "@envoy_api//envoy/config/filter/thrift/rate_limit/v2alpha1:pkg_cc_proto", ], ) diff --git a/test/extensions/filters/network/thrift_proxy/filters/ratelimit/config_test.cc b/test/extensions/filters/network/thrift_proxy/filters/ratelimit/config_test.cc index 63a5f256a913d..0d7b0e30e0c2d 100644 --- a/test/extensions/filters/network/thrift_proxy/filters/ratelimit/config_test.cc +++ b/test/extensions/filters/network/thrift_proxy/filters/ratelimit/config_test.cc @@ -1,3 +1,5 @@ +#include "envoy/api/v2/core/grpc_service.pb.h" +#include "envoy/config/filter/thrift/rate_limit/v2alpha1/rate_limit.pb.h" #include "envoy/config/filter/thrift/rate_limit/v2alpha1/rate_limit.pb.validate.h" #include "extensions/filters/network/thrift_proxy/filters/ratelimit/config.h" diff --git a/test/extensions/filters/network/thrift_proxy/filters/ratelimit/ratelimit_test.cc b/test/extensions/filters/network/thrift_proxy/filters/ratelimit/ratelimit_test.cc index 8d7aef34d5a12..05fa0d2bbfb6b 100644 --- a/test/extensions/filters/network/thrift_proxy/filters/ratelimit/ratelimit_test.cc +++ b/test/extensions/filters/network/thrift_proxy/filters/ratelimit/ratelimit_test.cc @@ -2,6 +2,8 @@ #include #include +#include "envoy/config/filter/thrift/rate_limit/v2alpha1/rate_limit.pb.h" + #include "common/buffer/buffer_impl.h" #include "common/common/empty_string.h" #include "common/http/headers.h" diff --git a/test/extensions/filters/network/thrift_proxy/integration_test.cc b/test/extensions/filters/network/thrift_proxy/integration_test.cc index 23f23c663d9ea..1e6ca6eea8e7e 100644 --- a/test/extensions/filters/network/thrift_proxy/integration_test.cc +++ b/test/extensions/filters/network/thrift_proxy/integration_test.cc @@ -1,3 +1,5 @@ +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" + #include "extensions/filters/network/thrift_proxy/buffer_helper.h" #include "test/extensions/filters/network/thrift_proxy/integration.h" diff --git a/test/extensions/filters/network/thrift_proxy/route_matcher_test.cc b/test/extensions/filters/network/thrift_proxy/route_matcher_test.cc index ee0dd28278ea3..96925869b1ad3 100644 --- a/test/extensions/filters/network/thrift_proxy/route_matcher_test.cc +++ b/test/extensions/filters/network/thrift_proxy/route_matcher_test.cc @@ -1,5 +1,6 @@ #include "envoy/config/filter/network/thrift_proxy/v2alpha1/route.pb.h" #include "envoy/config/filter/network/thrift_proxy/v2alpha1/route.pb.validate.h" +#include "envoy/config/filter/thrift/router/v2alpha1/router.pb.validate.h" #include "extensions/filters/network/thrift_proxy/router/config.h" #include "extensions/filters/network/thrift_proxy/router/router_impl.h" diff --git a/test/extensions/filters/network/thrift_proxy/router_ratelimit_test.cc b/test/extensions/filters/network/thrift_proxy/router_ratelimit_test.cc index b2fcbf2a025c7..eb776bcf307bc 100644 --- a/test/extensions/filters/network/thrift_proxy/router_ratelimit_test.cc +++ b/test/extensions/filters/network/thrift_proxy/router_ratelimit_test.cc @@ -1,6 +1,8 @@ #include +#include "envoy/api/v2/route/route.pb.h" #include "envoy/common/exception.h" +#include "envoy/config/filter/network/thrift_proxy/v2alpha1/thrift_proxy.pb.h" #include "envoy/config/filter/network/thrift_proxy/v2alpha1/thrift_proxy.pb.validate.h" #include "envoy/ratelimit/ratelimit.h" diff --git a/test/extensions/filters/network/thrift_proxy/router_test.cc b/test/extensions/filters/network/thrift_proxy/router_test.cc index a3f28a5183629..652ec3ca5f40b 100644 --- a/test/extensions/filters/network/thrift_proxy/router_test.cc +++ b/test/extensions/filters/network/thrift_proxy/router_test.cc @@ -1,7 +1,6 @@ #include -#include "envoy/config/filter/network/thrift_proxy/v2alpha1/route.pb.h" -#include "envoy/config/filter/network/thrift_proxy/v2alpha1/route.pb.validate.h" +#include "envoy/config/filter/thrift/router/v2alpha1/router.pb.validate.h" #include "envoy/tcp/conn_pool.h" #include "common/buffer/buffer_impl.h" diff --git a/test/extensions/filters/network/thrift_proxy/translation_integration_test.cc b/test/extensions/filters/network/thrift_proxy/translation_integration_test.cc index dcb0d796adf6a..ccb3912319859 100644 --- a/test/extensions/filters/network/thrift_proxy/translation_integration_test.cc +++ b/test/extensions/filters/network/thrift_proxy/translation_integration_test.cc @@ -1,3 +1,4 @@ +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" #include "envoy/config/filter/network/thrift_proxy/v2alpha1/thrift_proxy.pb.h" #include "extensions/filters/network/well_known_names.h" diff --git a/test/extensions/filters/network/zookeeper_proxy/config_test.cc b/test/extensions/filters/network/zookeeper_proxy/config_test.cc index a05f63a77cd00..6a2bc9724237e 100644 --- a/test/extensions/filters/network/zookeeper_proxy/config_test.cc +++ b/test/extensions/filters/network/zookeeper_proxy/config_test.cc @@ -1,3 +1,4 @@ +#include "envoy/config/filter/network/zookeeper_proxy/v1alpha1/zookeeper_proxy.pb.h" #include "envoy/config/filter/network/zookeeper_proxy/v1alpha1/zookeeper_proxy.pb.validate.h" #include "extensions/filters/network/zookeeper_proxy/config.h" @@ -62,4 +63,4 @@ stat_prefix: test_prefix } // namespace ZooKeeperProxy } // namespace NetworkFilters } // namespace Extensions -} // namespace Envoy \ No newline at end of file +} // namespace Envoy diff --git a/test/extensions/filters/udp/udp_proxy/BUILD b/test/extensions/filters/udp/udp_proxy/BUILD index f49ca2ff9a79e..a42eb221f00dc 100644 --- a/test/extensions/filters/udp/udp_proxy/BUILD +++ b/test/extensions/filters/udp/udp_proxy/BUILD @@ -30,5 +30,6 @@ envoy_extension_cc_test( deps = [ "//source/extensions/filters/udp/udp_proxy:config", "//test/integration:integration_lib", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", ], ) diff --git a/test/extensions/filters/udp/udp_proxy/udp_proxy_filter_test.cc b/test/extensions/filters/udp/udp_proxy/udp_proxy_filter_test.cc index 306f1fa3369e0..eae2d6a35940c 100644 --- a/test/extensions/filters/udp/udp_proxy/udp_proxy_filter_test.cc +++ b/test/extensions/filters/udp/udp_proxy/udp_proxy_filter_test.cc @@ -1,3 +1,4 @@ +#include "envoy/config/filter/udp/udp_proxy/v2alpha/udp_proxy.pb.h" #include "envoy/config/filter/udp/udp_proxy/v2alpha/udp_proxy.pb.validate.h" #include "extensions/filters/udp/udp_proxy/udp_proxy_filter.h" diff --git a/test/extensions/filters/udp/udp_proxy/udp_proxy_integration_test.cc b/test/extensions/filters/udp/udp_proxy/udp_proxy_integration_test.cc index 56901f2d25f06..a0862942a3b48 100644 --- a/test/extensions/filters/udp/udp_proxy/udp_proxy_integration_test.cc +++ b/test/extensions/filters/udp/udp_proxy/udp_proxy_integration_test.cc @@ -1,3 +1,5 @@ +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" + #include "test/integration/integration.h" namespace Envoy { diff --git a/test/extensions/grpc_credentials/aws_iam/aws_iam_grpc_credentials_test.cc b/test/extensions/grpc_credentials/aws_iam/aws_iam_grpc_credentials_test.cc index 7579f3a24fa28..410f08da169b1 100644 --- a/test/extensions/grpc_credentials/aws_iam/aws_iam_grpc_credentials_test.cc +++ b/test/extensions/grpc_credentials/aws_iam/aws_iam_grpc_credentials_test.cc @@ -1,3 +1,4 @@ +#include "envoy/api/v2/core/grpc_service.pb.h" #include "envoy/config/grpc_credential/v2alpha/aws_iam.pb.h" #include "common/common/fmt.h" @@ -113,4 +114,4 @@ TEST_P(GrpcAwsIamClientIntegrationTest, AwsIamGrpcAuth_EnvRegion) { } // namespace } // namespace Grpc -} // namespace Envoy \ No newline at end of file +} // namespace Envoy diff --git a/test/extensions/grpc_credentials/file_based_metadata/file_based_metadata_grpc_credentials_test.cc b/test/extensions/grpc_credentials/file_based_metadata/file_based_metadata_grpc_credentials_test.cc index 1bcd48b15c589..1617030c9aa73 100644 --- a/test/extensions/grpc_credentials/file_based_metadata/file_based_metadata_grpc_credentials_test.cc +++ b/test/extensions/grpc_credentials/file_based_metadata/file_based_metadata_grpc_credentials_test.cc @@ -1,5 +1,6 @@ #ifdef ENVOY_GOOGLE_GRPC +#include "envoy/api/v2/core/grpc_service.pb.h" #include "envoy/config/grpc_credential/v2alpha/file_based_metadata.pb.h" #include "common/common/fmt.h" diff --git a/test/extensions/health_checkers/redis/BUILD b/test/extensions/health_checkers/redis/BUILD index 8f38c2dfe32d5..03483171d5bee 100644 --- a/test/extensions/health_checkers/redis/BUILD +++ b/test/extensions/health_checkers/redis/BUILD @@ -27,6 +27,8 @@ envoy_extension_cc_test( "//test/mocks/runtime:runtime_mocks", "//test/mocks/upstream:upstream_mocks", "//test/test_common:utility_lib", + "@envoy_api//envoy/config/filter/network/redis_proxy/v2:pkg_cc_proto", + "@envoy_api//envoy/config/health_checker/redis/v2:pkg_cc_proto", ], ) @@ -42,5 +44,6 @@ envoy_extension_cc_test( "//test/mocks/runtime:runtime_mocks", "//test/mocks/server:server_mocks", "//test/mocks/upstream:upstream_mocks", + "@envoy_api//envoy/config/filter/network/redis_proxy/v2:pkg_cc_proto", ], ) diff --git a/test/extensions/health_checkers/redis/config_test.cc b/test/extensions/health_checkers/redis/config_test.cc index 8b38426fc652a..f4333fe856777 100644 --- a/test/extensions/health_checkers/redis/config_test.cc +++ b/test/extensions/health_checkers/redis/config_test.cc @@ -1,3 +1,5 @@ +#include "envoy/config/filter/network/redis_proxy/v2/redis_proxy.pb.validate.h" + #include "common/upstream/health_checker_impl.h" #include "extensions/health_checkers/redis/config.h" diff --git a/test/extensions/health_checkers/redis/redis_test.cc b/test/extensions/health_checkers/redis/redis_test.cc index 010c455acd30c..deda4f5803e1b 100644 --- a/test/extensions/health_checkers/redis/redis_test.cc +++ b/test/extensions/health_checkers/redis/redis_test.cc @@ -1,6 +1,8 @@ #include #include "envoy/api/api.h" +#include "envoy/config/filter/network/redis_proxy/v2/redis_proxy.pb.validate.h" +#include "envoy/config/health_checker/redis/v2/redis.pb.validate.h" #include "extensions/health_checkers/redis/redis.h" #include "extensions/health_checkers/redis/utility.h" diff --git a/test/extensions/quic_listeners/quiche/BUILD b/test/extensions/quic_listeners/quiche/BUILD index 2b34c79040947..f7b52aed56d26 100644 --- a/test/extensions/quic_listeners/quiche/BUILD +++ b/test/extensions/quic_listeners/quiche/BUILD @@ -219,7 +219,6 @@ envoy_cc_test( "//source/common/config:utility_lib", "//source/extensions/quic_listeners/quiche:active_quic_listener_config_lib", "//test/test_common:utility_lib", - "@envoy_api//envoy/api/v2/listener:pkg_cc_proto", ], ) @@ -234,5 +233,8 @@ envoy_cc_test_library( name = "test_utils_lib", hdrs = ["test_utils.h"], tags = ["nofips"], - deps = ["@com_googlesource_quiche//:quic_core_http_spdy_session_lib"], + deps = [ + "//source/extensions/quic_listeners/quiche:quic_filter_manager_connection_lib", + "@com_googlesource_quiche//:quic_core_http_spdy_session_lib", + ], ) diff --git a/test/extensions/quic_listeners/quiche/active_quic_listener_config_test.cc b/test/extensions/quic_listeners/quiche/active_quic_listener_config_test.cc index 6f0c0e4696ec9..641eb5409ee46 100644 --- a/test/extensions/quic_listeners/quiche/active_quic_listener_config_test.cc +++ b/test/extensions/quic_listeners/quiche/active_quic_listener_config_test.cc @@ -1,5 +1,3 @@ -#include "envoy/api/v2/listener/quic_config.pb.h" - #include "common/config/utility.h" #include "extensions/quic_listeners/quiche/active_quic_listener.h" diff --git a/test/extensions/quic_listeners/quiche/integration/BUILD b/test/extensions/quic_listeners/quiche/integration/BUILD index 361609bcdcfc7..b9c05f3c47595 100644 --- a/test/extensions/quic_listeners/quiche/integration/BUILD +++ b/test/extensions/quic_listeners/quiche/integration/BUILD @@ -23,5 +23,8 @@ envoy_cc_test( "//source/extensions/quic_listeners/quiche:envoy_quic_proof_verifier_lib", "//source/extensions/quic_listeners/quiche:quic_transport_socket_factory_lib", "//test/integration:http_integration_lib", + "@envoy_api//envoy/api/v2/auth:pkg_cc_proto", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", + "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto", ], ) diff --git a/test/extensions/quic_listeners/quiche/integration/quic_http_integration_test.cc b/test/extensions/quic_listeners/quiche/integration/quic_http_integration_test.cc index a652c5e9d40e8..1cf0d16c79b92 100644 --- a/test/extensions/quic_listeners/quiche/integration/quic_http_integration_test.cc +++ b/test/extensions/quic_listeners/quiche/integration/quic_http_integration_test.cc @@ -1,3 +1,7 @@ +#include "envoy/api/v2/auth/cert.pb.h" +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" +#include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.h" + #include "test/config/utility.h" #include "test/integration/http_integration.h" #include "test/test_common/utility.h" diff --git a/test/extensions/resource_monitors/fixed_heap/BUILD b/test/extensions/resource_monitors/fixed_heap/BUILD index 724e9d5e4289e..4f8594bbe4ea6 100644 --- a/test/extensions/resource_monitors/fixed_heap/BUILD +++ b/test/extensions/resource_monitors/fixed_heap/BUILD @@ -18,6 +18,7 @@ envoy_extension_cc_test( external_deps = ["abseil_optional"], deps = [ "//source/extensions/resource_monitors/fixed_heap:fixed_heap_monitor", + "@envoy_api//envoy/config/resource_monitor/fixed_heap/v2alpha:pkg_cc_proto", ], ) diff --git a/test/extensions/resource_monitors/fixed_heap/config_test.cc b/test/extensions/resource_monitors/fixed_heap/config_test.cc index 1c91ae642dd96..07249bcfe841e 100644 --- a/test/extensions/resource_monitors/fixed_heap/config_test.cc +++ b/test/extensions/resource_monitors/fixed_heap/config_test.cc @@ -1,3 +1,4 @@ +#include "envoy/config/resource_monitor/fixed_heap/v2alpha/fixed_heap.pb.h" #include "envoy/config/resource_monitor/fixed_heap/v2alpha/fixed_heap.pb.validate.h" #include "envoy/registry/registry.h" diff --git a/test/extensions/resource_monitors/fixed_heap/fixed_heap_monitor_test.cc b/test/extensions/resource_monitors/fixed_heap/fixed_heap_monitor_test.cc index d8c82b8450179..889f4eeab7a9e 100644 --- a/test/extensions/resource_monitors/fixed_heap/fixed_heap_monitor_test.cc +++ b/test/extensions/resource_monitors/fixed_heap/fixed_heap_monitor_test.cc @@ -1,3 +1,5 @@ +#include "envoy/config/resource_monitor/fixed_heap/v2alpha/fixed_heap.pb.h" + #include "extensions/resource_monitors/fixed_heap/fixed_heap_monitor.h" #include "absl/types/optional.h" diff --git a/test/extensions/resource_monitors/injected_resource/BUILD b/test/extensions/resource_monitors/injected_resource/BUILD index 9df0987dbab3b..034d9b1365f07 100644 --- a/test/extensions/resource_monitors/injected_resource/BUILD +++ b/test/extensions/resource_monitors/injected_resource/BUILD @@ -22,6 +22,7 @@ envoy_cc_test( "//source/server:resource_monitor_config_lib", "//test/test_common:environment_lib", "//test/test_common:utility_lib", + "@envoy_api//envoy/config/resource_monitor/injected_resource/v2alpha:pkg_cc_proto", ], ) diff --git a/test/extensions/resource_monitors/injected_resource/config_test.cc b/test/extensions/resource_monitors/injected_resource/config_test.cc index 00862c91bf1e0..c4e31aaab46d3 100644 --- a/test/extensions/resource_monitors/injected_resource/config_test.cc +++ b/test/extensions/resource_monitors/injected_resource/config_test.cc @@ -1,3 +1,4 @@ +#include "envoy/config/resource_monitor/injected_resource/v2alpha/injected_resource.pb.h" #include "envoy/config/resource_monitor/injected_resource/v2alpha/injected_resource.pb.validate.h" #include "envoy/registry/registry.h" diff --git a/test/extensions/resource_monitors/injected_resource/injected_resource_monitor_test.cc b/test/extensions/resource_monitors/injected_resource/injected_resource_monitor_test.cc index a6ac6f290e312..7ed824b7c2360 100644 --- a/test/extensions/resource_monitors/injected_resource/injected_resource_monitor_test.cc +++ b/test/extensions/resource_monitors/injected_resource/injected_resource_monitor_test.cc @@ -1,3 +1,5 @@ +#include "envoy/config/resource_monitor/injected_resource/v2alpha/injected_resource.pb.h" + #include "common/event/dispatcher_impl.h" #include "common/stats/isolated_store_impl.h" diff --git a/test/extensions/retry/priority/previous_priorities/config_test.cc b/test/extensions/retry/priority/previous_priorities/config_test.cc index 47f425dfee60e..d96a16bd487c9 100644 --- a/test/extensions/retry/priority/previous_priorities/config_test.cc +++ b/test/extensions/retry/priority/previous_priorities/config_test.cc @@ -1,4 +1,4 @@ -#include "envoy/config/retry/previous_priorities/previous_priorities_config.pb.validate.h" +#include "envoy/config/retry/previous_priorities/previous_priorities_config.pb.h" #include "envoy/registry/registry.h" #include "envoy/upstream/retry.h" diff --git a/test/extensions/stats_sinks/dog_statsd/BUILD b/test/extensions/stats_sinks/dog_statsd/BUILD index 66a5d61b3711c..29d4404ae6b41 100644 --- a/test/extensions/stats_sinks/dog_statsd/BUILD +++ b/test/extensions/stats_sinks/dog_statsd/BUILD @@ -23,6 +23,7 @@ envoy_extension_cc_test( "//test/test_common:environment_lib", "//test/test_common:network_utility_lib", "//test/test_common:utility_lib", - "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/config/metrics/v2:pkg_cc_proto", ], ) diff --git a/test/extensions/stats_sinks/dog_statsd/config_test.cc b/test/extensions/stats_sinks/dog_statsd/config_test.cc index 993fc0da13c8e..574ab55fece9d 100644 --- a/test/extensions/stats_sinks/dog_statsd/config_test.cc +++ b/test/extensions/stats_sinks/dog_statsd/config_test.cc @@ -1,4 +1,5 @@ -#include "envoy/config/bootstrap/v2/bootstrap.pb.h" +#include "envoy/api/v2/core/address.pb.h" +#include "envoy/config/metrics/v2/stats.pb.h" #include "envoy/registry/registry.h" #include "common/config/well_known_names.h" diff --git a/test/extensions/stats_sinks/hystrix/BUILD b/test/extensions/stats_sinks/hystrix/BUILD index b230c5e4be3db..420b4295d8609 100644 --- a/test/extensions/stats_sinks/hystrix/BUILD +++ b/test/extensions/stats_sinks/hystrix/BUILD @@ -23,7 +23,7 @@ envoy_extension_cc_test( "//test/test_common:environment_lib", "//test/test_common:network_utility_lib", "//test/test_common:utility_lib", - "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", + "@envoy_api//envoy/config/metrics/v2:pkg_cc_proto", ], ) diff --git a/test/extensions/stats_sinks/hystrix/config_test.cc b/test/extensions/stats_sinks/hystrix/config_test.cc index 360b982752735..0f730a32da7dc 100644 --- a/test/extensions/stats_sinks/hystrix/config_test.cc +++ b/test/extensions/stats_sinks/hystrix/config_test.cc @@ -1,4 +1,4 @@ -#include "envoy/config/bootstrap/v2/bootstrap.pb.h" +#include "envoy/config/metrics/v2/stats.pb.h" #include "envoy/registry/registry.h" #include "common/protobuf/utility.h" diff --git a/test/extensions/stats_sinks/metrics_service/BUILD b/test/extensions/stats_sinks/metrics_service/BUILD index 52063ff170097..ba1ecd0abd378 100644 --- a/test/extensions/stats_sinks/metrics_service/BUILD +++ b/test/extensions/stats_sinks/metrics_service/BUILD @@ -26,6 +26,7 @@ envoy_extension_cc_test( "//test/mocks/thread_local:thread_local_mocks", "//test/mocks/upstream:upstream_mocks", "//test/test_common:simulated_time_system_lib", + "@envoy_api//envoy/service/metrics/v2:pkg_cc_proto", ], ) @@ -42,6 +43,7 @@ envoy_extension_cc_test( "//test/common/grpc:grpc_client_integration_lib", "//test/integration:http_integration_lib", "//test/test_common:utility_lib", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", "@envoy_api//envoy/config/metrics/v2:pkg_cc_proto", "@envoy_api//envoy/service/metrics/v2:pkg_cc_proto", ], diff --git a/test/extensions/stats_sinks/metrics_service/grpc_metrics_service_impl_test.cc b/test/extensions/stats_sinks/metrics_service/grpc_metrics_service_impl_test.cc index ba8f091b83fd2..79724d85b49aa 100644 --- a/test/extensions/stats_sinks/metrics_service/grpc_metrics_service_impl_test.cc +++ b/test/extensions/stats_sinks/metrics_service/grpc_metrics_service_impl_test.cc @@ -1,3 +1,5 @@ +#include "envoy/service/metrics/v2/metrics_service.pb.h" + #include "extensions/stat_sinks/metrics_service/grpc_metrics_service_impl.h" #include "test/mocks/common.h" diff --git a/test/extensions/stats_sinks/metrics_service/metrics_service_integration_test.cc b/test/extensions/stats_sinks/metrics_service/metrics_service_integration_test.cc index 2281eadea9429..9718eb95d28e8 100644 --- a/test/extensions/stats_sinks/metrics_service/metrics_service_integration_test.cc +++ b/test/extensions/stats_sinks/metrics_service/metrics_service_integration_test.cc @@ -1,3 +1,4 @@ +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" #include "envoy/config/metrics/v2/metrics_service.pb.h" #include "envoy/service/metrics/v2/metrics_service.pb.h" diff --git a/test/extensions/stats_sinks/statsd/BUILD b/test/extensions/stats_sinks/statsd/BUILD index 9f23bc6631172..0ee9fab7b468c 100644 --- a/test/extensions/stats_sinks/statsd/BUILD +++ b/test/extensions/stats_sinks/statsd/BUILD @@ -23,6 +23,7 @@ envoy_extension_cc_test( "//test/test_common:environment_lib", "//test/test_common:network_utility_lib", "//test/test_common:utility_lib", - "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/config/metrics/v2:pkg_cc_proto", ], ) diff --git a/test/extensions/stats_sinks/statsd/config_test.cc b/test/extensions/stats_sinks/statsd/config_test.cc index 3ea7353f77e94..296fdd3a6510d 100644 --- a/test/extensions/stats_sinks/statsd/config_test.cc +++ b/test/extensions/stats_sinks/statsd/config_test.cc @@ -1,4 +1,5 @@ -#include "envoy/config/bootstrap/v2/bootstrap.pb.h" +#include "envoy/api/v2/core/address.pb.h" +#include "envoy/config/metrics/v2/stats.pb.h" #include "envoy/network/address.h" #include "envoy/registry/registry.h" diff --git a/test/extensions/tracers/datadog/BUILD b/test/extensions/tracers/datadog/BUILD index 714c3091bad41..5102a22a608c5 100644 --- a/test/extensions/tracers/datadog/BUILD +++ b/test/extensions/tracers/datadog/BUILD @@ -33,6 +33,7 @@ envoy_extension_cc_test( "//test/mocks/tracing:tracing_mocks", "//test/mocks/upstream:upstream_mocks", "//test/test_common:utility_lib", + "@envoy_api//envoy/config/trace/v2:pkg_cc_proto", ], ) @@ -44,5 +45,6 @@ envoy_extension_cc_test( "//source/extensions/tracers/datadog:config", "//test/mocks/server:server_mocks", "//test/test_common:utility_lib", + "@envoy_api//envoy/config/trace/v2:pkg_cc_proto", ], ) diff --git a/test/extensions/tracers/datadog/config_test.cc b/test/extensions/tracers/datadog/config_test.cc index 9ffe6a0035619..1ae7d7c1f1b6e 100644 --- a/test/extensions/tracers/datadog/config_test.cc +++ b/test/extensions/tracers/datadog/config_test.cc @@ -1,3 +1,6 @@ +#include "envoy/config/trace/v2/trace.pb.h" +#include "envoy/config/trace/v2/trace.pb.validate.h" + #include "extensions/tracers/datadog/config.h" #include "test/mocks/server/mocks.h" diff --git a/test/extensions/tracers/datadog/datadog_tracer_impl_test.cc b/test/extensions/tracers/datadog/datadog_tracer_impl_test.cc index 770d43655b292..bec72f27b53be 100644 --- a/test/extensions/tracers/datadog/datadog_tracer_impl_test.cc +++ b/test/extensions/tracers/datadog/datadog_tracer_impl_test.cc @@ -3,6 +3,8 @@ #include #include +#include "envoy/config/trace/v2/trace.pb.h" + #include "common/common/base64.h" #include "common/http/header_map_impl.h" #include "common/http/headers.h" diff --git a/test/extensions/tracers/dynamic_ot/BUILD b/test/extensions/tracers/dynamic_ot/BUILD index ffa581456f0ff..f961fb056ccc7 100644 --- a/test/extensions/tracers/dynamic_ot/BUILD +++ b/test/extensions/tracers/dynamic_ot/BUILD @@ -42,5 +42,6 @@ envoy_extension_cc_test( "//test/mocks/server:server_mocks", "//test/test_common:environment_lib", "//test/test_common:utility_lib", + "@envoy_api//envoy/config/trace/v2:pkg_cc_proto", ], ) diff --git a/test/extensions/tracers/dynamic_ot/config_test.cc b/test/extensions/tracers/dynamic_ot/config_test.cc index 5c11d6172f69d..b09b08d75c015 100644 --- a/test/extensions/tracers/dynamic_ot/config_test.cc +++ b/test/extensions/tracers/dynamic_ot/config_test.cc @@ -1,3 +1,6 @@ +#include "envoy/config/trace/v2/trace.pb.h" +#include "envoy/config/trace/v2/trace.pb.validate.h" + #include "extensions/tracers/dynamic_ot/config.h" #include "test/mocks/server/mocks.h" diff --git a/test/extensions/tracers/lightstep/BUILD b/test/extensions/tracers/lightstep/BUILD index f70b50b5bd9a8..a6a60444ef3f1 100644 --- a/test/extensions/tracers/lightstep/BUILD +++ b/test/extensions/tracers/lightstep/BUILD @@ -35,6 +35,7 @@ envoy_extension_cc_test( "//test/mocks/upstream:upstream_mocks", "//test/test_common:global_lib", "//test/test_common:utility_lib", + "@envoy_api//envoy/config/trace/v2:pkg_cc_proto", ], ) @@ -46,5 +47,6 @@ envoy_extension_cc_test( "//source/extensions/tracers/lightstep:config", "//test/mocks/server:server_mocks", "//test/test_common:utility_lib", + "@envoy_api//envoy/config/trace/v2:pkg_cc_proto", ], ) diff --git a/test/extensions/tracers/lightstep/config_test.cc b/test/extensions/tracers/lightstep/config_test.cc index 7cdd4595ef3e2..964d56230cbd2 100644 --- a/test/extensions/tracers/lightstep/config_test.cc +++ b/test/extensions/tracers/lightstep/config_test.cc @@ -1,3 +1,6 @@ +#include "envoy/config/trace/v2/trace.pb.h" +#include "envoy/config/trace/v2/trace.pb.validate.h" + #include "extensions/tracers/lightstep/config.h" #include "test/mocks/server/mocks.h" diff --git a/test/extensions/tracers/lightstep/lightstep_tracer_impl_test.cc b/test/extensions/tracers/lightstep/lightstep_tracer_impl_test.cc index c56ccd3753e3b..3da0e4c3e2088 100644 --- a/test/extensions/tracers/lightstep/lightstep_tracer_impl_test.cc +++ b/test/extensions/tracers/lightstep/lightstep_tracer_impl_test.cc @@ -3,6 +3,8 @@ #include #include +#include "envoy/config/trace/v2/trace.pb.h" + #include "common/common/base64.h" #include "common/grpc/common.h" #include "common/http/header_map_impl.h" diff --git a/test/extensions/tracers/opencensus/BUILD b/test/extensions/tracers/opencensus/BUILD index fcfa4033e704d..65adf16a989b3 100644 --- a/test/extensions/tracers/opencensus/BUILD +++ b/test/extensions/tracers/opencensus/BUILD @@ -32,5 +32,6 @@ envoy_extension_cc_test( "//source/extensions/tracers/opencensus:config", "//test/mocks/server:server_mocks", "//test/test_common:utility_lib", + "@envoy_api//envoy/config/trace/v2:pkg_cc_proto", ], ) diff --git a/test/extensions/tracers/opencensus/config_test.cc b/test/extensions/tracers/opencensus/config_test.cc index 95cd8767f86bd..2d97ff2ef31b0 100644 --- a/test/extensions/tracers/opencensus/config_test.cc +++ b/test/extensions/tracers/opencensus/config_test.cc @@ -1,3 +1,5 @@ +#include "envoy/config/trace/v2/trace.pb.h" +#include "envoy/config/trace/v2/trace.pb.validate.h" #include "envoy/registry/registry.h" #include "extensions/tracers/opencensus/config.h" diff --git a/test/extensions/tracers/opencensus/tracer_test.cc b/test/extensions/tracers/opencensus/tracer_test.cc index aef4d925b129c..286346f3a1b2a 100644 --- a/test/extensions/tracers/opencensus/tracer_test.cc +++ b/test/extensions/tracers/opencensus/tracer_test.cc @@ -5,7 +5,7 @@ #include #include -#include "envoy/config/trace/v2/trace.pb.validate.h" +#include "envoy/config/trace/v2/trace.pb.h" #include "common/common/base64.h" diff --git a/test/extensions/tracers/xray/BUILD b/test/extensions/tracers/xray/BUILD index 2ee6b8f70e57d..201d15cd64b29 100644 --- a/test/extensions/tracers/xray/BUILD +++ b/test/extensions/tracers/xray/BUILD @@ -43,6 +43,7 @@ envoy_extension_cc_test( "//test/mocks/server:server_mocks", "//test/test_common:environment_lib", "//test/test_common:utility_lib", + "@envoy_api//envoy/config/trace/v2:pkg_cc_proto", ], ) diff --git a/test/extensions/tracers/xray/config_test.cc b/test/extensions/tracers/xray/config_test.cc index 91dcd5903a0d0..0242d3ae964ab 100644 --- a/test/extensions/tracers/xray/config_test.cc +++ b/test/extensions/tracers/xray/config_test.cc @@ -1,3 +1,5 @@ +#include "envoy/config/trace/v2/trace.pb.h" +#include "envoy/config/trace/v2/trace.pb.validate.h" #include "envoy/registry/registry.h" #include "extensions/tracers/xray/config.h" diff --git a/test/extensions/tracers/zipkin/BUILD b/test/extensions/tracers/zipkin/BUILD index 3de3f8afee90b..6c74cb5de40e2 100644 --- a/test/extensions/tracers/zipkin/BUILD +++ b/test/extensions/tracers/zipkin/BUILD @@ -44,6 +44,7 @@ envoy_extension_cc_test( "//test/test_common:simulated_time_system_lib", "//test/test_common:test_time_lib", "//test/test_common:utility_lib", + "@envoy_api//envoy/config/trace/v2:pkg_cc_proto", ], ) @@ -55,5 +56,6 @@ envoy_extension_cc_test( "//source/extensions/tracers/zipkin:config", "//test/mocks/server:server_mocks", "//test/test_common:utility_lib", + "@envoy_api//envoy/config/trace/v2:pkg_cc_proto", ], ) diff --git a/test/extensions/tracers/zipkin/config_test.cc b/test/extensions/tracers/zipkin/config_test.cc index 7505966552912..5c698899f48b7 100644 --- a/test/extensions/tracers/zipkin/config_test.cc +++ b/test/extensions/tracers/zipkin/config_test.cc @@ -1,3 +1,5 @@ +#include "envoy/config/trace/v2/trace.pb.h" +#include "envoy/config/trace/v2/trace.pb.validate.h" #include "envoy/registry/registry.h" #include "extensions/tracers/zipkin/config.h" diff --git a/test/extensions/tracers/zipkin/span_buffer_test.cc b/test/extensions/tracers/zipkin/span_buffer_test.cc index 1ef6e88e64858..27b77859b7662 100644 --- a/test/extensions/tracers/zipkin/span_buffer_test.cc +++ b/test/extensions/tracers/zipkin/span_buffer_test.cc @@ -1,3 +1,5 @@ +#include "envoy/config/trace/v2/trace.pb.h" + #include "common/network/utility.h" #include "extensions/tracers/zipkin/span_buffer.h" diff --git a/test/extensions/tracers/zipkin/zipkin_tracer_impl_test.cc b/test/extensions/tracers/zipkin/zipkin_tracer_impl_test.cc index a605e3e0ebaea..8bcade8425ea0 100644 --- a/test/extensions/tracers/zipkin/zipkin_tracer_impl_test.cc +++ b/test/extensions/tracers/zipkin/zipkin_tracer_impl_test.cc @@ -4,6 +4,8 @@ #include #include +#include "envoy/config/trace/v2/trace.pb.h" + #include "common/http/header_map_impl.h" #include "common/http/headers.h" #include "common/http/message_impl.h" diff --git a/test/extensions/transport_sockets/alts/BUILD b/test/extensions/transport_sockets/alts/BUILD index 10a99ff65dd17..8c7cbfa6f27e4 100644 --- a/test/extensions/transport_sockets/alts/BUILD +++ b/test/extensions/transport_sockets/alts/BUILD @@ -21,7 +21,6 @@ envoy_extension_cc_test( "//test/mocks/event:event_mocks", "//test/mocks/network:network_mocks", "//test/mocks/server:server_mocks", - "@envoy_api//envoy/config/transport_socket/alts/v2alpha:pkg_cc_proto", ], ) diff --git a/test/extensions/transport_sockets/alts/alts_integration_test.cc b/test/extensions/transport_sockets/alts/alts_integration_test.cc index 23748aa098b81..fc42eb9b0f4dc 100644 --- a/test/extensions/transport_sockets/alts/alts_integration_test.cc +++ b/test/extensions/transport_sockets/alts/alts_integration_test.cc @@ -1,3 +1,4 @@ +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" #include "envoy/config/transport_socket/alts/v2alpha/alts.pb.h" #include "common/common/thread.h" diff --git a/test/extensions/transport_sockets/alts/config_test.cc b/test/extensions/transport_sockets/alts/config_test.cc index a17405dc7e083..6e1ae044c4698 100644 --- a/test/extensions/transport_sockets/alts/config_test.cc +++ b/test/extensions/transport_sockets/alts/config_test.cc @@ -1,5 +1,3 @@ -#include "envoy/config/transport_socket/alts/v2alpha/alts.pb.validate.h" - #include "common/protobuf/protobuf.h" #include "common/singleton/manager_impl.h" diff --git a/test/extensions/transport_sockets/tls/BUILD b/test/extensions/transport_sockets/tls/BUILD index 14b27c583b299..0f4c90f692f49 100644 --- a/test/extensions/transport_sockets/tls/BUILD +++ b/test/extensions/transport_sockets/tls/BUILD @@ -55,6 +55,9 @@ envoy_cc_test( "//test/test_common:registry_lib", "//test/test_common:simulated_time_system_lib", "//test/test_common:utility_lib", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/auth:pkg_cc_proto", + "@envoy_api//envoy/api/v2/listener:pkg_cc_proto", ], ) @@ -82,6 +85,7 @@ envoy_cc_test( "//test/mocks/ssl:ssl_mocks", "//test/test_common:environment_lib", "//test/test_common:simulated_time_system_lib", + "@envoy_api//envoy/admin/v2alpha:pkg_cc_proto", "@envoy_api//envoy/api/v2/auth:pkg_cc_proto", ], ) @@ -133,5 +137,6 @@ envoy_cc_test_library( "//include/envoy/ssl/private_key:private_key_interface", "//source/common/config:utility_lib", "//source/common/protobuf:utility_lib", + "@envoy_api//envoy/api/v2/auth:pkg_cc_proto", ], ) diff --git a/test/extensions/transport_sockets/tls/context_impl_test.cc b/test/extensions/transport_sockets/tls/context_impl_test.cc index 59e307b0e51e4..9780f7c1319cb 100644 --- a/test/extensions/transport_sockets/tls/context_impl_test.cc +++ b/test/extensions/transport_sockets/tls/context_impl_test.cc @@ -1,6 +1,8 @@ #include #include +#include "envoy/admin/v2alpha/certs.pb.h" +#include "envoy/api/v2/auth/cert.pb.h" #include "envoy/api/v2/auth/cert.pb.validate.h" #include "common/json/json_loader.h" diff --git a/test/extensions/transport_sockets/tls/integration/BUILD b/test/extensions/transport_sockets/tls/integration/BUILD index a01895bc2ce52..3e13930257ca5 100644 --- a/test/extensions/transport_sockets/tls/integration/BUILD +++ b/test/extensions/transport_sockets/tls/integration/BUILD @@ -29,7 +29,12 @@ envoy_cc_test( "//test/integration:http_integration_lib", "//test/mocks/secret:secret_mocks", "//test/test_common:utility_lib", + "@envoy_api//envoy/api/v2/auth:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", + "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto", "@envoy_api//envoy/config/transport_socket/tap/v2alpha:pkg_cc_proto", "@envoy_api//envoy/data/tap/v2alpha:pkg_cc_proto", + "@envoy_api//envoy/service/tap/v2alpha:pkg_cc_proto", ], ) diff --git a/test/extensions/transport_sockets/tls/integration/ssl_integration_test.cc b/test/extensions/transport_sockets/tls/integration/ssl_integration_test.cc index b439f2e25f97c..4b86fd895aaa3 100644 --- a/test/extensions/transport_sockets/tls/integration/ssl_integration_test.cc +++ b/test/extensions/transport_sockets/tls/integration/ssl_integration_test.cc @@ -3,8 +3,14 @@ #include #include +#include "envoy/api/v2/auth/cert.pb.h" +#include "envoy/api/v2/core/address.pb.h" +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" +#include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.h" #include "envoy/config/transport_socket/tap/v2alpha/tap.pb.h" #include "envoy/data/tap/v2alpha/wrapper.pb.h" +#include "envoy/service/tap/v2alpha/common.pb.h" #include "common/event/dispatcher_impl.h" #include "common/network/connection_impl.h" diff --git a/test/extensions/transport_sockets/tls/ssl_socket_test.cc b/test/extensions/transport_sockets/tls/ssl_socket_test.cc index c223cce86f1dd..a0c53b3e3e08d 100644 --- a/test/extensions/transport_sockets/tls/ssl_socket_test.cc +++ b/test/extensions/transport_sockets/tls/ssl_socket_test.cc @@ -2,6 +2,9 @@ #include #include +#include "envoy/api/v2/auth/cert.pb.h" +#include "envoy/api/v2/lds.pb.h" +#include "envoy/api/v2/listener/listener.pb.h" #include "envoy/network/transport_socket.h" #include "common/buffer/buffer_impl.h" diff --git a/test/extensions/transport_sockets/tls/test_private_key_method_provider.h b/test/extensions/transport_sockets/tls/test_private_key_method_provider.h index ca10cd596d165..417ddff3ebb61 100644 --- a/test/extensions/transport_sockets/tls/test_private_key_method_provider.h +++ b/test/extensions/transport_sockets/tls/test_private_key_method_provider.h @@ -1,5 +1,6 @@ #pragma once +#include "envoy/api/v2/auth/cert.pb.h" #include "envoy/event/dispatcher.h" #include "envoy/server/transport_socket_config.h" #include "envoy/ssl/private_key/private_key.h" diff --git a/test/fuzz/BUILD b/test/fuzz/BUILD index 44507b1c1a554..7e911baf6b74c 100644 --- a/test/fuzz/BUILD +++ b/test/fuzz/BUILD @@ -57,5 +57,6 @@ envoy_cc_test_library( "//test/mocks/ssl:ssl_mocks", "//test/mocks/upstream:upstream_mocks", "//test/test_common:utility_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) diff --git a/test/fuzz/utility.h b/test/fuzz/utility.h index 62771bd42b484..a455633c201d5 100644 --- a/test/fuzz/utility.h +++ b/test/fuzz/utility.h @@ -1,5 +1,7 @@ #pragma once +#include "envoy/api/v2/core/base.pb.h" + #include "common/common/empty_string.h" #include "common/network/resolver_impl.h" #include "common/network/utility.h" diff --git a/test/integration/BUILD b/test/integration/BUILD index 65f9e6dc1611e..c59c7a1c1bf1b 100644 --- a/test/integration/BUILD +++ b/test/integration/BUILD @@ -36,6 +36,8 @@ envoy_cc_test_library( "//test/test_common:utility_lib", "@envoy_api//envoy/admin/v2alpha:pkg_cc_proto", "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/auth:pkg_cc_proto", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", ], ) @@ -51,10 +53,8 @@ envoy_cc_test( "//test/common/grpc:grpc_client_integration_lib", "//test/test_common:network_utility_lib", "//test/test_common:utility_lib", - "@envoy_api//envoy/admin/v2alpha:pkg_cc_proto", "@envoy_api//envoy/api/v2:pkg_cc_proto", - "@envoy_api//envoy/api/v2/route:pkg_cc_proto", - "@envoy_api//envoy/service/discovery/v2:pkg_cc_proto", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", ], ) @@ -105,6 +105,10 @@ envoy_cc_test( "//test/integration/filters:eds_ready_filter_config_lib", "//test/test_common:network_utility_lib", "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", + "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto", + "@envoy_api//envoy/type:pkg_cc_proto", ], ) @@ -129,6 +133,7 @@ envoy_cc_test( "//test/server:utility_lib", "//test/test_common:registry_lib", "//test/test_common:utility_lib", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", ], ) @@ -141,6 +146,7 @@ envoy_cc_test( "//include/envoy/registry", "//source/extensions/filters/network/tcp_proxy:config", "//test/config:utility_lib", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", ], ) @@ -154,6 +160,7 @@ envoy_cc_test( "//test/integration/clusters:custom_static_cluster", "//test/test_common:network_utility_lib", "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", ], ) @@ -174,6 +181,7 @@ envoy_cc_test( "//test/test_common:network_utility_lib", "//test/test_common:utility_lib", "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/route:pkg_cc_proto", ], ) @@ -212,6 +220,8 @@ envoy_cc_test( "//source/common/protobuf", "//test/test_common:utility_lib", "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", "@envoy_api//envoy/config/filter/http/router/v2:pkg_cc_proto", "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto", ], @@ -238,6 +248,8 @@ envoy_cc_test( "//test/mocks/http:http_mocks", "//test/mocks/upstream:upstream_mocks", "//test/test_common:utility_lib", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", + "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto", ], ) @@ -249,6 +261,10 @@ envoy_cc_test( deps = [ ":http_integration_lib", "//test/common/upstream:utility_lib", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/route:pkg_cc_proto", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", + "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto", ], ) @@ -264,6 +280,10 @@ envoy_cc_test( ":http_integration_lib", "//source/extensions/transport_sockets/tls:context_lib", "//test/common/upstream:utility_lib", + "@envoy_api//envoy/api/v2/auth:pkg_cc_proto", + "@envoy_api//envoy/api/v2/route:pkg_cc_proto", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", + "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto", ], ) @@ -275,6 +295,7 @@ envoy_cc_test( deps = [ ":http_integration_lib", "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", + "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto", ], ) @@ -286,6 +307,8 @@ envoy_cc_test( ], deps = [ ":http_integration_lib", + "@envoy_api//envoy/config/filter/http/router/v2:pkg_cc_proto", + "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto", ], ) @@ -305,6 +328,9 @@ envoy_cc_test( "//source/extensions/filters/http/health_check:config", "//test/integration/filters:random_pause_filter_lib", "//test/test_common:utility_lib", + "@envoy_api//envoy/api/v2/route:pkg_cc_proto", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", + "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto", ], ) @@ -323,6 +349,8 @@ envoy_cc_test( "//source/extensions/filters/http/health_check:config", "//test/integration/filters:random_pause_filter_lib", "//test/test_common:utility_lib", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", + "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto", ], ) @@ -340,6 +368,8 @@ envoy_cc_test( "//source/extensions/filters/http/health_check:config", "//test/common/stats:stat_test_utility_lib", "@envoy_api//envoy/admin/v2alpha:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", "@envoy_api//envoy/config/metrics/v2:pkg_cc_proto", ], ) @@ -380,6 +410,7 @@ envoy_cc_test_library( "//test/integration/filters:passthrough_filter_config_lib", "//test/integration/filters:pause_filter_lib", "//test/test_common:registry_lib", + "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto", ], ) @@ -406,6 +437,8 @@ envoy_cc_test( deps = [ ":http_protocol_integration_lib", "//test/test_common:test_time_lib", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", + "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto", ], ) @@ -492,6 +525,12 @@ envoy_cc_test_library( "//test/test_common:test_time_lib", "//test/test_common:test_time_system_interface", "//test/test_common:utility_lib", + "@envoy_api//envoy/admin/v2alpha:pkg_cc_proto", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/auth:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/api/v2/endpoint:pkg_cc_proto", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", ], ) @@ -513,7 +552,9 @@ envoy_cc_test( "//test/integration/filters:process_context_lib", "//test/mocks/http:http_mocks", "//test/test_common:utility_lib", - "@envoy_api//envoy/config/accesslog/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/route:pkg_cc_proto", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", + "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto", ], ) @@ -526,6 +567,8 @@ envoy_cc_test( ":http_protocol_integration_lib", "//source/common/http:header_map_lib", "//test/test_common:utility_lib", + "@envoy_api//envoy/api/v2/route:pkg_cc_proto", + "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto", ], ) @@ -541,7 +584,8 @@ envoy_cc_test( "//source/extensions/access_loggers/file:config", "//source/extensions/filters/http/buffer:config", "//test/test_common:utility_lib", - "@envoy_api//envoy/config/accesslog/v2:pkg_cc_proto", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", + "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto", ], ) @@ -575,8 +619,8 @@ envoy_cc_test( "//test/common/stats:stat_test_utility_lib", "//test/test_common:network_utility_lib", "//test/test_common:utility_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", - "@envoy_api//envoy/config/metrics/v2:pkg_cc_proto", ], ) @@ -590,7 +634,9 @@ envoy_cc_test( "//test/test_common:network_utility_lib", "//test/test_common:utility_lib", "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", "@envoy_api//envoy/api/v2/endpoint:pkg_cc_proto", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", "@envoy_api//envoy/service/load_stats/v2:pkg_cc_proto", ], ) @@ -611,8 +657,8 @@ envoy_cc_test( "//test/common/upstream:utility_lib", "//test/config:utility_lib", "//test/test_common:network_utility_lib", - "@envoy_api//envoy/api/v2:pkg_cc_proto", - "@envoy_api//envoy/api/v2/endpoint:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", "@envoy_api//envoy/service/discovery/v2:pkg_cc_proto", ], ) @@ -623,6 +669,7 @@ envoy_cc_test( coverage = False, deps = [ ":http_protocol_integration_lib", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", ], ) @@ -632,6 +679,8 @@ envoy_cc_test( deps = [ ":http_protocol_integration_lib", "//source/extensions/resource_monitors/injected_resource:config", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", + "@envoy_api//envoy/config/overload/v2alpha:pkg_cc_proto", ], ) @@ -647,6 +696,8 @@ envoy_cc_test( "//source/common/http:codec_client_lib", "//source/extensions/filters/listener/proxy_protocol:config", "//test/test_common:utility_lib", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", ], ) @@ -660,6 +711,10 @@ envoy_cc_test( "//source/common/grpc:common_lib", "//source/extensions/filters/http/ratelimit:config", "//test/common/grpc:grpc_client_integration_lib", + "@envoy_api//envoy/api/v2/listener:pkg_cc_proto", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", + "@envoy_api//envoy/config/filter/http/rate_limit/v2:pkg_cc_proto", + "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto", "@envoy_api//envoy/service/ratelimit/v2:pkg_cc_proto", ], ) @@ -670,6 +725,7 @@ envoy_cc_test( deps = [ ":http_integration_lib", "//test/common/grpc:grpc_client_integration_lib", + "@envoy_api//envoy/service/discovery/v2:pkg_cc_proto", ], ) @@ -699,6 +755,8 @@ envoy_cc_test( "//source/extensions/transport_sockets/tls:context_lib", "//test/mocks/secret:secret_mocks", "//test/test_common:utility_lib", + "@envoy_api//envoy/api/v2/auth:pkg_cc_proto", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", ], ) @@ -726,6 +784,10 @@ envoy_cc_test( "//test/mocks/runtime:runtime_mocks", "//test/mocks/secret:secret_mocks", "//test/test_common:utility_lib", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/auth:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", "@envoy_api//envoy/service/discovery/v2:pkg_cc_proto", ], ) @@ -752,7 +814,10 @@ envoy_cc_test( "//test/mocks/runtime:runtime_mocks", "//test/mocks/secret:secret_mocks", "//test/test_common:utility_lib", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", "@envoy_api//envoy/config/accesslog/v2:pkg_cc_proto", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", "@envoy_api//envoy/config/filter/network/tcp_proxy/v2:pkg_cc_proto", ], ) @@ -769,7 +834,6 @@ envoy_cc_test( "//test/server:utility_lib", "//test/test_common:registry_lib", "//test/test_common:utility_lib", - "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", ], ) @@ -796,6 +860,7 @@ envoy_cc_test( "//source/common/http:codec_client_lib", "//source/common/stats:stats_lib", "//test/test_common:environment_lib", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", ], ) @@ -828,6 +893,8 @@ envoy_cc_test( ":http_protocol_integration_lib", "//test/test_common:environment_lib", "//test/test_common:utility_lib", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", + "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto", ], ) @@ -847,6 +914,8 @@ envoy_cc_test( "//source/extensions/transport_sockets/tls:config", "//test/mocks/server:server_mocks", "//test/test_common:utility_lib", + "@envoy_api//envoy/api/v2/auth:pkg_cc_proto", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto", ], ) @@ -877,7 +946,10 @@ envoy_cc_fuzz_test( name = "h1_capture_direct_response_fuzz_test", srcs = ["h1_capture_direct_response_fuzz_test.cc"], corpus = "h1_corpus", - deps = [":h1_fuzz_lib"], + deps = [ + ":h1_fuzz_lib", + "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto", + ], ) envoy_cc_test( @@ -895,6 +967,9 @@ envoy_cc_test( "//test/common/grpc:grpc_client_integration_lib", "//test/test_common:utility_lib", "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", + "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto", ], ) diff --git a/test/integration/ads_integration.cc b/test/integration/ads_integration.cc index e3d7874cd5a0b..3442c76bc42b6 100644 --- a/test/integration/ads_integration.cc +++ b/test/integration/ads_integration.cc @@ -1,10 +1,12 @@ #include "test/integration/ads_integration.h" +#include "envoy/admin/v2alpha/config_dump.pb.h" +#include "envoy/api/v2/auth/cert.pb.h" #include "envoy/api/v2/cds.pb.h" -#include "envoy/api/v2/discovery.pb.h" #include "envoy/api/v2/eds.pb.h" #include "envoy/api/v2/lds.pb.h" #include "envoy/api/v2/rds.pb.h" +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" #include "common/config/protobuf_link_hacks.h" #include "common/config/resources.h" diff --git a/test/integration/ads_integration_test.cc b/test/integration/ads_integration_test.cc index 56e7b33be962b..e750ef111ddbf 100644 --- a/test/integration/ads_integration_test.cc +++ b/test/integration/ads_integration_test.cc @@ -1,12 +1,9 @@ -#include "envoy/admin/v2alpha/config_dump.pb.h" #include "envoy/api/v2/cds.pb.h" -#include "envoy/api/v2/discovery.pb.h" #include "envoy/api/v2/eds.pb.h" #include "envoy/api/v2/lds.pb.h" #include "envoy/api/v2/rds.pb.h" -#include "envoy/api/v2/route/route.pb.h" +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" #include "envoy/grpc/status.h" -#include "envoy/service/discovery/v2/ads.pb.h" #include "common/config/protobuf_link_hacks.h" #include "common/config/resources.h" diff --git a/test/integration/cluster_filter_integration_test.cc b/test/integration/cluster_filter_integration_test.cc index a418c3278fd85..4f63cfe2d81f5 100644 --- a/test/integration/cluster_filter_integration_test.cc +++ b/test/integration/cluster_filter_integration_test.cc @@ -1,3 +1,4 @@ +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" #include "envoy/network/filter.h" #include "envoy/registry/registry.h" diff --git a/test/integration/clusters/BUILD b/test/integration/clusters/BUILD index 0447bc03403ca..3c3236c93cac8 100644 --- a/test/integration/clusters/BUILD +++ b/test/integration/clusters/BUILD @@ -32,6 +32,9 @@ envoy_cc_test_library( "//test/common/upstream:utility_lib", "//test/test_common:registry_lib", "//test/test_common:utility_lib", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/api/v2/endpoint:pkg_cc_proto", ], ) diff --git a/test/integration/clusters/custom_static_cluster.cc b/test/integration/clusters/custom_static_cluster.cc index b94c0314fd0be..97231e7935d0b 100644 --- a/test/integration/clusters/custom_static_cluster.cc +++ b/test/integration/clusters/custom_static_cluster.cc @@ -1,5 +1,9 @@ #include "custom_static_cluster.h" +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/api/v2/core/health_check.pb.h" +#include "envoy/api/v2/endpoint/endpoint.pb.h" + namespace Envoy { // ClusterImplBase diff --git a/test/integration/clusters/custom_static_cluster.h b/test/integration/clusters/custom_static_cluster.h index 77c3aa671b1d1..38127455be345 100644 --- a/test/integration/clusters/custom_static_cluster.h +++ b/test/integration/clusters/custom_static_cluster.h @@ -5,6 +5,7 @@ #include #include "envoy/api/api.h" +#include "envoy/api/v2/cds.pb.h" #include "envoy/http/codec.h" #include "envoy/upstream/cluster_manager.h" diff --git a/test/integration/custom_cluster_integration_test.cc b/test/integration/custom_cluster_integration_test.cc index d07886601a5b7..504e18f42b885 100644 --- a/test/integration/custom_cluster_integration_test.cc +++ b/test/integration/custom_cluster_integration_test.cc @@ -1,4 +1,5 @@ -#include "envoy/api/v2/eds.pb.h" +#include "envoy/api/v2/cds.pb.h" +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" #include "common/network/address_impl.h" #include "common/upstream/load_balancer_impl.h" diff --git a/test/integration/dynamic_validation_integration_test.cc b/test/integration/dynamic_validation_integration_test.cc index 87cc5e8cf48be..6e80fcb674d37 100644 --- a/test/integration/dynamic_validation_integration_test.cc +++ b/test/integration/dynamic_validation_integration_test.cc @@ -1,5 +1,6 @@ #include +#include "envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.pb.h" #include "envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.pb.validate.h" #include "extensions/filters/network/common/factory_base.h" diff --git a/test/integration/eds_integration_test.cc b/test/integration/eds_integration_test.cc index c5f59de1b0b60..945b42a05d62c 100644 --- a/test/integration/eds_integration_test.cc +++ b/test/integration/eds_integration_test.cc @@ -1,4 +1,9 @@ +#include "envoy/api/v2/cds.pb.h" +#include "envoy/api/v2/core/health_check.pb.h" #include "envoy/api/v2/eds.pb.h" +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" +#include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.h" +#include "envoy/type/http.pb.h" #include "common/upstream/load_balancer_impl.h" diff --git a/test/integration/fake_upstream.h b/test/integration/fake_upstream.h index 0c044bcb46cfc..764f3349ab382 100644 --- a/test/integration/fake_upstream.h +++ b/test/integration/fake_upstream.h @@ -6,6 +6,7 @@ #include #include "envoy/api/api.h" +#include "envoy/api/v2/core/base.pb.h" #include "envoy/event/timer.h" #include "envoy/grpc/status.h" #include "envoy/http/codec.h" diff --git a/test/integration/filter_manager_integration_test.cc b/test/integration/filter_manager_integration_test.cc index 99f01d515ddd0..7ff2cf3e68356 100644 --- a/test/integration/filter_manager_integration_test.cc +++ b/test/integration/filter_manager_integration_test.cc @@ -2,6 +2,8 @@ #include +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" + #include "test/integration/http_integration.h" #include "test/integration/integration.h" #include "test/integration/utility.h" diff --git a/test/integration/h1_capture_direct_response_fuzz_test.cc b/test/integration/h1_capture_direct_response_fuzz_test.cc index aaff549c7eb01..42a637b270e4a 100644 --- a/test/integration/h1_capture_direct_response_fuzz_test.cc +++ b/test/integration/h1_capture_direct_response_fuzz_test.cc @@ -1,3 +1,5 @@ +#include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.h" + #include "test/integration/h1_fuzz.h" namespace Envoy { diff --git a/test/integration/hds_integration_test.cc b/test/integration/hds_integration_test.cc index c5da97f665063..4a3c01777238f 100644 --- a/test/integration/hds_integration_test.cc +++ b/test/integration/hds_integration_test.cc @@ -1,7 +1,8 @@ #include -#include "envoy/api/v2/eds.pb.h" -#include "envoy/api/v2/endpoint/endpoint.pb.h" +#include "envoy/api/v2/core/config_source.pb.h" +#include "envoy/api/v2/core/health_check.pb.h" +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" #include "envoy/service/discovery/v2/hds.pb.h" #include "envoy/upstream/upstream.h" diff --git a/test/integration/header_casing_integration_test.cc b/test/integration/header_casing_integration_test.cc index 78104d71541d8..b3b4bb5d138a3 100644 --- a/test/integration/header_casing_integration_test.cc +++ b/test/integration/header_casing_integration_test.cc @@ -1,4 +1,5 @@ #include "envoy/config/bootstrap/v2/bootstrap.pb.h" +#include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.h" #include "common/buffer/buffer_impl.h" diff --git a/test/integration/header_integration_test.cc b/test/integration/header_integration_test.cc index 13bf87cd430aa..4c1a311e9a3f4 100644 --- a/test/integration/header_integration_test.cc +++ b/test/integration/header_integration_test.cc @@ -1,4 +1,8 @@ +#include "envoy/api/v2/cds.pb.h" +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/api/v2/discovery.pb.h" #include "envoy/api/v2/eds.pb.h" +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" #include "envoy/config/filter/http/router/v2/router.pb.h" #include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.h" diff --git a/test/integration/header_prefix_integration_test.cc b/test/integration/header_prefix_integration_test.cc index 687080c0e2e43..e8c1e31d9930c 100644 --- a/test/integration/header_prefix_integration_test.cc +++ b/test/integration/header_prefix_integration_test.cc @@ -1,3 +1,5 @@ +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" + #include "test/integration/http_protocol_integration.h" #include "test/integration/server.h" diff --git a/test/integration/http2_integration_test.cc b/test/integration/http2_integration_test.cc index 51996a6bacef5..2f6a9a708f292 100644 --- a/test/integration/http2_integration_test.cc +++ b/test/integration/http2_integration_test.cc @@ -3,6 +3,9 @@ #include #include +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" +#include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.h" + #include "common/buffer/buffer_impl.h" #include "common/http/header_map_impl.h" diff --git a/test/integration/http2_integration_test.h b/test/integration/http2_integration_test.h index 2c253e5f3b16a..57389864cd0ee 100644 --- a/test/integration/http2_integration_test.h +++ b/test/integration/http2_integration_test.h @@ -1,5 +1,8 @@ #pragma once +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" +#include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.h" + #include "test/common/http/http2/http2_frame.h" #include "test/integration/http_integration.h" diff --git a/test/integration/http2_upstream_integration_test.cc b/test/integration/http2_upstream_integration_test.cc index 90523c8d7b456..1cbda9125e6c3 100644 --- a/test/integration/http2_upstream_integration_test.cc +++ b/test/integration/http2_upstream_integration_test.cc @@ -2,6 +2,9 @@ #include +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" +#include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.h" + #include "common/http/header_map_impl.h" #include "test/integration/autonomous_upstream.h" diff --git a/test/integration/http_integration.cc b/test/integration/http_integration.cc index b75c75bf3c972..4ad710919deb8 100644 --- a/test/integration/http_integration.cc +++ b/test/integration/http_integration.cc @@ -8,6 +8,7 @@ #include #include "envoy/buffer/buffer.h" +#include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.h" #include "envoy/event/dispatcher.h" #include "envoy/http/header_map.h" #include "envoy/network/address.h" diff --git a/test/integration/http_subset_lb_integration_test.cc b/test/integration/http_subset_lb_integration_test.cc index 84a2bd9568466..4d0fad6296e3b 100644 --- a/test/integration/http_subset_lb_integration_test.cc +++ b/test/integration/http_subset_lb_integration_test.cc @@ -1,3 +1,8 @@ +#include "envoy/api/v2/cds.pb.h" +#include "envoy/api/v2/route/route.pb.h" +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" +#include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.h" + #include "test/integration/http_integration.h" #include "absl/strings/str_replace.h" diff --git a/test/integration/http_timeout_integration_test.h b/test/integration/http_timeout_integration_test.h index 5c73fcbfeef41..40404c2a684d9 100644 --- a/test/integration/http_timeout_integration_test.h +++ b/test/integration/http_timeout_integration_test.h @@ -1,5 +1,8 @@ #pragma once +#include "envoy/config/filter/http/router/v2/router.pb.h" +#include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.h" + #include "test/integration/http_integration.h" #include "gtest/gtest.h" diff --git a/test/integration/idle_timeout_integration_test.cc b/test/integration/idle_timeout_integration_test.cc index ad47453cab7f8..2cbc05466b8fb 100644 --- a/test/integration/idle_timeout_integration_test.cc +++ b/test/integration/idle_timeout_integration_test.cc @@ -1,3 +1,6 @@ +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" +#include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.h" + #include "test/integration/http_protocol_integration.h" #include "test/test_common/test_time.h" diff --git a/test/integration/integration.cc b/test/integration/integration.cc index 79c2cd7ae0eac..10f309dfe3a14 100644 --- a/test/integration/integration.cc +++ b/test/integration/integration.cc @@ -8,7 +8,12 @@ #include #include +#include "envoy/admin/v2alpha/config_dump.pb.h" +#include "envoy/api/v2/auth/cert.pb.h" +#include "envoy/api/v2/discovery.pb.h" +#include "envoy/api/v2/endpoint/endpoint.pb.h" #include "envoy/buffer/buffer.h" +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" #include "envoy/http/header_map.h" #include "common/api/api_impl.h" diff --git a/test/integration/integration.h b/test/integration/integration.h index 2e088e52390e8..1120797dc607b 100644 --- a/test/integration/integration.h +++ b/test/integration/integration.h @@ -5,6 +5,8 @@ #include #include +#include "envoy/api/v2/discovery.pb.h" +#include "envoy/api/v2/endpoint/endpoint.pb.h" #include "envoy/server/process_context.h" #include "common/http/codec_client.h" diff --git a/test/integration/integration_admin_test.cc b/test/integration/integration_admin_test.cc index 91f5a837c9144..7beaec4571cde 100644 --- a/test/integration/integration_admin_test.cc +++ b/test/integration/integration_admin_test.cc @@ -3,6 +3,8 @@ #include #include "envoy/admin/v2alpha/config_dump.pb.h" +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" #include "envoy/config/metrics/v2/stats.pb.h" #include "envoy/http/header_map.h" diff --git a/test/integration/integration_admin_test.h b/test/integration/integration_admin_test.h index d4e2b1bfa53ff..ffe3f57ee722a 100644 --- a/test/integration/integration_admin_test.h +++ b/test/integration/integration_admin_test.h @@ -1,5 +1,8 @@ #pragma once +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" +#include "envoy/config/metrics/v2/stats.pb.h" + #include "common/json/json_loader.h" #include "test/integration/http_protocol_integration.h" diff --git a/test/integration/integration_test.cc b/test/integration/integration_test.cc index d9aadffa1f4a0..d66a205614ee5 100644 --- a/test/integration/integration_test.cc +++ b/test/integration/integration_test.cc @@ -2,7 +2,9 @@ #include -#include "envoy/config/accesslog/v2/file.pb.h" +#include "envoy/api/v2/route/route.pb.h" +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" +#include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.h" #include "common/http/header_map_impl.h" #include "common/http/headers.h" diff --git a/test/integration/load_stats_integration_test.cc b/test/integration/load_stats_integration_test.cc index 00235f30478b4..4921d4cd6868d 100644 --- a/test/integration/load_stats_integration_test.cc +++ b/test/integration/load_stats_integration_test.cc @@ -1,6 +1,9 @@ +#include "envoy/api/v2/cds.pb.h" +#include "envoy/api/v2/core/config_source.pb.h" #include "envoy/api/v2/eds.pb.h" #include "envoy/api/v2/endpoint/endpoint.pb.h" #include "envoy/api/v2/endpoint/load_report.pb.h" +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" #include "envoy/service/load_stats/v2/lrs.pb.h" #include "common/config/resources.h" diff --git a/test/integration/overload_integration_test.cc b/test/integration/overload_integration_test.cc index acd24267ec9c0..0dd2b424b3a9b 100644 --- a/test/integration/overload_integration_test.cc +++ b/test/integration/overload_integration_test.cc @@ -1,3 +1,6 @@ +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" +#include "envoy/config/overload/v2alpha/overload.pb.h" + #include "test/integration/http_protocol_integration.h" #include "absl/strings/str_cat.h" diff --git a/test/integration/protocol_integration_test.cc b/test/integration/protocol_integration_test.cc index 39e98f3e5ffb6..3070e62c465fc 100644 --- a/test/integration/protocol_integration_test.cc +++ b/test/integration/protocol_integration_test.cc @@ -5,7 +5,10 @@ #include #include +#include "envoy/api/v2/route/route.pb.h" #include "envoy/buffer/buffer.h" +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" +#include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.h" #include "envoy/event/dispatcher.h" #include "envoy/http/header_map.h" #include "envoy/registry/registry.h" diff --git a/test/integration/proxy_proto_integration_test.cc b/test/integration/proxy_proto_integration_test.cc index cd8b4de73ea55..e1d4cc67a0154 100644 --- a/test/integration/proxy_proto_integration_test.cc +++ b/test/integration/proxy_proto_integration_test.cc @@ -1,5 +1,8 @@ #include "test/integration/proxy_proto_integration_test.h" +#include "envoy/api/v2/cds.pb.h" +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" + #include "common/buffer/buffer_impl.h" #include "test/test_common/network_utility.h" diff --git a/test/integration/proxy_proto_integration_test.h b/test/integration/proxy_proto_integration_test.h index e936ec2648f94..4b40639162649 100644 --- a/test/integration/proxy_proto_integration_test.h +++ b/test/integration/proxy_proto_integration_test.h @@ -1,5 +1,7 @@ #pragma once +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" + #include "common/http/codec_client.h" #include "test/integration/fake_upstream.h" diff --git a/test/integration/ratelimit_integration_test.cc b/test/integration/ratelimit_integration_test.cc index a9a9cbca401a5..0065fddf207db 100644 --- a/test/integration/ratelimit_integration_test.cc +++ b/test/integration/ratelimit_integration_test.cc @@ -1,3 +1,8 @@ +#include "envoy/api/v2/listener/listener.pb.h" +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" +#include "envoy/config/filter/http/rate_limit/v2/rate_limit.pb.h" +#include "envoy/config/filter/http/rate_limit/v2/rate_limit.pb.validate.h" +#include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.h" #include "envoy/service/ratelimit/v2/rls.pb.h" #include "common/buffer/zero_copy_input_stream_impl.h" diff --git a/test/integration/redirect_integration_test.cc b/test/integration/redirect_integration_test.cc index 8ee9d2d1c2f0c..c95c81974a486 100644 --- a/test/integration/redirect_integration_test.cc +++ b/test/integration/redirect_integration_test.cc @@ -1,3 +1,6 @@ +#include "envoy/api/v2/route/route.pb.h" +#include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.h" + #include "test/integration/http_protocol_integration.h" namespace Envoy { diff --git a/test/integration/rtds_integration_test.cc b/test/integration/rtds_integration_test.cc index 6f223f1a626dc..13baeb7ad1704 100644 --- a/test/integration/rtds_integration_test.cc +++ b/test/integration/rtds_integration_test.cc @@ -1,3 +1,5 @@ +#include "envoy/service/discovery/v2/rtds.pb.h" + #include "test/common/grpc/grpc_client_integration.h" #include "test/integration/http_integration.h" diff --git a/test/integration/scoped_rds_integration_test.cc b/test/integration/scoped_rds_integration_test.cc index 3caca65ec896b..c1ac2d9c9f09a 100644 --- a/test/integration/scoped_rds_integration_test.cc +++ b/test/integration/scoped_rds_integration_test.cc @@ -1,4 +1,10 @@ +#include "envoy/api/v2/core/config_source.pb.h" +#include "envoy/api/v2/core/grpc_service.pb.h" +#include "envoy/api/v2/discovery.pb.h" +#include "envoy/api/v2/rds.pb.h" #include "envoy/api/v2/srds.pb.h" +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" +#include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.h" #include "common/config/resources.h" diff --git a/test/integration/sds_dynamic_integration_test.cc b/test/integration/sds_dynamic_integration_test.cc index 60f697af7cc02..1027dd95304f6 100644 --- a/test/integration/sds_dynamic_integration_test.cc +++ b/test/integration/sds_dynamic_integration_test.cc @@ -1,6 +1,10 @@ #include #include +#include "envoy/api/v2/auth/cert.pb.h" +#include "envoy/api/v2/core/config_source.pb.h" +#include "envoy/api/v2/discovery.pb.h" +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" #include "envoy/service/discovery/v2/sds.pb.h" #include "common/config/resources.h" diff --git a/test/integration/sds_static_integration_test.cc b/test/integration/sds_static_integration_test.cc index 5493fde73c244..534eb129ab0e0 100644 --- a/test/integration/sds_static_integration_test.cc +++ b/test/integration/sds_static_integration_test.cc @@ -1,6 +1,8 @@ #include #include +#include "envoy/api/v2/auth/cert.pb.h" +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" #include "envoy/stats/scope.h" #include "common/event/dispatcher_impl.h" diff --git a/test/integration/ssl_utility.cc b/test/integration/ssl_utility.cc index cafea42463128..9a982e74ddf32 100644 --- a/test/integration/ssl_utility.cc +++ b/test/integration/ssl_utility.cc @@ -1,5 +1,7 @@ #include "test/integration/ssl_utility.h" +#include "envoy/api/v2/auth/cert.pb.h" + #include "common/json/json_loader.h" #include "common/network/utility.h" diff --git a/test/integration/ssl_utility.h b/test/integration/ssl_utility.h index 3e9066673850f..63774f916894a 100644 --- a/test/integration/ssl_utility.h +++ b/test/integration/ssl_utility.h @@ -1,6 +1,7 @@ #pragma once #include "envoy/api/api.h" +#include "envoy/api/v2/auth/cert.pb.h" #include "envoy/network/address.h" #include "envoy/network/transport_socket.h" #include "envoy/secret/secret_manager.h" diff --git a/test/integration/stats_integration_test.cc b/test/integration/stats_integration_test.cc index 52af564948edb..131067c897f7f 100644 --- a/test/integration/stats_integration_test.cc +++ b/test/integration/stats_integration_test.cc @@ -1,7 +1,7 @@ #include +#include "envoy/api/v2/core/address.pb.h" #include "envoy/config/bootstrap/v2/bootstrap.pb.h" -#include "envoy/config/metrics/v2/stats.pb.h" #include "envoy/stats/scope.h" #include "envoy/stats/stats.h" diff --git a/test/integration/tcp_conn_pool_integration_test.cc b/test/integration/tcp_conn_pool_integration_test.cc index 41410b123433b..e481799f38143 100644 --- a/test/integration/tcp_conn_pool_integration_test.cc +++ b/test/integration/tcp_conn_pool_integration_test.cc @@ -1,6 +1,5 @@ #include -#include "envoy/config/bootstrap/v2/bootstrap.pb.h" #include "envoy/server/filter_config.h" #include "test/integration/integration.h" diff --git a/test/integration/tcp_proxy_integration_test.cc b/test/integration/tcp_proxy_integration_test.cc index 5c19347a39d75..068530969862a 100644 --- a/test/integration/tcp_proxy_integration_test.cc +++ b/test/integration/tcp_proxy_integration_test.cc @@ -2,8 +2,11 @@ #include +#include "envoy/api/v2/cds.pb.h" +#include "envoy/api/v2/core/base.pb.h" #include "envoy/config/accesslog/v2/file.pb.h" -#include "envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.pb.validate.h" +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" +#include "envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.pb.h" #include "common/network/utility.h" diff --git a/test/integration/transport_socket_match_integration_test.cc b/test/integration/transport_socket_match_integration_test.cc index 43448ea3ed7ac..bfe5f0cce4ee2 100644 --- a/test/integration/transport_socket_match_integration_test.cc +++ b/test/integration/transport_socket_match_integration_test.cc @@ -1,3 +1,8 @@ +#include "envoy/api/v2/auth/cert.pb.h" +#include "envoy/api/v2/route/route.pb.h" +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" +#include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.h" + #include "extensions/transport_sockets/tls/context_config_impl.h" #include "extensions/transport_sockets/tls/context_impl.h" #include "extensions/transport_sockets/tls/ssl_socket.h" diff --git a/test/integration/uds_integration_test.cc b/test/integration/uds_integration_test.cc index f1633a693b9f5..12415e3863b72 100644 --- a/test/integration/uds_integration_test.cc +++ b/test/integration/uds_integration_test.cc @@ -1,5 +1,7 @@ #include "uds_integration_test.h" +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" + #include "common/event/dispatcher_impl.h" #include "common/network/utility.h" diff --git a/test/integration/uds_integration_test.h b/test/integration/uds_integration_test.h index d83d88d802427..77ef548b4a8a2 100644 --- a/test/integration/uds_integration_test.h +++ b/test/integration/uds_integration_test.h @@ -2,6 +2,8 @@ #include +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" + #include "common/common/fmt.h" #include "common/http/codec_client.h" diff --git a/test/integration/vhds_integration_test.cc b/test/integration/vhds_integration_test.cc index 1e54a38c20a4b..767fc592151e9 100644 --- a/test/integration/vhds_integration_test.cc +++ b/test/integration/vhds_integration_test.cc @@ -1,5 +1,5 @@ -#include "envoy/api/v2/discovery.pb.h" #include "envoy/api/v2/rds.pb.h" +#include "envoy/api/v2/route/route.pb.h" #include "envoy/grpc/status.h" #include "envoy/stats/scope.h" diff --git a/test/integration/websocket_integration_test.cc b/test/integration/websocket_integration_test.cc index 618e874071e31..8fd4985f47242 100644 --- a/test/integration/websocket_integration_test.cc +++ b/test/integration/websocket_integration_test.cc @@ -2,7 +2,8 @@ #include -#include "envoy/config/accesslog/v2/file.pb.h" +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" +#include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.h" #include "common/http/header_map_impl.h" #include "common/protobuf/utility.h" diff --git a/test/integration/xds_integration_test.cc b/test/integration/xds_integration_test.cc index 3b975c08afef8..5cc4791c1b6ff 100644 --- a/test/integration/xds_integration_test.cc +++ b/test/integration/xds_integration_test.cc @@ -1,3 +1,6 @@ +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" +#include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.h" + #include "test/integration/http_integration.h" #include "test/integration/http_protocol_integration.h" #include "test/test_common/environment.h" diff --git a/test/integration/xfcc_integration_test.cc b/test/integration/xfcc_integration_test.cc index 56f4545c6f563..9c7f2b85f1edd 100644 --- a/test/integration/xfcc_integration_test.cc +++ b/test/integration/xfcc_integration_test.cc @@ -4,6 +4,8 @@ #include #include +#include "envoy/api/v2/auth/cert.pb.h" +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" #include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.h" #include "envoy/stats/scope.h" diff --git a/test/integration/xfcc_integration_test.h b/test/integration/xfcc_integration_test.h index 5e1ad2082890d..e45fd6e03f9c0 100644 --- a/test/integration/xfcc_integration_test.h +++ b/test/integration/xfcc_integration_test.h @@ -3,6 +3,8 @@ #include #include +#include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.h" + #include "test/config/integration/certs/clientcert_hash.h" #include "test/integration/http_integration.h" #include "test/integration/server.h" diff --git a/test/mocks/config/BUILD b/test/mocks/config/BUILD index c9bc1a0a8d467..4523b97d98fec 100644 --- a/test/mocks/config/BUILD +++ b/test/mocks/config/BUILD @@ -21,5 +21,6 @@ envoy_cc_mock( "//source/common/protobuf:utility_lib", "//test/test_common:utility_lib", "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) diff --git a/test/mocks/config/mocks.cc b/test/mocks/config/mocks.cc index 4a3e3099e0c15..ae5053448e8ee 100644 --- a/test/mocks/config/mocks.cc +++ b/test/mocks/config/mocks.cc @@ -1,8 +1,6 @@ #include "test/mocks/config/mocks.h" -#include "envoy/api/v2/cds.pb.h" -#include "envoy/api/v2/lds.pb.h" -#include "envoy/api/v2/rds.pb.h" +#include "envoy/api/v2/core/config_source.pb.h" #include "test/test_common/utility.h" diff --git a/test/mocks/config/mocks.h b/test/mocks/config/mocks.h index 7fdf475521970..b54bb76d50b5a 100644 --- a/test/mocks/config/mocks.h +++ b/test/mocks/config/mocks.h @@ -1,5 +1,7 @@ #pragma once +#include "envoy/api/v2/core/config_source.pb.h" +#include "envoy/api/v2/discovery.pb.h" #include "envoy/api/v2/eds.pb.h" #include "envoy/config/config_provider_manager.h" #include "envoy/config/grpc_mux.h" diff --git a/test/mocks/grpc/BUILD b/test/mocks/grpc/BUILD index 4b7c4d65649e5..445bf1b5e97b6 100644 --- a/test/mocks/grpc/BUILD +++ b/test/mocks/grpc/BUILD @@ -17,5 +17,6 @@ envoy_cc_mock( "//include/envoy/grpc:async_client_manager_interface", "//source/common/grpc:typed_async_client_lib", "//test/test_common:utility_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) diff --git a/test/mocks/grpc/mocks.h b/test/mocks/grpc/mocks.h index e94e7785abb70..586dad9075230 100644 --- a/test/mocks/grpc/mocks.h +++ b/test/mocks/grpc/mocks.h @@ -3,6 +3,7 @@ #include #include +#include "envoy/api/v2/core/grpc_service.pb.h" #include "envoy/grpc/async_client.h" #include "envoy/grpc/async_client_manager.h" #include "envoy/stats/scope.h" diff --git a/test/mocks/local_info/BUILD b/test/mocks/local_info/BUILD index 497e56d044725..c302fc968595e 100644 --- a/test/mocks/local_info/BUILD +++ b/test/mocks/local_info/BUILD @@ -15,5 +15,6 @@ envoy_cc_mock( deps = [ "//include/envoy/local_info:local_info_interface", "//source/common/network:address_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) diff --git a/test/mocks/local_info/mocks.h b/test/mocks/local_info/mocks.h index 655eaaf590308..42c3d5f421fd5 100644 --- a/test/mocks/local_info/mocks.h +++ b/test/mocks/local_info/mocks.h @@ -2,6 +2,7 @@ #include +#include "envoy/api/v2/core/base.pb.h" #include "envoy/local_info/local_info.h" #include "gmock/gmock.h" diff --git a/test/mocks/network/mocks.h b/test/mocks/network/mocks.h index bc545d330634e..bc7b2f76ca1d5 100644 --- a/test/mocks/network/mocks.h +++ b/test/mocks/network/mocks.h @@ -6,6 +6,7 @@ #include #include "envoy/api/v2/core/address.pb.h" +#include "envoy/api/v2/core/base.pb.h" #include "envoy/network/connection.h" #include "envoy/network/drain_decision.h" #include "envoy/network/filter.h" diff --git a/test/mocks/network/transport_socket.cc b/test/mocks/network/transport_socket.cc index 876402559c1cf..5fb7a916ad04a 100644 --- a/test/mocks/network/transport_socket.cc +++ b/test/mocks/network/transport_socket.cc @@ -23,4 +23,4 @@ MockTransportSocketFactory::MockTransportSocketFactory() = default; MockTransportSocketFactory::~MockTransportSocketFactory() = default; } // namespace Network -} // namespace Envoy \ No newline at end of file +} // namespace Envoy diff --git a/test/mocks/network/transport_socket.h b/test/mocks/network/transport_socket.h index 6330d50753704..1f2c5f99fb7d5 100644 --- a/test/mocks/network/transport_socket.h +++ b/test/mocks/network/transport_socket.h @@ -40,4 +40,4 @@ class MockTransportSocketFactory : public TransportSocketFactory { }; } // namespace Network -} // namespace Envoy \ No newline at end of file +} // namespace Envoy diff --git a/test/mocks/router/BUILD b/test/mocks/router/BUILD index d5d8729cccad2..63441978475a0 100644 --- a/test/mocks/router/BUILD +++ b/test/mocks/router/BUILD @@ -28,5 +28,9 @@ envoy_cc_mock( "//source/common/stats:fake_symbol_table_lib", "//test/mocks:common_lib", "//test/mocks/stats:stats_mocks", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto", + "@envoy_api//envoy/type:pkg_cc_proto", ], ) diff --git a/test/mocks/router/mocks.h b/test/mocks/router/mocks.h index 6e9f703dfec7e..ff76315e26464 100644 --- a/test/mocks/router/mocks.h +++ b/test/mocks/router/mocks.h @@ -8,8 +8,11 @@ #include #include +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/api/v2/rds.pb.h" #include "envoy/common/time.h" #include "envoy/config/config_provider.h" +#include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.h" #include "envoy/config/typed_metadata.h" #include "envoy/event/dispatcher.h" #include "envoy/http/hash_policy.h" @@ -22,6 +25,7 @@ #include "envoy/router/shadow_writer.h" #include "envoy/runtime/runtime.h" #include "envoy/thread_local/thread_local.h" +#include "envoy/type/percent.pb.h" #include "envoy/upstream/cluster_manager.h" #include "common/stats/fake_symbol_table_impl.h" diff --git a/test/mocks/runtime/BUILD b/test/mocks/runtime/BUILD index 7aed549bc3871..4b9c19ff6cbed 100644 --- a/test/mocks/runtime/BUILD +++ b/test/mocks/runtime/BUILD @@ -17,5 +17,6 @@ envoy_cc_mock( "//include/envoy/runtime:runtime_interface", "//include/envoy/upstream:cluster_manager_interface", "//test/mocks:common_lib", + "@envoy_api//envoy/type:pkg_cc_proto", ], ) diff --git a/test/mocks/runtime/mocks.h b/test/mocks/runtime/mocks.h index 19416df012575..74899865f4878 100644 --- a/test/mocks/runtime/mocks.h +++ b/test/mocks/runtime/mocks.h @@ -5,6 +5,7 @@ #include #include "envoy/runtime/runtime.h" +#include "envoy/type/percent.pb.h" #include "envoy/upstream/cluster_manager.h" #include "gmock/gmock.h" diff --git a/test/mocks/secret/BUILD b/test/mocks/secret/BUILD index 43fc682bb7da0..4a452f26e27e8 100644 --- a/test/mocks/secret/BUILD +++ b/test/mocks/secret/BUILD @@ -18,5 +18,7 @@ envoy_cc_mock( "//include/envoy/server:transport_socket_config_interface", "//include/envoy/ssl:tls_certificate_config_interface", "//source/common/secret:secret_provider_impl_lib", + "@envoy_api//envoy/api/v2/auth:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) diff --git a/test/mocks/secret/mocks.cc b/test/mocks/secret/mocks.cc index 30fd6ae5d6229..300cd19811f4f 100644 --- a/test/mocks/secret/mocks.cc +++ b/test/mocks/secret/mocks.cc @@ -1,5 +1,7 @@ #include "test/mocks/secret/mocks.h" +#include "envoy/api/v2/auth/cert.pb.h" + #include "common/secret/secret_provider_impl.h" using testing::_; diff --git a/test/mocks/secret/mocks.h b/test/mocks/secret/mocks.h index 93ba29fa5edc1..955bd1fac76fe 100644 --- a/test/mocks/secret/mocks.h +++ b/test/mocks/secret/mocks.h @@ -1,5 +1,7 @@ #pragma once +#include "envoy/api/v2/auth/cert.pb.h" +#include "envoy/api/v2/core/config_source.pb.h" #include "envoy/secret/secret_callbacks.h" #include "envoy/secret/secret_manager.h" #include "envoy/server/transport_socket_config.h" diff --git a/test/mocks/server/BUILD b/test/mocks/server/BUILD index f58bf23389ac4..6025697ac585c 100644 --- a/test/mocks/server/BUILD +++ b/test/mocks/server/BUILD @@ -46,6 +46,10 @@ envoy_cc_mock( "//test/mocks/tracing:tracing_mocks", "//test/mocks/upstream:upstream_mocks", "//test/test_common:test_time_lib", + "@envoy_api//envoy/admin/v2alpha:pkg_cc_proto", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/api/v2/listener:pkg_cc_proto", "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", ], ) diff --git a/test/mocks/server/mocks.cc b/test/mocks/server/mocks.cc index 16ea2134de648..d0dcc64caa79c 100644 --- a/test/mocks/server/mocks.cc +++ b/test/mocks/server/mocks.cc @@ -2,6 +2,9 @@ #include +#include "envoy/admin/v2alpha/server_info.pb.h" +#include "envoy/api/v2/core/base.pb.h" + #include "common/singleton/manager_impl.h" #include "gmock/gmock.h" diff --git a/test/mocks/server/mocks.h b/test/mocks/server/mocks.h index 097e2382e17af..8637115211737 100644 --- a/test/mocks/server/mocks.h +++ b/test/mocks/server/mocks.h @@ -5,6 +5,10 @@ #include #include +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/api/v2/core/config_source.pb.h" +#include "envoy/api/v2/lds.pb.h" +#include "envoy/api/v2/listener/listener.pb.h" #include "envoy/common/mutex_tracer.h" #include "envoy/config/bootstrap/v2/bootstrap.pb.h" #include "envoy/protobuf/message_validator.h" diff --git a/test/mocks/ssl/BUILD b/test/mocks/ssl/BUILD index 28397ff0ed8bf..a185eb5c3ed0e 100644 --- a/test/mocks/ssl/BUILD +++ b/test/mocks/ssl/BUILD @@ -20,5 +20,6 @@ envoy_cc_mock( "//include/envoy/ssl:context_manager_interface", "//include/envoy/stats:stats_interface", "//test/mocks/secret:secret_mocks", + "@envoy_api//envoy/api/v2/auth:pkg_cc_proto", ], ) diff --git a/test/mocks/ssl/mocks.h b/test/mocks/ssl/mocks.h index 44e78de204018..af666a3d6ca5b 100644 --- a/test/mocks/ssl/mocks.h +++ b/test/mocks/ssl/mocks.h @@ -3,6 +3,7 @@ #include #include +#include "envoy/api/v2/auth/cert.pb.h" #include "envoy/ssl/certificate_validation_context_config.h" #include "envoy/ssl/connection.h" #include "envoy/ssl/context.h" diff --git a/test/mocks/stream_info/BUILD b/test/mocks/stream_info/BUILD index cacb79ac8006f..ec5c382b09f09 100644 --- a/test/mocks/stream_info/BUILD +++ b/test/mocks/stream_info/BUILD @@ -16,5 +16,6 @@ envoy_cc_mock( "//include/envoy/stream_info:stream_info_interface", "//include/envoy/upstream:upstream_interface", "//test/mocks/upstream:host_mocks", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) diff --git a/test/mocks/stream_info/mocks.h b/test/mocks/stream_info/mocks.h index 171134be370c1..1c4ab45f9ae22 100644 --- a/test/mocks/stream_info/mocks.h +++ b/test/mocks/stream_info/mocks.h @@ -1,5 +1,6 @@ #pragma once +#include "envoy/api/v2/core/base.pb.h" #include "envoy/stream_info/stream_info.h" #include "common/stream_info/filter_state_impl.h" diff --git a/test/mocks/upstream/BUILD b/test/mocks/upstream/BUILD index d3a71a35d5e9b..08a250c0672cf 100644 --- a/test/mocks/upstream/BUILD +++ b/test/mocks/upstream/BUILD @@ -22,6 +22,8 @@ envoy_cc_mock( "//source/common/upstream:upstream_lib", "//test/mocks/runtime:runtime_mocks", "//test/mocks/stats:stats_mocks", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -35,7 +37,8 @@ envoy_cc_mock( "//source/common/network:utility_lib", "//source/common/stats:stats_lib", "//test/mocks/network:transport_socket_mocks", - "@envoy_api//envoy/api/v2/cluster:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/data/cluster/v2alpha:pkg_cc_proto", ], ) @@ -47,6 +50,7 @@ envoy_cc_mock( "//include/envoy/upstream:upstream_interface", "//source/common/network:raw_buffer_socket_lib", "//source/common/stats:isolated_store_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -82,5 +86,9 @@ envoy_cc_mock( "//test/mocks/secret:secret_mocks", "//test/mocks/stats:stats_mocks", "//test/mocks/tcp:tcp_mocks", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", + "@envoy_api//envoy/data/core/v2alpha:pkg_cc_proto", ], ) diff --git a/test/mocks/upstream/cluster_info.cc b/test/mocks/upstream/cluster_info.cc index fef636ef11dad..a230c0a0a2c73 100644 --- a/test/mocks/upstream/cluster_info.cc +++ b/test/mocks/upstream/cluster_info.cc @@ -2,6 +2,7 @@ #include +#include "envoy/api/v2/cds.pb.h" #include "envoy/upstream/host_description.h" #include "envoy/upstream/upstream.h" diff --git a/test/mocks/upstream/cluster_info.h b/test/mocks/upstream/cluster_info.h index 34ccccf1e5b25..d4937156f0747 100644 --- a/test/mocks/upstream/cluster_info.h +++ b/test/mocks/upstream/cluster_info.h @@ -5,6 +5,8 @@ #include #include +#include "envoy/api/v2/cds.pb.h" +#include "envoy/api/v2/core/base.pb.h" #include "envoy/config/typed_metadata.h" #include "envoy/stats/scope.h" #include "envoy/upstream/cluster_manager.h" diff --git a/test/mocks/upstream/host.h b/test/mocks/upstream/host.h index 0470f89181c75..0c555a605d4e3 100644 --- a/test/mocks/upstream/host.h +++ b/test/mocks/upstream/host.h @@ -5,7 +5,8 @@ #include #include -#include "envoy/api/v2/cluster/outlier_detection.pb.h" +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/data/cluster/v2alpha/outlier_detection_event.pb.h" #include "envoy/upstream/upstream.h" #include "common/stats/fake_symbol_table_impl.h" diff --git a/test/mocks/upstream/mocks.h b/test/mocks/upstream/mocks.h index 1e4f9fd6360ef..d653f754b34fd 100644 --- a/test/mocks/upstream/mocks.h +++ b/test/mocks/upstream/mocks.h @@ -6,6 +6,11 @@ #include #include +#include "envoy/api/v2/cds.pb.h" +#include "envoy/api/v2/core/address.pb.h" +#include "envoy/api/v2/core/config_source.pb.h" +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" +#include "envoy/data/core/v2alpha/health_check_event.pb.h" #include "envoy/http/async_client.h" #include "envoy/upstream/cluster_manager.h" #include "envoy/upstream/health_checker.h" diff --git a/test/mocks/upstream/transport_socket_match.cc b/test/mocks/upstream/transport_socket_match.cc index 99328ceaeee47..27a77289b64b5 100644 --- a/test/mocks/upstream/transport_socket_match.cc +++ b/test/mocks/upstream/transport_socket_match.cc @@ -20,4 +20,4 @@ MockTransportSocketMatcher::MockTransportSocketMatcher(Network::TransportSocketF MockTransportSocketMatcher::~MockTransportSocketMatcher() = default; } // namespace Upstream -} // namespace Envoy \ No newline at end of file +} // namespace Envoy diff --git a/test/mocks/upstream/transport_socket_match.h b/test/mocks/upstream/transport_socket_match.h index c46745df585ab..80acd532fa8d0 100644 --- a/test/mocks/upstream/transport_socket_match.h +++ b/test/mocks/upstream/transport_socket_match.h @@ -2,6 +2,7 @@ #include +#include "envoy/api/v2/core/base.pb.h" #include "envoy/upstream/upstream.h" #include "common/stats/isolated_store_impl.h" @@ -26,4 +27,4 @@ class MockTransportSocketMatcher : public TransportSocketMatcher { }; } // namespace Upstream -} // namespace Envoy \ No newline at end of file +} // namespace Envoy diff --git a/test/server/BUILD b/test/server/BUILD index 9aeabecac6c73..c31c5584784ab 100644 --- a/test/server/BUILD +++ b/test/server/BUILD @@ -46,6 +46,9 @@ envoy_cc_test( "//test/mocks/server:server_mocks", "//test/test_common:environment_lib", "//test/test_common:utility_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", + "@envoy_api//envoy/config/metrics/v2:pkg_cc_proto", ], ) @@ -63,6 +66,8 @@ envoy_cc_test( "//test/mocks/server:server_mocks", "//test/test_common:network_utility_lib", "//test/test_common:threadsafe_singleton_injector_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/api/v2/listener:pkg_cc_proto", ], ) @@ -129,6 +134,7 @@ envoy_cc_test( "//test/test_common:logging_lib", "//test/test_common:threadsafe_singleton_injector_lib", "//test/test_common:utility_lib", + "@envoy_api//envoy/admin/v2alpha:pkg_cc_proto", "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", ], ) @@ -146,6 +152,7 @@ envoy_cc_test( "//test/mocks/thread_local:thread_local_mocks", "//test/test_common:registry_lib", "//test/test_common:utility_lib", + "@envoy_api//envoy/config/overload/v2alpha:pkg_cc_proto", ], ) @@ -164,6 +171,7 @@ envoy_cc_test( "//test/test_common:environment_lib", "//test/test_common:utility_lib", "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -180,6 +188,9 @@ envoy_cc_test_library( "//test/test_common:test_time_lib", "//test/test_common:threadsafe_singleton_injector_lib", "@envoy_api//envoy/admin/v2alpha:pkg_cc_proto", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/api/v2/listener:pkg_cc_proto", ], ) @@ -206,6 +217,9 @@ envoy_cc_test( "//source/server:active_raw_udp_listener_config", "//test/test_common:network_utility_lib", "//test/test_common:registry_lib", + "@envoy_api//envoy/admin/v2alpha:pkg_cc_proto", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -221,6 +235,8 @@ envoy_cc_test( "//source/extensions/quic_listeners/quiche:quic_transport_socket_factory_lib", "//source/extensions/transport_sockets/raw_buffer:config", "//test/test_common:threadsafe_singleton_injector_lib", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -252,7 +268,7 @@ envoy_cc_test( "//test/test_common:simulated_time_system_lib", "//test/test_common:test_time_lib", "//test/test_common:threadsafe_singleton_injector_lib", - "@envoy_api//envoy/admin/v2alpha:pkg_cc_proto", + "@envoy_api//envoy/api/v2/listener:pkg_cc_proto", ], ) @@ -327,6 +343,7 @@ envoy_cc_test( "//test/test_common:simulated_time_system_lib", "//test/test_common:test_time_lib", "//test/test_common:utility_lib", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -374,6 +391,8 @@ envoy_cc_test_binary( "googletest", ], deps = [ + "@envoy_api//envoy/api/v2/listener:pkg_cc_proto", + "@envoy_api//envoy/api/v2:pkg_cc_proto", "//source/server:filter_chain_manager_lib", "//test/test_common:environment_lib", "//test/mocks/network:network_mocks", diff --git a/test/server/config_validation/BUILD b/test/server/config_validation/BUILD index 1691c1e628357..734f2635936b9 100644 --- a/test/server/config_validation/BUILD +++ b/test/server/config_validation/BUILD @@ -46,6 +46,7 @@ envoy_cc_test( "//test/mocks/upstream:upstream_mocks", "//test/test_common:simulated_time_system_lib", "//test/test_common:utility_lib", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", ], ) diff --git a/test/server/config_validation/cluster_manager_test.cc b/test/server/config_validation/cluster_manager_test.cc index e7829296d5f79..b9159181c3b92 100644 --- a/test/server/config_validation/cluster_manager_test.cc +++ b/test/server/config_validation/cluster_manager_test.cc @@ -1,3 +1,4 @@ +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" #include "envoy/upstream/resource_manager.h" #include "envoy/upstream/upstream.h" diff --git a/test/server/config_validation/config_fuzz_test.cc b/test/server/config_validation/config_fuzz_test.cc index 363ea63e825c7..7112a6838b012 100644 --- a/test/server/config_validation/config_fuzz_test.cc +++ b/test/server/config_validation/config_fuzz_test.cc @@ -1,5 +1,7 @@ #include +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" + #include "common/common/thread.h" #include "common/network/address_impl.h" diff --git a/test/server/configuration_impl_test.cc b/test/server/configuration_impl_test.cc index 823290aa4fa28..e591c4197f5ea 100644 --- a/test/server/configuration_impl_test.cc +++ b/test/server/configuration_impl_test.cc @@ -2,6 +2,10 @@ #include #include +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" +#include "envoy/config/metrics/v2/stats.pb.h" + #include "common/api/api_impl.h" #include "common/config/well_known_names.h" #include "common/json/json_loader.h" diff --git a/test/server/connection_handler_test.cc b/test/server/connection_handler_test.cc index 38f077650228f..f8cc85fafeb72 100644 --- a/test/server/connection_handler_test.cc +++ b/test/server/connection_handler_test.cc @@ -1,3 +1,5 @@ +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/api/v2/listener/udp_listener_config.pb.h" #include "envoy/server/active_udp_listener_config.h" #include "envoy/stats/scope.h" diff --git a/test/server/filter_chain_benchmark_test.cc b/test/server/filter_chain_benchmark_test.cc index 17d58c3dff09d..e3a983c303742 100644 --- a/test/server/filter_chain_benchmark_test.cc +++ b/test/server/filter_chain_benchmark_test.cc @@ -1,6 +1,8 @@ #include #include +#include "envoy/api/v2/lds.pb.h" +#include "envoy/api/v2/listener/listener.pb.h" #include "envoy/network/connection.h" #include "envoy/network/listen_socket.h" #include "envoy/protobuf/message_validator.h" diff --git a/test/server/filter_chain_manager_impl_test.cc b/test/server/filter_chain_manager_impl_test.cc index 35252085458ca..5c4a3d64e1825 100644 --- a/test/server/filter_chain_manager_impl_test.cc +++ b/test/server/filter_chain_manager_impl_test.cc @@ -4,7 +4,7 @@ #include #include -#include "envoy/admin/v2alpha/config_dump.pb.h" +#include "envoy/api/v2/listener/listener.pb.h" #include "envoy/registry/registry.h" #include "envoy/server/filter_config.h" @@ -141,4 +141,4 @@ TEST_F(FilterChainManagerImplTest, AddSingleFilterChain) { EXPECT_NE(filter_chain, nullptr); } } // namespace Server -} // namespace Envoy \ No newline at end of file +} // namespace Envoy diff --git a/test/server/http/BUILD b/test/server/http/BUILD index c6789966d89ee..05c95287443d4 100644 --- a/test/server/http/BUILD +++ b/test/server/http/BUILD @@ -30,6 +30,9 @@ envoy_cc_test( "//test/test_common:network_utility_lib", "//test/test_common:utility_lib", "@envoy_api//envoy/admin/v2alpha:pkg_cc_proto", + "@envoy_api//envoy/api/v2/auth:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto", ], ) diff --git a/test/server/http/admin_test.cc b/test/server/http/admin_test.cc index 9fab43a8ff354..64e42105337a7 100644 --- a/test/server/http/admin_test.cc +++ b/test/server/http/admin_test.cc @@ -3,8 +3,12 @@ #include #include +#include "envoy/admin/v2alpha/clusters.pb.h" #include "envoy/admin/v2alpha/memory.pb.h" #include "envoy/admin/v2alpha/server_info.pb.h" +#include "envoy/api/v2/auth/cert.pb.h" +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.h" #include "envoy/json/json_object.h" #include "envoy/runtime/runtime.h" #include "envoy/stats/stats.h" diff --git a/test/server/lds_api_test.cc b/test/server/lds_api_test.cc index 64c56405d5582..6e00169473121 100644 --- a/test/server/lds_api_test.cc +++ b/test/server/lds_api_test.cc @@ -1,5 +1,7 @@ #include +#include "envoy/api/v2/core/config_source.pb.h" +#include "envoy/api/v2/discovery.pb.h" #include "envoy/api/v2/lds.pb.h" #include "common/protobuf/utility.h" diff --git a/test/server/listener_manager_impl_quic_only_test.cc b/test/server/listener_manager_impl_quic_only_test.cc index 0946bb5eeb822..3957365ff2a16 100644 --- a/test/server/listener_manager_impl_quic_only_test.cc +++ b/test/server/listener_manager_impl_quic_only_test.cc @@ -1,3 +1,6 @@ +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/api/v2/lds.pb.h" + #include "extensions/quic_listeners/quiche/quic_transport_socket_factory.h" #include "test/server/listener_manager_impl_test.h" diff --git a/test/server/listener_manager_impl_test.cc b/test/server/listener_manager_impl_test.cc index 977a757d8f807..86f9adbeb7077 100644 --- a/test/server/listener_manager_impl_test.cc +++ b/test/server/listener_manager_impl_test.cc @@ -6,6 +6,11 @@ #include #include +#include "envoy/admin/v2alpha/config_dump.pb.h" +#include "envoy/api/v2/core/address.pb.h" +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/api/v2/core/config_source.pb.h" +#include "envoy/api/v2/lds.pb.h" #include "envoy/registry/registry.h" #include "envoy/server/filter_config.h" #include "envoy/server/listener_manager.h" diff --git a/test/server/listener_manager_impl_test.h b/test/server/listener_manager_impl_test.h index 2acc73e114405..6eda87072f2d3 100644 --- a/test/server/listener_manager_impl_test.h +++ b/test/server/listener_manager_impl_test.h @@ -1,4 +1,7 @@ #include "envoy/admin/v2alpha/config_dump.pb.h" +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/api/v2/lds.pb.h" +#include "envoy/api/v2/listener/listener.pb.h" #include "common/network/listen_socket_impl.h" #include "common/network/socket_option_impl.h" diff --git a/test/server/options_impl_test.cc b/test/server/options_impl_test.cc index 1f2dc3c87cce5..7a4aba0bcb9ec 100644 --- a/test/server/options_impl_test.cc +++ b/test/server/options_impl_test.cc @@ -5,6 +5,7 @@ #include #include +#include "envoy/admin/v2alpha/server_info.pb.h" #include "envoy/common/exception.h" #include "envoy/config/bootstrap/v2/bootstrap.pb.h" diff --git a/test/server/overload_manager_impl_test.cc b/test/server/overload_manager_impl_test.cc index 7ee741245d5d6..15ca5f17d8c57 100644 --- a/test/server/overload_manager_impl_test.cc +++ b/test/server/overload_manager_impl_test.cc @@ -1,3 +1,4 @@ +#include "envoy/config/overload/v2alpha/overload.pb.h" #include "envoy/server/resource_monitor.h" #include "envoy/server/resource_monitor_config.h" diff --git a/test/server/server_fuzz_test.cc b/test/server/server_fuzz_test.cc index df47293d7cea1..634426ab5770f 100644 --- a/test/server/server_fuzz_test.cc +++ b/test/server/server_fuzz_test.cc @@ -1,6 +1,7 @@ #include -#include "envoy/config/bootstrap/v2/bootstrap.pb.validate.h" +#include "envoy/api/v2/core/address.pb.h" +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" #include "common/network/address_impl.h" #include "common/thread_local/thread_local_impl.h" diff --git a/test/server/server_test.cc b/test/server/server_test.cc index 1cbc58c63feae..8c919a6d02565 100644 --- a/test/server/server_test.cc +++ b/test/server/server_test.cc @@ -1,5 +1,7 @@ #include +#include "envoy/api/v2/core/base.pb.h" + #include "common/common/assert.h" #include "common/common/version.h" #include "common/network/address_impl.h" diff --git a/test/test_common/BUILD b/test/test_common/BUILD index 8311779346607..ce42a79dd7dc4 100644 --- a/test/test_common/BUILD +++ b/test/test_common/BUILD @@ -117,8 +117,9 @@ envoy_cc_test_library( "//test/mocks/stats:stats_mocks", "@envoy_api//envoy/api/v2:pkg_cc_proto", "@envoy_api//envoy/api/v2/route:pkg_cc_proto", - "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", "@envoy_api//envoy/service/discovery/v2:pkg_cc_proto", + "@envoy_api//envoy/type:pkg_cc_proto", + "@envoy_api//envoy/type/matcher:pkg_cc_proto", ], ) @@ -134,6 +135,7 @@ envoy_cc_test_library( "//test/mocks/protobuf:protobuf_mocks", "//test/mocks/runtime:runtime_mocks", "//test/mocks/thread_local:thread_local_mocks", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", ], ) diff --git a/test/test_common/test_runtime.h b/test/test_common/test_runtime.h index ca796ca23f65d..3b8f87129d45c 100644 --- a/test/test_common/test_runtime.h +++ b/test/test_common/test_runtime.h @@ -11,6 +11,8 @@ #pragma once +#include "envoy/config/bootstrap/v2/bootstrap.pb.h" + #include "common/runtime/runtime_impl.h" #include "common/stats/isolated_store_impl.h" diff --git a/test/test_common/utility.cc b/test/test_common/utility.cc index 7a2ef2af6f08a..15969e64411c5 100644 --- a/test/test_common/utility.cc +++ b/test/test_common/utility.cc @@ -11,6 +11,7 @@ #include #include "envoy/api/v2/cds.pb.h" +#include "envoy/api/v2/eds.pb.h" #include "envoy/api/v2/lds.pb.h" #include "envoy/api/v2/rds.pb.h" #include "envoy/api/v2/route/route.pb.h" diff --git a/test/test_common/utility.h b/test/test_common/utility.h index ec1f0c32245e4..a6963c49ad61d 100644 --- a/test/test_common/utility.h +++ b/test/test_common/utility.h @@ -8,11 +8,12 @@ #include "envoy/api/api.h" #include "envoy/buffer/buffer.h" -#include "envoy/config/bootstrap/v2/bootstrap.pb.h" #include "envoy/network/address.h" #include "envoy/stats/stats.h" #include "envoy/stats/store.h" #include "envoy/thread/thread.h" +#include "envoy/type/matcher/string.pb.h" +#include "envoy/type/percent.pb.h" #include "common/buffer/buffer_impl.h" #include "common/common/c_smart_ptr.h" diff --git a/test/tools/router_check/BUILD b/test/tools/router_check/BUILD index eacd06156d62f..a37239b02fd97 100644 --- a/test/tools/router_check/BUILD +++ b/test/tools/router_check/BUILD @@ -38,7 +38,9 @@ envoy_cc_test_library( "//test/test_common:printers_lib", "//test/test_common:utility_lib", "//test/tools/router_check/json:tool_config_schemas_lib", + "@envoy_api//envoy/api/v2:pkg_cc_proto", "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/type:pkg_cc_proto", ], ) diff --git a/test/tools/router_check/coverage.cc b/test/tools/router_check/coverage.cc index 1d0d311e47dc3..f079f0319fd72 100644 --- a/test/tools/router_check/coverage.cc +++ b/test/tools/router_check/coverage.cc @@ -2,8 +2,6 @@ #include -#include "envoy/api/v2/core/base.pb.h" - namespace Envoy { double RouteCoverage::report() { uint64_t route_weight = 0; diff --git a/test/tools/router_check/coverage.h b/test/tools/router_check/coverage.h index a3ed3d18cef40..a9671afce00f4 100644 --- a/test/tools/router_check/coverage.h +++ b/test/tools/router_check/coverage.h @@ -1,5 +1,6 @@ #pragma once +#include "envoy/api/v2/rds.pb.h" #include "envoy/router/router.h" #include "test/mocks/server/mocks.h" diff --git a/test/tools/router_check/router.cc b/test/tools/router_check/router.cc index 936589c8ca46c..ac23bfff95bbe 100644 --- a/test/tools/router_check/router.cc +++ b/test/tools/router_check/router.cc @@ -5,6 +5,10 @@ #include #include +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/api/v2/rds.pb.h" +#include "envoy/type/percent.pb.h" + #include "common/network/utility.h" #include "common/protobuf/message_validator_impl.h" #include "common/protobuf/utility.h" diff --git a/test/tools/router_check/router.h b/test/tools/router_check/router.h index 8083e356c9946..d56f7c25536f3 100644 --- a/test/tools/router_check/router.h +++ b/test/tools/router_check/router.h @@ -3,7 +3,8 @@ #include #include -#include "envoy/api/v2/core/base.pb.h" +#include "envoy/api/v2/rds.pb.h" +#include "envoy/type/percent.pb.h" #include "common/common/logger.h" #include "common/common/utility.h" diff --git a/tools/api_boost/README.md b/tools/api_boost/README.md new file mode 100644 index 0000000000000..fdc56362e4199 --- /dev/null +++ b/tools/api_boost/README.md @@ -0,0 +1,29 @@ +# Envoy API upgrades + +This directory contains tooling to support the [Envoy API versioning +guidelines](api/API_VERSIONING.md). Envoy internally tracks the latest API +version for any given package. Since each package may have a different API +version, and we have have > 15k of API protos, we require machine assistance to +scale the upgrade process. + +We refer to the process of upgrading Envoy to the latest version of the API as +*API boosting*. This is a manual process, where a developer wanting to bump +major version at the API clock invokes: + +```console +/tools/api_boost/api_boost.py --build_api_booster --generate_api_type_database \ + --generate_compilation_database +``` + +followed by `fix_format`. The full process is still WiP, but we expect that +there will be some manual fixup required of test cases (e.g. YAML fragments) as +well. + +You will need to configure `LLVM_CONFIG` as per the [Clang Libtooling setup +guide](tools/clang_tools/README.md). + +## Status + +The API boosting tooling is still WiP. It is slated to land in the v3 release +(EOY 2019), at which point it should be considered ready for general consumption +by experienced developers who work on Envoy APIs. diff --git a/tools/api_boost/api_boost.py b/tools/api_boost/api_boost.py new file mode 100755 index 0000000000000..43938c17edfe6 --- /dev/null +++ b/tools/api_boost/api_boost.py @@ -0,0 +1,159 @@ +#!/usr/bin/env python3 + +# Tool that assists in upgrading the Envoy source tree to the latest API. +# Internally, Envoy uses the latest vN or vNalpha for a given package. Envoy +# will perform a reflection based version upgrade on any older protos that are +# presented to it in configuration at ingestion time. +# +# Usage (from a clean tree): +# +# api_boost.py --generate_api_type_database --generate_compilation_database \ +# --build_api_booster + +import argparse +import functools +import json +import os +import multiprocessing as mp +import pathlib +import re +import subprocess as sp + +# Temporary location of modified files. +TMP_SWP_SUFFIX = '.tmp.swp' + +# Detect API #includes. +API_INCLUDE_REGEX = re.compile('#include "(envoy/.*)/[^/]+\.pb\.(validate\.)?h"') + + +# Update a C++ file to the latest API. +def ApiBoostFile(llvm_include_path, path): + print('Processing %s' % path) + # Run the booster + try: + result = sp.run([ + './bazel-bin/external/envoy_dev/clang_tools/api_booster/api_booster', + '--extra-arg-before=-xc++', + '--extra-arg=-isystem%s' % llvm_include_path, '--extra-arg=-Wno-undefined-internal', path + ], + capture_output=True, + check=True) + except sp.CalledProcessError as e: + print('api_booster failure for %s: %s %s' % (path, e, e.stderr.decode('utf-8'))) + raise + + # Consume stdout containing the list of inferred API headers. We don't have + # rewrite capabilities yet in the API booster, so we rewrite here in Python + # below. + inferred_api_includes = sorted(set(result.stdout.decode('utf-8').splitlines())) + + # We just dump the inferred API header includes at the start of the #includes + # in the file and remove all the present API header includes. This does not + # match Envoy style; we rely on later invocations of fix_format.sh to take + # care of this alignment. + output_lines = [] + include_lines = ['#include "%s"' % f for f in inferred_api_includes] + input_text = pathlib.Path(path).read_text() + for line in input_text.splitlines(): + if include_lines and line.startswith('#include'): + output_lines.extend(include_lines) + include_lines = None + # Exclude API includes, except for a special case related to v2alpha + # ext_authz; this is needed to include the service descriptor in the build + # and is a hack that will go away when we remove v2. + if re.match(API_INCLUDE_REGEX, line) and 'envoy/service/auth/v2alpha' not in line: + continue + output_lines.append(line) + + # Write to temporary file. We can't overwrite in place as we're executing + # concurrently with other ApiBoostFile() invocations that might need the file + # we're writing to. + pathlib.Path(path + TMP_SWP_SUFFIX).write_text('\n'.join(output_lines) + '\n') + + +# Replace the original file with the temporary file created by ApiBoostFile() +# for a given path. +def SwapTmpFile(path): + pathlib.Path(path + TMP_SWP_SUFFIX).rename(path) + + +# Update the Envoy source tree the latest API. +def ApiBoostTree(args): + # Optional setup of state. We need the API type database, compilation database + # and api_booster tool in place before we can start boosting. + if args.generate_api_type_database: + sp.run(['./tools/gen_api_type_database.sh'], check=True) + + if args.generate_compilation_database: + sp.run(['./tools/gen_compilation_database.py', '--run_bazel_build', '--include_headers'], + check=True) + + if args.build_api_booster: + # Similar to gen_compilation_database.py, we only need the cc_library for + # setup. The long term fix for this is in + # https://github.com/bazelbuild/bazel/issues/9578. + dep_build_targets = [ + '//source/...', + '//test/...', + ] + query = 'kind(cc_library, {})'.format(' union '.join(dep_build_targets)) + dep_lib_build_targets = sp.check_output(['bazel', 'query', query]).decode().splitlines() + # Slightly easier to debug when we build api_booster on its own. + sp.run([ + 'bazel', + 'build', + '--strip=always', + '@envoy_dev//clang_tools/api_booster', + ], check=True) + sp.run([ + 'bazel', + 'build', + '--strip=always', + ] + dep_lib_build_targets, check=True) + + # Figure out where the LLVM include path is. We need to provide this + # explicitly as the api_booster is built inside the Bazel cache and doesn't + # know about this path. + # TODO(htuch): this is fragile and depends on Clang version, should figure out + # a cleaner approach. + llvm_include_path = os.path.join( + sp.check_output([os.getenv('LLVM_CONFIG'), '--libdir']).decode().rstrip(), + 'clang/9.0.0/include') + + # Determine the files in the target dirs eligible for API boosting. + paths = [] + for p in args.paths: + if os.path.isfile(p): + paths.append(p) + continue + for root, dirs, files in os.walk(p): + for f in files: + if f.endswith('.cc') or f.endswith('.h'): + paths.append(os.path.join(root, f)) + + # Filter files that aren't in the compilation database; we can't meaningfully + # run them under Clang libtooling (e.g. Windows plaform files on Linux). + known_files = set( + [entry['file'] for entry in json.loads(pathlib.Path('compile_commands.json').read_text())]) + paths = [p for p in paths if p in known_files] + + # The API boosting is file local, so this is trivially parallelizable, use + # multiprocessing pool with default worker pool sized to cpu_count(), since + # this is CPU bound. + with mp.Pool() as p: + # We need two phases, to ensure that any dependency on files being modified + # in one thread on consumed transitive headers on the other thread isn't an + # issue. This also ensures that we complete all analysis error free before + # any mutation takes place. + p.map(functools.partial(ApiBoostFile, llvm_include_path), paths) + p.map(SwapTmpFile, paths) + + +if __name__ == '__main__': + parser = argparse.ArgumentParser(description='Update Envoy tree to the latest API') + parser.add_argument('--generate_api_type_database', action='store_true') + parser.add_argument('--generate_compilation_database', action='store_true') + parser.add_argument('--build_api_booster', action='store_true') + parser.add_argument('paths', nargs='*', default=['source', 'test', 'include']) + args = parser.parse_args() + ApiBoostTree(args) diff --git a/tools/check_format.py b/tools/check_format.py index d06cb169a27d0..a7bb5daf7426f 100755 --- a/tools/check_format.py +++ b/tools/check_format.py @@ -70,7 +70,8 @@ "./source/common/access_log/access_log_formatter.cc", "./source/extensions/filters/http/squash/squash_filter.h", "./source/extensions/filters/http/squash/squash_filter.cc", - "./source/server/http/admin.h", "./source/server/http/admin.cc") + "./source/server/http/admin.h", "./source/server/http/admin.cc", + "./tools/clang_tools/api_booster/main.cc") # Only one C++ file should instantiate grpc_init GRPC_INIT_WHITELIST = ("./source/common/grpc/google_grpc_context.cc") @@ -340,7 +341,8 @@ def isBuildFile(file_path): def isExternalBuildFile(file_path): - return isBuildFile(file_path) and file_path.startswith("./bazel/external/") + return isBuildFile(file_path) and (file_path.startswith("./bazel/external/") or + file_path.startswith("./tools/clang_tools")) def isSkylarkFile(file_path): diff --git a/tools/clang_tools/README.md b/tools/clang_tools/README.md index 2c4738d1eea5e..a53ad6038af30 100644 --- a/tools/clang_tools/README.md +++ b/tools/clang_tools/README.md @@ -1,4 +1,4 @@ -# Envoy Clang libtool developer tools +# Envoy Clang Libtooling developer tools ## Overview diff --git a/tools/clang_tools/api_booster/BUILD b/tools/clang_tools/api_booster/BUILD new file mode 100644 index 0000000000000..53872e22279bc --- /dev/null +++ b/tools/clang_tools/api_booster/BUILD @@ -0,0 +1,14 @@ +load("//clang_tools/support:clang_tools.bzl", "envoy_clang_tools_cc_binary") + +licenses(["notice"]) # Apache 2 + +envoy_clang_tools_cc_binary( + name = "api_booster", + srcs = ["main.cc"], + deps = [ + "@clang_tools//:clang_astmatchers", + "@clang_tools//:clang_basic", + "@clang_tools//:clang_tooling", + "@envoy//tools/type_whisperer:api_type_db_lib", + ], +) diff --git a/tools/clang_tools/api_booster/main.cc b/tools/clang_tools/api_booster/main.cc new file mode 100644 index 0000000000000..a9584f9864ced --- /dev/null +++ b/tools/clang_tools/api_booster/main.cc @@ -0,0 +1,194 @@ +// Upgrade a single Envoy C++ file to the latest API version. +// +// Currently this tool is a WiP and only does inference of .pb[.validate].h +// #include locations. This already exercises some of the muscles we need, such +// as AST matching, rudimentary type inference and API type database lookup. +// +// NOLINT(namespace-envoy) + +#include +#include +#include + +// Declares clang::SyntaxOnlyAction. +#include "clang/ASTMatchers/ASTMatchers.h" +#include "clang/ASTMatchers/ASTMatchFinder.h" +#include "clang/Frontend/FrontendActions.h" +#include "clang/Tooling/CommonOptionsParser.h" +#include "clang/Tooling/Tooling.h" + +// Declares llvm::cl::extrahelp. +#include "llvm/Support/CommandLine.h" + +#include "tools/type_whisperer/api_type_db.h" + +#include "absl/strings/str_join.h" +#include "absl/strings/str_split.h" + +using namespace clang; +using namespace clang::ast_matchers; +using namespace clang::tooling; +using namespace llvm; + +class ApiBooster : public MatchFinder::MatchCallback, public SourceFileCallbacks { +public: + // AST match callback. + void run(const MatchFinder::MatchResult& result) override { + // If we have a match on type, we should track the corresponding .pb.h. + if (const clang::TypeLoc* type = result.Nodes.getNodeAs("type")) { + const std::string type_name = + type->getType().getCanonicalType().getUnqualifiedType().getAsString(); + // std::cerr << "debug: " << type_name << std::endl; + const auto result = getProtoPathFromCType(type_name); + if (result) { + source_api_proto_paths_.insert(*result + ".pb.h"); + } + return; + } + + // If we have a match on a call expression, check to see if it's something + // like loadFromYamlAndValidate; if so, we might need to look at the + // argument type to figure out any corresponding .pb.validate.h we require. + if (const clang::CallExpr* call_expr = result.Nodes.getNodeAs("call_expr")) { + auto* direct_callee = call_expr->getDirectCallee(); + if (direct_callee != nullptr) { + const std::unordered_map ValidateNameToArg = { + {"loadFromYamlAndValidate", 1}, + {"loadFromFileAndValidate", 1}, + {"downcastAndValidate", 0}, + {"validate", 0}, + }; + const std::string& callee_name = direct_callee->getNameInfo().getName().getAsString(); + const auto arg = ValidateNameToArg.find(callee_name); + // Sometimes we hit false positives because we aren't qualifying above. + // TODO(htuch): fix this before merging. + if (arg != ValidateNameToArg.end() && arg->second < call_expr->getNumArgs()) { + const std::string type_name = call_expr->getArg(arg->second) + ->getType() + .getCanonicalType() + .getUnqualifiedType() + .getAsString(); + const auto result = getProtoPathFromCType(type_name); + if (result) { + source_api_proto_paths_.insert(*result + ".pb.validate.h"); + } + } + } + return; + } + + // The last place we need to look for .pb.validate.h reference is + // instantiation of FactoryBase. + if (const clang::ClassTemplateSpecializationDecl* tmpl = + result.Nodes.getNodeAs("tmpl")) { + const std::string tmpl_type_name = tmpl->getSpecializedTemplate() + ->getInjectedClassNameSpecialization() + .getCanonicalType() + .getAsString(); + if (tmpl_type_name == "FactoryBase") { + const std::string type_name = tmpl->getTemplateArgs() + .get(0) + .getAsType() + .getCanonicalType() + .getUnqualifiedType() + .getAsString(); + const auto result = getProtoPathFromCType(type_name); + if (result) { + source_api_proto_paths_.insert(*result + ".pb.validate.h"); + } + } + } + } + + // Visitor callback for start of a compilation unit. + bool handleBeginSource(CompilerInstance& CI) override { + source_api_proto_paths_.clear(); + return true; + } + + // Visitor callback for end of a compiation unit. + void handleEndSource() override { + // Dump known API header paths to stdout for api_boost.py to rewrite with + // (no rewriting support in this tool yet). + for (const std::string& proto_path : source_api_proto_paths_) { + std::cout << proto_path << std::endl; + } + } + +private: + // Convert from C++ type, e.g. envoy:config::v2::Cluster, to a proto path + // (minus the .proto suffix), e.g. envoy/config/v2/cluster. + absl::optional getProtoPathFromCType(const std::string& c_type_name) { + // Ignore compound or non-API types. + // TODO(htuch): without compound types, this is only an under-approximation + // of the types. Add proper logic to destructor compound types. + const std::string type_name = std::regex_replace(c_type_name, std::regex("^(class|enum) "), ""); + if (!absl::StartsWith(type_name, "envoy::") || absl::StrContains(type_name, " ")) { + return {}; + } + + // Convert from C++ to a qualified proto type. This is fairly hacky stuff, + // we're essentially reversing the conventions that the protobuf C++ + // compiler is using, e.g. replacing _ and :: with . as needed, guessing + // that a Case suffix implies some enum switching. + const std::string dotted_path = std::regex_replace(type_name, std::regex("::"), "."); + std::vector frags = absl::StrSplit(dotted_path, '.'); + for (std::string& frag : frags) { + if (!frag.empty() && isupper(frag[0])) { + frag = std::regex_replace(frag, std::regex("_"), "."); + } + } + if (absl::EndsWith(frags.back(), "Case")) { + frags.pop_back(); + } + const std::string proto_type_name = absl::StrJoin(frags, "."); + + // Use API type database to map from proto type to path. + auto result = Envoy::Tools::TypeWhisperer::ApiTypeDb::getProtoPathForType(proto_type_name); + if (result) { + // Remove the .proto extension. + return result->substr(0, result->size() - 6); + } else if (!absl::StartsWith(proto_type_name, "envoy.HotRestart") && + !absl::StartsWith(proto_type_name, "envoy.RouterCheckToolSchema") && + !absl::StartsWith(proto_type_name, "envoy.test")) { + // Die hard if we don't have a useful proto type for something that looks + // like an API type(modulo a short whitelist). + std::cerr << "Unknown API type: " << proto_type_name << std::endl; + // TODO(htuch): mabye there is a nicer way to terminate AST traversal? + ::exit(1); + } + + return {}; + } + + // Set of inferred .pb[.validate].h, updated as the AST matcher callbacks above fire. + std::set source_api_proto_paths_; +}; + +int main(int argc, const char** argv) { + // Apply a custom category to all command-line options so that they are the + // only ones displayed. + llvm::cl::OptionCategory api_booster_tool_category("api-booster options"); + + CommonOptionsParser OptionsParser(argc, argv, api_booster_tool_category); + ClangTool Tool(OptionsParser.getCompilations(), OptionsParser.getSourcePathList()); + + ApiBooster api_booster; + MatchFinder finder; + + // Match on all mentions of types in the AST. + auto type_matcher = typeLoc(isExpansionInMainFile()).bind("type"); + finder.addMatcher(type_matcher, &api_booster); + + // Match on all call expressions. We are interested in particular in calls + // where validation on protos is performed. + auto call_matcher = callExpr().bind("call_expr"); + finder.addMatcher(call_matcher, &api_booster); + + // Match on all template instantiations.We are interested in particular in + // instantiations of factories where validation on protos is performed. + auto tmpl_matcher = classTemplateSpecializationDecl().bind("tmpl"); + finder.addMatcher(tmpl_matcher, &api_booster); + + return Tool.run(newFrontendActionFactory(&finder, &api_booster).get()); +} diff --git a/tools/gen_api_type_database.sh b/tools/gen_api_type_database.sh new file mode 100755 index 0000000000000..3cad9585fa621 --- /dev/null +++ b/tools/gen_api_type_database.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +set -e + +# Clean up any stale files in the API tree output. Bazel remembers valid cached +# files still. +rm -rf bazel-bin/external/envoy_api + +# TODO(htuch): This script started life by cloning docs/build.sh. It depends on +# the @envoy_api//docs:protos target in a few places as a result. This is not +# guaranteed to be the precise set of protos we want to format, but as a +# starting place it seems reasonable. In the future, we should change the logic +# here. +bazel build ${BAZEL_BUILD_OPTIONS} --//tools/api_proto_plugin:default_type_db_target=@envoy_api//docs:protos \ + @envoy_api//docs:protos --aspects //tools/protoxform:protoxform.bzl%protoxform_aspect --output_groups=proto \ + --action_env=CPROFILE_ENABLED=1 --host_force_python=PY3 diff --git a/tools/proto_format.sh b/tools/proto_format.sh index 4ee93b75eabf4..c1f77e84835ee 100755 --- a/tools/proto_format.sh +++ b/tools/proto_format.sh @@ -6,23 +6,8 @@ set -e [[ "$1" == "check" || "$1" == "fix" ]] || (echo "Usage: $0 "; exit 1) -# Clean up any stale files in the API tree output. Bazel remembers valid cached -# files still. -rm -rf bazel-bin/external/envoy_api - -# Find all source protos. -declare -r PROTO_TARGETS=$(bazel query "labels(srcs, labels(deps, @envoy_api//docs:protos))") - # This is for local RBE setup, should be no-op for builds without RBE setting in bazelrc files. BAZEL_BUILD_OPTIONS+=" --remote_download_outputs=all" -# TODO(htuch): This script started life by cloning docs/build.sh. It depends on -# the @envoy_api//docs:protos target in a few places as a result. This is not -# guaranteed to be the precise set of protos we want to format, but as a -# starting place it seems reasonable. In the future, we should change the logic -# here. -bazel build ${BAZEL_BUILD_OPTIONS} --//tools/api_proto_plugin:default_type_db_target=@envoy_api//docs:protos \ - @envoy_api//docs:protos --aspects //tools/protoxform:protoxform.bzl%protoxform_aspect --output_groups=proto \ - --action_env=CPROFILE_ENABLED=1 --host_force_python=PY3 - +./tools/gen_api_type_database.sh ./tools/proto_sync.py "$1" ${PROTO_TARGETS} diff --git a/tools/type_whisperer/BUILD b/tools/type_whisperer/BUILD index 23998b1a20151..88eae75f42717 100644 --- a/tools/type_whisperer/BUILD +++ b/tools/type_whisperer/BUILD @@ -1,6 +1,6 @@ licenses(["notice"]) # Apache 2 -load("//bazel:envoy_build_system.bzl", "envoy_package", "envoy_proto_library") +load("//bazel:envoy_build_system.bzl", "envoy_cc_library", "envoy_cc_test", "envoy_package", "envoy_proto_library") load("@com_google_protobuf//:protobuf.bzl", "py_proto_library") envoy_package() @@ -35,7 +35,38 @@ py_binary( ], ) +# Pack API type database text file into a char* string that can be referenced +# at the C++ level. +genrule( + name = "api_type_db_genrule", + srcs = ["api_type_db.generated.pb_text"], + outs = ["api_type_db_def.generated.cc"], + cmd = "(echo 'namespace Envoy { namespace Tools { namespace TypeWhisperer " + + "{ const char* ApiTypeDbPbText = R\"EOF('; cat $(SRCS); echo ')EOF\";}}}') > $@", +) + +envoy_cc_library( + name = "api_type_db_lib", + srcs = [ + "api_type_db.cc", + "api_type_db_def.generated.cc", + ], + hdrs = ["api_type_db.h"], + deps = [ + "//source/common/protobuf", + "//tools/type_whisperer:api_type_db_proto_cc_proto", + ], +) + envoy_proto_library( name = "api_type_db_proto", srcs = ["api_type_db.proto"], ) + +envoy_cc_test( + name = "api_type_db_test", + srcs = ["api_type_db_test.cc"], + deps = [ + ":api_type_db_lib", + ], +) diff --git a/tools/type_whisperer/api_type_db.cc b/tools/type_whisperer/api_type_db.cc new file mode 100644 index 0000000000000..dce28eadffd47 --- /dev/null +++ b/tools/type_whisperer/api_type_db.cc @@ -0,0 +1,40 @@ +#include "tools/type_whisperer/api_type_db.h" + +#include "common/protobuf/protobuf.h" + +#include "tools/type_whisperer/api_type_db.pb.h" + +namespace Envoy { +namespace Tools { +namespace TypeWhisperer { + +extern const char* ApiTypeDbPbText; + +namespace { + +tools::type_whisperer::TypeDb* loadApiTypeDb() { + tools::type_whisperer::TypeDb* api_type_db = new tools::type_whisperer::TypeDb; + if (Protobuf::TextFormat::ParseFromString(ApiTypeDbPbText, api_type_db)) { + return api_type_db; + } + return nullptr; +} + +const tools::type_whisperer::TypeDb& getApiTypeDb() { + static tools::type_whisperer::TypeDb* api_type_db = loadApiTypeDb(); + return *api_type_db; +} + +} // namespace + +absl::optional ApiTypeDb::getProtoPathForType(const std::string& type_name) { + auto it = getApiTypeDb().types().find(type_name); + if (it == getApiTypeDb().types().end()) { + return absl::nullopt; + } + return it->second.proto_path(); +} + +} // namespace TypeWhisperer +} // namespace Tools +} // namespace Envoy diff --git a/tools/type_whisperer/api_type_db.h b/tools/type_whisperer/api_type_db.h new file mode 100644 index 0000000000000..34d4c2808e46e --- /dev/null +++ b/tools/type_whisperer/api_type_db.h @@ -0,0 +1,20 @@ +#pragma once + +#include "absl/strings/string_view.h" +#include "absl/types/optional.h" + +namespace Envoy { +namespace Tools { +namespace TypeWhisperer { + +// We don't expose the raw API type database to consumers, as this requires RTTI +// and this may be linked in environments where this is not available (e.g. +// libtooling binaries). +class ApiTypeDb { +public: + static absl::optional getProtoPathForType(const std::string& type_name); +}; + +} // namespace TypeWhisperer +} // namespace Tools +} // namespace Envoy diff --git a/tools/type_whisperer/api_type_db_test.cc b/tools/type_whisperer/api_type_db_test.cc new file mode 100644 index 0000000000000..dd84e9181f170 --- /dev/null +++ b/tools/type_whisperer/api_type_db_test.cc @@ -0,0 +1,25 @@ +#include "tools/type_whisperer/api_type_db.h" + +// TODO(htuch): make sure this runs under CI. + +#include "gtest/gtest.h" + +namespace Envoy { +namespace Tools { +namespace TypeWhisperer { +namespace { + +TEST(ApiTypeDb, GetProtoPathForTypeUnknown) { + const auto unknown_type_path = ApiTypeDb::getProtoPathForType("foo"); + EXPECT_EQ(absl::nullopt, unknown_type_path); +} + +TEST(ApiTypeDb, GetProtoPathForTypeKnown) { + const auto known_type_path = ApiTypeDb::getProtoPathForType("envoy.type.Int64Range"); + EXPECT_EQ("envoy/type/range.proto", *known_type_path); +} + +} // namespace +} // namespace TypeWhisperer +} // namespace Tools +} // namespace Envoy