✨ Enhance EulerOS version detection

Implements: #6314

Use title from /etc/euleros-release instead of /etc/os-release.

Signed-off-by: Christian Zunker <christian@mondoo.com>

Author: czunker

providers/os/detector/detector_all.go

@@ -468,7 +468,7 @@ var oracle = &PlatformResolver{
 			return true, nil
 		}
 
-		// check if we have /etc/centos-release file
+		// check if we have /etc/oracle-release file
 		f, err := conn.FileSystem().Open("/etc/oracle-release")
 		if err != nil {
 			return false, nil
@@ -838,6 +838,26 @@ var euleros = &PlatformResolver{
 	Name:     "euleros",
 	IsFamily: false,
 	Detect: func(r *PlatformResolver, pf *inventory.Platform, conn shared.Connection) (bool, error) {
+		// EulerOS includes /etc/os-release file, but version information in this file is not reliable
+		// So, we need to check whether /etc/euleros-release file exists
+		f, err := conn.FileSystem().Open("/etc/euleros-release")
+		if err != nil {
+			return false, nil
+		}
+		defer f.Close()
+
+		content, err := io.ReadAll(f)
+		if err != nil {
+			return false, err
+		}
+		prettyName := strings.Trim(string(content), "\n")
+		if len(prettyName) > 0 {
+			// align with title from /etc/os-release
+			// EulerOS release 2.0 (SP9x86_64) => EulerOS 2.0 (SP9x86_64)
+			prettyName = strings.Replace(prettyName, " release", "", 1)
+			pf.Title = prettyName
+		}
+
 		if pf.Name == "euleros" {
 			return true, nil
 		}

providers/os/detector/detector_platform_test.go

@@ -1061,6 +1061,19 @@ func TestEulerOSDetector(t *testing.T) {
 
 	assert.Equal(t, "euleros", di.Name, "os name should be identified")
 	assert.Equal(t, "EulerOS 2.0 (SP9x86_64)", di.Title, "os title should be identified")
+	assert.Equal(t, "2.0", di.Version, "os version should be identified")
+	assert.Equal(t, "x86_64", di.Arch, "os arch should be identified")
+	assert.Equal(t, []string{"euler", "linux", "unix", "os"}, di.Family)
+}
+
+// Verify /etc/euleros-release overrides the title from /etc/os-release
+func TestEulerOSDetector_withdifferentversion(t *testing.T) {
+	di, err := detectPlatformFromMock("./testdata/detect-euleros-2_v2.toml")
+	assert.Nil(t, err, "was able to create the provider")
+
+	assert.Equal(t, "euleros", di.Name, "os name should be identified")
+	assert.Equal(t, "EulerOS 2.0 (SP9x86_64)", di.Title, "os title should be identified")
+	assert.Equal(t, "2.0", di.Version, "os version should be identified")
 	assert.Equal(t, "x86_64", di.Arch, "os arch should be identified")
 	assert.Equal(t, []string{"euler", "linux", "unix", "os"}, di.Family)
 }

providers/os/detector/testdata/detect-euleros-2.toml

@@ -16,3 +16,8 @@ VERSION_ID="2.0"
 PRETTY_NAME="EulerOS 2.0 (SP9x86_64)"
 ANSI_COLOR="0;31"
 """
+
+[files."/etc/euleros-release"]
+content = """
+EulerOS release 2.0 (SP9x86_64)
+"""

providers/os/detector/testdata/detect-euleros-2_v2.toml

@@ -0,0 +1,23 @@
+[commands."uname -s"]
+stdout = "Linux"
+
+[commands."uname -m"]
+stdout = "x86_64"
+
+[commands."uname -r"]
+stdout = "4.18.0-147.5.1.6.h1511.eulerosv2r9.x86_64"
+
+[files."/etc/os-release"]
+content = """
+NAME="EulerOS"
+VERSION="2.0 (SP5x86_64)"
+ID="euleros"
+VERSION_ID="2.0"
+PRETTY_NAME="EulerOS 2.0 (SP5x86_64)"
+ANSI_COLOR="0;31"
+"""
+
+[files."/etc/euleros-release"]
+content = """
+EulerOS release 2.0 (SP9x86_64)
+"""