From 2c9e13d3d4f29b3edc7dfae3e64a7f7ceccadde8 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Tue, 9 Jul 2024 15:54:35 +0200 Subject: [PATCH] refactor: persistent DebugFlag --- cli/app/backup.go | 4 ---- cli/app/check.go | 1 - cli/app/cmd.go | 2 -- cli/app/config.go | 11 ++++------- cli/app/cp.go | 1 - cli/app/deploy.go | 1 - cli/app/list.go | 1 - cli/app/logs.go | 1 - cli/app/new.go | 1 - cli/app/ps.go | 1 - cli/app/remove.go | 1 - cli/app/restart.go | 1 - cli/app/restore.go | 1 - cli/app/rollback.go | 1 - cli/app/run.go | 1 - cli/app/secret.go | 1 - cli/app/services.go | 11 ++++------- cli/app/undeploy.go | 1 - cli/app/upgrade.go | 1 - cli/app/volume.go | 1 - cli/catalogue/catalogue.go | 1 - cli/cli.go | 6 +++--- cli/internal/cli.go | 1 + cli/recipe/diff.go | 1 - cli/recipe/fetch.go | 1 - cli/recipe/lint.go | 1 - cli/recipe/list.go | 1 - cli/recipe/new.go | 1 - cli/recipe/release.go | 1 - cli/recipe/reset.go | 1 - cli/recipe/sync.go | 1 - cli/recipe/upgrade.go | 1 - cli/recipe/version.go | 1 - cli/server/add.go | 1 - cli/server/prune.go | 1 - cli/server/remove.go | 1 - cli/updater/updater.go | 1 - 37 files changed, 12 insertions(+), 54 deletions(-) diff --git a/cli/app/backup.go b/cli/app/backup.go index 3a22e8ba..8d12d389 100644 --- a/cli/app/backup.go +++ b/cli/app/backup.go @@ -39,7 +39,6 @@ var appBackupListCommand = cli.Command{ Name: "list", Aliases: []string{"ls"}, Flags: []cli.Flag{ - internal.DebugFlag, internal.OfflineFlag, snapshotFlag, includePathFlag, @@ -87,7 +86,6 @@ var appBackupDownloadCommand = cli.Command{ Name: "download", Aliases: []string{"d"}, Flags: []cli.Flag{ - internal.DebugFlag, internal.OfflineFlag, snapshotFlag, includePathFlag, @@ -159,7 +157,6 @@ var appBackupCreateCommand = cli.Command{ Name: "create", Aliases: []string{"c"}, Flags: []cli.Flag{ - internal.DebugFlag, internal.OfflineFlag, resticRepoFlag, }, @@ -218,7 +215,6 @@ var appBackupSnapshotsCommand = cli.Command{ Name: "snapshots", Aliases: []string{"s"}, Flags: []cli.Flag{ - internal.DebugFlag, internal.OfflineFlag, snapshotFlag, }, diff --git a/cli/app/check.go b/cli/app/check.go index 6ac73a90..af62cc63 100644 --- a/cli/app/check.go +++ b/cli/app/check.go @@ -29,7 +29,6 @@ recipes regardless of commenting or not (e.g. through the use of ${FOO:} syntax). "check" does not confirm or deny this for you.`, ArgsUsage: "", Flags: []cli.Flag{ - internal.DebugFlag, internal.ChaosFlag, internal.OfflineFlag, }, diff --git a/cli/app/cmd.go b/cli/app/cmd.go index c2b2753f..2cf52779 100644 --- a/cli/app/cmd.go +++ b/cli/app/cmd.go @@ -37,7 +37,6 @@ EXAMPLE: abra app cmd --local example.com app create_user -- me@example.com`, ArgsUsage: " [] [-- ]", Flags: []cli.Flag{ - internal.DebugFlag, internal.LocalCmdFlag, internal.RemoteUserFlag, internal.TtyFlag, @@ -205,7 +204,6 @@ var appCmdListCommand = cli.Command{ Usage: "List all available commands", ArgsUsage: "", Flags: []cli.Flag{ - internal.DebugFlag, internal.OfflineFlag, internal.ChaosFlag, }, diff --git a/cli/app/config.go b/cli/app/config.go index e873b2da..dfce75db 100644 --- a/cli/app/config.go +++ b/cli/app/config.go @@ -15,13 +15,10 @@ import ( ) var appConfigCommand = cli.Command{ - Name: "config", - Aliases: []string{"cfg"}, - Usage: "Edit app config", - ArgsUsage: "", - Flags: []cli.Flag{ - internal.DebugFlag, - }, + Name: "config", + Aliases: []string{"cfg"}, + Usage: "Edit app config", + ArgsUsage: "", Before: internal.SubCommandBefore, EnableShellCompletion: true, ShellComplete: autocomplete.AppNameComplete, diff --git a/cli/app/cp.go b/cli/app/cp.go index ee3d7d2d..84bd1cb9 100644 --- a/cli/app/cp.go +++ b/cli/app/cp.go @@ -30,7 +30,6 @@ var appCpCommand = cli.Command{ Aliases: []string{"c"}, ArgsUsage: " ", Flags: []cli.Flag{ - internal.DebugFlag, internal.NoInputFlag, }, Before: internal.SubCommandBefore, diff --git a/cli/app/deploy.go b/cli/app/deploy.go index aad8d330..32fefc93 100644 --- a/cli/app/deploy.go +++ b/cli/app/deploy.go @@ -24,7 +24,6 @@ var appDeployCommand = cli.Command{ Usage: "Deploy an app", ArgsUsage: " []", Flags: []cli.Flag{ - internal.DebugFlag, internal.NoInputFlag, internal.ForceFlag, internal.ChaosFlag, diff --git a/cli/app/list.go b/cli/app/list.go index 134b97ad..4b3929f3 100644 --- a/cli/app/list.go +++ b/cli/app/list.go @@ -82,7 +82,6 @@ By passing the "--status/-S" flag, you can query all your servers for the actual live deployment status. Depending on how many servers you manage, this can take some time.`, Flags: []cli.Flag{ - internal.DebugFlag, internal.MachineReadableFlag, statusFlag, listAppServerFlag, diff --git a/cli/app/logs.go b/cli/app/logs.go index acfed548..5c221200 100644 --- a/cli/app/logs.go +++ b/cli/app/logs.go @@ -30,7 +30,6 @@ var appLogsCommand = cli.Command{ Flags: []cli.Flag{ internal.StdErrOnlyFlag, internal.SinceLogsFlag, - internal.DebugFlag, }, Before: internal.SubCommandBefore, EnableShellCompletion: true, diff --git a/cli/app/new.go b/cli/app/new.go index 735dff25..62875a85 100644 --- a/cli/app/new.go +++ b/cli/app/new.go @@ -44,7 +44,6 @@ var appNewCommand = cli.Command{ Usage: "Create a new app", Description: appNewDescription, Flags: []cli.Flag{ - internal.DebugFlag, internal.NoInputFlag, internal.NewAppServerFlag, internal.DomainFlag, diff --git a/cli/app/ps.go b/cli/app/ps.go index 71822527..971a5d7e 100644 --- a/cli/app/ps.go +++ b/cli/app/ps.go @@ -28,7 +28,6 @@ var appPsCommand = cli.Command{ Description: "Show status of a deployed app.", Flags: []cli.Flag{ internal.MachineReadableFlag, - internal.DebugFlag, }, Before: internal.SubCommandBefore, EnableShellCompletion: true, diff --git a/cli/app/remove.go b/cli/app/remove.go index 8cbcd5f3..3f1ca724 100644 --- a/cli/app/remove.go +++ b/cli/app/remove.go @@ -39,7 +39,6 @@ To delete everything without prompt, use the "--force/-f" or the "--no-input/n" flag.`, Flags: []cli.Flag{ internal.ForceFlag, - internal.DebugFlag, internal.NoInputFlag, internal.OfflineFlag, }, diff --git a/cli/app/restart.go b/cli/app/restart.go index 193e3ae9..250bef62 100644 --- a/cli/app/restart.go +++ b/cli/app/restart.go @@ -21,7 +21,6 @@ var appRestartCommand = cli.Command{ Usage: "Restart an app", ArgsUsage: " []", Flags: []cli.Flag{ - internal.DebugFlag, internal.OfflineFlag, internal.AllServicesFlag, }, diff --git a/cli/app/restore.go b/cli/app/restore.go index 103bb80f..4b5c9a98 100644 --- a/cli/app/restore.go +++ b/cli/app/restore.go @@ -25,7 +25,6 @@ var appRestoreCommand = cli.Command{ Usage: "Restore an app backup", ArgsUsage: " ", Flags: []cli.Flag{ - internal.DebugFlag, internal.OfflineFlag, targetPathFlag, }, diff --git a/cli/app/rollback.go b/cli/app/rollback.go index 12cd47ed..e6d6a982 100644 --- a/cli/app/rollback.go +++ b/cli/app/rollback.go @@ -24,7 +24,6 @@ var appRollbackCommand = cli.Command{ Usage: "Roll an app back to a previous version", ArgsUsage: " []", Flags: []cli.Flag{ - internal.DebugFlag, internal.NoInputFlag, internal.ForceFlag, internal.NoDomainChecksFlag, diff --git a/cli/app/run.go b/cli/app/run.go index cc6a6b3f..742c978e 100644 --- a/cli/app/run.go +++ b/cli/app/run.go @@ -36,7 +36,6 @@ var appRunCommand = cli.Command{ Name: "run", Aliases: []string{"r"}, Flags: []cli.Flag{ - internal.DebugFlag, noTTYFlag, userFlag, }, diff --git a/cli/app/secret.go b/cli/app/secret.go index 6025afd2..0e628fa8 100644 --- a/cli/app/secret.go +++ b/cli/app/secret.go @@ -46,7 +46,6 @@ var appSecretGenerateCommand = cli.Command{ Usage: "Generate secrets", ArgsUsage: " ", Flags: []cli.Flag{ - internal.DebugFlag, allSecretsFlag, internal.PassFlag, internal.MachineReadableFlag, diff --git a/cli/app/services.go b/cli/app/services.go index b406cbf0..50307e5f 100644 --- a/cli/app/services.go +++ b/cli/app/services.go @@ -17,13 +17,10 @@ import ( ) var appServicesCommand = cli.Command{ - Name: "services", - Aliases: []string{"sr"}, - Usage: "Display all services of an app", - ArgsUsage: "", - Flags: []cli.Flag{ - internal.DebugFlag, - }, + Name: "services", + Aliases: []string{"sr"}, + Usage: "Display all services of an app", + ArgsUsage: "", Before: internal.SubCommandBefore, EnableShellCompletion: true, ShellComplete: autocomplete.AppNameComplete, diff --git a/cli/app/undeploy.go b/cli/app/undeploy.go index 62ebb735..03fcdcff 100644 --- a/cli/app/undeploy.go +++ b/cli/app/undeploy.go @@ -66,7 +66,6 @@ var appUndeployCommand = cli.Command{ Aliases: []string{"un"}, ArgsUsage: "", Flags: []cli.Flag{ - internal.DebugFlag, internal.NoInputFlag, pruneFlag, }, diff --git a/cli/app/upgrade.go b/cli/app/upgrade.go index f01fa753..ee23868a 100644 --- a/cli/app/upgrade.go +++ b/cli/app/upgrade.go @@ -23,7 +23,6 @@ var appUpgradeCommand = cli.Command{ Usage: "Upgrade an app", ArgsUsage: " []", Flags: []cli.Flag{ - internal.DebugFlag, internal.NoInputFlag, internal.ForceFlag, internal.NoDomainChecksFlag, diff --git a/cli/app/volume.go b/cli/app/volume.go index c5b34937..ef83ec57 100644 --- a/cli/app/volume.go +++ b/cli/app/volume.go @@ -18,7 +18,6 @@ var appVolumeListCommand = cli.Command{ Aliases: []string{"ls"}, ArgsUsage: "", Flags: []cli.Flag{ - internal.DebugFlag, internal.NoInputFlag, }, Before: internal.SubCommandBefore, diff --git a/cli/catalogue/catalogue.go b/cli/catalogue/catalogue.go index 575150f6..98848ed3 100644 --- a/cli/catalogue/catalogue.go +++ b/cli/catalogue/catalogue.go @@ -24,7 +24,6 @@ var catalogueGenerateCommand = cli.Command{ Aliases: []string{"g"}, Usage: "Generate the recipe catalogue", Flags: []cli.Flag{ - internal.DebugFlag, internal.NoInputFlag, internal.PublishFlag, internal.DryFlag, diff --git a/cli/cli.go b/cli/cli.go index f2a2f853..340fe771 100644 --- a/cli/cli.go +++ b/cli/cli.go @@ -36,9 +36,6 @@ EXAMPLE: abra autocomplete bash`, ArgsUsage: "", - Flags: []cli.Flag{ - internal.DebugFlag, - }, Action: func(ctx context.Context, cmd *cli.Command) error { shellType := cmd.Args().First() @@ -157,6 +154,9 @@ func newAbraApp(version, commit string) *cli.Command { |_| `, Version: fmt.Sprintf("%s-%s", version, commit[:7]), + Flags: []cli.Flag{ + internal.DebugFlag, + }, Commands: []*cli.Command{ &app.AppCommand, &server.ServerCommand, diff --git a/cli/internal/cli.go b/cli/internal/cli.go index 48b94a02..8423b6fe 100644 --- a/cli/internal/cli.go +++ b/cli/internal/cli.go @@ -106,6 +106,7 @@ var DebugFlag = &cli.BoolFlag{ Name: "debug", Aliases: []string{"d"}, Destination: &Debug, + Persistent: true, Usage: "Show DEBUG messages", } diff --git a/cli/recipe/diff.go b/cli/recipe/diff.go index 118714f6..936d27ef 100644 --- a/cli/recipe/diff.go +++ b/cli/recipe/diff.go @@ -17,7 +17,6 @@ var recipeDiffCommand = cli.Command{ Aliases: []string{"d"}, ArgsUsage: "", Flags: []cli.Flag{ - internal.DebugFlag, internal.NoInputFlag, }, Before: internal.SubCommandBefore, diff --git a/cli/recipe/fetch.go b/cli/recipe/fetch.go index a3a67c78..6a104ff4 100644 --- a/cli/recipe/fetch.go +++ b/cli/recipe/fetch.go @@ -18,7 +18,6 @@ var recipeFetchCommand = cli.Command{ ArgsUsage: "[]", Description: "Retrieves all recipes if no argument is passed", Flags: []cli.Flag{ - internal.DebugFlag, internal.NoInputFlag, internal.OfflineFlag, }, diff --git a/cli/recipe/lint.go b/cli/recipe/lint.go index 418deab7..be55a278 100644 --- a/cli/recipe/lint.go +++ b/cli/recipe/lint.go @@ -18,7 +18,6 @@ var recipeLintCommand = cli.Command{ Aliases: []string{"l"}, ArgsUsage: "", Flags: []cli.Flag{ - internal.DebugFlag, internal.OnlyErrorFlag, internal.OfflineFlag, internal.NoInputFlag, diff --git a/cli/recipe/list.go b/cli/recipe/list.go index 73b0ebe7..f69594e1 100644 --- a/cli/recipe/list.go +++ b/cli/recipe/list.go @@ -28,7 +28,6 @@ var recipeListCommand = cli.Command{ Usage: "List available recipes", Aliases: []string{"ls"}, Flags: []cli.Flag{ - internal.DebugFlag, internal.MachineReadableFlag, patternFlag, internal.OfflineFlag, diff --git a/cli/recipe/new.go b/cli/recipe/new.go index 4ed01b16..c80f2eec 100644 --- a/cli/recipe/new.go +++ b/cli/recipe/new.go @@ -35,7 +35,6 @@ var recipeNewCommand = cli.Command{ Name: "new", Aliases: []string{"n"}, Flags: []cli.Flag{ - internal.DebugFlag, internal.NoInputFlag, internal.OfflineFlag, internal.GitNameFlag, diff --git a/cli/recipe/release.go b/cli/recipe/release.go index 506875f3..88135748 100644 --- a/cli/recipe/release.go +++ b/cli/recipe/release.go @@ -47,7 +47,6 @@ Publish your new release to git.coopcloud.tech with "-p/--publish". This requires that you have permission to git push to these repositories and have your SSH keys configured on your account.`, Flags: []cli.Flag{ - internal.DebugFlag, internal.NoInputFlag, internal.DryFlag, internal.MajorFlag, diff --git a/cli/recipe/reset.go b/cli/recipe/reset.go index be0f8e6b..32c4c786 100644 --- a/cli/recipe/reset.go +++ b/cli/recipe/reset.go @@ -18,7 +18,6 @@ var recipeResetCommand = cli.Command{ Aliases: []string{"rs"}, ArgsUsage: "", Flags: []cli.Flag{ - internal.DebugFlag, internal.NoInputFlag, }, Before: internal.SubCommandBefore, diff --git a/cli/recipe/sync.go b/cli/recipe/sync.go index c85992b7..f0c3617f 100644 --- a/cli/recipe/sync.go +++ b/cli/recipe/sync.go @@ -22,7 +22,6 @@ var recipeSyncCommand = cli.Command{ Usage: "Sync recipe version label", ArgsUsage: " []", Flags: []cli.Flag{ - internal.DebugFlag, internal.NoInputFlag, internal.DryFlag, internal.MajorFlag, diff --git a/cli/recipe/upgrade.go b/cli/recipe/upgrade.go index 358bd8ac..6e1d5324 100644 --- a/cli/recipe/upgrade.go +++ b/cli/recipe/upgrade.go @@ -61,7 +61,6 @@ EXAMPLE: abra recipe upgrade`, ArgsUsage: "", Flags: []cli.Flag{ - internal.DebugFlag, internal.NoInputFlag, internal.PatchFlag, internal.MinorFlag, diff --git a/cli/recipe/version.go b/cli/recipe/version.go index 9ba346ed..0c887f11 100644 --- a/cli/recipe/version.go +++ b/cli/recipe/version.go @@ -30,7 +30,6 @@ var recipeVersionCommand = cli.Command{ Usage: "List recipe versions", ArgsUsage: "", Flags: []cli.Flag{ - internal.DebugFlag, internal.OfflineFlag, internal.NoInputFlag, internal.MachineReadableFlag, diff --git a/cli/server/add.go b/cli/server/add.go index c4a09fbe..6f42d4df 100644 --- a/cli/server/add.go +++ b/cli/server/add.go @@ -125,7 +125,6 @@ of your ~/.ssh/config. Checks for a valid online domain will be skipped: abra server add -D example`, Flags: []cli.Flag{ - internal.DebugFlag, internal.NoInputFlag, internal.NoDomainChecksFlag, localFlag, diff --git a/cli/server/prune.go b/cli/server/prune.go index c773d108..3fd0da33 100644 --- a/cli/server/prune.go +++ b/cli/server/prune.go @@ -43,7 +43,6 @@ app. This can result in unwanted data loss if not used carefully.`, Flags: []cli.Flag{ allFilterFlag, volumesFilterFlag, - internal.DebugFlag, internal.OfflineFlag, internal.NoInputFlag, }, diff --git a/cli/server/remove.go b/cli/server/remove.go index b0b8add9..c3f53ce4 100644 --- a/cli/server/remove.go +++ b/cli/server/remove.go @@ -25,7 +25,6 @@ Abra will remove the internal bookkeeping (~/.abra/servers/...) and underlying client connection context. This server will then be lost in time, like tears in rain.`, Flags: []cli.Flag{ - internal.DebugFlag, internal.NoInputFlag, internal.OfflineFlag, }, diff --git a/cli/updater/updater.go b/cli/updater/updater.go index 3f1f9274..f0a1d4ff 100644 --- a/cli/updater/updater.go +++ b/cli/updater/updater.go @@ -50,7 +50,6 @@ var Notify = cli.Command{ Aliases: []string{"n"}, Usage: "Check for available upgrades", Flags: []cli.Flag{ - internal.DebugFlag, majorFlag, internal.OfflineFlag, },