GitOps: support categories for in-house apps gitops - #35531
Merged
Conversation
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #35531 +/- ##
=======================================
Coverage 66.20% 66.21%
=======================================
Files 2102 2102
Lines 178160 178200 +40
Branches 7324 7386 +62
=======================================
+ Hits 117954 117987 +33
- Misses 49401 49403 +2
- Partials 10805 10810 +5
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:
|
9 tasks
jkatz01
added a commit
that referenced
this pull request
Nov 11, 2025
<!-- Add the related story/sub-task/bug number, like Resolves #123, or remove if NA --> **Related issue:** Resolves #35464 Also allows #35531 to be merged Adds self-service categories for #32247 Changes: - Move category insertion up in update installer so in house apps can use it - Add migration for in_house_app_software_categories table - Fix some overly wrapped errors - Add new tests for categories - Fix unused param in another test # Checklist for submitter If some of the following don't apply, delete the relevant line. - [ ] 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. - [ ] Input data is properly validated, `SELECT *` is avoided, SQL injection is prevented (using placeholders for values in statements) - [ ] If paths of existing endpoints are modified without backwards compatibility, checked the frontend/CLI for any necessary changes ## 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) - [x] QA'd all new/changed functionality manually ## Database migrations - [ ] Checked schema for all modified table for columns that will auto-update timestamps during migration. - [ ] Confirmed that updating the timestamps is acceptable, and will not cause unwanted side effects. - [ ] Ensured the correct collation is explicitly set for character columns (`COLLATE utf8mb4_unicode_ci`).
mna
force-pushed
the
mna-33164-gitops-in-house-apps-2
branch
from
November 11, 2025 20:56
5d25c93 to
98e328d
Compare
mna
force-pushed
the
mna-33164-gitops-in-house-apps-2
branch
from
November 11, 2025 21:23
3daab2c to
af49a83
Compare
mna
force-pushed
the
mna-33164-gitops-in-house-apps-2
branch
from
November 11, 2025 21:40
af49a83 to
d13571c
Compare
mna
marked this pull request as ready for review
November 11, 2025 21:59
jkatz01
added a commit
that referenced
this pull request
Nov 12, 2025
<!-- Add the related story/sub-task/bug number, like Resolves #123, or remove if NA --> **Related issue:** Resolves #35464 Also allows #35531 to be merged Adds self-service categories for #32247 Changes: - Move category insertion up in update installer so in house apps can use it - Add migration for in_house_app_software_categories table - Fix some overly wrapped errors - Add new tests for categories - Fix unused param in another test # Checklist for submitter If some of the following don't apply, delete the relevant line. - [ ] 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. - [ ] Input data is properly validated, `SELECT *` is avoided, SQL injection is prevented (using placeholders for values in statements) - [ ] If paths of existing endpoints are modified without backwards compatibility, checked the frontend/CLI for any necessary changes ## 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) - [x] QA'd all new/changed functionality manually ## Database migrations - [ ] Checked schema for all modified table for columns that will auto-update timestamps during migration. - [ ] Confirmed that updating the timestamps is acceptable, and will not cause unwanted side effects. - [ ] Ensured the correct collation is explicitly set for character columns (`COLLATE utf8mb4_unicode_ci`).
mna
added a commit
that referenced
this pull request
Nov 12, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
NOTE: this is implemented fromAll that has happened and it's ready to merge once approved.mna-33164-gitops-in-house-appsbranch (PR #35423) and will only merge once @jkatz01 's work on categories for IPA (non-gitops) is merged.Related issue: Resolves #33164
Checklist for submitter
SELECT *is avoided, SQL injection is prevented (using placeholders for values in statements)Testing
Recording: https://drive.google.com/file/d/1TQ6UVQnRXuTS1m1H4K6IsXsd_aqtoIUZ/view?usp=drive_link
New Fleet configuration settings
fleetctl generate-gitops.deb)