[ynaamane]

Related issue: Resolves #55539

A title matched by name (for example a macOS title without a bundle identifier) was reported as deleted on every GitOps run. The apply keeps the title softwareInstallerTitleSelect resolves, including its name fallback, while the deletion report compared the payload's identifier with the title's unique_identifier. The report now skips candidates whose title an incoming payload resolves to with the title lookup the apply runs (softwareInstallerTitleSelect, through GetExistingSoftwareInstallerTitleID); it only runs when there are candidates.

• ee/server/service/software_installers.go
• server/datastore/mysql/software_installers.go and server/fleet/datastore.go (comments only)

Checklist for submitter

• Changes file added for user-visible changes in changes/, orbit/changes/ or ee/fleetd-chrome/changes.
  See Changes files for more information.

Testing

• Added/updated automated tests
• QA'd all new/changed functionality manually

TestBatchSetSoftwareInstallersKeepsTitleAttachedByName (MySQL integration) adds an inventory title with no bundle identifier and batches dummy_installer.pkg twice: main reports the title as deleted on the second batch, this branch reports nothing, and an empty payload still reports it.

AI

AI: Claude Code (claude-opus-5-5)

AI: Claude Code (claude-sonnet-5-5)

Summary by CodeRabbit

• Bug Fixes
  • Fixed GitOps incorrectly reporting Fleet-maintained apps or packages as deleted when incoming software matches an existing title by name, bundle identifier, or upgrade code. This includes macOS titles without bundle identifiers.
  • Batch uploads now report genuine pending deletions while preserving titles matched by incoming packages. Failed title lookups return an error instead of a deletion result.

[coderabbitai]

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

⚙️ Run configuration

• Configuration used: Repository: fleetdm/fleet/.coderabbit.yaml
• Review profile: CHILL
• Plan: Advanced
• Run ID: f1536a46-2ade-4bad-a041-f72c4e4f9936

📥 Commits

Reviewing files that changed from the base of the PR and between a9eeb2b and 9a31430.

📒 Files selected for processing: 4

• ee/server/service/software_installers_test.go
• server/datastore/mysql/software_installers.go
• server/fleet/datastore.go
• server/service/integration_enterprise_software_batch_test.go

🚧 Files skipped from review as they are similar to previous changes: 2

• server/datastore/mysql/software_installers.go
• server/fleet/datastore.go

Included review availability: This review used your included allowance. Your plan provides up to 8 included reviews per hour; 7 remain after this review.

Walkthrough

Batch software upload deletion reporting now resolves incoming packages to existing software titles and excludes those title IDs from pending-deletion results. Lookup errors other than NotFound fail the batch. Unit and integration tests cover name-attached titles, dry-run and normal uploads, repeat applies, removal, and lookup errors. Datastore comments and a changelog entry describe name-attached title handling.

Priority: ➖ Normal

Severity of issue fixed: Medium

Merge Risk: ⚪ Minimal · up to 9a314

The change preserves name-matched titles in deletion reports, with no established merge-blocking issue remaining.

Pre-merge checks: 4 · 1

Failed checks: 1 warning

Check name	Status	Explanation	Resolution
Docstring Coverage		Docstring coverage is 0.00% which is insufficient. The required threshold is 80.00%. Docstring coverage is scoped to functions touched by this diff. Analyzed 3 functions across 5 files.	Write docstrings for the functions missing them to satisfy the coverage threshold.

Passed checks: 4 passed

Check name	Status	Explanation
Title check		The title clearly summarizes the primary change: preventing GitOps from reporting software attached to a title by name as deleted.
Description check		The description identifies the related issue, explains the root cause and fix, lists the main files, documents automated testing, and includes the required AI section. It also transparently leaves man…
Linked Issues check		The change satisfies issue #55539. When deletion candidates exist, softwareBatchUpload resolves each incoming package with GetExistingSoftwareInstallerTitleID and removes the resolved title IDs fr…
Out of Scope Changes check		The changes stay within issue #55539. The service code fixes deletion filtering. The automated tests verify name attachment and deletion reporting. The datastore comments and changelog document the be…

Full details: Description check

Explanation

The description identifies the related issue, explains the root cause and fix, lists the main files, documents automated testing, and includes the required AI section. It also transparently leaves manual QA unchecked. The duplicate AI entries are a minor formatting issue.

Full details: Linked Issues check

Explanation

The change satisfies issue #55539. When deletion candidates exist, softwareBatchUpload resolves each incoming package with GetExistingSoftwareInstallerTitleID and removes the resolved title IDs from the deletion report. This covers name matching when the payload identifier differs from the title unique_identifier. The service test covers dry-run and error handling. The MySQL integration test covers repeated batches and an empty payload.

Full details: Out of Scope Changes check

Explanation

The changes stay within issue #55539. The service code fixes deletion filtering. The automated tests verify name attachment and deletion reporting. The datastore comments and changelog document the behavior. No unrelated executable behavior is reported.

• Fix all pre-merge checks with AI

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create a new PR

• Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands.}

[codecov]

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 77.35%. Comparing base (aacba24) to head (9a31430).

Additional details and impacted files

@@           Coverage Diff           @@
##             main   #55547   +/-   ##
=======================================
  Coverage   77.35%   77.35%           
=======================================
  Files        4322     4322           
  Lines      269605   269617   +12     
  Branches    15952    15952           
=======================================
+ Hits       208560   208573   +13     
+ Misses      60855    60854    -1     
  Partials      190      190           

Flag	Coverage Δ
backend	78.63% <100.00%> (+<0.01%)	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
• 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

[cdcme]

@ynaamane Could you add a MySQL integration test? The unit test hard-codes the title the lookup returns, so it would still pass if the real lookup picked a different title than the apply. I can reproduce the bug on main by adding a title with no bundle ID and batching dummy_installer.pkg twice.

Could you also update the comment in GetSoftwareInstallersPendingDeletion? It still says it matches the way BatchSetSoftwareInstallers does.

[ynaamane]

Added TestBatchSetSoftwareInstallersKeepsTitleAttachedByName to the enterprise integration suite. It adds an inventory title with no bundle ID, batches dummy_installer.pkg (the apply attaches it to that title), then batches it again with dry run on and off and expects no deleted packages; an empty payload still reports the title. It fails on main and passes on this branch.

Updated the comment in GetSoftwareInstallersPendingDeletion, and the interface doc that said the same: the query only matches (unique_identifier, source), and the caller drops titles a payload attaches to by name.

[cdcme]

@ynaamane Thanks! If you get the conflicts resolved, I can get this approved & merged!

[ynaamane]

Rebased on main and resolved the conflict: the test split moved the new integration test, so it now sits next to yours in integration_enterprise_software_batch_test.go, unchanged.
Nothing else in the diff changed, and the test still fails on main and passes on this branch.

[ynaamane]

@cdcme Friendly ping: this still merges cleanly into main and is ready whenever you have a moment.

[cdcme]

Thanks @ynaamane for the contribution! 👏

[ynaamane]

Thanks for the review and the merge, @cdcme!