From 628c4b9be7083ef5a337aa39c996d5ea2f3047d8 Mon Sep 17 00:00:00 2001 From: Alyssa Wilk Date: Tue, 8 Dec 2020 16:59:18 -0500 Subject: [PATCH] test: TODO fixup Signed-off-by: Alyssa Wilk --- .../grpc/tcp_grpc_access_log_integration_test.cc | 2 +- .../filters/http/oauth2/oauth_integration_test.cc | 2 +- test/integration/base_integration_test.cc | 4 ++-- test/integration/base_integration_test.h | 15 ++++++++------- .../cluster_filter_integration_test.cc | 2 +- .../filter_manager_integration_test.cc | 2 +- test/integration/tcp_proxy_integration_test.cc | 10 +++++----- test/integration/tcp_proxy_integration_test.h | 2 +- .../integration/tcp_tunneling_integration_test.cc | 8 ++++---- test/integration/uds_integration_test.cc | 2 +- 10 files changed, 25 insertions(+), 24 deletions(-) diff --git a/test/extensions/access_loggers/grpc/tcp_grpc_access_log_integration_test.cc b/test/extensions/access_loggers/grpc/tcp_grpc_access_log_integration_test.cc index 98541158c3c65..22a3d800a89f4 100644 --- a/test/extensions/access_loggers/grpc/tcp_grpc_access_log_integration_test.cc +++ b/test/extensions/access_loggers/grpc/tcp_grpc_access_log_integration_test.cc @@ -29,7 +29,7 @@ class TcpGrpcAccessLogIntegrationTest : public Grpc::VersionedGrpcClientIntegrat public: TcpGrpcAccessLogIntegrationTest() : BaseIntegrationTest(ipVersion(), ConfigHelper::tcpProxyConfig()) { - enable_half_close_ = true; + enableHalfClose(true); } void createUpstreams() override { diff --git a/test/extensions/filters/http/oauth2/oauth_integration_test.cc b/test/extensions/filters/http/oauth2/oauth_integration_test.cc index f1ec679be0915..565f4349ba94f 100644 --- a/test/extensions/filters/http/oauth2/oauth_integration_test.cc +++ b/test/extensions/filters/http/oauth2/oauth_integration_test.cc @@ -16,7 +16,7 @@ class OauthIntegrationTest : public testing::Test, public HttpIntegrationTest { public: OauthIntegrationTest() : HttpIntegrationTest(Http::CodecClient::Type::HTTP2, Network::Address::IpVersion::v4) { - enable_half_close_ = true; + enableHalfClose(true); } envoy::service::discovery::v3::DiscoveryResponse genericSecretResponse(absl::string_view name, diff --git a/test/integration/base_integration_test.cc b/test/integration/base_integration_test.cc index 806a8a3d4d061..8cbaba5ead73c 100644 --- a/test/integration/base_integration_test.cc +++ b/test/integration/base_integration_test.cc @@ -92,7 +92,7 @@ Network::ClientConnectionPtr BaseIntegrationTest::makeClientConnectionWithOption fmt::format("tcp://{}:{}", Network::Test::getLoopbackAddressUrlString(version_), port)), Network::Address::InstanceConstSharedPtr(), Network::Test::createRawBufferSocket(), options)); - connection->enableHalfClose(enable_half_close_); + connection->enableHalfClose(enableHalfClose()); return connection; } @@ -223,7 +223,7 @@ BaseIntegrationTest::makeTcpConnection(uint32_t port, const Network::ConnectionSocket::OptionsSharedPtr& options, Network::Address::InstanceConstSharedPtr source_address) { return std::make_unique(*dispatcher_, *mock_buffer_factory_, port, version_, - enable_half_close_, options, source_address); + enableHalfClose(), options, source_address); } void BaseIntegrationTest::registerPort(const std::string& key, uint32_t port) { diff --git a/test/integration/base_integration_test.h b/test/integration/base_integration_test.h index 07d011b063a0f..632030d997b4c 100644 --- a/test/integration/base_integration_test.h +++ b/test/integration/base_integration_test.h @@ -369,11 +369,14 @@ class BaseIntegrationTest : protected Logger::Loggable { protected: void setUdpFakeUpstream(bool value) { upstream_config_.udp_fake_upstream_ = value; } bool initialized() const { return initialized_; } - const FakeUpstreamConfig& upstreamConfig() { - // TODO(alyssawilk) make enable_half_close_ private and remove this. - upstream_config_.enable_half_close_ = enable_half_close_; - return upstream_config_; - } + + // Right now half-close is set globally, not separately for upstream and + // downstream. + void enableHalfClose(bool value) { upstream_config_.enable_half_close_ = value; } + + bool enableHalfClose() { return upstream_config_.enable_half_close_; } + + const FakeUpstreamConfig& upstreamConfig() { return upstream_config_; } std::unique_ptr upstream_stats_store_; @@ -442,8 +445,6 @@ class BaseIntegrationTest : protected Logger::Loggable { // This does nothing if autonomous_upstream_ is false bool autonomous_allow_incomplete_streams_{false}; - bool enable_half_close_{false}; - // True if test will use a fixed RNG value. bool deterministic_{}; diff --git a/test/integration/cluster_filter_integration_test.cc b/test/integration/cluster_filter_integration_test.cc index 7c19415ba1f1c..40ec3ec404fdf 100644 --- a/test/integration/cluster_filter_integration_test.cc +++ b/test/integration/cluster_filter_integration_test.cc @@ -80,7 +80,7 @@ class ClusterFilterIntegrationTest : public testing::TestWithParammutable_clusters(0); auto* filter = cluster_0->add_filters(); diff --git a/test/integration/filter_manager_integration_test.cc b/test/integration/filter_manager_integration_test.cc index d6d43ba0a66a2..2c789989e458e 100644 --- a/test/integration/filter_manager_integration_test.cc +++ b/test/integration/filter_manager_integration_test.cc @@ -492,7 +492,7 @@ INSTANTIATE_TEST_SUITE_P( InjectDataToFilterChainIntegrationTest::testParamsToString); TEST_P(InjectDataWithTcpProxyFilterIntegrationTest, UsageOfInjectDataMethodsShouldBeUnnoticeable) { - enable_half_close_ = true; + enableHalfClose(true); initialize(); auto tcp_client = makeTcpConnection(lookupPort("listener_0")); diff --git a/test/integration/tcp_proxy_integration_test.cc b/test/integration/tcp_proxy_integration_test.cc index d55765f66950b..255a674505c04 100644 --- a/test/integration/tcp_proxy_integration_test.cc +++ b/test/integration/tcp_proxy_integration_test.cc @@ -141,7 +141,7 @@ TEST_P(TcpProxyIntegrationTest, NoUpstream) { lb_endpoint->mutable_endpoint()->mutable_address()->mutable_socket_address()->set_port_value(1); }); config_helper_.skipPortUsageValidation(); - enable_half_close_ = false; + enableHalfClose(false); initialize(); IntegrationTcpClientPtr tcp_client = makeTcpConnection(lookupPort("tcp_proxy")); @@ -384,7 +384,7 @@ TEST_P(TcpProxyIntegrationTest, ShutdownWithOpenConnections) { TEST_P(TcpProxyIntegrationTest, TestIdletimeoutWithNoData) { autonomous_upstream_ = true; - enable_half_close_ = false; + enableHalfClose(false); config_helper_.addConfigModifier([&](envoy::config::bootstrap::v3::Bootstrap& bootstrap) -> void { auto* listener = bootstrap.mutable_static_resources()->mutable_listeners(0); auto* filter_chain = listener->mutable_filter_chains(0); @@ -408,7 +408,7 @@ TEST_P(TcpProxyIntegrationTest, TestIdletimeoutWithNoData) { TEST_P(TcpProxyIntegrationTest, TestIdletimeoutWithLargeOutstandingData) { config_helper_.setBufferLimits(1024, 1024); - enable_half_close_ = false; + enableHalfClose(false); config_helper_.addConfigModifier([&](envoy::config::bootstrap::v3::Bootstrap& bootstrap) -> void { auto* listener = bootstrap.mutable_static_resources()->mutable_listeners(0); auto* filter_chain = listener->mutable_filter_chains(0); @@ -441,7 +441,7 @@ TEST_P(TcpProxyIntegrationTest, TestIdletimeoutWithLargeOutstandingData) { TEST_P(TcpProxyIntegrationTest, TestMaxDownstreamConnectionDurationWithNoData) { autonomous_upstream_ = true; - enable_half_close_ = false; + enableHalfClose(false); config_helper_.addConfigModifier([&](envoy::config::bootstrap::v3::Bootstrap& bootstrap) -> void { auto* listener = bootstrap.mutable_static_resources()->mutable_listeners(0); auto* filter_chain = listener->mutable_filter_chains(0); @@ -466,7 +466,7 @@ TEST_P(TcpProxyIntegrationTest, TestMaxDownstreamConnectionDurationWithNoData) { TEST_P(TcpProxyIntegrationTest, TestMaxDownstreamConnectionDurationWithLargeOutstandingData) { config_helper_.setBufferLimits(1024, 1024); - enable_half_close_ = false; + enableHalfClose(false); config_helper_.addConfigModifier([&](envoy::config::bootstrap::v3::Bootstrap& bootstrap) -> void { auto* listener = bootstrap.mutable_static_resources()->mutable_listeners(0); auto* filter_chain = listener->mutable_filter_chains(0); diff --git a/test/integration/tcp_proxy_integration_test.h b/test/integration/tcp_proxy_integration_test.h index d4a2248c4e3e2..9bcaa758b774d 100644 --- a/test/integration/tcp_proxy_integration_test.h +++ b/test/integration/tcp_proxy_integration_test.h @@ -20,7 +20,7 @@ class TcpProxyIntegrationTest : public testing::TestWithParam, } void SetUp() override { - enable_half_close_ = true; + enableHalfClose(true); setDownstreamProtocol(Http::CodecClient::Type::HTTP2); setUpstreamProtocol(std::get<1>(GetParam())); @@ -456,7 +456,7 @@ TEST_P(TcpTunnelingIntegrationTest, ResetStreamTest) { if (upstreamProtocol() == FakeHttpConnection::Type::HTTP1) { return; } - enable_half_close_ = false; + enableHalfClose(false); initialize(); // Establish a connection. @@ -472,7 +472,7 @@ TEST_P(TcpTunnelingIntegrationTest, ResetStreamTest) { } TEST_P(TcpTunnelingIntegrationTest, TestIdletimeoutWithLargeOutstandingData) { - enable_half_close_ = false; + enableHalfClose(false); config_helper_.setBufferLimits(1024, 1024); config_helper_.addConfigModifier([&](envoy::config::bootstrap::v3::Bootstrap& bootstrap) -> void { auto* listener = bootstrap.mutable_static_resources()->mutable_listeners(1); diff --git a/test/integration/uds_integration_test.cc b/test/integration/uds_integration_test.cc index 6fce94e56646c..0df38c66564e3 100644 --- a/test/integration/uds_integration_test.cc +++ b/test/integration/uds_integration_test.cc @@ -87,7 +87,7 @@ HttpIntegrationTest::ConnectionCreationFunction UdsListenerIntegrationTest::crea Network::Utility::resolveUrl(fmt::format("unix://{}", getListenerSocketName())), Network::Address::InstanceConstSharedPtr(), Network::Test::createRawBufferSocket(), nullptr)); - conn->enableHalfClose(enable_half_close_); + conn->enableHalfClose(enableHalfClose()); return conn; }; }