Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-24 01:18:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 84

allow created_at and updated_at as hosts filter (with "after") (#8535)

Browse source
This commit is contained in:
Frank Sievertsen 2022-11-02 15:51:31 +01:00 committed by GitHub
parent 74b8e29cfe
commit f9728b8435
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 47 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
server/datastore/mysql/hosts.go
View file

@ -23,6 +23,19 @@ import (
var hostSearchColumns = []string{"hostname", "computer_name", "uuid", "hardware_serial", "primary_ip"}
// Fixme: We should not make implementation details of the database schema part of the API.
var defaultHostColumnTableAliases = map[string]string{
"created_at": "h.created_at",
"updated_at": "h.updated_at",
}
func defaultHostColumnTableAlias(s string) string {
if newCol, ok := defaultHostColumnTableAliases[s]; ok {
return newCol
}
return s
}
// NewHost creates a new host on the datastore.
//
// Currently only used for testing.
@ -571,6 +584,8 @@ func (ds *Datastore) ListHosts(ctx context.Context, filter fleet.TeamFilter, opt
}
func (ds *Datastore) applyHostFilters(opt fleet.HostListOptions, sql string, filter fleet.TeamFilter, params []interface{}) (string, []interface{}) {
opt.OrderKey = defaultHostColumnTableAlias(opt.OrderKey)
deviceMappingJoin := `LEFT JOIN (
SELECT
host_id,

40
server/datastore/mysql/hosts_test.go
View file

@ -129,7 +129,7 @@ func TestHosts(t *testing.T) {
{"FailingPoliciesCount", testFailingPoliciesCount},
{"SetOrUpdateHostDisksSpace", testHostsSetOrUpdateHostDisksSpace},
{"HostIDsByOSID", testHostIDsByOSID},
{"TestHostDisplayName", testHostDisplayName},
{"TestHostOrder", testHostOrder},
}
for _, c := range cases {
t.Run(c.name, func(t *testing.T) {
@ -5372,8 +5372,8 @@ func testHostsSetOrUpdateHostDisksSpace(t *testing.T, ds *Datastore) {
require.Equal(t, 6.0, h.PercentDiskSpaceAvailable)
}
// testHostDisplayName tests listing a host sorted by display name.
func testHostDisplayName(t *testing.T, ds *Datastore) {
// testHostOrder tests listing a host sorted by different keys.
func testHostOrder(t *testing.T, ds *Datastore) {
ctx := context.Background()
_, err := ds.NewHost(ctx, &fleet.Host{ID: 1, OsqueryHostID: "1", Hostname: "0001", NodeKey: "1"})
require.NoError(t, err)
@ -5381,17 +5381,41 @@ func testHostDisplayName(t *testing.T, ds *Datastore) {
require.NoError(t, err)
_, err = ds.NewHost(ctx, &fleet.Host{ID: 3, OsqueryHostID: "3", Hostname: "0003", NodeKey: "3"})
require.NoError(t, err)
chk := func(hosts []*fleet.Host, expect ...string) {
require.Len(t, hosts, len(expect))
for i, h := range hosts {
assert.Equal(t, expect[i], h.DisplayName())
}
}
hosts, err := ds.ListHosts(ctx, fleet.TeamFilter{User: test.UserAdmin}, fleet.HostListOptions{
ListOptions: fleet.ListOptions{
OrderKey: "display_name",
},
})
require.NoError(t, err)
expect := []string{"0001", "0003", "0004"}
require.Len(t, hosts, len(expect))
for i, h := range hosts {
assert.Equal(t, expect[i], h.DisplayName())
}
chk(hosts, "0001", "0003", "0004")
ds.writer.Exec(`UPDATE hosts SET created_at = created_at + id`)
hosts, err = ds.ListHosts(ctx, fleet.TeamFilter{User: test.UserAdmin}, fleet.HostListOptions{
ListOptions: fleet.ListOptions{
OrderKey: "created_at",
After: "2010-10-22T20:22:03Z",
OrderDirection: fleet.OrderAscending,
},
})
require.NoError(t, err)
chk(hosts, "0001", "0004", "0003")
hosts, err = ds.ListHosts(ctx, fleet.TeamFilter{User: test.UserAdmin}, fleet.HostListOptions{
ListOptions: fleet.ListOptions{
OrderKey: "created_at",
After: "2180-10-22T20:22:03Z",
OrderDirection: fleet.OrderDescending,
},
})
require.NoError(t, err)
chk(hosts, "0003", "0004", "0001")
}
func testHostIDsByOSID(t *testing.T, ds *Datastore) {