Fix output from gitops to use "fleets" instead of "teams", "queries" instead of "reports"#40610
Merged
Fix output from gitops to use "fleets" instead of "teams", "queries" instead of "reports"#40610
Conversation
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #40610 +/- ##
=======================================
Coverage 66.28% 66.28%
=======================================
Files 2466 2466
Lines 197552 197552
Branches 8726 8726
=======================================
+ Hits 130946 130955 +9
+ Misses 54757 54752 -5
+ Partials 11849 11845 -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:
|
iansltx
approved these changes
Feb 26, 2026
sgress454
added a commit
that referenced
this pull request
Feb 26, 2026
…instead of "reports" (#40610) <!-- Add the related story/sub-task/bug number, like Resolves #123, or remove if NA --> **Related issue:** Resolves #40621 # Details This PR updates the output from `fleetctl gitops` and `fleetctl apply` to use the correct terminology: * "fleet" instead of "team" * "report" instead of "query" (where appropriate) * "for unassigned hosts" in place of "No Team" where possible, and "for fleet Unassigned" otherwise. All changes other than tests are in `client.go` and are text-only; no functional code is changed (and no code relies on the strings besides tests). # 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. n/a ## Testing - [X] Added/updated automated tests - [ ] QA'd all new/changed functionality manually I did a `fleetctl generate-gitops` and a `fleetctl gitops` run and saw the updated logs: ``` [+] would've applied EULA [+] would've applied certificate authorities [+] would've applied fleet config [+] would've applied MDM profiles [+] would've applied enroll secrets [+] would've applied 1 report [+] would've applied 1 software package for fleet 'Unassigned' [+] would've applied 0 app store apps for fleet 'Unassigned' [+] would've applied webhook settings for unassigned hosts [+] would've applied 1 policy [!] gitops dry run succeeded ``` but I did not go through and try and replicate every log or error message. I think the best we can do on this one is eyeball the code changes for mistakes.
Closed
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
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.
Related issue: Resolves #40621
Details
This PR updates the output from
fleetctl gitopsandfleetctl applyto use the correct terminology:All changes other than tests are in
client.goand are text-only; no functional code is changed (and no code relies on the strings besides tests).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.
n/a
Testing
I did a
fleetctl generate-gitopsand afleetctl gitopsrun and saw the updated logs:but I did not go through and try and replicate every log or error message. I think the best we can do on this one is eyeball the code changes for mistakes.