command: Rename seal-status to status

This commit is contained in:
Armon Dadgar 2015-04-20 12:11:21 -07:00
parent f1c97ab2cf
commit f76e5b2fc5
3 changed files with 14 additions and 14 deletions

View File

@ -163,8 +163,8 @@ func Commands(metaPtr *command.Meta) map[string]cli.CommandFactory {
}, nil
},
"seal-status": func() (cli.Command, error) {
return &command.SealStatusCommand{
"status": func() (cli.Command, error) {
return &command.StatusCommand{
Meta: meta,
}, nil
},

View File

@ -5,14 +5,14 @@ import (
"strings"
)
// SealStatusCommand is a Command that outputs the status of whether
// Vault is sealed or not.
type SealStatusCommand struct {
// StatusCommand is a Command that outputs the status of whether
// Vault is sealed or not as well as HA information.
type StatusCommand struct {
Meta
}
func (c *SealStatusCommand) Run(args []string) int {
flags := c.Meta.FlagSet("seal-status", FlagSetDefault)
func (c *StatusCommand) Run(args []string) int {
flags := c.Meta.FlagSet("status", FlagSetDefault)
flags.Usage = func() { c.Ui.Error(c.Help()) }
if err := flags.Parse(args); err != nil {
return 1
@ -63,15 +63,15 @@ func (c *SealStatusCommand) Run(args []string) int {
}
}
func (c *SealStatusCommand) Synopsis() string {
return "Outputs status of whether Vault is sealed"
func (c *StatusCommand) Synopsis() string {
return "Outputs status of whether Vault is sealed and if HA mode is enabled"
}
func (c *SealStatusCommand) Help() string {
func (c *StatusCommand) Help() string {
helpText := `
Usage: vault seal-status [options]
Usage: vault status [options]
Outputs the state of the Vault, sealed or unsealed.
Outputs the state of the Vault, sealed or unsealed and if HA is enabled.
This command outputs whether or not the Vault is sealed. The exit
code also reflects the seal status (0 unsealed, 1 sealed, 2+ error).

View File

@ -8,9 +8,9 @@ import (
"github.com/mitchellh/cli"
)
func TestSealStatus(t *testing.T) {
func TestStatus(t *testing.T) {
ui := new(cli.MockUi)
c := &SealStatusCommand{
c := &StatusCommand{
Meta: Meta{
Ui: ui,
},