refactor: persistent offline/noinput

cli/app/backup.go

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

cli/app/cmd.go

@@ -37,7 +37,6 @@ using the "-- <cmd-args>" syntax.
 		internal.LocalCmdFlag,
 		internal.RemoteUserFlag,
 		internal.TtyFlag,
-		internal.OfflineFlag,
 		internal.ChaosFlag,
 	},
 	Before: internal.SubCommandBefore,
@@ -202,7 +201,6 @@ var appCmdListCommand = cli.Command{
 	UsageText:       "abra app cmd ls [options] <domain>",
 	HideHelpCommand: true,
 	Flags: []cli.Flag{
-		internal.OfflineFlag,
 		internal.ChaosFlag,
 	},
 	EnableShellCompletion: true,

cli/app/cp.go

@@ -30,11 +30,8 @@ var appCpCommand = cli.Command{
 	Aliases:         []string{"c"},
 	HideHelpCommand: true,
 	UsageText:       "abra app cp [options] <domain> <src> <dst>",
-	Flags: []cli.Flag{
+	Before:          internal.SubCommandBefore,
-		internal.NoInputFlag,
+	Usage:           "Copy files to/from a deployed app service",
-	},
-	Before: internal.SubCommandBefore,
-	Usage:  "Copy files to/from a deployed app service",
 	Description: `Copy files to and from any app service file system.
 
 If you want to copy a myfile.txt to the root of the app service:

cli/app/deploy.go

@@ -26,12 +26,10 @@ var appDeployCommand = cli.Command{
 	HideHelpCommand: true,
 	UsageText:       "abra app deploy [options] <domain> [<version>]",
 	Flags: []cli.Flag{
-		internal.NoInputFlag,
 		internal.ForceFlag,
 		internal.ChaosFlag,
 		internal.NoDomainChecksFlag,
 		internal.DontWaitConvergeFlag,
-		internal.OfflineFlag,
 	},
 	Before: internal.SubCommandBefore,
 	Description: `Deploy an app.

cli/app/list.go

@@ -86,7 +86,6 @@ can take some time.`,
 		statusFlag,
 		listAppServerFlag,
 		recipeFlag,
-		internal.OfflineFlag,
 	},
 	Before: internal.SubCommandBefore,
 	Action: func(ctx context.Context, cmd *cli.Command) error {

cli/app/new.go

@@ -45,12 +45,10 @@ var appNewCommand = cli.Command{
 	Usage:       "Create a new app",
 	Description: appNewDescription,
 	Flags: []cli.Flag{
-		internal.NoInputFlag,
 		internal.NewAppServerFlag,
 		internal.DomainFlag,
 		internal.PassFlag,
 		internal.SecretsFlag,
-		internal.OfflineFlag,
 		internal.ChaosFlag,
 	},
 	Before:                internal.SubCommandBefore,

cli/app/remove.go

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

cli/app/restart.go

@@ -22,7 +22,6 @@ var appRestartCommand = cli.Command{
 	HideHelpCommand: true,
 	UsageText:       "abra app restart [options] <domain> [<service>]",
 	Flags: []cli.Flag{
-		internal.OfflineFlag,
 		internal.AllServicesFlag,
 	},
 	Before: internal.SubCommandBefore,

cli/app/restore.go

@@ -26,7 +26,6 @@ var appRestoreCommand = cli.Command{
 	HideHelpCommand: true,
 	UsageText:       "abra app restore [options] <domain> <service>",
 	Flags: []cli.Flag{
-		internal.OfflineFlag,
 		targetPathFlag,
 	},
 	Before:                internal.SubCommandBefore,

cli/app/rollback.go

@@ -25,11 +25,9 @@ var appRollbackCommand = cli.Command{
 	HideHelpCommand: true,
 	UsageText:       "abra app rollback [options] <domain> [<version>]",
 	Flags: []cli.Flag{
-		internal.NoInputFlag,
 		internal.ForceFlag,
 		internal.NoDomainChecksFlag,
 		internal.DontWaitConvergeFlag,
-		internal.OfflineFlag,
 	},
 	Before: internal.SubCommandBefore,
 	Description: `This command rolls an app back to a previous version.

cli/app/secret.go

@@ -50,7 +50,6 @@ var appSecretGenerateCommand = cli.Command{
 		allSecretsFlag,
 		internal.PassFlag,
 		internal.MachineReadableFlag,
-		internal.OfflineFlag,
 		internal.ChaosFlag,
 	},
 	Before:                internal.SubCommandBefore,

cli/app/undeploy.go

@@ -67,7 +67,6 @@ var appUndeployCommand = cli.Command{
 	UsageText:       "abra app undeploy [options] <domain>",
 	HideHelpCommand: true,
 	Flags: []cli.Flag{
-		internal.NoInputFlag,
 		pruneFlag,
 	},
 	Before:                internal.SubCommandBefore,

cli/app/upgrade.go

@@ -23,11 +23,9 @@ var appUpgradeCommand = cli.Command{
 	Usage:     "Upgrade an app",
 	UsageText: "abra app upgrade [options] <domain> [<version>]",
 	Flags: []cli.Flag{
-		internal.NoInputFlag,
 		internal.ForceFlag,
 		internal.NoDomainChecksFlag,
 		internal.DontWaitConvergeFlag,
-		internal.OfflineFlag,
 		internal.ReleaseNotesFlag,
 	},
 	Before: internal.SubCommandBefore,

cli/app/volume.go

@@ -14,12 +14,9 @@ import (
 )
 
 var appVolumeListCommand = cli.Command{
-	Name:      "list",
+	Name:                  "list",
-	Aliases:   []string{"ls"},
+	Aliases:               []string{"ls"},
-	UsageText: "abra app volume list [options] <domain>",
+	UsageText:             "abra app volume list [options] <domain>",
-	Flags: []cli.Flag{
-		internal.NoInputFlag,
-	},
 	Before:                internal.SubCommandBefore,
 	Usage:                 "List volumes associated with an app",
 	HideHelpCommand:       true,

cli/catalogue/catalogue.go

@@ -26,12 +26,10 @@ var catalogueGenerateCommand = cli.Command{
 	HideHelpCommand: true,
 	UsageText:       "abra catalogue generate [options] [<recipe>]",
 	Flags: []cli.Flag{
-		internal.NoInputFlag,
 		internal.PublishFlag,
 		internal.DryFlag,
 		internal.SkipUpdatesFlag,
 		internal.ChaosFlag,
-		internal.OfflineFlag,
 	},
 	Before: internal.SubCommandBefore,
 	Description: `Generate a new copy of the recipe catalogue.

cli/cli.go

@@ -139,6 +139,8 @@ func newAbraApp(version, commit string) *cli.Command {
 		Version:   fmt.Sprintf("%s-%s", version, commit[:7]),
 		Flags: []cli.Flag{
 			internal.DebugFlag,
+			internal.OfflineFlag,
+			internal.NoInputFlag,
 		},
 		Commands: []*cli.Command{
 			&app.AppCommand,

cli/internal/cli.go

@@ -96,6 +96,7 @@ var NoInputFlag = &cli.BoolFlag{
 	Aliases:     []string{"n"},
 	Usage:       "Toggle non-interactive mode",
 	Destination: &NoInput,
+	Persistent:  true,
 }
 
 // Debug stores the variable from DebugFlag.
@@ -119,6 +120,7 @@ var OfflineFlag = &cli.BoolFlag{
 	Aliases:     []string{"o"},
 	Destination: &Offline,
 	Usage:       "Prefer offline & filesystem access when possible",
+	Persistent:  true,
 }
 
 // ReleaseNotes stores the variable from ReleaseNotesFlag.

cli/recipe/diff.go

@@ -11,15 +11,12 @@ import (
 )
 
 var recipeDiffCommand = cli.Command{
-	Name:            "diff",
+	Name:                  "diff",
-	Usage:           "Show unstaged changes in recipe config",
+	Usage:                 "Show unstaged changes in recipe config",
-	Description:     "This command requires /usr/bin/git.",
+	Description:           "This command requires /usr/bin/git.",
-	HideHelpCommand: true,
+	HideHelpCommand:       true,
-	Aliases:         []string{"d"},
+	Aliases:               []string{"d"},
-	UsageText:       "abra recipe diff [options] <recipe>",
+	UsageText:             "abra recipe diff [options] <recipe>",
-	Flags: []cli.Flag{
-		internal.NoInputFlag,
-	},
 	Before:                internal.SubCommandBefore,
 	EnableShellCompletion: true,
 	ShellComplete:         autocomplete.RecipeNameComplete,

cli/recipe/fetch.go

@@ -12,15 +12,11 @@ import (
 )
 
 var recipeFetchCommand = cli.Command{
-	Name:        "fetch",
+	Name:                  "fetch",
-	Usage:       "Fetch recipe(s)",
+	Usage:                 "Fetch recipe(s)",
-	Aliases:     []string{"f"},
+	Aliases:               []string{"f"},
-	UsageText:   "abra recipe fetch [options] [<recipe>]",
+	UsageText:             "abra recipe fetch [options] [<recipe>]",
-	Description: "Retrieves all recipes if no <recipe> argument is passed",
+	Description:           "Retrieves all recipes if no <recipe> argument is passed",
-	Flags: []cli.Flag{
-		internal.NoInputFlag,
-		internal.OfflineFlag,
-	},
 	Before:                internal.SubCommandBefore,
 	EnableShellCompletion: true,
 	ShellComplete:         autocomplete.RecipeNameComplete,

cli/recipe/lint.go

@@ -20,8 +20,6 @@ var recipeLintCommand = cli.Command{
 	HideHelpCommand: true,
 	Flags: []cli.Flag{
 		internal.OnlyErrorFlag,
-		internal.OfflineFlag,
-		internal.NoInputFlag,
 		internal.ChaosFlag,
 	},
 	Before:                internal.SubCommandBefore,

cli/recipe/list.go

@@ -32,7 +32,6 @@ var recipeListCommand = cli.Command{
 	Flags: []cli.Flag{
 		internal.MachineReadableFlag,
 		patternFlag,
-		internal.OfflineFlag,
 	},
 	Before: internal.SubCommandBefore,
 	Action: func(ctx context.Context, cmd *cli.Command) error {

cli/recipe/new.go

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

cli/recipe/release.go

@@ -49,13 +49,11 @@ 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.NoInputFlag,
 		internal.DryFlag,
 		internal.MajorFlag,
 		internal.MinorFlag,
 		internal.PatchFlag,
 		internal.PublishFlag,
-		internal.OfflineFlag,
 	},
 	Before:                internal.SubCommandBefore,
 	EnableShellCompletion: true,

cli/recipe/reset.go

@@ -12,15 +12,12 @@ import (
 )
 
 var recipeResetCommand = cli.Command{
-	Name:            "reset",
+	Name:                  "reset",
-	Usage:           "Remove all unstaged changes from recipe config",
+	Usage:                 "Remove all unstaged changes from recipe config",
-	Description:     "WARNING: this will delete your changes. Be Careful.",
+	Description:           "WARNING: this will delete your changes. Be Careful.",
-	HideHelpCommand: true,
+	HideHelpCommand:       true,
-	Aliases:         []string{"rs"},
+	Aliases:               []string{"rs"},
-	UsageText:       "abra recipe reset [options] <recipe>",
+	UsageText:             "abra recipe reset [options] <recipe>",
-	Flags: []cli.Flag{
-		internal.NoInputFlag,
-	},
 	Before:                internal.SubCommandBefore,
 	EnableShellCompletion: true,
 	ShellComplete:         autocomplete.RecipeNameComplete,

cli/recipe/sync.go

@@ -23,7 +23,6 @@ var recipeSyncCommand = cli.Command{
 	HideHelpCommand: true,
 	UsageText:       "abra recipe lint [options] <recipe> [<version>]",
 	Flags: []cli.Flag{
-		internal.NoInputFlag,
 		internal.DryFlag,
 		internal.MajorFlag,
 		internal.MinorFlag,

cli/recipe/upgrade.go

@@ -57,7 +57,6 @@ interface.
 You may invoke this command in "wizard" mode and be prompted for input.`,
 	UsageText: "abra recipe upgrade [options] [<recipe>]",
 	Flags: []cli.Flag{
-		internal.NoInputFlag,
 		internal.PatchFlag,
 		internal.MinorFlag,
 		internal.MajorFlag,

cli/recipe/version.go

@@ -31,8 +31,6 @@ var recipeVersionCommand = cli.Command{
 	UsageText:       "abra recipe version [options] <recipe>",
 	HideHelpCommand: true,
 	Flags: []cli.Flag{
-		internal.OfflineFlag,
-		internal.NoInputFlag,
 		internal.MachineReadableFlag,
 	},
 	Before:                internal.SubCommandBefore,

cli/server/add.go

@@ -120,7 +120,6 @@ You can also pass "--no-domain-checks/-D" flag to use any arbitrary name
 instead of a real domain. The host will be resolved with the "Hostname" entry
 of your ~/.ssh/config. Checks for a valid online domain will be skipped.`,
 	Flags: []cli.Flag{
-		internal.NoInputFlag,
 		internal.NoDomainChecksFlag,
 		localFlag,
 	},

cli/server/list.go

@@ -22,7 +22,6 @@ var serverListCommand = cli.Command{
 	Flags: []cli.Flag{
 		internal.DebugFlag,
 		internal.MachineReadableFlag,
-		internal.OfflineFlag,
 	},
 	Before: internal.SubCommandBefore,
 	Action: func(ctx context.Context, cmd *cli.Command) error {

cli/server/prune.go

@@ -44,8 +44,6 @@ app. This can result in unwanted data loss if not used carefully.`,
 	Flags: []cli.Flag{
 		allFilterFlag,
 		volumesFilterFlag,
-		internal.OfflineFlag,
-		internal.NoInputFlag,
 	},
 	Before:                internal.SubCommandBefore,
 	EnableShellCompletion: true,

cli/server/remove.go

@@ -24,10 +24,6 @@ var serverRemoveCommand = cli.Command{
 Abra will remove the internal bookkeeping ($ABRA_DIR/servers/...) and
 underlying client connection context. This server will then be lost in time,
 like tears in rain.`,
-	Flags: []cli.Flag{
-		internal.NoInputFlag,
-		internal.OfflineFlag,
-	},
 	Before:                internal.SubCommandBefore,
 	EnableShellCompletion: true,
 	ShellComplete:         autocomplete.ServerNameComplete,