From 96da3dc126cfa95ae75a2c216c883f8116eebb8f Mon Sep 17 00:00:00 2001 From: Alyssa Wilk Date: Tue, 19 Mar 2024 11:08:39 -0400 Subject: [PATCH] srds: removing hard link in binary Signed-off-by: Alyssa Wilk --- envoy/config/config_provider_manager.h | 3 +- envoy/router/BUILD | 1 + envoy/router/route_config_provider_manager.h | 27 +++ .../envoy_build_config/extension_registry.cc | 2 - mobile/test/performance/files_em_does_not_use | 1 + source/common/config/config_provider_impl.h | 2 +- source/common/router/scoped_rds.cc | 10 +- source/common/router/scoped_rds.h | 32 ++++ source/exe/BUILD | 1 + .../network/http_connection_manager/BUILD | 1 - .../network/http_connection_manager/config.cc | 41 +++-- .../network/http_connection_manager/config.h | 9 +- .../config_filter_chain_test.cc | 16 +- .../config_filter_dependencies_test.cc | 18 +- .../http_connection_manager/config_test.cc | 161 +++++++++--------- .../config_test_base.h | 2 +- test/integration/BUILD | 1 + 17 files changed, 198 insertions(+), 130 deletions(-) diff --git a/envoy/config/config_provider_manager.h b/envoy/config/config_provider_manager.h index 3af10f1d3ae80..06f181607e2a9 100644 --- a/envoy/config/config_provider_manager.h +++ b/envoy/config/config_provider_manager.h @@ -4,6 +4,7 @@ #include "envoy/config/config_provider.h" #include "envoy/server/filter_config.h" +#include "envoy/singleton/instance.h" #include "source/common/protobuf/protobuf.h" @@ -23,7 +24,7 @@ namespace Config { * growth based on the size of the configuration set, regardless of the number of threads/objects * that must hold a reference/pointer to them. */ -class ConfigProviderManager { +class ConfigProviderManager : public Singleton::Instance { public: class OptionalArg { public: diff --git a/envoy/router/BUILD b/envoy/router/BUILD index e3306bee49071..9e03be2321c4f 100644 --- a/envoy/router/BUILD +++ b/envoy/router/BUILD @@ -32,6 +32,7 @@ envoy_cc_library( hdrs = ["route_config_provider_manager.h"], deps = [ ":rds_interface", + "//envoy/config:config_provider_manager_interface", "//envoy/event:dispatcher_interface", "//envoy/json:json_object_interface", "//envoy/local_info:local_info_interface", diff --git a/envoy/router/route_config_provider_manager.h b/envoy/router/route_config_provider_manager.h index 67a184f2ba8e6..1bd9bea96203a 100644 --- a/envoy/router/route_config_provider_manager.h +++ b/envoy/router/route_config_provider_manager.h @@ -3,7 +3,9 @@ #include #include +#include "envoy/config/config_provider_manager.h" #include "envoy/config/route/v3/route.pb.h" +#include "envoy/config/typed_config.h" #include "envoy/event/dispatcher.h" #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h" #include "envoy/json/json_object.h" @@ -59,5 +61,30 @@ class RouteConfigProviderManager { using RouteConfigProviderManagerPtr = std::unique_ptr; using RouteConfigProviderManagerSharedPtr = std::shared_ptr; +// This factory exists to avoid direct-linking the SRDS libraries into Envoy so +// they can be compiled or substituted out. +class SrdsFactory : public Envoy::Config::UntypedFactory { +public: + // UntypedFactory + virtual std::string category() const override { return "envoy.srds_factory"; } + virtual std::unique_ptr + createScopedRoutesConfigProviderManager( + Server::Configuration::ServerFactoryContext& factory_context, + Router::RouteConfigProviderManager& route_config_provider_manager) PURE; + // If enabled in the HttpConnectionManager config, returns a ConfigProvider for scoped routing + // configuration. + virtual Envoy::Config::ConfigProviderPtr createConfigProvider( + const envoy::extensions::filters::network::http_connection_manager::v3::HttpConnectionManager& + config, + Server::Configuration::ServerFactoryContext& factory_context, const std::string& stat_prefix, + Envoy::Config::ConfigProviderManager& scoped_routes_config_provider_manager) PURE; + + // If enabled in the HttpConnectionManager config, returns a ConfigProvider for scoped routing + // configuration. + virtual ScopeKeyBuilderPtr createScopeKeyBuilder( + const envoy::extensions::filters::network::http_connection_manager::v3::HttpConnectionManager& + config) PURE; +}; + } // namespace Router } // namespace Envoy diff --git a/mobile/envoy_build_config/extension_registry.cc b/mobile/envoy_build_config/extension_registry.cc index 6a14f920c7bfc..836973465ef59 100644 --- a/mobile/envoy_build_config/extension_registry.cc +++ b/mobile/envoy_build_config/extension_registry.cc @@ -146,8 +146,6 @@ void ExtensionRegistry::registerFactories() { // These are required to support specific route configs, if they are on. // It's likely no current users of E-M require them so we could optionally compile out by default. Router::forceRegisterDefaultEarlyDataPolicyFactory(); - Router::forceRegisterRouteListMatchActionFactory(); - Router::forceRegisterRouteMatchActionFactory(); Extensions::UriTemplate::Match::forceRegisterUriTemplateMatcherFactory(); Extensions::UriTemplate::Rewrite::forceRegisterUriTemplateRewriterFactory(); Http::Matching::forceRegisterHttpRequestHeadersDataInputFactory(); diff --git a/mobile/test/performance/files_em_does_not_use b/mobile/test/performance/files_em_does_not_use index 46569cf0675f6..577362f5779c3 100644 --- a/mobile/test/performance/files_em_does_not_use +++ b/mobile/test/performance/files_em_does_not_use @@ -8,3 +8,4 @@ source/server/guarddog_impl.h source/server/watchdog_impl.h source/server/options_impl.cc source/extensions/access_loggers/common/file_access_log_impl.h +source/common/router/scoped_rds.h diff --git a/source/common/config/config_provider_impl.h b/source/common/config/config_provider_impl.h index e346780031b71..0c911f33078df 100644 --- a/source/common/config/config_provider_impl.h +++ b/source/common/config/config_provider_impl.h @@ -377,7 +377,7 @@ class MutableConfigProviderCommonBase : public ConfigProvider { * This class can not be instantiated directly; instead, it provides the foundation for * dynamic config provider implementations which derive from it. */ -class ConfigProviderManagerImplBase : public ConfigProviderManager, public Singleton::Instance { +class ConfigProviderManagerImplBase : public ConfigProviderManager { public: /** * This is invoked by the /config_dump admin handler. diff --git a/source/common/router/scoped_rds.cc b/source/common/router/scoped_rds.cc index 3e4c6526df493..a9282ecb6373f 100644 --- a/source/common/router/scoped_rds.cc +++ b/source/common/router/scoped_rds.cc @@ -93,13 +93,11 @@ makeScopedRouteInfos(ProtobufTypes::ConstMessagePtrVector&& config_protos, MessageUtil::downcastAndValidate( *config_proto, factory_context.messageValidationContext().staticValidationVisitor()); if (!scoped_route_config.route_configuration_name().empty()) { - throwEnvoyExceptionOrPanic( - "Fetching routes via RDS (route_configuration_name) is not supported " - "with inline scoped routes."); + throw EnvoyException("Fetching routes via RDS (route_configuration_name) is not supported " + "with inline scoped routes."); } if (!scoped_route_config.has_route_configuration()) { - throwEnvoyExceptionOrPanic( - "You must specify a route_configuration with inline scoped routes."); + throw EnvoyException("You must specify a route_configuration with inline scoped routes."); } RouteConfigProviderPtr route_config_provider = config_provider_manager.routeConfigProviderManager().createStaticRouteConfigProvider( @@ -636,5 +634,7 @@ ConfigProviderPtr ScopedRoutesConfigProviderManager::createStaticConfigProvider( typed_optarg.rds_config_source_); } +REGISTER_FACTORY(SrdsFactoryDefault, SrdsFactory); + } // namespace Router } // namespace Envoy diff --git a/source/common/router/scoped_rds.h b/source/common/router/scoped_rds.h index b10b518493ba4..cbbec39cac2ed 100644 --- a/source/common/router/scoped_rds.h +++ b/source/common/router/scoped_rds.h @@ -320,5 +320,37 @@ class ScopedRoutesConfigProviderManagerOptArg const envoy::config::core::v3::ConfigSource& rds_config_source_; }; +class SrdsFactoryDefault : public SrdsFactory { +public: + // UntypedFactory + virtual std::string name() const override { return "envoy.srds_factory.default"; } + + virtual std::unique_ptr + createScopedRoutesConfigProviderManager( + Server::Configuration::ServerFactoryContext& factory_context, + RouteConfigProviderManager& route_config_provider_manager) override { + return std::make_unique( + factory_context.admin(), route_config_provider_manager); + } + + Envoy::Config::ConfigProviderPtr createConfigProvider( + const envoy::extensions::filters::network::http_connection_manager::v3::HttpConnectionManager& + config, + Server::Configuration::ServerFactoryContext& factory_context, const std::string& stat_prefix, + Envoy::Config::ConfigProviderManager& scoped_routes_config_provider_manager) override { + return Router::ScopedRoutesConfigProviderUtil::create( + config, factory_context, factory_context.initManager(), stat_prefix, + scoped_routes_config_provider_manager); + } + + // If enabled in the HttpConnectionManager config, returns a ConfigProvider for scoped routing + // configuration. + ScopeKeyBuilderPtr createScopeKeyBuilder( + const envoy::extensions::filters::network::http_connection_manager::v3::HttpConnectionManager& + config) override { + return Router::ScopedRoutesConfigProviderUtil::createScopeKeyBuilder(config); + } +}; + } // namespace Router } // namespace Envoy diff --git a/source/exe/BUILD b/source/exe/BUILD index cd7d5706b12f3..76dfa429a524d 100644 --- a/source/exe/BUILD +++ b/source/exe/BUILD @@ -165,6 +165,7 @@ envoy_cc_library( # TODO(wbpcode) make this a proper extension "//source/extensions/filters/http/match_delegate:config", "//source/common/http:rds_lib", + "//source/common/router:scoped_rds_lib", ] + envoy_select_enable_http3(["//source/common/quic:server_codec_lib"]), ) diff --git a/source/extensions/filters/network/http_connection_manager/BUILD b/source/extensions/filters/network/http_connection_manager/BUILD index 0dd2d064b2f34..8fc12dd14ca05 100644 --- a/source/extensions/filters/network/http_connection_manager/BUILD +++ b/source/extensions/filters/network/http_connection_manager/BUILD @@ -51,7 +51,6 @@ envoy_cc_extension( "//source/common/network:cidr_range_lib", "//source/common/protobuf:utility_lib", "//source/common/router:rds_lib", - "//source/common/router:scoped_rds_lib", "//source/common/runtime:runtime_lib", "//source/common/tracing:custom_tag_lib", "//source/common/tracing:http_tracer_lib", diff --git a/source/extensions/filters/network/http_connection_manager/config.cc b/source/extensions/filters/network/http_connection_manager/config.cc index 1bfa9b129523e..42e6b4c89bb0b 100644 --- a/source/extensions/filters/network/http_connection_manager/config.cc +++ b/source/extensions/filters/network/http_connection_manager/config.cc @@ -34,7 +34,6 @@ #include "source/common/protobuf/utility.h" #include "source/common/quic/server_connection_factory.h" #include "source/common/router/rds_impl.h" -#include "source/common/router/scoped_rds.h" #include "source/common/runtime/runtime_impl.h" #include "source/common/tracing/custom_tag_impl.h" #include "source/common/tracing/tracer_config_impl.h" @@ -211,6 +210,7 @@ createHeaderValidatorFactory([[maybe_unused]] const envoy::extensions::filters:: SINGLETON_MANAGER_REGISTRATION(date_provider); SINGLETON_MANAGER_REGISTRATION(route_config_provider_manager); SINGLETON_MANAGER_REGISTRATION(scoped_routes_config_provider_manager); +static const std::string srds_factory_name = "envoy.srds_factory.default"; Utility::Singletons Utility::createSingletons(Server::Configuration::FactoryContext& context) { auto& server_context = context.serverFactoryContext(); @@ -227,15 +227,19 @@ Utility::Singletons Utility::createSingletons(Server::Configuration::FactoryCont SINGLETON_MANAGER_REGISTERED_NAME(route_config_provider_manager), [&server_context] { return std::make_shared(server_context.admin()); }); - - Router::ScopedRoutesConfigProviderManagerSharedPtr scoped_routes_config_provider_manager = - server_context.singletonManager().getTyped( + std::shared_ptr scoped_routes_config_provider_manager = + server_context.singletonManager().getTyped( SINGLETON_MANAGER_REGISTERED_NAME(scoped_routes_config_provider_manager), - [&server_context, route_config_provider_manager] { - return std::make_shared( - server_context.admin(), *route_config_provider_manager); + [&server_context, route_config_provider_manager]() + -> std::shared_ptr { + auto srds_factory = + Envoy::Config::Utility::getFactoryByName(srds_factory_name); + if (srds_factory) { + return srds_factory->createScopedRoutesConfigProviderManager( + server_context, *route_config_provider_manager); + } + return nullptr; }); - auto tracer_manager = Tracing::TracerManagerImpl::singleton(context); std::shared_ptr filter_config_provider_manager = @@ -251,7 +255,7 @@ absl::StatusOr> Utility::createConf proto_config, Server::Configuration::FactoryContext& context, Http::DateProvider& date_provider, Router::RouteConfigProviderManager& route_config_provider_manager, - Config::ConfigProviderManager& scoped_routes_config_provider_manager, + Config::ConfigProviderManager* scoped_routes_config_provider_manager, Tracing::TracerManager& tracer_manager, FilterConfigProviderManager& filter_config_provider_manager) { absl::Status creation_status = absl::OkStatus(); @@ -281,7 +285,7 @@ HttpConnectionManagerFilterConfigFactory::createFilterFactoryFromProtoAndHopByHo auto filter_config = THROW_OR_RETURN_VALUE( Utility::createConfig(proto_config, context, *singletons.date_provider_, *singletons.route_config_provider_manager_, - *singletons.scoped_routes_config_provider_manager_, + singletons.scoped_routes_config_provider_manager_.get(), *singletons.tracer_manager_, *singletons.filter_config_provider_manager_), std::shared_ptr); @@ -337,7 +341,7 @@ HttpConnectionManagerConfig::HttpConnectionManagerConfig( config, Server::Configuration::FactoryContext& context, Http::DateProvider& date_provider, Router::RouteConfigProviderManager& route_config_provider_manager, - Config::ConfigProviderManager& scoped_routes_config_provider_manager, + Config::ConfigProviderManager* scoped_routes_config_provider_manager, Tracing::TracerManager& tracer_manager, FilterConfigProviderManager& filter_config_provider_manager, absl::Status& creation_status) : context_(context), stats_prefix_(fmt::format("http.{}.", config.stat_prefix())), @@ -522,6 +526,8 @@ HttpConnectionManagerConfig::HttpConnectionManagerConfig( early_header_mutation_extensions_.push_back(std::move(extension)); } + auto srds_factory = + Envoy::Config::Utility::getFactoryByName(srds_factory_name); // If scoped RDS is enabled, avoid creating a route config provider. Route config providers // will be managed by the scoped routing logic instead. switch (config.route_specifier_case()) { @@ -535,10 +541,13 @@ HttpConnectionManagerConfig::HttpConnectionManagerConfig( break; case envoy::extensions::filters::network::http_connection_manager::v3::HttpConnectionManager:: RouteSpecifierCase::kScopedRoutes: - scoped_routes_config_provider_ = Router::ScopedRoutesConfigProviderUtil::create( - config, context_.serverFactoryContext(), context_.initManager(), stats_prefix_, - scoped_routes_config_provider_manager_); - scope_key_builder_ = Router::ScopedRoutesConfigProviderUtil::createScopeKeyBuilder(config); + if (!srds_factory || !scoped_routes_config_provider_manager_) { + throwEnvoyExceptionOrPanic("SRDS configured but not compiled in"); + } + scoped_routes_config_provider_ = + srds_factory->createConfigProvider(config, context_.serverFactoryContext(), stats_prefix_, + *scoped_routes_config_provider_manager_); + scope_key_builder_ = srds_factory->createScopeKeyBuilder(config); break; case envoy::extensions::filters::network::http_connection_manager::v3::HttpConnectionManager:: RouteSpecifierCase::ROUTE_SPECIFIER_NOT_SET: @@ -838,7 +847,7 @@ HttpConnectionManagerFactory::createHttpConnectionManagerFactoryFromProto( auto filter_config = THROW_OR_RETURN_VALUE( Utility::createConfig(proto_config, context, *singletons.date_provider_, *singletons.route_config_provider_manager_, - *singletons.scoped_routes_config_provider_manager_, + singletons.scoped_routes_config_provider_manager_.get(), *singletons.tracer_manager_, *singletons.filter_config_provider_manager_), std::shared_ptr); diff --git a/source/extensions/filters/network/http_connection_manager/config.h b/source/extensions/filters/network/http_connection_manager/config.h index 71a06a6a7ecf3..7f3a0ae586077 100644 --- a/source/extensions/filters/network/http_connection_manager/config.h +++ b/source/extensions/filters/network/http_connection_manager/config.h @@ -35,7 +35,6 @@ #include "source/common/local_reply/local_reply.h" #include "source/common/network/cidr_range.h" #include "source/common/router/rds_impl.h" -#include "source/common/router/scoped_rds.h" #include "source/common/tracing/http_tracer_impl.h" #include "source/extensions/filters/network/common/factory_base.h" #include "source/extensions/filters/network/well_known_names.h" @@ -135,7 +134,7 @@ class HttpConnectionManagerConfig : Logger::Loggable, config, Server::Configuration::FactoryContext& context, Http::DateProvider& date_provider, Router::RouteConfigProviderManager& route_config_provider_manager, - Config::ConfigProviderManager& scoped_routes_config_provider_manager, + Config::ConfigProviderManager* scoped_routes_config_provider_manager, Tracing::TracerManager& tracer_manager, FilterConfigProviderManager& filter_config_provider_manager, absl::Status& creation_status); @@ -307,7 +306,7 @@ class HttpConnectionManagerConfig : Logger::Loggable, Http::ForwardClientCertType forward_client_cert_; std::vector set_current_client_cert_details_; Router::RouteConfigProviderManager& route_config_provider_manager_; - Config::ConfigProviderManager& scoped_routes_config_provider_manager_; + Config::ConfigProviderManager* scoped_routes_config_provider_manager_; FilterConfigProviderManager& filter_config_provider_manager_; CodecType codec_type_; envoy::config::core::v3::Http3ProtocolOptions http3_options_; @@ -388,7 +387,7 @@ class Utility { struct Singletons { std::shared_ptr date_provider_; Router::RouteConfigProviderManagerSharedPtr route_config_provider_manager_; - Router::ScopedRoutesConfigProviderManagerSharedPtr scoped_routes_config_provider_manager_; + std::shared_ptr scoped_routes_config_provider_manager_; Tracing::TracerManagerSharedPtr tracer_manager_; std::shared_ptr filter_config_provider_manager_; }; @@ -416,7 +415,7 @@ class Utility { proto_config, Server::Configuration::FactoryContext& context, Http::DateProvider& date_provider, Router::RouteConfigProviderManager& route_config_provider_manager, - Config::ConfigProviderManager& scoped_routes_config_provider_manager, + Config::ConfigProviderManager* scoped_routes_config_provider_manager, Tracing::TracerManager& tracer_manager, FilterConfigProviderManager& filter_config_provider_manager); }; diff --git a/test/extensions/filters/network/http_connection_manager/config_filter_chain_test.cc b/test/extensions/filters/network/http_connection_manager/config_filter_chain_test.cc index 1dac87eb74d5d..3abd10326edc3 100644 --- a/test/extensions/filters/network/http_connection_manager/config_filter_chain_test.cc +++ b/test/extensions/filters/network/http_connection_manager/config_filter_chain_test.cc @@ -46,7 +46,7 @@ stat_prefix: router TEST_F(FilterChainTest, CreateFilterChain) { HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(basic_config_), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); @@ -81,7 +81,7 @@ stat_prefix: router HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(basic_config_), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); @@ -152,7 +152,7 @@ stat_prefix: router Http::MockStreamDecoderFilterCallbacks decoder_callbacks; HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); @@ -181,7 +181,7 @@ TEST_F(FilterChainTest, CreateUpgradeFilterChain) { HttpConnectionManagerConfig config(hcm_config, context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); @@ -231,7 +231,7 @@ TEST_F(FilterChainTest, CreateUpgradeFilterChainHCMDisabled) { HttpConnectionManagerConfig config(hcm_config, context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); @@ -288,7 +288,7 @@ TEST_F(FilterChainTest, CreateCustomUpgradeFilterChain) { HttpConnectionManagerConfig config(hcm_config, context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); @@ -334,7 +334,7 @@ TEST_F(FilterChainTest, CreateCustomUpgradeFilterChainWithRouterNotLast) { EXPECT_THROW_WITH_MESSAGE( HttpConnectionManagerConfig(hcm_config, context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_), EnvoyException, "Error: terminal filter named envoy.filters.http.router of type envoy.filters.http.router " @@ -348,7 +348,7 @@ TEST_F(FilterChainTest, InvalidConfig) { HttpConnectionManagerConfig config(hcm_config, context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); EXPECT_EQ(creation_status_.message(), "Error: multiple upgrade configs with the same name: 'websocket'"); diff --git a/test/extensions/filters/network/http_connection_manager/config_filter_dependencies_test.cc b/test/extensions/filters/network/http_connection_manager/config_filter_dependencies_test.cc index 75154ec224a4b..4d8730ef91974 100644 --- a/test/extensions/filters/network/http_connection_manager/config_filter_dependencies_test.cc +++ b/test/extensions/filters/network/http_connection_manager/config_filter_dependencies_test.cc @@ -84,7 +84,7 @@ TEST_F(HttpConnectionManagerConfigTest, UnregisteredFilterException) { EXPECT_THROW_WITH_MESSAGE( HttpConnectionManagerConfig(hcm_config, context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_), EnvoyException, "Didn't find a registered implementation for name: 'test.pantry'"); } @@ -102,7 +102,7 @@ TEST_F(HttpConnectionManagerConfigTest, AllDependenciesSatisfiedOk) { Registry::InjectFactory rc(cf); HttpConnectionManagerConfig(hcm_config, context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); } @@ -117,7 +117,7 @@ TEST_F(HttpConnectionManagerConfigTest, UnusedProvidencyOk) { Registry::InjectFactory rf(pf); HttpConnectionManagerConfig(hcm_config, context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); } @@ -133,7 +133,7 @@ TEST_F(HttpConnectionManagerConfigTest, UnmetDependencyError) { HttpConnectionManagerConfig config(hcm_config, context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); EXPECT_EQ(creation_status_.message(), "Dependency violation: filter 'test.chef' requires a FILTER_STATE_KEY named 'potato'"); @@ -154,7 +154,7 @@ TEST_F(HttpConnectionManagerConfigTest, MisorderedDependenciesError) { HttpConnectionManagerConfig config(hcm_config, context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); EXPECT_EQ(creation_status_.message(), "Dependency violation: filter 'test.chef' requires a FILTER_STATE_KEY named 'potato'"); @@ -173,7 +173,7 @@ TEST_F(HttpConnectionManagerConfigTest, UpgradeUnmetDependencyError) { HttpConnectionManagerConfig config(hcm_config, context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); EXPECT_EQ(creation_status_.message(), "Dependency violation: filter 'test.chef' requires a FILTER_STATE_KEY named 'potato'"); @@ -194,7 +194,7 @@ TEST_F(HttpConnectionManagerConfigTest, UpgradeDependencyOK) { HttpConnectionManagerConfig config(hcm_config, context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); } @@ -218,7 +218,7 @@ TEST_F(HttpConnectionManagerConfigTest, UpgradeFilterChainDependenciesIsolatedFr HttpConnectionManagerConfig config(hcm_config, context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); EXPECT_EQ(creation_status_.message(), "Dependency violation: filter 'test.chef' requires a FILTER_STATE_KEY named 'potato'"); @@ -245,7 +245,7 @@ TEST_F(HttpConnectionManagerConfigTest, UpgradeFilterChainDependenciesIsolatedFr HttpConnectionManagerConfig config(hcm_config, context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); EXPECT_EQ(creation_status_.message(), "Dependency violation: filter 'test.chef' requires a FILTER_STATE_KEY named 'potato'"); 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 4567cfeee77bd..b71ee2d89d979 100644 --- a/test/extensions/filters/network/http_connection_manager/config_test.cc +++ b/test/extensions/filters/network/http_connection_manager/config_test.cc @@ -179,7 +179,7 @@ stat_prefix: router HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); @@ -225,7 +225,7 @@ stat_prefix: router EXPECT_CALL(listener_info_, isQuic()).WillOnce(Return(true)); HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); } @@ -289,7 +289,7 @@ stat_prefix: router HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); @@ -331,7 +331,7 @@ stat_prefix: router HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); @@ -370,7 +370,7 @@ tracing: {} # notice that tracing is enabled HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); @@ -414,7 +414,7 @@ tracing: {} # notice that tracing is enabled HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); @@ -476,7 +476,7 @@ stat_prefix: router HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); @@ -509,7 +509,7 @@ stat_prefix: router )EOF"; HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); @@ -536,7 +536,7 @@ TEST_F(HttpConnectionManagerConfigTest, SamplingDefault) { HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); @@ -574,7 +574,7 @@ TEST_F(HttpConnectionManagerConfigTest, SamplingConfigured) { HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); @@ -611,7 +611,7 @@ TEST_F(HttpConnectionManagerConfigTest, FractionalSamplingConfigured) { HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); @@ -648,7 +648,7 @@ TEST_F(HttpConnectionManagerConfigTest, OverallSampling) { HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); @@ -698,7 +698,7 @@ TEST_F(HttpConnectionManagerConfigTest, UnixSocketInternalAddress) { HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); Network::Address::PipeInstance unixAddress{"/foo"}; @@ -727,7 +727,7 @@ TEST_F(HttpConnectionManagerConfigTest, CidrRangeBasedInternalAddress) { HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); Network::Address::Ipv4Instance first_internal_ip_address{"100.64.0.10", 0, nullptr}; @@ -760,7 +760,7 @@ TEST_F(HttpConnectionManagerConfigTest, MaxRequestHeadersKbDefault) { HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); EXPECT_EQ(60, config.maxRequestHeadersKb()); @@ -780,7 +780,7 @@ TEST_F(HttpConnectionManagerConfigTest, MaxRequestHeadersKbConfigured) { HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); EXPECT_EQ(16, config.maxRequestHeadersKb()); @@ -800,7 +800,7 @@ TEST_F(HttpConnectionManagerConfigTest, MaxRequestHeadersKbMaxConfigurable) { HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); EXPECT_EQ(8192, config.maxRequestHeadersKb()); @@ -823,7 +823,7 @@ TEST_F(HttpConnectionManagerConfigTest, MaxRequestHeadersKbMaxConfiguredViaRunti HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); EXPECT_EQ(9000, config.maxRequestHeadersKb()); @@ -844,7 +844,7 @@ TEST_F(HttpConnectionManagerConfigTest, DisabledStreamIdleTimeout) { HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); EXPECT_EQ(0, config.streamIdleTimeout().count()); @@ -866,7 +866,7 @@ TEST_F(HttpConnectionManagerConfigTest, CommonHttpProtocolIdleTimeout) { HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); EXPECT_EQ(1000, config.idleTimeout().value().count()); @@ -886,7 +886,7 @@ TEST_F(HttpConnectionManagerConfigTest, CommonHttpProtocolIdleTimeoutDefault) { HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); EXPECT_EQ(std::chrono::hours(1), config.idleTimeout().value()); @@ -908,7 +908,7 @@ TEST_F(HttpConnectionManagerConfigTest, CommonHttpProtocolIdleTimeoutOff) { HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); EXPECT_FALSE(config.idleTimeout().has_value()); @@ -928,7 +928,7 @@ TEST_F(HttpConnectionManagerConfigTest, DefaultMaxRequestHeaderCount) { HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); EXPECT_EQ(100, config.maxRequestHeadersCount()); @@ -950,7 +950,7 @@ TEST_F(HttpConnectionManagerConfigTest, MaxRequestHeaderCountConfigurable) { HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); EXPECT_EQ(200, config.maxRequestHeadersCount()); @@ -970,7 +970,7 @@ TEST_F(HttpConnectionManagerConfigTest, DefaultMaxRequestPerConnection) { HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); EXPECT_EQ(0, config.maxRequestsPerConnection()); @@ -992,7 +992,7 @@ TEST_F(HttpConnectionManagerConfigTest, MaxRequestPerConnectionConfigurable) { HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); EXPECT_EQ(5, config.maxRequestsPerConnection()); @@ -1016,7 +1016,7 @@ TEST_F(HttpConnectionManagerConfigTest, ServerOverwrite) { &Runtime::MockSnapshot::featureEnabledDefault)); HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); EXPECT_EQ(HttpConnectionManagerConfig::HttpConnectionManagerProto::OVERWRITE, @@ -1041,7 +1041,7 @@ TEST_F(HttpConnectionManagerConfigTest, ServerAppendIfAbsent) { &Runtime::MockSnapshot::featureEnabledDefault)); HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); EXPECT_EQ(HttpConnectionManagerConfig::HttpConnectionManagerProto::APPEND_IF_ABSENT, @@ -1066,7 +1066,7 @@ TEST_F(HttpConnectionManagerConfigTest, ServerPassThrough) { &Runtime::MockSnapshot::featureEnabledDefault)); HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); EXPECT_EQ(HttpConnectionManagerConfig::HttpConnectionManagerProto::PASS_THROUGH, @@ -1092,7 +1092,7 @@ TEST_F(HttpConnectionManagerConfigTest, SchemeOverwrite) { &Runtime::MockSnapshot::featureEnabledDefault)); HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); EXPECT_EQ(config.schemeToSet(), "http"); @@ -1117,7 +1117,7 @@ TEST_F(HttpConnectionManagerConfigTest, NormalizePathDefault) { &Runtime::MockSnapshot::featureEnabledDefault)); HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); #ifdef ENVOY_NORMALIZE_PATH_BY_DEFAULT @@ -1148,7 +1148,7 @@ TEST_F(HttpConnectionManagerConfigTest, NormalizePathRuntime) { .WillOnce(Return(true)); HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); EXPECT_TRUE(config.shouldNormalizePath()); @@ -1176,7 +1176,7 @@ TEST_F(HttpConnectionManagerConfigTest, NormalizePathTrue) { .Times(0); HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); EXPECT_TRUE(config.shouldNormalizePath()); @@ -1204,7 +1204,7 @@ TEST_F(HttpConnectionManagerConfigTest, NormalizePathFalse) { .Times(0); HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); EXPECT_FALSE(config.shouldNormalizePath()); @@ -1224,7 +1224,7 @@ TEST_F(HttpConnectionManagerConfigTest, MergeSlashesDefault) { HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); EXPECT_FALSE(config.shouldMergeSlashes()); @@ -1245,7 +1245,7 @@ TEST_F(HttpConnectionManagerConfigTest, MergeSlashesTrue) { HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); EXPECT_TRUE(config.shouldMergeSlashes()); @@ -1266,7 +1266,7 @@ TEST_F(HttpConnectionManagerConfigTest, MergeSlashesFalse) { HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); EXPECT_FALSE(config.shouldMergeSlashes()); @@ -1286,7 +1286,7 @@ TEST_F(HttpConnectionManagerConfigTest, RemovePortDefault) { HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); EXPECT_EQ(Http::StripPortType::None, config.stripPortType()); @@ -1307,7 +1307,7 @@ TEST_F(HttpConnectionManagerConfigTest, RemovePortTrue) { HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); EXPECT_EQ(Http::StripPortType::MatchingHost, config.stripPortType()); @@ -1347,7 +1347,7 @@ TEST_F(HttpConnectionManagerConfigTest, RemovePortFalse) { HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); EXPECT_EQ(Http::StripPortType::None, config.stripPortType()); @@ -1368,7 +1368,7 @@ TEST_F(HttpConnectionManagerConfigTest, RemoveAnyPortTrue) { HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); EXPECT_EQ(Http::StripPortType::Any, config.stripPortType()); @@ -1389,7 +1389,7 @@ TEST_F(HttpConnectionManagerConfigTest, RemoveAnyPortFalse) { HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); EXPECT_EQ(Http::StripPortType::None, config.stripPortType()); @@ -1409,7 +1409,7 @@ TEST_F(HttpConnectionManagerConfigTest, RemoveTrailingDotDefault) { HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); EXPECT_EQ(false, config.shouldStripTrailingHostDot()); @@ -1430,7 +1430,7 @@ TEST_F(HttpConnectionManagerConfigTest, RemoveTrailingDotTrue) { HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); EXPECT_EQ(true, config.shouldStripTrailingHostDot()); @@ -1451,7 +1451,7 @@ TEST_F(HttpConnectionManagerConfigTest, RemoveTrailingDotFalse) { HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); EXPECT_EQ(false, config.shouldStripTrailingHostDot()); @@ -1471,7 +1471,7 @@ TEST_F(HttpConnectionManagerConfigTest, HeadersWithUnderscoresAllowedByDefault) HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); EXPECT_EQ(envoy::config::core::v3::HttpProtocolOptions::ALLOW, @@ -1494,7 +1494,7 @@ TEST_F(HttpConnectionManagerConfigTest, HeadersWithUnderscoresDroppedByConfig) { HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); EXPECT_EQ(envoy::config::core::v3::HttpProtocolOptions::DROP_HEADER, @@ -1517,7 +1517,7 @@ TEST_F(HttpConnectionManagerConfigTest, HeadersWithUnderscoresRequestRejectedByC HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); EXPECT_EQ(envoy::config::core::v3::HttpProtocolOptions::REJECT_REQUEST, @@ -1538,7 +1538,7 @@ TEST_F(HttpConnectionManagerConfigTest, ConfiguredRequestTimeout) { HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); EXPECT_EQ(53 * 1000, config.requestTimeout().count()); @@ -1558,7 +1558,7 @@ TEST_F(HttpConnectionManagerConfigTest, DisabledRequestTimeout) { HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); EXPECT_EQ(0, config.requestTimeout().count()); @@ -1577,7 +1577,7 @@ TEST_F(HttpConnectionManagerConfigTest, UnconfiguredRequestTimeout) { HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); EXPECT_EQ(0, config.requestTimeout().count()); @@ -1663,7 +1663,7 @@ TEST_F(HttpConnectionManagerConfigTest, FlushAccessLogOnNewRequest) { { HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(base_yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); @@ -1678,7 +1678,7 @@ TEST_F(HttpConnectionManagerConfigTest, FlushAccessLogOnNewRequest) { HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); @@ -1693,7 +1693,7 @@ TEST_F(HttpConnectionManagerConfigTest, FlushAccessLogOnNewRequest) { HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); @@ -1729,7 +1729,7 @@ TEST_F(HttpConnectionManagerConfigTest, HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); @@ -1784,7 +1784,7 @@ TEST_F(HttpConnectionManagerConfigTest, AccessLogFlushInterval) { { HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(base_yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); @@ -1799,7 +1799,7 @@ TEST_F(HttpConnectionManagerConfigTest, AccessLogFlushInterval) { HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); @@ -1835,7 +1835,7 @@ TEST_F(HttpConnectionManagerConfigTest, DEPRECATED_FEATURE_TEST(DeprecatedAccess HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); @@ -2175,7 +2175,7 @@ TEST_F(HttpConnectionManagerConfigTest, AlwaysSetRequestIdInResponseDefault) { HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); EXPECT_FALSE(config.alwaysSetRequestIdInResponse()); @@ -2195,7 +2195,7 @@ TEST_F(HttpConnectionManagerConfigTest, AlwaysSetRequestIdInResponseConfigured) HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); EXPECT_TRUE(config.alwaysSetRequestIdInResponse()); @@ -2269,7 +2269,7 @@ TEST_F(HttpConnectionManagerConfigTest, CustomRequestIDExtension) { HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); auto request_id_extension = @@ -2336,7 +2336,7 @@ TEST_F(HttpConnectionManagerConfigTest, DefaultRequestIDExtension) { HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); auto request_id_extension = dynamic_cast( @@ -2364,7 +2364,7 @@ TEST_F(HttpConnectionManagerConfigTest, DefaultRequestIDExtensionWithParams) { HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); auto request_id_extension = dynamic_cast( @@ -2516,7 +2516,7 @@ TEST_F(HttpConnectionManagerConfigTest, OriginalIPDetectionExtension) { HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); @@ -2543,7 +2543,7 @@ TEST_F(HttpConnectionManagerConfigTest, EarlyHeaderMutationExtension) { HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); @@ -2864,7 +2864,7 @@ TEST_F(HttpConnectionManagerConfigTest, PathWithEscapedSlashesActionDefault) { .WillRepeatedly(Return(0)); HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); EXPECT_EQ(envoy::extensions::filters::network::http_connection_manager::v3:: @@ -2894,7 +2894,7 @@ TEST_F(HttpConnectionManagerConfigTest, PathWithEscapedSlashesActionDefaultOverr .WillRepeatedly(Return(3)); HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); EXPECT_EQ(envoy::extensions::filters::network::http_connection_manager::v3:: @@ -2907,7 +2907,7 @@ TEST_F(HttpConnectionManagerConfigTest, PathWithEscapedSlashesActionDefaultOverr .WillRepeatedly(Return(4)); HttpConnectionManagerConfig config1(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); EXPECT_EQ(envoy::extensions::filters::network::http_connection_manager::v3:: @@ -2941,7 +2941,7 @@ TEST_F(HttpConnectionManagerConfigTest, .Times(0); HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); EXPECT_EQ(envoy::extensions::filters::network::http_connection_manager::v3:: @@ -2977,7 +2977,7 @@ TEST_F(HttpConnectionManagerConfigTest, PathWithEscapedSlashesActionDefaultOverr .Times(0); HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); EXPECT_EQ(envoy::extensions::filters::network::http_connection_manager::v3:: @@ -3002,7 +3002,7 @@ TEST_F(HttpConnectionManagerConfigTest, SetCurrentClientCertDetailsCertAndChain) HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); EXPECT_EQ(Http::ForwardClientCertType::AppendForward, config.forwardClientCert()); @@ -3103,7 +3103,7 @@ TEST_F(HttpConnectionManagerConfigTest, HeaderValidatorConfig) { #ifdef ENVOY_ENABLE_UHV HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); EXPECT_NE(nullptr, config.makeHeaderValidator(Http::Protocol::Http2)); @@ -3111,7 +3111,7 @@ TEST_F(HttpConnectionManagerConfigTest, HeaderValidatorConfig) { // If UHV is disabled, providing config should result in rejection HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); #endif } @@ -3142,7 +3142,7 @@ TEST_F(HttpConnectionManagerConfigTest, HeaderValidatorConfigWithRuntimeDisabled #ifdef ENVOY_ENABLE_UHV HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); // Without envoy.reloadable_features.enable_universal_header_validator runtime set, UHV is always @@ -3152,7 +3152,7 @@ TEST_F(HttpConnectionManagerConfigTest, HeaderValidatorConfigWithRuntimeDisabled // If UHV is disabled, providing config should result in rejection HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_FALSE(creation_status_.ok()); #endif @@ -3186,7 +3186,7 @@ TEST_F(HttpConnectionManagerConfigTest, DefaultHeaderValidatorConfigWithRuntimeE #ifdef ENVOY_ENABLE_UHV HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); EXPECT_NE(nullptr, config.makeHeaderValidator(Http::Protocol::Http2)); @@ -3203,7 +3203,7 @@ TEST_F(HttpConnectionManagerConfigTest, DefaultHeaderValidatorConfigWithRuntimeE // result in rejection HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_FALSE(creation_status_.ok()); #endif @@ -3232,7 +3232,7 @@ TEST_F(HttpConnectionManagerConfigTest, DefaultHeaderValidatorConfig) { .Times(AnyNumber()); HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); @@ -3276,7 +3276,7 @@ TEST_F(HttpConnectionManagerConfigTest, TranslateLegacyConfigToDefaultHeaderVali #ifdef ENVOY_ENABLE_UHV HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); ASSERT_TRUE(creation_status_.ok()); EXPECT_NE(nullptr, config.makeHeaderValidator(Http::Protocol::Http2)); @@ -3293,7 +3293,7 @@ TEST_F(HttpConnectionManagerConfigTest, TranslateLegacyConfigToDefaultHeaderVali // result in rejection HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); EXPECT_FALSE(creation_status_.ok()); #endif @@ -3320,7 +3320,6 @@ TEST_F(HcmUtilityTest, EnsureCreateSingletonsActuallyReturnsTheSameInstances) { EXPECT_THAT(singletons_one.date_provider_.get(), NotNull()); EXPECT_THAT(singletons_one.route_config_provider_manager_.get(), NotNull()); - EXPECT_THAT(singletons_one.scoped_routes_config_provider_manager_.get(), NotNull()); EXPECT_THAT(singletons_one.tracer_manager_.get(), NotNull()); // Simulate `HttpConnectionManagerFilterConfigFactory::createFilterFactoryFromProtoTyped()` diff --git a/test/extensions/filters/network/http_connection_manager/config_test_base.h b/test/extensions/filters/network/http_connection_manager/config_test_base.h index e7bb332ef745b..12ee459af20d6 100644 --- a/test/extensions/filters/network/http_connection_manager/config_test_base.h +++ b/test/extensions/filters/network/http_connection_manager/config_test_base.h @@ -54,7 +54,7 @@ class HttpConnectionManagerConfigTest : public testing::Test { creation_status_ = absl::OkStatus(); HttpConnectionManagerConfig(parseHttpConnectionManagerFromYaml(yaml), context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, tracer_manager_, + &scoped_routes_config_provider_manager_, tracer_manager_, filter_config_provider_manager_, creation_status_); THROW_IF_NOT_OK(creation_status_); } diff --git a/test/integration/BUILD b/test/integration/BUILD index 99b9800e708dc..ad8fe57efba09 100644 --- a/test/integration/BUILD +++ b/test/integration/BUILD @@ -1281,6 +1281,7 @@ envoy_cc_test_library( "//source/common/network:filter_lib", "//source/common/network:listen_socket_lib", "//source/common/network:utility_lib", + "//source/common/router:scoped_rds_lib", "//source/common/runtime:runtime_lib", "//source/common/stats:isolated_store_lib", "//source/common/stats:thread_local_store_lib",