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_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")
 
@@ -99,13 +99,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_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
@@ -95,13 +95,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/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
 
@@ -152,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
+
 		if bit&FlagSetHTTP != 0 {
 			f := set.NewFlagSet("HTTP Options")
 
@@ -237,6 +243,15 @@ func (c *BaseCommand) flagSet(bit FlagSetBit) *FlagSets {
 					"The TTL is specified as a numeric string with suffix like \"30s\" " +
 					"or \"5m\".",
 			})
+
+			f.BoolVar(&BoolVar{
+				Name:    "no-color",
+				Target:  &c.flagNoColor,
+				Default: false,
+				Hidden:  true,
+				EnvVar:  EnvVaultCLINoColor,
+				Usage:   "Print the output without ANSI color escape sequences.",
+			})
 		}
 
 		if bit&(FlagSetOutputField|FlagSetOutputFormat) != 0 {
@@ -317,6 +332,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

@@ -64,6 +64,9 @@ import (
 	physZooKeeper "github.com/hashicorp/vault/physical/zookeeper"
 )
 
+// EnvVaultCLINoColor is an env var that toggles colored UI output.
+const EnvVaultCLINoColor = `VAULT_CLI_NO_COLOR`
+
 var (
 	auditBackends = map[string]audit.Factory{
 		"file":   auditFile.Factory,
@@ -166,24 +169,7 @@ func (c *DeprecatedCommand) warn() {
 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,
-		},
-	}
-
-	serverCmdUi := &cli.ColoredUi{
-		ErrorColor: cli.UiColorRed,
-		WarnColor:  cli.UiColorYellow,
-		Ui: &cli.BasicUi{
-			Writer: os.Stdout,
-		},
-	}
-
+func initCommands(ui, serverCmdUi cli.Ui) {
 	loginHandlers := map[string]LoginHandler{
 		"aws":      &credAws.CLIHandler{},
 		"centrify": &credCentrify.CLIHandler{},

command/format.go

@@ -19,29 +19,55 @@ const (
 	hopeDelim = "♨"
 )
 
+type FormatOptions struct {
+	Format string
+}
+
 func OutputSecret(ui cli.Ui, format string, secret *api.Secret) int {
 	return outputWithFormat(ui, format, secret, secret)
 }
 
-func OutputList(ui cli.Ui, format string, secret *api.Secret) int {
-	return outputWithFormat(ui, format, secret, secret.Data["keys"])
+func OutputList(ui cli.Ui, format string, data interface{}) int {
+	switch data.(type) {
+	case *api.Secret:
+		secret := data.(*api.Secret)
+		return outputWithFormat(ui, format, secret, secret.Data["keys"])
+	default:
+		return outputWithFormat(ui, format, nil, data)
+	}
 }
 
-func outputWithFormat(ui cli.Ui, format string, secret *api.Secret, data interface{}) int {
-	// If we had a colored UI, pull out the nested ui so we don't add escape
-	// sequences for outputting json, etc.
-	colorUI, ok := ui.(*cli.ColoredUi)
-	if ok {
-		ui = colorUI.Ui
+// OutputWithFormat supports printing arbitrary data under a specified format.
+func OutputWithFormat(ui cli.Ui, format string, data interface{}) int {
+	switch data.(type) {
+	case *api.Secret:
+		secret := data.(*api.Secret)
+		// Best-guess effort that is this a list, so parse out the keys
+		if listVals, ok := secret.Data["keys"]; ok {
+			return outputWithFormat(ui, format, secret, listVals)
+		}
+		return outputWithFormat(ui, format, secret, secret)
+	default:
+		return outputWithFormat(ui, format, nil, data)
 	}
+}
 
+func outputWithFormat(ui cli.Ui, format string, secret *api.Secret, data interface{}) int {
 	formatter, ok := Formatters[strings.ToLower(format)]
 	if !ok {
 		ui.Error(fmt.Sprintf("Invalid output format: %s", format))
 		return 1
 	}
+
+	// Type-check formatter, and ignore colored UI if it's a non-table output
+	if _, ok := formatter.(TableFormatter); !ok {
+		// If we had a colored UI, pull out the nested ui so we don't add escape
+		// sequences for outputting json, etc.
+		ui = getBasicUI(ui)
+	}
+
 	if err := formatter.Output(ui, secret, data); err != nil {
-		ui.Error(fmt.Sprintf("Could not output secret: %s", err.Error()))
+		ui.Error(fmt.Sprintf("Could not parse output: %s", err.Error()))
 		return 1
 	}
 	return 0
@@ -87,19 +113,30 @@ type TableFormatter struct {
 }
 
 func (t TableFormatter) Output(ui cli.Ui, secret *api.Secret, data interface{}) error {
-	// TODO: this should really use reflection like the other formatters do
-	if s, ok := data.(*api.Secret); ok {
-		return t.OutputSecret(ui, s)
-	}
-	if s, ok := data.([]interface{}); ok {
-		return t.OutputList(ui, secret, s)
+	switch data.(type) {
+	case *api.Secret:
+		return t.OutputSecret(ui, secret)
+	case []interface{}:
+		return t.OutputList(ui, secret, data)
+	case []string:
+		return t.OutputList(ui, nil, data)
+	default:
+		return errors.New("Cannot use the table formatter for this type")
 	}
-	return errors.New("Cannot use the table formatter for this type")
 }
 
-func (t TableFormatter) OutputList(ui cli.Ui, secret *api.Secret, list []interface{}) error {
+func (t TableFormatter) OutputList(ui cli.Ui, secret *api.Secret, data interface{}) error {
 	t.printWarnings(ui, secret)
 
+	switch data.(type) {
+	case []interface{}:
+	case []string:
+		ui.Output(tableOutput(data.([]string), nil))
+		return nil
+	}
+
+	list := data.([]interface{})
+
 	if len(list) > 0 {
 		keys := make([]string, len(list))
 		for i, v := range list {
@@ -208,7 +245,14 @@ func (t TableFormatter) OutputSecret(ui cli.Ui, secret *api.Secret) error {
 	return nil
 }
 
-func OutputSealStatus(ui cli.Ui, client *api.Client, status *api.SealStatusResponse) int {
+// OutputSealStatus will print *api.SealStatusResponse in the CLI according to the format provided
+func OutputSealStatus(ui cli.Ui, format string, client *api.Client, status *api.SealStatusResponse) int {
+	switch format {
+	case "table":
+	default:
+		return OutputWithFormat(ui, format, status)
+	}
+
 	var sealPrefix string
 	if status.RecoverySeal {
 		sealPrefix = "Recovery "