scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-11-02 11:38:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switch per-mount values to strings going in and seconds coming out, like other commands. Indicate deprecation of 'lease' in the token backend.

Browse Source
This commit is contained in:
Jeff Mitchell
2015-09-25 09:46:20 -04:00
parent ae8192f990
commit 70ce824267
14 changed files with 220 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
command/mounts.go
View File

@@ -3,6 +3,7 @@ package command
import (
"fmt"
"sort"
"strconv"
"strings"
"github.com/ryanuber/columnize"
@@ -43,9 +44,26 @@ func (c *MountsCommand) Run(args []string) int {
columns := []string{"Path | Type | Default TTL | Max TTL | Description"}
for _, path := range paths {
mount := mounts[path]
defTTL := "system"
switch {
case mount.Type == "system":
defTTL = "n/a"
case mount.Type == "cubbyhole":
defTTL = "n/a"
case mount.Config.DefaultLeaseTTL != 0:
defTTL = strconv.Itoa(mount.Config.DefaultLeaseTTL)
}
maxTTL := "system"
switch {
case mount.Type == "system":
maxTTL = "n/a"
case mount.Type == "cubbyhole":
maxTTL = "n/a"
case mount.Config.MaxLeaseTTL != 0:
maxTTL = strconv.Itoa(mount.Config.MaxLeaseTTL)
}
columns = append(columns, fmt.Sprintf(
"%s | %s | %s | %s | %s", path, mount.Type, mount.Config.DefaultLeaseTTL, mount.Config.MaxLeaseTTL, mount.Description))
"%s | %s | %s | %s | %s", path, mount.Type, defTTL, maxTTL, mount.Description))
}
c.Ui.Output(columnize.SimpleFormat(columns))
@@ -64,7 +82,7 @@ Usage: vault mounts [options]
This command lists the mounted backends, their mount points, the
configured TTLs, and a human-friendly description of the mount point.
A TTL of '0' indicates that the system default is being used.
A TTL of 'system' indicates that the system default is being used.
General Options: