diff --git a/include/envoy/network/BUILD b/include/envoy/network/BUILD index c5469f5ee22c..c4c89fee0caa 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 adb02dafd7a1..49a38da8c14d 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 f5538c15c983..5d57b9cd6c7d 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 17625722f7fb..09236c3c7e1d 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 387c84fcb9b7..8c79d5a01daf 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 6e4d492b1676..33826cfd9355 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 fb398503f7b7..6fd2ff10136c 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 e6d613716342..dd4bca328091 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 4cbcfc5a920d..e8cf0994f17b 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 d52d03ae0876..657643e74a86 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 21a2e583fbad..0c7d6dc969da 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 f639ea3581a1..4fe695e929d6 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 2e093fb8f556..6709adcfc875 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 d06b43f1f997..cb30f9994bc4 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 01ecedafaa3b..5c6ee9787ed8 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 d7c52af32baf..1993ef0672b1 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 656d1eca1c2c..30193e3edf82 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 aa3267ebf869..76c225d52c4d 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 83de403e3b5d..53c991a6701f 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 741a17272ace..a48d21d0de46 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 7613e3ba9ae0..8b4a0f3b7512 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 f8d8cd0dfa42..fae56dcf0944 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 d46833d17700..59ce2cb6bed9 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/matchers.cc b/source/common/common/matchers.cc index 4c648ebe8eb6..cce97a2636e0 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 fc1d0505c151..50a37431da5e 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 47fb3d42625d..c8bbe5a64781 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", ], ) @@ -227,7 +227,6 @@ envoy_cc_library( deps = [ "//source/common/common:assert_lib", "@com_google_googleapis//google/rpc:status_cc_proto", - "@envoy_api//envoy/api/v2:pkg_cc_proto", ], ) @@ -294,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", ], ) @@ -324,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", ], ) @@ -350,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 a03b1718c1a2..b527ec88c6d6 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 ed34dac39bea..537929bc5f34 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 b45be7c4da85..cbc53fb25484 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 8fdfdca0ffca..cebfbb3cc5c7 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 4fae62266b34..83d060a53871 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 6937a8ecf6df..39c86f1654da 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 3246dfbbd189..f1d4dc1c7b0f 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 3f55178f4e1e..d37826a4a871 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 299aa4f1480e..1353728a5bc6 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 8914519746f2..16edffded0b6 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 5f32bba0c4ab..5fe413a12da7 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 727cc90e6db2..14af5d8240c1 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 167057d17ce7..48b9c08f2f08 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 d22593d0bf99..9c468e35e6a2 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 46222a8b2e3c..f4a5d42ce8f9 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 687187887c64..1993b522ceaa 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 2ef6b39a3c4f..280e37b89330 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 ef1f8e45ca15..500f2439e48c 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 9217b612b18d..601efc790335 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 3a7f0ba1e31c..60ddaf549aa0 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 800d04271435..ec8a8c7c610a 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 bc4322a15186..f0abdce9e249 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 8e8c25a52293..bbd25757d3e1 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 7cab1efa9887..53a06f94864a 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 9df852c7f712..4119f31aa6c1 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 39a3dc27e782..7e3e8c21a0e8 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 c4f99bc98852..a2ed465c39bd 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 1e9eddbe9e63..a0c88e142847 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 4d511bf4670a..d198d8a4a7ba 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 07536adf24db..59bfba3bb974 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 17007ba260c2..58856ead1e97 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 1026780cdba6..5157fc18e6b7 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 effd5cfa0d83..f82cad602bf7 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 c02858b19370..83848ab72c2c 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 57f98a9d9e8f..e4dca8bcf973 100644 --- a/source/common/http/async_client_impl.h +++ b/source/common/http/async_client_impl.h @@ -9,6 +9,8 @@ #include #include +#include "envoy/api/v2/core/base.pb.h" +#include "envoy/api/v2/route/route.pb.h" #include "envoy/common/scope_tracker.h" #include "envoy/config/typed_metadata.h" #include "envoy/event/dispatcher.h" @@ -23,6 +25,7 @@ #include "envoy/server/filter_config.h" #include "envoy/ssl/connection.h" #include "envoy/tracing/http_tracer.h" +#include "envoy/type/percent.pb.h" #include "envoy/upstream/load_balancer.h" #include "envoy/upstream/upstream.h" diff --git a/source/common/http/conn_manager_config.h b/source/common/http/conn_manager_config.h index 8a8f1661663b..cb17f00bb1de 100644 --- a/source/common/http/conn_manager_config.h +++ b/source/common/http/conn_manager_config.h @@ -5,6 +5,7 @@ #include "envoy/http/filter.h" #include "envoy/router/rds.h" #include "envoy/stats/scope.h" +#include "envoy/type/percent.pb.h" #include "common/http/date_provider.h" #include "common/network/utility.h" diff --git a/source/common/http/conn_manager_impl.cc b/source/common/http/conn_manager_impl.cc index ac95cff1fa65..3061e0daca2b 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 69e594bc6998..c60efd398849 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 b2cc447e4aab..4a9bd9cceb45 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/header_utility.cc b/source/common/http/header_utility.cc index 7bb74e0ea932..36213f1dedc1 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/utility.cc b/source/common/http/utility.cc index 2ac769ee2fce..3b4d514bce8c 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/local_info/BUILD b/source/common/local_info/BUILD index 76334e2d44ea..0016d66e9f7a 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 a9e1ee97eef7..6ab957e38474 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 28954514e8f4..080c77c44d1b 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 ffa31a96f565..b7552f4162f1 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 1e8b463dbd4a..202e56779416 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 1901c267824a..4be927a43edf 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 0c0c2757b092..6070f8587fd6 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 d2b33085a289..77cc9a0a3252 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 ca843c24c3de..0880d8bce386 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 aac2196dc98d..2126a1676a1e 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 98d825f9c749..c25d82c9f6d1 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 8cac03b61b21..12fca95088fd 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 bcaabda83121..ff7c9b962c80 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 dbf8aa153301..b8439976009a 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 688e42dbd1dc..9262131c4daf 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 d864c85032a7..87e4df71a468 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 b288bf41a93d..6e9e9f1b0bdf 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 9bc3a6ccc7ff..561e424206b3 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 abb15b4895ee..1034f252c039 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 6b6bf0fe7294..0eabbf1a310d 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 21258c90eec7..0f14937c7ba5 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 09dc85db59cc..93150c379ef4 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 d03866203bc2..58ebe215c6f0 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 e5d71aa9ef1f..d9aa1080cdf8 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 7e9317191521..98ef89251792 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 dae58a9306d9..41f71b6957e4 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 63e879e333e5..de3787d9bfa6 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 81931e482c90..4738c72cd570 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 cff6dd59a80a..80ae2d407fa5 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 28519851ea83..ab3510ae514b 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 d99b946f81ab..031954fc33fc 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 c6f00f58ea1e..268318978a37 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 a1b79e98a82b..dce6782a779a 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 d226f3dddc7e..2a993274d39f 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 7abbb9b26d64..28d586419b35 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 d5a57cd2159a..11efea2d4901 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 62c305f12982..7db4ebd04e50 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 5d08de997df5..d92492af69e2 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 763d4d3d1c5c..505f1860244b 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 cfc5cc3ae4ce..7b51f36935b4 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 1ee1fe97c66e..26c7d7c1eb0b 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 e08a8c1c1bd6..db35adccc31a 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 4514f5ce0792..53d495f9d84a 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 695ecd02e8af..c7f1d32ced06 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 c63af2f50ac5..a672f202d216 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 2237a49d2c4f..1f1018df30c7 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 dc0af8d2b645..879f22866a1d 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 5eb7b4aca38d..0cd962aa245b 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 aa70b7046ce0..67d267c2a129 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 5b28c3568e09..2a2dea0a0ee8 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 bd73c46adf5c..e334ffe7d624 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 f03a4b6553e3..752a22a63104 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 b80bdc6d4c06..f7f96eb3ad75 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 d07c96bd729c..6f23a183f388 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 7117a900d25b..504ced2b864c 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 a80eaa4ebcea..8a71036e1eeb 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 f3e31d3e3c2e..d69373394f05 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 a8a90107afa8..d5e9d63257f8 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 c9cfb856194a..02f4c0478956 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 b44d89ed75c8..6993b0d28fa9 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 99fa95f8286f..26bb6de76f64 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 b17d4bbc9989..ba5cd4977cf3 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 ad557eab6d0b..9c2f5da1b8f8 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 41759e66d390..07ea992b4736 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 398e47edc97f..a478ecbb2eda 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 83f463afd777..79cc6d83257a 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 5851445763c1..285e9ea158ce 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 a19859add5b7..c84df480b018 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 5858fdbadc31..17811a97bd9e 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 5008cf9d3907..9616c2db426f 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 c1aad5a96ca2..624707d28cda 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 63b4b0c142cc..1bc64bdcdf16 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 8579620c48be..f8ef0e46bb92 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 b393190f3b47..545652092025 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 185652b660cd..4f2ae7dbbe70 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 57a9f2411a9b..1f0b1c21b727 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 bf73083e0e35..9141b580c5e6 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 b1f7026aa312..a9fe16159d31 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 f08df466d29c..07f5bd8e67cd 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 2fba318f8830..e726766da9e2 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 d48849ac3efc..e181fd990965 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 04b91f58f236..35e995789fdb 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 1a88dfb1c61c..e911a3184a45 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 5ff3d9f6a71c..87ed6593f03f 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 b10bc8571003..72793d14845f 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 2489b8e44cd9..264b471c182d 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 76bb1923b07b..4a61d39023ae 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 37feab2ea41a..2b5997d73d6d 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 f8a440d72f12..b588084dd58e 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 a676059857f4..e6e58f978138 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 9dab1adb631d..e8c944203c04 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 db5f5d5eb99e..aac75a2dfe01 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 ea9b1aaccf59..7cdcb4139771 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 3f68d1afbbaf..efe4d117c4e0 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 1b99435cb0d0..3077d01834e4 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 742643f6f2ed..dab8cf531ade 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 26f51bd8b7ae..7d285162637d 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 642e916184eb..4eeed9a7597c 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 dce4fdbe8b53..daa8a198e578 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 9a6d6caa6668..3f75f5e8e503 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 714a5fb4eb6d..556037f5f65a 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 3fa3e01b0e94..3c28905d976d 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 5d2a648a0f5d..e950aea731fb 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 f95b53f6a790..5df42e71814a 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 3f96ba308b5b..6c3cc10e1389 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 8c254e47bca0..ddaadb883c85 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 6936800be0ff..67dd0585bc55 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 a42354ccd7a1..0eae355075cf 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 555481a2efc8..c6e74bfcbbaa 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 e8f6992600cd..89a050985b79 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 1eda50f09274..e6fc6d3bb9b4 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 be8d1e1d7d3f..02b9c6af95aa 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 b8c053ae0c44..6af51e20b4bf 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 99eeec94f45f..6b41141c36af 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 115c8a467719..3cb96af4b965 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 3f6007f3b686..e7db20184fab 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 809aac1e28dc..cdb45536f3db 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 23ea5b24d9bc..296b35b77b43 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 1e6e6a6cca48..f1ad824d7db1 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 2aa9d4087987..9580cefea60b 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 5c0568c91066..6272e1694c04 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 365227e141cd..e8f7200185b9 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 0eb379fa9d54..a6c38edc1018 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 5d67ec2bb101..634587263255 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 51077c3b652d..f2567df97c3b 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 56f351d4f236..8218e13a4de9 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 a5ff26147a38..2abaa2077b33 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 69a69eccf7c6..cf6e4f0ca5ee 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 a895bf82fca1..6a4fa1a95ddc 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 cdd4249a4c93..e2a6c4c90f64 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 e71236882732..578f187288a1 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 bf7b99e6f2d2..5d695a51fbff 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 be611ed0d4a6..9feb537aa8f8 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 e72ce4458a2b..305956f8d0a1 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 7e72447cf348..07401e9c308f 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 f99dc4f6009a..76bd425f085e 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 36b6f8fca556..91bed8ae5789 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 66511e2f8856..2f0e43d50b1c 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 6b531f5afd57..9ff51cb02cb1 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 8fd34742d6ac..731d679ee72a 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 c694fb0c1137..f02ee5d6a74a 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 d9cb13eafd4b..51dc8c78aba4 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 7e27cd8189ce..5018b0c785c3 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 749d75313c43..147d6ae80367 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 c5e20dea7717..328113d977bd 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 70bf6fff9d19..fc7538cc43a6 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 a7c4c4eebced..2d23e1f480cf 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 d36e361b46e0..77da44c89a7a 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 c4de2b1ffa54..af6f2ebc2611 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 57203ebf1ad9..7f17a2ea8825 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 1f39f8354855..4e53b2901223 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 0a15c216bf92..26881b9a5c51 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 3e428bf9b329..096835e4077e 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 5cd8eb6e9469..2f6ac8c9ccb5 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 3145d6074437..c13cb92771ad 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 74bb9b0761bf..964a6a490757 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 fcd4cb520b1d..6ae9cb821bd3 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 b5642f0bb566..510ddccce10b 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 093eb72fb778..34a262c89a81 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 4456dd6eafbb..462c288a6794 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 43b71fe5d8b0..600651e95865 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 6a34606da2b2..8fc81347101e 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 8b2ef2bf1076..677d8c12e152 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 4809e5fcb225..a48efb813234 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 82a85271b9a4..6c747a91ad25 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 6cd64144901c..94480e318ebb 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 1228dbfce75c..b7598e56ff97 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 45bee66a691d..77e56c61effb 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 6ad71f309a7d..77239a1795db 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 672c233ceaa0..8447cc7c376b 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 3b4baedd98a0..f0dc93f97fbd 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 7d602890009c..bb24aa7ff527 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 55dcbe082de7..a4f86e7b50c8 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 5b101953e8e7..c04fce02092d 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 e3bb6f9a26e4..a6bce63831b1 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 a9553129abf4..3e7733616cca 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 56dcddee2b03..790eda38656f 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 f95b249cbc25..a106278f7ecb 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 214f11b87ce7..770d77f9cd63 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 703405a0e635..854d196d031e 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 b675ecf0d05f..ddff58dc65c5 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 61414ae8d2e1..92a494595d1c 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 7d1a9f40c010..c01dcf880c01 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 804d38ea6f54..dca6dedac4a2 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 7bfeaf9d70fe..902627d8738f 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 2f45628d1d29..eeb24c52a8cd 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 066e2e3fb869..19039501e857 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 2b783781553a..c4738020cb6a 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 9b0e4ae87f4e..2c799956cb41 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 a89960942d60..1da1b4ea1efa 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 a15cfae09f02..9308d4f886fe 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 9c1c34b2d58e..f623472a4634 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 c201f4e3c0f3..a2cdde494488 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 b18b2ddb6332..3c9b10471308 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 6c4379e7a9d8..8e364ae5beff 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 9ae6f3bf39c5..80a4bfab012d 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 659d7c389096..18d6f6142fdd 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 d6baea069e27..f08eeb7a9633 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 97830b2a5f64..0484ae09ca3b 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 5c593083ac13..f701e042e780 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 0943534255ce..5af920b2a9b2 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 8398ffbf902b..b437c79ab433 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 86d20a3a6fbb..02c19e251bb4 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 931507e8eaf9..f7b84845dc15 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 425bef1b4959..e882d240d6da 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 75753cdb42e1..349d822ed71b 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 c5dd65d08d90..c991e86d32db 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 c105056a9999..b56a45840f27 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 686b82105c5f..78a68485f7d3 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 ae4f0e193b53..cfbacff1a275 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 9859e9bf8f1b..a3c3ff48c1a7 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 dce0f88aeb7c..772b1ea225ae 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 f3fde289b2ca..32ac5d93c012 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 a750dd47cc47..12f885b17ddc 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 c1ab48371466..73f45b863c37 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 287ef5e809a7..6143e964f974 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 99d5de7349a8..52d652b11112 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 53a766186a7c..2b1929cbf0ad 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 bd52ef69284f..35d95e340b99 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 041544f363ba..91c437f12936 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 034b9f5af7db..9c7cef9ceaea 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 bc58398a2c6d..04290595eba7 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 aba00bb9734e..fdcc611ab0d5 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 dc1f524a8262..305a68e9f57a 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 8d5d6703c46b..884a4e5e4edd 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 131bca55d886..a7b83bed5d44 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 003753b54f9a..7cbb2d711a7f 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 cf1d8b6c98b5..716cdd0dac39 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 249eaa8933f1..154915b0cbd9 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 b0599cf04ebe..32a9d8f3b88e 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 5af5e5d59622..7655d891a554 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 c9559f1652be..c6c5b3654bda 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 3c2aa4501c18..83808c43ffad 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 a362dc7c86f3..74db64229dfb 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 0fcbabd4765e..90bf6427ecd4 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 5414f511f378..02ab9c57d024 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 6b668af7c604..ec26e3fb70e3 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 e5ddae675dc8..983843c6f7fe 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 68b53f7dbdba..62a27388b5b4 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 a4e383538813..68127be21bf5 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 80743c678212..5cc4cf3f6426 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 7707a7ef46a9..bcc676feed09 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 6ac9f27a5e39..f5662dda813e 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 63c47252e996..0eaa73b9e6a8 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 7ac9ea6095b5..7e5c55fb1c20 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 ad3a5efea017..db8f0593f8bf 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 da85af19f281..0da6146f418e 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 a39085adfcd0..4637fb51542a 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 30ec557c2ef1..3f47e243ecce 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 e91a87ef59e8..13b4d174d949 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 421b9a766bb8..f2df934a2a71 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 746b2664f210..502f63199bf5 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 f1f202df90cf..f3149e8486ff 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 9605496bcc2d..d377a05159b4 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 9bc369f246dc..b0337677d39c 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 a42214004c5c..d0e2ed6122f9 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 0331264fe496..e3b6cbd3ada2 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 82037bdb3410..b2e57a61f88f 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 367d1ed0980f..d8af1cbbfb55 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 96b1e5ed1907..fef3d071df4c 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 58628bab6f62..221fc806a6c7 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 337261945beb..d1090be1ed8d 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 78fabf8840ad..a5265a5e85df 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 bf9e929a8005..b46cb22c435d 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 e75d8c10d25e..f8a1ad91a14c 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 e034cfc160f6..13c6571e359e 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 88c8adff441b..25ecd6e78e40 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 98a4efcd9d6b..81531193d3b9 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 312f8143b445..88b11a357da2 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 d7de50a5d665..606dfa88516d 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 14f6e310a733..f20ee665abe2 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 a9b2b1196f16..847de6ed4fea 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 66290d5def54..5bc50bfaa8a3 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 8caecadb2148..ef3d5be585a3 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 bcacd5b44f88..277d445085a7 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 43324d8ced9a..38bd4aec6e6b 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 b711f4a84427..dbc637ce2126 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 3682a8603b8d..68eae7fb9a89 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 f10557a30a55..17d3cf6da001 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 a5ea52a0c923..b697b2ffb795 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 961688d1db31..18dd7cba48ba 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 ad7e4b963528..b2bd340e5203 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 a3bdb6eab6de..7d8ce8b653ad 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 534496050c05..ab324e5e52a9 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 0ba52b6dbd4f..1d7506a99dbe 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 25f2b562134a..b77c66f75eaa 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 b05a1856f273..214a7be4b080 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 ae124d4c3cf7..747eadfb8eaf 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 a3bd4a92d394..87182c456403 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 b02f76c7b1ad..45b73545e9dc 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 4411811a0d54..a8c5e4175ec5 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 b429812e6bcf..26be00d731be 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 a968856aa04d..17bc6c95406f 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 9576695e44d1..8ac0cee6928b 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 12f5ea6e66de..1b98a86cad0a 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 c6f2976209d3..95d8e77ccb6a 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 0c6db398daec..ccc8d24d32c5 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 70255267a895..d2609f3f383a 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 d528442359f7..de7766c0d5a6 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 8fe761b3fe69..10a9156aa208 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 495877790e7a..ec7c57b5c6d7 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 d3adfeeb846f..531fe10741cc 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 16f54c46f111..9986848b1d87 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 5c0473b084dc..2a4854fd6d72 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 be0a767fdced..50f8c9ab53df 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 94bc439cef5d..1fdc623138d6 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 1e9c77ca1f56..c452039d722c 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 0ff6e968be7d..9b893dd5c293 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 41b962848716..538c3cade275 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 f5b4098a298e..3b67c128e047 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 39e736b04175..61853f0d4c81 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 5e5213c600be..46936d200754 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 7b20eca964df..b2913b804251 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 2716221fa9c4..2d38156ce331 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 2ef179b8d08c..892b45990219 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 6988ce504bcc..a5298475a9da 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 ec0e766e532d..4e8e1a2aa40d 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 20c2beea3f62..e0d9b876373d 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 ffe49be82159..304b20c14316 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 1b334e928172..1805c6536303 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 faf457e32274..d4c2b6a89317 100644 --- a/source/extensions/tracers/xray/config.cc +++ b/source/extensions/tracers/xray/config.cc @@ -3,6 +3,8 @@ #include #include "envoy/api/v2/core/address.pb.h" +#include "envoy/config/trace/v2alpha/xray.pb.h" +#include "envoy/config/trace/v2alpha/xray.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 a41ebd731a1f..6529b4af9ea2 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/v2alpha/xray.pb.h" #include "envoy/config/trace/v2alpha/xray.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 47ec3d2ff299..54fa111ce61a 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 a2047594711e..0fda006259b0 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 66bb96a9463b..adec867a4d75 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 46135a508313..743e88b9beb9 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 4cecd015d6a3..8b708538fd1f 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 81cd27b5a497..8b01381dcc23 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 fb04ed511b26..c45f2def51a3 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 a404e6a72516..6485886aa87c 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 6e1e6a98cd12..96480544b426 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 92d4e502852e..cea959d4f368 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 dc16dc2c96d2..af6a0f2e8784 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 6ccc256a98bf..79271a398829 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 6c8a79d60a8d..295aab1ced5b 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 0c3844e52b9a..f51117dd346a 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 817b9d362616..d2008a40a5cd 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 d76c43cad493..5e4cc5a66719 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", ], ) @@ -255,8 +257,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", ], ) @@ -288,6 +291,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", ], ) @@ -322,6 +327,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", ], ) @@ -356,9 +363,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 43233ed74665..98f62ae02a87 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 cf20a6c0e221..80599afc5321 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 0fe33294d190..f861363a7a1e 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 3c1c03dc9d74..475e563d24fc 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 97a6e89334dc..71483c76ce55 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 d0b6315cbda2..eeb325e2d11b 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 4bb5b224b575..9b167dce863c 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 03dbf548c265..e58944e26ee1 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 8f44ad1cf99a..1bee06b92d20 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 44306d43f21c..51ad2a8e5eec 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 0600a4174a0e..80ad9c393424 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 0eb99f366e72..877520f15f7e 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 41e3656236d8..5b2a6f3298c0 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 13a3df9e48e1..3fadc71662bc 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 24ca66cfe73f..357360c851c1 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 21c5d6c1503c..c9b7da94f87d 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 013d423ed50e..85130c3ced5e 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 1b1029161962..ef03a703e843 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 40170057da8b..3c1f8f3067f5 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 3feeec652171..7e697bb7a15a 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 484be6f075a9..8195502cbccd 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 8b55786ecdfd..7516fe54504f 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 334ead1a07a9..950c9bcf97cc 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 417000add0b4..13acc78b04eb 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 b337251309d4..4b618e6e64f4 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 b0622e328933..618dced63e16 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 9fabf6295175..5040252e95a6 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 059d44313e8c..9b1fcef9f55e 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 a94642e72d30..056ce9ac37b4 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 3c0a64f4ca05..f014b607609f 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 40caf6fa34e4..377442366707 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 112325f6e377..eaebd01a0ae5 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 651d43196f6e..6e3369de52be 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 e4f9edca504c..4df740356b11 100644 --- a/test/common/config/api_type_oracle_test.cc +++ b/test/common/config/api_type_oracle_test.cc @@ -1,8 +1,9 @@ +#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" // 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 "gtest/gtest.h" #include "udpa/type/v1/typed_struct.pb.h" diff --git a/test/common/config/config_provider_impl_test.cc b/test/common/config/config_provider_impl_test.cc index 6bf5e0f9ce04..9e9f348d4f7a 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 509a00d672af..7bf171b41213 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 e6b783b6583f..4a3694d903ff 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 f98dfe5aa05e..1734d97dc83c 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 bf35490d4b90..2ed0609d7251 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 8c0f19775c22..7b83c61cc59a 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 1958a4270bd6..f05d36cd2479 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 476230d68cb5..25dbff0c3fb3 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 1f00c95cd87d..07862eafdae5 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 885d69f82117..b856a45e82b1 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 0451f1a6b9a2..76352810b118 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 403ad4d5f91f..547ae7fa876e 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 075f42828e5d..be838813150b 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 77003b2a61c5..e70129fb51e8 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 523c1d1fd266..5bffedb3f73c 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 72e5d6411584..c50f76669ecf 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 7678dfef41fe..c42a1528a974 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 40a7d02da2da..c1cfa9539537 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 19b6b735dc6d..9689c0299202 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 86017cf821d1..e54805ba3966 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 d2c93021882f..6858c3fa65d9 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 8b37766adb6d..730e4a84812d 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 b6a6ae43810d..edf83118d839 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 3aa33b548100..ad89769e17d1 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 d64e24b3f1b7..5d4ac9498068 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 86239175431e..0765d5d4a400 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 9b3257092b41..6177f70494de 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 3fd7eb323093..d5ce38f1bfcf 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 88b7b3781ee8..f6fd886de24a 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 ac397390c95e..5b7a2a04c7c8 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 c6c6d97fbe78..ef4fb9c41fdd 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 90493b7f7abf..4a71e7796202 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 ab1f4e26a21a..388621247de1 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 d9c65c83c095..c3ce9cd19362 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 fa9d9160ea6c..56adea5ef64a 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 02c9d29e672a..9653012ddbb6 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 ca5e25cc363f..da2c441a871d 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 d979d8a01098..65031311814e 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 c4d57591209a..21cd2767d561 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 485df4fef59d..61e648e2cf59 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 3d9206548146..8ee5762bcc27 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 d64b7e15c60e..f437a1a4bac7 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 7f63b2856ba2..bb41d3e5d986 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 ae4872656815..66d722872999 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 0d12eba6b2b7..5ffe51929c29 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 6c210a47b145..c910e61cccfc 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 a4b3300e1c6d..45c8c22a0439 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 24977c5d5e4e..095553fe27af 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 34df71b6b0a3..7c2879e544c0 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 f5f893f23373..eacf95c701cc 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 5dcddfc3bebb..1674207e0400 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 c828016a655f..de20a867890a 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 0decf3b2e7a3..2d9d5922a1f0 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 cead6e004886..56fbcb43abb3 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 7aab6ad42440..6b3950d477bd 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 764ff12d7579..b3f3033ca312 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 86da9289a502..282d7ab10715 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 d591e3b6d763..7e0bf18df555 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 1c9121f00535..10f506fd050f 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 bcedd9d363a3..35779ce47078 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 9c781b980716..3427d667dcdc 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 b39c0b6243d5..3bb028802e23 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 9277a545e16a..427a56db06dd 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 6ea30cb61e84..e2f061044c6a 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 09ee831518d5..dee9a0b39c3c 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 4f153adbdae6..4455f9bf2fb9 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 561cf784d555..d86e305f0993 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 81d7096f7e0d..762b1a16a581 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 0ccd24be2adc..f08ec699acc6 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 9bcf20b00377..7a04da9a6667 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 aea0dc82191a..c7436946f983 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 fe6b5e39ab60..1b4d729eac1f 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 6b4091db67ae..d1820575822c 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 d94b4d1a2562..478c074449fe 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 377471ff61ad..394603dbd374 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 93f21232ec87..46419d2fd31e 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 fd7927414212..c2ae66f00168 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 edc2eb53d9d2..a11341b099d2 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 0b7487004249..1f200a636dd6 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 734e57b194c1..4cca47733fba 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 fe22e4a4c356..0e6a657827ef 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 784d994efdae..77de14fe34c0 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 5742109ca7fe..c4966c3b2229 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 660d76cc8f93..81dd50fb9594 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 b7c382610ac9..c6ab6692665b 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 86105360e56d..94a5515bc0fa 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 f9ed21bcb8b3..3752f8266730 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 e59f43c1175d..cb6c93383e73 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 0b771ce1bd9b..661a19e2d46b 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 a699b8360922..b30b929d80a4 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 b41b9cbfd280..b8f64ee01472 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 daedb69e8a66..286e06521a6c 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 6260f6e85e50..b39725eb1a38 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 2150e797b554..39841ce95612 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 ad9461143346..626c8482c270 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 68bf42752655..64a55c5dc10a 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 181c8665c498..0b58cfd30c0f 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 3709524fd2a3..4e3c14d2fdaa 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 befa7febbdd1..cf458f360b1c 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 2a23658a91b7..73abc22a66b7 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 32ccf2641eb5..9e5633c6c2fc 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 736b42fdc1e3..eaf17a673eb8 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 2408d6326d21..7baa3bfd42b0 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 670023ef8cdd..699ded2ea0e5 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 1eb82136ff55..529fc0911a3c 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 bf0c2d5dd6b7..4552132c667d 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 119eaa613893..d29e263dda19 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 98fd5cfddea1..be03b0cb6a2e 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 3a792f3f604c..05f1e5c70840 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 ddf3a7e6cbea..c105e66412ca 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 7ddbd83bed45..f5dce8457d3d 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 f0ae690f29dc..c89bb13ac312 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 c9cdb9841aa9..1bf68caa1f9a 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 726637bc67c1..ea83b657c0bd 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 d377220ab05b..46812d6ccccf 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 c9bb27447c2a..8b8964e1baa0 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 c2062232879a..a1ded3f9476a 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 eb15995c2ffa..1a48aae801de 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 253ba29987d4..df76b7e88aab 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 4c7428a62820..d73119b23387 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 2a4cd729399d..9aeec4649803 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 dda23a913472..9d005b461d36 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 e21cdcdb0b22..a381f7858894 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 d896e70c2294..65702ba952b0 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 b1219d470852..36317dc8b2f3 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 60fc785c7e6c..b5dc3cc681ae 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 832467749e3c..e780537a9760 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 9a8bd9b57c85..b896e731fb8c 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 8d2dd1a31365..f4401d7c46df 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 50eaf9434ec4..4f322e01da30 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 2ac2d0e7331d..e784aaa2f274 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 b32b0d000811..db3d74fd3406 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 a01a1c569006..e8cbf9d8083a 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 6b84cbe798ca..2a4ea815b577 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 8d4a9af87ec2..a64ee7c6f25d 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 c1825c4e75ad..f42ad5108618 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 c2e108cb666a..a410f682ff8a 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 95ba515ee8b9..740798ba309b 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 7c392dd28873..40acdb9ec20e 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 1620b70b5f16..e4abc56ebda1 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 7bbbb3e8dc9c..2f8e1b3f1a29 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 9b6a79ef595d..848f7bcc4a3d 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 50555419dd4c..78bafc4a3e18 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 07f95ee1df8a..3ed4b4fb30a1 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 c5413bddba31..f7b7fd11fc44 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 e54540a8ca5a..546b15b392eb 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 216010883505..bf6720bc3649 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 53bb6b5a7b42..64ee63ca54dc 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 4d2c0e7a5e75..cd1ac2368823 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 6bacd36317bf..e472ab7439e8 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 ea6f9f42f878..e449604325d6 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 399ef18b4e50..57a01a919262 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 c37f2fa038bd..af89b52cca87 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 06a9120c8c4a..a1132270586e 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 503f624dd741..a5663b72a23f 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 b927d7a89873..b58f0443c0d6 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 22ab5972488f..b5e988291359 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 891bbb152f43..6c205015c4f7 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 b731a091a405..9c26c95168bd 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 521a14d55f73..06d72300802a 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 67a50cfe3e7d..b1cb8993f0b4 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 63e889ed6c17..be228d0cf968 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 fe392d519022..24fdd6594974 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 cbd5f5f22e58..fe8f9500bd46 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 0e7ff714f6e6..b2466b0dbd2f 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 3dfb5bc87267..87e7c58400a8 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 ac8d4fb7d336..7d09e4aa4be5 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 87abfd42c563..c6a383ca71d2 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 e1cdbb966389..f2bc72abd15a 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 bed07013bdbe..eb4e266b22e4 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 b7ad9349db92..b7d92917ff4b 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 a6e53da8dd5d..0d295ec1bbb0 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 43dc2682af51..bbd9d4acb633 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 133c0259b84c..cab9b31075b9 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 359507785ac6..5e644db4c2ad 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 2f43834a5b81..e9c908faa2ee 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 63d3020c4eb9..959131002ee9 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 ecc375fbcf06..3c6d091ced99 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 9674e22e8217..909aeb272569 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 c2286d67a599..b4f5ea3c7c13 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 f323512c4eb3..faa815246596 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 5c4472e669f5..b23aceef3e66 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 ee75cf8ac4b5..326777335588 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 a237eb08a1de..285ca89979ae 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 ad86785c619f..f616ac5b654f 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 bb978b4b029d..846c40643305 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 ac5965b316d5..332861033f31 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 07012c0d6870..eac701791376 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 a202d67c147f..d4237206f475 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 6b5e5900f9c0..5e4ce54adf40 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 f5812c904e5f..43a30922d115 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 5bbc021bc318..a885737b9c44 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 1485a7e9a83b..6aa68f5b3a38 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 ff1f767db4e7..ea331f92974c 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 360ac000f462..0b899cdd5a8e 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 66bc69879a93..e7243509804a 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 a23f2028dc50..469018a1ebda 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 52678967394b..28a756d772ef 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 5d96c613a877..dc0b86197ab6 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 043d2d33dde5..514db3a4c5c3 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 2ce294f854d1..6f9327636767 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 4b1e3044e699..79a6a8573fe6 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 dcfc34f3eeab..e00ac0ee5a15 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 ea164cacc971..4d05b45fabeb 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 9eba38759156..6f20821c72aa 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 3b9d2303ebc4..a411be36e21f 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 4d876839d917..7c78cfee2a1c 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 e6ff5c12b58d..664f90593114 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 e4290dc401c7..e5edfaa2ab88 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 7ab2a39ffe0a..bc22a019f086 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 eda2d202ff20..0897ddc5d5cf 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 2bdbe6f83af4..ac753690e485 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 ecc0b1dcafac..be082a24103a 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 e0598defdec9..607fd06bcbc7 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 16e4d38335cc..4cb807da79ec 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 e4f07b59d1bb..deca536063ab 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 2abddb9344e9..8949459ca36e 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 07c5ab946a3d..ffaa170b32e8 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 61a6932188cb..c8fae1227508 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 62348a93a883..acfe538d0126 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 ed082ce4ebb5..9c0c2cc249ef 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 9ec92c7be9bb..08cdb4acfeb6 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 25f758e9e6b2..9137e986d914 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 9684e6e59b92..bdad2f8f3566 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 418ba831cb86..716612d0ac09 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 0724ceccae64..f831e3346edb 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 29461cb78d8b..df44e6910d52 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 6a49fe9d76f1..8f1f81b1593b 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 567a2671a294..02dc012014c8 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 7e6890d52f48..0b7cb824a581 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 db3f0b35d116..144ae1f1d1fe 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 39272bf9ddfa..17a500b4719b 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 6aa87a5f993b..9aadf58aeffd 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 220c2d48bc3b..cea84965b576 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 a46f43ddb10b..86fe835183e4 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 d46f21a43f13..5005a44af2cc 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 a6f1757532f5..3697dc3b9fd5 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 f98b64c1e271..796175bb356d 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 0fe0ef85315a..1ada6ef207f9 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 1d4eba695d7c..4d3278aed0c2 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 3a8689c1c404..118a93fea240 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 ff73f917c1ac..76498c471fa4 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 53f06c715acf..591ca97d5d90 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 6dfda5703cc7..21fcc56ed77a 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 cecc0282c1d0..7b1d3588e26d 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 24aeb7e74ee4..f446a57b37a9 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 aa12513dc745..e483026d8435 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 a1d4b291f29f..a4602e23d1ce 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 8577982491ab..45931f219f37 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 8f4f91bbf5ef..49c820307c84 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 11ffc418de92..97073a1761d6 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 57664278043c..2c975b038079 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 8c34fb502fd7..b24893593a52 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 221d6944aaad..a25f72e57595 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 cb3c22a80319..480d79e392f3 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 8cf9cbc9d226..ad062ea38cb5 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 59ef09d7d159..ff72e8ed51eb 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 4efa00f54af0..9282fa7d7e85 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 234d66cc3751..efc877bd9906 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 5c6749bd645c..71510591494e 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 45e763cb009f..13b40f281bcf 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 693620bd1003..907ddf164ee4 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 63a5f256a913..0d7b0e30e0c2 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 8d7aef34d5a1..05fa0d2bbfb6 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 23f23c663d9e..1e6ca6eea8e7 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 ee0dd28278ea..96925869b1ad 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 b2fcbf2a025c..eb776bcf307b 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 a3f28a518362..652ec3ca5f40 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 dcb0d796adf6..ccb391231985 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 a05f63a77cd0..6a2bc9724237 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 f49ca2ff9a79..a42eb221f00d 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 306f1fa3369e..eae2d6a35940 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 56901f2d25f0..a0862942a3b4 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 7579f3a24fa2..410f08da169b 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 1bcd48b15c58..1617030c9aa7 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 8f38c2dfe32d..03483171d5be 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 8b38426fc652..f4333fe85677 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 010c455acd30..deda4f5803e1 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 50f517b6f306..f7b52aed56d2 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", ], ) 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 6f0c0e4696ec..641eb5409ee4 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 361609bcdcfc..b9c05f3c4759 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 a652c5e9d40e..1cf0d16c79b9 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 724e9d5e4289..4f8594bbe4ea 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 1c91ae642dd9..07249bcfe841 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 d8c82b845017..889f4eeab7a9 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 9df0987dbab3..034d9b1365f0 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 00862c91bf1e..c4e31aaab46d 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 a6ac6f290e31..7ed824b7c236 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 c75ce3df1331..117c11682877 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 66a5d61b3711..29d4404ae6b4 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 993fc0da13c8..574ab55fece9 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 b230c5e4be3d..420b4295d860 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 360b98275273..0f730a32da7d 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 52063ff17009..ba1ecd0abd37 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 ba8f091b83fd..79724d85b49a 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 2281eadea942..9718eb95d28e 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 9f23bc663117..0ee9fab7b468 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 3ea7353f77e9..296fdd3a6510 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 714c3091bad4..5102a22a608c 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 9ffe6a003561..1ae7d7c1f1b6 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 770d43655b29..bec72f27b53b 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 ffa581456f0f..f961fb056ccc 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 5c11d6172f69..b09b08d75c01 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 f70b50b5bd9a..a6a60444ef3f 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 7cdd4595ef3e..964d56230cbd 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 c56ccd3753e3..3da0e4c3e208 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 fcfa4033e704..65adf16a989b 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 95cd8767f86b..2d97ff2ef31b 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 aef4d925b129..286346f3a1b2 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 25cf03a07c94..cd40df0e39ad 100644 --- a/test/extensions/tracers/xray/BUILD +++ b/test/extensions/tracers/xray/BUILD @@ -44,6 +44,8 @@ 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", + "@envoy_api//envoy/config/trace/v2alpha:pkg_cc_proto", ], ) diff --git a/test/extensions/tracers/xray/config_test.cc b/test/extensions/tracers/xray/config_test.cc index 36e911ba3edc..7fe7e41e29e2 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/v2alpha/xray.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 3de3f8afee90..6c74cb5de40e 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 750596655291..5c698899f48b 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 1ef6e88e6485..27b77859b766 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 a605e3e0ebae..8bcade8425ea 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 10a99ff65dd1..8c7cbfa6f27e 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 23748aa098b8..fc42eb9b0f4d 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 a17405dc7e08..6e1ae044c469 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 73ab498e35d5..d9ee09ac0d30 100644 --- a/test/extensions/transport_sockets/tls/BUILD +++ b/test/extensions/transport_sockets/tls/BUILD @@ -54,6 +54,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", ], ) @@ -81,6 +84,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", ], ) @@ -132,5 +136,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 59e307b0e51e..9780f7c1319c 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 6f5efbed04bb..79ee5129ce4e 100644 --- a/test/extensions/transport_sockets/tls/integration/BUILD +++ b/test/extensions/transport_sockets/tls/integration/BUILD @@ -28,7 +28,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 b439f2e25f97..4b86fd895aaa 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 3b5da36d0e1a..79e318683744 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 ca10cd596d16..417ddff3ebb6 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 44507b1c1a55..7e911baf6b74 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 62771bd42b48..a455633c201d 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 ed41847dc19e..3c3d24948e36 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", ], ) @@ -698,6 +754,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", ], ) @@ -724,6 +782,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", ], ) @@ -750,7 +812,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", ], ) @@ -767,7 +832,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", ], ) @@ -794,6 +858,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", ], ) @@ -826,6 +891,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", ], ) @@ -844,6 +911,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", ], ) @@ -874,7 +943,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( @@ -892,6 +964,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 e3d7874cd5a0..3442c76bc42b 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 56e7b33be962..e750ef111ddb 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 a418c3278fd8..4f63cfe2d81f 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 0447bc03403c..3c3236c93cac 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 b94c0314fd0b..97231e7935d0 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 77c3aa671b1d..38127455be34 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 d07886601a5b..504e18f42b88 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 87cc5e8cf48b..6e80fcb674d3 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 c5f59de1b0b6..945b42a05d62 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 0c044bcb46cf..764f3349ab38 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 99f01d515ddd..7ff2cf3e6835 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 aaff549c7eb0..42a637b270e4 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 c5da97f66506..4a3c01777238 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 78104d71541d..b3b4bb5d138a 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 13bf87cd430a..4c1a311e9a3f 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 687080c0e2e4..e8c1e31d9930 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 51996a6bacef..2f6a9a708f29 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 2c253e5f3b16..57389864cd0e 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 90523c8d7b45..1cbda9125e6c 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 b75c75bf3c97..4ad710919deb 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 84a2bd956846..4d0fad6296e3 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 5c73fcbfeef4..40404c2a684d 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 ad47453cab7f..2cbc05466b8f 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 79c2cd7ae0ea..10f309dfe3a1 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 2e088e52390e..1120797dc607 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 91f5a837c914..7beaec4571cd 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 d4e2b1bfa53f..ffe3f57ee722 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 ba592e487bbf..7c8b22b0b434 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 00235f30478b..4921d4cd6868 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 acd24267ec9c..0dd2b424b3a9 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 39e98f3e5ffb..3070e62c465f 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 cd8b4de73ea5..e1d4cc67a015 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 e936ec2648f9..4b4063916264 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 a9a9cbca401a..0065fddf207d 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 8ee9d2d1c2f0..c95c81974a48 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 6f223f1a626d..13baeb7ad170 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 3caca65ec896..c1ac2d9c9f09 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 60f697af7cc0..1027dd95304f 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 5493fde73c24..534eb129ab0e 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 cafea4246312..9a982e74ddf3 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 3e9066673850..63774f916894 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 52af564948ed..131067c897f7 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 41410b123433..e481799f3814 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 5c19347a39d7..068530969862 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 43448ea3ed7a..bfe5f0cce4ee 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 f1633a693b9f..12415e3863b7 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 d83d88d80242..77ef548b4a8a 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 1e54a38c20a4..767fc592151e 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 618e874071e3..8fd4985f4724 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 3b975c08afef..5cc4791c1b6f 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 56f4545c6f56..9c7f2b85f1ed 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 5e1ad2082890..e45fd6e03f9c 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 c9bc1a0a8d46..4523b97d98fe 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 4a3e3099e0c1..ae5053448e8e 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 7fdf47552197..b54bb76d50b5 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 4b7c4d65649e..445bf1b5e97b 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 e94e7785abb7..586dad907523 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 497e56d04472..c302fc968595 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 655eaaf59030..42c3d5f421fd 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 bc545d330634..bc7b2f76ca1d 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 876402559c1c..5fb7a916ad04 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 6330d5075370..1f2c5f99fb7d 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 d5d8729cccad..63441978475a 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 50787638c848..afec397ef347 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 7aed549bc387..4b9c19ff6cbe 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 19416df01257..74899865f487 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 43fc682bb7da..4a452f26e27e 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 30fd6ae5d622..300cd19811f4 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 93ba29fa5edc..955bd1fac76f 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 f58bf23389ac..6025697ac585 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 0b17ced93f38..7c87416d6550 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 d7358f56bb25..93d9c60e58c8 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 28397ff0ed8b..a185eb5c3ed0 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 44e78de20401..af666a3d6ca5 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 cacb79ac8006..ec5c382b09f0 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 171134be370c..1c4ab45f9ae2 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 d3a71a35d5e9..08a250c0672c 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 fef636ef11da..a230c0a0a2c7 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 34ccccf1e5b2..d4937156f074 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 0470f89181c7..0c555a605d4e 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 1e4f9fd6360e..d653f754b34f 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 99328ceaeee4..27a77289b64b 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 c46745df585a..80acd532fa8d 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 43845db29318..8c4c13f19ea3 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", ], ) @@ -250,7 +266,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", ], ) @@ -326,6 +342,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", ], ) @@ -373,6 +390,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 1691c1e62835..734f2635936b 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 e7829296d5f7..b9159181c3b9 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 363ea63e825c..7112a6838b01 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 823290aa4fa2..e591c4197f5e 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 38f077650228..f8cc85fafeb7 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 17d58c3dff09..e3a983c30374 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 88b09c24922c..0742b3146757 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" diff --git a/test/server/http/BUILD b/test/server/http/BUILD index c6789966d89e..05c95287443d 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 9fab43a8ff35..64e42105337a 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 64c56405d558..6e0016947312 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 0946bb5eeb82..3957365ff2a1 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 977a757d8f80..86f9adbeb707 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 2acc73e11440..6eda87072f2d 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 0c4a3ba83d71..efbc9cc15c2b 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 7ee741245d5d..15ca5f17d8c5 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 df47293d7cea..634426ab5770 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 d7fd26309c91..877c884e8c8f 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 831177934660..ce42a79dd7dc 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 ca796ca23f65..3b8f87129d45 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 7a2ef2af6f08..15969e64411c 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 ec1f0c32245e..a6963c49ad61 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 eacd06156d62..a37239b02fd9 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 1d0d311e47dc..f079f0319fd7 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 a3ed3d18cef4..a9671afce00f 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 936589c8ca46..ac23bfff95bb 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 8083e356c994..d56f7c25536f 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/api_boost.py b/tools/api_boost/api_boost.py index 608f143f0c05..4bcd7b4b17d5 100755 --- a/tools/api_boost/api_boost.py +++ b/tools/api_boost/api_boost.py @@ -97,8 +97,7 @@ def ApiBoostTree(args): ] # Figure out some cc_libraries that cover most of our external deps. This is # the same logic as in gen_compilation_database.py. - query = 'attr(include_prefix, ".+", kind(cc_library, deps({})))'.format( - ' union '.join(dep_build_targets)) + query = 'kind(cc_library, {})'.format(' union '.join(dep_build_targets)) dep_lib_build_targets = sp.check_output(['bazel', 'query', query]).decode().splitlines() # We also need some misc. stuff such as test binaries for setup of benchmark # dep. diff --git a/tools/clang_tools/api_booster/main.cc b/tools/clang_tools/api_booster/main.cc index baaaf0d7adb0..ab45b7ba5ea5 100644 --- a/tools/clang_tools/api_booster/main.cc +++ b/tools/clang_tools/api_booster/main.cc @@ -156,7 +156,8 @@ class ApiBooster : public clang::ast_matchers::MatchFinder::MatchCallback, 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")) { + !absl::StartsWith(proto_type_name, "envoy.test") && + !absl::StartsWith(proto_type_name, "envoy.tracers.xray.daemon")) { // 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;