From 1c75aab380a24c3b8ebbac9059e9dc288812a83b Mon Sep 17 00:00:00 2001 From: Ava Hahn Date: Mon, 23 Sep 2024 11:44:46 -0700 Subject: tools/unitctl: use hyper-rustls instead of hyper-tls Signed-off-by: Ava Hahn --- tools/unitctl/unit-client-rs/src/lib.rs | 1 - tools/unitctl/unit-client-rs/src/unit_client.rs | 11 +++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'tools/unitctl/unit-client-rs/src') diff --git a/tools/unitctl/unit-client-rs/src/lib.rs b/tools/unitctl/unit-client-rs/src/lib.rs index a0933f42..59dd2681 100644 --- a/tools/unitctl/unit-client-rs/src/lib.rs +++ b/tools/unitctl/unit-client-rs/src/lib.rs @@ -1,7 +1,6 @@ extern crate custom_error; extern crate futures; extern crate hyper; -extern crate hyper_tls; extern crate hyperlocal; extern crate serde; extern crate serde_json; diff --git a/tools/unitctl/unit-client-rs/src/unit_client.rs b/tools/unitctl/unit-client-rs/src/unit_client.rs index 3d09e67a..bc6cc4f7 100644 --- a/tools/unitctl/unit-client-rs/src/unit_client.rs +++ b/tools/unitctl/unit-client-rs/src/unit_client.rs @@ -9,7 +9,7 @@ use hyper::body::{Buf, HttpBody}; use hyper::client::{HttpConnector, ResponseFuture}; use hyper::Error as HyperError; use hyper::{http, Body, Client, Request}; -use hyper_tls::HttpsConnector; +use hyper_rustls::{HttpsConnectorBuilder, HttpsConnector}; use hyperlocal::{UnixClientExt, UnixConnector}; use serde::{Deserialize, Serialize}; @@ -185,7 +185,14 @@ impl UnitClient { } pub fn new_http(control_socket: ControlSocket) -> Self { - let remote_client = Client::builder().build(HttpsConnector::new()); + let remote_client = Client::builder() + .build(HttpsConnectorBuilder::default() + .with_native_roots() + .unwrap_or_else(|_| HttpsConnectorBuilder::default() + .with_webpki_roots()) + .https_or_http() + .enable_http1() + .wrap_connector(HttpConnector::new())); Self { control_socket, client: Box::from(RemoteClient::Tcp { client: remote_client }), -- cgit From ac90254870760011203a649ba833445918815703 Mon Sep 17 00:00:00 2001 From: Ava Hahn Date: Mon, 23 Sep 2024 13:39:09 -0700 Subject: tools/unitctl: bump bollard and clarify docker client error Signed-off-by: Ava Hahn --- tools/unitctl/unit-client-rs/src/unit_client.rs | 2 +- tools/unitctl/unit-client-rs/src/unitd_docker.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tools/unitctl/unit-client-rs/src') diff --git a/tools/unitctl/unit-client-rs/src/unit_client.rs b/tools/unitctl/unit-client-rs/src/unit_client.rs index bc6cc4f7..10d11e5f 100644 --- a/tools/unitctl/unit-client-rs/src/unit_client.rs +++ b/tools/unitctl/unit-client-rs/src/unit_client.rs @@ -191,7 +191,7 @@ impl UnitClient { .unwrap_or_else(|_| HttpsConnectorBuilder::default() .with_webpki_roots()) .https_or_http() - .enable_http1() + .enable_all_versions() .wrap_connector(HttpConnector::new())); Self { control_socket, diff --git a/tools/unitctl/unit-client-rs/src/unitd_docker.rs b/tools/unitctl/unit-client-rs/src/unitd_docker.rs index 2b9e0c7d..001f02a7 100644 --- a/tools/unitctl/unit-client-rs/src/unitd_docker.rs +++ b/tools/unitctl/unit-client-rs/src/unitd_docker.rs @@ -144,7 +144,7 @@ impl UnitdContainer { if let Ok(docker) = Docker::connect_with_local_defaults() { match docker.list_containers::(None).await { Err(e) => { - eprintln!("{}", e); + eprintln!("Could not read docker instances: {}", e); vec![] } Ok(summary) => { -- cgit