fixup! Fix exit code on tedge cert error

didier-wenzek · didier-wenzek · commit 758b169b7cac · 2025-04-02T16:16:46.000+02:00
diff --git a/crates/core/c8y_api/src/http_proxy.rs b/crates/core/c8y_api/src/http_proxy.rs
@@ -69,17 +69,19 @@ impl C8yEndPoint {
         c8y_profile: Option<&str>,
     ) -> Result<Self, C8yEndPointConfigError> {
         let c8y_config = tedge_config.c8y.try_get(c8y_profile)?;
-        let c8y_host = c8y_config.proxy.client.host.to_string();
-        let c8y_mqtt_host = c8y_host.clone();
         let auth_proxy_addr = c8y_config.proxy.client.host.clone();
         let auth_proxy_port = c8y_config.proxy.client.port;
         let auth_proxy_protocol = c8y_config
             .proxy
             .cert_path
             .or_none()
             .map_or(Protocol::Http, |_| Protocol::Https);
+        let c8y_host = format!(
+            "{}://{auth_proxy_addr}:{auth_proxy_port}",
+            auth_proxy_protocol.as_str()
+        );
+        let c8y_mqtt_host = c8y_host.clone();
         let proxy = ProxyUrlGenerator::new(auth_proxy_addr, auth_proxy_port, auth_proxy_protocol);
-
         Ok(C8yEndPoint {
             c8y_host,
             c8y_mqtt_host,
diff --git a/crates/core/tedge/src/cli/certificate/c8y/renew.rs b/crates/core/tedge/src/cli/certificate/c8y/renew.rs
@@ -47,7 +47,10 @@ pub struct RenewCertCmd {
 #[async_trait::async_trait]
 impl Command for RenewCertCmd {
     fn description(&self) -> String {
-        format!("renew the device certificate from {}", self.c8y_url())
+        format!(
+            "renew the device certificate via Cumulocity HTTP proxy {}",
+            self.c8y_url()
+        )
     }
 
     async fn execute(&self) -> Result<(), MaybeFancy<Error>> {
@@ -103,10 +106,8 @@ impl RenewCertCmd {
                 response.status(),
                 response.text().await.unwrap_or("".to_string())
             )),
-            Err(err) => Err(anyhow!(
-                "Fail to connect to {url}: {:?}",
-                get_webpki_error_from_reqwest(err)
-            )),
+            Err(err) => Err(Error::new(get_webpki_error_from_reqwest(err))
+                .context(format!("Fail to connect to Cumulocity HTTP proxy {url}"))),
         }
     }
 
diff --git a/crates/core/tedge/src/cli/certificate/error.rs b/crates/core/tedge/src/cli/certificate/error.rs
@@ -79,6 +79,12 @@ pub enum CertError {
     #[error(transparent)]
     PathsError(#[from] PathsError),
 
+    #[error("Connection error: {0}")]
+    ReqwestConnect(String),
+
+    #[error("Request time out")]
+    ReqwestTimeout,
+
     #[error(transparent)]
     ReqwestError(#[from] reqwest::Error),
 
@@ -161,6 +167,16 @@ pub fn get_webpki_error_from_reqwest(err: reqwest::Error) -> CertError {
     {
         CertError::CertificateError(tls_error)
     } else {
-        CertError::ReqwestError(err) // any other Error type than `hyper::Error`
+        // any other Error type than `hyper::Error`
+        if err.is_connect() {
+            match err.source().and_then(|err| err.source()) {
+                Some(io_error) => CertError::ReqwestConnect(format!("{io_error}")),
+                None => CertError::ReqwestError(err),
+            }
+        } else if err.is_timeout() {
+            CertError::ReqwestTimeout
+        } else {
+            CertError::ReqwestError(err)
+        }
     }
 }
