NationTech/harmony
6
0
Fork 1
Code Issues 33 Pull Requests 6 Actions Packages Projects Releases 1 Wiki Activity

fix: made -version version, used ok_or to return error if k8s_state is not ready

Browse Source
This commit is contained in:
Willem 2025-04-24 11:46:26 -04:00
parent c00eadca5d
commit 7576c4a74c
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
harmony/src/domain/topology/k8s_anywhere.rs
View File

@ -38,7 +38,7 @@ impl K8sAnywhereTopology {
fn is_helm_available(&self) -> Result<(), String> { fn is_helm_available(&self) -> Result<(), String> {
let version_result = Command::new("helm") let version_result = Command::new("helm")
.arg("-version") .arg("version")
.output() .output()
.map_err(|e| format!("Failed to execute 'helm -version': {}", e))?; .map_err(|e| format!("Failed to execute 'helm -version': {}", e))?;
@ -151,20 +151,24 @@ impl Topology for K8sAnywhereTopology {
} }
async fn ensure_ready(&self) -> Result<Outcome, InterpretError> { async fn ensure_ready(&self) -> Result<Outcome, InterpretError> {
let k8s_state = self let k8s_state = self
.k8s_state .k8s_state
.get_or_try_init(|| self.try_get_or_install_k8s_client()) .get_or_try_init(|| self.try_get_or_install_k8s_client())
.await?; .await?;
//{
// Some(k8s_state) => Ok(Outcome::success(k8s_state.message.clone())), let k8s_state: &K8sState = k8s_state
// None => Err(InterpretError::new("No K8s client could be found or installed".to_string(), .as_ref()
// )), .ok_or(InterpretError::new(
//} "No K8s client could be found or installed".to_string(),
))?;
match self.is_helm_available() { 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())), Err(_) => Err(InterpretError::new("helm unavailable".to_string())),
} }
} }
} }