feat: add new command to migrate onhost folders (#1815)

* feat: new command to migrate old folder to new ones

* fix command name and check logic

* simplify the check logic to check only for local paths

* fix more comments and simplify

* move from statics agents names to scrapping fleet/agents.d

Author: vjripoll

agent-control/src/agent_control/defaults.rs

@@ -48,12 +48,9 @@ cfg_if::cfg_if! {
     }
 }
 
-/// - **On-host**: Used as the directory name (e.g., `.../local-data/`).
+/// - **On-host**: Used as the directory name (e.g., `.../fleet-data/` or `.../local-data/`).
 /// - **k8s**: Used as a ConfigMap prefix, followed by a hyphen (e.g., `local-data-agentid`).
 pub const FOLDER_NAME_LOCAL_DATA: &str = "local-data";
-
-/// - **On-host**: Used as the directory name (e.g., `.../fleet-data/`).
-/// - **k8s**: Used as a ConfigMap prefix, followed by a hyphen (e.g., `fleet-data-agentid`).
 pub const FOLDER_NAME_FLEET_DATA: &str = "fleet-data";
 
 /// - **On-host**: Used as the base filename, combined with ".yaml" (e.g., `local_config.yaml`).

agent-control/src/bin/main_agent_control_onhost_cli.rs

@@ -1,6 +1,7 @@
 use std::process::ExitCode;
 
 use clap::{CommandFactory, Parser, error::ErrorKind};
+use newrelic_agent_control::cli::on_host::migrate_folders;
 use newrelic_agent_control::cli::on_host::{host_monitoring_gen, systemd_gen};
 use newrelic_agent_control::cli::{logs, on_host::config_gen};
 use tracing::{Level, error};
@@ -25,6 +26,8 @@ enum Commands {
     HostMonitoring(host_monitoring_gen::Args),
     // Generate systemd configuration according to the provided configuration data.
     SystemdConfig(systemd_gen::Args),
+    /// Migrate from the older on host folders to the new ones. DON'T USE IT
+    FilesBackwardsCompatibilityMigrationFromV120,
 }
 
 fn main() -> ExitCode {
@@ -49,6 +52,7 @@ fn main() -> ExitCode {
             host_monitoring_gen::generate_host_monitoring_config(args)
         }
         Commands::SystemdConfig(args) => systemd_gen::generate_systemd_config(args),
+        Commands::FilesBackwardsCompatibilityMigrationFromV120 => migrate_folders::migrate(),
     };
 
     if let Err(err) = result {

agent-control/src/cli/error.rs

@@ -1,8 +1,7 @@
 use std::process::ExitCode;
 
-use thiserror::Error;
-
 use crate::instrumentation::tracing::TracingError;
+use thiserror::Error;
 
 #[derive(Debug, Error)]
 pub enum CliError {
@@ -14,6 +13,9 @@ pub enum CliError {
 
     #[error("{0}")]
     Command(String),
+
+    #[error("File system error: {0}")]
+    FileSystemError(String),
 }
 
 impl From<CliError> for ExitCode {
@@ -29,6 +31,7 @@ impl From<CliError> for ExitCode {
             CliError::Precondition(_) => Self::from(69),
             CliError::Tracing(_) => Self::from(70),
             CliError::Command(_) => Self::from(1),
+            CliError::FileSystemError(_) => Self::from(1),
         }
     }
 }

agent-control/src/cli/on_host.rs

@@ -1,4 +1,4 @@
 pub mod config_gen;
-
 pub mod host_monitoring_gen;
+pub mod migrate_folders;
 pub mod systemd_gen;

agent-control/src/cli/on_host/host_monitoring_gen/infra_config_gen.rs

@@ -1,7 +1,5 @@
 use crate::agent_control::config_repository::store::AgentControlConfigStore;
-use crate::agent_control::defaults::{
-    AGENT_CONTROL_DATA_DIR, AGENT_CONTROL_LOCAL_DATA_DIR, SUB_AGENT_DIR,
-};
+use crate::agent_control::defaults::{AGENT_CONTROL_DATA_DIR, AGENT_CONTROL_LOCAL_DATA_DIR};
 use crate::agent_type::agent_type_id::AgentTypeID;
 use crate::cli::error::CliError;
 use crate::cli::on_host::config_gen::region::Region;
@@ -97,8 +95,7 @@ impl InfraConfigGenerator {
         };
 
         for (agent_id, _) in sub_agents_cfg.agents {
-            let infra_values_persister =
-                ValuesPersisterFile::new(self.local_dir.join(SUB_AGENT_DIR));
+            let infra_values_persister = ValuesPersisterFile::new(self.local_dir.clone());
             infra_values_persister
                 .persist_values_file(
                     &agent_id,
@@ -126,7 +123,7 @@ impl InfraConfigGenerator {
         let config_migrator = ConfigMigrator::new(
             ConfigConverter::default(),
             AgentConfigGetter::new(sa_local_config_loader),
-            ValuesPersisterFile::new(self.local_dir.join(SUB_AGENT_DIR)),
+            ValuesPersisterFile::new(self.local_dir.clone()),
         );
 
         let legacy_config_renamer = LegacyConfigRenamer::default();
@@ -169,7 +166,12 @@ impl InfraConfigGenerator {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::agent_control::defaults::{
+        AGENT_CONTROL_ID, FOLDER_NAME_LOCAL_DATA, STORE_KEY_LOCAL_DATA_CONFIG,
+    };
+    use crate::opamp::instance_id::on_host::storer::build_config_name;
     use std::fs;
+    use std::fs::create_dir_all;
     use tempfile::TempDir;
 
     const INITIAL_INFRA_CONFIG: &str = r#"
@@ -187,20 +189,27 @@ agents:
         agent_type: "newrelic/com.newrelic.infrastructure:0.1.0"
 "#;
 
-    const INFRA_AGENT_VALUES: &str = "fleet/agents.d/infra-test/values/values.yaml";
+    const INFRA_AGENT_VALUES: &str = "local-data/infra-test/local_config.yaml";
 
     #[cfg(target_family = "unix")] //TODO This should be removed when Windows support is added (DirectoryManager unimplemented)
     #[test]
     fn test_migrate_old_infra_config() {
         // Create a temporary directory
         let temp_dir = TempDir::new().unwrap();
         let infra_file_path = temp_dir.path().join("newrelic-infra.yml");
-        let agents_file_path = temp_dir.path().join("config.yaml");
-
+        let agents_file_path = temp_dir
+            .path()
+            .join(FOLDER_NAME_LOCAL_DATA)
+            .join(AGENT_CONTROL_ID);
+        create_dir_all(&agents_file_path).unwrap();
         // Emulate the existence of the file by creating it
         fs::write(&infra_file_path, INITIAL_INFRA_CONFIG).unwrap();
 
-        fs::write(&agents_file_path, AGENTS_CONFIG).unwrap();
+        fs::write(
+            agents_file_path.join(build_config_name(STORE_KEY_LOCAL_DATA_CONFIG)),
+            AGENTS_CONFIG,
+        )
+        .unwrap();
 
         // Format the string using dynamic file path
         let config_mapping = format!(
@@ -256,9 +265,17 @@ config_agent:
     #[test]
     fn test_generate_new_infra_config() {
         let temp_dir = TempDir::new().unwrap();
-        let agents_file_path = temp_dir.path().join("config.yaml");
-
-        fs::write(&agents_file_path, AGENTS_CONFIG).unwrap();
+        let agents_file_path = temp_dir
+            .path()
+            .join(FOLDER_NAME_LOCAL_DATA)
+            .join(AGENT_CONTROL_ID);
+        create_dir_all(&agents_file_path).unwrap();
+
+        fs::write(
+            agents_file_path.join(build_config_name(STORE_KEY_LOCAL_DATA_CONFIG)),
+            AGENTS_CONFIG,
+        )
+        .unwrap();
 
         let infra_config_generator = InfraConfigGenerator::new(
             temp_dir.path().to_path_buf(),

agent-control/src/cli/on_host/host_monitoring_gen/otel_config_gen.rs

@@ -1,4 +1,8 @@
+use crate::agent_control::defaults::{
+    AGENT_CONTROL_LOCAL_DATA_DIR, FOLDER_NAME_LOCAL_DATA, STORE_KEY_LOCAL_DATA_CONFIG,
+};
 use crate::cli::error::CliError;
+use crate::opamp::instance_id::on_host::storer::build_config_name;
 use std::path::PathBuf;
 use tracing::info;
 
@@ -11,9 +15,9 @@ pub struct OtelConfigGen {
 impl Default for OtelConfigGen {
     fn default() -> Self {
         Self {
-            otel_agent_values_path: PathBuf::from(
-                "/etc/newrelic-agent-control/fleet/agents.d/nrdot/values",
-            ),
+            otel_agent_values_path: PathBuf::from(AGENT_CONTROL_LOCAL_DATA_DIR)
+                .join(FOLDER_NAME_LOCAL_DATA)
+                .join("nrdot"),
             otel_config_source_path: PathBuf::from(
                 "/etc/newrelic-agent-control/examples/values-nr-otel-collector-agent-linux.yaml",
             ),
@@ -42,7 +46,9 @@ impl OtelConfigGen {
 
     fn modify_values_yaml(&self) -> Result<(), CliError> {
         let source_path = self.otel_config_source_path.clone();
-        let file_path = self.otel_agent_values_path.join("values.yaml");
+        let file_path = self
+            .otel_agent_values_path
+            .join(build_config_name(STORE_KEY_LOCAL_DATA_CONFIG));
         let content = std::fs::read_to_string(source_path)
             .map_err(|err| CliError::Command(format!("error reading otel values file: {err}")))?;
 
@@ -67,6 +73,8 @@ impl OtelConfigGen {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::agent_control::defaults::{FOLDER_NAME_LOCAL_DATA, STORE_KEY_LOCAL_DATA_CONFIG};
+    use crate::opamp::instance_id::on_host::storer::build_config_name;
     use std::fs;
     use std::io::Write;
     use tempfile::tempdir;
@@ -83,7 +91,7 @@ mod tests {
     #[test]
     fn test_generate_otel_config_creates_directories_and_copies_file() {
         let temp_dir = tempdir().unwrap();
-        let temp_values_dir = temp_dir.path().join("fleet/agents.d/nrdot/values");
+        let temp_values_dir = temp_dir.path().join(FOLDER_NAME_LOCAL_DATA).join("nrdot");
         let temp_example_file = temp_dir
             .path()
             .join("values-nr-otel-collector-agent-linux.yaml");
@@ -100,7 +108,7 @@ mod tests {
         assert!(result.is_ok());
         assert!(temp_values_dir.exists());
 
-        let values_file = temp_values_dir.join("values.yaml");
+        let values_file = temp_values_dir.join(build_config_name(STORE_KEY_LOCAL_DATA_CONFIG));
         let values_content = fs::read_to_string(&values_file).unwrap();
         assert!(values_content.contains("limit_mib: 100"));
         assert!(values_content.contains("OTHER_CONFIG: value"));