60732577f5
* Use Colored UI if stdout is a tty * Add format options to operator unseal * Add format test on operator unseal * Add -no-color output flag, and use BasicUi if no-color flag is provided * Move seal status formatting logic to OutputSealStatus * Apply no-color to warnings from DeprecatedCommands as well * Add OutputWithFormat to support arbitrary data, add format option to auth list * Add ability to output arbitrary list data on TableFormatter * Clear up switch logic on format * Add format option for list-related commands * Add format option to rest of commands that returns a client API response * Remove initOutputYAML and initOutputJSON, and use OutputWithFormat instead * Remove outputAsYAML and outputAsJSON, and use OutputWithFormat instead * Remove -no-color flag, use env var exclusively to toggle colored output * Fix compile * Remove -no-color flag in main.go * Add missing FlagSetOutputFormat * Fix generate-root/decode test * Migrate init functions to main.go * Add no-color flag back as hidden * Handle non-supported data types for TableFormatter.OutputList * Pull formatting much further up to remove the need to use c.flagFormat (#3950) * Pull formatting much further up to remove the need to use c.flagFormat Also remove OutputWithFormat as the logic can cause issues. * Use const for env var * Minor updates * Remove unnecessary check * Fix SSH output and some tests * Fix tests * Make race detector not run on generate root since it kills Travis these days * Update docs * Update docs * Address review feedback * Handle --format as well as -format
54 lines
1,020 B
Go
54 lines
1,020 B
Go
package command
|
|
|
|
import (
|
|
"github.com/mitchellh/cli"
|
|
)
|
|
|
|
// Deprecation
|
|
// TODO: remove in 0.9.0
|
|
|
|
var _ cli.Command = (*PoliciesDeprecatedCommand)(nil)
|
|
|
|
type PoliciesDeprecatedCommand struct {
|
|
*BaseCommand
|
|
}
|
|
|
|
func (c *PoliciesDeprecatedCommand) Synopsis() string { return "" }
|
|
|
|
func (c *PoliciesDeprecatedCommand) Help() string {
|
|
return (&PolicyListCommand{
|
|
BaseCommand: c.BaseCommand,
|
|
}).Help()
|
|
}
|
|
|
|
func (c *PoliciesDeprecatedCommand) Run(args []string) int {
|
|
oargs := args
|
|
|
|
f := c.flagSet(FlagSetHTTP)
|
|
if err := f.Parse(args); err != nil {
|
|
c.UI.Error(err.Error())
|
|
return 1
|
|
}
|
|
|
|
args = f.Args()
|
|
|
|
// Got an arg, this is trying to read a policy
|
|
if len(args) > 0 {
|
|
return (&PolicyReadCommand{
|
|
BaseCommand: &BaseCommand{
|
|
UI: c.UI,
|
|
client: c.client,
|
|
},
|
|
}).Run(oargs)
|
|
}
|
|
|
|
// No args, probably ran "vault policies" and we want to translate that to
|
|
// "vault policy list"
|
|
return (&PolicyListCommand{
|
|
BaseCommand: &BaseCommand{
|
|
UI: c.UI,
|
|
client: c.client,
|
|
},
|
|
}).Run(oargs)
|
|
}
|