Skip to content

Fix for ONC profiles losing their details when adding another profile (#45299) - #45311

Merged
getvictor merged 1 commit into
rc-minor-fleet-v4.85.0from
victor/42405-cherry-pick-2
May 12, 2026
Merged

Fix for ONC profiles losing their details when adding another profile (#45299)#45311
getvictor merged 1 commit into
rc-minor-fleet-v4.85.0from
victor/42405-cherry-pick-2

Conversation

@getvictor

Copy link
Copy Markdown
Member

Related issue: Resolves #42405

Unreleased bug fix.

Checklist for submitter

Testing

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

Summary by CodeRabbit

  • Bug Fixes

  • Android MDM profile detail messages (e.g., certificate status) are preserved when adding additional profiles or marking profiles pending, preventing loss of important status information.

  • Tests

  • Added an integration test verifying ONC/certificate detail is retained when additional Android MDM profiles are uploaded for the same team.

Review Change Stack

(cherry picked from commit 7e3dea6)

…#45299)

<!-- Add the related story/sub-task/bug number, like Resolves #123, or
remove if NA -->
**Related issue:** Resolves #42405

Unreleased bug fix.

# Checklist for submitter

## Testing

- [x] Added/updated automated tests
- [x] QA'd all new/changed functionality manually

<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit

* **Bug Fixes**
* Android MDM profile detail messages (e.g., certificate status) are
preserved when adding additional profiles or marking profiles pending,
preventing loss of important status information.

* **Tests**
* Added an integration test verifying ONC/certificate detail is retained
when additional Android MDM profiles are uploaded for the same team.

[![Review Change
Stack](https://storage.googleapis.com/coderabbit_public_assets/review-stack-in-coderabbit-ui.svg)](https://app.coderabbit.ai/change-stack/fleetdm/fleet/pull/45299)
<!-- end of auto-generated comment: release notes by coderabbit.ai -->

(cherry picked from commit 7e3dea6)
@getvictor
getvictor marked this pull request as ready for review May 12, 2026 22:49
@getvictor
getvictor requested a review from a team as a code owner May 12, 2026 22:49

@claude claude Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Claude Code Review

This repository is configured for manual code reviews. Comment @claude review to trigger a review and subscribe this PR to future pushes, or @claude review once for a one-time review.

Tip: disable this comment in your organization's Code Review settings.

@getvictor
getvictor merged commit 4d5a0f8 into rc-minor-fleet-v4.85.0 May 12, 2026
36 checks passed
@getvictor
getvictor deleted the victor/42405-cherry-pick-2 branch May 12, 2026 23:02
@codecov

codecov Bot commented May 12, 2026

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 81.81818% with 2 lines in your changes missing coverage. Please review.
✅ Project coverage is 68.61%. Comparing base (9de8af6) to head (066793c).
⚠️ Report is 40 commits behind head on rc-minor-fleet-v4.85.0.

Files with missing lines Patch % Lines
server/datastore/mysql/android.go 81.81% 1 Missing and 1 partial ⚠️
Additional details and impacted files
@@                    Coverage Diff                     @@
##           rc-minor-fleet-v4.85.0   #45311      +/-   ##
==========================================================
+ Coverage                   66.72%   68.61%   +1.88%     
==========================================================
  Files                        2626     1584    -1042     
  Lines                      211198   183160   -28038     
  Branches                     9428        0    -9428     
==========================================================
- Hits                       140924   125676   -15248     
+ Misses                      57485    44751   -12734     
+ Partials                    12789    12733      -56     
Flag Coverage Δ
android ?
backend 68.61% <81.81%> (+0.11%) ⬆️
backend-activity ?
fleetd-chrome ?
frontend ?

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

☔ View full report in Codecov by Sentry.
📢 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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants