Merge pull request #2182 from Ruadhri17/tedge-connect-test-fix

Fix the wrong exit code after the cloud connection test failure
thin-edge · Aug 23, 2023 · 3e37b35 · 3e37b35 · github-actions · Aug 23, 2023
2 parents 763f0a9 + 6d231b8
commit 3e37b35
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git 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
@@ -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}"
     )]