8000 Split orig-proto tests out of discovery tests by olix0r · Pull Request #629 · linkerd/linkerd2-proxy · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Split orig-proto tests out of discovery tests #629

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
merged 5 commits into from
Aug 18, 2020
Merged

Split orig-proto tests out of discovery tests #629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
82b830d
Remove scrubbing for unused headers
olix0r Aug 18, 2020
ec9c15f
Remove unused inbound modules
olix0r Aug 18, 2020
a78239b
Remove remote-ip tests
olix0r Aug 18, 2020
c72e648
Split orig-proto tests out of discovery tests
olix0r Aug 18, 2020
762b9ca
Merge branch 'main' into ver/proxy-to-proxy
olix0r Aug 18, 2020
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
84 changes: 0 additions & 84 deletions linkerd/app/integration/tests/discovery.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,87 +626,3 @@ mod http1 {
}
}
}

mod proxy_to_proxy {
use super::*;

#[tokio::test]
async fn outbound_http1() {
let _trace = trace_init();

// Instead of a second proxy, this mocked h2 server will be the target.
let srv = server::http2()
.route_fn("/hint", |req| {
assert_eq!(req.headers()["l5d-orig-proto"], "HTTP/1.1");
Response::builder()
.header("l5d-orig-proto", "HTTP/1.1")
.body(Default::default())
.unwrap()
})
.run()
.await;

let ctrl = controller::new();
ctrl.profile_tx_default("disco.test.svc.cluster.local");
let dst = ctrl.destination_tx("disco.test.svc.cluster.local");
dst.send_h2_hinted(srv.addr);

let proxy = proxy::new().controller(ctrl.run().await).run().await;

let client = client::http1(proxy.outbound, "disco.test.svc.cluster.local");

let res = client
.request(client.request_builder("/hint"))
.await
.unwrap();
assert_eq!(res.status(), 200);
assert_eq!(res.version(), http::Version::HTTP_11);

// Ensure panics are propagated.
proxy.join_servers().await;
srv.join().await;
}

#[tokio::test]
async fn inbound_http1() {
let _trace = trace_init();

let srv = server::http1()
.route_fn("/h1", |req| {
assert_eq!(req.version(), http::Version::HTTP_11);
assert!(
!req.headers().contains_key("l5d-orig-proto"),
"h1 server shouldn't receive l5d-orig-proto header"
);
Response::default()
})
.run()
.await;

let ctrl = controller::new();
ctrl.profile_tx_default("disco.test.svc.cluster.local");

let proxy = proxy::new()
.controller(ctrl.run().await)
.inbound(srv)
.run()
.await;

// This client will be used as a mocked-other-proxy.
let client = client::http2(proxy.inbound, "disco.test.svc.cluster.local");

let res = client
.request(
client
.request_builder("/h1")
.header("l5d-orig-proto", "HTTP/1.1"),
)
.await
.unwrap();
assert_eq!(res.status(), 200);
assert_eq!(res.version(), http::Version::HTTP_2);

// Ensure panics are propagated.
proxy.join_servers().await;
}
}
84 changes: 84 additions & 0 deletions linkerd/app/integration/tests/orig_proto.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
#![deny(warnings, rust_2018_idioms)]
#![type_length_limit = "3361329"]

use linkerd2_app_integration::*;

#[tokio::test]
async fn outbound_http1() {
let _trace = trace_init();

// Instead of a second proxy, this mocked h2 server will be the target.
let srv = server::http2()
.route_fn("/hint", |req| {
assert_eq!(req.headers()["l5d-orig-proto"], "HTTP/1.1");
Response::builder()
.header("l5d-orig-proto", "HTTP/1.1")
.body(Default::default())
.unwrap()
})
.run()
.await;

let ctrl = controller::new();
ctrl.profile_tx_default("disco.test.svc.cluster.local");
let dst = ctrl.destination_tx("disco.test.svc.cluster.local");
dst.send_h2_hinted(srv.addr);

let proxy = proxy::new().controller(ctrl.run().await).run().await;

let client = client::http1(proxy.outbound, "disco.test.svc.cluster.local");

let res = client
.request(client.request_builder("/hint"))
.await
.unwrap();
assert_eq!(res.status(), 200);
assert_eq!(res.version(), http::Version::HTTP_11);

// Ensure panics are propagated.
proxy.join_servers().await;
srv.join().await;
}

#[tokio::test]
async fn inbound_http1() {
let _trace = trace_init();

let srv = server::http1()
.route_fn("/h1", |req| {
assert_eq!(req.version(), http::Version::HTTP_11);
assert!(
!req.headers().contains_key("l5d-orig-proto"),
"h1 server shouldn't receive l5d-orig-proto header"
);
Response::default()
})
.run()
.await;

let ctrl = controller::new();
ctrl.profile_tx_default("disco.test.svc.cluster.local");

let proxy = proxy::new()
.controller(ctrl.run().await)
.inbound(srv)
.run()
.await;

// This client will be used as a mocked-other-proxy.
let client = client::http2(proxy.inbound, "disco.test.svc.cluster.local");

let res = client
.request(
client
.request_builder("/h1")
.header("l5d-orig-proto", "HTTP/1.1"),
)
.await
.unwrap();
assert_eq!(res.status(), 200);
assert_eq!(res.version(), http::Version::HTTP_2);

// Ensure panics are propagated.
proxy.join_servers().await;
}
0