fix: Tests, doctests, formatting

harmony/src/domain/topology/mod.rs

@@ -15,7 +15,7 @@ pub use k8s_anywhere::*;
 pub use localhost::*;
 pub mod k8s;
 mod load_balancer;
-mod router;
+pub mod router;
 mod tftp;
 use async_trait::async_trait;
 pub use ha_cluster::*;

harmony/src/domain/topology/router.rs

@@ -47,7 +47,6 @@ impl Router for UnmanagedRouter {
     }
 }
 
-
 #[derive(Clone, Debug)]
 
 /// Desired state config for a TLS passthrough route.
@@ -57,7 +56,7 @@ impl Router for UnmanagedRouter {
 ///
 /// # Example
 /// ```
-/// use harmony::domain::topology::router::TlsRoute;
+/// use harmony::topology::router::TlsRoute;
 /// let postgres_rw = TlsRoute {
 ///     hostname: "postgres-cluster-example.public.domain.io".to_string(),
 ///     backend: "postgres-cluster-example-rw".to_string(),  // k8s Service or HAProxy upstream
@@ -83,17 +82,17 @@ pub struct TlsRoute {
 /// Used by PostgreSQL capability to expose CNPG clusters multisite (site1 → site2 replication).
 ///
 /// # Usage
-/// ```rust,no_run
+/// ```ignore
+/// use harmony::topology::router::TlsRoute;
 /// // After CNPG deploy, expose RW endpoint
+/// async fn route() {
 ///     let topology = okd_topology();
 ///     let route = TlsRoute { /* ... */ };
-/// topology.install_route(route).await?;  // OKD Route, HAProxy reload, etc.
+///     topology.install_route(route).await;  // OKD Route, HAProxy reload, etc.
-/// 
+/// }
-/// // Client: psql \\"host={route.hostname} port=443 sslmode=verify-ca sslnegotiation=direct\\"
-/// let public_ep = Endpoint { host: topology.hostname(), port: 443 };
 /// ```
 pub trait TlsRouter: Send + Sync {
-/// Provisions the route (idempotent where possible).
+    /// Provisions the route (idempotent where possible).
     /// Example: OKD Route{ host, to: backend:target_port, tls: {passthrough} };
     ///          HAProxy frontend→backend \"postgres-upstream\".
     async fn install_route(&self, config: TlsRoute) -> Result<(), String>;
@@ -118,4 +117,3 @@ impl std::fmt::Debug for dyn TlsRouter {
         ))
     }
 }
-

harmony/src/modules/postgresql/cnpg/crd.rs

@@ -1,4 +1,4 @@
-use kube::{api::ObjectMeta, CustomResource};
+use kube::{CustomResource, api::ObjectMeta};
 use serde::{Deserialize, Serialize};
 
 #[derive(CustomResource, Deserialize, Serialize, Clone, Debug)]

harmony/src/modules/postgresql/score_public.rs

@@ -1,11 +1,14 @@
 use async_trait::async_trait;
+use harmony_types::id::Id;
 use serde::Serialize;
 
+use crate::data::Version;
 use crate::domain::topology::router::{TlsRoute, TlsRouter};
-use crate::interpret::Interpret;
+use crate::interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome};
+use crate::inventory::Inventory;
 use crate::modules::k8s::resource::K8sResourceScore;
-use crate::modules::postgresql::cnpg::{Bootstrap, Cluster, ClusterSpec, Initdb, Storage};
 use crate::modules::postgresql::PostgreSQLScore;
+use crate::modules::postgresql::cnpg::{Bootstrap, Cluster, ClusterSpec, Initdb, Storage};
 use crate::score::Score;
 use crate::topology::{K8sclient, Topology};
 use k8s_openapi::apimachinery::pkg::apis::meta::v1::ObjectMeta;
@@ -55,14 +58,35 @@ struct PublicPostgreSQLInterpret {
 
 #[async_trait]
 impl<T: Topology + K8sclient + TlsRouter + Send + Sync> Interpret<T> for PublicPostgreSQLInterpret {
-    async fn interpret(&self, topo: &T) -> Result<(), Box<dyn std::error::Error>> {
+    fn get_name(&self) -> InterpretName {
+        InterpretName::Custom("PublicPostgreSQLInterpret")
+    }
+    fn get_version(&self) -> Version {
+        todo!()
+    }
+    fn get_status(&self) -> InterpretStatus {
+        todo!()
+    }
+    fn get_children(&self) -> Vec<Id> {
+        todo!()
+    }
+    async fn execute(&self, inventory: &Inventory, topo: &T) -> Result<Outcome, InterpretError> {
         // Deploy CNPG cluster first (creates -rw service)
-        self.postgres_score.create_interpret().interpret(topo).await?;
+        self.postgres_score
+            .create_interpret()
+            .execute(inventory, topo)
+            .await?;
 
         // Expose RW publicly via TLS passthrough
-        topo.install_route(self.tls_route.clone()).await.map_err(|e| Box::new(std::io::Error::new(std::io::ErrorKind::Other, e)) as Box<dyn std::error::Error>)?;
+        topo.install_route(self.tls_route.clone())
+            .await
+            .map_err(|e| InterpretError::new(e))?;
 
-        Ok(())
+        Ok(Outcome::success(format!(
+            "Public CNPG cluster '{}' deployed with TLS passthrough route '{}'",
+            self.postgres_score.name.clone(),
+            self.tls_route.hostname
+        )))
     }
 }
 
@@ -82,7 +106,10 @@ impl<T: Topology + K8sclient + TlsRouter + Send + Sync> Score<T> for PublicPostg
     }
 
     fn name(&self) -> String {
-        format!("PublicPostgreSQLScore({}:{})", self.inner.namespace, self.hostname)
+        format!(
+            "PublicPostgreSQLScore({}:{})",
+            self.inner.namespace, self.hostname
+        )
     }
 }