Cargo.lock

@@ -105,7 +105,7 @@ dependencies = [
  "futures-core",
  "futures-util",
  "mio 1.0.4",
- "socket2 0.5.10",
+ "socket2",
  "tokio",
  "tracing",
 ]
@@ -167,7 +167,7 @@ dependencies = [
  "serde_json",
  "serde_urlencoded",
  "smallvec",
- "socket2 0.5.10",
+ "socket2",
  "time",
  "tracing",
  "url",
@@ -2178,6 +2178,7 @@ dependencies = [
  "serde",
  "serde_json",
  "sysinfo",
+ "uuid",
 ]
 
 [[package]]

harmony_inventory_agent/Cargo.toml

@@ -10,3 +10,4 @@ serde.workspace = true
 serde_json.workspace = true
 log.workspace = true
 env_logger.workspace = true
+uuid.workspace = true

harmony_inventory_agent/src/hwinfo.rs

@@ -1,4 +1,3 @@
-use log::debug;
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 use std::fs;
@@ -84,108 +83,27 @@ pub struct ManagementInterface {
 }
 
 impl PhysicalHost {
-    pub fn gather() -> Result<Self, String> {
+    pub fn gather() -> Self {
         let mut sys = System::new_all();
         sys.refresh_all();
 
-        Self::all_tools_available()?;
+        Self {
-
+            storage_drives: Self::gather_storage_drives(),
-        Ok(Self {
+            storage_controller: Self::gather_storage_controller(),
-            storage_drives: Self::gather_storage_drives()?,
+            memory_modules: Self::gather_memory_modules(),
-            storage_controller: Self::gather_storage_controller()?,
+            cpus: Self::gather_cpus(&sys),
-            memory_modules: Self::gather_memory_modules()?,
+            chipset: Self::gather_chipset(),
-            cpus: Self::gather_cpus(&sys)?,
+            network_interfaces: Self::gather_network_interfaces(),
-            chipset: Self::gather_chipset()?,
+            management_interface: Self::gather_management_interface(),
-            network_interfaces: Self::gather_network_interfaces()?,
+            host_uuid: Self::get_host_uuid(),
-            management_interface: Self::gather_management_interface()?,
-            host_uuid: Self::get_host_uuid()?,
-        })
-    }
-
-    fn all_tools_available() -> Result<(), String> {
-        let required_tools = [
-            ("lsblk", "--version"),
-            ("lspci", "--version"),
-            ("lsmod", "--version"),
-            ("dmidecode", "--version"),
-            ("smartctl", "--version"),
-            ("ip", "route"), // No version flag available
-        ];
-
-        let mut missing_tools = Vec::new();
-
-        for (tool, tool_arg) in required_tools.iter() {
-            // First check if tool exists in PATH using which(1)
-            let exists = if let Ok(output) = Command::new("which").arg(tool).output() {
-                output.status.success()
-            } else {
-                // Fallback: manual PATH search if which(1) is unavailable
-                if let Ok(path_var) = std::env::var("PATH") {
-                    path_var.split(':').any(|dir| {
-                        let tool_path = std::path::Path::new(dir).join(tool);
-                        tool_path.exists() && Self::is_executable(&tool_path)
-                    })
-                } else {
-                    false
-                }
-            };
-
-            if !exists {
-                missing_tools.push(*tool);
-                continue;
-            }
-
-            // Verify tool is functional by checking version/help output
-            let mut cmd = Command::new(tool);
-            cmd.arg(tool_arg);
-            cmd.stdout(std::process::Stdio::null());
-            cmd.stderr(std::process::Stdio::null());
-
-            if let Ok(status) = cmd.status() {
-                if !status.success() {
-                    missing_tools.push(*tool);
-                }
-            } else {
-                missing_tools.push(*tool);
-            }
-        }
-
-        if !missing_tools.is_empty() {
-            let missing_str = missing_tools
-                .iter()
-                .map(|s| s.to_string())
-                .collect::<Vec<String>>()
-                .join(", ");
-            return Err(format!(
-                "The following required tools are not available: {}. Please install these tools to use PhysicalHost::gather()",
-                missing_str
-            ));
-        }
-
-        Ok(())
-    }
-
-    #[cfg(unix)]
-    fn is_executable(path: &std::path::Path) -> bool {
-        use std::os::unix::fs::PermissionsExt;
-
-        match std::fs::metadata(path) {
-            Ok(meta) => meta.permissions().mode() & 0o111 != 0,
-            Err(_) => false,
         }
     }
 
-    #[cfg(not(unix))]
+    fn gather_storage_drives() -> Vec<StorageDrive> {
-    fn is_executable(_path: &std::path::Path) -> bool {
-        // On non-Unix systems, we assume existence implies executability
-        true
-    }
-
-    fn gather_storage_drives() -> Result<Vec<StorageDrive>, String> {
         let mut drives = Vec::new();
 
         // Use lsblk with JSON output for robust parsing
-        let output = Command::new("lsblk")
+        if let Ok(output) = Command::new("lsblk")
             .args([
                 "-d",
                 "-o",
@@ -196,165 +114,132 @@ impl PhysicalHost {
                 "--json",
             ])
             .output()
-            .map_err(|e| format!("Failed to execute lsblk: {}", e))?;
+            && output.status.success()
+            && let Ok(json) = serde_json::from_slice::<Value>(&output.stdout)
+            && let Some(blockdevices) = json.get("blockdevices").and_then(|v| v.as_array())
+        {
+            for device in blockdevices {
+                let name = device
+                    .get("name")
+                    .and_then(|v| v.as_str())
+                    .unwrap_or("")
+                    .to_string();
+                if name.is_empty() {
+                    continue;
+                }
 
-        if !output.status.success() {
+                let model = device
-            return Err(format!(
+                    .get("model")
-                "lsblk command failed: {}",
+                    .and_then(|v| v.as_str())
-                String::from_utf8_lossy(&output.stderr)
+                    .map(|s| s.trim().to_string())
-            ));
+                    .unwrap_or_default();
+
+                let serial = device
+                    .get("serial")
+                    .and_then(|v| v.as_str())
+                    .map(|s| s.trim().to_string())
+                    .unwrap_or_default();
+
+                let size_str = device.get("size").and_then(|v| v.as_str()).unwrap_or("0");
+                let size_bytes = Self::parse_size(size_str).unwrap_or(0);
+
+                let rotational = device
+                    .get("rota")
+                    .and_then(|v| v.as_bool())
+                    .unwrap_or(false);
+
+                let wwn = device
+                    .get("wwn")
+                    .and_then(|v| v.as_str())
+                    .map(|s| s.trim().to_string())
+                    .filter(|s| !s.is_empty() && s != "null");
+
+                let device_path = Path::new("/sys/block").join(&name);
+
+                let mut drive = StorageDrive {
+                    name: name.clone(),
+                    model,
+                    serial,
+                    size_bytes,
+                    logical_block_size: Self::read_sysfs_u32(
+                        &device_path.join("queue/logical_block_size"),
+                    )
+                    .unwrap_or(512),
+                    physical_block_size: Self::read_sysfs_u32(
+                        &device_path.join("queue/physical_block_size"),
+                    )
+                    .unwrap_or(512),
+                    rotational,
+                    wwn,
+                    interface_type: Self::get_interface_type(&name, &device_path),
+                    smart_status: Self::get_smart_status(&name),
+                };
+
+                // Enhance with additional sysfs info if available
+                if device_path.exists() {
+                    if drive.model.is_empty() {
+                        drive.model = Self::read_sysfs_string(&device_path.join("device/model"));
+                    }
+                    if drive.serial.is_empty() {
+                        drive.serial = Self::read_sysfs_string(&device_path.join("device/serial"));
+                    }
+                }
+
+                drives.push(drive);
+            }
         }
 
-        let json: Value = serde_json::from_slice(&output.stdout)
+        drives
-            .map_err(|e| format!("Failed to parse lsblk JSON output: {}", e))?;
-
-        let blockdevices = json
-            .get("blockdevices")
-            .and_then(|v| v.as_array())
-            .ok_or("Invalid lsblk JSON: missing 'blockdevices' array")?;
-
-        for device in blockdevices {
-            let name = device
-                .get("name")
-                .and_then(|v| v.as_str())
-                .ok_or("Missing 'name' in lsblk device")?
-                .to_string();
-
-            if name.is_empty() {
-                continue;
-            }
-
-            let model = device
-                .get("model")
-                .and_then(|v| v.as_str())
-                .map(|s| s.trim().to_string())
-                .unwrap_or_default();
-
-            let serial = device
-                .get("serial")
-                .and_then(|v| v.as_str())
-                .map(|s| s.trim().to_string())
-                .unwrap_or_default();
-
-            let size_str = device
-                .get("size")
-                .and_then(|v| v.as_str())
-                .ok_or("Missing 'size' in lsblk device")?;
-            let size_bytes = Self::parse_size(size_str)?;
-
-            let rotational = device
-                .get("rota")
-                .and_then(|v| v.as_bool())
-                .ok_or("Missing 'rota' in lsblk device")?;
-
-            let wwn = device
-                .get("wwn")
-                .and_then(|v| v.as_str())
-                .map(|s| s.trim().to_string())
-                .filter(|s| !s.is_empty() && s != "null");
-
-            let device_path = Path::new("/sys/block").join(&name);
-
-            let logical_block_size = Self::read_sysfs_u32(
-                &device_path.join("queue/logical_block_size"),
-            )
-            .map_err(|e| format!("Failed to read logical block size for {}: {}", name, e))?;
-
-            let physical_block_size = Self::read_sysfs_u32(
-                &device_path.join("queue/physical_block_size"),
-            )
-            .map_err(|e| format!("Failed to read physical block size for {}: {}", name, e))?;
-
-            let interface_type = Self::get_interface_type(&name, &device_path)?;
-            let smart_status = Self::get_smart_status(&name)?;
-
-            let mut drive = StorageDrive {
-                name: name.clone(),
-                model,
-                serial,
-                size_bytes,
-                logical_block_size,
-                physical_block_size,
-                rotational,
-                wwn,
-                interface_type,
-                smart_status,
-            };
-
-            // Enhance with additional sysfs info if available
-            if device_path.exists() {
-                if drive.model.is_empty() {
-                    drive.model = Self::read_sysfs_string(&device_path.join("device/model"))
-                        .map_err(|e| format!("Failed to read model for {}: {}", name, e))?;
-                }
-                if drive.serial.is_empty() {
-                    drive.serial = Self::read_sysfs_string(&device_path.join("device/serial"))
-                        .map_err(|e| format!("Failed to read serial for {}: {}", name, e))?;
-                }
-            }
-
-            drives.push(drive);
-        }
-
-        Ok(drives)
     }
 
-    fn gather_storage_controller() -> Result<StorageController, String> {
+    fn gather_storage_controller() -> StorageController {
         let mut controller = StorageController {
             name: "Unknown".to_string(),
             driver: "Unknown".to_string(),
         };
 
         // Use lspci with JSON output if available
-        let output = Command::new("lspci")
+        if let Ok(output) = Command::new("lspci")
             .args(["-nn", "-d", "::0100", "-J"]) // Storage controllers class with JSON
             .output()
-            .map_err(|e| format!("Failed to execute lspci: {}", e))?;
+            && output.status.success()
-
+            && let Ok(json) = serde_json::from_slice::<Value>(&output.stdout)
-        if output.status.success() {
+            && let Some(devices) = json.as_array()
-            let json: Value = serde_json::from_slice(&output.stdout)
+        {
-                .map_err(|e| format!("Failed to parse lspci JSON output: {}", e))?;
+            for device in devices {
-
+                if let Some(device_info) = device.as_object()
-            if let Some(devices) = json.as_array() {
+                    && let Some(name) = device_info
-                for device in devices {
+                        .get("device")
-                    if let Some(device_info) = device.as_object()
+                        .and_then(|v| v.as_object())
-                        && let Some(name) = device_info
+                        .and_then(|v| v.get("name"))
-                            .get("device")
+                        .and_then(|v| v.as_str())
-                            .and_then(|v| v.as_object())
+                {
-                            .and_then(|v| v.get("name"))
+                    controller.name = name.to_string();
-                            .and_then(|v| v.as_str())
+                    break;
-                    {
-                        controller.name = name.to_string();
-                        break;
-                    }
                 }
             }
         }
 
-        // Fallback to text output if JSON fails or no device found
+        // Fallback to text output if JSON fails
-        if controller.name == "Unknown" {
+        if controller.name == "Unknown"
-            let output = Command::new("lspci")
+            && let Ok(output) = Command::new("lspci")
                 .args(["-nn", "-d", "::0100"]) // Storage controllers class
                 .output()
-                .map_err(|e| format!("Failed to execute lspci (fallback): {}", e))?;
+            && output.status.success()
-
+        {
-            if output.status.success() {
+            let output_str = String::from_utf8_lossy(&output.stdout);
-                let output_str = String::from_utf8_lossy(&output.stdout);
+            if let Some(line) = output_str.lines().next() {
-                if let Some(line) = output_str.lines().next() {
+                let parts: Vec<&str> = line.split(':').collect();
-                    let parts: Vec<&str> = line.split(':').collect();
+                if parts.len() > 2 {
-                    if parts.len() > 2 {
+                    controller.name = parts[2].trim().to_string();
-                        controller.name = parts[2].trim().to_string();
-                    }
                 }
             }
         }
 
         // Try to get driver info from lsmod
-        let output = Command::new("lsmod")
+        if let Ok(output) = Command::new("lsmod").output()
-            .output()
+            && output.status.success()
-            .map_err(|e| format!("Failed to execute lsmod: {}", e))?;
+        {
-
-        if output.status.success() {
             let output_str = String::from_utf8_lossy(&output.stdout);
             for line in output_str.lines() {
                 if line.contains("ahci")
@@ -371,78 +256,67 @@ impl PhysicalHost {
             }
         }
 
-        Ok(controller)
+        controller
     }
 
-    fn gather_memory_modules() -> Result<Vec<MemoryModule>, String> {
+    fn gather_memory_modules() -> Vec<MemoryModule> {
         let mut modules = Vec::new();
 
-        let output = Command::new("dmidecode")
+        if let Ok(output) = Command::new("dmidecode").arg("--type").arg("17").output()
-            .arg("--type")
+            && output.status.success()
-            .arg("17")
+        {
-            .output()
+            let output_str = String::from_utf8_lossy(&output.stdout);
-            .map_err(|e| format!("Failed to execute dmidecode: {}", e))?;
+            let sections: Vec<&str> = output_str.split("Memory Device").collect();
 
-        if !output.status.success() {
+            for section in sections.into_iter().skip(1) {
-            return Err(format!(
+                let mut module = MemoryModule {
-                "dmidecode command failed: {}",
+                    size_bytes: 0,
-                String::from_utf8_lossy(&output.stderr)
+                    speed_mhz: None,
-            ));
+                    manufacturer: None,
-        }
+                    part_number: None,
+                    serial_number: None,
+                    rank: None,
+                };
 
-        let output_str = String::from_utf8(output.stdout)
+                for line in section.lines() {
-            .map_err(|e| format!("Failed to parse dmidecode output: {}", e))?;
+                    let line = line.trim();
-
+                    if let Some(size_str) = line.strip_prefix("Size: ") {
-        let sections: Vec<&str> = output_str.split("Memory Device").collect();
+                        if size_str != "No Module Installed"
-
+                            && let Some((num, unit)) = size_str.split_once(' ')
-        for section in sections.into_iter().skip(1) {
+                            && let Ok(num) = num.parse::<u64>()
-            let mut module = MemoryModule {
+                        {
-                size_bytes: 0,
+                            module.size_bytes = match unit {
-                speed_mhz: None,
+                                "MB" => num * 1024 * 1024,
-                manufacturer: None,
+                                "GB" => num * 1024 * 1024 * 1024,
-                part_number: None,
+                                "KB" => num * 1024,
-                serial_number: None,
+                                _ => 0,
-                rank: None,
+                            };
-            };
+                        }
-
+                    } else if let Some(speed_str) = line.strip_prefix("Speed: ") {
-            for line in section.lines() {
+                        if let Some((num, _unit)) = speed_str.split_once(' ') {
-                let line = line.trim();
+                            module.speed_mhz = num.parse().ok();
-                if let Some(size_str) = line.strip_prefix("Size: ") {
+                        }
-                    if size_str != "No Module Installed"
+                    } else if let Some(man) = line.strip_prefix("Manufacturer: ") {
-                        && let Some((num, unit)) = size_str.split_once(' ')
+                        module.manufacturer = Some(man.to_string());
-                        && let Ok(num) = num.parse::<u64>()
+                    } else if let Some(part) = line.strip_prefix("Part Number: ") {
-                    {
+                        module.part_number = Some(part.to_string());
-                        module.size_bytes = match unit {
+                    } else if let Some(serial) = line.strip_prefix("Serial Number: ") {
-                            "MB" => num * 1024 * 1024,
+                        module.serial_number = Some(serial.to_string());
-                            "GB" => num * 1024 * 1024 * 1024,
+                    } else if let Some(rank) = line.strip_prefix("Rank: ") {
-                            "KB" => num * 1024,
+                        module.rank = rank.parse().ok();
-                            _ => 0,
-                        };
                     }
-                } else if let Some(speed_str) = line.strip_prefix("Speed: ") {
+                }
-                    if let Some((num, _unit)) = speed_str.split_once(' ') {
+
-                        module.speed_mhz = num.parse().ok();
+                if module.size_bytes > 0 {
-                    }
+                    modules.push(module);
-                } else if let Some(man) = line.strip_prefix("Manufacturer: ") {
-                    module.manufacturer = Some(man.to_string());
-                } else if let Some(part) = line.strip_prefix("Part Number: ") {
-                    module.part_number = Some(part.to_string());
-                } else if let Some(serial) = line.strip_prefix("Serial Number: ") {
-                    module.serial_number = Some(serial.to_string());
-                } else if let Some(rank) = line.strip_prefix("Rank: ") {
-                    module.rank = rank.parse().ok();
                 }
             }
-
-            if module.size_bytes > 0 {
-                modules.push(module);
-            }
         }
 
-        Ok(modules)
+        modules
     }
 
-    fn gather_cpus(sys: &System) -> Result<Vec<CPU>, String> {
+    fn gather_cpus(sys: &System) -> Vec<CPU> {
         let mut cpus = Vec::new();
         let global_cpu = sys.global_cpu_info();
 
@@ -454,310 +328,201 @@ impl PhysicalHost {
             frequency_mhz: global_cpu.frequency(),
         });
 
-        Ok(cpus)
+        cpus
     }
 
-    fn gather_chipset() -> Result<Chipset, String> {
+    fn gather_chipset() -> Chipset {
-        Ok(Chipset {
+        Chipset {
-            name: Self::read_dmi("baseboard-product-name")?,
+            name: Self::read_dmi("board-product-name").unwrap_or_else(|| "Unknown".to_string()),
-            vendor: Self::read_dmi("baseboard-manufacturer")?,
+            vendor: Self::read_dmi("board-manufacturer").unwrap_or_else(|| "Unknown".to_string()),
-        })
+        }
     }
 
-    fn gather_network_interfaces() -> Result<Vec<NetworkInterface>, String> {
+    fn gather_network_interfaces() -> Vec<NetworkInterface> {
         let mut interfaces = Vec::new();
         let sys_net_path = Path::new("/sys/class/net");
 
-        let entries = fs::read_dir(sys_net_path)
+        if let Ok(entries) = fs::read_dir(sys_net_path) {
-            .map_err(|e| format!("Failed to read /sys/class/net: {}", e))?;
+            for entry in entries.flatten() {
+                let iface_name = entry.file_name().into_string().unwrap_or_default();
+                let iface_path = entry.path();
 
-        for entry in entries {
+                // Skip virtual interfaces
-            let entry = entry.map_err(|e| format!("Failed to read directory entry: {}", e))?;
+                if iface_name.starts_with("lo")
-            let iface_name = entry
+                    || iface_name.starts_with("docker")
-                .file_name()
+                    || iface_name.starts_with("virbr")
-                .into_string()
+                    || iface_name.starts_with("veth")
-                .map_err(|_| "Invalid UTF-8 in interface name")?;
+                    || iface_name.starts_with("br-")
-            let iface_path = entry.path();
+                    || iface_name.starts_with("tun")
-
+                    || iface_name.starts_with("wg")
-            // Skip virtual interfaces
+                {
-            if iface_name.starts_with("lo")
+                    continue;
-                || iface_name.starts_with("docker")
-                || iface_name.starts_with("virbr")
-                || iface_name.starts_with("veth")
-                || iface_name.starts_with("br-")
-                || iface_name.starts_with("tun")
-                || iface_name.starts_with("wg")
-            {
-                continue;
-            }
-
-            // Check if it's a physical interface by looking for device directory
-            if !iface_path.join("device").exists() {
-                continue;
-            }
-
-            let mac_address = Self::read_sysfs_string(&iface_path.join("address"))
-                .map_err(|e| format!("Failed to read MAC address for {}: {}", iface_name, e))?;
-
-            let speed_mbps = if iface_path.join("speed").exists() {
-                match Self::read_sysfs_u32(&iface_path.join("speed")) {
-                    Ok(speed) => Some(speed),
-                    Err(e) => {
-                        debug!(
-                            "Failed to read speed for {}: {} . This is expected to fail on wifi interfaces.",
-                            iface_name, e
-                        );
-                        None
-                    }
                 }
-            } else {
-                None
-            };
 
-            let operstate = Self::read_sysfs_string(&iface_path.join("operstate"))
+                // Check if it's a physical interface by looking for device directory
-                .map_err(|e| format!("Failed to read operstate for {}: {}", iface_name, e))?;
+                if !iface_path.join("device").exists() {
+                    continue;
+                }
 
-            let mtu = Self::read_sysfs_u32(&iface_path.join("mtu"))
+                let mac_address = Self::read_sysfs_string(&iface_path.join("address"));
-                .map_err(|e| format!("Failed to read MTU for {}: {}", iface_name, e))?;
+                let speed_mbps = Self::read_sysfs_u32(&iface_path.join("speed"));
+                let operstate = Self::read_sysfs_string(&iface_path.join("operstate"));
+                let mtu = Self::read_sysfs_u32(&iface_path.join("mtu")).unwrap_or(1500);
+                let driver = Self::read_sysfs_string(&iface_path.join("device/driver/module"));
+                let firmware_version =
+                    Self::read_sysfs_opt_string(&iface_path.join("device/firmware_version"));
 
-            let driver =
+                // Get IP addresses using ip command with JSON output
-                Self::read_sysfs_symlink_basename(&iface_path.join("device/driver/module"))
+                let (ipv4_addresses, ipv6_addresses) = Self::get_interface_ips_json(&iface_name);
-                    .map_err(|e| format!("Failed to read driver for {}: {}", iface_name, e))?;
 
-            let firmware_version = Self::read_sysfs_opt_string(
+                interfaces.push(NetworkInterface {
-                &iface_path.join("device/firmware_version"),
+                    name: iface_name,
-            )
+                    mac_address,
-            .map_err(|e| format!("Failed to read firmware version for {}: {}", iface_name, e))?;
+                    speed_mbps,
-
+                    is_up: operstate == "up",
-            // Get IP addresses using ip command with JSON output
+                    mtu,
-            let (ipv4_addresses, ipv6_addresses) = Self::get_interface_ips_json(&iface_name)
+                    ipv4_addresses,
-                .map_err(|e| format!("Failed to get IP addresses for {}: {}", iface_name, e))?;
+                    ipv6_addresses,
-
+                    driver,
-            interfaces.push(NetworkInterface {
+                    firmware_version,
-                name: iface_name,
+                });
-                mac_address,
+            }
-                speed_mbps,
-                is_up: operstate == "up",
-                mtu,
-                ipv4_addresses,
-                ipv6_addresses,
-                driver,
-                firmware_version,
-            });
         }
 
-        Ok(interfaces)
+        interfaces
     }
 
-    fn gather_management_interface() -> Result<Option<ManagementInterface>, String> {
+    fn gather_management_interface() -> Option<ManagementInterface> {
+        // Try to detect common management interfaces
         if Path::new("/dev/ipmi0").exists() {
-            Ok(Some(ManagementInterface {
+            Some(ManagementInterface {
                 kind: "IPMI".to_string(),
                 address: None,
-                firmware: Some(Self::read_dmi("bios-version")?),
+                firmware: Self::read_dmi("bios-version"),
-            }))
+            })
         } else if Path::new("/sys/class/misc/mei").exists() {
-            Ok(Some(ManagementInterface {
+            Some(ManagementInterface {
                 kind: "Intel ME".to_string(),
                 address: None,
                 firmware: None,
-            }))
+            })
         } else {
-            Ok(None)
+            None
         }
     }
 
-    fn get_host_uuid() -> Result<String, String> {
+    fn get_host_uuid() -> String {
-        Self::read_dmi("system-uuid")
+        Self::read_dmi("system-uuid").unwrap()
     }
 
     // Helper methods
-    fn read_sysfs_string(path: &Path) -> Result<String, String> {
+    fn read_sysfs_string(path: &Path) -> String {
         fs::read_to_string(path)
-            .map(|s| s.trim().to_string())
+            .unwrap_or_default()
-            .map_err(|e| format!("Failed to read {}: {}", path.display(), e))
-    }
-
-    fn read_sysfs_opt_string(path: &Path) -> Result<Option<String>, String> {
-        match fs::read_to_string(path) {
-            Ok(s) => {
-                let s = s.trim().to_string();
-                Ok(if s.is_empty() { None } else { Some(s) })
-            }
-            Err(e) if e.kind() == std::io::ErrorKind::NotFound => Ok(None),
-            Err(e) => Err(format!("Failed to read {}: {}", path.display(), e)),
-        }
-    }
-
-    fn read_sysfs_u32(path: &Path) -> Result<u32, String> {
-        fs::read_to_string(path)
-            .map_err(|e| format!("Failed to read {}: {}", path.display(), e))?
             .trim()
-            .parse()
+            .to_string()
-            .map_err(|e| format!("Failed to parse {}: {}", path.display(), e))
     }
 
-    fn read_sysfs_symlink_basename(path: &Path) -> Result<String, String> {
+    fn read_sysfs_opt_string(path: &Path) -> Option<String> {
-        match fs::read_link(path) {
+        fs::read_to_string(path)
-            Ok(target_path) => match target_path.file_name() {
+            .ok()
-                Some(name_osstr) => match name_osstr.to_str() {
+            .map(|s| s.trim().to_string())
-                    Some(name_str) => Ok(name_str.to_string()),
+            .filter(|s| !s.is_empty())
-                    None => Err(format!(
-                        "Symlink target basename is not valid UTF-8: {}",
-                        target_path.display()
-                    )),
-                },
-                None => Err(format!(
-                    "Symlink target has no basename: {} -> {}",
-                    path.display(),
-                    target_path.display()
-                )),
-            },
-            Err(e) if e.kind() == std::io::ErrorKind::NotFound => Err(format!(
-                "Could not resolve symlink for path : {}",
-                path.display()
-            )),
-            Err(e) => Err(format!("Failed to read symlink {}: {}", path.display(), e)),
-        }
     }
 
-    fn read_dmi(field: &str) -> Result<String, String> {
+    fn read_sysfs_u32(path: &Path) -> Option<u32> {
-        let output = Command::new("dmidecode")
+        fs::read_to_string(path)
+            .ok()
+            .and_then(|s| s.trim().parse().ok())
+    }
+
+    fn read_dmi(field: &str) -> Option<String> {
+        Command::new("dmidecode")
             .arg("-s")
             .arg(field)
             .output()
-            .map_err(|e| format!("Failed to execute dmidecode for field {}: {}", field, e))?;
+            .ok()
-
+            .filter(|output| output.status.success())
-        if !output.status.success() {
+            .and_then(|output| String::from_utf8(output.stdout).ok())
-            return Err(format!(
-                "dmidecode command failed for field {}: {}",
-                field,
-                String::from_utf8_lossy(&output.stderr)
-            ));
-        }
-
-        String::from_utf8(output.stdout)
             .map(|s| s.trim().to_string())
-            .map_err(|e| {
+            .filter(|s| !s.is_empty())
-                format!(
-                    "Failed to parse dmidecode output for field {}: {}",
-                    field, e
-                )
-            })
     }
 
-    fn get_interface_type(device_name: &str, device_path: &Path) -> Result<String, String> {
+    fn get_interface_type(device_name: &str, device_path: &Path) -> String {
         if device_name.starts_with("nvme") {
-            Ok("NVMe".to_string())
+            "NVMe".to_string()
         } else if device_name.starts_with("sd") {
-            Ok("SATA".to_string())
+            "SATA".to_string()
         } else if device_name.starts_with("hd") {
-            Ok("IDE".to_string())
+            "IDE".to_string()
         } else if device_name.starts_with("vd") {
-            Ok("VirtIO".to_string())
+            "VirtIO".to_string()
         } else {
             // Try to determine from device path
-            let subsystem = Self::read_sysfs_string(&device_path.join("device/subsystem"))?;
+            Self::read_sysfs_string(&device_path.join("device/subsystem"))
-            Ok(subsystem
                 .split('/')
                 .next_back()
                 .unwrap_or("Unknown")
-                .to_string())
+                .to_string()
         }
     }
 
-    fn get_smart_status(device_name: &str) -> Result<Option<String>, String> {
+    fn get_smart_status(device_name: &str) -> Option<String> {
-        let output = Command::new("smartctl")
+        Command::new("smartctl")
             .arg("-H")
             .arg(format!("/dev/{}", device_name))
             .output()
-            .map_err(|e| format!("Failed to execute smartctl for {}: {}", device_name, e))?;
+            .ok()
-
+            .filter(|output| output.status.success())
-        if !output.status.success() {
+            .and_then(|output| String::from_utf8(output.stdout).ok())
-            return Ok(None);
+            .and_then(|s| {
-        }
+                s.lines()
-
+                    .find(|line| line.contains("SMART overall-health self-assessment"))
-        let stdout = String::from_utf8(output.stdout)
+                    .and_then(|line| line.split(':').nth(1))
-            .map_err(|e| format!("Failed to parse smartctl output for {}: {}", device_name, e))?;
+                    .map(|s| s.trim().to_string())
-
+            })
-        for line in stdout.lines() {
-            if line.contains("SMART overall-health self-assessment") {
-                if let Some(status) = line.split(':').nth(1) {
-                    return Ok(Some(status.trim().to_string()));
-                }
-            }
-        }
-
-        Ok(None)
     }
 
-    fn parse_size(size_str: &str) -> Result<u64, String> {
+    fn parse_size(size_str: &str) -> Option<u64> {
-        debug!("Parsing size_str '{size_str}'");
-        let size;
         if size_str.ends_with('T') {
-            size = size_str[..size_str.len() - 1]
+            size_str[..size_str.len() - 1]
-                .parse::<f64>()
+                .parse::<u64>()
-                .map(|t| t * 1024.0 * 1024.0 * 1024.0 * 1024.0)
+                .ok()
-                .map_err(|e| format!("Failed to parse T size '{}': {}", size_str, e))
+                .map(|t| t * 1024 * 1024 * 1024 * 1024)
         } else if size_str.ends_with('G') {
-            size = size_str[..size_str.len() - 1]
+            size_str[..size_str.len() - 1]
-                .parse::<f64>()
+                .parse::<u64>()
-                .map(|g| g * 1024.0 * 1024.0 * 1024.0)
+                .ok()
-                .map_err(|e| format!("Failed to parse G size '{}': {}", size_str, e))
+                .map(|g| g * 1024 * 1024 * 1024)
         } else if size_str.ends_with('M') {
-            size = size_str[..size_str.len() - 1]
+            size_str[..size_str.len() - 1]
-                .parse::<f64>()
+                .parse::<u64>()
-                .map(|m| m * 1024.0 * 1024.0)
+                .ok()
-                .map_err(|e| format!("Failed to parse M size '{}': {}", size_str, e))
+                .map(|m| m * 1024 * 1024)
         } else if size_str.ends_with('K') {
-            size = size_str[..size_str.len() - 1]
+            size_str[..size_str.len() - 1]
-                .parse::<f64>()
+                .parse::<u64>()
-                .map(|k| k * 1024.0)
+                .ok()
-                .map_err(|e| format!("Failed to parse K size '{}': {}", size_str, e))
+                .map(|k| k * 1024)
         } else if size_str.ends_with('B') {
-            size = size_str[..size_str.len() - 1]
+            size_str[..size_str.len() - 1].parse::<u64>().ok()
-                .parse::<f64>()
-                .map_err(|e| format!("Failed to parse B size '{}': {}", size_str, e))
         } else {
-            size = size_str
+            size_str.parse::<u64>().ok()
-                .parse::<f64>()
-                .map_err(|e| format!("Failed to parse size '{}': {}", size_str, e))
         }
-
-        size.map(|s| s as u64)
     }
 
-    fn get_interface_ips_json(iface_name: &str) -> Result<(Vec<String>, Vec<String>), String> {
+    fn get_interface_ips_json(iface_name: &str) -> (Vec<String>, Vec<String>) {
         let mut ipv4 = Vec::new();
         let mut ipv6 = Vec::new();
 
         // Get IPv4 addresses using JSON output
-        let output = Command::new("ip")
+        if let Ok(output) = Command::new("ip")
             .args(["-j", "-4", "addr", "show", iface_name])
             .output()
-            .map_err(|e| {
+            && output.status.success()
-                format!(
+            && let Ok(json) = serde_json::from_slice::<Value>(&output.stdout)
-                    "Failed to execute ip command for IPv4 on {}: {}",
+            && let Some(addrs) = json.as_array()
-                    iface_name, e
+        {
-                )
-            })?;
-
-        if !output.status.success() {
-            return Err(format!(
-                "ip command for IPv4 on {} failed: {}",
-                iface_name,
-                String::from_utf8_lossy(&output.stderr)
-            ));
-        }
-
-        let json: Value = serde_json::from_slice(&output.stdout).map_err(|e| {
-            format!(
-                "Failed to parse ip JSON output for IPv4 on {}: {}",
-                iface_name, e
-            )
-        })?;
-
-        if let Some(addrs) = json.as_array() {
             for addr_info in addrs {
                 if let Some(addr_info_obj) = addr_info.as_object()
                     && let Some(addr_info) =
@@ -775,32 +540,13 @@ impl PhysicalHost {
         }
 
         // Get IPv6 addresses using JSON output
-        let output = Command::new("ip")
+        if let Ok(output) = Command::new("ip")
             .args(["-j", "-6", "addr", "show", iface_name])
             .output()
-            .map_err(|e| {
+            && output.status.success()
-                format!(
+            && let Ok(json) = serde_json::from_slice::<Value>(&output.stdout)
-                    "Failed to execute ip command for IPv6 on {}: {}",
+            && let Some(addrs) = json.as_array()
-                    iface_name, e
+        {
-                )
-            })?;
-
-        if !output.status.success() {
-            return Err(format!(
-                "ip command for IPv6 on {} failed: {}",
-                iface_name,
-                String::from_utf8_lossy(&output.stderr)
-            ));
-        }
-
-        let json: Value = serde_json::from_slice(&output.stdout).map_err(|e| {
-            format!(
-                "Failed to parse ip JSON output for IPv6 on {}: {}",
-                iface_name, e
-            )
-        })?;
-
-        if let Some(addrs) = json.as_array() {
             for addr_info in addrs {
                 if let Some(addr_info_obj) = addr_info.as_object()
                     && let Some(addr_info) =
@@ -820,6 +566,6 @@ impl PhysicalHost {
             }
         }
 
-        Ok((ipv4, ipv6))
+        (ipv4, ipv6)
     }
 }

harmony_inventory_agent/src/main.rs

@@ -9,16 +9,8 @@ mod hwinfo;
 async fn inventory() -> impl Responder {
     log::info!("Received inventory request");
     let host = PhysicalHost::gather();
-    match host {
+    log::info!("Inventory data gathered successfully");
-        Ok(host) => {
+    actix_web::HttpResponse::Ok().json(host)
-            log::info!("Inventory data gathered successfully");
-            actix_web::HttpResponse::Ok().json(host)
-        }
-        Err(error) => {
-            log::error!("Inventory data gathering FAILED");
-            actix_web::HttpResponse::InternalServerError().json(error)
-        }
-    }
 }
 
 #[actix_web::main]