refactor: Simplify Linux distribution detection by removing unnecessary checks and consolidating logic

Author: HynoR

agent/utils/psutil/host.go

@@ -1,6 +1,7 @@
 package psutil
 
 import (
+	"fmt"
 	"os"
 	"strings"
 	"sync"
@@ -42,11 +43,7 @@ func (h *HostInfoState) GetHostInfo(forceRefresh bool) (*host.InfoStat, error) {
 
 func (h *HostInfoState) GetDistro() string {
 	if h.cachedDistro == "" {
-		d := detectLinuxDistro()
-		if strings.Contains(d, "(") && strings.Contains(d, ")") {
-			d = d[:strings.LastIndex(d, "(")]
-		}
-		h.cachedDistro = strings.TrimSpace(d)
+		h.cachedDistro = detectLinuxDistro()
 	}
 	return h.cachedDistro
 }
@@ -55,10 +52,6 @@ func detectLinuxDistro() string {
 	distroFiles := []string{
 		"/etc/os-release",
 		"/usr/lib/os-release",
-		"/etc/lsb-release",
-		"/etc/redhat-release",
-		"/etc/debian_version",
-		"/etc/issue",
 	}
 
 	var targetFile string
@@ -73,56 +66,26 @@ func detectLinuxDistro() string {
 		data, err := os.ReadFile(targetFile)
 		if err == nil {
 			content := string(data)
-			switch targetFile {
-			case "/etc/os-release", "/usr/lib/os-release":
-				if v := findKeyValues(content, "PRETTY_NAME"); v["PRETTY_NAME"] != "" {
-					return v["PRETTY_NAME"]
-				}
-				if v := findKeyValues(content, "NAME", "VERSION_ID"); v["NAME"] != "" && v["VERSION_ID"] != "" {
-					return v["NAME"] + " " + v["VERSION_ID"]
-				}
-			case "/etc/lsb-release":
-				if v := findKeyValues(content, "DISTRIB_DESCRIPTION"); v["DISTRIB_DESCRIPTION"] != "" {
-					return v["DISTRIB_DESCRIPTION"]
+			for _, line := range strings.Split(content, "\n") {
+				idx := strings.Index(line, "=")
+				if idx == -1 {
+					continue
 				}
-				if v := findKeyValues(content, "DISTRIB_ID", "DISTRIB_RELEASE"); v["DISTRIB_ID"] != "" && v["DISTRIB_RELEASE"] != "" {
-					return v["DISTRIB_ID"] + " " + v["DISTRIB_RELEASE"]
+				key := line[:idx]
+				if key == "PRETTY_NAME" {
+					d := strings.Trim(line[idx+1:], "\"")
+					if strings.Contains(d, "(") && strings.Contains(d, ")") {
+						d = d[:strings.LastIndex(d, "(")]
+					}
+					return strings.TrimSpace(d)
 				}
-			case "/etc/redhat-release", "/etc/issue":
-				return strings.TrimSpace(content)
-			case "/etc/debian_version":
-				return "Debian " + strings.TrimSpace(content)
 			}
 		}
 	}
 
-	// gopsutil fallback
 	if osInfo, err := host.Info(); err == nil {
-		return osInfo.OS
+		return fmt.Sprintf("%s %s", osInfo.Platform, osInfo.PlatformVersion)
 	}
 
-	return "Unknown Linux"
-}
-
-func findKeyValues(data string, keys ...string) map[string]string {
-	result := make(map[string]string, len(keys))
-	found := 0
-	for _, line := range strings.Split(data, "\n") {
-		idx := strings.Index(line, "=")
-		if idx == -1 {
-			continue
-		}
-		key := line[:idx]
-		for _, k := range keys {
-			if key == k {
-				result[k] = strings.Trim(line[idx+1:], "\"")
-				found++
-				if found == len(keys) {
-					return result
-				}
-				break
-			}
-		}
-	}
-	return result
+	return "Linux"
 }