Skip to content

Commit

Permalink
Revert "try to resolve CI port conflicts with github action... zzz"
Browse files Browse the repository at this point in the history
This reverts commit 147028e.
  • Loading branch information
GlenDC committed Nov 14, 2024
1 parent 147028e commit 863581e
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion examples/mtls_tunnel_and_service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
//! This won't work as the client is not authorized. You can use `curl` to interact with the service:
//!
//! ```sh
//! curl -v http://127.0.0.1:62114/hello
//! curl -v http://127.0.0.1:62014/hello
//! ```
//!
//! You should see a response with `HTTP/1.1 200 OK` and a body with `Hello, authorized client!`.
Expand Down
6 changes: 3 additions & 3 deletions examples/tls_termination.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
//!
//! # Expected output
//!
//! The server will start and listen on `:63850`. You can use `curl` to interact with the service:
//! The server will start and listen on `:63800`. You can use `curl` to interact with the service:
//!
//! ```sh
//! curl -v https://127.0.0.1:62800
Expand All @@ -32,7 +32,7 @@
//! This one will work however:
//!
//! ```sh
//! curl -k -v https://127.0.0.1:63850
//! curl -k -v https://127.0.0.1:63800
//! ```
//!
//! You should see a response with `HTTP/1.0 200 ok` and the body `Hello world!`.
Expand Down Expand Up @@ -92,7 +92,7 @@ async fn main() {
),
);

TcpListener::bind("127.0.0.1:63850")
TcpListener::bind("127.0.0.1:63800")
.await
.expect("bind TCP Listener: tls")
.serve_graceful(guard, tcp_service)
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/examples/example_tests/http_mitm_proxy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ async fn test_http_mitm_proxy() {
tokio::spawn(async {
HttpServer::auto(Executor::default())
.listen(
"127.0.0.1:63103",
"127.0.0.1:63003",
service_fn(|req: Request| async move {
Ok(Json(json!({
"method": req.method().as_str(),
Expand Down Expand Up @@ -74,7 +74,7 @@ async fn test_http_mitm_proxy() {

// test http request proxy flow
let result = runner
.get("http://127.0.0.1:61003/foo/bar")
.get("http://127.0.0.1:63003/foo/bar")
.send(ctx.clone())
.await
.unwrap()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ async fn test_https_connect_proxy() {
tokio::spawn(async {
HttpServer::auto(Executor::default())
.listen(
"127.0.0.1:63102",
"127.0.0.1:63002",
(
#[cfg(feature = "compression")]
CompressionLayer::new(),
Expand All @@ -46,7 +46,7 @@ async fn test_https_connect_proxy() {

// test regular proxy flow
let result = runner
.get("http://127.0.0.1:63102/foo/bar")
.get("http://127.0.0.1:63002/foo/bar")
.typed_header(Accept::json())
.send(ctx.clone())
.await
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ async fn test_mtls_tunnel_and_service() {
let runner = utils::ExampleRunner::interactive("mtls_tunnel_and_service", Some("rustls"));

let res_str = runner
.get("http://127.0.0.1:62114/hello")
.get("http://127.0.0.1:62014/hello")
.send(Context::default())
.await
.unwrap()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ async fn test_tls_termination() {
// but mostly because otherwise we need to fake the Forwarding stuff (HaProxy) as well.

let reply = runner
.get("https://127.0.0.1:63850")
.get("https://127.0.0.1:63800")
.send(Context::default())
.await
.unwrap()
Expand Down

0 comments on commit 863581e

Please sign in to comment.