Add global flags to all commands and subcommands (#2605)

cmd/commands.go

@@ -24,19 +24,6 @@ var commands = []cli.Command{}
 // Collection of minio commands currently supported in a trie tree.
 var commandsTree = newTrie()
 
-// Collection of minio flags currently supported.
-var globalFlags = []cli.Flag{
-	cli.StringFlag{
-		Name:  "config-dir, C",
-		Value: mustGetConfigPath(),
-		Usage: "Path to configuration folder.",
-	},
-	cli.BoolFlag{
-		Name:  "quiet",
-		Usage: "Suppress chatty output.",
-	},
-}
-
 // registerCommand registers a cli command.
 func registerCommand(command cli.Command) {
 	commands = append(commands, command)

cmd/control-heal-main.go

@@ -29,12 +29,17 @@ var healCmd = cli.Command{
 	Name:   "heal",
 	Usage:  "To heal objects.",
 	Action: healControl,
+	Flags:  globalFlags,
 	CustomHelpTemplate: `NAME:
   minio control {{.Name}} - {{.Usage}}
 
 USAGE:
   minio control {{.Name}}
 
+FLAGS:
+  {{range .Flags}}{{.}}
+  {{end}}
+
 EXAMPLES:
   1. Heal an object.
      $ minio control {{.Name}} http://localhost:9000/songs/classical/western/piano.mp3

cmd/control-lock-main.go

@@ -97,12 +97,17 @@ var lockCmd = cli.Command{
 	Name:   "lock",
 	Usage:  "info about the locks in the node.",
 	Action: lockControl,
+	Flags:  globalFlags,
 	CustomHelpTemplate: `NAME:
   minio control {{.Name}} - {{.Usage}}
 
 USAGE:
   minio control {{.Name}} http://localhost:9000/
 
+FLAGS:
+  {{range .Flags}}{{.}}
+  {{end}}
+
 EAMPLES:
   1. Get all the info about the blocked/held locks in the node:
     $ minio control lock http://localhost:9000/

cmd/control-main.go

@@ -22,6 +22,7 @@ import "github.com/minio/cli"
 var controlCmd = cli.Command{
 	Name:   "control",
 	Usage:  "Control and manage minio server.",
+	Flags:  globalFlags,
 	Action: mainControl,
 	Subcommands: []cli.Command{
 		lockCmd,

cmd/control-shutdown-main.go

@@ -23,22 +23,28 @@ import (
 	"github.com/minio/cli"
 )
 
+var shutdownFlags = []cli.Flag{
+	cli.BoolFlag{
+		Name:  "restart",
+		Usage: "Restart the server.",
+	},
+}
+
 var shutdownCmd = cli.Command{
 	Name:   "shutdown",
 	Usage:  "Shutdown or restart the server.",
 	Action: shutdownControl,
-	Flags: []cli.Flag{
+	Flags:  append(shutdownFlags, globalFlags...),
-		cli.BoolFlag{
-			Name:  "restart",
-			Usage: "Restart the server.",
-		},
-	},
 	CustomHelpTemplate: `NAME:
   minio control {{.Name}} - {{.Usage}}
 
 USAGE:
   minio control {{.Name}} http://localhost:9000/
 
+FLAGS:
+  {{range .Flags}}{{.}}
+  {{end}}
+
 EXAMPLES:
   1. Shutdown the server:
     $ minio control shutdown http://localhost:9000/

cmd/main.go

@@ -27,11 +27,20 @@ import (
 
 var (
 	// global flags for minio.
-	minioFlags = []cli.Flag{
+	globalFlags = []cli.Flag{
 		cli.BoolFlag{
 			Name:  "help, h",
 			Usage: "Show help.",
 		},
+		cli.StringFlag{
+			Name:  "config-dir, C",
+			Value: mustGetConfigPath(),
+			Usage: "Path to configuration folder.",
+		},
+		cli.BoolFlag{
+			Name:  "quiet",
+			Usage: "Suppress chatty output.",
+		},
 	}
 )
 
@@ -115,7 +124,7 @@ func registerApp() *cli.App {
 	app.Author = "Minio.io"
 	app.Usage = "Cloud Storage Server."
 	app.Description = `Minio is an Amazon S3 compatible object storage server. Use it to store photos, videos, VMs, containers, log files, or any blob of data as objects.`
-	app.Flags = append(minioFlags, globalFlags...)
+	app.Flags = globalFlags
 	app.Commands = commands
 	app.CustomAppHelpTemplate = minioHelpTemplate
 	app.CommandNotFound = func(ctx *cli.Context, command string) {

cmd/server-main.go

@@ -29,20 +29,23 @@ import (
 )
 
 var srvConfig serverCmdConfig
-var serverCmd = cli.Command{
+
-	Name:  "server",
+var serverFlags = []cli.Flag{
-	Usage: "Start object storage server.",
+	cli.StringFlag{
-	Flags: []cli.Flag{
+		Name:  "address",
-		cli.StringFlag{
+		Value: ":9000",
-			Name:  "address",
+		Usage: "Specify custom server \"ADDRESS:PORT\", defaults to \":9000\".",
-			Value: ":9000",
+	},
-			Usage: "Specify custom server \"ADDRESS:PORT\", defaults to \":9000\".",
+	cli.StringFlag{
-		},
+		Name:  "ignore-disks",
-		cli.StringFlag{
+		Usage: "Specify comma separated list of disks that are offline.",
-			Name:  "ignore-disks",
-			Usage: "Specify comma separated list of disks that are offline.",
-		},
 	},
+}
+
+var serverCmd = cli.Command{
+	Name:   "server",
+	Usage:  "Start object storage server.",
+	Flags:  append(serverFlags, globalFlags...),
 	Action: serverMain,
 	CustomHelpTemplate: `NAME:
   minio {{.Name}} - {{.Usage}}

cmd/update-main.go

@@ -33,10 +33,6 @@ import (
 // command specific flags.
 var (
 	updateFlags = []cli.Flag{
-		cli.BoolFlag{
-			Name:  "help, h",
-			Usage: "Help for update.",
-		},
 		cli.BoolFlag{
 			Name:  "experimental, E",
 			Usage: "Check experimental update.",
@@ -49,7 +45,7 @@ var updateCmd = cli.Command{
 	Name:   "update",
 	Usage:  "Check for a new software update.",
 	Action: mainUpdate,
-	Flags:  updateFlags,
+	Flags:  append(updateFlags, globalFlags...),
 	CustomHelpTemplate: `Name:
    minio {{.Name}} - {{.Usage}}
 

cmd/version-main.go

@@ -25,15 +25,25 @@ var versionCmd = cli.Command{
 	Name:   "version",
 	Usage:  "Print version.",
 	Action: mainVersion,
+	Flags:  globalFlags,
 	CustomHelpTemplate: `NAME:
    minio {{.Name}} - {{.Usage}}
 
 USAGE:
-   minio {{.Name}} {{if .Description}}
+   minio {{.Name}}
+
+FLAGS:
+  {{range .Flags}}{{.}}
+  {{end}}
+
 `,
 }
 
 func mainVersion(ctx *cli.Context) {
+	if len(ctx.Args()) != 0 {
+		cli.ShowCommandHelpAndExit(ctx, "version", 1)
+	}
+
 	console.Println("Version: " + Version)
 	console.Println("Release-Tag: " + ReleaseTag)
 	console.Println("Commit-ID: " + CommitID)