refactor: persistent DebugFlag

This commit is contained in:
decentral1se 2024-07-09 15:54:35 +02:00
parent ca37621ce3
commit 2c9e13d3d4
Signed by: decentral1se
GPG Key ID: 03789458B3D0C410
37 changed files with 12 additions and 54 deletions

View File

@ -39,7 +39,6 @@ var appBackupListCommand = cli.Command{
Name: "list", Name: "list",
Aliases: []string{"ls"}, Aliases: []string{"ls"},
Flags: []cli.Flag{ Flags: []cli.Flag{
internal.DebugFlag,
internal.OfflineFlag, internal.OfflineFlag,
snapshotFlag, snapshotFlag,
includePathFlag, includePathFlag,
@ -87,7 +86,6 @@ var appBackupDownloadCommand = cli.Command{
Name: "download", Name: "download",
Aliases: []string{"d"}, Aliases: []string{"d"},
Flags: []cli.Flag{ Flags: []cli.Flag{
internal.DebugFlag,
internal.OfflineFlag, internal.OfflineFlag,
snapshotFlag, snapshotFlag,
includePathFlag, includePathFlag,
@ -159,7 +157,6 @@ var appBackupCreateCommand = cli.Command{
Name: "create", Name: "create",
Aliases: []string{"c"}, Aliases: []string{"c"},
Flags: []cli.Flag{ Flags: []cli.Flag{
internal.DebugFlag,
internal.OfflineFlag, internal.OfflineFlag,
resticRepoFlag, resticRepoFlag,
}, },
@ -218,7 +215,6 @@ var appBackupSnapshotsCommand = cli.Command{
Name: "snapshots", Name: "snapshots",
Aliases: []string{"s"}, Aliases: []string{"s"},
Flags: []cli.Flag{ Flags: []cli.Flag{
internal.DebugFlag,
internal.OfflineFlag, internal.OfflineFlag,
snapshotFlag, snapshotFlag,
}, },

View File

@ -29,7 +29,6 @@ recipes regardless of commenting or not (e.g. through the use of
${FOO:<default>} syntax). "check" does not confirm or deny this for you.`, ${FOO:<default>} syntax). "check" does not confirm or deny this for you.`,
ArgsUsage: "<domain>", ArgsUsage: "<domain>",
Flags: []cli.Flag{ Flags: []cli.Flag{
internal.DebugFlag,
internal.ChaosFlag, internal.ChaosFlag,
internal.OfflineFlag, internal.OfflineFlag,
}, },

View File

@ -37,7 +37,6 @@ EXAMPLE:
abra app cmd --local example.com app create_user -- me@example.com`, abra app cmd --local example.com app create_user -- me@example.com`,
ArgsUsage: "<domain> [<service>] <command> [-- <args>]", ArgsUsage: "<domain> [<service>] <command> [-- <args>]",
Flags: []cli.Flag{ Flags: []cli.Flag{
internal.DebugFlag,
internal.LocalCmdFlag, internal.LocalCmdFlag,
internal.RemoteUserFlag, internal.RemoteUserFlag,
internal.TtyFlag, internal.TtyFlag,
@ -205,7 +204,6 @@ var appCmdListCommand = cli.Command{
Usage: "List all available commands", Usage: "List all available commands",
ArgsUsage: "<domain>", ArgsUsage: "<domain>",
Flags: []cli.Flag{ Flags: []cli.Flag{
internal.DebugFlag,
internal.OfflineFlag, internal.OfflineFlag,
internal.ChaosFlag, internal.ChaosFlag,
}, },

View File

@ -15,13 +15,10 @@ import (
) )
var appConfigCommand = cli.Command{ var appConfigCommand = cli.Command{
Name: "config", Name: "config",
Aliases: []string{"cfg"}, Aliases: []string{"cfg"},
Usage: "Edit app config", Usage: "Edit app config",
ArgsUsage: "<domain>", ArgsUsage: "<domain>",
Flags: []cli.Flag{
internal.DebugFlag,
},
Before: internal.SubCommandBefore, Before: internal.SubCommandBefore,
EnableShellCompletion: true, EnableShellCompletion: true,
ShellComplete: autocomplete.AppNameComplete, ShellComplete: autocomplete.AppNameComplete,

View File

@ -30,7 +30,6 @@ var appCpCommand = cli.Command{
Aliases: []string{"c"}, Aliases: []string{"c"},
ArgsUsage: "<domain> <src> <dst>", ArgsUsage: "<domain> <src> <dst>",
Flags: []cli.Flag{ Flags: []cli.Flag{
internal.DebugFlag,
internal.NoInputFlag, internal.NoInputFlag,
}, },
Before: internal.SubCommandBefore, Before: internal.SubCommandBefore,

View File

@ -24,7 +24,6 @@ var appDeployCommand = cli.Command{
Usage: "Deploy an app", Usage: "Deploy an app",
ArgsUsage: "<domain> [<version>]", ArgsUsage: "<domain> [<version>]",
Flags: []cli.Flag{ Flags: []cli.Flag{
internal.DebugFlag,
internal.NoInputFlag, internal.NoInputFlag,
internal.ForceFlag, internal.ForceFlag,
internal.ChaosFlag, internal.ChaosFlag,

View File

@ -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 actual live deployment status. Depending on how many servers you manage, this
can take some time.`, can take some time.`,
Flags: []cli.Flag{ Flags: []cli.Flag{
internal.DebugFlag,
internal.MachineReadableFlag, internal.MachineReadableFlag,
statusFlag, statusFlag,
listAppServerFlag, listAppServerFlag,

View File

@ -30,7 +30,6 @@ var appLogsCommand = cli.Command{
Flags: []cli.Flag{ Flags: []cli.Flag{
internal.StdErrOnlyFlag, internal.StdErrOnlyFlag,
internal.SinceLogsFlag, internal.SinceLogsFlag,
internal.DebugFlag,
}, },
Before: internal.SubCommandBefore, Before: internal.SubCommandBefore,
EnableShellCompletion: true, EnableShellCompletion: true,

View File

@ -44,7 +44,6 @@ var appNewCommand = cli.Command{
Usage: "Create a new app", Usage: "Create a new app",
Description: appNewDescription, Description: appNewDescription,
Flags: []cli.Flag{ Flags: []cli.Flag{
internal.DebugFlag,
internal.NoInputFlag, internal.NoInputFlag,
internal.NewAppServerFlag, internal.NewAppServerFlag,
internal.DomainFlag, internal.DomainFlag,

View File

@ -28,7 +28,6 @@ var appPsCommand = cli.Command{
Description: "Show status of a deployed app.", Description: "Show status of a deployed app.",
Flags: []cli.Flag{ Flags: []cli.Flag{
internal.MachineReadableFlag, internal.MachineReadableFlag,
internal.DebugFlag,
}, },
Before: internal.SubCommandBefore, Before: internal.SubCommandBefore,
EnableShellCompletion: true, EnableShellCompletion: true,

View File

@ -39,7 +39,6 @@ To delete everything without prompt, use the "--force/-f" or the "--no-input/n"
flag.`, flag.`,
Flags: []cli.Flag{ Flags: []cli.Flag{
internal.ForceFlag, internal.ForceFlag,
internal.DebugFlag,
internal.NoInputFlag, internal.NoInputFlag,
internal.OfflineFlag, internal.OfflineFlag,
}, },

View File

@ -21,7 +21,6 @@ var appRestartCommand = cli.Command{
Usage: "Restart an app", Usage: "Restart an app",
ArgsUsage: "<domain> [<service>]", ArgsUsage: "<domain> [<service>]",
Flags: []cli.Flag{ Flags: []cli.Flag{
internal.DebugFlag,
internal.OfflineFlag, internal.OfflineFlag,
internal.AllServicesFlag, internal.AllServicesFlag,
}, },

View File

@ -25,7 +25,6 @@ var appRestoreCommand = cli.Command{
Usage: "Restore an app backup", Usage: "Restore an app backup",
ArgsUsage: "<domain> <service>", ArgsUsage: "<domain> <service>",
Flags: []cli.Flag{ Flags: []cli.Flag{
internal.DebugFlag,
internal.OfflineFlag, internal.OfflineFlag,
targetPathFlag, targetPathFlag,
}, },

View File

@ -24,7 +24,6 @@ var appRollbackCommand = cli.Command{
Usage: "Roll an app back to a previous version", Usage: "Roll an app back to a previous version",
ArgsUsage: "<domain> [<version>]", ArgsUsage: "<domain> [<version>]",
Flags: []cli.Flag{ Flags: []cli.Flag{
internal.DebugFlag,
internal.NoInputFlag, internal.NoInputFlag,
internal.ForceFlag, internal.ForceFlag,
internal.NoDomainChecksFlag, internal.NoDomainChecksFlag,

View File

@ -36,7 +36,6 @@ var appRunCommand = cli.Command{
Name: "run", Name: "run",
Aliases: []string{"r"}, Aliases: []string{"r"},
Flags: []cli.Flag{ Flags: []cli.Flag{
internal.DebugFlag,
noTTYFlag, noTTYFlag,
userFlag, userFlag,
}, },

View File

@ -46,7 +46,6 @@ var appSecretGenerateCommand = cli.Command{
Usage: "Generate secrets", Usage: "Generate secrets",
ArgsUsage: "<domain> <secret> <version>", ArgsUsage: "<domain> <secret> <version>",
Flags: []cli.Flag{ Flags: []cli.Flag{
internal.DebugFlag,
allSecretsFlag, allSecretsFlag,
internal.PassFlag, internal.PassFlag,
internal.MachineReadableFlag, internal.MachineReadableFlag,

View File

@ -17,13 +17,10 @@ import (
) )
var appServicesCommand = cli.Command{ var appServicesCommand = cli.Command{
Name: "services", Name: "services",
Aliases: []string{"sr"}, Aliases: []string{"sr"},
Usage: "Display all services of an app", Usage: "Display all services of an app",
ArgsUsage: "<domain>", ArgsUsage: "<domain>",
Flags: []cli.Flag{
internal.DebugFlag,
},
Before: internal.SubCommandBefore, Before: internal.SubCommandBefore,
EnableShellCompletion: true, EnableShellCompletion: true,
ShellComplete: autocomplete.AppNameComplete, ShellComplete: autocomplete.AppNameComplete,

View File

@ -66,7 +66,6 @@ var appUndeployCommand = cli.Command{
Aliases: []string{"un"}, Aliases: []string{"un"},
ArgsUsage: "<domain>", ArgsUsage: "<domain>",
Flags: []cli.Flag{ Flags: []cli.Flag{
internal.DebugFlag,
internal.NoInputFlag, internal.NoInputFlag,
pruneFlag, pruneFlag,
}, },

View File

@ -23,7 +23,6 @@ var appUpgradeCommand = cli.Command{
Usage: "Upgrade an app", Usage: "Upgrade an app",
ArgsUsage: "<domain> [<version>]", ArgsUsage: "<domain> [<version>]",
Flags: []cli.Flag{ Flags: []cli.Flag{
internal.DebugFlag,
internal.NoInputFlag, internal.NoInputFlag,
internal.ForceFlag, internal.ForceFlag,
internal.NoDomainChecksFlag, internal.NoDomainChecksFlag,

View File

@ -18,7 +18,6 @@ var appVolumeListCommand = cli.Command{
Aliases: []string{"ls"}, Aliases: []string{"ls"},
ArgsUsage: "<domain>", ArgsUsage: "<domain>",
Flags: []cli.Flag{ Flags: []cli.Flag{
internal.DebugFlag,
internal.NoInputFlag, internal.NoInputFlag,
}, },
Before: internal.SubCommandBefore, Before: internal.SubCommandBefore,

View File

@ -24,7 +24,6 @@ var catalogueGenerateCommand = cli.Command{
Aliases: []string{"g"}, Aliases: []string{"g"},
Usage: "Generate the recipe catalogue", Usage: "Generate the recipe catalogue",
Flags: []cli.Flag{ Flags: []cli.Flag{
internal.DebugFlag,
internal.NoInputFlag, internal.NoInputFlag,
internal.PublishFlag, internal.PublishFlag,
internal.DryFlag, internal.DryFlag,

View File

@ -36,9 +36,6 @@ EXAMPLE:
abra autocomplete bash`, abra autocomplete bash`,
ArgsUsage: "<shell>", ArgsUsage: "<shell>",
Flags: []cli.Flag{
internal.DebugFlag,
},
Action: func(ctx context.Context, cmd *cli.Command) error { Action: func(ctx context.Context, cmd *cli.Command) error {
shellType := cmd.Args().First() shellType := cmd.Args().First()
@ -157,6 +154,9 @@ func newAbraApp(version, commit string) *cli.Command {
|_| |_|
`, `,
Version: fmt.Sprintf("%s-%s", version, commit[:7]), Version: fmt.Sprintf("%s-%s", version, commit[:7]),
Flags: []cli.Flag{
internal.DebugFlag,
},
Commands: []*cli.Command{ Commands: []*cli.Command{
&app.AppCommand, &app.AppCommand,
&server.ServerCommand, &server.ServerCommand,

View File

@ -106,6 +106,7 @@ var DebugFlag = &cli.BoolFlag{
Name: "debug", Name: "debug",
Aliases: []string{"d"}, Aliases: []string{"d"},
Destination: &Debug, Destination: &Debug,
Persistent: true,
Usage: "Show DEBUG messages", Usage: "Show DEBUG messages",
} }

View File

@ -17,7 +17,6 @@ var recipeDiffCommand = cli.Command{
Aliases: []string{"d"}, Aliases: []string{"d"},
ArgsUsage: "<recipe>", ArgsUsage: "<recipe>",
Flags: []cli.Flag{ Flags: []cli.Flag{
internal.DebugFlag,
internal.NoInputFlag, internal.NoInputFlag,
}, },
Before: internal.SubCommandBefore, Before: internal.SubCommandBefore,

View File

@ -18,7 +18,6 @@ var recipeFetchCommand = cli.Command{
ArgsUsage: "[<recipe>]", ArgsUsage: "[<recipe>]",
Description: "Retrieves all recipes if no <recipe> argument is passed", Description: "Retrieves all recipes if no <recipe> argument is passed",
Flags: []cli.Flag{ Flags: []cli.Flag{
internal.DebugFlag,
internal.NoInputFlag, internal.NoInputFlag,
internal.OfflineFlag, internal.OfflineFlag,
}, },

View File

@ -18,7 +18,6 @@ var recipeLintCommand = cli.Command{
Aliases: []string{"l"}, Aliases: []string{"l"},
ArgsUsage: "<recipe>", ArgsUsage: "<recipe>",
Flags: []cli.Flag{ Flags: []cli.Flag{
internal.DebugFlag,
internal.OnlyErrorFlag, internal.OnlyErrorFlag,
internal.OfflineFlag, internal.OfflineFlag,
internal.NoInputFlag, internal.NoInputFlag,

View File

@ -28,7 +28,6 @@ var recipeListCommand = cli.Command{
Usage: "List available recipes", Usage: "List available recipes",
Aliases: []string{"ls"}, Aliases: []string{"ls"},
Flags: []cli.Flag{ Flags: []cli.Flag{
internal.DebugFlag,
internal.MachineReadableFlag, internal.MachineReadableFlag,
patternFlag, patternFlag,
internal.OfflineFlag, internal.OfflineFlag,

View File

@ -35,7 +35,6 @@ var recipeNewCommand = cli.Command{
Name: "new", Name: "new",
Aliases: []string{"n"}, Aliases: []string{"n"},
Flags: []cli.Flag{ Flags: []cli.Flag{
internal.DebugFlag,
internal.NoInputFlag, internal.NoInputFlag,
internal.OfflineFlag, internal.OfflineFlag,
internal.GitNameFlag, internal.GitNameFlag,

View File

@ -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 requires that you have permission to git push to these repositories and have
your SSH keys configured on your account.`, your SSH keys configured on your account.`,
Flags: []cli.Flag{ Flags: []cli.Flag{
internal.DebugFlag,
internal.NoInputFlag, internal.NoInputFlag,
internal.DryFlag, internal.DryFlag,
internal.MajorFlag, internal.MajorFlag,

View File

@ -18,7 +18,6 @@ var recipeResetCommand = cli.Command{
Aliases: []string{"rs"}, Aliases: []string{"rs"},
ArgsUsage: "<recipe>", ArgsUsage: "<recipe>",
Flags: []cli.Flag{ Flags: []cli.Flag{
internal.DebugFlag,
internal.NoInputFlag, internal.NoInputFlag,
}, },
Before: internal.SubCommandBefore, Before: internal.SubCommandBefore,

View File

@ -22,7 +22,6 @@ var recipeSyncCommand = cli.Command{
Usage: "Sync recipe version label", Usage: "Sync recipe version label",
ArgsUsage: "<recipe> [<version>]", ArgsUsage: "<recipe> [<version>]",
Flags: []cli.Flag{ Flags: []cli.Flag{
internal.DebugFlag,
internal.NoInputFlag, internal.NoInputFlag,
internal.DryFlag, internal.DryFlag,
internal.MajorFlag, internal.MajorFlag,

View File

@ -61,7 +61,6 @@ EXAMPLE:
abra recipe upgrade`, abra recipe upgrade`,
ArgsUsage: "<recipe>", ArgsUsage: "<recipe>",
Flags: []cli.Flag{ Flags: []cli.Flag{
internal.DebugFlag,
internal.NoInputFlag, internal.NoInputFlag,
internal.PatchFlag, internal.PatchFlag,
internal.MinorFlag, internal.MinorFlag,

View File

@ -30,7 +30,6 @@ var recipeVersionCommand = cli.Command{
Usage: "List recipe versions", Usage: "List recipe versions",
ArgsUsage: "<recipe>", ArgsUsage: "<recipe>",
Flags: []cli.Flag{ Flags: []cli.Flag{
internal.DebugFlag,
internal.OfflineFlag, internal.OfflineFlag,
internal.NoInputFlag, internal.NoInputFlag,
internal.MachineReadableFlag, internal.MachineReadableFlag,

View File

@ -125,7 +125,6 @@ of your ~/.ssh/config. Checks for a valid online domain will be skipped:
abra server add -D example`, abra server add -D example`,
Flags: []cli.Flag{ Flags: []cli.Flag{
internal.DebugFlag,
internal.NoInputFlag, internal.NoInputFlag,
internal.NoDomainChecksFlag, internal.NoDomainChecksFlag,
localFlag, localFlag,

View File

@ -43,7 +43,6 @@ app. This can result in unwanted data loss if not used carefully.`,
Flags: []cli.Flag{ Flags: []cli.Flag{
allFilterFlag, allFilterFlag,
volumesFilterFlag, volumesFilterFlag,
internal.DebugFlag,
internal.OfflineFlag, internal.OfflineFlag,
internal.NoInputFlag, internal.NoInputFlag,
}, },

View File

@ -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 client connection context. This server will then be lost in time, like tears in
rain.`, rain.`,
Flags: []cli.Flag{ Flags: []cli.Flag{
internal.DebugFlag,
internal.NoInputFlag, internal.NoInputFlag,
internal.OfflineFlag, internal.OfflineFlag,
}, },

View File

@ -50,7 +50,6 @@ var Notify = cli.Command{
Aliases: []string{"n"}, Aliases: []string{"n"},
Usage: "Check for available upgrades", Usage: "Check for available upgrades",
Flags: []cli.Flag{ Flags: []cli.Flag{
internal.DebugFlag,
majorFlag, majorFlag,
internal.OfflineFlag, internal.OfflineFlag,
}, },