Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-24 09:28:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 30

Add explicit int64 for parsing physical_memory column (#2315)

Browse source 
Addresses an error when Fleet is compiled for a 32-bit architecture.

May not be comprehensive of all related errors.

Fixes #2314.
This commit is contained in:
Zachary Wasserman 2020-10-05 17:03:32 -07:00 committed by GitHub
parent f2d3683d80
commit 50dbdb3db4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
server/kolide/hosts.go
View file

@ -111,7 +111,7 @@ type Host struct {
PlatformLike string `json:"platform_like" db:"platform_like"` PlatformLike string `json:"platform_like" db:"platform_like"`
CodeName string `json:"code_name" db:"code_name"` CodeName string `json:"code_name" db:"code_name"`
Uptime time.Duration `json:"uptime"` Uptime time.Duration `json:"uptime"`
PhysicalMemory int `json:"memory" sql:"type:bigint" db:"physical_memory"` PhysicalMemory int64 `json:"memory" sql:"type:bigint" db:"physical_memory"`
// system_info fields // system_info fields
CPUType string `json:"cpu_type" db:"cpu_type"` CPUType string `json:"cpu_type" db:"cpu_type"`
CPUSubtype string `json:"cpu_subtype" db:"cpu_subtype"` CPUSubtype string `json:"cpu_subtype" db:"cpu_subtype"`

2
server/service/service_osquery.go
View file

@ -411,7 +411,7 @@ var detailQueries = map[string]struct {
} }
var err error var err error
host.PhysicalMemory, err = strconv.Atoi(emptyToZero(rows[0]["physical_memory"])) host.PhysicalMemory, err = strconv.ParseInt(emptyToZero(rows[0]["physical_memory"]), 10, 64)
if err != nil { if err != nil {
return err return err
} }

4
server/service/service_osquery_test.go
View file

@ -650,7 +650,7 @@ func TestDetailQueriesWithEmptyStrings(t *testing.T) {
assert.Equal(t, "1.8.2", gotHost.OsqueryVersion) assert.Equal(t, "1.8.2", gotHost.OsqueryVersion)
// system_info // system_info
assert.Equal(t, 17179869184, gotHost.PhysicalMemory) assert.Equal(t, int64(17179869184), gotHost.PhysicalMemory)
assert.Equal(t, "computer.local", gotHost.HostName) assert.Equal(t, "computer.local", gotHost.HostName)
assert.Equal(t, "uuid", gotHost.UUID) assert.Equal(t, "uuid", gotHost.UUID)
@ -820,7 +820,7 @@ func TestDetailQueries(t *testing.T) {
assert.Equal(t, "1.8.2", gotHost.OsqueryVersion) assert.Equal(t, "1.8.2", gotHost.OsqueryVersion)
// system_info // system_info
assert.Equal(t, 17179869184, gotHost.PhysicalMemory) assert.Equal(t, int64(17179869184), gotHost.PhysicalMemory)
assert.Equal(t, "computer.local", gotHost.HostName) assert.Equal(t, "computer.local", gotHost.HostName)
assert.Equal(t, "uuid", gotHost.UUID) assert.Equal(t, "uuid", gotHost.UUID)