Jonathan Katz
bc694cbf3e
<!-- Add the related story/sub-task/bug number, like Resolves #123, or remove if NA --> **Related issue:** Resolves #39858 ~~Also implements the idea from this comment: https://github.com/fleetdm/fleet/issues/37802#issuecomment-3715729822~~ Decided to move the FMA name overriding idea to another PR. ## Changes - `getOrGenerateSoftwareInstallerTitleID` now attempts to find existing titles by name or by upgrade code if possible. It will update the upgrade code if possible. - also updated `addSoftwareTitleToMatchingSoftware` to match _only_ by upgrade code if the installer has an upgrade code These are the assumptions (and tests mostly) I made: | installer | existing title | result | |------------------|-----------------------------------|----------------------------------------------------------------------------| | no upgrade code | same name, no upgrade code | uses existing | | no upgrade code | same name, has upgrade code | uses existing, existing upgrade code stays | | has upgrade code | same name, no upgrade code | uses existing, existing title is updated with the incoming upgrade code | | has upgrade code | same name, different upgrade code | new title is created with same name | | has upgrade code | same name, same upgrade code | uses existing | | has upgrade code | different name, same upgrade code | uses existing, ~~existing title's name is updated~~ | # Checklist for submitter If some of the following don't apply, delete the relevant line. - [x] Changes file added for user-visible changes in `changes/`, `orbit/changes/` or `ee/fleetd-chrome/changes`. See [Changes files](https://github.com/fleetdm/fleet/blob/main/docs/Contributing/guides/committing-changes.md#changes-files) for more information. ## Testing - [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) - [ ] QA'd all new/changed functionality manually - Tested having the title `7-Zip 23.01 (x64)` with an upgrade code in the db, added 7-Zip FMA, title became the existing `7-Zip 23.01 (x64)` title with the same upgrade code. - Trying to add it again fails with the correct error message
2 lines
118 B
Plaintext
2 lines
118 B
Plaintext
- Fixed adding Windows Fleet maintained apps failing when a software title with the same upgrade code already exists.
|