From 336e1cfefe4d9127b0f53eb375a47469e2ccf7bf Mon Sep 17 00:00:00 2001 From: Ian Letourneau Date: Sat, 9 Aug 2025 22:18:06 -0400 Subject: [PATCH] rename a few scores & interprets --- .../modules/application/features/helm_argocd_score.rs | 2 +- harmony/src/modules/application/rust.rs | 2 +- harmony/src/modules/helm/chart.rs | 2 +- .../application_monitoring_score.rs | 9 +++++++-- harmony/src/modules/monitoring/ntfy/ntfy.rs | 4 ++-- .../modules/prometheus/k8s_prometheus_alerting_score.rs | 6 ++---- harmony/src/modules/tenant/mod.rs | 6 +++--- harmony_cli/src/cli_logger.rs | 6 +++++- 8 files changed, 22 insertions(+), 15 deletions(-) diff --git a/harmony/src/modules/application/features/helm_argocd_score.rs b/harmony/src/modules/application/features/helm_argocd_score.rs index 66b23f0..5a91798 100644 --- a/harmony/src/modules/application/features/helm_argocd_score.rs +++ b/harmony/src/modules/application/features/helm_argocd_score.rs @@ -59,7 +59,7 @@ impl Interpret for ArgoInterpret { .await .unwrap(); Ok(Outcome::success(format!( - "Successfully installed ArgoCD and {} Applications", + "ArgoCD installed with {} applications", self.argo_apps.len() ))) } diff --git a/harmony/src/modules/application/rust.rs b/harmony/src/modules/application/rust.rs index 4f30e3e..22a1c42 100644 --- a/harmony/src/modules/application/rust.rs +++ b/harmony/src/modules/application/rust.rs @@ -46,7 +46,7 @@ where } fn name(&self) -> String { - format!("Application: {}", self.application.name()) + format!("{} [ApplicationScore]", self.application.name()) } } diff --git a/harmony/src/modules/helm/chart.rs b/harmony/src/modules/helm/chart.rs index b21aa50..6bff93a 100644 --- a/harmony/src/modules/helm/chart.rs +++ b/harmony/src/modules/helm/chart.rs @@ -55,7 +55,7 @@ impl Score for HelmChartScore { } fn name(&self) -> String { - format!("{} {} HelmChartScore", self.release_name, self.chart_name) + format!("{} [HelmChartScore]", self.release_name) } } diff --git a/harmony/src/modules/monitoring/application_monitoring/application_monitoring_score.rs b/harmony/src/modules/monitoring/application_monitoring/application_monitoring_score.rs index 1bcaacc..51c8ff9 100644 --- a/harmony/src/modules/monitoring/application_monitoring/application_monitoring_score.rs +++ b/harmony/src/modules/monitoring/application_monitoring/application_monitoring_score.rs @@ -33,7 +33,10 @@ impl> Score } fn name(&self) -> String { - "ApplicationMonitoringScore".to_string() + format!( + "{} monitoring [ApplicationMonitoringScore]", + self.application.name() + ) } } @@ -61,7 +64,9 @@ impl> Interpret match result { Ok(outcome) => match outcome { - PreparationOutcome::Success { details } => Ok(Outcome::success(details)), + PreparationOutcome::Success { details: _ } => { + Ok(Outcome::success("Prometheus installed".into())) + } PreparationOutcome::Noop => Ok(Outcome::noop()), }, Err(err) => Err(InterpretError::from(err)), diff --git a/harmony/src/modules/monitoring/ntfy/ntfy.rs b/harmony/src/modules/monitoring/ntfy/ntfy.rs index 2622c28..8ad3230 100644 --- a/harmony/src/modules/monitoring/ntfy/ntfy.rs +++ b/harmony/src/modules/monitoring/ntfy/ntfy.rs @@ -28,7 +28,7 @@ impl Score for NtfyScore { } fn name(&self) -> String { - "NtfyScore".to_string() + "alert receiver [NtfyScore]".into() } } @@ -119,7 +119,7 @@ impl Interpret for NtfyInterpret { debug!("exec into pod done"); - Ok(Outcome::success("installed ntfy".to_string())) + Ok(Outcome::success("Ntfy installed".to_string())) } fn get_name(&self) -> InterpretName { diff --git a/harmony/src/modules/prometheus/k8s_prometheus_alerting_score.rs b/harmony/src/modules/prometheus/k8s_prometheus_alerting_score.rs index df8fc49..1258675 100644 --- a/harmony/src/modules/prometheus/k8s_prometheus_alerting_score.rs +++ b/harmony/src/modules/prometheus/k8s_prometheus_alerting_score.rs @@ -61,7 +61,7 @@ impl> S } fn name(&self) -> String { - "CRDApplicationAlertingScore".into() + "prometheus alerting [CRDAlertingScore]".into() } } @@ -93,9 +93,7 @@ impl> I self.install_rules(&self.prometheus_rules, &client).await?; self.install_monitors(self.service_monitors.clone(), &client) .await?; - Ok(Outcome::success( - "deployed application monitoring composants".to_string(), - )) + Ok(Outcome::success("K8s components installed".to_string())) } fn get_name(&self) -> InterpretName { diff --git a/harmony/src/modules/tenant/mod.rs b/harmony/src/modules/tenant/mod.rs index 1803b69..b1a49c2 100644 --- a/harmony/src/modules/tenant/mod.rs +++ b/harmony/src/modules/tenant/mod.rs @@ -28,7 +28,7 @@ impl Score for TenantScore { } fn name(&self) -> String { - format!("{} TenantScore", self.config.name) + format!("{} [TenantScore]", self.config.name) } } @@ -47,8 +47,8 @@ impl Interpret for TenantInterpret { topology.provision_tenant(&self.tenant_config).await?; Ok(Outcome::success(format!( - "Successfully provisioned tenant {} with id {}", - self.tenant_config.name, self.tenant_config.id + "Tenant provisioned with id '{}'", + self.tenant_config.id ))) } diff --git a/harmony_cli/src/cli_logger.rs b/harmony_cli/src/cli_logger.rs index e51aacd..201c689 100644 --- a/harmony_cli/src/cli_logger.rs +++ b/harmony_cli/src/cli_logger.rs @@ -50,7 +50,11 @@ async fn handle_events(base_progress: MultiProgress) { match event { HarmonyEvent::HarmonyStarted => {} HarmonyEvent::HarmonyFinished => { - progress_tracker.add_section("harmony-finished", "\n"); + progress_tracker.add_section( + "harmony-summary", + &format!("\n{} Harmony completed\n\n", crate::theme::EMOJI_HARMONY), + ); + progress_tracker.add_section("harmony-finished", "\n\n"); return false; } HarmonyEvent::TopologyStateChanged {