mirror of
https://github.com/fleetdm/fleet
synced 2026-04-21 21:47:20 +00:00
8e98a1b65b
<!-- Add the related story/sub-task/bug number, like Resolves #123, or remove if NA --> **Related issue:** Resolves #40598 # Details 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. # 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 - [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 --> ## Summary by CodeRabbit ## Release Notes * **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>
41 lines
1.1 KiB
Go
41 lines
1.1 KiB
Go
package main
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
"io/fs"
|
|
"os"
|
|
"path"
|
|
"runtime"
|
|
|
|
"github.com/fleetdm/fleet/v4/cmd/fleetctl/fleetctl"
|
|
"github.com/urfave/cli/v2"
|
|
)
|
|
|
|
func main() {
|
|
app := fleetctl.CreateApp(os.Stdin, os.Stdout, os.Stderr, exitErrHandler)
|
|
fleetctl.StashRawArgs(app, os.Args)
|
|
if err := app.Run(os.Args); err != nil {
|
|
fmt.Fprintf(os.Stdout, "Error: %+v\n", err)
|
|
os.Exit(1)
|
|
}
|
|
}
|
|
|
|
// exitErrHandler implements cli.ExitErrHandlerFunc. If there is an error, prints it to stderr and exits with status 1.
|
|
func exitErrHandler(c *cli.Context, err error) {
|
|
if err == nil {
|
|
return
|
|
}
|
|
|
|
fmt.Fprintf(c.App.ErrWriter, "Error: %+v\n", err)
|
|
|
|
if errors.Is(err, fs.ErrPermission) {
|
|
switch runtime.GOOS {
|
|
case "darwin", "linux":
|
|
fmt.Fprintf(c.App.ErrWriter, "\nThis error can usually be resolved by fixing the permissions on the %s directory, or re-running this command with sudo.\n", path.Dir(c.String("config")))
|
|
case "windows":
|
|
fmt.Fprintf(c.App.ErrWriter, "\nThis error can usually be resolved by fixing the permissions on the %s directory, or re-running this command with 'Run as administrator'.\n", path.Dir(c.String("config")))
|
|
}
|
|
}
|
|
cli.OsExiter(1)
|
|
}
|