style: make clippy happy by removing unused code

Author: DavSanchez

agent-control/src/config_migrate/migration/config.rs

@@ -159,12 +159,6 @@ pub struct MigrationAgentConfig {
     pub next: Option<AgentTypeID>,
 }
 
-impl MigrationAgentConfig {
-    pub(crate) fn get_agent_type_fqn(&self) -> AgentTypeID {
-        self.agent_type_fqn.clone()
-    }
-}
-
 impl MigrationAgentConfig {
     pub fn get_file(&self, fqn_to_check: AgentTypeFieldFQN) -> Option<FilePath> {
         for (fqn, path) in self.files_map.iter() {

agent-control/src/config_migrate/migration/converter.rs

@@ -1,19 +1,10 @@
-use crate::agent_control::run::Environment;
-use crate::agent_type::agent_type_registry::{AgentRegistry, AgentRepositoryError};
-use crate::agent_type::embedded_registry::EmbeddedRegistry;
-use crate::agent_type::variable::constraints::VariableConstraints;
-use crate::config_migrate::migration::agent_value_spec::AgentValueSpec::AgentValueSpecEnd;
-use crate::config_migrate::migration::agent_value_spec::{
-    AgentValueError, AgentValueSpec, from_fqn_and_value, merge_agent_values,
-};
-use crate::config_migrate::migration::config::{
-    AgentTypeFieldFQN, DirInfo, FilePath, MigrationAgentConfig,
-};
-use crate::config_migrate::migration::config::{FILE_SEPARATOR, FILE_SEPARATOR_REPLACE};
+use crate::agent_type::agent_type_registry::AgentRepositoryError;
+use crate::config_migrate::migration::agent_value_spec::AgentValueError;
+use crate::config_migrate::migration::config::MigrationAgentConfig;
 use crate::config_migrate::migration::converter::ConversionError::*;
 use crate::config_migrate::migration::supported_config_value::SupportedConfigValue;
 use crate::config_migrate::migration::supported_config_value::SupportedConfigValueError;
-use crate::sub_agent::effective_agents_assembler::{AgentTypeDefinitionError, build_agent_type};
+use crate::sub_agent::effective_agents_assembler::AgentTypeDefinitionError;
 use fs::LocalFile;
 use fs::file_reader::{FileReader, FileReaderError};
 use std::collections::HashMap;
@@ -40,22 +31,20 @@ pub enum ConversionError {
     SupportedConfigValueError(#[from] SupportedConfigValueError),
 }
 
-pub struct ConfigConverter<R: AgentRegistry, F: FileReader> {
-    agent_registry: R,
+pub struct ConfigConverter<F: FileReader> {
     file_reader: F,
 }
 
-impl Default for ConfigConverter<EmbeddedRegistry, LocalFile> {
+impl Default for ConfigConverter<LocalFile> {
     fn default() -> Self {
         ConfigConverter {
-            agent_registry: EmbeddedRegistry::default(),
             file_reader: LocalFile,
         }
     }
 }
 
 #[cfg_attr(test, mockall::automock)]
-impl<R: AgentRegistry, F: FileReader> ConfigConverter<R, F> {
+impl<F: FileReader> ConfigConverter<F> {
     pub fn convert(
         &self,
         migration_agent_config: &MigrationAgentConfig,
@@ -111,40 +100,4 @@ impl<R: AgentRegistry, F: FileReader> ConfigConverter<R, F> {
         ]
         .into())
     }
-
-    fn file_to_agent_value_spec(
-        &self,
-        agent_type_field_fqn: AgentTypeFieldFQN,
-        file_path: FilePath,
-    ) -> Result<HashMap<String, AgentValueSpec>, ConversionError> {
-        let contents = self.file_reader.read(file_path.as_path())?;
-        Ok(from_fqn_and_value(
-            agent_type_field_fqn.clone(),
-            AgentValueSpecEnd(contents),
-        ))
-    }
-
-    fn dir_to_agent_value_spec(
-        &self,
-        agent_type_field_fqn: AgentTypeFieldFQN,
-        dir_info: DirInfo,
-    ) -> Result<HashMap<String, AgentValueSpec>, ConversionError> {
-        let files_paths = self.file_reader.dir_entries(dir_info.path.as_path())?;
-        let mut res: Vec<HashMap<String, AgentValueSpec>> = Vec::new();
-        // refactor file_path to path
-        for path in files_paths {
-            let filename = path.file_name().unwrap().to_str().unwrap().to_string();
-            //filter by filename
-            if !dir_info.valid_filename(filename.as_str()) {
-                continue;
-            }
-
-            // replace the file separator to not be treated as a leaf
-            let escaped_filename = filename.replace(FILE_SEPARATOR, FILE_SEPARATOR_REPLACE);
-            let full_agent_type_field_fqn: AgentTypeFieldFQN =
-                format!("{agent_type_field_fqn}.{escaped_filename}").into();
-            res.push(self.file_to_agent_value_spec(full_agent_type_field_fqn, path)?);
-        }
-        Ok(merge_agent_values(res)?)
-    }
 }

agent-control/src/config_migrate/migration/migrator.rs

@@ -1,8 +1,6 @@
 use crate::agent_control::config::AgentControlConfigError;
 use crate::agent_control::config_repository::repository::AgentControlDynamicConfigRepository;
 use crate::agent_control::config_repository::store::AgentControlConfigStore;
-use crate::agent_type::agent_type_registry::AgentRegistry;
-use crate::agent_type::embedded_registry::EmbeddedRegistry;
 #[cfg_attr(test, mockall_double::double)]
 use crate::config_migrate::migration::agent_config_getter::AgentConfigGetter;
 use crate::config_migrate::migration::config::MigrationAgentConfig;
@@ -38,26 +36,24 @@ pub enum MigratorError {
 }
 
 pub struct ConfigMigrator<
-    R: AgentRegistry,
     SL: AgentControlDynamicConfigRepository + 'static,
     C: DirectoryManager,
     F: FileReader,
 > {
-    config_converter: ConfigConverter<R, F>,
+    config_converter: ConfigConverter<F>,
     agent_config_getter: AgentConfigGetter<SL>,
     values_persister: ValuesPersisterFile<C>,
 }
 
 impl
     ConfigMigrator<
-        EmbeddedRegistry,
         AgentControlConfigStore<ConfigRepositoryFile<LocalFile, DirectoryManagerFs>>,
         DirectoryManagerFs,
         LocalFile,
     >
 {
     pub fn new(
-        config_converter: ConfigConverter<EmbeddedRegistry, LocalFile>,
+        config_converter: ConfigConverter<LocalFile>,
         agent_config_getter: AgentConfigGetter<
             AgentControlConfigStore<ConfigRepositoryFile<LocalFile, DirectoryManagerFs>>,
         >,

agent-control/src/config_migrate/migration/supported_config_value.rs

@@ -91,7 +91,7 @@ impl SupportedConfigValue {
     pub fn merge(mut self, other: Self) -> Self {
         if self.0.0 != other.0.0 {
             debug!(
-                "cannot merge uncompatible config values. Left value key: `{}`, right value key: `{}`",
+                "cannot merge incompatible config values. Left value key: `{}`, right value key: `{}`",
                 self.0.0, other.0.0
             );
         } else {