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
137 lines
3.3 KiB
Go
137 lines
3.3 KiB
Go
package command
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/hashicorp/vault/api"
|
|
"github.com/mitchellh/cli"
|
|
"github.com/posener/complete"
|
|
)
|
|
|
|
var _ cli.Command = (*TokenRenewCommand)(nil)
|
|
var _ cli.CommandAutocomplete = (*TokenRenewCommand)(nil)
|
|
|
|
type TokenRenewCommand struct {
|
|
*BaseCommand
|
|
|
|
flagIncrement time.Duration
|
|
}
|
|
|
|
func (c *TokenRenewCommand) Synopsis() string {
|
|
return "Renew a token lease"
|
|
}
|
|
|
|
func (c *TokenRenewCommand) Help() string {
|
|
helpText := `
|
|
Usage: vault token renew [options] [TOKEN]
|
|
|
|
Renews a token's lease, extending the amount of time it can be used. If a
|
|
TOKEN is not provided, the locally authenticated token is used. Lease renewal
|
|
will fail if the token is not renewable, the token has already been revoked,
|
|
or if the token has already reached its maximum TTL.
|
|
|
|
Renew a token (this uses the /auth/token/renew endpoint and permission):
|
|
|
|
$ vault token renew 96ddf4bc-d217-f3ba-f9bd-017055595017
|
|
|
|
Renew the currently authenticated token (this uses the /auth/token/renew-self
|
|
endpoint and permission):
|
|
|
|
$ vault token renew
|
|
|
|
Renew a token requesting a specific increment value:
|
|
|
|
$ vault token renew -increment=30m 96ddf4bc-d217-f3ba-f9bd-017055595017
|
|
|
|
For a full list of examples, please see the documentation.
|
|
|
|
` + c.Flags().Help()
|
|
|
|
return strings.TrimSpace(helpText)
|
|
}
|
|
|
|
func (c *TokenRenewCommand) Flags() *FlagSets {
|
|
set := c.flagSet(FlagSetHTTP | FlagSetOutputFormat)
|
|
f := set.NewFlagSet("Command Options")
|
|
|
|
f.DurationVar(&DurationVar{
|
|
Name: "increment",
|
|
Aliases: []string{"i"},
|
|
Target: &c.flagIncrement,
|
|
Default: 0,
|
|
EnvVar: "",
|
|
Completion: complete.PredictAnything,
|
|
Usage: "Request a specific increment for renewal. Vault is not required " +
|
|
"to honor this request. If not supplied, Vault will use the default " +
|
|
"TTL. This is specified as a numeric string with suffix like \"30s\" " +
|
|
"or \"5m\".",
|
|
})
|
|
|
|
return set
|
|
}
|
|
|
|
func (c *TokenRenewCommand) AutocompleteArgs() complete.Predictor {
|
|
return c.PredictVaultFiles()
|
|
}
|
|
|
|
func (c *TokenRenewCommand) AutocompleteFlags() complete.Flags {
|
|
return c.Flags().Completions()
|
|
}
|
|
|
|
func (c *TokenRenewCommand) Run(args []string) int {
|
|
f := c.Flags()
|
|
|
|
if err := f.Parse(args); err != nil {
|
|
c.UI.Error(err.Error())
|
|
return 1
|
|
}
|
|
|
|
token := ""
|
|
increment := c.flagIncrement
|
|
|
|
args = f.Args()
|
|
switch len(args) {
|
|
case 0:
|
|
// Use the local token
|
|
case 1:
|
|
token = strings.TrimSpace(args[0])
|
|
case 2:
|
|
// TODO: remove in 0.9.0 - backwards compat
|
|
c.UI.Warn("Specifying increment as a second argument is deprecated. " +
|
|
"Please use -increment instead.")
|
|
|
|
token = strings.TrimSpace(args[0])
|
|
parsed, err := time.ParseDuration(appendDurationSuffix(args[1]))
|
|
if err != nil {
|
|
c.UI.Error(fmt.Sprintf("Invalid increment: %s", err))
|
|
return 1
|
|
}
|
|
increment = parsed
|
|
default:
|
|
c.UI.Error(fmt.Sprintf("Too many arguments (expected 1, got %d)", len(args)))
|
|
return 1
|
|
}
|
|
|
|
client, err := c.Client()
|
|
if err != nil {
|
|
c.UI.Error(err.Error())
|
|
return 2
|
|
}
|
|
|
|
var secret *api.Secret
|
|
inc := truncateToSeconds(increment)
|
|
if token == "" {
|
|
secret, err = client.Auth().Token().RenewSelf(inc)
|
|
} else {
|
|
secret, err = client.Auth().Token().Renew(token, inc)
|
|
}
|
|
if err != nil {
|
|
c.UI.Error(fmt.Sprintf("Error renewing token: %s", err))
|
|
return 2
|
|
}
|
|
|
|
return OutputSecret(c.UI, secret)
|
|
}
|