Cherry pick: Return icon in in-house app metadata (#35568) - #35624
Conversation
**Related issue:** Resolves #35559 If some of the following don't apply, delete the relevant line. - [x] Added/updated automated tests - [ ] Where appropriate, [automated tests simulate multiple hosts and test for host isolation](https://github.com/fleetdm/fleet/blob/main/docs/Contributing/reference/patterns-backend.md#unit-testing) (updates to one hosts's records do not affect another) - [x] QA'd all new/changed functionality manually
jkatz01
changed the title
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## rc-minor-fleet-v4.77.0 #35624 +/- ##
=========================================================
Coverage ? 66.14%
=========================================================
Files ? 2100
Lines ? 177458
Branches ? 7382
=========================================================
Hits ? 117377
Misses ? 49319
Partials ? 10762
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
| categoryMap, err := ds.GetCategoriesForSoftwareTitles(ctx, []uint{titleID}, teamID) | ||
| if err != nil { | ||
| return nil, ctxerr.Wrap(ctx, err, "getting categories for in house app metadata") | ||
| } | ||
|
|
||
| if categories, ok := categoryMap[titleID]; ok { | ||
| dest.Categories = categories | ||
| } |
There was a problem hiding this comment.
Just double-checking, is it meant to include this? The original PR that his cherry-picks does not have this change.
There was a problem hiding this comment.
Though self-service is definitely in 4.77 so that' sprobably fine, but maybe this was meant to be another cherry-pick?
There was a problem hiding this comment.
Oh nevermind, I see that https://github.com/fleetdm/fleet/pull/35618/files is the categories cherry-pick and is probably meant to merge first.
There was a problem hiding this comment.
Yes @mna I accidentally merged this cherry pick before that. Good catch!
2 participants
Merged into main in #35568
Fixes in-house app icon not being deleted when title is deleted #35559