fix(secrets): use Inquire::Editor instead of regular text

Cargo.lock

@@ -3124,6 +3124,7 @@ dependencies = [
  "fxhash",
  "newline-converter",
  "once_cell",
+ "tempfile",
  "unicode-segmentation",
  "unicode-width 0.1.14",
 ]

Cargo.toml

@@ -14,7 +14,8 @@ members = [
   "harmony_composer",
   "harmony_inventory_agent",
   "harmony_secret_derive",
-  "harmony_secret", "adr/agent_discovery/mdns",
+  "harmony_secret",
+  "adr/agent_discovery/mdns",
 ]
 
 [workspace.package]
@@ -50,7 +51,7 @@ k8s-openapi = { version = "0.25", features = ["v1_30"] }
 serde_yaml = "0.9"
 serde-value = "0.7"
 http = "1.2"
-inquire = "0.7"
+inquire = { version = "0.7", features = ["editor"] }
 convert_case = "0.8"
 chrono = "0.4"
 similar = "2"
@@ -66,5 +67,11 @@ thiserror = "2.0.14"
 serde = { version = "1.0.209", features = ["derive", "rc"] }
 serde_json = "1.0.127"
 askama = "0.14"
-sqlx = { version = "0.8", features = ["runtime-tokio", "sqlite" ] }
+sqlx = { version = "0.8", features = ["runtime-tokio", "sqlite"] }
-reqwest = { version = "0.12", features = ["blocking", "stream", "rustls-tls", "http2", "json"], default-features = false }
+reqwest = { version = "0.12", features = [
+  "blocking",
+  "stream",
+  "rustls-tls",
+  "http2",
+  "json",
+], default-features = false }

examples/rhob_application_monitoring/src/main.rs

@@ -4,7 +4,8 @@ use harmony::{
     inventory::Inventory,
     modules::{
         application::{
-            ApplicationScore, RustWebFramework, RustWebapp, features::rhob_monitoring::Monitoring,
+            ApplicationScore, RustWebFramework, RustWebapp,
+            features::rhob_monitoring::RHOBMonitoring,
         },
         monitoring::alert_channel::discord_alert_channel::DiscordWebhook,
     },
@@ -28,7 +29,7 @@ async fn main() {
 
     let app = ApplicationScore {
         features: vec![
-            Box::new(Monitoring {
+            Box::new(RHOBMonitoring {
                 application: application.clone(),
                 alert_receiver: vec![Box::new(discord_receiver)],
             }),

examples/rust/src/main.rs

@@ -5,7 +5,7 @@ use harmony::{
     modules::{
         application::{
             ApplicationScore, RustWebFramework, RustWebapp,
-            features::{Monitoring, PackagingDeployment},
+            features::{ContinuousDelivery, Monitoring},
         },
         monitoring::alert_channel::{
             discord_alert_channel::DiscordWebhook, webhook_receiver::WebhookReceiver,
@@ -36,7 +36,7 @@ async fn main() {
 
     let app = ApplicationScore {
         features: vec![
-            Box::new(PackagingDeployment {
+            Box::new(ContinuousDelivery {
                 application: application.clone(),
             }),
             Box::new(Monitoring {

examples/try_rust_webapp/files_to_add/.dockerignore

@@ -1 +0,0 @@
-harmony

examples/try_rust_webapp/files_to_add/Cargo.toml.to_add

@@ -1,20 +0,0 @@
-[package]
-name = "harmony-tryrust"
-edition = "2024"
-version = "0.1.0"
-
-[dependencies]
-harmony = { path = "../../../nationtech/harmony/harmony" }
-harmony_cli = { path = "../../../nationtech/harmony/harmony_cli" }
-harmony_types = { path = "../../../nationtech/harmony/harmony_types" }
-harmony_macros = { path = "../../../nationtech/harmony/harmony_macros" }
-tokio = { version = "1.40", features = [
-  "io-std",
-  "fs",
-  "macros",
-  "rt-multi-thread",
-] }
-log = { version = "0.4", features = ["kv"] }
-env_logger = "0.11"
-url = "2.5"
-base64 = "0.22.1"

examples/try_rust_webapp/files_to_add/main.rs

@@ -1,50 +0,0 @@
-use harmony::{
-    inventory::Inventory,
-    modules::{
-        application::{
-            ApplicationScore, RustWebFramework, RustWebapp,
-            features::{PackagingDeployment, rhob_monitoring::Monitoring},
-        },
-        monitoring::alert_channel::discord_alert_channel::DiscordWebhook,
-    },
-    topology::K8sAnywhereTopology,
-};
-use harmony_macros::hurl;
-use std::{path::PathBuf, sync::Arc};
-
-#[tokio::main]
-async fn main() {
-    let application = Arc::new(RustWebapp {
-        name: "tryrust".to_string(),
-        project_root: PathBuf::from(".."),
-        framework: Some(RustWebFramework::Leptos),
-        service_port: 8080,
-    });
-
-    let discord_webhook = DiscordWebhook {
-        name: "harmony_demo".to_string(),
-        url: hurl!("http://not_a_url.com"),
-    };
-
-    let app = ApplicationScore {
-        features: vec![
-            Box::new(PackagingDeployment {
-                application: application.clone(),
-            }),
-            Box::new(Monitoring {
-                application: application.clone(),
-                alert_receiver: vec![Box::new(discord_webhook)],
-            }),
-        ],
-        application,
-    };
-
-    harmony_cli::run(
-        Inventory::autoload(),
-        K8sAnywhereTopology::from_env(),
-        vec![Box::new(app)],
-        None,
-    )
-    .await
-    .unwrap();
-}

examples/try_rust_webapp/src/main.rs

@@ -3,7 +3,7 @@ use harmony::{
     modules::{
         application::{
             ApplicationScore, RustWebFramework, RustWebapp,
-            features::{PackagingDeployment, rhob_monitoring::Monitoring},
+            features::{ContinuousDelivery, Monitoring, rhob_monitoring::RHOBMonitoring},
         },
         monitoring::alert_channel::discord_alert_channel::DiscordWebhook,
     },
@@ -28,10 +28,10 @@ async fn main() {
 
     let app = ApplicationScore {
         features: vec![
-            Box::new(PackagingDeployment {
+            Box::new(ContinuousDelivery {
                 application: application.clone(),
             }),
-            Box::new(Monitoring {
+            Box::new(RHOBMonitoring {
                 application: application.clone(),
                 alert_receiver: vec![Box::new(discord_receiver)],
             }),

harmony/src/domain/interpret/mod.rs

@@ -34,7 +34,6 @@ pub enum InterpretName {
     CephClusterHealth,
     Custom(&'static str),
     RHOBAlerting,
-    K8sIngress,
 }
 
 impl std::fmt::Display for InterpretName {
@@ -65,7 +64,6 @@ impl std::fmt::Display for InterpretName {
             InterpretName::CephClusterHealth => f.write_str("CephClusterHealth"),
             InterpretName::Custom(name) => f.write_str(name),
             InterpretName::RHOBAlerting => f.write_str("RHOBAlerting"),
-            InterpretName::K8sIngress => f.write_str("K8sIngress"),
         }
     }
 }
@@ -84,15 +82,13 @@ pub trait Interpret<T>: std::fmt::Debug + Send {
 pub struct Outcome {
     pub status: InterpretStatus,
     pub message: String,
-    pub details: Vec<String>,
 }
 
 impl Outcome {
-    pub fn noop(message: String) -> Self {
+    pub fn noop() -> Self {
         Self {
             status: InterpretStatus::NOOP,
-            message,
+            message: String::new(),
-            details: vec![],
         }
     }
 
@@ -100,23 +96,6 @@ impl Outcome {
         Self {
             status: InterpretStatus::SUCCESS,
             message,
-            details: vec![],
-        }
-    }
-
-    pub fn success_with_details(message: String, details: Vec<String>) -> Self {
-        Self {
-            status: InterpretStatus::SUCCESS,
-            message,
-            details,
-        }
-    }
-
-    pub fn running(message: String) -> Self {
-        Self {
-            status: InterpretStatus::RUNNING,
-            message,
-            details: vec![],
         }
     }
 }

harmony/src/domain/topology/k8s_anywhere.rs

@@ -372,9 +372,7 @@ impl K8sAnywhereTopology {
             if let Some(Some(k8s_state)) = self.k8s_state.get() {
                 match k8s_state.source {
                     K8sSource::LocalK3d => {
-                        warn!(
+                        warn!("Installing observability operator is not supported on LocalK3d source");
-                            "Installing observability operator is not supported on LocalK3d source"
-                        );
                         return Ok(PreparationOutcome::Noop);
                         debug!("installing cluster observability operator");
                         todo!();

harmony/src/domain/topology/localhost.rs

@@ -1,10 +1,9 @@
 use async_trait::async_trait;
 use derive_new::new;
-use serde::{Deserialize, Serialize};
 
 use super::{HelmCommand, PreparationError, PreparationOutcome, Topology};
 
-#[derive(new, Clone, Debug, Serialize, Deserialize)]
+#[derive(new)]
 pub struct LocalhostTopology;
 
 #[async_trait]

harmony/src/modules/application/feature.rs

@@ -1,10 +1,7 @@
-use std::error::Error;
-
 use async_trait::async_trait;
-use derive_new::new;
 use serde::Serialize;
 
-use crate::{executors::ExecutorError, topology::Topology};
+use crate::topology::Topology;
 
 /// An ApplicationFeature provided by harmony, such as Backups, Monitoring, MultisiteAvailability,
 /// ContinuousIntegration, ContinuousDelivery
@@ -12,10 +9,7 @@ use crate::{executors::ExecutorError, topology::Topology};
 pub trait ApplicationFeature<T: Topology>:
     std::fmt::Debug + Send + Sync + ApplicationFeatureClone<T>
 {
-    async fn ensure_installed(
+    async fn ensure_installed(&self, topology: &T) -> Result<(), String>;
-        &self,
-        topology: &T,
-    ) -> Result<InstallationOutcome, InstallationError>;
     fn name(&self) -> String;
 }
 
@@ -46,60 +40,3 @@ impl<T: Topology> Clone for Box<dyn ApplicationFeature<T>> {
         self.clone_box()
     }
 }
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum InstallationOutcome {
-    Success { details: Vec<String> },
-    Noop,
-}
-
-impl InstallationOutcome {
-    pub fn success() -> Self {
-        Self::Success { details: vec![] }
-    }
-
-    pub fn success_with_details(details: Vec<String>) -> Self {
-        Self::Success { details }
-    }
-
-    pub fn noop() -> Self {
-        Self::Noop
-    }
-}
-
-#[derive(Debug, Clone, new)]
-pub struct InstallationError {
-    msg: String,
-}
-
-impl std::fmt::Display for InstallationError {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.write_str(&self.msg)
-    }
-}
-
-impl Error for InstallationError {}
-
-impl From<ExecutorError> for InstallationError {
-    fn from(value: ExecutorError) -> Self {
-        Self {
-            msg: format!("InstallationError : {value}"),
-        }
-    }
-}
-
-impl From<kube::Error> for InstallationError {
-    fn from(value: kube::Error) -> Self {
-        Self {
-            msg: format!("InstallationError : {value}"),
-        }
-    }
-}
-
-impl From<String> for InstallationError {
-    fn from(value: String) -> Self {
-        Self {
-            msg: format!("PreparationError : {value}"),
-        }
-    }
-}

harmony/src/modules/application/features/continuous_delivery.rs

@@ -10,7 +10,7 @@ use crate::{
     data::Version,
     inventory::Inventory,
     modules::application::{
-        ApplicationFeature, HelmPackage, InstallationError, InstallationOutcome, OCICompliant,
+        ApplicationFeature, HelmPackage, OCICompliant,
         features::{ArgoApplication, ArgoHelmScore},
     },
     score::Score,
@@ -47,11 +47,11 @@ use crate::{
 /// - ArgoCD to install/upgrade/rollback/inspect k8s resources
 /// - Kubernetes for runtime orchestration
 #[derive(Debug, Default, Clone)]
-pub struct PackagingDeployment<A: OCICompliant + HelmPackage> {
+pub struct ContinuousDelivery<A: OCICompliant + HelmPackage> {
     pub application: Arc<A>,
 }
 
-impl<A: OCICompliant + HelmPackage> PackagingDeployment<A> {
+impl<A: OCICompliant + HelmPackage> ContinuousDelivery<A> {
     async fn deploy_to_local_k3d(
         &self,
         app_name: String,
@@ -139,12 +139,9 @@ impl<A: OCICompliant + HelmPackage> PackagingDeployment<A> {
 impl<
     A: OCICompliant + HelmPackage + Clone + 'static,
     T: Topology + HelmCommand + MultiTargetTopology + K8sclient + Ingress + 'static,
-> ApplicationFeature<T> for PackagingDeployment<A>
+> ApplicationFeature<T> for ContinuousDelivery<A>
 {
-    async fn ensure_installed(
+    async fn ensure_installed(&self, topology: &T) -> Result<(), String> {
-        &self,
-        topology: &T,
-    ) -> Result<InstallationOutcome, InstallationError> {
         let image = self.application.image_name();
         let domain = topology
             .get_domain(&self.application.name())
@@ -208,11 +205,7 @@ impl<
                     .unwrap();
             }
         };
-
+        Ok(())
-        Ok(InstallationOutcome::success_with_details(vec![format!(
-            "{}: http://{domain}",
-            self.application.name()
-        )]))
     }
     fn name(&self) -> String {
         "ContinuousDelivery".to_string()

harmony/src/modules/application/features/endpoint.rs

@@ -2,7 +2,7 @@ use async_trait::async_trait;
 use log::info;
 
 use crate::{
-    modules::application::{ApplicationFeature, InstallationError, InstallationOutcome},
+    modules::application::ApplicationFeature,
     topology::{K8sclient, Topology},
 };
 
@@ -29,10 +29,7 @@ impl Default for PublicEndpoint {
 /// For now we only suport K8s ingress, but we will support more stuff at some point
 #[async_trait]
 impl<T: Topology + K8sclient + 'static> ApplicationFeature<T> for PublicEndpoint {
-    async fn ensure_installed(
+    async fn ensure_installed(&self, _topology: &T) -> Result<(), String> {
-        &self,
-        _topology: &T,
-    ) -> Result<InstallationOutcome, InstallationError> {
         info!(
             "Making sure public endpoint is installed for port {}",
             self.application_port

harmony/src/modules/application/features/mod.rs

@@ -5,8 +5,8 @@ pub use endpoint::*;
 mod monitoring;
 pub use monitoring::*;
 
-mod packaging_deployment;
+mod continuous_delivery;
-pub use packaging_deployment::*;
+pub use continuous_delivery::*;
 
 mod helm_argocd_score;
 pub use helm_argocd_score::*;

harmony/src/modules/application/features/monitoring.rs

@@ -1,6 +1,4 @@
-use crate::modules::application::{
+use crate::modules::application::{Application, ApplicationFeature};
-    Application, ApplicationFeature, InstallationError, InstallationOutcome,
-};
 use crate::modules::monitoring::application_monitoring::application_monitoring_score::ApplicationMonitoringScore;
 use crate::modules::monitoring::kube_prometheus::crd::crd_alertmanager_config::CRDPrometheus;
 use crate::topology::MultiTargetTopology;
@@ -45,10 +43,7 @@ impl<
         + std::fmt::Debug,
 > ApplicationFeature<T> for Monitoring
 {
-    async fn ensure_installed(
+    async fn ensure_installed(&self, topology: &T) -> Result<(), String> {
-        &self,
-        topology: &T,
-    ) -> Result<InstallationOutcome, InstallationError> {
         info!("Ensuring monitoring is available for application");
         let namespace = topology
             .get_tenant_config()
@@ -108,7 +103,7 @@ impl<
             .await
             .map_err(|e| e.to_string())?;
 
-        Ok(InstallationOutcome::success())
+        Ok(())
     }
 
     fn name(&self) -> String {

harmony/src/modules/application/features/rhob_monitoring.rs

@@ -1,8 +1,6 @@
 use std::sync::Arc;
 
-use crate::modules::application::{
+use crate::modules::application::{Application, ApplicationFeature};
-    Application, ApplicationFeature, InstallationError, InstallationOutcome,
-};
 use crate::modules::monitoring::application_monitoring::application_monitoring_score::ApplicationMonitoringScore;
 use crate::modules::monitoring::application_monitoring::rhobs_application_monitoring_score::ApplicationRHOBMonitoringScore;
 
@@ -27,7 +25,7 @@ use harmony_types::net::Url;
 use log::{debug, info};
 
 #[derive(Debug, Clone)]
-pub struct Monitoring {
+pub struct RHOBMonitoring {
     pub application: Arc<dyn Application>,
     pub alert_receiver: Vec<Box<dyn AlertReceiver<RHOBObservability>>>,
 }
@@ -43,12 +41,9 @@ impl<
         + Ingress
         + std::fmt::Debug
         + PrometheusApplicationMonitoring<RHOBObservability>,
-> ApplicationFeature<T> for Monitoring
+> ApplicationFeature<T> for RHOBMonitoring
 {
-    async fn ensure_installed(
+    async fn ensure_installed(&self, topology: &T) -> Result<(), String> {
-        &self,
-        topology: &T,
-    ) -> Result<InstallationOutcome, InstallationError> {
         info!("Ensuring monitoring is available for application");
         let namespace = topology
             .get_tenant_config()
@@ -111,7 +106,7 @@ impl<
             .interpret(&Inventory::empty(), topology)
             .await
             .map_err(|e| e.to_string())?;
-        Ok(InstallationOutcome::success())
+        Ok(())
     }
     fn name(&self) -> String {
         "Monitoring".to_string()

harmony/src/modules/application/mod.rs

@@ -24,8 +24,8 @@ use harmony_types::id::Id;
 #[derive(Clone, Debug)]
 pub enum ApplicationFeatureStatus {
     Installing,
-    Installed { details: Vec<String> },
+    Installed,
-    Failed { message: String },
+    Failed { details: String },
 }
 
 pub trait Application: std::fmt::Debug + Send + Sync {
@@ -65,32 +65,27 @@ impl<A: Application, T: Topology + std::fmt::Debug> Interpret<T> for Application
             .unwrap();
 
             let _ = match feature.ensure_installed(topology).await {
-                Ok(outcome) => {
+                Ok(()) => {
                     instrumentation::instrument(HarmonyEvent::ApplicationFeatureStateChanged {
                         topology: topology.name().into(),
                         application: self.application.name(),
                         feature: feature.name(),
-                        status: ApplicationFeatureStatus::Installed {
+                        status: ApplicationFeatureStatus::Installed,
-                            details: match outcome {
-                                InstallationOutcome::Success { details } => details,
-                                InstallationOutcome::Noop => vec![],
-                            },
-                        },
                     })
                     .unwrap();
                 }
-                Err(error) => {
+                Err(msg) => {
                     instrumentation::instrument(HarmonyEvent::ApplicationFeatureStateChanged {
                         topology: topology.name().into(),
                         application: self.application.name(),
                         feature: feature.name(),
                         status: ApplicationFeatureStatus::Failed {
-                            message: error.to_string(),
+                            details: msg.clone(),
                         },
                     })
                     .unwrap();
                     return Err(InterpretError::new(format!(
-                        "Application Interpret failed to install feature : {error}"
+                        "Application Interpret failed to install feature : {msg}"
                     )));
                 }
             };

harmony/src/modules/application/rust.rs

@@ -10,7 +10,7 @@ use dockerfile_builder::Dockerfile;
 use dockerfile_builder::instruction::{CMD, COPY, ENV, EXPOSE, FROM, RUN, USER, WORKDIR};
 use dockerfile_builder::instruction_builder::CopyBuilder;
 use futures_util::StreamExt;
-use log::{debug, error, info, log_enabled, trace, warn};
+use log::{debug, info, log_enabled};
 use serde::Serialize;
 use tar::{Builder, Header};
 use walkdir::WalkDir;
@@ -162,7 +162,7 @@ impl RustWebapp {
         &self,
         image_name: &str,
     ) -> Result<String, Box<dyn std::error::Error>> {
-        info!("Generating Dockerfile for '{}'", self.name);
+        debug!("Generating Dockerfile for '{}'", self.name);
         let dockerfile = self.get_or_build_dockerfile();
         let quiet = !log_enabled!(log::Level::Debug);
         match dockerfile
@@ -194,41 +194,8 @@ impl RustWebapp {
                     Some(body_full(tar_data.into())),
                 );
 
-                while let Some(mut msg) = image_build_stream.next().await {
+                while let Some(msg) = image_build_stream.next().await {
-                    trace!("Got bollard msg {msg:?}");
+                    debug!("Message: {msg:?}");
-                    match msg {
-                        Ok(mut msg) => {
-                            if let Some(progress) = msg.progress_detail {
-                                info!(
-                                    "Build progress {}/{}",
-                                    progress.current.unwrap_or(0),
-                                    progress.total.unwrap_or(0)
-                                );
-                            }
-
-                            if let Some(mut log) = msg.stream {
-                                if log.ends_with('\n') {
-                                    log.pop();
-                                    if log.ends_with('\r') {
-                                        log.pop();
-                                    }
-                                }
-                                info!("{log}");
-                            }
-
-                            if let Some(error) = msg.error {
-                                warn!("Build error : {error:?}");
-                            }
-
-                            if let Some(error) = msg.error_detail {
-                                warn!("Build error : {error:?}");
-                            }
-                        }
-                        Err(e) => {
-                            error!("Build failed : {e}");
-                            return Err(format!("Build failed : {e}").into());
-                        }
-                    }
                 }
 
                 Ok(image_name.to_string())

harmony/src/modules/dhcp.rs

@@ -69,14 +69,17 @@ impl DhcpInterpret {
 
         dhcp_server.set_pxe_options(pxe_options).await?;
 
-        Ok(Outcome::success(format!(
+        Ok(Outcome::new(
+            InterpretStatus::SUCCESS,
+            format!(
                 "Dhcp Interpret Set next boot to [{:?}], boot_filename to [{:?}], filename to [{:?}], filename64 to [{:?}], filenameipxe to [:{:?}]",
                 self.score.boot_filename,
                 self.score.boot_filename,
                 self.score.filename,
                 self.score.filename64,
                 self.score.filenameipxe
-        )))
+            ),
+        ))
     }
 }
 
@@ -119,7 +122,8 @@ impl<T: Topology + DhcpServer> Interpret<T> for DhcpInterpret {
 
         topology.commit_config().await?;
 
-        Ok(Outcome::success(
+        Ok(Outcome::new(
+            InterpretStatus::SUCCESS,
             "Dhcp Interpret execution successful".to_string(),
         ))
     }
@@ -193,10 +197,10 @@ impl DhcpHostBindingInterpret {
             }
         }
 
-        Ok(Outcome::success(format!(
+        Ok(Outcome::new(
-            "Dhcp Interpret registered {} entries",
+            InterpretStatus::SUCCESS,
-            number_new_entries
+            format!("Dhcp Interpret registered {} entries", number_new_entries),
-        )))
+        ))
     }
 }
 
@@ -232,9 +236,12 @@ impl<T: DhcpServer> Interpret<T> for DhcpHostBindingInterpret {
 
         topology.commit_config().await?;
 
-        Ok(Outcome::success(format!(
+        Ok(Outcome::new(
+            InterpretStatus::SUCCESS,
+            format!(
                 "Dhcp Host Binding Interpret execution successful on {} hosts",
                 self.score.host_binding.len()
-        )))
+            ),
+        ))
     }
 }

harmony/src/modules/dns.rs

@@ -55,7 +55,8 @@ impl DnsInterpret {
             dns.register_dhcp_leases(register).await?;
         }
 
-        Ok(Outcome::success(
+        Ok(Outcome::new(
+            InterpretStatus::SUCCESS,
             "DNS Interpret execution successfull".to_string(),
         ))
     }
@@ -67,10 +68,13 @@ impl DnsInterpret {
         let entries = &self.score.dns_entries;
         dns_server.ensure_hosts_registered(entries.clone()).await?;
 
-        Ok(Outcome::success(format!(
+        Ok(Outcome::new(
+            InterpretStatus::SUCCESS,
+            format!(
                 "DnsInterpret registered {} hosts successfully",
                 entries.len()
-        )))
+            ),
+        ))
     }
 }
 
@@ -107,7 +111,8 @@ impl<T: Topology + DnsServer> Interpret<T> for DnsInterpret {
 
         topology.commit_config().await?;
 
-        Ok(Outcome::success(
+        Ok(Outcome::new(
+            InterpretStatus::SUCCESS,
             "Dns Interpret execution successful".to_string(),
         ))
     }

harmony/src/modules/helm/chart.rs

@@ -197,10 +197,13 @@ impl<T: Topology + HelmCommand> Interpret<T> for HelmChartInterpret {
                     self.score.release_name, ns
                 );
 
-                return Ok(Outcome::success(format!(
+                return Ok(Outcome::new(
+                    InterpretStatus::SUCCESS,
+                    format!(
                         "Helm Chart '{}' already installed to namespace {ns} and install_only=true",
                         self.score.release_name
-                )));
+                    ),
+                ));
             } else {
                 info!(
                     "Release '{}' not found in namespace '{}'. Proceeding with installation.",
@@ -225,18 +228,18 @@ impl<T: Topology + HelmCommand> Interpret<T> for HelmChartInterpret {
         };
 
         match status {
-            helm_wrapper_rs::HelmDeployStatus::Deployed => Ok(Outcome::success(format!(
+            helm_wrapper_rs::HelmDeployStatus::Deployed => Ok(Outcome::new(
-                "Helm Chart {} deployed",
+                InterpretStatus::SUCCESS,
-                self.score.release_name
+                format!("Helm Chart {} deployed", self.score.release_name),
-            ))),
+            )),
-            helm_wrapper_rs::HelmDeployStatus::PendingInstall => Ok(Outcome::running(format!(
+            helm_wrapper_rs::HelmDeployStatus::PendingInstall => Ok(Outcome::new(
-                "Helm Chart {} pending install...",
+                InterpretStatus::RUNNING,
-                self.score.release_name
+                format!("Helm Chart {} pending install...", self.score.release_name),
-            ))),
+            )),
-            helm_wrapper_rs::HelmDeployStatus::PendingUpgrade => Ok(Outcome::running(format!(
+            helm_wrapper_rs::HelmDeployStatus::PendingUpgrade => Ok(Outcome::new(
-                "Helm Chart {} pending upgrade...",
+                InterpretStatus::RUNNING,
-                self.score.release_name
+                format!("Helm Chart {} pending upgrade...", self.score.release_name),
-            ))),
+            )),
             helm_wrapper_rs::HelmDeployStatus::Failed => Err(InterpretError::new(format!(
                 "Helm Chart {} installation failed",
                 self.score.release_name

harmony/src/modules/inventory/mod.rs

@@ -133,9 +133,10 @@ impl<T: Topology> Interpret<T> for DiscoverInventoryAgentInterpret {
             },
         )
         .await;
-        Ok(Outcome::success(
+        Ok(Outcome {
-            "Discovery process completed successfully".to_string(),
+            status: InterpretStatus::SUCCESS,
-        ))
+            message: "Discovery process completed successfully".to_string(),
+        })
     }
 
     fn get_name(&self) -> InterpretName {

harmony/src/modules/k8s/ingress.rs

@@ -1,15 +1,11 @@
-use async_trait::async_trait;
 use harmony_macros::ingress_path;
-use harmony_types::id::Id;
 use k8s_openapi::api::networking::v1::Ingress;
 use log::{debug, trace};
 use serde::Serialize;
 use serde_json::json;
 
 use crate::{
-    data::Version,
+    interpret::Interpret,
-    interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome},
-    inventory::Inventory,
     score::Score,
     topology::{K8sclient, Topology},
 };
@@ -61,7 +57,7 @@ impl<T: Topology + K8sclient> Score<T> for K8sIngressScore {
 
         let ingress_class = match self.ingress_class_name.clone() {
             Some(ingress_class_name) => ingress_class_name,
-            None => "\"default\"".to_string(),
+            None => format!("\"default\""),
         };
 
         let ingress = json!(
@@ -101,12 +97,11 @@ impl<T: Topology + K8sclient> Score<T> for K8sIngressScore {
             "Successfully built Ingress for host {:?}",
             ingress.metadata.name
         );
-
+        Box::new(K8sResourceInterpret {
-        Box::new(K8sIngressInterpret {
+            score: K8sResourceScore::single(
-            ingress,
+                ingress.clone(),
-            service: self.name.to_string(),
+                self.namespace.clone().map(|f| f.to_string()),
-            namespace: self.namespace.clone().map(|f| f.to_string()),
+            ),
-            host: self.host.clone(),
         })
     }
 
@@ -114,59 +109,3 @@ impl<T: Topology + K8sclient> Score<T> for K8sIngressScore {
         format!("{} K8sIngressScore", self.name)
     }
 }
-
-#[derive(std::fmt::Debug)]
-struct K8sIngressInterpret {
-    ingress: Ingress,
-    service: String,
-    namespace: Option<String>,
-    host: fqdn::FQDN,
-}
-
-#[async_trait]
-impl<T: Topology + K8sclient> Interpret<T> for K8sIngressInterpret {
-    async fn execute(
-        &self,
-        inventory: &Inventory,
-        topology: &T,
-    ) -> Result<Outcome, InterpretError> {
-        let result = K8sResourceInterpret {
-            score: K8sResourceScore::single(self.ingress.clone(), self.namespace.clone()),
-        }
-        .execute(inventory, topology)
-        .await;
-
-        match result {
-            Ok(outcome) => match outcome.status {
-                InterpretStatus::SUCCESS => {
-                    let details = match &self.namespace {
-                        Some(namespace) => {
-                            vec![format!("{} ({namespace}): {}", self.service, self.host)]
-                        }
-                        None => vec![format!("{}: {}", self.service, self.host)],
-                    };
-
-                    Ok(Outcome::success_with_details(outcome.message, details))
-                }
-                _ => Ok(outcome),
-            },
-            Err(e) => Err(e),
-        }
-    }
-
-    fn get_name(&self) -> InterpretName {
-        InterpretName::K8sIngress
-    }
-
-    fn get_version(&self) -> Version {
-        Version::from("0.0.1").unwrap()
-    }
-
-    fn get_status(&self) -> InterpretStatus {
-        todo!()
-    }
-
-    fn get_children(&self) -> Vec<Id> {
-        vec![]
-    }
-}

harmony/src/modules/monitoring/application_monitoring/application_monitoring_score.rs

@@ -68,9 +68,7 @@ impl<T: Topology + PrometheusApplicationMonitoring<CRDPrometheus>> Interpret<T>
                 PreparationOutcome::Success { details: _ } => {
                     Ok(Outcome::success("Prometheus installed".into()))
                 }
-                PreparationOutcome::Noop => {
+                PreparationOutcome::Noop => Ok(Outcome::noop()),
-                    Ok(Outcome::noop("Prometheus installation skipped".into()))
-                }
             },
             Err(err) => Err(InterpretError::from(err)),
         }

harmony/src/modules/monitoring/application_monitoring/rhobs_application_monitoring_score.rs

@@ -70,9 +70,7 @@ impl<T: Topology + PrometheusApplicationMonitoring<RHOBObservability>> Interpret
                 PreparationOutcome::Success { details: _ } => {
                     Ok(Outcome::success("Prometheus installed".into()))
                 }
-                PreparationOutcome::Noop => {
+                PreparationOutcome::Noop => Ok(Outcome::noop()),
-                    Ok(Outcome::noop("Prometheus installation skipped".into()))
-                }
             },
             Err(err) => Err(InterpretError::from(err)),
         }

harmony/src/modules/monitoring/ntfy/ntfy.rs

@@ -113,13 +113,7 @@ impl<T: Topology + HelmCommand + K8sclient + MultiTargetTopology> Interpret<T> f
             .await?;
         info!("user added");
 
-        Ok(Outcome::success_with_details(
+        Ok(Outcome::success("Ntfy installed".to_string()))
-            "Ntfy installed".to_string(),
-            vec![format!(
-                "Ntfy ({}): http://{}",
-                self.score.namespace, self.score.host
-            )],
-        ))
     }
 
     fn get_name(&self) -> InterpretName {

harmony/src/modules/okd/bootstrap_01_prepare.rs

@@ -1,19 +1,19 @@
+use async_trait::async_trait;
+use derive_new::new;
+use harmony_types::id::Id;
+use log::{error, info, warn};
+use serde::Serialize;
+
 use crate::{
     data::Version,
     hardware::PhysicalHost,
     infra::inventory::InventoryRepositoryFactory,
     interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome},
     inventory::{HostRole, Inventory},
-    modules::inventory::DiscoverHostForRoleScore,
+    modules::inventory::{DiscoverHostForRoleScore, LaunchDiscoverInventoryAgentScore},
     score::Score,
     topology::HAClusterTopology,
 };
-use async_trait::async_trait;
-use derive_new::new;
-use harmony_types::id::Id;
-use log::info;
-use serde::Serialize;
-
 // -------------------------------------------------------------------------------------------------
 // Step 01: Inventory (default PXE + Kickstart in RAM + Rust agent)
 // - This score exposes/ensures the default inventory assets and waits for discoveries.
@@ -109,9 +109,12 @@ When you can dig them, confirm to continue.
             .await?;
         }
 
-        Ok(Outcome::success(format!(
+        Ok(Outcome::new(
+            InterpretStatus::SUCCESS,
+            format!(
                 "Found and assigned bootstrap node: {}",
                 bootstrap_host.unwrap().summary()
-        )))
+            ),
+        ))
     }
 }

harmony/src/modules/okd/bootstrap_02_bootstrap.rs

@@ -1,13 +1,25 @@
+use std::{fmt::Write, path::PathBuf};
+
+use async_trait::async_trait;
+use derive_new::new;
+use harmony_secret::SecretManager;
+use harmony_types::id::Id;
+use log::{debug, error, info, warn};
+use serde::{Deserialize, Serialize};
+use tokio::{fs::File, io::AsyncWriteExt, process::Command};
+
 use crate::{
     config::secret::{RedhatSecret, SshKeyPair},
     data::{FileContent, FilePath, Version},
     hardware::PhysicalHost,
     infra::inventory::InventoryRepositoryFactory,
+    instrumentation::{HarmonyEvent, instrument},
     interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome},
     inventory::{HostRole, Inventory},
     modules::{
         dhcp::DhcpHostBindingScore,
         http::{IPxeMacBootFileScore, StaticFilesHttpScore},
+        inventory::LaunchDiscoverInventoryAgentScore,
         okd::{
             bootstrap_load_balancer::OKDBootstrapLoadBalancerScore,
             templates::{BootstrapIpxeTpl, InstallConfigYaml},
@@ -16,15 +28,6 @@ use crate::{
     score::Score,
     topology::{HAClusterTopology, HostBinding},
 };
-use async_trait::async_trait;
-use derive_new::new;
-use harmony_secret::SecretManager;
-use harmony_types::id::Id;
-use log::{debug, info};
-use serde::Serialize;
-use std::path::PathBuf;
-use tokio::{fs::File, io::AsyncWriteExt, process::Command};
-
 // -------------------------------------------------------------------------------------------------
 // Step 02: Bootstrap
 // - Select bootstrap node (from discovered set).
@@ -310,7 +313,7 @@ impl OKDSetup02BootstrapInterpret {
         info!("[Bootstrap] Rebooting bootstrap node via SSH");
         // TODO reboot programatically, there are some logical checks and refactoring to do such as
         // accessing the bootstrap node config (ip address) from the inventory
-        let _ = inquire::Confirm::new(
+        let confirmation = inquire::Confirm::new(
                 "Now reboot the bootstrap node so it picks up its pxe boot file. Press enter when ready.",
         )
         .prompt()
@@ -376,6 +379,9 @@ impl Interpret<HAClusterTopology> for OKDSetup02BootstrapInterpret {
         self.reboot_target().await?;
         self.wait_for_bootstrap_complete().await?;
 
-        Ok(Outcome::success("Bootstrap phase complete".into()))
+        Ok(Outcome::new(
+            InterpretStatus::SUCCESS,
+            "Bootstrap phase complete".into(),
+        ))
     }
 }

harmony/src/modules/okd/bootstrap_03_control_plane.rs

@@ -1,3 +1,11 @@
+use std::{fmt::Write, path::PathBuf};
+
+use async_trait::async_trait;
+use derive_new::new;
+use harmony_types::id::Id;
+use log::{debug, info};
+use serde::Serialize;
+
 use crate::{
     data::Version,
     hardware::PhysicalHost,
@@ -11,12 +19,6 @@ use crate::{
     score::Score,
     topology::{HAClusterTopology, HostBinding},
 };
-use async_trait::async_trait;
-use derive_new::new;
-use harmony_types::id::Id;
-use log::{debug, info};
-use serde::Serialize;
-
 // -------------------------------------------------------------------------------------------------
 // Step 03: Control Plane
 // - Render per-MAC PXE & ignition for cp0/cp1/cp2.
@@ -267,7 +269,8 @@ impl Interpret<HAClusterTopology> for OKDSetup03ControlPlaneInterpret {
         // the `wait-for bootstrap-complete` command.
         info!("[ControlPlane] Provisioning initiated. Monitor the cluster convergence manually.");
 
-        Ok(Outcome::success(
+        Ok(Outcome::new(
+            InterpretStatus::SUCCESS,
             "Control plane provisioning has been successfully initiated.".into(),
         ))
     }

harmony/src/modules/okd/bootstrap_04_workers.rs

@@ -1,17 +1,33 @@
+use std::{fmt::Write, path::PathBuf};
+
 use async_trait::async_trait;
 use derive_new::new;
+use harmony_secret::SecretManager;
 use harmony_types::id::Id;
-use log::info;
+use log::{debug, error, info, warn};
-use serde::Serialize;
+use serde::{Deserialize, Serialize};
+use tokio::{fs::File, io::AsyncWriteExt, process::Command};
 
 use crate::{
-    data::Version,
+    config::secret::{RedhatSecret, SshKeyPair},
+    data::{FileContent, FilePath, Version},
+    hardware::PhysicalHost,
+    infra::inventory::InventoryRepositoryFactory,
+    instrumentation::{HarmonyEvent, instrument},
     interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome},
-    inventory::Inventory,
+    inventory::{HostRole, Inventory},
+    modules::{
+        dhcp::DhcpHostBindingScore,
+        http::{IPxeMacBootFileScore, StaticFilesHttpScore},
+        inventory::LaunchDiscoverInventoryAgentScore,
+        okd::{
+            bootstrap_load_balancer::OKDBootstrapLoadBalancerScore,
+            templates::{BootstrapIpxeTpl, InstallConfigYaml},
+        },
+    },
     score::Score,
-    topology::HAClusterTopology,
+    topology::{HAClusterTopology, HostBinding},
 };
-
 // -------------------------------------------------------------------------------------------------
 // Step 04: Workers
 // - Render per-MAC PXE & ignition for workers; join nodes.
@@ -78,6 +94,9 @@ impl Interpret<HAClusterTopology> for OKDSetup04WorkersInterpret {
         _topology: &HAClusterTopology,
     ) -> Result<Outcome, InterpretError> {
         self.render_and_reboot().await?;
-        Ok(Outcome::success("Workers provisioned".into()))
+        Ok(Outcome::new(
+            InterpretStatus::SUCCESS,
+            "Workers provisioned".into(),
+        ))
     }
 }

harmony/src/modules/okd/bootstrap_05_sanity_check.rs

@@ -1,16 +1,33 @@
-use crate::{
+use std::{fmt::Write, path::PathBuf};
-    data::Version,
+
-    interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome},
-    inventory::Inventory,
-    score::Score,
-    topology::HAClusterTopology,
-};
 use async_trait::async_trait;
 use derive_new::new;
+use harmony_secret::SecretManager;
 use harmony_types::id::Id;
-use log::info;
+use log::{debug, error, info, warn};
-use serde::Serialize;
+use serde::{Deserialize, Serialize};
+use tokio::{fs::File, io::AsyncWriteExt, process::Command};
 
+use crate::{
+    config::secret::{RedhatSecret, SshKeyPair},
+    data::{FileContent, FilePath, Version},
+    hardware::PhysicalHost,
+    infra::inventory::InventoryRepositoryFactory,
+    instrumentation::{HarmonyEvent, instrument},
+    interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome},
+    inventory::{HostRole, Inventory},
+    modules::{
+        dhcp::DhcpHostBindingScore,
+        http::{IPxeMacBootFileScore, StaticFilesHttpScore},
+        inventory::LaunchDiscoverInventoryAgentScore,
+        okd::{
+            bootstrap_load_balancer::OKDBootstrapLoadBalancerScore,
+            templates::{BootstrapIpxeTpl, InstallConfigYaml},
+        },
+    },
+    score::Score,
+    topology::{HAClusterTopology, HostBinding},
+};
 // -------------------------------------------------------------------------------------------------
 // Step 05: Sanity Check
 // - Validate API reachability, ClusterOperators, ingress, and SDN status.
@@ -76,6 +93,9 @@ impl Interpret<HAClusterTopology> for OKDSetup05SanityCheckInterpret {
         _topology: &HAClusterTopology,
     ) -> Result<Outcome, InterpretError> {
         self.run_checks().await?;
-        Ok(Outcome::success("Sanity checks passed".into()))
+        Ok(Outcome::new(
+            InterpretStatus::SUCCESS,
+            "Sanity checks passed".into(),
+        ))
     }
 }

harmony/src/modules/okd/bootstrap_06_installation_report.rs

@@ -1,15 +1,32 @@
+// -------------------------------------------------------------------------------------------------
 use async_trait::async_trait;
 use derive_new::new;
+use harmony_secret::SecretManager;
 use harmony_types::id::Id;
-use log::info;
+use log::{debug, error, info, warn};
-use serde::Serialize;
+use serde::{Deserialize, Serialize};
+use std::{fmt::Write, path::PathBuf};
+use tokio::{fs::File, io::AsyncWriteExt, process::Command};
 
 use crate::{
-    data::Version,
+    config::secret::{RedhatSecret, SshKeyPair},
+    data::{FileContent, FilePath, Version},
+    hardware::PhysicalHost,
+    infra::inventory::InventoryRepositoryFactory,
+    instrumentation::{HarmonyEvent, instrument},
     interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome},
-    inventory::Inventory,
+    inventory::{HostRole, Inventory},
+    modules::{
+        dhcp::DhcpHostBindingScore,
+        http::{IPxeMacBootFileScore, StaticFilesHttpScore},
+        inventory::LaunchDiscoverInventoryAgentScore,
+        okd::{
+            bootstrap_load_balancer::OKDBootstrapLoadBalancerScore,
+            templates::{BootstrapIpxeTpl, InstallConfigYaml},
+        },
+    },
     score::Score,
-    topology::HAClusterTopology,
+    topology::{HAClusterTopology, HostBinding},
 };
 
 // Step 06: Installation Report
@@ -76,6 +93,9 @@ impl Interpret<HAClusterTopology> for OKDSetup06InstallationReportInterpret {
         _topology: &HAClusterTopology,
     ) -> Result<Outcome, InterpretError> {
         self.generate().await?;
-        Ok(Outcome::success("Installation report generated".into()))
+        Ok(Outcome::new(
+            InterpretStatus::SUCCESS,
+            "Installation report generated".into(),
+        ))
     }
 }

harmony_cli/src/cli_logger.rs

@@ -178,10 +178,10 @@ fn handle_events() {
                     ApplicationFeatureStatus::Installing => {
                         info!("Installing feature '{feature}' for '{application}'...");
                     }
-                    ApplicationFeatureStatus::Installed { details: _ } => {
+                    ApplicationFeatureStatus::Installed => {
                         info!(status = "finished"; "Feature '{feature}' installed");
                     }
-                    ApplicationFeatureStatus::Failed { message: details } => {
+                    ApplicationFeatureStatus::Failed { details } => {
                         error!(status = "failed"; "Feature '{feature}' installation failed: {details}");
                     }
                 },

harmony_cli/src/cli_reporter.rs

@@ -1,56 +0,0 @@
-use std::sync::Mutex;
-
-use harmony::{
-    instrumentation::{self, HarmonyEvent},
-    modules::application::ApplicationFeatureStatus,
-};
-
-use crate::theme;
-
-pub fn init() {
-    let details: Mutex<Vec<String>> = Mutex::new(vec![]);
-
-    instrumentation::subscribe("Harmony CLI Reporter", {
-        move |event| {
-            let mut details = details.lock().unwrap();
-
-            match event {
-                HarmonyEvent::InterpretExecutionFinished {
-                    execution_id: _,
-                    topology: _,
-                    interpret: _,
-                    score: _,
-                    outcome: Ok(outcome),
-                } => {
-                    if outcome.status == harmony::interpret::InterpretStatus::SUCCESS {
-                        details.extend(outcome.details.clone());
-                    }
-                }
-                HarmonyEvent::ApplicationFeatureStateChanged {
-                    topology: _,
-                    application: _,
-                    feature: _,
-                    status:
-                        ApplicationFeatureStatus::Installed {
-                            details: feature_details,
-                        },
-                } => {
-                    details.extend(feature_details.clone());
-                }
-                HarmonyEvent::HarmonyFinished => {
-                    if !details.is_empty() {
-                        println!(
-                            "\n{} All done! Here's what's next for you:",
-                            theme::EMOJI_SUMMARY
-                        );
-                        for detail in details.iter() {
-                            println!("- {detail}");
-                        }
-                        println!();
-                    }
-                }
-                _ => {}
-            };
-        }
-    });
-}

harmony_cli/src/lib.rs

@@ -8,7 +8,6 @@ use inquire::Confirm;
 use log::debug;
 
 pub mod cli_logger; // FIXME: Don't make me pub
-mod cli_reporter;
 pub mod progress;
 pub mod theme;
 
@@ -117,7 +116,6 @@ pub async fn run_cli<T: Topology + Send + Sync + 'static>(
     args: Args,
 ) -> Result<(), Box<dyn std::error::Error>> {
     cli_logger::init();
-    cli_reporter::init();
 
     let mut maestro = Maestro::initialize(inventory, topology).await.unwrap();
     maestro.register_all(scores);

harmony_cli/src/theme.rs

@@ -9,7 +9,6 @@ pub static EMOJI_ERROR: Emoji<'_, '_> = Emoji("⚠️", "");
 pub static EMOJI_DEPLOY: Emoji<'_, '_> = Emoji("🚀", "");
 pub static EMOJI_TOPOLOGY: Emoji<'_, '_> = Emoji("📦", "");
 pub static EMOJI_SCORE: Emoji<'_, '_> = Emoji("🎶", "");
-pub static EMOJI_SUMMARY: Emoji<'_, '_> = Emoji("🚀", "");
 
 lazy_static! {
     pub static ref SECTION_STYLE: ProgressStyle = ProgressStyle::default_spinner()

harmony_composer/src/harmony_composer_logger.rs

@@ -21,6 +21,7 @@ pub fn handle_events() {
 
     instrumentation::subscribe("Harmony Composer Logger", {
         move |event| match event {
+            HarmonyComposerEvent::HarmonyComposerStarted => {}
             HarmonyComposerEvent::ProjectInitializationStarted => {
                 progress_tracker.add_section(
                     SETUP_SECTION,

harmony_composer/src/instrumentation.rs

@@ -5,6 +5,7 @@ use crate::{HarmonyProfile, HarmonyTarget};
 
 #[derive(Debug, Clone)]
 pub enum HarmonyComposerEvent {
+    HarmonyComposerStarted,
     ProjectInitializationStarted,
     ProjectInitialized,
     ProjectCompilationStarted {

harmony_secret/src/lib.rs

@@ -120,10 +120,26 @@ impl SecretManager {
 
             let ns = &manager.namespace;
             let key = T::KEY;
-            let secret_json = inquire::Text::new(&format!(
+            let secret_json = inquire::Editor::new(&format!(
-                "Secret not found for {} {}, paste the JSON here :",
+                "Secret not found for {ns} {key}, paste the JSON here :",
-                ns, key
             ))
+            .with_formatter(&|data| {
+                let char_count = data.chars().count();
+                if char_count == 0 {
+                    String::from("<skipped>")
+                } else if char_count <= 20 {
+                    data.into()
+                } else {
+                    let mut substr: String = data.chars().take(17).collect();
+                    substr.push_str("...");
+                    substr
+                }
+            })
+            .with_render_config(
+                inquire::ui::RenderConfig::default().with_canceled_prompt_indicator(
+                    inquire::ui::Styled::new("<skipped>").with_fg(inquire::ui::Color::DarkYellow),
+                ),
+            )
             .prompt()
             .map_err(|e| {
                 SecretStoreError::Store(format!("Failed to prompt secret {ns} {key} : {e}").into())