From c02763a6fc5826edd725759df80c5a9d23a08fbd Mon Sep 17 00:00:00 2001 From: Ian Letourneau Date: Tue, 1 Jul 2025 11:33:05 -0400 Subject: [PATCH] Adjust imports --- .../application/features/continuous_delivery.rs | 7 ++++++- harmony/src/modules/application/features/mod.rs | 4 +++- .../src/modules/application/features/monitoring.rs | 10 +++++++++- harmony_cli/src/lib.rs | 12 ++++++------ harmony_composer/src/main.rs | 1 + 5 files changed, 25 insertions(+), 9 deletions(-) diff --git a/harmony/src/modules/application/features/continuous_delivery.rs b/harmony/src/modules/application/features/continuous_delivery.rs index 4cd2946..982b5c4 100644 --- a/harmony/src/modules/application/features/continuous_delivery.rs +++ b/harmony/src/modules/application/features/continuous_delivery.rs @@ -1,3 +1,8 @@ +use async_trait::async_trait; +use log::info; + +use crate::{modules::application::ApplicationFeature, topology::Topology}; + /// ContinuousDelivery in Harmony provides this functionality : /// /// - **Package** the application @@ -29,7 +34,7 @@ pub struct ContinuousDelivery {} #[async_trait] -impl ApplicationFeature for ContinuousDelivery { +impl ApplicationFeature for ContinuousDelivery { async fn ensure_installed(&self, _topology: &T) -> Result<(), String> { info!("Installing ContinuousDelivery feature"); todo!() diff --git a/harmony/src/modules/application/features/mod.rs b/harmony/src/modules/application/features/mod.rs index e58a814..0e034fc 100644 --- a/harmony/src/modules/application/features/mod.rs +++ b/harmony/src/modules/application/features/mod.rs @@ -1,6 +1,8 @@ mod endpoint; pub use endpoint::*; + mod monitoring; pub use monitoring::*; + mod continuous_delivery; -pub use endpoint::*; +pub use continuous_delivery::*; diff --git a/harmony/src/modules/application/features/monitoring.rs b/harmony/src/modules/application/features/monitoring.rs index dccfa88..91ad72d 100644 --- a/harmony/src/modules/application/features/monitoring.rs +++ b/harmony/src/modules/application/features/monitoring.rs @@ -1,8 +1,16 @@ +use async_trait::async_trait; +use log::info; + +use crate::{ + modules::application::ApplicationFeature, + topology::{HelmCommand, Topology}, +}; + #[derive(Debug, Default)] pub struct Monitoring {} #[async_trait] -impl ApplicationFeature for Monitoring { +impl ApplicationFeature for Monitoring { async fn ensure_installed(&self, _topology: &T) -> Result<(), String> { info!("Ensuring monitoring is available for application"); todo!("create and execute k8s prometheus score, depends on Will's work") diff --git a/harmony_cli/src/lib.rs b/harmony_cli/src/lib.rs index 33759fa..50beb6e 100644 --- a/harmony_cli/src/lib.rs +++ b/harmony_cli/src/lib.rs @@ -12,15 +12,15 @@ use harmony_tui; pub struct Args { /// Run score(s) without prompt #[arg(short, long, default_value_t = false, conflicts_with = "interactive")] - yes: bool, + pub yes: bool, /// Filter query #[arg(short, long, conflicts_with = "interactive")] - filter: Option, + pub filter: Option, /// Run interactive TUI or not #[arg(short, long, default_value_t = false)] - interactive: bool, + pub interactive: bool, /// Run all or nth, defaults to all #[arg( @@ -31,15 +31,15 @@ pub struct Args { conflicts_with = "number", conflicts_with = "interactive" )] - all: bool, + pub all: bool, /// Run nth matching, zero indexed #[arg(short, long, default_value_t = 0, conflicts_with = "interactive")] - number: usize, + pub number: usize, /// list scores, will also be affected by run filter #[arg(short, long, default_value_t = false, conflicts_with = "interactive")] - list: bool, + pub list: bool, } fn maestro_scores_filter( diff --git a/harmony_composer/src/main.rs b/harmony_composer/src/main.rs index 0bdb7be..5bda800 100644 --- a/harmony_composer/src/main.rs +++ b/harmony_composer/src/main.rs @@ -119,6 +119,7 @@ async fn main() { if args.prod { todo!("implement prod deployment"); } + println!("harmony_bin_path: {}", harmony_bin_path.display()); let deploy_output = Command::new(harmony_bin_path) .arg("-y") .arg("-a")