From 54a53fa982f18fc46774178236313eb56ee28a53 Mon Sep 17 00:00:00 2001 From: wjro Date: Mon, 19 Jan 2026 12:48:47 -0500 Subject: [PATCH] fix: modified score names for better clarity --- examples/cert_manager/src/main.rs | 6 +++--- .../domain/topology/k8s_anywhere/k8s_anywhere.rs | 10 ++++------ harmony/src/modules/cert_manager/crd/mod.rs | 4 ++-- ...re_certificate.rs => score_k8s_certificate.rs} | 4 ++-- ...ster_issuer.rs => score_k8s_cluster_issuer.rs} | 0 .../crd/{score_issuer.rs => score_k8s_issuer.rs} | 4 ++-- harmony/src/modules/cert_manager/mod.rs | 6 +++--- ...score_operator.rs => score_cert_management.rs} | 0 ...{score_create_cert.rs => score_certificate.rs} | 15 +++++---------- .../{score_create_issuer.rs => score_issuer.rs} | 0 10 files changed, 21 insertions(+), 28 deletions(-) rename harmony/src/modules/cert_manager/crd/{score_certificate.rs => score_k8s_certificate.rs} (93%) rename harmony/src/modules/cert_manager/crd/{score_cluster_issuer.rs => score_k8s_cluster_issuer.rs} (100%) rename harmony/src/modules/cert_manager/crd/{score_issuer.rs => score_k8s_issuer.rs} (93%) rename harmony/src/modules/cert_manager/{score_operator.rs => score_cert_management.rs} (100%) rename harmony/src/modules/cert_manager/{score_create_cert.rs => score_certificate.rs} (84%) rename harmony/src/modules/cert_manager/{score_create_issuer.rs => score_issuer.rs} (100%) diff --git a/examples/cert_manager/src/main.rs b/examples/cert_manager/src/main.rs index 1d0c3ac..7ab3ce1 100644 --- a/examples/cert_manager/src/main.rs +++ b/examples/cert_manager/src/main.rs @@ -1,8 +1,8 @@ use harmony::{ inventory::Inventory, modules::cert_manager::{ - capability::CertificateManagementConfig, score_create_cert::CertificateCreationScore, - score_create_issuer::CertificateIssuerScore, score_operator::CertificateManagementScore, + capability::CertificateManagementConfig, score_cert_management::CertificateManagementScore, + score_certificate::CertificateScore, score_issuer::CertificateIssuerScore, }, topology::K8sAnywhereTopology, }; @@ -25,7 +25,7 @@ async fn main() { issuer_name: "test-self-signed-issuer".to_string(), }; - let cert = CertificateCreationScore { + let cert = CertificateScore { config: config.clone(), cert_name: "test-self-signed-cert".to_string(), issuer_name: "test-self-signed-issuer".to_string(), diff --git a/harmony/src/domain/topology/k8s_anywhere/k8s_anywhere.rs b/harmony/src/domain/topology/k8s_anywhere/k8s_anywhere.rs index ef48015..14e1ac2 100644 --- a/harmony/src/domain/topology/k8s_anywhere/k8s_anywhere.rs +++ b/harmony/src/domain/topology/k8s_anywhere/k8s_anywhere.rs @@ -20,10 +20,8 @@ use crate::{ cert_manager::{ capability::{CertificateManagement, CertificateManagementConfig}, crd::{ - certificate::Certificate, - issuer::{Issuer, IssuerSpec}, - score_certificate::CertificateScore, - score_issuer::IssuerScore, + certificate::Certificate, issuer::Issuer, + score_k8s_certificate::K8sCertificateScore, score_k8s_issuer::K8sIssuerScore, }, operator::CertManagerOperatorScore, }, @@ -412,7 +410,7 @@ impl CertificateManagement for K8sAnywhereTopology { issuer_name: String, config: &CertificateManagementConfig, ) -> Result { - let issuer_score = IssuerScore { + let issuer_score = K8sIssuerScore { issuer_name: issuer_name.clone(), config: config.clone(), }; @@ -441,7 +439,7 @@ impl CertificateManagement for K8sAnywhereTopology { ) .await?; - let cert = CertificateScore { + let cert = K8sCertificateScore { cert_name: cert_name, config: config.clone(), issuer_name, diff --git a/harmony/src/modules/cert_manager/crd/mod.rs b/harmony/src/modules/cert_manager/crd/mod.rs index 7f8e6d1..7725c1a 100644 --- a/harmony/src/modules/cert_manager/crd/mod.rs +++ b/harmony/src/modules/cert_manager/crd/mod.rs @@ -4,8 +4,8 @@ pub mod certificate; pub mod cluster_issuer; pub mod issuer; //pub mod score_cluster_issuer; -pub mod score_certificate; -pub mod score_issuer; +pub mod score_k8s_certificate; +pub mod score_k8s_issuer; #[derive(Deserialize, Serialize, Clone, Debug)] #[serde(rename_all = "camelCase")] diff --git a/harmony/src/modules/cert_manager/crd/score_certificate.rs b/harmony/src/modules/cert_manager/crd/score_k8s_certificate.rs similarity index 93% rename from harmony/src/modules/cert_manager/crd/score_certificate.rs rename to harmony/src/modules/cert_manager/crd/score_k8s_certificate.rs index fb9a145..adc7cc4 100644 --- a/harmony/src/modules/cert_manager/crd/score_certificate.rs +++ b/harmony/src/modules/cert_manager/crd/score_k8s_certificate.rs @@ -15,13 +15,13 @@ use crate::{ }; #[derive(Debug, Clone, Serialize)] -pub struct CertificateScore { +pub struct K8sCertificateScore { pub cert_name: String, pub issuer_name: String, pub config: CertificateManagementConfig, } -impl Score for CertificateScore { +impl Score for K8sCertificateScore { fn name(&self) -> String { "CertificateScore".to_string() } diff --git a/harmony/src/modules/cert_manager/crd/score_cluster_issuer.rs b/harmony/src/modules/cert_manager/crd/score_k8s_cluster_issuer.rs similarity index 100% rename from harmony/src/modules/cert_manager/crd/score_cluster_issuer.rs rename to harmony/src/modules/cert_manager/crd/score_k8s_cluster_issuer.rs diff --git a/harmony/src/modules/cert_manager/crd/score_issuer.rs b/harmony/src/modules/cert_manager/crd/score_k8s_issuer.rs similarity index 93% rename from harmony/src/modules/cert_manager/crd/score_issuer.rs rename to harmony/src/modules/cert_manager/crd/score_k8s_issuer.rs index c858d6e..213da58 100644 --- a/harmony/src/modules/cert_manager/crd/score_issuer.rs +++ b/harmony/src/modules/cert_manager/crd/score_k8s_issuer.rs @@ -18,12 +18,12 @@ use crate::{ }; #[derive(Debug, Clone, Serialize)] -pub struct IssuerScore { +pub struct K8sIssuerScore { pub issuer_name: String, pub config: CertificateManagementConfig, } -impl Score for IssuerScore { +impl Score for K8sIssuerScore { fn name(&self) -> String { "IssuerScore".to_string() } diff --git a/harmony/src/modules/cert_manager/mod.rs b/harmony/src/modules/cert_manager/mod.rs index d1ff660..46c1cb4 100644 --- a/harmony/src/modules/cert_manager/mod.rs +++ b/harmony/src/modules/cert_manager/mod.rs @@ -3,7 +3,7 @@ pub mod cluster_issuer; pub mod crd; mod helm; pub mod operator; -pub mod score_create_cert; -pub mod score_create_issuer; -pub mod score_operator; +pub mod score_cert_management; +pub mod score_certificate; +pub mod score_issuer; pub use helm::*; diff --git a/harmony/src/modules/cert_manager/score_operator.rs b/harmony/src/modules/cert_manager/score_cert_management.rs similarity index 100% rename from harmony/src/modules/cert_manager/score_operator.rs rename to harmony/src/modules/cert_manager/score_cert_management.rs diff --git a/harmony/src/modules/cert_manager/score_create_cert.rs b/harmony/src/modules/cert_manager/score_certificate.rs similarity index 84% rename from harmony/src/modules/cert_manager/score_create_cert.rs rename to harmony/src/modules/cert_manager/score_certificate.rs index 8f3a21b..19cf7f1 100644 --- a/harmony/src/modules/cert_manager/score_create_cert.rs +++ b/harmony/src/modules/cert_manager/score_certificate.rs @@ -13,19 +13,19 @@ use crate::{ }; #[derive(Debug, Clone, Serialize)] -pub struct CertificateCreationScore { +pub struct CertificateScore { pub cert_name: String, pub issuer_name: String, pub config: CertificateManagementConfig, } -impl Score for CertificateCreationScore { +impl Score for CertificateScore { fn name(&self) -> String { "CertificateCreationScore".to_string() } fn create_interpret(&self) -> Box> { - Box::new(CertificateCreationInterpret { + Box::new(CertificateInterpret { cert_name: self.cert_name.clone(), issuer_name: self.issuer_name.clone(), config: self.config.clone(), @@ -34,14 +34,14 @@ impl Score for CertificateCreationScore } #[derive(Debug)] -struct CertificateCreationInterpret { +struct CertificateInterpret { cert_name: String, issuer_name: String, config: CertificateManagementConfig, } #[async_trait] -impl Interpret for CertificateCreationInterpret { +impl Interpret for CertificateInterpret { async fn execute( &self, inventory: &Inventory, @@ -56,11 +56,6 @@ impl Interpret for CertificateCreationIn .await .map_err(|e| InterpretError::new(e.to_string()))?; - let ca_cert = topology - .get_ca_certificate("test-self-signed-cert".to_string(), &self.config) - .await?; - trace!("cacert: {}", ca_cert); - Ok(Outcome::success(format!("Installed CertificateManagement"))) } diff --git a/harmony/src/modules/cert_manager/score_create_issuer.rs b/harmony/src/modules/cert_manager/score_issuer.rs similarity index 100% rename from harmony/src/modules/cert_manager/score_create_issuer.rs rename to harmony/src/modules/cert_manager/score_issuer.rs