Ignore comments at the top of XML files #27176
Merged
+6
−0
Conversation
This file contains 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
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #27176 +/- ##
==========================================
- Coverage 63.80% 63.79% -0.02%
==========================================
Files 1729 1729
Lines 164109 164111 +2
Branches 4481 4481
==========================================
- Hits 104707 104690 -17
- Misses 51254 51269 +15
- Partials 8148 8152 +4
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:
|
georgekarrv
approved these changes
Mar 15, 2025
3 tasks
georgekarrv
pushed a commit
that referenced
this pull request
Mar 21, 2025
Addresses #26443 (comment) after #27176 was merged. # Checklist for submitter If some of the following don't apply, delete the relevant line. <!-- Note that API documentation changes are now addressed by the product design team. --> - [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/Committing-Changes.md#changes-files) for more information. - I did this in #27176, same change message. - [x] Added/updated automated tests - [x] Manual QA for all new/changed functionality
3 tasks
getvictor
pushed a commit
that referenced
this pull request
Apr 1, 2025
Addresses #26443 (comment) after #27176 was merged. Reading XML as a string in this way feels wrong, but I don't want to avoid a refactor, so I'm checking for a "comment" string in this PR. I tested by building fleetctl locally and running: ```sh $ make fleetctl; ./build/fleetctl gitops -f it-and-security/teams/test.yml --dry-run ... Client Version: tf-mod-addon-monitoring-v1.5.1-1091-g8eb9111c6-dirty Server Version: 0.0.0-SNAPSHOT-85f4f65 [+] applying MDM profiles for team TEST Error: applying custom settings for team "TEST": POST /api/latest/fleet/mdm/profiles/batch received status 422 Validation Failed: disable-onedrive is not a valid macOS or Windows configuration profile. macOS profiles must be valid .mobileconfig or .json files. Windows configuration profiles can only have <Replace> or <Add> top level elements. ``` I'm not sure if the error above ([code](https://github.com/fleetdm/fleet/blob/8eb9111c67c017d3a7b6e448b7e333c8e43f2f6a/server/service/mdm.go#L2160)) is caused by my test environment not yet having the updated server code. The `--dry-run` passed in my test, as seen by the `[+] applying MDM profiles for team TEST` line. I can't get any test code to be reflected in the server response, so my hunch is that the issue should be fixed after this PR. # Checklist for submitter If some of the following don't apply, delete the relevant line. <!-- Note that API documentation changes are now addressed by the product design team. --> - [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/Committing-Changes.md#changes-files) for more information. - I did this in #27176, same change message. - [x] Added/updated automated tests - [x] Manual QA for all new/changed functionality
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Allows comments to be at the top of Fleet XML CSP files (addresses #26443)
We should validate that this fixes the errors with GitOps pushes, but I don't know how to do that without pushing this change through to QA.
Checklist for submitter
If some of the following don't apply, delete the relevant line.
changes/,orbit/changes/oree/fleetd-chrome/changes.See Changes files for more information.