chore(code): delete unused code (#1452)

Author: paologallinaharbur

agent-control/src/agent_type/definition.rs

@@ -12,9 +12,7 @@ use super::{
     variable::definition::{VariableDefinition, VariableDefinitionTree},
 };
 
-use crate::agent_control::defaults::default_capabilities;
 use crate::values::yaml_config::YAMLConfig;
-use opamp_client::operation::capabilities::Capabilities;
 use serde::Deserialize;
 use std::collections::HashMap;
 use tracing::warn;
@@ -50,7 +48,6 @@ pub struct AgentType {
     pub agent_type_id: AgentTypeID,
     pub variables: VariableTree,
     pub runtime_config: Runtime,
-    capabilities: Capabilities,
 }
 
 impl AgentType {
@@ -59,17 +56,8 @@ impl AgentType {
             agent_type_id: metadata,
             variables,
             runtime_config,
-            capabilities: default_capabilities(), // TODO: can capabilities be set in AgentTypeDefinition?
         }
     }
-
-    pub fn get_variables(&self) -> Variables {
-        self.variables.clone().flatten()
-    }
-
-    pub fn get_capabilities(&self) -> Capabilities {
-        self.capabilities
-    }
 }
 
 /// Flexible tree-like structure that contains variables definitions, that can later be changed by the end user via [`YAMLConfig`].
@@ -240,10 +228,6 @@ pub mod tests {
             build_agent_type(definition, environment).unwrap()
         }
 
-        pub fn set_capabilities(&mut self, capabilities: Capabilities) {
-            self.capabilities = capabilities
-        }
-
         /// Retrieve the `variables` field of the agent type at the specified key, if any.
         pub fn get_variable(self, path: String) -> Option<VariableDefinition> {
             self.variables.flatten().get(&path).cloned()
@@ -449,25 +433,22 @@ status_server_port: 8004
             input_agent_type.fill_variables(GIVEN_NEWRELIC_INFRA_USER_CONFIG_YAML);
 
         // Then, we expect the corresponding final values.
-        let expected_config_3: TrivialValue = HashMap::from([
+        let expected_config_3 = TrivialValue::MapStringString(HashMap::from([
             ("log_level".to_string(), "trace".to_string()),
             ("forward".to_string(), "true".to_string()),
-        ])
-        .into();
+        ]));
         // File with default
-        let expected_config_2: TrivialValue = FilePathWithContent::new(
+        let expected_config_2 = TrivialValue::File(FilePathWithContent::new(
             "config2.yml".into(),
             "license_key: abc123\nstaging: true\n".to_string(),
-        )
-        .into();
+        ));
         // File with values
-        let expected_config: TrivialValue = FilePathWithContent::new(
+        let expected_config = TrivialValue::File(FilePathWithContent::new(
             "config.yml".into(),
             "license_key: abc124\nstaging: false\n".to_string(),
-        )
-        .into();
+        ));
         // MapStringFile
-        let expected_integrations: TrivialValue = HashMap::from([
+        let expected_integrations = TrivialValue::MapStringFile(HashMap::from([
             (
                 "kafka.conf".to_string(),
                 FilePathWithContent::new(
@@ -479,10 +460,9 @@ status_server_port: 8004
                 "redis.yml".to_string(),
                 FilePathWithContent::new("integrations.d".into(), "user: redis\n".to_string()),
             ),
-        ])
-        .into();
+        ]));
         // Number
-        let expected_status_server: TrivialValue = Number::from(8004).into();
+        let expected_status_server = TrivialValue::Number(Number::from(8004));
 
         assert_eq!(
             expected_config_3,

agent-control/src/agent_type/runtime_config/restart_policy.rs

@@ -43,10 +43,6 @@ pub(super) const DEFAULT_BACKOFF_LAST_RETRY_INTERVAL: Duration = Duration::from_
 pub struct BackoffDelay(#[serde(deserialize_with = "deserialize_duration")] Duration);
 
 impl BackoffDelay {
-    pub fn new(value: Duration) -> Self {
-        Self(value)
-    }
-
     pub fn from_secs(value: u64) -> Self {
         Self(Duration::from_secs(value))
     }
@@ -57,10 +53,6 @@ impl BackoffDelay {
 pub struct BackoffLastRetryInterval(#[serde(deserialize_with = "deserialize_duration")] Duration);
 
 impl BackoffLastRetryInterval {
-    pub fn new(value: Duration) -> Self {
-        Self(value)
-    }
-
     pub fn from_secs(value: u64) -> Self {
         Self(Duration::from_secs(value))
     }

agent-control/src/agent_type/templates.rs

@@ -187,10 +187,12 @@ fn template_yaml_value_string(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::agent_type::variable::kind_value::KindValue;
+    use crate::agent_type::trivial_value::FilePathWithContent;
+    use crate::agent_type::variable::kind_value::{KindValue, KindValueWithPath};
     use assert_matches::assert_matches;
     use rstest::rstest;
     use serde_yaml::Number;
+    use std::collections::HashMap;
 
     #[rstest]
     #[case::multiline_indent_line("\nline1\nline2\n", "|indent 1", "\n line1\n line2\n ")]
@@ -739,4 +741,46 @@ mod tests {
             AgentTypeError::MissingTemplateKey(s) => s);
         assert_eq!("does.not.exists".to_string(), key);
     }
+
+    impl From<KindValue<String>> for Kind {
+        fn from(kind_value: KindValue<String>) -> Self {
+            Kind::String(kind_value)
+        }
+    }
+
+    impl From<KindValue<bool>> for Kind {
+        fn from(kind_value: KindValue<bool>) -> Self {
+            Kind::Bool(kind_value)
+        }
+    }
+
+    impl From<KindValue<Number>> for Kind {
+        fn from(kind_value: KindValue<Number>) -> Self {
+            Kind::Number(kind_value)
+        }
+    }
+
+    impl From<KindValueWithPath<FilePathWithContent>> for Kind {
+        fn from(kind_value: KindValueWithPath<FilePathWithContent>) -> Self {
+            Kind::File(kind_value)
+        }
+    }
+
+    impl From<KindValue<HashMap<String, String>>> for Kind {
+        fn from(kind_value: KindValue<HashMap<String, String>>) -> Self {
+            Kind::MapStringString(kind_value)
+        }
+    }
+
+    impl From<KindValueWithPath<HashMap<String, FilePathWithContent>>> for Kind {
+        fn from(kind_value: KindValueWithPath<HashMap<String, FilePathWithContent>>) -> Self {
+            Kind::MapStringFile(kind_value)
+        }
+    }
+
+    impl From<KindValue<serde_yaml::Value>> for Kind {
+        fn from(kind_value: KindValue<serde_yaml::Value>) -> Self {
+            Kind::Yaml(kind_value)
+        }
+    }
 }

agent-control/src/agent_type/trivial_value.rs

@@ -23,48 +23,6 @@ pub enum TrivialValue {
     MapStringFile(Map<String, FilePathWithContent>),
 }
 
-impl From<String> for TrivialValue {
-    fn from(s: String) -> Self {
-        TrivialValue::String(s)
-    }
-}
-
-impl From<FilePathWithContent> for TrivialValue {
-    fn from(file: FilePathWithContent) -> Self {
-        TrivialValue::File(file)
-    }
-}
-
-impl From<serde_yaml::Value> for TrivialValue {
-    fn from(yaml: serde_yaml::Value) -> Self {
-        TrivialValue::Yaml(yaml)
-    }
-}
-
-impl From<bool> for TrivialValue {
-    fn from(b: bool) -> Self {
-        TrivialValue::Bool(b)
-    }
-}
-
-impl From<serde_yaml::Number> for TrivialValue {
-    fn from(n: serde_yaml::Number) -> Self {
-        TrivialValue::Number(n)
-    }
-}
-
-impl From<Map<String, String>> for TrivialValue {
-    fn from(map: Map<String, String>) -> Self {
-        TrivialValue::MapStringString(map)
-    }
-}
-
-impl From<Map<String, FilePathWithContent>> for TrivialValue {
-    fn from(map: Map<String, FilePathWithContent>) -> Self {
-        TrivialValue::MapStringFile(map)
-    }
-}
-
 impl TrivialValue {
     /// If the trivial value is a yaml, it returns a copy the corresponding [serde_yaml::Value], returns None otherwise.
     pub fn to_yaml_value(&self) -> Option<serde_yaml::Value> {

agent-control/src/agent_type/variable/kind.rs

@@ -1,13 +1,10 @@
-use std::{collections::HashMap, path::PathBuf};
-
-use serde::{Deserialize, Serialize};
-
+use super::kind_value::{KindValue, KindValueWithPath};
 use crate::agent_type::{
     error::AgentTypeError,
     trivial_value::{FilePathWithContent, TrivialValue},
 };
-
-use super::kind_value::{KindValue, KindValueWithPath};
+use serde::{Deserialize, Serialize};
+use std::{collections::HashMap, path::PathBuf};
 
 #[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
 #[serde(tag = "type")]
@@ -28,49 +25,6 @@ pub enum Kind {
     Yaml(KindValue<serde_yaml::Value>),
 }
 
-/// Conversions from KindValue<T> to Kind
-impl From<KindValue<String>> for Kind {
-    fn from(kind_value: KindValue<String>) -> Self {
-        Kind::String(kind_value)
-    }
-}
-
-impl From<KindValue<bool>> for Kind {
-    fn from(kind_value: KindValue<bool>) -> Self {
-        Kind::Bool(kind_value)
-    }
-}
-
-impl From<KindValue<serde_yaml::Number>> for Kind {
-    fn from(kind_value: KindValue<serde_yaml::Number>) -> Self {
-        Kind::Number(kind_value)
-    }
-}
-
-impl From<KindValueWithPath<FilePathWithContent>> for Kind {
-    fn from(kind_value: KindValueWithPath<FilePathWithContent>) -> Self {
-        Kind::File(kind_value)
-    }
-}
-
-impl From<KindValue<HashMap<String, String>>> for Kind {
-    fn from(kind_value: KindValue<HashMap<String, String>>) -> Self {
-        Kind::MapStringString(kind_value)
-    }
-}
-
-impl From<KindValueWithPath<HashMap<String, FilePathWithContent>>> for Kind {
-    fn from(kind_value: KindValueWithPath<HashMap<String, FilePathWithContent>>) -> Self {
-        Kind::MapStringFile(kind_value)
-    }
-}
-
-impl From<KindValue<serde_yaml::Value>> for Kind {
-    fn from(kind_value: KindValue<serde_yaml::Value>) -> Self {
-        Kind::Yaml(kind_value)
-    }
-}
-
 /// The below methods are mostly concerned with delegating to the inner type on each `Kind` variant.
 /// It's a lot of boilerplate, but declarative and straight-forward.
 impl Kind {

agent-control/src/event.rs

@@ -50,10 +50,6 @@ impl SubAgentEvent {
     pub fn new_health(agent_identity: AgentIdentity, health: HealthWithStartTime) -> Self {
         Self::HealthUpdated(agent_identity, health)
     }
-
-    pub fn new_agent_started(agent_identity: AgentIdentity, started_time: SystemTime) -> Self {
-        Self::SubAgentStarted(agent_identity, started_time)
-    }
 }
 
 /// Defines internal events for the AgentControl component