Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-22 16:39:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 121

Per Figma, using default policy description/resolution if either is missing. (#18714)

Browse source 
#18187 
Per Figma, use the default policy description/resolution if either is
missing.
This commit is contained in:
Victor Lyuboslavsky 2024-05-02 15:11:54 -05:00 committed by GitHub
parent 8bbd0063b1
commit c0dbe78766
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
server/cron/calendar_cron.go
View file

@ -616,8 +616,7 @@ func getCalendarEventDescriptionAndResolution(
var description, resolution string
policyIDs := strings.Split(host.FailingPolicyIDs, ",")
switch {
case len(policyIDs) == 1 && policyIDs[0] != "":
if len(policyIDs) == 1 && policyIDs[0] != "" {
var policy *fleet.PolicyLite
policyAny, ok := policyIDtoPolicy.Load(policyIDs[0])
if !ok {
@ -636,22 +635,14 @@ func getCalendarEventDescriptionAndResolution(
policy = policyAny.(*fleet.PolicyLite)
}
policyDescription := strings.TrimSpace(policy.Description)
if policyDescription == "" {
if policyDescription == "" || policy.Resolution == nil || strings.TrimSpace(*policy.Resolution) == "" {
description = getDefaultDescription()
} else {
description = policyDescription
}
if policy.Resolution == nil {
resolution = defaultResolution
} else {
policyResolution := strings.TrimSpace(*policy.Resolution)
if policyResolution == "" {
resolution = defaultResolution
} else {
resolution = policyResolution
}
description = policyDescription
resolution = strings.TrimSpace(*policy.Resolution)
}
default:
} else {
description = getDefaultDescription()
resolution = defaultResolution
}

14
server/cron/calendar_cron_test.go
View file

@ -941,21 +941,13 @@ func TestEventDescription(t *testing.T) {
err = json.Unmarshal(calendarEvents[hostCalEvent.HostID].Data, &details)
require.NoError(t, err)
description := createdCalendarEvents[details["id"]].Description
defaultDescriptionWithOrg := fmt.Sprintf("%s %s", orgName, defaultDescription)
switch hostCalEvent.HostID {
case hostID1, hostID6:
assert.Contains(t, description, "Description for policy 1")
assert.Contains(t, description, "Resolution for policy 1")
case hostID2:
assert.Contains(t, description, "Description for policy 2")
assert.Contains(t, description, defaultResolution)
case hostID3:
assert.Contains(t, description, "Description for policy 3")
assert.Contains(t, description, defaultResolution)
case hostID4:
assert.Contains(t, description, fmt.Sprintf("%s %s", orgName, defaultDescription))
assert.Contains(t, description, "Resolution for policy 4")
case hostID5, hostID7:
assert.Contains(t, description, fmt.Sprintf("%s %s", orgName, defaultDescription))
default:
assert.Contains(t, description, defaultDescriptionWithOrg)
assert.Contains(t, description, defaultResolution)
}
}