Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-23 08:58:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 111

bugfix: 18703 policies filter (#18706)

Browse source 
#18703
This commit is contained in:
Tim Lee 2024-05-02 14:10:13 -06:00 committed by RachelElysia
parent fc3cb5b5d3
commit eb7ac35071
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
server/datastore/mysql/policies.go
View file

@ -642,7 +642,7 @@ func (ds *Datastore) ListMergedTeamPolicies(ctx context.Context, teamID uint, op
LEFT JOIN users u ON p.author_id = u.id
LEFT JOIN policy_stats ps ON p.id = ps.policy_id
AND ps.inherited_team_id = COALESCE(p.team_id, 0)
WHERE p.team_id = ? OR p.team_id IS NULL
WHERE (p.team_id = ? OR p.team_id IS NULL)
`
args = append(args, teamID)

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

@ -762,6 +762,21 @@ func testListMergedTeamPolicies(t *testing.T, ds *Datastore) {
require.Len(t, merged, 2)
assert.Equal(t, p.ID, merged[0].ID)
assert.Equal(t, gpol.ID, merged[1].ID)
// Test filter
merged, err = ds.ListMergedTeamPolicies(ctx, team1.ID, fleet.ListOptions{
MatchQuery: "query1",
})
require.NoError(t, err)
require.Len(t, merged, 1)
assert.Equal(t, gpol.ID, merged[0].ID)
merged, err = ds.ListMergedTeamPolicies(ctx, team1.ID, fleet.ListOptions{
MatchQuery: "query2",
})
require.NoError(t, err)
require.Len(t, merged, 1)
assert.Equal(t, p.ID, merged[0].ID)
}
func newTestHostWithPlatform(t *testing.T, ds *Datastore, hostname, platform string, teamID *uint) *fleet.Host {