Cherry-pick #40548: Add aliases to fleetctl commands and flags#40690
Merged
sgress454 merged 2 commits intorc-minor-fleet-v4.82.0from Feb 27, 2026
Merged
Cherry-pick #40548: Add aliases to fleetctl commands and flags#40690sgress454 merged 2 commits intorc-minor-fleet-v4.82.0from
sgress454 merged 2 commits intorc-minor-fleet-v4.82.0from
Conversation
<!-- Add the related story/sub-task/bug number, like Resolves #123, or remove if NA --> **Related issue:** Resolves #40598 This PR updates `fleetctl` with new commands and flag names with "team" and "query" terminology replaced with "fleet" and "report", using aliases for backwards compatibility and logging deprecation warnings when the old terminology is used. 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 - [X] Added/updated automated tests - [X] QA'd all new/changed functionality manually - [x] `fleetctl query` -> `fleetctl report` - [x] using `fleetctl query` logs a deprecation warning --- - [x] `fleetctl get queries` -> `fleetctl get reports` - [x] using `fleetctl get queries` logs a deprecation warning --- - [x] `fleetctl get teams` -> `fleetctl get fleets` - [x] using `fleetctl get teams` logs a deprecation warning --- - [ ] `fleetctl apply --policies-teams` -> `fleetctl apply --policies-fleets` - [ ] using `fleetctl apply --policies-teams` logs a deprecation warning --- - [x] `fleetctl get --with-queries` -> `fleetctl get --with-reports` - [x] using `fleetctl get --with-queries` logs a deprecation warning --- - [x] `fleetctl gitops --delete-other-teams` -> `fleetctl gitops --delete-other-fleets` - [x] using `fleetctl gitops --delete-other-teams` logs a deprecation warning --- - [x] `fleetctl report --query-name` -> `fleetctl report --report-name` - [x] using `fleetctl report --query-name` logs a deprecation warning <!-- This is an auto-generated comment: release notes by coderabbit.ai --> * **New Features** * Deprecation warnings for legacy command and flag names to help users transition to current terminology. * **Changes** * "Team" terminology updated to "Fleet" across commands and associated flags throughout the CLI. * "Queries" terminology updated to "Reports" in get and related commands. * All flag name changes maintain backward compatibility through aliases for existing automation. <!-- end of auto-generated comment: release notes by coderabbit.ai --> --------- Co-authored-by: Ian Littman <iansltx@gmail.com> (cherry picked from commit 8e98a1b)
The opts.ActivityMock pattern doesn't exist in the rc branch. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Contributor
Author
|
@iansltx FYI I had to resolve a merge conflict on the |
Codecov Report❌ Patch coverage is Additional details and impacted files@@ Coverage Diff @@
## rc-minor-fleet-v4.82.0 #40690 +/- ##
=========================================================
Coverage ? 66.40%
=========================================================
Files ? 2456
Lines ? 197029
Branches ? 8556
=========================================================
Hits ? 130836
Misses ? 54354
Partials ? 11839
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 27, 2026
Contributor
iansltx
left a comment
iansltx
left a comment
There was a problem hiding this comment.
Thanks for calling out the conflict resolution. Given that tests pass, that conflict was resolved correctly, so g2g.
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.
Cherry-pick of #40548 into
rc-minor-fleet-v4.82.0.