Report OS id

pierres · pierres · commit 94f04ffc0fb5 · 2026-01-18T10:24:19.000+01:00
diff --git a/internal/api/submit/request.go b/internal/api/submit/request.go
@@ -6,6 +6,7 @@ type System struct {
 
 type OS struct {
 	Architecture string `json:"architecture"`
+	Id           string `json:"id"`
 }
 
 type Pacman struct {
@@ -30,6 +31,7 @@ type PackageManager interface {
 type SystemInfo interface {
 	GetCpuArchitecture() (string, error)
 	GetArchitecture() (string, error)
+	GetOSId() (string, error)
 }
 
 func CreateRequest(p PackageManager, s SystemInfo) (*Request, error) {
@@ -51,10 +53,15 @@ func CreateRequest(p PackageManager, s SystemInfo) (*Request, error) {
 		return nil, err
 	}
 
+	osId, err := s.GetOSId()
+	if err != nil {
+		return nil, err
+	}
+
 	return &Request{
 		Version: Version,
 		System:  System{Architecture: cpuArchitecture},
-		OS:      OS{Architecture: architecture},
+		OS:      OS{Architecture: architecture, Id: osId},
 		Pacman:  Pacman{Packages: packages, Mirror: mirror},
 	}, nil
 }
diff --git a/internal/system/system_goos.go b/internal/system/system_goos.go
@@ -16,3 +16,7 @@ func (s *System) GetArchitecture() (string, error) {
 		return runtime.GOARCH, nil
 	}
 }
+
+func (s *System) GetOSId() (string, error) {
+	return runtime.GOOS, nil
+}
diff --git a/internal/system/system_linux.go b/internal/system/system_linux.go
@@ -2,6 +2,9 @@ package system
 
 import (
 	"bytes"
+	"os"
+	"runtime"
+	"strings"
 
 	"golang.org/x/sys/unix"
 )
@@ -15,3 +18,42 @@ func (s *System) GetArchitecture() (string, error) {
 
 	return string(utsname.Machine[:bytes.IndexByte(utsname.Machine[:], 0)]), nil
 }
+
+func (s *System) GetOSId() (string, error) {
+	for _, path := range []string{"/etc/os-release", "/usr/lib/os-release"} {
+		content, err := os.ReadFile(path)
+		if err != nil {
+			continue
+		}
+		if id := ParseOSId(content); id != "" {
+			return id, nil
+		}
+		break
+	}
+
+	return runtime.GOOS, nil
+}
+
+func ParseOSId(content []byte) string {
+	var id string
+
+	lines := strings.Split(string(content), "\n")
+	const keyValueParts = 2
+	for _, line := range lines {
+		if trimmedLine := strings.TrimSpace(line); trimmedLine == "" || strings.HasPrefix(trimmedLine, "#") {
+			continue
+		}
+
+		parts := strings.SplitN(line, "=", keyValueParts)
+		if len(parts) != keyValueParts {
+			continue
+		}
+
+		key := strings.TrimSpace(parts[0])
+		if key == "ID" {
+			id = strings.Trim(strings.TrimSpace(parts[1]), `"'`)
+		}
+	}
+
+	return id
+}
diff --git a/tests/integration/integration_test.go b/tests/integration/integration_test.go
@@ -43,6 +43,10 @@ func TestShowInformationToBeSent(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
+	osId, err := s.GetOSId()
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	output, err := pkgstats(t, []string{"submit", "--dump-json"}, WithPkgBlocklist([]string{"secret-*"}), WithMirrorBlocklist([]string{"secret.com"}))
 	if err != nil {
@@ -61,6 +65,9 @@ func TestShowInformationToBeSent(t *testing.T) {
 	if request.OS.Architecture != osArchitecture {
 		t.Errorf("Expected OS architecture '%s', got %v", osArchitecture, request.OS.Architecture)
 	}
+	if request.OS.Id != osId {
+		t.Errorf("Expected OS id '%s', got %v", osId, request.OS.Id)
+	}
 	if !strings.HasPrefix(request.Pacman.Mirror, "https://") {
 		t.Errorf("Expected pacman mirror to start with 'https://', got %v", request.Pacman.Mirror)
 	}
diff --git a/tests/integration/mock_server_test.go b/tests/integration/mock_server_test.go
@@ -108,6 +108,11 @@ func validateSubmitRequest(w http.ResponseWriter, request *submit.Request) {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return
 	}
+	osId, err := s.GetOSId()
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
 
 	if request.Version != submit.Version {
 		http.Error(w, fmt.Sprintf("Expected version %s, got %s", submit.Version, request.Version), http.StatusBadRequest)
@@ -117,6 +122,10 @@ func validateSubmitRequest(w http.ResponseWriter, request *submit.Request) {
 		http.Error(w, fmt.Sprintf("Expected OS architecture %s, got %s", osArchitecture, request.OS.Architecture), http.StatusBadRequest)
 		return
 	}
+	if request.OS.Id != osId {
+		http.Error(w, fmt.Sprintf("Expected OS id %s, got %s", osId, request.OS.Id), http.StatusBadRequest)
+		return
+	}
 	if request.System.Architecture != cpuArchitecture {
 		http.Error(w, fmt.Sprintf("Expected CPU architecture %s, got %s", cpuArchitecture, request.System.Architecture), http.StatusBadRequest)
 		return
diff --git a/tests/unit/internal/api/submit/client_test.go b/tests/unit/internal/api/submit/client_test.go
@@ -6,6 +6,7 @@ import (
 	"io"
 	"net/http"
 	"net/http/httptest"
+	"runtime"
 	"strings"
 	"testing"
 
@@ -32,7 +33,7 @@ func TestSendRequest(t *testing.T) {
 	request := &submit.Request{
 		Version: submit.Version,
 		System:  submit.System{Architecture: system.X86_64},
-		OS:      submit.OS{Architecture: system.I686},
+		OS:      submit.OS{Architecture: system.I686, Id: runtime.GOOS},
 		Pacman:  submit.Pacman{Packages: []string{"pacman", "linux"}, Mirror: mirror},
 	}
 	err := client.SendRequest(*request)
@@ -74,6 +75,9 @@ func validateRequest(t *testing.T, req *http.Request) {
 	if request.OS.Architecture != system.I686 {
 		t.Error("Invalid arch value")
 	}
+	if request.OS.Id != runtime.GOOS {
+		t.Error("Invalid id value")
+	}
 	if request.Pacman.Mirror != mirror {
 		t.Error("Invalid mirror value")
 	}
@@ -101,7 +105,7 @@ func TestSendRequestFollowsRedirect(t *testing.T) {
 	request := &submit.Request{
 		Version: submit.Version,
 		System:  submit.System{Architecture: system.X86_64},
-		OS:      submit.OS{Architecture: system.I686},
+		OS:      submit.OS{Architecture: system.I686, Id: runtime.GOOS},
 		Pacman:  submit.Pacman{Packages: []string{"pacman", "linux"}, Mirror: mirror},
 	}
 	err := client.SendRequest(*request)
@@ -128,7 +132,7 @@ func TestReturnServerErrorOnFailure(t *testing.T) {
 	request := &submit.Request{
 		Version: submit.Version,
 		System:  submit.System{Architecture: system.X86_64},
-		OS:      submit.OS{Architecture: system.I686},
+		OS:      submit.OS{Architecture: system.I686, Id: runtime.GOOS},
 		Pacman:  submit.Pacman{Packages: []string{"pacman", "linux"}, Mirror: mirror},
 	}
 	err := client.SendRequest(*request)
diff --git a/tests/unit/internal/system/system_goos_test.go b/tests/unit/internal/system/system_goos_test.go
@@ -18,3 +18,13 @@ func TestGetArchitecture(t *testing.T) {
 		t.Error(cpuArch)
 	}
 }
+
+func TestGetOSId(t *testing.T) {
+	osId, err := system.NewSystem().GetOSId()
+	if err != nil {
+		t.Error(err)
+	}
+	if osId != runtime.GOOS {
+		t.Error(osId)
+	}
+}
diff --git a/tests/unit/internal/system/system_linux_test.go b/tests/unit/internal/system/system_linux_test.go
@@ -1,6 +1,7 @@
 package system_test
 
 import (
+	"os"
 	"runtime"
 	"slices"
 	"strings"
@@ -33,3 +34,24 @@ func TestGetMachine(t *testing.T) {
 		t.Error(arch)
 	}
 }
+
+func TestGetOSId(t *testing.T) {
+	sys := system.NewSystem()
+	osId, err := sys.GetOSId()
+	if err != nil {
+		t.Fatalf("unexpected error getting OSId: %v", err)
+	}
+
+	_, err1 := os.Stat("/etc/os-release")
+	_, err2 := os.Stat("/usr/lib/os-release")
+
+	if os.IsNotExist(err1) && os.IsNotExist(err2) {
+		if osId != runtime.GOOS {
+			t.Errorf("expected OSId %q, got %q", runtime.GOOS, osId)
+		}
+	} else {
+		if osId == "" {
+			t.Error("expected a non-empty OSId, but it was empty")
+		}
+	}
+}
diff --git a/tests/unit/internal/system/system_parse_linux_test.go b/tests/unit/internal/system/system_parse_linux_test.go
@@ -0,0 +1,105 @@
+package system_test
+
+import (
+	"testing"
+
+	"pkgstats-cli/internal/system"
+)
+
+func TestParseOSId(t *testing.T) {
+	testCases := []struct {
+		name         string
+		content      string
+		expectedOSId string
+	}{
+		{
+			name: "should return Id from simple content",
+			content: `
+NAME="Test OS"
+VERSION="1.0"
+ID=testos
+ID_LIKE=anotheros
+`,
+			expectedOSId: "testos",
+		},
+		{
+			name: "should return Id from double-quoted syntax with whitespaces",
+			content: `
+NAME="Test OS"
+VERSION="1.0"
+ ID = "testos"
+ID_LIKE=anotheros
+`,
+			expectedOSId: "testos",
+		},
+		{
+			name: "should return Id with whitespaces",
+			content: `
+NAME="Test OS"
+VERSION="1.0"
+ ID = testos
+ID_LIKE=anotheros
+`,
+			expectedOSId: "testos",
+		},
+		{
+			name: "should return Id from single-quoted syntax",
+			content: `
+NAME="Test OS"
+VERSION="1.0"
+ID='testos'
+ID_LIKE=anotheros
+`,
+			expectedOSId: "testos",
+		},
+		{
+			name: "should return the last Id when duplicates exist",
+			content: `
+ID=firstid
+NAME="Test OS"
+ID=secondid
+VERSION="1.0"
+ID=lastid
+`,
+			expectedOSId: "lastid",
+		},
+		{
+			name:         "should return empty string for empty content",
+			content:      "",
+			expectedOSId: "",
+		},
+		{
+			name: "should return empty string for content with no Id",
+			content: `
+NAME="Test OS"
+VERSION="1.0"
+`,
+			expectedOSId: "",
+		},
+		{
+			name: "should ignore comments",
+			content: `
+#ID=commented
+NAME="Test OS"
+ID=actual
+`,
+			expectedOSId: "actual",
+		},
+		{
+			name: "should handle Id with embedded equals",
+			content: `
+ID=some=value
+`,
+			expectedOSId: "some=value",
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			osId := system.ParseOSId([]byte(tc.content))
+			if osId != tc.expectedOSId {
+				t.Errorf("expected OSId %q, got %q", tc.expectedOSId, osId)
+			}
+		})
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -16,3 +16,7 @@ func (s *System) GetArchitecture() (string, error) {`
`16`	`16`	`return runtime.GOARCH, nil`
`17`	`17`	`}`
`18`	`18`	`}`
	`19`	`+`
	`20`	`+func (s *System) GetOSId() (string, error) {`
	`21`	`+ return runtime.GOOS, nil`
	`22`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,10 @@ func TestShowInformationToBeSent(t *testing.T) {`
`43`	`43`	`if err != nil {`
`44`	`44`	`t.Fatal(err)`
`45`	`45`	`}`
	`46`	`+ osId, err := s.GetOSId()`
	`47`	`+ if err != nil {`
	`48`	`+ t.Fatal(err)`
	`49`	`+ }`
`46`	`50`
`47`	`51`	`output, err := pkgstats(t, []string{"submit", "--dump-json"}, WithPkgBlocklist([]string{"secret-*"}), WithMirrorBlocklist([]string{"secret.com"}))`
`48`	`52`	`if err != nil {`
`@@ -61,6 +65,9 @@ func TestShowInformationToBeSent(t *testing.T) {`
`61`	`65`	`if request.OS.Architecture != osArchitecture {`
`62`	`66`	`t.Errorf("Expected OS architecture '%s', got %v", osArchitecture, request.OS.Architecture)`
`63`	`67`	`}`
	`68`	`+ if request.OS.Id != osId {`
	`69`	`+ t.Errorf("Expected OS id '%s', got %v", osId, request.OS.Id)`
	`70`	`+ }`
`64`	`71`	`if !strings.HasPrefix(request.Pacman.Mirror, "https://") {`
`65`	`72`	`t.Errorf("Expected pacman mirror to start with 'https://', got %v", request.Pacman.Mirror)`
`66`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,3 +18,13 @@ func TestGetArchitecture(t *testing.T) {`
`18`	`18`	`t.Error(cpuArch)`
`19`	`19`	`}`
`20`	`20`	`}`
	`21`	`+`
	`22`	`+func TestGetOSId(t *testing.T) {`
	`23`	`+ osId, err := system.NewSystem().GetOSId()`
	`24`	`+ if err != nil {`
	`25`	`+ t.Error(err)`
	`26`	`+ }`
	`27`	`+ if osId != runtime.GOOS {`
	`28`	`+ t.Error(osId)`
	`29`	`+ }`
	`30`	`+}`