Skip to content

test: deflake upstream starttls integration test #16436

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
antoniovicente merged 13 commits into from
May 14, 2021
Merged

test: deflake upstream starttls integration test #16436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
d92faba
Dirty but deflaked tests.
cpakulski May 10, 2021
6b5559e
Dynamically add upstream starttls transport socket to cluster_0.
cpakulski May 10, 2021
3e191ed
Dynamically add StartTls test filter to filter chain.
cpakulski May 11, 2021
25721f8
Converted filter to pass data in both directions.
cpakulski May 11, 2021
afe432b
Cleanup of unused code.
cpakulski May 11, 2021
c9e2d5d
Merge remote-tracking branch 'upstream/main' into starttls_flake
cpakulski May 11, 2021
044cb56
Removed unused code.
cpakulski May 11, 2021
6693fb9
Cleaned up starttls BUILD file.
cpakulski May 11, 2021
b8c12c9
Acquire lock before setting transport socket in fake_upstream.
cpakulski May 12, 2021
dee2973
MOved setting transport socket to SharedConnectionWrapper.
cpakulski May 12, 2021
cc78944
Defer destruction of old transport socket until test ends.
cpakulski May 12, 2021
d366f26
Moved transport socket conversion to fake_upstream's thread.
cpakulski May 13, 2021
4bbb9f1
Merge remote-tracking branch 'upstream/main' into starttls_flake
cpakulski May 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions source/common/network/connection_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ class ConnectionImpl : public ConnectionImplBase,
// Reconsider how to make fairness happen.
void setTransportSocketIsReadable() override;
void flushWriteBuffer() override;
TransportSocketPtr& transportSocket() { return transport_socket_; }

// Obtain global next connection ID. This should only be used in tests.
static uint64_t nextGlobalIdForTest() { return next_global_id_; }
Expand Down
43 changes: 0 additions & 43 deletions test/config/utility.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,49 +146,6 @@ std::string ConfigHelper::startTlsConfig() {
TestEnvironment::runfilesPath("test/config/integration/certs/serverkey.pem")));
}

envoy::config::cluster::v3::Cluster ConfigHelper::buildStartTlsCluster(const std::string& address,
int port) {
API_NO_BOOST(envoy::config::cluster::v3::Cluster) cluster;
auto config_str = fmt::format(
R"EOF(
name: dummy_cluster
connect_timeout: 5s
type: STATIC
load_assignment:
cluster_name: dummy_cluster
endpoints:
- lb_endpoints:
- endpoint:
address:
socket_address:
address: {}
port_value: {}
transport_socket:
name: "starttls"
typed_config:
"@type": type.googleapis.com/envoy.extensions.transport_sockets.starttls.v3.UpstreamStartTlsConfig
cleartext_socket_config:
tls_socket_config:
common_tls_context:
tls_certificates:
certificate_chain:
filename: {}
private_key:
filename: {}
lb_policy: ROUND_ROBIN
typed_extension_protocol_options:
envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
"@type": type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions
explicit_http_config:
http2_protocol_options: {{}}
)EOF",
address, port, TestEnvironment::runfilesPath("test/config/integration/certs/clientcert.pem"),
TestEnvironment::runfilesPath("test/config/integration/certs/clientkey.pem"));

TestUtility::loadFromYaml(config_str, cluster);
return cluster;
}

std::string ConfigHelper::tlsInspectorFilter() {
return R"EOF(
name: "envoy.filters.listener.tls_inspector"
Expand Down
3 changes: 0 additions & 3 deletions test/extensions/transport_sockets/starttls/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,8 @@ envoy_extension_cc_test(
extension_name = "envoy.transport_sockets.starttls",
deps = [
":starttls_integration_proto_cc_proto",
"//source/extensions/filters/network/tcp_proxy:config",
"//source/extensions/transport_sockets/raw_buffer:config",
"//source/extensions/transport_sockets/starttls:config",
"//test/integration:integration_lib",
"//test/test_common:registry_lib",
"@envoy_api//envoy/extensions/transport_sockets/raw_buffer/v3:pkg_cc_proto",
],
)
Loading