Skip to content

[v17] Use the DeviceCollectedData.os_login_user field #63453

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
codingllama merged 2 commits into from
Feb 3, 2026
Merged

[v17] Use the DeviceCollectedData.os_login_user field #63453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d1156bf
Use the DeviceCollectedData.os_login_user field
codingllama Jan 29, 2026
17dc6a9
Fix Linux tests
codingllama Feb 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions api/types/device.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ func DeviceFromResource(res *DeviceV1) (*devicepb.Device, error) {
OsVersion: d.OsVersion,
OsBuild: d.OsBuild,
OsUsername: d.OsUsername,
OsLoginUser: d.OsLoginUser,
JamfBinaryVersion: d.JamfBinaryVersion,
MacosEnrollmentProfiles: d.MacosEnrollmentProfiles,
ReportedAssetTag: d.ReportedAssetTag,
Expand Down Expand Up @@ -235,6 +236,7 @@ func DeviceToResource(dev *devicepb.Device) *DeviceV1 {
OsVersion: d.OsVersion,
OsBuild: d.OsBuild,
OsUsername: d.OsUsername,
OsLoginUser: d.OsLoginUser,
JamfBinaryVersion: d.JamfBinaryVersion,
MacosEnrollmentProfiles: d.MacosEnrollmentProfiles,
ReportedAssetTag: d.ReportedAssetTag,
Expand Down
1 change: 1 addition & 0 deletions api/types/device_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ func TestDeviceConversions_toAndFrom(t *testing.T) {
OsVersion: "13.1.2",
OsBuild: "22D68",
OsUsername: "llama",
OsLoginUser: "llama2", // Usually matches OsUsername, different for testing only
JamfBinaryVersion: "9.27",
MacosEnrollmentProfiles: "Enrolled via DEP: No\nMDM enrollment: Yes (User Approved)\nMDM server: ...",
ReportedAssetTag: assetTag + "-reported",
Expand Down
1 change: 1 addition & 0 deletions lib/devicetrust/native/device_darwin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ func collectDeviceData(_ CollectDataMode) (*devicepb.DeviceCollectedData, error)
OsVersion: fmt.Sprintf("%v.%v.%v", dd.os_major, dd.os_minor, dd.os_patch),
OsBuild: osBuild,
OsUsername: osUser.Username,
OsLoginUser: osUser.Username,
JamfBinaryVersion: jamfVersion,
MacosEnrollmentProfiles: macosEnrollmentProfiles,
SystemSerialNumber: sn,
Expand Down
1 change: 1 addition & 0 deletions lib/devicetrust/native/device_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@ func collectDeviceData(mode CollectDataMode) (*devicepb.DeviceCollectedData, err
OsVersion: osRelease.VersionID,
OsBuild: osRelease.Version,
OsUsername: displayName, // Wrong, but kept for backwards compatibility.
OsLoginUser: u.Username,
ReportedAssetTag: reportedAssetTag,
SystemSerialNumber: systemSerialNumber,
BaseBoardSerialNumber: baseBoardSerialNumber,
Expand Down
1 change: 1 addition & 0 deletions lib/devicetrust/native/device_linux_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ func TestCollectDeviceData_linux(t *testing.T) {
OsVersion: "22.04",
OsBuild: "22.04.3 LTS (Jammy Jellyfish)",
OsUsername: u.Name,
OsLoginUser: u.Username,
ReportedAssetTag: "No Asset Information",
SystemSerialNumber: "PF0A0AAA",
BaseBoardSerialNumber: "L1AA00A00A0",
Expand Down
1 change: 1 addition & 0 deletions lib/devicetrust/native/device_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@ func collectDeviceData(_ CollectDataMode) (*devicepb.DeviceCollectedData, error)
OsVersion: fmt.Sprintf("%v.%v.%v", ver.MajorVersion, ver.MinorVersion, ver.BuildNumber),
OsBuild: strconv.FormatInt(int64(ver.BuildNumber), 10),
OsUsername: u.Username,
OsLoginUser: u.Username,
SystemSerialNumber: systemSerial,
BaseBoardSerialNumber: baseBoardSerial,
ReportedAssetTag: reportedAssetTag,
Expand Down
Loading