From 9b6b9494bbf2f22d5fadb05d9ef70e622001dc4b Mon Sep 17 00:00:00 2001 From: Alyssa Wilk Date: Tue, 26 Feb 2019 16:54:02 -0500 Subject: [PATCH 1/2] test: refactoring how we add custom routes Signed-off-by: Alyssa Wilk --- test/config/utility.cc | 38 +++++-------- test/config/utility.h | 15 ++--- test/integration/http_integration.cc | 7 ++- test/integration/integration_test.cc | 18 +++--- test/integration/protocol_integration_test.cc | 56 +++++++++++-------- test/integration/redirect_integration_test.cc | 16 +++--- .../integration/websocket_integration_test.cc | 6 +- 7 files changed, 73 insertions(+), 83 deletions(-) diff --git a/test/config/utility.cc b/test/config/utility.cc index 27c0e4cc184f3..ee765ef5ca76a 100644 --- a/test/config/utility.cc +++ b/test/config/utility.cc @@ -337,34 +337,24 @@ void ConfigHelper::setConnectTimeout(std::chrono::milliseconds timeout) { connect_timeout_set_ = true; } -void ConfigHelper::addRoute( - const std::string& domains, const std::string& prefix, const std::string& cluster, - bool validate_clusters, envoy::api::v2::route::RouteAction::ClusterNotFoundResponseCode code, - envoy::api::v2::route::VirtualHost::TlsRequirementType type, - envoy::api::v2::route::RetryPolicy retry_policy, bool include_attempt_count_header, - const absl::string_view upgrade, - envoy::api::v2::route::RouteAction::InternalRedirectAction internal_redirect_action) { +envoy::api::v2::route::VirtualHost ConfigHelper::createHost(const char* domain, const char* prefix, + const char* cluster) { + envoy::api::v2::route::VirtualHost virtual_host; + virtual_host.set_name(domain); + virtual_host.add_domains(domain); + virtual_host.add_routes()->mutable_match()->set_prefix(prefix); + auto* route = virtual_host.mutable_routes(0)->mutable_route(); + route->set_cluster(cluster); + return virtual_host; +} + +void ConfigHelper::addVirtualHost(envoy::api::v2::route::VirtualHost& vhost) { RELEASE_ASSERT(!finalized_, ""); envoy::config::filter::network::http_connection_manager::v2::HttpConnectionManager hcm_config; loadHttpConnectionManager(hcm_config); - - auto* route_config = hcm_config.mutable_route_config(); - route_config->mutable_validate_clusters()->set_value(validate_clusters); + auto route_config = hcm_config.mutable_route_config(); auto* virtual_host = route_config->add_virtual_hosts(); - virtual_host->set_name(domains); - virtual_host->set_include_request_attempt_count(include_attempt_count_header); - virtual_host->add_domains(domains); - virtual_host->add_routes()->mutable_match()->set_prefix(prefix); - auto* route = virtual_host->mutable_routes(0)->mutable_route(); - route->set_cluster(cluster); - route->set_cluster_not_found_response_code(code); - route->mutable_retry_policy()->Swap(&retry_policy); - if (!upgrade.empty()) { - route->add_upgrade_configs()->set_upgrade_type(std::string(upgrade)); - } - route->set_internal_redirect_action(internal_redirect_action); - virtual_host->set_require_tls(type); - + virtual_host->CopyFrom(vhost); storeHttpConnectionManager(hcm_config); } diff --git a/test/config/utility.h b/test/config/utility.h index fb9b8762c7f0c..d23aeee6fc717 100644 --- a/test/config/utility.h +++ b/test/config/utility.h @@ -104,17 +104,10 @@ class ConfigHelper { // Set the connect timeout on upstream connections. void setConnectTimeout(std::chrono::milliseconds timeout); - // TODO(alyssawilk) this does not scale. Refactor. - // Add an additional route to the configuration. - void addRoute(const std::string& host, const std::string& route, const std::string& cluster, - bool validate_clusters, - envoy::api::v2::route::RouteAction::ClusterNotFoundResponseCode code, - envoy::api::v2::route::VirtualHost::TlsRequirementType type = - envoy::api::v2::route::VirtualHost::NONE, - envoy::api::v2::route::RetryPolicy retry_policy = {}, - bool include_attempt_count_header = false, const absl::string_view upgrade = "", - const envoy::api::v2::route::RouteAction::InternalRedirectAction internal_action = - envoy::api::v2::route::RouteAction::PASS_THROUGH_INTERNAL_REDIRECT); + envoy::api::v2::route::VirtualHost createHost(const char* host, const char* route = "/", + const char* cluster = "cluster_0"); + + void addVirtualHost(envoy::api::v2::route::VirtualHost& vhost); // Add an HTTP filter prior to existing filters. void addFilter(const std::string& filter_yaml); diff --git a/test/integration/http_integration.cc b/test/integration/http_integration.cc index d8d7eb2951ada..07402294f41c1 100644 --- a/test/integration/http_integration.cc +++ b/test/integration/http_integration.cc @@ -579,9 +579,10 @@ void HttpIntegrationTest::testRetry() { // Tests that the x-envoy-attempt-count header is properly set on the upstream request // and updated after the request is retried. void HttpIntegrationTest::testRetryAttemptCountHeader() { - config_helper_.addRoute("host", "/test_retry", "cluster_0", false, - envoy::api::v2::route::RouteAction::NOT_FOUND, - envoy::api::v2::route::VirtualHost::NONE, {}, true); + auto host = config_helper_.createHost("host", "/test_retry"); + host.set_include_request_attempt_count(true); + config_helper_.addVirtualHost(host); + initialize(); codec_client_ = makeHttpConnection(lookupPort("http")); auto response = diff --git a/test/integration/integration_test.cc b/test/integration/integration_test.cc index 0141026a9478c..1835f11babec1 100644 --- a/test/integration/integration_test.cc +++ b/test/integration/integration_test.cc @@ -399,9 +399,9 @@ TEST_P(IntegrationTest, BadPath) { TEST_P(IntegrationTest, AbsolutePath) { // Configure www.redirect.com to send a redirect, and ensure the redirect is // encountered via absolute URL. - config_helper_.addRoute("www.redirect.com", "/", "cluster_0", true, - envoy::api::v2::route::RouteAction::SERVICE_UNAVAILABLE, - envoy::api::v2::route::VirtualHost::ALL); + auto host = config_helper_.createHost("www.redirect.com", "/"); + host.set_require_tls(envoy::api::v2::route::VirtualHost::ALL); + config_helper_.addVirtualHost(host); config_helper_.addConfigModifier(&setAllowAbsoluteUrl); initialize(); @@ -415,9 +415,9 @@ TEST_P(IntegrationTest, AbsolutePath) { TEST_P(IntegrationTest, AbsolutePathWithPort) { // Configure www.namewithport.com:1234 to send a redirect, and ensure the redirect is // encountered via absolute URL with a port. - config_helper_.addRoute("www.namewithport.com:1234", "/", "cluster_0", true, - envoy::api::v2::route::RouteAction::SERVICE_UNAVAILABLE, - envoy::api::v2::route::VirtualHost::ALL); + auto host = config_helper_.createHost("www.namewithport.com:1234", "/"); + host.set_require_tls(envoy::api::v2::route::VirtualHost::ALL); + config_helper_.addVirtualHost(host); config_helper_.addConfigModifier(&setAllowAbsoluteUrl); initialize(); std::string response; @@ -432,9 +432,9 @@ TEST_P(IntegrationTest, AbsolutePathWithoutPort) { config_helper_.setDefaultHostAndRoute("foo.com", "/found"); // Set a matcher for www.namewithport.com:1234 and verify http://www.namewithport.com does not // match - config_helper_.addRoute("www.namewithport.com:1234", "/", "cluster_0", true, - envoy::api::v2::route::RouteAction::SERVICE_UNAVAILABLE, - envoy::api::v2::route::VirtualHost::ALL); + auto host = config_helper_.createHost("www.namewithport.com:1234", "/"); + host.set_require_tls(envoy::api::v2::route::VirtualHost::ALL); + config_helper_.addVirtualHost(host); config_helper_.addConfigModifier(&setAllowAbsoluteUrl); initialize(); std::string response; diff --git a/test/integration/protocol_integration_test.cc b/test/integration/protocol_integration_test.cc index 011266e9b8de9..fcf6cda115156 100644 --- a/test/integration/protocol_integration_test.cc +++ b/test/integration/protocol_integration_test.cc @@ -41,6 +41,12 @@ using testing::Not; namespace Envoy { +void setDoNotValidateRouteConfig( + envoy::config::filter::network::http_connection_manager::v2::HttpConnectionManager& hcm) { + auto* route_config = hcm.mutable_route_config(); + route_config->mutable_validate_clusters()->set_value(false); +}; + // Tests for DownstreamProtocolIntegrationTest will be run with all protocols // (H1/H2 downstream) but only H1 upstreams. // @@ -71,9 +77,11 @@ TEST_P(DownstreamProtocolIntegrationTest, RouterNotFoundBodyNoBuffer) { // Add a route that uses unknown cluster (expect 404 Not Found). TEST_P(DownstreamProtocolIntegrationTest, RouterClusterNotFound404) { - config_helper_.addRoute("foo.com", "/unknown", "unknown_cluster", false, - envoy::api::v2::route::RouteAction::NOT_FOUND, - envoy::api::v2::route::VirtualHost::NONE); + config_helper_.addConfigModifier(&setDoNotValidateRouteConfig); + auto host = config_helper_.createHost("foo.com", "/unknown", "unknown_cluster"); + host.mutable_routes(0)->mutable_route()->set_cluster_not_found_response_code( + envoy::api::v2::route::RouteAction::NOT_FOUND); + config_helper_.addVirtualHost(host); initialize(); BufferingStreamDecoderPtr response = IntegrationUtil::makeSingleRequest( @@ -84,9 +92,11 @@ TEST_P(DownstreamProtocolIntegrationTest, RouterClusterNotFound404) { // Add a route that uses unknown cluster (expect 503 Service Unavailable). TEST_P(DownstreamProtocolIntegrationTest, RouterClusterNotFound503) { - config_helper_.addRoute("foo.com", "/unknown", "unknown_cluster", false, - envoy::api::v2::route::RouteAction::SERVICE_UNAVAILABLE, - envoy::api::v2::route::VirtualHost::NONE); + config_helper_.addConfigModifier(&setDoNotValidateRouteConfig); + auto host = config_helper_.createHost("foo.com", "/unknown", "unknown_cluster"); + host.mutable_routes(0)->mutable_route()->set_cluster_not_found_response_code( + envoy::api::v2::route::RouteAction::SERVICE_UNAVAILABLE); + config_helper_.addVirtualHost(host); initialize(); BufferingStreamDecoderPtr response = IntegrationUtil::makeSingleRequest( @@ -97,9 +107,9 @@ TEST_P(DownstreamProtocolIntegrationTest, RouterClusterNotFound503) { // Add a route which redirects HTTP to HTTPS, and verify Envoy sends a 301 TEST_P(ProtocolIntegrationTest, RouterRedirect) { - config_helper_.addRoute("www.redirect.com", "/", "cluster_0", true, - envoy::api::v2::route::RouteAction::SERVICE_UNAVAILABLE, - envoy::api::v2::route::VirtualHost::ALL); + auto host = config_helper_.createHost("www.redirect.com", "/"); + host.set_require_tls(envoy::api::v2::route::VirtualHost::ALL); + config_helper_.addVirtualHost(host); initialize(); BufferingStreamDecoderPtr response = IntegrationUtil::makeSingleRequest( @@ -230,9 +240,9 @@ TEST_P(ProtocolIntegrationTest, Retry) { // Tests that the x-envoy-attempt-count header is properly set on the upstream request // and updated after the request is retried. TEST_P(DownstreamProtocolIntegrationTest, RetryAttemptCountHeader) { - config_helper_.addRoute("host", "/test_retry", "cluster_0", false, - envoy::api::v2::route::RouteAction::NOT_FOUND, - envoy::api::v2::route::VirtualHost::NONE, {}, true); + auto host = config_helper_.createHost("host", "/test_retry"); + host.set_include_request_attempt_count(true); + config_helper_.addVirtualHost(host); initialize(); codec_client_ = makeHttpConnection(lookupPort("http")); auto response = @@ -280,13 +290,12 @@ TEST_P(DownstreamProtocolIntegrationTest, RetryPriority) { Registry::InjectFactory inject_factory(factory); - envoy::api::v2::route::RetryPolicy retry_policy; - retry_policy.mutable_retry_priority()->set_name(factory.name()); - // Add route with custom retry policy - config_helper_.addRoute("host", "/test_retry", "cluster_0", false, - envoy::api::v2::route::RouteAction::NOT_FOUND, - envoy::api::v2::route::VirtualHost::NONE, retry_policy); + auto host = config_helper_.createHost("host", "/test_retry"); + host.set_include_request_attempt_count(true); + auto retry_policy = host.mutable_routes(0)->mutable_route()->mutable_retry_policy(); + retry_policy->mutable_retry_priority()->set_name(factory.name()); + config_helper_.addVirtualHost(host); // Use load assignments instead of static hosts. Necessary in order to use priorities. config_helper_.addConfigModifier([](envoy::config::bootstrap::v2::Bootstrap& bootstrap) { @@ -356,13 +365,12 @@ TEST_P(DownstreamProtocolIntegrationTest, RetryHostPredicateFilter) { TestHostPredicateFactory predicate_factory; Registry::InjectFactory inject_factory(predicate_factory); - envoy::api::v2::route::RetryPolicy retry_policy; - retry_policy.add_retry_host_predicate()->set_name(predicate_factory.name()); - // Add route with custom retry policy - config_helper_.addRoute("host", "/test_retry", "cluster_0", false, - envoy::api::v2::route::RouteAction::NOT_FOUND, - envoy::api::v2::route::VirtualHost::NONE, retry_policy); + auto host = config_helper_.createHost("host", "/test_retry"); + host.set_include_request_attempt_count(true); + auto retry_policy = host.mutable_routes(0)->mutable_route()->mutable_retry_policy(); + retry_policy->add_retry_host_predicate()->set_name(predicate_factory.name()); + config_helper_.addVirtualHost(host); // We want to work with a cluster with two hosts. config_helper_.addConfigModifier([](envoy::config::bootstrap::v2::Bootstrap& bootstrap) { diff --git a/test/integration/redirect_integration_test.cc b/test/integration/redirect_integration_test.cc index 91d48b3c7b947..c80d1998df6dd 100644 --- a/test/integration/redirect_integration_test.cc +++ b/test/integration/redirect_integration_test.cc @@ -7,15 +7,13 @@ class RedirectIntegrationTest : public HttpProtocolIntegrationTest { void initialize() override { envoy::api::v2::route::RetryPolicy retry_policy; - config_helper_.addRoute("pass.through.internal.redirect", "/", "cluster_0", false, - envoy::api::v2::route::RouteAction::NOT_FOUND, - envoy::api::v2::route::VirtualHost::NONE, retry_policy, false, "", - envoy::api::v2::route::RouteAction::PASS_THROUGH_INTERNAL_REDIRECT); - - config_helper_.addRoute("handle.internal.redirect", "/", "cluster_0", false, - envoy::api::v2::route::RouteAction::NOT_FOUND, - envoy::api::v2::route::VirtualHost::NONE, retry_policy, false, "", - envoy::api::v2::route::RouteAction::HANDLE_INTERNAL_REDIRECT); + auto pass_through = config_helper_.createHost("pass.through.internal.redirect"); + config_helper_.addVirtualHost(pass_through); + + auto handle = config_helper_.createHost("handle.internal.redirect"); + handle.mutable_routes(0)->mutable_route()->set_internal_redirect_action( + envoy::api::v2::route::RouteAction::HANDLE_INTERNAL_REDIRECT); + config_helper_.addVirtualHost(handle); HttpProtocolIntegrationTest::initialize(); } diff --git a/test/integration/websocket_integration_test.cc b/test/integration/websocket_integration_test.cc index 92d1f696403e3..ecaf79c70abfb 100644 --- a/test/integration/websocket_integration_test.cc +++ b/test/integration/websocket_integration_test.cc @@ -319,9 +319,9 @@ TEST_P(WebsocketIntegrationTest, RouteSpecificUpgrade) { foo_upgrade->set_upgrade_type("foo"); foo_upgrade->mutable_enabled()->set_value(false); }); - config_helper_.addRoute("host", "/websocket/test", "cluster_0", false, - envoy::api::v2::route::RouteAction::NOT_FOUND, - envoy::api::v2::route::VirtualHost::NONE, {}, false, "foo"); + auto host = config_helper_.createHost("host", "/websocket/test"); + host.mutable_routes(0)->mutable_route()->add_upgrade_configs()->set_upgrade_type("foo"); + config_helper_.addVirtualHost(host); initialize(); performUpgrade(upgradeRequestHeaders("foo", 0), upgradeResponseHeaders("foo")); From 93a193d1b630ec10879d1be167e508a07c9b2af5 Mon Sep 17 00:00:00 2001 From: Alyssa Wilk Date: Tue, 26 Mar 2019 15:30:16 -0400 Subject: [PATCH 2/2] reviewer comments Signed-off-by: Alyssa Wilk --- test/config/utility.cc | 6 +++--- test/config/utility.h | 6 +++--- test/integration/http_integration.cc | 2 +- test/integration/integration_test.cc | 6 +++--- test/integration/protocol_integration_test.cc | 12 ++++++------ test/integration/redirect_integration_test.cc | 4 ++-- test/integration/websocket_integration_test.cc | 2 +- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/test/config/utility.cc b/test/config/utility.cc index ee765ef5ca76a..a4070b311ae7f 100644 --- a/test/config/utility.cc +++ b/test/config/utility.cc @@ -337,8 +337,8 @@ void ConfigHelper::setConnectTimeout(std::chrono::milliseconds timeout) { connect_timeout_set_ = true; } -envoy::api::v2::route::VirtualHost ConfigHelper::createHost(const char* domain, const char* prefix, - const char* cluster) { +envoy::api::v2::route::VirtualHost +ConfigHelper::createVirtualHost(const char* domain, const char* prefix, const char* cluster) { envoy::api::v2::route::VirtualHost virtual_host; virtual_host.set_name(domain); virtual_host.add_domains(domain); @@ -348,7 +348,7 @@ envoy::api::v2::route::VirtualHost ConfigHelper::createHost(const char* domain, return virtual_host; } -void ConfigHelper::addVirtualHost(envoy::api::v2::route::VirtualHost& vhost) { +void ConfigHelper::addVirtualHost(const envoy::api::v2::route::VirtualHost& vhost) { RELEASE_ASSERT(!finalized_, ""); envoy::config::filter::network::http_connection_manager::v2::HttpConnectionManager hcm_config; loadHttpConnectionManager(hcm_config); diff --git a/test/config/utility.h b/test/config/utility.h index d23aeee6fc717..b6b05d08bcca5 100644 --- a/test/config/utility.h +++ b/test/config/utility.h @@ -104,10 +104,10 @@ class ConfigHelper { // Set the connect timeout on upstream connections. void setConnectTimeout(std::chrono::milliseconds timeout); - envoy::api::v2::route::VirtualHost createHost(const char* host, const char* route = "/", - const char* cluster = "cluster_0"); + envoy::api::v2::route::VirtualHost createVirtualHost(const char* host, const char* route = "/", + const char* cluster = "cluster_0"); - void addVirtualHost(envoy::api::v2::route::VirtualHost& vhost); + void addVirtualHost(const envoy::api::v2::route::VirtualHost& vhost); // Add an HTTP filter prior to existing filters. void addFilter(const std::string& filter_yaml); diff --git a/test/integration/http_integration.cc b/test/integration/http_integration.cc index 07402294f41c1..d2d6e4d33fc78 100644 --- a/test/integration/http_integration.cc +++ b/test/integration/http_integration.cc @@ -579,7 +579,7 @@ void HttpIntegrationTest::testRetry() { // Tests that the x-envoy-attempt-count header is properly set on the upstream request // and updated after the request is retried. void HttpIntegrationTest::testRetryAttemptCountHeader() { - auto host = config_helper_.createHost("host", "/test_retry"); + auto host = config_helper_.createVirtualHost("host", "/test_retry"); host.set_include_request_attempt_count(true); config_helper_.addVirtualHost(host); diff --git a/test/integration/integration_test.cc b/test/integration/integration_test.cc index 1835f11babec1..c3a5d2b25c79d 100644 --- a/test/integration/integration_test.cc +++ b/test/integration/integration_test.cc @@ -399,7 +399,7 @@ TEST_P(IntegrationTest, BadPath) { TEST_P(IntegrationTest, AbsolutePath) { // Configure www.redirect.com to send a redirect, and ensure the redirect is // encountered via absolute URL. - auto host = config_helper_.createHost("www.redirect.com", "/"); + auto host = config_helper_.createVirtualHost("www.redirect.com", "/"); host.set_require_tls(envoy::api::v2::route::VirtualHost::ALL); config_helper_.addVirtualHost(host); config_helper_.addConfigModifier(&setAllowAbsoluteUrl); @@ -415,7 +415,7 @@ TEST_P(IntegrationTest, AbsolutePath) { TEST_P(IntegrationTest, AbsolutePathWithPort) { // Configure www.namewithport.com:1234 to send a redirect, and ensure the redirect is // encountered via absolute URL with a port. - auto host = config_helper_.createHost("www.namewithport.com:1234", "/"); + auto host = config_helper_.createVirtualHost("www.namewithport.com:1234", "/"); host.set_require_tls(envoy::api::v2::route::VirtualHost::ALL); config_helper_.addVirtualHost(host); config_helper_.addConfigModifier(&setAllowAbsoluteUrl); @@ -432,7 +432,7 @@ TEST_P(IntegrationTest, AbsolutePathWithoutPort) { config_helper_.setDefaultHostAndRoute("foo.com", "/found"); // Set a matcher for www.namewithport.com:1234 and verify http://www.namewithport.com does not // match - auto host = config_helper_.createHost("www.namewithport.com:1234", "/"); + auto host = config_helper_.createVirtualHost("www.namewithport.com:1234", "/"); host.set_require_tls(envoy::api::v2::route::VirtualHost::ALL); config_helper_.addVirtualHost(host); config_helper_.addConfigModifier(&setAllowAbsoluteUrl); diff --git a/test/integration/protocol_integration_test.cc b/test/integration/protocol_integration_test.cc index fcf6cda115156..33b9e1ac84823 100644 --- a/test/integration/protocol_integration_test.cc +++ b/test/integration/protocol_integration_test.cc @@ -78,7 +78,7 @@ TEST_P(DownstreamProtocolIntegrationTest, RouterNotFoundBodyNoBuffer) { // Add a route that uses unknown cluster (expect 404 Not Found). TEST_P(DownstreamProtocolIntegrationTest, RouterClusterNotFound404) { config_helper_.addConfigModifier(&setDoNotValidateRouteConfig); - auto host = config_helper_.createHost("foo.com", "/unknown", "unknown_cluster"); + auto host = config_helper_.createVirtualHost("foo.com", "/unknown", "unknown_cluster"); host.mutable_routes(0)->mutable_route()->set_cluster_not_found_response_code( envoy::api::v2::route::RouteAction::NOT_FOUND); config_helper_.addVirtualHost(host); @@ -93,7 +93,7 @@ TEST_P(DownstreamProtocolIntegrationTest, RouterClusterNotFound404) { // Add a route that uses unknown cluster (expect 503 Service Unavailable). TEST_P(DownstreamProtocolIntegrationTest, RouterClusterNotFound503) { config_helper_.addConfigModifier(&setDoNotValidateRouteConfig); - auto host = config_helper_.createHost("foo.com", "/unknown", "unknown_cluster"); + auto host = config_helper_.createVirtualHost("foo.com", "/unknown", "unknown_cluster"); host.mutable_routes(0)->mutable_route()->set_cluster_not_found_response_code( envoy::api::v2::route::RouteAction::SERVICE_UNAVAILABLE); config_helper_.addVirtualHost(host); @@ -107,7 +107,7 @@ TEST_P(DownstreamProtocolIntegrationTest, RouterClusterNotFound503) { // Add a route which redirects HTTP to HTTPS, and verify Envoy sends a 301 TEST_P(ProtocolIntegrationTest, RouterRedirect) { - auto host = config_helper_.createHost("www.redirect.com", "/"); + auto host = config_helper_.createVirtualHost("www.redirect.com", "/"); host.set_require_tls(envoy::api::v2::route::VirtualHost::ALL); config_helper_.addVirtualHost(host); initialize(); @@ -240,7 +240,7 @@ TEST_P(ProtocolIntegrationTest, Retry) { // Tests that the x-envoy-attempt-count header is properly set on the upstream request // and updated after the request is retried. TEST_P(DownstreamProtocolIntegrationTest, RetryAttemptCountHeader) { - auto host = config_helper_.createHost("host", "/test_retry"); + auto host = config_helper_.createVirtualHost("host", "/test_retry"); host.set_include_request_attempt_count(true); config_helper_.addVirtualHost(host); initialize(); @@ -291,7 +291,7 @@ TEST_P(DownstreamProtocolIntegrationTest, RetryPriority) { Registry::InjectFactory inject_factory(factory); // Add route with custom retry policy - auto host = config_helper_.createHost("host", "/test_retry"); + auto host = config_helper_.createVirtualHost("host", "/test_retry"); host.set_include_request_attempt_count(true); auto retry_policy = host.mutable_routes(0)->mutable_route()->mutable_retry_policy(); retry_policy->mutable_retry_priority()->set_name(factory.name()); @@ -366,7 +366,7 @@ TEST_P(DownstreamProtocolIntegrationTest, RetryHostPredicateFilter) { Registry::InjectFactory inject_factory(predicate_factory); // Add route with custom retry policy - auto host = config_helper_.createHost("host", "/test_retry"); + auto host = config_helper_.createVirtualHost("host", "/test_retry"); host.set_include_request_attempt_count(true); auto retry_policy = host.mutable_routes(0)->mutable_route()->mutable_retry_policy(); retry_policy->add_retry_host_predicate()->set_name(predicate_factory.name()); diff --git a/test/integration/redirect_integration_test.cc b/test/integration/redirect_integration_test.cc index c80d1998df6dd..e1a614557fc1c 100644 --- a/test/integration/redirect_integration_test.cc +++ b/test/integration/redirect_integration_test.cc @@ -7,10 +7,10 @@ class RedirectIntegrationTest : public HttpProtocolIntegrationTest { void initialize() override { envoy::api::v2::route::RetryPolicy retry_policy; - auto pass_through = config_helper_.createHost("pass.through.internal.redirect"); + auto pass_through = config_helper_.createVirtualHost("pass.through.internal.redirect"); config_helper_.addVirtualHost(pass_through); - auto handle = config_helper_.createHost("handle.internal.redirect"); + auto handle = config_helper_.createVirtualHost("handle.internal.redirect"); handle.mutable_routes(0)->mutable_route()->set_internal_redirect_action( envoy::api::v2::route::RouteAction::HANDLE_INTERNAL_REDIRECT); config_helper_.addVirtualHost(handle); diff --git a/test/integration/websocket_integration_test.cc b/test/integration/websocket_integration_test.cc index ecaf79c70abfb..d4b55d31e826d 100644 --- a/test/integration/websocket_integration_test.cc +++ b/test/integration/websocket_integration_test.cc @@ -319,7 +319,7 @@ TEST_P(WebsocketIntegrationTest, RouteSpecificUpgrade) { foo_upgrade->set_upgrade_type("foo"); foo_upgrade->mutable_enabled()->set_value(false); }); - auto host = config_helper_.createHost("host", "/websocket/test"); + auto host = config_helper_.createVirtualHost("host", "/websocket/test"); host.mutable_routes(0)->mutable_route()->add_upgrade_configs()->set_upgrade_type("foo"); config_helper_.addVirtualHost(host); initialize();