From 6d231b8d2e9b771ead762cebaf706c0ae75c2f79 Mon Sep 17 00:00:00 2001
From: Krzysztof Piotrowski <krzysztof.piotrowski@inetum.com>
Date: Wed, 23 Aug 2023 11:35:52 +0000
Subject: [PATCH] Return exit code 1 when connection test fails

Signed-off-by: Krzysztof Piotrowski <krzysztof.piotrowski@inetum.com>
---
 crates/core/tedge/src/cli/connect/command.rs | 12 ++----------
 crates/core/tedge/src/cli/connect/error.rs   |  3 +++
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/crates/core/tedge/src/cli/connect/command.rs b/crates/core/tedge/src/cli/connect/command.rs
index 1fb13bd62b7..30841234f77 100644
--- a/crates/core/tedge/src/cli/connect/command.rs
+++ b/crates/core/tedge/src/cli/connect/command.rs
@@ -64,13 +64,8 @@ impl Command for ConnectCommand {
                         println!("Connection check to {} cloud is successful.\n", cloud);
                         Ok(())
                     }
-                    Ok(DeviceStatus::Unknown) | Err(_) => {
-                        println!(
-                            "Connection check to {} cloud failed.\n",
-                            self.cloud.as_str()
-                        );
-                        Ok(())
-                    }
+                    Ok(DeviceStatus::Unknown) => Err(ConnectError::UnknownDeviceStatus.into()),
+                    Err(err) => Err(err.into()),
                 };
             } else {
                 return Err((ConnectError::DeviceNotConnected {
@@ -283,7 +278,6 @@ fn check_device_status_c8y(tedge_config: &TEdgeConfig) -> Result<DeviceStatus, C
         Ok(DeviceStatus::Unknown)
     } else {
         // The request has not even been sent
-        println!("\nMake sure mosquitto is running.");
         Err(ConnectError::TimeoutElapsedError)
     }
 }
@@ -359,7 +353,6 @@ fn check_device_status_azure(tedge_config: &TEdgeConfig) -> Result<DeviceStatus,
         Ok(DeviceStatus::Unknown)
     } else {
         // The request has not even been sent
-        println!("Make sure mosquitto is running.");
         Err(ConnectError::TimeoutElapsedError)
     }
 }
@@ -426,7 +419,6 @@ fn check_device_status_aws(tedge_config: &TEdgeConfig) -> Result<DeviceStatus, C
         Ok(DeviceStatus::Unknown)
     } else {
         // The request has not even been sent
-        println!("Make sure mosquitto is running.");
         Err(ConnectError::TimeoutElapsedError)
     }
 }
diff --git a/crates/core/tedge/src/cli/connect/error.rs b/crates/core/tedge/src/cli/connect/error.rs
index 066aaea93d4..36158b93a75 100644
--- a/crates/core/tedge/src/cli/connect/error.rs
+++ b/crates/core/tedge/src/cli/connect/error.rs
@@ -48,6 +48,9 @@ pub enum ConnectError {
     #[error("Device is not connected to {cloud} cloud")]
     DeviceNotConnected { cloud: String },
 
+    #[error("Unknown device status")]
+    UnknownDeviceStatus,
+
     #[error(
         "The JWT token received from Cumulocity is invalid.\nToken: {token}\nReason: {reason}"
     )]