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 52

Bugfix: Policies count filter (#18882)

Browse source
This commit is contained in:
Tim Lee 2024-05-09 13:30:19 -06:00 committed by GitHub
parent db070837c8
commit 98ec500761
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 14 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

@ -454,7 +454,7 @@ func (ds *Datastore) CountPolicies(ctx context.Context, teamID *uint, matchQuery
func (ds *Datastore) CountMergedTeamPolicies(ctx context.Context, teamID uint, matchQuery string) (int, error) {
var args []interface{}
query := `SELECT count(*) FROM policies p WHERE p.team_id = ? OR p.team_id IS NULL`
query := `SELECT count(*) FROM policies p WHERE (p.team_id = ? OR p.team_id IS NULL)`
args = append(args, teamID)
// We must normalize the name for full Unicode support (Unicode equivalence).

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

@ -3058,6 +3058,19 @@ func testCountPolicies(t *testing.T, ds *Datastore) {
mergedCount, err = ds.CountMergedTeamPolicies(ctx, tm.ID, "")
require.NoError(t, err)
assert.Equal(t, 15, mergedCount)
// test filter
globalCount, err = ds.CountPolicies(ctx, nil, "global policy 1")
require.NoError(t, err)
assert.Equal(t, 1, globalCount)
teamCount, err = ds.CountPolicies(ctx, &tm.ID, "team policy 1")
require.NoError(t, err)
assert.Equal(t, 1, teamCount)
mergedCount, err = ds.CountMergedTeamPolicies(ctx, tm.ID, "policy 1")
require.NoError(t, err)
assert.Equal(t, 2, mergedCount)
}
func testUpdatePolicyHostCounts(t *testing.T, ds *Datastore) {