From 1edb230fa485c8d0694bc8973f2e76e7770e9d4d Mon Sep 17 00:00:00 2001 From: Taha Hawa Date: Thu, 24 Apr 2025 14:43:39 -0400 Subject: [PATCH 1/2] fix: logging in harmony_cli --- Cargo.lock | 1 + harmony_cli/Cargo.toml | 1 + harmony_cli/src/lib.rs | 2 ++ 3 files changed, 4 insertions(+) diff --git a/Cargo.lock b/Cargo.lock index f58898d..197da40 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1373,6 +1373,7 @@ version = "0.1.0" dependencies = [ "assert_cmd", "clap", + "env_logger", "harmony", "harmony_tui", "inquire", diff --git a/harmony_cli/Cargo.toml b/harmony_cli/Cargo.toml index 9d92103..e7d7398 100644 --- a/harmony_cli/Cargo.toml +++ b/harmony_cli/Cargo.toml @@ -12,6 +12,7 @@ harmony = { path = "../harmony" } harmony_tui = { path = "../harmony_tui", optional = true } inquire.workspace = true tokio.workspace = true +env_logger.workspace = true [features] diff --git a/harmony_cli/src/lib.rs b/harmony_cli/src/lib.rs index 47d3aff..a47df06 100644 --- a/harmony_cli/src/lib.rs +++ b/harmony_cli/src/lib.rs @@ -99,6 +99,8 @@ pub async fn init( return Err("Not compiled with interactive support".into()); } + env_logger::builder().init(); + let scores_vec = maestro_scores_filter(&maestro, args.all, args.filter, args.number); if scores_vec.len() == 0 { -- 2.39.5 From 48a914e08fc2fdbf027fb2273537fbefd8e0d9e0 Mon Sep 17 00:00:00 2001 From: Taha Hawa Date: Thu, 24 Apr 2025 14:43:55 -0400 Subject: [PATCH 2/2] fix: re-export nonblanksstring --- harmony/src/modules/helm/chart.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/harmony/src/modules/helm/chart.rs b/harmony/src/modules/helm/chart.rs index ea03765..35d6863 100644 --- a/harmony/src/modules/helm/chart.rs +++ b/harmony/src/modules/helm/chart.rs @@ -6,7 +6,7 @@ use crate::topology::{HelmCommand, Topology}; use async_trait::async_trait; use helm_wrapper_rs; use helm_wrapper_rs::blocking::{DefaultHelmExecutor, HelmExecutor}; -use non_blank_string_rs::NonBlankString; +pub use non_blank_string_rs::NonBlankString; use serde::Serialize; use std::collections::HashMap; @@ -27,7 +27,7 @@ impl Score for HelmChartScore { } fn name(&self) -> String { - "HelmChartScore".to_string() + format!("{} {} HelmChartScore", self.release_name, self.chart_name) } } -- 2.39.5