Cargo.lock

@@ -1194,20 +1194,6 @@ dependencies = [
  "url",
 ]
 
-[[package]]
-name = "example-rust"
-version = "0.1.0"
-dependencies = [
- "env_logger",
- "harmony",
- "harmony_cli",
- "harmony_macros",
- "harmony_types",
- "log",
- "tokio",
- "url",
-]
-
 [[package]]
 name = "example-tenant"
 version = "0.1.0"

examples/rust/Cargo.toml

@@ -1,14 +0,0 @@
-[package]
-name = "example-rust"
-version = "0.1.0"
-edition = "2024"
-
-[dependencies]
-harmony = { path = "../../harmony" }
-harmony_cli = { path = "../../harmony_cli" }
-harmony_types = { path = "../../harmony_types" }
-harmony_macros = { path = "../../harmony_macros" }
-tokio = { workspace = true }
-log = { workspace = true }
-env_logger = { workspace = true }
-url = { workspace = true }

examples/rust/src/main.rs

@@ -1,20 +0,0 @@
-use harmony::{
-    inventory::Inventory,
-    maestro::Maestro,
-    modules::application::{RustWebappScore, features::ContinuousDelivery},
-    topology::{K8sAnywhereTopology, Url},
-};
-
-#[tokio::main]
-async fn main() {
-    let app = RustWebappScore {
-        name: "Example Rust Webapp".to_string(),
-        domain: Url::Url(url::Url::parse("https://rustapp.harmony.example.com").unwrap()),
-        features: vec![Box::new(ContinuousDelivery {})],
-    };
-
-    let topology = K8sAnywhereTopology::from_env();
-    let mut maestro = Maestro::new(Inventory::autoload(), topology);
-    maestro.register_all(vec![Box::new(app)]);
-    harmony_cli::init(maestro, None).await.unwrap();
-}

examples/tui/Cargo.toml

@@ -10,9 +10,9 @@ publish = false
 harmony = { path = "../../harmony" }
 harmony_tui = { path = "../../harmony_tui" }
 harmony_types = { path = "../../harmony_types" }
-harmony_macros = { path = "../../harmony_macros" }
 cidr = { workspace = true }
 tokio = { workspace = true }
+harmony_macros = { path = "../../harmony_macros" }
 log = { workspace = true }
 env_logger = { workspace = true }
 url = { workspace = true }

harmony/src/domain/topology/ha_cluster.rs

@@ -46,7 +46,7 @@ pub struct HAClusterTopology {
 #[async_trait]
 impl Topology for HAClusterTopology {
     fn name(&self) -> &str {
-        "HAClusterTopology"
+        todo!()
     }
     async fn ensure_ready(&self) -> Result<Outcome, InterpretError> {
         todo!(

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

@@ -30,7 +30,7 @@ use crate::{modules::application::ApplicationFeature, topology::Topology};
 /// - Harbor as artifact registru
 /// - ArgoCD to install/upgrade/rollback/inspect k8s resources
 /// - Kubernetes for runtime orchestration
-#[derive(Debug, Default, Clone)]
+#[derive(Debug, Default)]
 pub struct ContinuousDelivery {}
 
 #[async_trait]

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

@@ -6,7 +6,7 @@ use crate::{
     topology::{K8sclient, Topology},
 };
 
-#[derive(Debug, Clone)]
+#[derive(Debug)]
 pub struct PublicEndpoint {
     application_port: u16,
 }

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

@@ -6,7 +6,7 @@ use crate::{
     topology::{HelmCommand, Topology},
 };
 
-#[derive(Debug, Default, Clone)]
+#[derive(Debug, Default)]
 pub struct Monitoring {}
 
 #[async_trait]

harmony/src/modules/application/mod.rs

@@ -22,19 +22,9 @@ impl<T: Topology + std::fmt::Debug> Interpret<T> for ApplicationInterpret<T> {
     async fn execute(
         &self,
         _inventory: &Inventory,
-        topology: &T,
+        _topology: &T,
     ) -> Result<Outcome, InterpretError> {
-        for feature in self.features.iter() {
+        todo!()
-            let _ = match feature.ensure_installed(topology).await {
-                Ok(()) => (),
-                Err(msg) => {
-                    return Err(InterpretError::new(format!(
-                        "Application Interpret failed to install feature : {msg}"
-                    )));
-                }
-            };
-        }
-        todo!("Do I need to do anything more than this here??")
     }
 
     fn get_name(&self) -> InterpretName {
@@ -57,25 +47,10 @@ impl<T: Topology + std::fmt::Debug> Interpret<T> for ApplicationInterpret<T> {
 /// An ApplicationFeature provided by harmony, such as Backups, Monitoring, MultisiteAvailability,
 /// ContinuousIntegration, ContinuousDelivery
 #[async_trait]
-pub trait ApplicationFeature<T: Topology>:
+pub trait ApplicationFeature<T: Topology>: std::fmt::Debug + Send + Sync {
-    std::fmt::Debug + Send + Sync + ApplicationFeatureClone<T>
-{
     async fn ensure_installed(&self, topology: &T) -> Result<(), String>;
 }
 
-trait ApplicationFeatureClone<T: Topology> {
-    fn clone_box(&self) -> Box<dyn ApplicationFeature<T>>;
-}
-
-impl<A, T: Topology> ApplicationFeatureClone<T> for A
-where
-    A: ApplicationFeature<T> + Clone + 'static,
-{
-    fn clone_box(&self) -> Box<dyn ApplicationFeature<T>> {
-        Box::new(self.clone())
-    }
-}
-
 impl<T: Topology> Serialize for Box<dyn ApplicationFeature<T>> {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
     where
@@ -87,6 +62,6 @@ impl<T: Topology> Serialize for Box<dyn ApplicationFeature<T>> {
 
 impl<T: Topology> Clone for Box<dyn ApplicationFeature<T>> {
     fn clone(&self) -> Self {
-        self.clone_box()
+        todo!()
     }
 }

harmony/src/modules/application/rust.rs

@@ -5,7 +5,7 @@ use crate::{
     topology::{Topology, Url},
 };
 
-use super::{ApplicationFeature, ApplicationInterpret, features::ContinuousDelivery};
+use super::{ApplicationFeature, ApplicationInterpret};
 
 #[derive(Debug, Serialize, Clone)]
 pub struct RustWebappScore<T: Topology + Clone + Serialize> {
@@ -16,9 +16,7 @@ pub struct RustWebappScore<T: Topology + Clone + Serialize> {
 
 impl<T: Topology + std::fmt::Debug + Clone + Serialize + 'static> Score<T> for RustWebappScore<T> {
     fn create_interpret(&self) -> Box<dyn crate::interpret::Interpret<T>> {
-        Box::new(ApplicationInterpret {
+        Box::new(ApplicationInterpret { features: todo!() })
-            features: self.features.clone(),
-        })
     }
 
     fn name(&self) -> String {