diff --git a/examples/cli/src/main.rs b/examples/cli/src/main.rs index 58674ff..34c93e8 100644 --- a/examples/cli/src/main.rs +++ b/examples/cli/src/main.rs @@ -1,20 +1,21 @@ use harmony::{ inventory::Inventory, - maestro::Maestro, modules::dummy::{ErrorScore, PanicScore, SuccessScore}, topology::LocalhostTopology, }; #[tokio::main] async fn main() { - let inventory = Inventory::autoload(); - let topology = LocalhostTopology::new(); - let mut maestro = Maestro::initialize(inventory, topology).await.unwrap(); - - maestro.register_all(vec![ - Box::new(SuccessScore {}), - Box::new(ErrorScore {}), - Box::new(PanicScore {}), - ]); - harmony_cli::init(maestro, None).await.unwrap(); + harmony_cli::run( + LocalhostTopology::new(), + Inventory::autoload(), + vec![ + Box::new(SuccessScore {}), + Box::new(ErrorScore {}), + Box::new(PanicScore {}), + ], + None, + ) + .await + .unwrap(); } diff --git a/examples/lamp/src/main.rs b/examples/lamp/src/main.rs index 51816e6..ec11bae 100644 --- a/examples/lamp/src/main.rs +++ b/examples/lamp/src/main.rs @@ -1,7 +1,6 @@ use harmony::{ data::Version, inventory::Inventory, - maestro::Maestro, modules::lamp::{LAMPConfig, LAMPScore}, topology::{K8sAnywhereTopology, Url}, }; @@ -43,15 +42,13 @@ async fn main() { // K8sAnywhereTopology as it is the most automatic one that enables you to easily deploy // locally, to development environment from a CI, to staging, and to production with settings // that automatically adapt to each environment grade. - let mut maestro = Maestro::::initialize( - Inventory::autoload(), + harmony_cli::run( K8sAnywhereTopology::from_env(), + Inventory::autoload(), + vec![Box::new(lamp_stack)], + None, ) .await .unwrap(); - - maestro.register_all(vec![Box::new(lamp_stack)]); - // Here we bootstrap the CLI, this gives some nice features if you need them - harmony_cli::init(maestro, None).await.unwrap(); } // That's it, end of the infra as code. diff --git a/examples/monitoring/src/main.rs b/examples/monitoring/src/main.rs index 989b1ec..371c4ff 100644 --- a/examples/monitoring/src/main.rs +++ b/examples/monitoring/src/main.rs @@ -2,7 +2,6 @@ use std::collections::HashMap; use harmony::{ inventory::Inventory, - maestro::Maestro, modules::{ monitoring::{ alert_channel::discord_alert_channel::DiscordWebhook, @@ -74,13 +73,13 @@ async fn main() { rules: vec![Box::new(additional_rules), Box::new(additional_rules2)], service_monitors: vec![service_monitor], }; - let mut maestro = Maestro::::initialize( - Inventory::autoload(), + + harmony_cli::run( K8sAnywhereTopology::from_env(), + Inventory::autoload(), + vec![Box::new(alerting_score)], + None, ) .await .unwrap(); - - maestro.register_all(vec![Box::new(alerting_score)]); - harmony_cli::init(maestro, None).await.unwrap(); } diff --git a/examples/monitoring_with_tenant/src/main.rs b/examples/monitoring_with_tenant/src/main.rs index ec80542..db500fb 100644 --- a/examples/monitoring_with_tenant/src/main.rs +++ b/examples/monitoring_with_tenant/src/main.rs @@ -3,7 +3,6 @@ use std::collections::HashMap; use harmony::{ data::Id, inventory::Inventory, - maestro::Maestro, modules::{ monitoring::{ alert_channel::discord_alert_channel::DiscordWebhook, @@ -78,13 +77,13 @@ async fn main() { rules: vec![Box::new(additional_rules)], service_monitors: vec![service_monitor], }; - let mut maestro = Maestro::::initialize( - Inventory::autoload(), + + harmony_cli::run( K8sAnywhereTopology::from_env(), + Inventory::autoload(), + vec![Box::new(tenant), Box::new(alerting_score)], + None, ) .await .unwrap(); - - maestro.register_all(vec![Box::new(tenant), Box::new(alerting_score)]); - harmony_cli::init(maestro, None).await.unwrap(); } diff --git a/examples/ntfy/src/main.rs b/examples/ntfy/src/main.rs index fc04e6e..89e0162 100644 --- a/examples/ntfy/src/main.rs +++ b/examples/ntfy/src/main.rs @@ -1,20 +1,18 @@ use harmony::{ - inventory::Inventory, maestro::Maestro, modules::monitoring::ntfy::ntfy::NtfyScore, - topology::K8sAnywhereTopology, + inventory::Inventory, modules::monitoring::ntfy::ntfy::NtfyScore, topology::K8sAnywhereTopology, }; #[tokio::main] async fn main() { - let mut maestro = Maestro::::initialize( - Inventory::autoload(), + harmony_cli::run( K8sAnywhereTopology::from_env(), + Inventory::autoload(), + vec![Box::new(NtfyScore { + namespace: "monitoring".to_string(), + host: "localhost".to_string(), + })], + None, ) .await .unwrap(); - - maestro.register_all(vec![Box::new(NtfyScore { - namespace: "monitoring".to_string(), - host: "localhost".to_string(), - })]); - harmony_cli::init(maestro, None).await.unwrap(); } diff --git a/examples/rust/src/main.rs b/examples/rust/src/main.rs index 94eb8a7..149f58f 100644 --- a/examples/rust/src/main.rs +++ b/examples/rust/src/main.rs @@ -2,24 +2,15 @@ use std::{path::PathBuf, sync::Arc}; use harmony::{ inventory::Inventory, - maestro::Maestro, modules::application::{ ApplicationScore, RustWebFramework, RustWebapp, features::{ContinuousDelivery, Monitoring}, }, topology::{K8sAnywhereTopology, Url}, }; -use harmony_cli::cli_logger; #[tokio::main] async fn main() { - let cli_logger_handle = cli_logger::init(); - - let topology = K8sAnywhereTopology::from_env(); - let mut maestro = Maestro::initialize(Inventory::autoload(), topology) - .await - .unwrap(); - let application = Arc::new(RustWebapp { name: "harmony-example-rust-webapp".to_string(), domain: Url::Url(url::Url::parse("https://rustapp.harmony.example.com").unwrap()), @@ -39,8 +30,12 @@ async fn main() { application, }; - maestro.register_all(vec![Box::new(app)]); - harmony_cli::init(maestro, None).await.unwrap(); - - let _ = tokio::try_join!(cli_logger_handle); + harmony_cli::run( + K8sAnywhereTopology::from_env(), + Inventory::autoload(), + vec![Box::new(app)], + None, + ) + .await + .unwrap(); } diff --git a/examples/tenant/src/main.rs b/examples/tenant/src/main.rs index e5ac36c..bd3b9e6 100644 --- a/examples/tenant/src/main.rs +++ b/examples/tenant/src/main.rs @@ -1,7 +1,6 @@ use harmony::{ data::Id, inventory::Inventory, - maestro::Maestro, modules::tenant::TenantScore, topology::{K8sAnywhereTopology, tenant::TenantConfig}, }; @@ -16,15 +15,14 @@ async fn main() { }, }; - let mut maestro = Maestro::::initialize( - Inventory::autoload(), + harmony_cli::run( K8sAnywhereTopology::from_env(), + Inventory::autoload(), + vec![Box::new(tenant)], + None, ) .await .unwrap(); - - maestro.register_all(vec![Box::new(tenant)]); - harmony_cli::init(maestro, None).await.unwrap(); } // TODO write tests diff --git a/harmony/src/domain/maestro/mod.rs b/harmony/src/domain/maestro/mod.rs index a7f2b60..4d1053e 100644 --- a/harmony/src/domain/maestro/mod.rs +++ b/harmony/src/domain/maestro/mod.rs @@ -1,6 +1,6 @@ use std::sync::{Arc, Mutex, RwLock}; -use log::{debug, info, warn}; +use log::{debug, warn}; use crate::instrumentation::{self, HarmonyEvent}; diff --git a/harmony_cli/src/lib.rs b/harmony_cli/src/lib.rs index 4d71a6e..3980dea 100644 --- a/harmony_cli/src/lib.rs +++ b/harmony_cli/src/lib.rs @@ -1,8 +1,10 @@ use clap::Parser; use clap::builder::ArgPredicate; -use harmony; +use harmony::inventory::Inventory; +use harmony::maestro::Maestro; use harmony::{score::Score, topology::Topology}; use inquire::Confirm; +use log::debug; pub mod cli_logger; // FIXME: Don't make me pub pub mod progress; @@ -10,7 +12,6 @@ pub mod theme; #[cfg(feature = "tui")] use harmony_tui; -use log::debug; #[derive(Parser, Debug)] #[command(version, about, long_about = None)] @@ -85,6 +86,23 @@ fn list_scores_with_index(scores_vec: &Vec>>) -> S return display_str; } +pub async fn run( + topology: T, + inventory: Inventory, + scores: Vec>>, + args_struct: Option, +) -> Result<(), Box> { + let cli_logger_handle = cli_logger::init(); + + let mut maestro = Maestro::initialize(inventory, topology).await.unwrap(); + maestro.register_all(scores); + + let result = init(maestro, args_struct).await; + + let _ = tokio::try_join!(cli_logger_handle); + result +} + pub async fn init( maestro: harmony::maestro::Maestro, args_struct: Option,