feat: Unify AgentControlDynamicConfig traits into one AgentControlDynamicConfigRepository (#1339)

alvarocabanas · web-flow · commit cdada40d7098 · 2025-06-06T11:15:20.000+02:00
diff --git a/agent-control/src/agent_control.rs b/agent-control/src/agent_control.rs
@@ -1,6 +1,6 @@
 pub mod agent_id;
 pub mod config;
-pub mod config_storer;
+pub mod config_repository;
 pub mod config_validator;
 pub mod defaults;
 pub mod error;
diff --git a/agent-control/src/agent_control/agent_control.rs b/agent-control/src/agent_control/agent_control.rs
@@ -1,11 +1,7 @@
 use super::config::{
     AgentControlConfig, AgentControlDynamicConfig, SubAgentsMap, sub_agents_difference,
 };
-use super::config_storer::loader_storer::{
-    AgentControlDynamicConfigLoader, AgentControlRemoteConfigDeleter,
-    AgentControlRemoteConfigHashGetter, AgentControlRemoteConfigHashStateUpdater,
-    AgentControlRemoteConfigStorer,
-};
+use super::config_repository::repository::AgentControlDynamicConfigRepository;
 use super::resource_cleaner::ResourceCleaner;
 use super::version_updater::VersionUpdater;
 use crate::agent_control::config_validator::DynamicConfigValidator;
@@ -35,11 +31,7 @@ use tracing::{debug, error, info, instrument, trace, warn};
 pub struct AgentControl<S, O, SL, DV, RC, VU>
 where
     O: StartedClient,
-    SL: AgentControlRemoteConfigStorer
-        + AgentControlDynamicConfigLoader
-        + AgentControlRemoteConfigDeleter
-        + AgentControlRemoteConfigHashStateUpdater
-        + AgentControlRemoteConfigHashGetter,
+    SL: AgentControlDynamicConfigRepository,
     S: SubAgentBuilder,
     DV: DynamicConfigValidator,
     RC: ResourceCleaner,
@@ -63,11 +55,7 @@ impl<S, O, SL, DV, RC, VU> AgentControl<S, O, SL, DV, RC, VU>
 where
     O: StartedClient,
     S: SubAgentBuilder,
-    SL: AgentControlRemoteConfigStorer
-        + AgentControlDynamicConfigLoader
-        + AgentControlRemoteConfigDeleter
-        + AgentControlRemoteConfigHashStateUpdater
-        + AgentControlRemoteConfigHashGetter,
+    SL: AgentControlDynamicConfigRepository,
     DV: DynamicConfigValidator,
     RC: ResourceCleaner,
     VU: VersionUpdater,
@@ -448,7 +436,7 @@ mod tests {
     use crate::agent_control::config::{
         AgentControlConfig, AgentControlDynamicConfig, SubAgentConfig,
     };
-    use crate::agent_control::config_storer::loader_storer::tests::MockAgentControlDynamicConfigStore;
+    use crate::agent_control::config_repository::repository::tests::MockAgentControlDynamicConfigStore;
     use crate::agent_control::config_validator::DynamicConfigValidatorError;
     use crate::agent_control::config_validator::tests::MockDynamicConfigValidator;
     use crate::agent_control::resource_cleaner::ResourceCleanerError;
diff --git a/agent-control/src/agent_control/config_repository.rs b/agent-control/src/agent_control/config_repository.rs
@@ -0,0 +1,2 @@
+pub mod repository;
+pub mod store;
diff --git a/agent-control/src/agent_control/config_repository/repository.rs b/agent-control/src/agent_control/config_repository/repository.rs
@@ -10,41 +10,28 @@ pub trait AgentControlConfigLoader {
     fn load(&self) -> Result<AgentControlConfig, AgentControlConfigError>;
 }
 
-/// AgentControlRemoteConfigStorer stores a remote_config containing
-/// the dynamic part of the AgentControlConfig and the remote config hash and status
-pub trait AgentControlRemoteConfigStorer {
+/// AgentControlDynamicConfigRepository loads, stores, deletes or updates agent_control's remote_configs
+#[cfg_attr(test, mockall::automock)]
+pub trait AgentControlDynamicConfigRepository {
+    /// load the dynamic part of the AgentControlConfig
+    fn load(&self) -> Result<AgentControlDynamicConfig, AgentControlConfigError>;
+    /// store a remote_config containing
+    /// the dynamic part of the AgentControlConfig and the remote config hash and status
     fn store(&self, config: &RemoteConfig) -> Result<(), AgentControlConfigError>;
-}
 
-/// AgentControlRemoteConfigHashUpdater stores the hash and status for a remote_config
-pub trait AgentControlRemoteConfigHashStateUpdater {
+    /// update the state of a remote_config
     fn update_hash_state(&self, state: &ConfigState) -> Result<(), AgentControlConfigError>;
-}
 
-/// AgentControlRemoteConfigHashGetter retrieves the hash and status
-/// from the stored remote_config if exists
-pub trait AgentControlRemoteConfigHashGetter {
+    /// retrieves the hash and status from the stored remote_config if exists
     fn get_hash(&self) -> Result<Option<Hash>, AgentControlConfigError>;
-}
 
-/// AgentControlRemoteConfigDeleter deletes the dynamic part of the AgentControlConfig
-pub trait AgentControlRemoteConfigDeleter {
+    /// delete the dynamic part of the AgentControlConfig
     fn delete(&self) -> Result<(), AgentControlConfigError>;
 }
 
-/// AgentControlDynamicConfigLoader loads the dynamic part of the AgentControlConfig
-#[cfg_attr(test, mockall::automock)]
-pub trait AgentControlDynamicConfigLoader {
-    fn load(&self) -> Result<AgentControlDynamicConfig, AgentControlConfigError>;
-}
-
 #[cfg(test)]
 pub(crate) mod tests {
-    use super::{
-        AgentControlConfigError, AgentControlDynamicConfigLoader, AgentControlRemoteConfigDeleter,
-        AgentControlRemoteConfigHashGetter, AgentControlRemoteConfigHashStateUpdater,
-        AgentControlRemoteConfigStorer,
-    };
+    use super::{AgentControlConfigError, AgentControlDynamicConfigRepository};
     use crate::agent_control::config::AgentControlDynamicConfig;
     use crate::opamp::remote_config::hash::{ConfigState, Hash};
     use crate::values::config::RemoteConfig;
@@ -53,20 +40,16 @@ pub(crate) mod tests {
     mock! {
         pub AgentControlDynamicConfigStore {}
 
-        impl AgentControlRemoteConfigStorer for AgentControlDynamicConfigStore {
-            fn store(&self, config: &RemoteConfig) -> Result<(), AgentControlConfigError>;
-        }
-        impl AgentControlDynamicConfigLoader for AgentControlDynamicConfigStore {
+        impl AgentControlDynamicConfigRepository for AgentControlDynamicConfigStore {
             fn load(&self) -> Result<AgentControlDynamicConfig, AgentControlConfigError>;
-        }
-        impl AgentControlRemoteConfigDeleter for AgentControlDynamicConfigStore {
-            fn delete(&self) -> Result<(), AgentControlConfigError>;
-        }
-        impl AgentControlRemoteConfigHashStateUpdater for AgentControlDynamicConfigStore {
+
+            fn store(&self, config: &RemoteConfig) -> Result<(), AgentControlConfigError>;
+
             fn update_hash_state(&self, state: &ConfigState) -> Result<(), AgentControlConfigError>;
-        }
-        impl AgentControlRemoteConfigHashGetter for AgentControlDynamicConfigStore {
+
             fn get_hash(&self) -> Result<Option<Hash>, AgentControlConfigError>;
+
+            fn delete(&self) -> Result<(), AgentControlConfigError>;
         }
     }
 
diff --git a/agent-control/src/agent_control/config_repository/store.rs b/agent-control/src/agent_control/config_repository/store.rs
@@ -2,10 +2,8 @@ use crate::agent_control::agent_id::AgentID;
 use crate::agent_control::config::{
     AgentControlConfig, AgentControlConfigError, AgentControlDynamicConfig,
 };
-use crate::agent_control::config_storer::loader_storer::{
-    AgentControlConfigLoader, AgentControlDynamicConfigLoader, AgentControlRemoteConfigDeleter,
-    AgentControlRemoteConfigHashGetter, AgentControlRemoteConfigHashStateUpdater,
-    AgentControlRemoteConfigStorer,
+use crate::agent_control::config_repository::repository::{
+    AgentControlConfigLoader, AgentControlDynamicConfigRepository,
 };
 use crate::agent_control::defaults::{AGENT_CONTROL_CONFIG_ENV_VAR_PREFIX, default_capabilities};
 use crate::opamp::remote_config::hash::{ConfigState, Hash};
@@ -36,55 +34,35 @@ where
     }
 }
 
-impl<Y> AgentControlDynamicConfigLoader for AgentControlConfigStore<Y>
+impl<Y> AgentControlDynamicConfigRepository for AgentControlConfigStore<Y>
 where
     Y: ConfigRepository,
 {
     fn load(&self) -> Result<AgentControlDynamicConfig, AgentControlConfigError> {
         Ok(self._load_config()?.dynamic)
     }
-}
-
-impl<Y> AgentControlRemoteConfigDeleter for AgentControlConfigStore<Y>
-where
-    Y: ConfigRepository,
-{
-    fn delete(&self) -> Result<(), AgentControlConfigError> {
-        self.values_repository
-            .delete_remote(&self.agent_control_id)?;
-        Ok(())
-    }
-}
 
-impl<Y> AgentControlRemoteConfigStorer for AgentControlConfigStore<Y>
-where
-    Y: ConfigRepository,
-{
     fn store(&self, config: &RemoteConfig) -> Result<(), AgentControlConfigError> {
         self.values_repository
             .store_remote(&self.agent_control_id, config)?;
         Ok(())
     }
-}
 
-impl<Y> AgentControlRemoteConfigHashStateUpdater for AgentControlConfigStore<Y>
-where
-    Y: ConfigRepository,
-{
     fn update_hash_state(&self, state: &ConfigState) -> Result<(), AgentControlConfigError> {
         self.values_repository
             .update_hash_state(&self.agent_control_id, state)?;
         Ok(())
     }
-}
 
-impl<Y> AgentControlRemoteConfigHashGetter for AgentControlConfigStore<Y>
-where
-    Y: ConfigRepository,
-{
     fn get_hash(&self) -> Result<Option<Hash>, AgentControlConfigError> {
         Ok(self.values_repository.get_hash(&self.agent_control_id)?)
     }
+
+    fn delete(&self) -> Result<(), AgentControlConfigError> {
+        self.values_repository
+            .delete_remote(&self.agent_control_id)?;
+        Ok(())
+    }
 }
 
 impl<V> AgentControlConfigStore<V>
diff --git a/agent-control/src/agent_control/config_storer.rs b/agent-control/src/agent_control/config_storer.rs
diff --git a/agent-control/src/agent_control/run/k8s.rs b/agent-control/src/agent_control/run/k8s.rs
@@ -1,7 +1,7 @@
 use crate::agent_control::AgentControl;
 use crate::agent_control::config::K8sConfig;
-use crate::agent_control::config_storer::loader_storer::AgentControlConfigLoader;
-use crate::agent_control::config_storer::store::AgentControlConfigStore;
+use crate::agent_control::config_repository::repository::AgentControlConfigLoader;
+use crate::agent_control::config_repository::store::AgentControlConfigStore;
 use crate::agent_control::config_validator::RegistryDynamicConfigValidator;
 use crate::agent_control::defaults::{
     AGENT_CONTROL_VERSION, FLEET_ID_ATTRIBUTE_KEY, HOST_NAME_ATTRIBUTE_KEY,
diff --git a/agent-control/src/agent_control/run/on_host.rs b/agent-control/src/agent_control/run/on_host.rs
@@ -1,6 +1,6 @@
 use crate::agent_control::AgentControl;
-use crate::agent_control::config_storer::loader_storer::AgentControlConfigLoader;
-use crate::agent_control::config_storer::store::AgentControlConfigStore;
+use crate::agent_control::config_repository::repository::AgentControlConfigLoader;
+use crate::agent_control::config_repository::store::AgentControlConfigStore;
 use crate::agent_control::config_validator::RegistryDynamicConfigValidator;
 use crate::agent_control::defaults::{
     AGENT_CONTROL_VERSION, FLEET_ID_ATTRIBUTE_KEY, HOST_ID_ATTRIBUTE_KEY, HOST_NAME_ATTRIBUTE_KEY,
diff --git a/agent-control/src/bin/main_config_migrate.rs b/agent-control/src/bin/main_config_migrate.rs
@@ -1,4 +1,4 @@
-use newrelic_agent_control::agent_control::config_storer::store::AgentControlConfigStore;
+use newrelic_agent_control::agent_control::config_repository::store::AgentControlConfigStore;
 use newrelic_agent_control::agent_control::defaults::{
     AGENT_CONTROL_DATA_DIR, AGENT_CONTROL_LOCAL_DATA_DIR, AGENT_CONTROL_LOG_DIR, SUB_AGENT_DIR,
 };
diff --git a/agent-control/src/config_migrate/migration/agent_config_getter.rs b/agent-control/src/config_migrate/migration/agent_config_getter.rs
@@ -1,5 +1,5 @@
 use crate::agent_control::config::{AgentControlConfigError, AgentControlDynamicConfig};
-use crate::agent_control::config_storer::loader_storer::AgentControlDynamicConfigLoader;
+use crate::agent_control::config_repository::repository::AgentControlDynamicConfigRepository;
 use crate::agent_type::agent_type_id::AgentTypeID;
 use semver::VersionReq;
 use thiserror::Error;
@@ -16,15 +16,15 @@ pub enum ConversionError {
 
 pub struct AgentConfigGetter<SL>
 where
-    SL: AgentControlDynamicConfigLoader,
+    SL: AgentControlDynamicConfigRepository,
 {
     pub(super) sub_agents_config_loader: SL,
 }
 
 #[cfg_attr(test, mockall::automock)]
 impl<SL> AgentConfigGetter<SL>
 where
-    SL: AgentControlDynamicConfigLoader + 'static,
+    SL: AgentControlDynamicConfigRepository + 'static,
 {
     pub fn new(sub_agents_config_loader: SL) -> Self {
         Self {
@@ -69,13 +69,23 @@ pub(crate) mod tests {
     use super::*;
     use crate::agent_control::agent_id::AgentID;
     use crate::agent_control::config::{AgentControlDynamicConfig, SubAgentConfig};
+    use crate::opamp::remote_config::hash::{ConfigState, Hash};
+    use crate::values::config::RemoteConfig;
     use mockall::mock;
     use std::collections::HashMap;
 
     mock! {
         pub AgentControlDynamicConfigLoader {}
-        impl AgentControlDynamicConfigLoader for AgentControlDynamicConfigLoader {
+        impl AgentControlDynamicConfigRepository for AgentControlDynamicConfigLoader {
             fn load(&self) -> Result<AgentControlDynamicConfig, AgentControlConfigError>;
+
+            fn store(&self, config: &RemoteConfig) -> Result<(), AgentControlConfigError>;
+
+            fn update_hash_state(&self, state: &ConfigState) -> Result<(), AgentControlConfigError>;
+
+            fn get_hash(&self) -> Result<Option<Hash>, AgentControlConfigError>;
+
+            fn delete(&self) -> Result<(), AgentControlConfigError>;
         }
     }
 
diff --git a/agent-control/src/config_migrate/migration/migrator.rs b/agent-control/src/config_migrate/migration/migrator.rs
@@ -1,6 +1,6 @@
 use crate::agent_control::config::AgentControlConfigError;
-use crate::agent_control::config_storer::loader_storer::AgentControlDynamicConfigLoader;
-use crate::agent_control::config_storer::store::AgentControlConfigStore;
+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)]
@@ -39,7 +39,7 @@ pub enum MigratorError {
 
 pub struct ConfigMigrator<
     R: AgentRegistry,
-    SL: AgentControlDynamicConfigLoader + 'static,
+    SL: AgentControlDynamicConfigRepository + 'static,
     C: DirectoryManager,
     F: FileReader,
 > {
diff --git a/agent-control/src/flags.rs b/agent-control/src/flags.rs
@@ -14,7 +14,7 @@ use crate::opamp::client_builder::DEFAULT_POLL_INTERVAL;
 use crate::values::file::ConfigRepositoryFile;
 use crate::{
     agent_control::{
-        config_storer::{loader_storer::AgentControlConfigLoader, store::AgentControlConfigStore},
+        config_repository::{repository::AgentControlConfigLoader, store::AgentControlConfigStore},
         run::{AgentControlRunConfig, BasePaths},
     },
     utils::binary_metadata::binary_metadata,
diff --git a/agent-control/tests/common/agent_control.rs b/agent-control/tests/common/agent_control.rs
@@ -1,7 +1,7 @@
 use crate::common::global_logger::init_logger;
 use newrelic_agent_control::agent_control::config::K8sConfig;
-use newrelic_agent_control::agent_control::config_storer::loader_storer::AgentControlConfigLoader;
-use newrelic_agent_control::agent_control::config_storer::store::AgentControlConfigStore;
+use newrelic_agent_control::agent_control::config_repository::repository::AgentControlConfigLoader;
+use newrelic_agent_control::agent_control::config_repository::store::AgentControlConfigStore;
 use newrelic_agent_control::agent_control::run::{
     AgentControlRunConfig, AgentControlRunner, BasePaths, Environment,
 };
diff --git a/agent-control/tests/k8s/garbage_collector.rs b/agent-control/tests/k8s/garbage_collector.rs
@@ -10,7 +10,10 @@ use super::tools::{
 use k8s_openapi::api::core::v1::Secret;
 use kube::{api::Api, core::TypeMeta};
 use mockall::mock;
+use newrelic_agent_control::agent_control::config_repository::repository::AgentControlDynamicConfigRepository;
+use newrelic_agent_control::opamp::remote_config::hash::{ConfigState, Hash};
 use newrelic_agent_control::sub_agent::k8s::supervisor::NotStartedSupervisorK8s;
+use newrelic_agent_control::values::config::RemoteConfig;
 use newrelic_agent_control::{
     agent_control::config::default_group_version_kinds, agent_type::agent_type_id::AgentTypeID,
 };
@@ -26,7 +29,7 @@ use newrelic_agent_control::{
 use newrelic_agent_control::{
     agent_control::{
         config::{AgentControlConfig, AgentControlConfigError, AgentControlDynamicConfig},
-        config_storer::loader_storer::{AgentControlConfigLoader, AgentControlDynamicConfigLoader},
+        config_repository::repository::AgentControlConfigLoader,
     },
     k8s::labels::Labels,
 };
@@ -49,10 +52,18 @@ mock! {
 
 // Setup AgentControlDynamicConfigLoader mock
 mock! {
-    pub AgentControlDynamicConfigLoader{}
+    pub AgentControlDynamicConfigRepository{}
 
-    impl AgentControlDynamicConfigLoader for AgentControlDynamicConfigLoader {
+    impl AgentControlDynamicConfigRepository for AgentControlDynamicConfigRepository {
         fn load(&self) -> Result<AgentControlDynamicConfig, AgentControlConfigError>;
+
+        fn store(&self, config: &RemoteConfig) -> Result<(), AgentControlConfigError>;
+
+        fn update_hash_state(&self, state: &ConfigState) -> Result<(), AgentControlConfigError>;
+
+        fn get_hash(&self) -> Result<Option<Hash>, AgentControlConfigError>;
+
+        fn delete(&self) -> Result<(), AgentControlConfigError>;
     }
 }
 
diff --git a/agent-control/tests/k8s/store.rs b/agent-control/tests/k8s/store.rs
@@ -4,11 +4,8 @@ use crate::k8s::tools::k8s_env::K8sEnv;
 use k8s_openapi::api::core::v1::ConfigMap;
 use kube::Api;
 use newrelic_agent_control::agent_control::agent_id::AgentID;
-use newrelic_agent_control::agent_control::config_storer::loader_storer::{
-    AgentControlDynamicConfigLoader, AgentControlRemoteConfigDeleter,
-    AgentControlRemoteConfigStorer,
-};
-use newrelic_agent_control::agent_control::config_storer::store::AgentControlConfigStore;
+use newrelic_agent_control::agent_control::config_repository::repository::AgentControlDynamicConfigRepository;
+use newrelic_agent_control::agent_control::config_repository::store::AgentControlConfigStore;
 use newrelic_agent_control::agent_control::defaults::default_capabilities;
 use newrelic_agent_control::k8s::client::SyncK8sClient;
 use newrelic_agent_control::k8s::labels::Labels;

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+pub mod repository;`
	`2`	`+pub mod store;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-use newrelic_agent_control::agent_control::config_storer::store::AgentControlConfigStore;`
	`1`	`+use newrelic_agent_control::agent_control::config_repository::store::AgentControlConfigStore;`
`2`	`2`	`use newrelic_agent_control::agent_control::defaults::{`
`3`	`3`	`AGENT_CONTROL_DATA_DIR, AGENT_CONTROL_LOCAL_DATA_DIR, AGENT_CONTROL_LOG_DIR, SUB_AGENT_DIR,`
`4`	`4`	`};`