From c2985abecba711a4f59a58dbce424bf4625923d7 Mon Sep 17 00:00:00 2001 From: Luis Moreno Date: Mon, 26 Feb 2024 21:50:30 -0500 Subject: [PATCH 1/2] chore: use fixed version of cc --- Cargo.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index af1ae760..67864374 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,6 +13,8 @@ env_logger = "^0.11" log = "^0.4.17" [dependencies] +anyhow = "1.0" +cc = "=1.0.83" pyo3 = { version = "0.20.2", features = ["extension-module"] } fluvio-future = { version = "0.6.0", features = ["task", "io", "native2_tls", "subscriber"] } thiserror = "1.0.21" @@ -31,7 +33,6 @@ webbrowser = "0.8.2" toml = "0.8.1" serde_json = "1.0.59" rpassword = "7.3.1" -anyhow = "1.0" fluvio = { features = ["admin", "rustls"], git = "https://github.com/infinyon/fluvio.git", tag = "v0.11.4" } fluvio-types = { git = "https://github.com/infinyon/fluvio.git", tag = "v0.11.4" } From 49a2cc0e7296675ed55d4123bcaee0a70a8609ca Mon Sep 17 00:00:00 2001 From: Luis Moreno Date: Mon, 26 Feb 2024 22:04:57 -0500 Subject: [PATCH 2/2] chore: use rust-tls --- Cargo.toml | 5 ++--- src/cloud/http.rs | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 67864374..72a0fa1a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,9 +14,8 @@ log = "^0.4.17" [dependencies] anyhow = "1.0" -cc = "=1.0.83" pyo3 = { version = "0.20.2", features = ["extension-module"] } -fluvio-future = { version = "0.6.0", features = ["task", "io", "native2_tls", "subscriber"] } +fluvio-future = { version = "0.6.0", default_features = false, features = ["task", "io", "rust_tls", "subscriber"] } thiserror = "1.0.21" serde = "1.0.117" tracing = "0.1.37" @@ -34,5 +33,5 @@ toml = "0.8.1" serde_json = "1.0.59" rpassword = "7.3.1" -fluvio = { features = ["admin", "rustls"], git = "https://github.com/infinyon/fluvio.git", tag = "v0.11.4" } +fluvio = { features = ["admin", "rustls"], default_features = false, git = "https://github.com/infinyon/fluvio.git", tag = "v0.11.4" } fluvio-types = { git = "https://github.com/infinyon/fluvio.git", tag = "v0.11.4" } diff --git a/src/cloud/http.rs b/src/cloud/http.rs index 3ab2e3e9..9126c345 100644 --- a/src/cloud/http.rs +++ b/src/cloud/http.rs @@ -30,7 +30,7 @@ pub async fn execute(req: Request) -> Result { ); let result = if is_https { - let tls_connector = fluvio_future::native_tls::TlsConnector::default(); + let tls_connector = fluvio_future::rust_tls::TlsConnector::default(); let tls_stream = tls_connector.connect(host, tcp_stream).await?; client::connect(tls_stream, req).await } else {