fix: modified score names for better clarity

examples/cert_manager/src/main.rs

@@ -1,8 +1,8 @@
 use harmony::{
     inventory::Inventory,
     modules::cert_manager::{
-        capability::CertificateManagementConfig, score_create_cert::CertificateCreationScore,
+        capability::CertificateManagementConfig, score_cert_management::CertificateManagementScore,
-        score_create_issuer::CertificateIssuerScore, score_operator::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(),

harmony/src/domain/topology/k8s_anywhere/k8s_anywhere.rs

@@ -20,10 +20,8 @@ use crate::{
         cert_manager::{
             capability::{CertificateManagement, CertificateManagementConfig},
             crd::{
-                certificate::Certificate,
+                certificate::Certificate, issuer::Issuer,
-                issuer::{Issuer, IssuerSpec},
+                score_k8s_certificate::K8sCertificateScore, score_k8s_issuer::K8sIssuerScore,
-                score_certificate::CertificateScore,
-                score_issuer::IssuerScore,
             },
             operator::CertManagerOperatorScore,
         },
@@ -412,7 +410,7 @@ impl CertificateManagement for K8sAnywhereTopology {
         issuer_name: String,
         config: &CertificateManagementConfig,
     ) -> Result<Outcome, ExecutorError> {
-        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,

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_k8s_certificate;
-pub mod score_issuer;
+pub mod score_k8s_issuer;
 
 #[derive(Deserialize, Serialize, Clone, Debug)]
 #[serde(rename_all = "camelCase")]

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<T: Topology + K8sclient> Score<T> for CertificateScore {
+impl<T: Topology + K8sclient> Score<T> for K8sCertificateScore {
     fn name(&self) -> String {
         "CertificateScore".to_string()
     }

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<T: Topology + K8sclient> Score<T> for IssuerScore {
+impl<T: Topology + K8sclient> Score<T> for K8sIssuerScore {
     fn name(&self) -> String {
         "IssuerScore".to_string()
     }

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_cert_management;
-pub mod score_create_issuer;
+pub mod score_certificate;
-pub mod score_operator;
+pub mod score_issuer;
 pub use helm::*;

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<T: Topology + CertificateManagement> Score<T> for CertificateCreationScore {
+impl<T: Topology + CertificateManagement> Score<T> for CertificateScore {
     fn name(&self) -> String {
         "CertificateCreationScore".to_string()
     }
 
     fn create_interpret(&self) -> Box<dyn Interpret<T>> {
-        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<T: Topology + CertificateManagement> Score<T> for CertificateCreationScore
 }
 
 #[derive(Debug)]
-struct CertificateCreationInterpret {
+struct CertificateInterpret {
     cert_name: String,
     issuer_name: String,
     config: CertificateManagementConfig,
 }
 
 #[async_trait]
-impl<T: Topology + CertificateManagement> Interpret<T> for CertificateCreationInterpret {
+impl<T: Topology + CertificateManagement> Interpret<T> for CertificateInterpret {
     async fn execute(
         &self,
         inventory: &Inventory,
@@ -56,11 +56,6 @@ impl<T: Topology + CertificateManagement> Interpret<T> 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")))
     }