From 7576c4a74cb1aff312b7d36adcc869d089396846 Mon Sep 17 00:00:00 2001 From: Willem Date: Thu, 24 Apr 2025 11:46:26 -0400 Subject: [PATCH] fix: made -version version, used ok_or to return error if k8s_state is not ready --- harmony/src/domain/topology/k8s_anywhere.rs | 22 ++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/harmony/src/domain/topology/k8s_anywhere.rs b/harmony/src/domain/topology/k8s_anywhere.rs index 0c3451d..c8912d7 100644 --- a/harmony/src/domain/topology/k8s_anywhere.rs +++ b/harmony/src/domain/topology/k8s_anywhere.rs @@ -38,7 +38,7 @@ impl K8sAnywhereTopology { fn is_helm_available(&self) -> Result<(), String> { let version_result = Command::new("helm") - .arg("-version") + .arg("version") .output() .map_err(|e| format!("Failed to execute 'helm -version': {}", e))?; @@ -151,20 +151,24 @@ impl Topology for K8sAnywhereTopology { } async fn ensure_ready(&self) -> Result { - let k8s_state = self + let k8s_state = self .k8s_state .get_or_try_init(|| self.try_get_or_install_k8s_client()) .await?; - //{ - // Some(k8s_state) => Ok(Outcome::success(k8s_state.message.clone())), - // None => Err(InterpretError::new("No K8s client could be found or installed".to_string(), - // )), - //} + + let k8s_state: &K8sState = k8s_state + .as_ref() + .ok_or(InterpretError::new( + "No K8s client could be found or installed".to_string(), + ))?; + match self.is_helm_available() { - Ok(()) => Ok(Outcome::success("helm available".to_string())), + Ok(()) => Ok(Outcome::success(format!( + "{} + helm available", + k8s_state.message.clone() + ))), Err(_) => Err(InterpretError::new("helm unavailable".to_string())), } - } }