CLI Enhancements

api/sys_generate_root.go

@@ -99,11 +99,11 @@ func (c *Sys) generateRootUpdateCommon(path, shard, nonce string) (*GenerateRoot
 }
 
 type GenerateRootStatusResponse struct {
-	Nonce            string
-	Started          bool
-	Progress         int
-	Required         int
-	Complete         bool
+	Nonce            string `json:"nonce"`
+	Started          bool   `json:"started"`
+	Progress         int    `json:"progress"`
+	Required         int    `json:"required"`
+	Complete         bool   `json:"complete"`
 	EncodedToken     string `json:"encoded_token"`
 	EncodedRootToken string `json:"encoded_root_token"`
 	PGPFingerprint   string `json:"pgp_fingerprint"`

api/sys_rekey.go

@@ -177,27 +177,27 @@ type RekeyInitRequest struct {
 }
 
 type RekeyStatusResponse struct {
-	Nonce           string
-	Started         bool
-	T               int
-	N               int
-	Progress        int
-	Required        int
+	Nonce           string   `json:"nonce"`
+	Started         bool     `json:"started"`
+	T               int      `json:"t"`
+	N               int      `json:"n"`
+	Progress        int      `json:"progress"`
+	Required        int      `json:"required"`
 	PGPFingerprints []string `json:"pgp_fingerprints"`
-	Backup          bool
+	Backup          bool     `json:"backup"`
 }
 
 type RekeyUpdateResponse struct {
-	Nonce           string
-	Complete        bool
-	Keys            []string
+	Nonce           string   `json:"nonce"`
+	Complete        bool     `json:"complete"`
+	Keys            []string `json:"keys"`
 	KeysB64         []string `json:"keys_base64"`
 	PGPFingerprints []string `json:"pgp_fingerprints"`
-	Backup          bool
+	Backup          bool     `json:"backup"`
 }
 
 type RekeyRetrieveResponse struct {
-	Nonce   string
-	Keys    map[string][]string
+	Nonce   string              `json:"nonce"`
+	Keys    map[string][]string `json:"keys"`
 	KeysB64 map[string][]string `json:"keys_base64"`
 }

command/audit_disable.go

@@ -58,6 +58,10 @@ func (c *AuditDisableCommand) Run(args []string) int {
 		return 1
 	}
 
+	if c.flagNoColor {
+		c.UI = getBasicUI(c.UI)
+	}
+
 	args = f.Args()
 	switch {
 	case len(args) < 1:

command/audit_enable.go

@@ -106,6 +106,10 @@ func (c *AuditEnableCommand) Run(args []string) int {
 		return 1
 	}
 
+	if c.flagNoColor {
+		c.UI = getBasicUI(c.UI)
+	}
+
 	args = f.Args()
 	if len(args) < 1 {
 		c.UI.Error("Missing TYPE!")

command/audit_list.go

@@ -44,7 +44,7 @@ Usage: vault audit list [options]
 }
 
 func (c *AuditListCommand) Flags() *FlagSets {
-	set := c.flagSet(FlagSetHTTP)
+	set := c.flagSet(FlagSetHTTP | FlagSetOutputFormat)
 
 	f := set.NewFlagSet("Command Options")
 
@@ -76,6 +76,10 @@ func (c *AuditListCommand) Run(args []string) int {
 		return 1
 	}
 
+	if c.flagNoColor {
+		c.UI = getBasicUI(c.UI)
+	}
+
 	args = f.Args()
 	if len(args) > 0 {
 		c.UI.Error(fmt.Sprintf("Too many arguments (expected 0, got %d)", len(args)))
@@ -99,13 +103,15 @@ func (c *AuditListCommand) Run(args []string) int {
 		return 0
 	}
 
-	if c.flagDetailed {
-		c.UI.Output(tableOutput(c.detailedAudits(audits), nil))
-		return 0
+	switch c.flagFormat {
+	case "table":
+		if c.flagDetailed {
+			return OutputWithFormat(c.UI, c.flagFormat, c.detailedAudits(audits))
+		}
+		return OutputWithFormat(c.UI, c.flagFormat, c.simpleAudits(audits))
+	default:
+		return OutputWithFormat(c.UI, c.flagFormat, audits)
 	}
-
-	c.UI.Output(tableOutput(c.simpleAudits(audits), nil))
-	return 0
 }
 
 func (c *AuditListCommand) simpleAudits(audits map[string]*api.Audit) []string {

command/auth_disable.go

@@ -59,6 +59,10 @@ func (c *AuthDisableCommand) Run(args []string) int {
 		return 1
 	}
 
+	if c.flagNoColor {
+		c.UI = getBasicUI(c.UI)
+	}
+
 	args = f.Args()
 	switch {
 	case len(args) < 1:

command/auth_enable.go

@@ -117,6 +117,10 @@ func (c *AuthEnableCommand) Run(args []string) int {
 		return 1
 	}
 
+	if c.flagNoColor {
+		c.UI = getBasicUI(c.UI)
+	}
+
 	args = f.Args()
 	switch {
 	case len(args) < 1:

command/auth_help.go

@@ -73,6 +73,10 @@ func (c *AuthHelpCommand) Run(args []string) int {
 		return 1
 	}
 
+	if c.flagNoColor {
+		c.UI = getBasicUI(c.UI)
+	}
+
 	args = f.Args()
 	switch {
 	case len(args) < 1:

command/auth_list.go

@@ -46,7 +46,7 @@ Usage: vault auth list [options]
 }
 
 func (c *AuthListCommand) Flags() *FlagSets {
-	set := c.flagSet(FlagSetHTTP)
+	set := c.flagSet(FlagSetHTTP | FlagSetOutputFormat)
 
 	f := set.NewFlagSet("Command Options")
 
@@ -55,7 +55,7 @@ func (c *AuthListCommand) Flags() *FlagSets {
 		Target:  &c.flagDetailed,
 		Default: false,
 		Usage: "Print detailed information such as configuration and replication " +
-			"status about each auth method.",
+			"status about each auth method. This option is only applicable to table formatted output.",
 	})
 
 	return set
@@ -77,6 +77,10 @@ func (c *AuthListCommand) Run(args []string) int {
 		return 1
 	}
 
+	if c.flagNoColor {
+		c.UI = getBasicUI(c.UI)
+	}
+
 	args = f.Args()
 	if len(args) > 0 {
 		c.UI.Error(fmt.Sprintf("Too many arguments (expected 0, got %d)", len(args)))
@@ -95,13 +99,15 @@ func (c *AuthListCommand) Run(args []string) int {
 		return 2
 	}
 
-	if c.flagDetailed {
-		c.UI.Output(tableOutput(c.detailedMounts(auths), nil))
-		return 0
+	switch c.flagFormat {
+	case "table":
+		if c.flagDetailed {
+			return OutputWithFormat(c.UI, c.flagFormat, c.detailedMounts(auths))
+		}
+		return OutputWithFormat(c.UI, c.flagFormat, c.simpleMounts(auths))
+	default:
+		return OutputWithFormat(c.UI, c.flagFormat, auths)
 	}
-
-	c.UI.Output(tableOutput(c.simpleMounts(auths), nil))
-	return 0
 }
 
 func (c *AuthListCommand) simpleMounts(auths map[string]*api.AuthMount) []string {

command/auth_tune.go

@@ -87,6 +87,10 @@ func (c *AuthTuneCommand) Run(args []string) int {
 		return 1
 	}
 
+	if c.flagNoColor {
+		c.UI = getBasicUI(c.UI)
+	}
+
 	args = f.Args()
 	switch {
 	case len(args) < 1:

command/base.go

@@ -40,8 +40,9 @@ type BaseCommand struct {
 	flagTLSSkipVerify bool
 	flagWrapTTL       time.Duration
 
-	flagFormat string
-	flagField  string
+	flagFormat  string
+	flagField   string
+	flagNoColor bool
 
 	tokenHelper token.TokenHelper
 
@@ -143,6 +144,7 @@ const (
 	FlagSetHTTP
 	FlagSetOutputField
 	FlagSetOutputFormat
+	FlagSetOutputNoColor
 )
 
 // flagSet creates the flags for this command. The result is cached on the
@@ -151,6 +153,11 @@ func (c *BaseCommand) flagSet(bit FlagSetBit) *FlagSets {
 	c.flagsOnce.Do(func() {
 		set := NewFlagSets(c.UI)
 
+		// These flag sets will apply to all leaf subcommands.
+		// TODO: Optional, but FlagSetHTTP can be safely removed from the individual
+		// Flags() subcommands.
+		bit = bit | FlagSetHTTP | FlagSetOutputNoColor
+
 		if bit&FlagSetHTTP != 0 {
 			f := set.NewFlagSet("HTTP Options")
 
@@ -238,7 +245,7 @@ func (c *BaseCommand) flagSet(bit FlagSetBit) *FlagSets {
 			})
 		}
 
-		if bit&(FlagSetOutputField|FlagSetOutputFormat) != 0 {
+		if bit&(FlagSetOutputField|FlagSetOutputFormat|FlagSetOutputNoColor) != 0 {
 			f := set.NewFlagSet("Output Options")
 
 			if bit&FlagSetOutputField != 0 {
@@ -265,6 +272,16 @@ func (c *BaseCommand) flagSet(bit FlagSetBit) *FlagSets {
 						"are \"table\", \"json\", or \"yaml\".",
 				})
 			}
+
+			if bit&FlagSetOutputNoColor != 0 {
+				f.BoolVar(&BoolVar{
+					Name:    "no-color",
+					Target:  &c.flagNoColor,
+					Default: false,
+					EnvVar:  "VAULT_OUTPUT_NO_COLOR",
+					Usage:   "Print the output without ANSI color escape sequences.",
+				})
+			}
 		}
 
 		c.flags = set
@@ -316,6 +333,11 @@ func (f *FlagSets) Parse(args []string) error {
 	return f.mainSet.Parse(args)
 }
 
+// Parsed reports whether the command-line flags have been parsed.
+func (f *FlagSets) Parsed() bool {
+	return f.mainSet.Parsed()
+}
+
 // Args returns the remaining args after parsing.
 func (f *FlagSets) Args() []string {
 	return f.mainSet.Args()

command/commands.go

@@ -11,6 +11,7 @@ import (
 	"github.com/hashicorp/vault/physical"
 	"github.com/hashicorp/vault/version"
 	"github.com/mitchellh/cli"
+	"golang.org/x/crypto/ssh/terminal"
 
 	"github.com/hashicorp/vault/builtin/logical/aws"
 	"github.com/hashicorp/vault/builtin/logical/cassandra"
@@ -88,6 +89,13 @@ func (c *DeprecatedCommand) Run(args []string) int {
 }
 
 func (c *DeprecatedCommand) warn() {
+	// If we detect the env var for no-color, then get the BasicUi.
+	// Ideally we would want DeprecatedCommands to support flags as well,
+	// and do parsing here, but this will do for now.
+	if os.Getenv("VAULT_OUTPUT_NO_COLOR") != "" {
+		c.UI = getBasicUI(c.UI)
+	}
+
 	c.UI.Warn(wrapAtLength(fmt.Sprintf(
 		"WARNING! The \"vault %s\" command is deprecated. Please use \"vault %s\" "+
 			"instead. This command will be removed in Vault 0.11 (or later).",
@@ -101,21 +109,32 @@ var Commands map[string]cli.CommandFactory
 var DeprecatedCommands map[string]cli.CommandFactory
 
 func init() {
-	ui := &cli.ColoredUi{
-		ErrorColor: cli.UiColorRed,
-		WarnColor:  cli.UiColorYellow,
-		Ui: &cli.BasicUi{
-			Writer:      os.Stdout,
-			ErrorWriter: os.Stderr,
-		},
+	var ui cli.Ui
+	var serverCmdUi cli.Ui
+
+	ui = &cli.BasicUi{
+		Writer:      os.Stdout,
+		ErrorWriter: os.Stderr,
 	}
 
-	serverCmdUi := &cli.ColoredUi{
-		ErrorColor: cli.UiColorRed,
-		WarnColor:  cli.UiColorYellow,
-		Ui: &cli.BasicUi{
-			Writer: os.Stdout,
-		},
+	serverCmdUi = &cli.BasicUi{
+		Writer: os.Stdout,
+	}
+
+	// Attempt to detect if stdout is a tty. If so,
+	// wrap BasicUi's in ColoredUi.
+	if terminal.IsTerminal(int(os.Stdout.Fd())) {
+		ui = &cli.ColoredUi{
+			ErrorColor: cli.UiColorRed,
+			WarnColor:  cli.UiColorYellow,
+			Ui:         ui,
+		}
+
+		serverCmdUi = &cli.ColoredUi{
+			ErrorColor: cli.UiColorRed,
+			WarnColor:  cli.UiColorYellow,
+			Ui:         serverCmdUi,
+		}
 	}
 
 	loginHandlers := map[string]LoginHandler{

command/delete.go

@@ -66,6 +66,10 @@ func (c *DeleteCommand) Run(args []string) int {
 		return 1
 	}
 
+	if c.flagNoColor {
+		c.UI = getBasicUI(c.UI)
+	}
+
 	args = f.Args()
 	switch {
 	case len(args) < 1: