2015-04-27 21:55:29 +00:00
|
|
|
package command
|
|
|
|
|
|
|
|
import (
|
2021-03-03 18:59:50 +00:00
|
|
|
"bytes"
|
2015-04-27 21:55:29 +00:00
|
|
|
"encoding/json"
|
2016-02-12 18:21:42 +00:00
|
|
|
"errors"
|
2015-04-27 21:55:29 +00:00
|
|
|
"fmt"
|
2018-02-12 23:12:16 +00:00
|
|
|
"os"
|
2015-12-10 09:01:22 +00:00
|
|
|
"sort"
|
2015-12-10 10:32:31 +00:00
|
|
|
"strings"
|
2020-12-12 00:50:19 +00:00
|
|
|
"time"
|
2015-04-27 21:55:29 +00:00
|
|
|
|
2015-12-10 10:32:31 +00:00
|
|
|
"github.com/ghodss/yaml"
|
2015-04-27 21:55:29 +00:00
|
|
|
"github.com/hashicorp/vault/api"
|
|
|
|
"github.com/mitchellh/cli"
|
|
|
|
"github.com/ryanuber/columnize"
|
|
|
|
)
|
|
|
|
|
2017-09-08 02:04:48 +00:00
|
|
|
const (
|
|
|
|
// hopeDelim is the delimiter to use when splitting columns. We call it a
|
|
|
|
// hopeDelim because we hope that it's never contained in a secret.
|
|
|
|
hopeDelim = "♨"
|
|
|
|
)
|
2017-08-24 22:23:40 +00:00
|
|
|
|
2018-02-12 23:12:16 +00:00
|
|
|
type FormatOptions struct {
|
|
|
|
Format string
|
2015-04-27 21:55:29 +00:00
|
|
|
}
|
|
|
|
|
2018-02-12 23:12:16 +00:00
|
|
|
func OutputSecret(ui cli.Ui, secret *api.Secret) int {
|
|
|
|
return outputWithFormat(ui, secret, secret)
|
2016-02-12 18:21:42 +00:00
|
|
|
}
|
|
|
|
|
2018-02-12 23:12:16 +00:00
|
|
|
func OutputList(ui cli.Ui, data interface{}) int {
|
2021-09-30 11:33:14 +00:00
|
|
|
switch data := data.(type) {
|
2018-02-12 23:12:16 +00:00
|
|
|
case *api.Secret:
|
2021-09-30 11:33:14 +00:00
|
|
|
secret := data
|
2018-02-12 23:12:16 +00:00
|
|
|
return outputWithFormat(ui, secret, secret.Data["keys"])
|
|
|
|
default:
|
|
|
|
return outputWithFormat(ui, nil, data)
|
2017-09-05 04:01:44 +00:00
|
|
|
}
|
2018-02-12 23:12:16 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
func OutputData(ui cli.Ui, data interface{}) int {
|
|
|
|
return outputWithFormat(ui, nil, data)
|
|
|
|
}
|
2017-09-05 04:01:44 +00:00
|
|
|
|
2018-02-12 23:12:16 +00:00
|
|
|
func outputWithFormat(ui cli.Ui, secret *api.Secret, data interface{}) int {
|
|
|
|
format := Format(ui)
|
|
|
|
formatter, ok := Formatters[format]
|
2016-02-12 18:21:42 +00:00
|
|
|
if !ok {
|
2016-01-14 19:18:27 +00:00
|
|
|
ui.Error(fmt.Sprintf("Invalid output format: %s", format))
|
|
|
|
return 1
|
|
|
|
}
|
2018-02-12 23:12:16 +00:00
|
|
|
|
2016-02-25 02:45:14 +00:00
|
|
|
if err := formatter.Output(ui, secret, data); err != nil {
|
2018-02-12 23:12:16 +00:00
|
|
|
ui.Error(fmt.Sprintf("Could not parse output: %s", err.Error()))
|
2015-04-27 21:55:29 +00:00
|
|
|
return 1
|
|
|
|
}
|
|
|
|
return 0
|
|
|
|
}
|
|
|
|
|
2016-02-12 18:21:42 +00:00
|
|
|
type Formatter interface {
|
2016-02-25 02:45:14 +00:00
|
|
|
Output(ui cli.Ui, secret *api.Secret, data interface{}) error
|
2018-02-15 14:11:56 +00:00
|
|
|
Format(data interface{}) ([]byte, error)
|
2016-02-12 18:21:42 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
var Formatters = map[string]Formatter{
|
2021-03-03 18:59:50 +00:00
|
|
|
"json": JsonFormatter{},
|
|
|
|
"table": TableFormatter{},
|
|
|
|
"yaml": YamlFormatter{},
|
|
|
|
"yml": YamlFormatter{},
|
|
|
|
"pretty": PrettyFormatter{},
|
2016-02-12 18:21:42 +00:00
|
|
|
}
|
|
|
|
|
2018-02-12 23:12:16 +00:00
|
|
|
func Format(ui cli.Ui) string {
|
2021-09-30 11:33:14 +00:00
|
|
|
switch ui := ui.(type) {
|
2018-02-12 23:12:16 +00:00
|
|
|
case *VaultUI:
|
2021-09-30 11:33:14 +00:00
|
|
|
return ui.format
|
2018-02-12 23:12:16 +00:00
|
|
|
}
|
2018-05-23 20:45:17 +00:00
|
|
|
|
|
|
|
format := os.Getenv(EnvVaultFormat)
|
|
|
|
if format == "" {
|
|
|
|
format = "table"
|
|
|
|
}
|
|
|
|
|
|
|
|
return format
|
2018-02-12 23:12:16 +00:00
|
|
|
}
|
|
|
|
|
Vault CLI: show detailed information with ListResponseWithInfo (#15417)
* CLI: Add ability to display ListResponseWithInfos
The Vault Server API includes a ListResponseWithInfo call, allowing LIST
responses to contain additional information about their keys. This is in
a key=value mapping format (both for each key, to get the additional
metadata, as well as within each metadata).
Expand the `vault list` CLI command with a `-detailed` flag (and env var
VAULT_DETAILED_LISTS) to print this additional metadata. This looks
roughly like the following:
$ vault list -detailed pki/issuers
Keys issuer_name
---- -----------
0cba84d7-bbbe-836a-4ff6-a11b31dc0fb7 n/a
35dfb02d-0cdb-3d35-ee64-d0cd6568c6b0 n/a
382fad1e-e99c-9c54-e147-bb1faa8033d3 n/a
8bb4a793-2ad9-460c-9fa8-574c84a981f7 n/a
8bd231d7-20e2-f21f-ae1a-7aa3319715e7 n/a
9425d51f-cb81-426d-d6ad-5147d092094e n/a
ae679732-b497-ab0d-3220-806a2b9d81ed n/a
c5a44a1f-2ae4-2140-3acf-74b2609448cc utf8
d41d2419-efce-0e36-c96b-e91179a24dc1 something
Signed-off-by: Alexander Scheel <alex.scheel@hashicorp.com>
* Allow detailed printing of LIST responses in JSON
When using the JSON formatter, only the absolute list of keys were
returned. Reuse the `-detailed` flag value for the `-format=json` list
response printer, allowing us to show the complete API response returned
by Vault.
This returns something like the following:
{
"request_id": "e9a25dcd-b67a-97d7-0f08-3670918ef3ff",
"lease_id": "",
"lease_duration": 0,
"renewable": false,
"data": {
"key_info": {
"0cba84d7-bbbe-836a-4ff6-a11b31dc0fb7": {
"issuer_name": ""
},
"35dfb02d-0cdb-3d35-ee64-d0cd6568c6b0": {
"issuer_name": ""
},
"382fad1e-e99c-9c54-e147-bb1faa8033d3": {
"issuer_name": ""
},
"8bb4a793-2ad9-460c-9fa8-574c84a981f7": {
"issuer_name": ""
},
"8bd231d7-20e2-f21f-ae1a-7aa3319715e7": {
"issuer_name": ""
},
"9425d51f-cb81-426d-d6ad-5147d092094e": {
"issuer_name": ""
},
"ae679732-b497-ab0d-3220-806a2b9d81ed": {
"issuer_name": ""
},
"c5a44a1f-2ae4-2140-3acf-74b2609448cc": {
"issuer_name": "utf8"
},
"d41d2419-efce-0e36-c96b-e91179a24dc1": {
"issuer_name": "something"
}
},
"keys": [
"0cba84d7-bbbe-836a-4ff6-a11b31dc0fb7",
"35dfb02d-0cdb-3d35-ee64-d0cd6568c6b0",
"382fad1e-e99c-9c54-e147-bb1faa8033d3",
"8bb4a793-2ad9-460c-9fa8-574c84a981f7",
"8bd231d7-20e2-f21f-ae1a-7aa3319715e7",
"9425d51f-cb81-426d-d6ad-5147d092094e",
"ae679732-b497-ab0d-3220-806a2b9d81ed",
"c5a44a1f-2ae4-2140-3acf-74b2609448cc",
"d41d2419-efce-0e36-c96b-e91179a24dc1"
]
},
"warnings": null
}
Signed-off-by: Alexander Scheel <alex.scheel@hashicorp.com>
* Add changelog
Signed-off-by: Alexander Scheel <alex.scheel@hashicorp.com>
* Use field on UI rather than secret.Data
Signed-off-by: Alexander Scheel <alex.scheel@hashicorp.com>
* Only include headers from visitable key_infos
Certain API endpoints return data from non-visitable key_infos, by
virtue of using a hand-rolled response. Limit our headers to those
from visitable key_infos. This means we won't return entire columns with
n/a entries, if no key matches the key_info key that includes that
header.
Signed-off-by: Alexander Scheel <alex.scheel@hashicorp.com>
* Use setupEnv sourced detailed info
Signed-off-by: Alexander Scheel <alex.scheel@hashicorp.com>
* Fix changelog environment variable
Signed-off-by: Alexander Scheel <alex.scheel@hashicorp.com>
* Fix broken tests using setupEnv
Signed-off-by: Alexander Scheel <alex.scheel@hashicorp.com>
2022-05-18 17:00:50 +00:00
|
|
|
func Detailed(ui cli.Ui) bool {
|
|
|
|
switch ui := ui.(type) {
|
|
|
|
case *VaultUI:
|
|
|
|
return ui.detailed
|
|
|
|
}
|
|
|
|
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
2016-02-12 18:21:42 +00:00
|
|
|
// An output formatter for json output of an object
|
2017-08-28 20:45:04 +00:00
|
|
|
type JsonFormatter struct{}
|
2016-02-12 18:21:42 +00:00
|
|
|
|
2018-02-15 14:11:56 +00:00
|
|
|
func (j JsonFormatter) Format(data interface{}) ([]byte, error) {
|
|
|
|
return json.MarshalIndent(data, "", " ")
|
|
|
|
}
|
|
|
|
|
2016-02-25 02:45:14 +00:00
|
|
|
func (j JsonFormatter) Output(ui cli.Ui, secret *api.Secret, data interface{}) error {
|
2018-02-15 14:11:56 +00:00
|
|
|
b, err := j.Format(data)
|
2017-08-28 20:45:04 +00:00
|
|
|
if err != nil {
|
|
|
|
return err
|
2016-01-14 19:18:27 +00:00
|
|
|
}
|
Vault CLI: show detailed information with ListResponseWithInfo (#15417)
* CLI: Add ability to display ListResponseWithInfos
The Vault Server API includes a ListResponseWithInfo call, allowing LIST
responses to contain additional information about their keys. This is in
a key=value mapping format (both for each key, to get the additional
metadata, as well as within each metadata).
Expand the `vault list` CLI command with a `-detailed` flag (and env var
VAULT_DETAILED_LISTS) to print this additional metadata. This looks
roughly like the following:
$ vault list -detailed pki/issuers
Keys issuer_name
---- -----------
0cba84d7-bbbe-836a-4ff6-a11b31dc0fb7 n/a
35dfb02d-0cdb-3d35-ee64-d0cd6568c6b0 n/a
382fad1e-e99c-9c54-e147-bb1faa8033d3 n/a
8bb4a793-2ad9-460c-9fa8-574c84a981f7 n/a
8bd231d7-20e2-f21f-ae1a-7aa3319715e7 n/a
9425d51f-cb81-426d-d6ad-5147d092094e n/a
ae679732-b497-ab0d-3220-806a2b9d81ed n/a
c5a44a1f-2ae4-2140-3acf-74b2609448cc utf8
d41d2419-efce-0e36-c96b-e91179a24dc1 something
Signed-off-by: Alexander Scheel <alex.scheel@hashicorp.com>
* Allow detailed printing of LIST responses in JSON
When using the JSON formatter, only the absolute list of keys were
returned. Reuse the `-detailed` flag value for the `-format=json` list
response printer, allowing us to show the complete API response returned
by Vault.
This returns something like the following:
{
"request_id": "e9a25dcd-b67a-97d7-0f08-3670918ef3ff",
"lease_id": "",
"lease_duration": 0,
"renewable": false,
"data": {
"key_info": {
"0cba84d7-bbbe-836a-4ff6-a11b31dc0fb7": {
"issuer_name": ""
},
"35dfb02d-0cdb-3d35-ee64-d0cd6568c6b0": {
"issuer_name": ""
},
"382fad1e-e99c-9c54-e147-bb1faa8033d3": {
"issuer_name": ""
},
"8bb4a793-2ad9-460c-9fa8-574c84a981f7": {
"issuer_name": ""
},
"8bd231d7-20e2-f21f-ae1a-7aa3319715e7": {
"issuer_name": ""
},
"9425d51f-cb81-426d-d6ad-5147d092094e": {
"issuer_name": ""
},
"ae679732-b497-ab0d-3220-806a2b9d81ed": {
"issuer_name": ""
},
"c5a44a1f-2ae4-2140-3acf-74b2609448cc": {
"issuer_name": "utf8"
},
"d41d2419-efce-0e36-c96b-e91179a24dc1": {
"issuer_name": "something"
}
},
"keys": [
"0cba84d7-bbbe-836a-4ff6-a11b31dc0fb7",
"35dfb02d-0cdb-3d35-ee64-d0cd6568c6b0",
"382fad1e-e99c-9c54-e147-bb1faa8033d3",
"8bb4a793-2ad9-460c-9fa8-574c84a981f7",
"8bd231d7-20e2-f21f-ae1a-7aa3319715e7",
"9425d51f-cb81-426d-d6ad-5147d092094e",
"ae679732-b497-ab0d-3220-806a2b9d81ed",
"c5a44a1f-2ae4-2140-3acf-74b2609448cc",
"d41d2419-efce-0e36-c96b-e91179a24dc1"
]
},
"warnings": null
}
Signed-off-by: Alexander Scheel <alex.scheel@hashicorp.com>
* Add changelog
Signed-off-by: Alexander Scheel <alex.scheel@hashicorp.com>
* Use field on UI rather than secret.Data
Signed-off-by: Alexander Scheel <alex.scheel@hashicorp.com>
* Only include headers from visitable key_infos
Certain API endpoints return data from non-visitable key_infos, by
virtue of using a hand-rolled response. Limit our headers to those
from visitable key_infos. This means we won't return entire columns with
n/a entries, if no key matches the key_info key that includes that
header.
Signed-off-by: Alexander Scheel <alex.scheel@hashicorp.com>
* Use setupEnv sourced detailed info
Signed-off-by: Alexander Scheel <alex.scheel@hashicorp.com>
* Fix changelog environment variable
Signed-off-by: Alexander Scheel <alex.scheel@hashicorp.com>
* Fix broken tests using setupEnv
Signed-off-by: Alexander Scheel <alex.scheel@hashicorp.com>
2022-05-18 17:00:50 +00:00
|
|
|
|
|
|
|
if secret != nil {
|
|
|
|
shouldListWithInfo := Detailed(ui)
|
|
|
|
|
|
|
|
// Show the raw JSON of the LIST call, rather than only the
|
|
|
|
// list of keys.
|
|
|
|
if shouldListWithInfo {
|
|
|
|
b, err = j.Format(secret)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-08-28 20:45:04 +00:00
|
|
|
ui.Output(string(b))
|
|
|
|
return nil
|
2016-02-12 18:21:42 +00:00
|
|
|
}
|
2016-01-14 19:18:27 +00:00
|
|
|
|
2016-02-12 18:21:42 +00:00
|
|
|
// An output formatter for yaml output format of an object
|
2018-07-11 16:07:48 +00:00
|
|
|
type YamlFormatter struct{}
|
2016-01-14 19:18:27 +00:00
|
|
|
|
2018-02-15 14:11:56 +00:00
|
|
|
func (y YamlFormatter) Format(data interface{}) ([]byte, error) {
|
|
|
|
return yaml.Marshal(data)
|
|
|
|
}
|
|
|
|
|
2016-02-25 02:45:14 +00:00
|
|
|
func (y YamlFormatter) Output(ui cli.Ui, secret *api.Secret, data interface{}) error {
|
2018-02-15 14:11:56 +00:00
|
|
|
b, err := y.Format(data)
|
2016-02-12 18:21:42 +00:00
|
|
|
if err == nil {
|
|
|
|
ui.Output(strings.TrimSpace(string(b)))
|
2015-12-10 10:32:31 +00:00
|
|
|
}
|
2016-02-12 18:21:42 +00:00
|
|
|
return err
|
|
|
|
}
|
2015-12-10 10:32:31 +00:00
|
|
|
|
2021-03-03 18:59:50 +00:00
|
|
|
type PrettyFormatter struct{}
|
|
|
|
|
|
|
|
func (p PrettyFormatter) Format(data interface{}) ([]byte, error) {
|
|
|
|
return nil, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (p PrettyFormatter) Output(ui cli.Ui, secret *api.Secret, data interface{}) error {
|
|
|
|
switch data.(type) {
|
|
|
|
case *api.AutopilotState:
|
|
|
|
p.OutputAutopilotState(ui, data)
|
|
|
|
default:
|
|
|
|
return errors.New("cannot use the pretty formatter for this type")
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func outputStringSlice(buffer *bytes.Buffer, indent string, values []string) {
|
|
|
|
for _, val := range values {
|
|
|
|
buffer.WriteString(fmt.Sprintf("%s%s\n", indent, val))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
type mapOutput struct {
|
|
|
|
key string
|
|
|
|
value string
|
|
|
|
}
|
|
|
|
|
|
|
|
func formatServer(srv *api.AutopilotServer) string {
|
|
|
|
var buffer bytes.Buffer
|
|
|
|
|
|
|
|
buffer.WriteString(fmt.Sprintf(" %s\n", srv.ID))
|
2022-05-20 20:49:11 +00:00
|
|
|
buffer.WriteString(fmt.Sprintf(" Name: %s\n", srv.Name))
|
|
|
|
buffer.WriteString(fmt.Sprintf(" Address: %s\n", srv.Address))
|
|
|
|
buffer.WriteString(fmt.Sprintf(" Status: %s\n", srv.Status))
|
|
|
|
buffer.WriteString(fmt.Sprintf(" Node Status: %s\n", srv.NodeStatus))
|
|
|
|
buffer.WriteString(fmt.Sprintf(" Healthy: %t\n", srv.Healthy))
|
|
|
|
buffer.WriteString(fmt.Sprintf(" Last Contact: %s\n", srv.LastContact))
|
|
|
|
buffer.WriteString(fmt.Sprintf(" Last Term: %d\n", srv.LastTerm))
|
|
|
|
buffer.WriteString(fmt.Sprintf(" Last Index: %d\n", srv.LastIndex))
|
|
|
|
buffer.WriteString(fmt.Sprintf(" Version: %s\n", srv.Version))
|
|
|
|
|
|
|
|
if srv.UpgradeVersion != "" {
|
|
|
|
buffer.WriteString(fmt.Sprintf(" Upgrade Version: %s\n", srv.UpgradeVersion))
|
|
|
|
}
|
|
|
|
if srv.RedundancyZone != "" {
|
|
|
|
buffer.WriteString(fmt.Sprintf(" Redundancy Zone: %s\n", srv.RedundancyZone))
|
|
|
|
}
|
|
|
|
if srv.NodeType != "" {
|
|
|
|
buffer.WriteString(fmt.Sprintf(" Node Type: %s\n", srv.NodeType))
|
2021-03-03 18:59:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return buffer.String()
|
|
|
|
}
|
|
|
|
|
|
|
|
func (p PrettyFormatter) OutputAutopilotState(ui cli.Ui, data interface{}) {
|
|
|
|
state := data.(*api.AutopilotState)
|
|
|
|
|
|
|
|
var buffer bytes.Buffer
|
2022-05-20 20:49:11 +00:00
|
|
|
buffer.WriteString(fmt.Sprintf("Healthy: %t\n", state.Healthy))
|
|
|
|
buffer.WriteString(fmt.Sprintf("Failure Tolerance: %d\n", state.FailureTolerance))
|
|
|
|
buffer.WriteString(fmt.Sprintf("Leader: %s\n", state.Leader))
|
2021-03-03 18:59:50 +00:00
|
|
|
buffer.WriteString("Voters:\n")
|
|
|
|
outputStringSlice(&buffer, " ", state.Voters)
|
|
|
|
|
|
|
|
if len(state.NonVoters) > 0 {
|
|
|
|
buffer.WriteString("Non Voters:\n")
|
|
|
|
outputStringSlice(&buffer, " ", state.NonVoters)
|
|
|
|
}
|
|
|
|
|
2022-05-20 20:49:11 +00:00
|
|
|
if state.OptimisticFailureTolerance > 0 {
|
|
|
|
buffer.WriteString(fmt.Sprintf("Optimistic Failure Tolerance: %d\n", state.OptimisticFailureTolerance))
|
|
|
|
}
|
|
|
|
|
|
|
|
// Servers
|
2021-03-03 18:59:50 +00:00
|
|
|
buffer.WriteString("Servers:\n")
|
|
|
|
var outputs []mapOutput
|
|
|
|
for id, srv := range state.Servers {
|
|
|
|
outputs = append(outputs, mapOutput{key: id, value: formatServer(srv)})
|
|
|
|
}
|
|
|
|
sort.Slice(outputs, func(i, j int) bool {
|
|
|
|
return outputs[i].key < outputs[j].key
|
|
|
|
})
|
|
|
|
for _, output := range outputs {
|
|
|
|
buffer.WriteString(output.value)
|
|
|
|
}
|
|
|
|
|
2022-05-20 20:49:11 +00:00
|
|
|
// Redundancy Zones
|
|
|
|
if len(state.RedundancyZones) > 0 {
|
|
|
|
buffer.WriteString("Redundancy Zones:\n")
|
|
|
|
zoneList := make([]string, 0, len(state.RedundancyZones))
|
|
|
|
for z := range state.RedundancyZones {
|
|
|
|
zoneList = append(zoneList, z)
|
|
|
|
}
|
|
|
|
sort.Strings(zoneList)
|
|
|
|
for _, zoneName := range zoneList {
|
|
|
|
zone := state.RedundancyZones[zoneName]
|
|
|
|
servers := zone.Servers
|
|
|
|
voters := zone.Voters
|
|
|
|
sort.Strings(servers)
|
|
|
|
sort.Strings(voters)
|
|
|
|
buffer.WriteString(fmt.Sprintf(" %s\n", zoneName))
|
|
|
|
buffer.WriteString(fmt.Sprintf(" Servers: %s\n", strings.Join(servers, ", ")))
|
|
|
|
buffer.WriteString(fmt.Sprintf(" Voters: %s\n", strings.Join(voters, ", ")))
|
|
|
|
buffer.WriteString(fmt.Sprintf(" Failure Tolerance: %d\n", zone.FailureTolerance))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Upgrade Info
|
|
|
|
if state.Upgrade != nil {
|
|
|
|
buffer.WriteString("Upgrade Info:\n")
|
|
|
|
buffer.WriteString(fmt.Sprintf(" Status: %s\n", state.Upgrade.Status))
|
|
|
|
buffer.WriteString(fmt.Sprintf(" Target Version: %s\n", state.Upgrade.TargetVersion))
|
|
|
|
buffer.WriteString(fmt.Sprintf(" Target Version Voters: %s\n", strings.Join(state.Upgrade.TargetVersionVoters, ", ")))
|
|
|
|
buffer.WriteString(fmt.Sprintf(" Target Version Non-Voters: %s\n", strings.Join(state.Upgrade.TargetVersionNonVoters, ", ")))
|
|
|
|
buffer.WriteString(fmt.Sprintf(" Other Version Voters: %s\n", strings.Join(state.Upgrade.OtherVersionVoters, ", ")))
|
|
|
|
buffer.WriteString(fmt.Sprintf(" Other Version Non-Voters: %s\n", strings.Join(state.Upgrade.OtherVersionNonVoters, ", ")))
|
|
|
|
|
|
|
|
if len(state.Upgrade.RedundancyZones) > 0 {
|
|
|
|
buffer.WriteString(" Redundancy Zones:\n")
|
|
|
|
for zoneName, zoneVersion := range state.Upgrade.RedundancyZones {
|
|
|
|
buffer.WriteString(fmt.Sprintf(" %s\n", zoneName))
|
|
|
|
buffer.WriteString(fmt.Sprintf(" Target Version Voters: %s\n", strings.Join(zoneVersion.TargetVersionVoters, ", ")))
|
|
|
|
buffer.WriteString(fmt.Sprintf(" Target Version Non-Voters: %s\n", strings.Join(zoneVersion.TargetVersionNonVoters, ", ")))
|
|
|
|
buffer.WriteString(fmt.Sprintf(" Other Version Voters: %s\n", strings.Join(zoneVersion.OtherVersionVoters, ", ")))
|
|
|
|
buffer.WriteString(fmt.Sprintf(" Other Version Non-Voters: %s\n", strings.Join(zoneVersion.OtherVersionNonVoters, ", ")))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-03-03 18:59:50 +00:00
|
|
|
ui.Output(buffer.String())
|
|
|
|
}
|
|
|
|
|
2016-02-12 18:21:42 +00:00
|
|
|
// An output formatter for table output of an object
|
2018-07-11 16:07:48 +00:00
|
|
|
type TableFormatter struct{}
|
2015-12-10 10:32:31 +00:00
|
|
|
|
2020-09-23 17:30:01 +00:00
|
|
|
// We don't use this due to the TableFormatter introducing a bug when the -field flag is supplied:
|
|
|
|
// https://github.com/hashicorp/vault/commit/b24cf9a8af2190e96c614205b8cdf06d8c4b6718 .
|
2018-02-15 14:11:56 +00:00
|
|
|
func (t TableFormatter) Format(data interface{}) ([]byte, error) {
|
|
|
|
return nil, nil
|
|
|
|
}
|
|
|
|
|
2016-02-25 02:45:14 +00:00
|
|
|
func (t TableFormatter) Output(ui cli.Ui, secret *api.Secret, data interface{}) error {
|
2021-09-30 11:33:14 +00:00
|
|
|
switch data := data.(type) {
|
2018-02-12 23:12:16 +00:00
|
|
|
case *api.Secret:
|
|
|
|
return t.OutputSecret(ui, secret)
|
|
|
|
case []interface{}:
|
|
|
|
return t.OutputList(ui, secret, data)
|
|
|
|
case []string:
|
|
|
|
return t.OutputList(ui, nil, data)
|
2018-03-21 22:02:41 +00:00
|
|
|
case map[string]interface{}:
|
2021-09-30 11:33:14 +00:00
|
|
|
return t.OutputMap(ui, data)
|
2020-09-23 17:30:01 +00:00
|
|
|
case SealStatusOutput:
|
|
|
|
return t.OutputSealStatusStruct(ui, nil, data)
|
2018-02-12 23:12:16 +00:00
|
|
|
default:
|
2018-04-09 18:35:21 +00:00
|
|
|
return errors.New("cannot use the table formatter for this type")
|
2016-02-12 18:21:42 +00:00
|
|
|
}
|
|
|
|
}
|
2016-01-14 19:18:27 +00:00
|
|
|
|
2020-09-23 17:30:01 +00:00
|
|
|
func (t TableFormatter) OutputSealStatusStruct(ui cli.Ui, secret *api.Secret, data interface{}) error {
|
|
|
|
var status SealStatusOutput = data.(SealStatusOutput)
|
|
|
|
var sealPrefix string
|
|
|
|
if status.RecoverySeal {
|
|
|
|
sealPrefix = "Recovery "
|
|
|
|
}
|
|
|
|
|
|
|
|
out := []string{}
|
|
|
|
out = append(out, "Key | Value")
|
|
|
|
out = append(out, fmt.Sprintf("%sSeal Type | %s", sealPrefix, status.Type))
|
|
|
|
out = append(out, fmt.Sprintf("Initialized | %t", status.Initialized))
|
|
|
|
out = append(out, fmt.Sprintf("Sealed | %t", status.Sealed))
|
|
|
|
out = append(out, fmt.Sprintf("Total %sShares | %d", sealPrefix, status.N))
|
|
|
|
out = append(out, fmt.Sprintf("Threshold | %d", status.T))
|
|
|
|
|
|
|
|
if status.Sealed {
|
|
|
|
out = append(out, fmt.Sprintf("Unseal Progress | %d/%d", status.Progress, status.T))
|
|
|
|
out = append(out, fmt.Sprintf("Unseal Nonce | %s", status.Nonce))
|
|
|
|
}
|
|
|
|
|
|
|
|
if status.Migration {
|
|
|
|
out = append(out, fmt.Sprintf("Seal Migration in Progress | %t", status.Migration))
|
|
|
|
}
|
|
|
|
|
|
|
|
out = append(out, fmt.Sprintf("Version | %s", status.Version))
|
2022-04-19 18:28:08 +00:00
|
|
|
out = append(out, fmt.Sprintf("Build Date | %s", status.BuildDate))
|
2020-09-23 17:30:01 +00:00
|
|
|
out = append(out, fmt.Sprintf("Storage Type | %s", status.StorageType))
|
|
|
|
|
|
|
|
if status.ClusterName != "" && status.ClusterID != "" {
|
|
|
|
out = append(out, fmt.Sprintf("Cluster Name | %s", status.ClusterName))
|
|
|
|
out = append(out, fmt.Sprintf("Cluster ID | %s", status.ClusterID))
|
|
|
|
}
|
|
|
|
|
2022-09-06 18:11:04 +00:00
|
|
|
// Output if HCP link is configured
|
|
|
|
if status.HCPLinkStatus != "" {
|
|
|
|
out = append(out, fmt.Sprintf("HCP Link Status | %s", status.HCPLinkStatus))
|
|
|
|
out = append(out, fmt.Sprintf("HCP Link Resource ID | %s", status.HCPLinkResourceID))
|
|
|
|
}
|
|
|
|
|
2020-09-23 17:30:01 +00:00
|
|
|
// Output if HA is enabled
|
|
|
|
out = append(out, fmt.Sprintf("HA Enabled | %t", status.HAEnabled))
|
|
|
|
|
|
|
|
if status.HAEnabled {
|
|
|
|
mode := "sealed"
|
|
|
|
if !status.Sealed {
|
|
|
|
out = append(out, fmt.Sprintf("HA Cluster | %s", status.LeaderClusterAddress))
|
|
|
|
mode = "standby"
|
|
|
|
showLeaderAddr := false
|
|
|
|
if status.IsSelf {
|
|
|
|
mode = "active"
|
|
|
|
} else {
|
|
|
|
if status.LeaderAddress == "" {
|
|
|
|
status.LeaderAddress = "<none>"
|
|
|
|
}
|
|
|
|
showLeaderAddr = true
|
|
|
|
}
|
|
|
|
out = append(out, fmt.Sprintf("HA Mode | %s", mode))
|
|
|
|
|
2020-12-12 00:50:19 +00:00
|
|
|
if status.IsSelf && !status.ActiveTime.IsZero() {
|
|
|
|
out = append(out, fmt.Sprintf("Active Since | %s", status.ActiveTime.Format(time.RFC3339Nano)))
|
|
|
|
}
|
2020-09-23 17:30:01 +00:00
|
|
|
// This is down here just to keep ordering consistent
|
|
|
|
if showLeaderAddr {
|
|
|
|
out = append(out, fmt.Sprintf("Active Node Address | %s", status.LeaderAddress))
|
|
|
|
}
|
|
|
|
|
|
|
|
if status.PerfStandby {
|
|
|
|
out = append(out, fmt.Sprintf("Performance Standby Node | %t", status.PerfStandby))
|
|
|
|
out = append(out, fmt.Sprintf("Performance Standby Last Remote WAL | %d", status.PerfStandbyLastRemoteWAL))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if status.RaftCommittedIndex > 0 {
|
|
|
|
out = append(out, fmt.Sprintf("Raft Committed Index | %d", status.RaftCommittedIndex))
|
|
|
|
}
|
|
|
|
if status.RaftAppliedIndex > 0 {
|
|
|
|
out = append(out, fmt.Sprintf("Raft Applied Index | %d", status.RaftAppliedIndex))
|
|
|
|
}
|
|
|
|
if status.LastWAL != 0 {
|
|
|
|
out = append(out, fmt.Sprintf("Last WAL | %d", status.LastWAL))
|
|
|
|
}
|
|
|
|
|
|
|
|
ui.Output(tableOutput(out, &columnize.Config{
|
|
|
|
Delim: "|",
|
|
|
|
}))
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2018-02-12 23:12:16 +00:00
|
|
|
func (t TableFormatter) OutputList(ui cli.Ui, secret *api.Secret, data interface{}) error {
|
2017-09-08 02:04:48 +00:00
|
|
|
t.printWarnings(ui, secret)
|
2016-02-12 18:21:42 +00:00
|
|
|
|
Vault CLI: show detailed information with ListResponseWithInfo (#15417)
* CLI: Add ability to display ListResponseWithInfos
The Vault Server API includes a ListResponseWithInfo call, allowing LIST
responses to contain additional information about their keys. This is in
a key=value mapping format (both for each key, to get the additional
metadata, as well as within each metadata).
Expand the `vault list` CLI command with a `-detailed` flag (and env var
VAULT_DETAILED_LISTS) to print this additional metadata. This looks
roughly like the following:
$ vault list -detailed pki/issuers
Keys issuer_name
---- -----------
0cba84d7-bbbe-836a-4ff6-a11b31dc0fb7 n/a
35dfb02d-0cdb-3d35-ee64-d0cd6568c6b0 n/a
382fad1e-e99c-9c54-e147-bb1faa8033d3 n/a
8bb4a793-2ad9-460c-9fa8-574c84a981f7 n/a
8bd231d7-20e2-f21f-ae1a-7aa3319715e7 n/a
9425d51f-cb81-426d-d6ad-5147d092094e n/a
ae679732-b497-ab0d-3220-806a2b9d81ed n/a
c5a44a1f-2ae4-2140-3acf-74b2609448cc utf8
d41d2419-efce-0e36-c96b-e91179a24dc1 something
Signed-off-by: Alexander Scheel <alex.scheel@hashicorp.com>
* Allow detailed printing of LIST responses in JSON
When using the JSON formatter, only the absolute list of keys were
returned. Reuse the `-detailed` flag value for the `-format=json` list
response printer, allowing us to show the complete API response returned
by Vault.
This returns something like the following:
{
"request_id": "e9a25dcd-b67a-97d7-0f08-3670918ef3ff",
"lease_id": "",
"lease_duration": 0,
"renewable": false,
"data": {
"key_info": {
"0cba84d7-bbbe-836a-4ff6-a11b31dc0fb7": {
"issuer_name": ""
},
"35dfb02d-0cdb-3d35-ee64-d0cd6568c6b0": {
"issuer_name": ""
},
"382fad1e-e99c-9c54-e147-bb1faa8033d3": {
"issuer_name": ""
},
"8bb4a793-2ad9-460c-9fa8-574c84a981f7": {
"issuer_name": ""
},
"8bd231d7-20e2-f21f-ae1a-7aa3319715e7": {
"issuer_name": ""
},
"9425d51f-cb81-426d-d6ad-5147d092094e": {
"issuer_name": ""
},
"ae679732-b497-ab0d-3220-806a2b9d81ed": {
"issuer_name": ""
},
"c5a44a1f-2ae4-2140-3acf-74b2609448cc": {
"issuer_name": "utf8"
},
"d41d2419-efce-0e36-c96b-e91179a24dc1": {
"issuer_name": "something"
}
},
"keys": [
"0cba84d7-bbbe-836a-4ff6-a11b31dc0fb7",
"35dfb02d-0cdb-3d35-ee64-d0cd6568c6b0",
"382fad1e-e99c-9c54-e147-bb1faa8033d3",
"8bb4a793-2ad9-460c-9fa8-574c84a981f7",
"8bd231d7-20e2-f21f-ae1a-7aa3319715e7",
"9425d51f-cb81-426d-d6ad-5147d092094e",
"ae679732-b497-ab0d-3220-806a2b9d81ed",
"c5a44a1f-2ae4-2140-3acf-74b2609448cc",
"d41d2419-efce-0e36-c96b-e91179a24dc1"
]
},
"warnings": null
}
Signed-off-by: Alexander Scheel <alex.scheel@hashicorp.com>
* Add changelog
Signed-off-by: Alexander Scheel <alex.scheel@hashicorp.com>
* Use field on UI rather than secret.Data
Signed-off-by: Alexander Scheel <alex.scheel@hashicorp.com>
* Only include headers from visitable key_infos
Certain API endpoints return data from non-visitable key_infos, by
virtue of using a hand-rolled response. Limit our headers to those
from visitable key_infos. This means we won't return entire columns with
n/a entries, if no key matches the key_info key that includes that
header.
Signed-off-by: Alexander Scheel <alex.scheel@hashicorp.com>
* Use setupEnv sourced detailed info
Signed-off-by: Alexander Scheel <alex.scheel@hashicorp.com>
* Fix changelog environment variable
Signed-off-by: Alexander Scheel <alex.scheel@hashicorp.com>
* Fix broken tests using setupEnv
Signed-off-by: Alexander Scheel <alex.scheel@hashicorp.com>
2022-05-18 17:00:50 +00:00
|
|
|
// Determine if we have additional information from a ListResponseWithInfo endpoint.
|
|
|
|
var additionalInfo map[string]interface{}
|
|
|
|
if secret != nil {
|
|
|
|
shouldListWithInfo := Detailed(ui)
|
|
|
|
if additional, ok := secret.Data["key_info"]; shouldListWithInfo && ok && len(additional.(map[string]interface{})) > 0 {
|
|
|
|
additionalInfo = additional.(map[string]interface{})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-09-30 11:33:14 +00:00
|
|
|
switch data := data.(type) {
|
2018-02-12 23:12:16 +00:00
|
|
|
case []interface{}:
|
|
|
|
case []string:
|
2021-09-30 11:33:14 +00:00
|
|
|
ui.Output(tableOutput(data, nil))
|
2018-02-12 23:12:16 +00:00
|
|
|
return nil
|
|
|
|
default:
|
2018-04-09 18:35:21 +00:00
|
|
|
return errors.New("error: table formatter cannot output list for this data type")
|
2018-02-12 23:12:16 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
list := data.([]interface{})
|
|
|
|
|
2016-09-01 19:58:16 +00:00
|
|
|
if len(list) > 0 {
|
2017-09-08 02:04:48 +00:00
|
|
|
keys := make([]string, len(list))
|
|
|
|
for i, v := range list {
|
|
|
|
typed, ok := v.(string)
|
|
|
|
if !ok {
|
2018-04-05 15:49:21 +00:00
|
|
|
return fmt.Errorf("%v is not a string", v)
|
2017-09-08 02:04:48 +00:00
|
|
|
}
|
|
|
|
keys[i] = typed
|
2016-09-01 19:58:16 +00:00
|
|
|
}
|
|
|
|
sort.Strings(keys)
|
2016-02-12 18:21:42 +00:00
|
|
|
|
Vault CLI: show detailed information with ListResponseWithInfo (#15417)
* CLI: Add ability to display ListResponseWithInfos
The Vault Server API includes a ListResponseWithInfo call, allowing LIST
responses to contain additional information about their keys. This is in
a key=value mapping format (both for each key, to get the additional
metadata, as well as within each metadata).
Expand the `vault list` CLI command with a `-detailed` flag (and env var
VAULT_DETAILED_LISTS) to print this additional metadata. This looks
roughly like the following:
$ vault list -detailed pki/issuers
Keys issuer_name
---- -----------
0cba84d7-bbbe-836a-4ff6-a11b31dc0fb7 n/a
35dfb02d-0cdb-3d35-ee64-d0cd6568c6b0 n/a
382fad1e-e99c-9c54-e147-bb1faa8033d3 n/a
8bb4a793-2ad9-460c-9fa8-574c84a981f7 n/a
8bd231d7-20e2-f21f-ae1a-7aa3319715e7 n/a
9425d51f-cb81-426d-d6ad-5147d092094e n/a
ae679732-b497-ab0d-3220-806a2b9d81ed n/a
c5a44a1f-2ae4-2140-3acf-74b2609448cc utf8
d41d2419-efce-0e36-c96b-e91179a24dc1 something
Signed-off-by: Alexander Scheel <alex.scheel@hashicorp.com>
* Allow detailed printing of LIST responses in JSON
When using the JSON formatter, only the absolute list of keys were
returned. Reuse the `-detailed` flag value for the `-format=json` list
response printer, allowing us to show the complete API response returned
by Vault.
This returns something like the following:
{
"request_id": "e9a25dcd-b67a-97d7-0f08-3670918ef3ff",
"lease_id": "",
"lease_duration": 0,
"renewable": false,
"data": {
"key_info": {
"0cba84d7-bbbe-836a-4ff6-a11b31dc0fb7": {
"issuer_name": ""
},
"35dfb02d-0cdb-3d35-ee64-d0cd6568c6b0": {
"issuer_name": ""
},
"382fad1e-e99c-9c54-e147-bb1faa8033d3": {
"issuer_name": ""
},
"8bb4a793-2ad9-460c-9fa8-574c84a981f7": {
"issuer_name": ""
},
"8bd231d7-20e2-f21f-ae1a-7aa3319715e7": {
"issuer_name": ""
},
"9425d51f-cb81-426d-d6ad-5147d092094e": {
"issuer_name": ""
},
"ae679732-b497-ab0d-3220-806a2b9d81ed": {
"issuer_name": ""
},
"c5a44a1f-2ae4-2140-3acf-74b2609448cc": {
"issuer_name": "utf8"
},
"d41d2419-efce-0e36-c96b-e91179a24dc1": {
"issuer_name": "something"
}
},
"keys": [
"0cba84d7-bbbe-836a-4ff6-a11b31dc0fb7",
"35dfb02d-0cdb-3d35-ee64-d0cd6568c6b0",
"382fad1e-e99c-9c54-e147-bb1faa8033d3",
"8bb4a793-2ad9-460c-9fa8-574c84a981f7",
"8bd231d7-20e2-f21f-ae1a-7aa3319715e7",
"9425d51f-cb81-426d-d6ad-5147d092094e",
"ae679732-b497-ab0d-3220-806a2b9d81ed",
"c5a44a1f-2ae4-2140-3acf-74b2609448cc",
"d41d2419-efce-0e36-c96b-e91179a24dc1"
]
},
"warnings": null
}
Signed-off-by: Alexander Scheel <alex.scheel@hashicorp.com>
* Add changelog
Signed-off-by: Alexander Scheel <alex.scheel@hashicorp.com>
* Use field on UI rather than secret.Data
Signed-off-by: Alexander Scheel <alex.scheel@hashicorp.com>
* Only include headers from visitable key_infos
Certain API endpoints return data from non-visitable key_infos, by
virtue of using a hand-rolled response. Limit our headers to those
from visitable key_infos. This means we won't return entire columns with
n/a entries, if no key matches the key_info key that includes that
header.
Signed-off-by: Alexander Scheel <alex.scheel@hashicorp.com>
* Use setupEnv sourced detailed info
Signed-off-by: Alexander Scheel <alex.scheel@hashicorp.com>
* Fix changelog environment variable
Signed-off-by: Alexander Scheel <alex.scheel@hashicorp.com>
* Fix broken tests using setupEnv
Signed-off-by: Alexander Scheel <alex.scheel@hashicorp.com>
2022-05-18 17:00:50 +00:00
|
|
|
// If we have a ListResponseWithInfo endpoint, we'll need to show
|
|
|
|
// additional headers. To satisfy the table outputter, we'll need
|
|
|
|
// to concat them with the deliminator.
|
|
|
|
var headers []string
|
|
|
|
header := "Keys"
|
|
|
|
if len(additionalInfo) > 0 {
|
|
|
|
seenHeaders := make(map[string]bool)
|
|
|
|
for key, rawValues := range additionalInfo {
|
|
|
|
// Most endpoints use the well-behaved ListResponseWithInfo.
|
|
|
|
// However, some use a hand-rolled equivalent, where the
|
|
|
|
// returned "keys" doesn't match the key of the "key_info"
|
|
|
|
// member (namely, /sys/policies/egp). We seek to exclude
|
|
|
|
// headers only visible from "non-visitable" key_info rows,
|
|
|
|
// to make table output less confusing. These non-visitable
|
|
|
|
// rows will still be visible in the JSON output.
|
|
|
|
index := sort.SearchStrings(keys, key)
|
|
|
|
if index < len(keys) && keys[index] != key {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
|
|
|
values := rawValues.(map[string]interface{})
|
|
|
|
for key := range values {
|
|
|
|
seenHeaders[key] = true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
for key := range seenHeaders {
|
|
|
|
headers = append(headers, key)
|
|
|
|
}
|
|
|
|
sort.Strings(headers)
|
|
|
|
|
|
|
|
header = header + hopeDelim + strings.Join(headers, hopeDelim)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Finally, if we have a ListResponseWithInfo, we'll need to update
|
|
|
|
// the returned rows to not just have the keys (in the sorted order),
|
|
|
|
// but also have the values for each header (in their sorted order).
|
|
|
|
rows := keys
|
|
|
|
if len(additionalInfo) > 0 && len(headers) > 0 {
|
|
|
|
for index, row := range rows {
|
|
|
|
formatted := []string{row}
|
|
|
|
if rawValues, ok := additionalInfo[row]; ok {
|
|
|
|
values := rawValues.(map[string]interface{})
|
|
|
|
for _, header := range headers {
|
|
|
|
if rawValue, ok := values[header]; ok {
|
|
|
|
if looksLikeDuration(header) {
|
|
|
|
rawValue = humanDurationInt(rawValue)
|
|
|
|
}
|
|
|
|
|
|
|
|
formatted = append(formatted, fmt.Sprintf("%v", rawValue))
|
|
|
|
} else {
|
|
|
|
// Show a default empty n/a when this field is
|
|
|
|
// missing from the additional information.
|
|
|
|
formatted = append(formatted, "n/a")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
rows[index] = strings.Join(formatted, hopeDelim)
|
|
|
|
}
|
|
|
|
}
|
2017-09-08 02:04:48 +00:00
|
|
|
|
Vault CLI: show detailed information with ListResponseWithInfo (#15417)
* CLI: Add ability to display ListResponseWithInfos
The Vault Server API includes a ListResponseWithInfo call, allowing LIST
responses to contain additional information about their keys. This is in
a key=value mapping format (both for each key, to get the additional
metadata, as well as within each metadata).
Expand the `vault list` CLI command with a `-detailed` flag (and env var
VAULT_DETAILED_LISTS) to print this additional metadata. This looks
roughly like the following:
$ vault list -detailed pki/issuers
Keys issuer_name
---- -----------
0cba84d7-bbbe-836a-4ff6-a11b31dc0fb7 n/a
35dfb02d-0cdb-3d35-ee64-d0cd6568c6b0 n/a
382fad1e-e99c-9c54-e147-bb1faa8033d3 n/a
8bb4a793-2ad9-460c-9fa8-574c84a981f7 n/a
8bd231d7-20e2-f21f-ae1a-7aa3319715e7 n/a
9425d51f-cb81-426d-d6ad-5147d092094e n/a
ae679732-b497-ab0d-3220-806a2b9d81ed n/a
c5a44a1f-2ae4-2140-3acf-74b2609448cc utf8
d41d2419-efce-0e36-c96b-e91179a24dc1 something
Signed-off-by: Alexander Scheel <alex.scheel@hashicorp.com>
* Allow detailed printing of LIST responses in JSON
When using the JSON formatter, only the absolute list of keys were
returned. Reuse the `-detailed` flag value for the `-format=json` list
response printer, allowing us to show the complete API response returned
by Vault.
This returns something like the following:
{
"request_id": "e9a25dcd-b67a-97d7-0f08-3670918ef3ff",
"lease_id": "",
"lease_duration": 0,
"renewable": false,
"data": {
"key_info": {
"0cba84d7-bbbe-836a-4ff6-a11b31dc0fb7": {
"issuer_name": ""
},
"35dfb02d-0cdb-3d35-ee64-d0cd6568c6b0": {
"issuer_name": ""
},
"382fad1e-e99c-9c54-e147-bb1faa8033d3": {
"issuer_name": ""
},
"8bb4a793-2ad9-460c-9fa8-574c84a981f7": {
"issuer_name": ""
},
"8bd231d7-20e2-f21f-ae1a-7aa3319715e7": {
"issuer_name": ""
},
"9425d51f-cb81-426d-d6ad-5147d092094e": {
"issuer_name": ""
},
"ae679732-b497-ab0d-3220-806a2b9d81ed": {
"issuer_name": ""
},
"c5a44a1f-2ae4-2140-3acf-74b2609448cc": {
"issuer_name": "utf8"
},
"d41d2419-efce-0e36-c96b-e91179a24dc1": {
"issuer_name": "something"
}
},
"keys": [
"0cba84d7-bbbe-836a-4ff6-a11b31dc0fb7",
"35dfb02d-0cdb-3d35-ee64-d0cd6568c6b0",
"382fad1e-e99c-9c54-e147-bb1faa8033d3",
"8bb4a793-2ad9-460c-9fa8-574c84a981f7",
"8bd231d7-20e2-f21f-ae1a-7aa3319715e7",
"9425d51f-cb81-426d-d6ad-5147d092094e",
"ae679732-b497-ab0d-3220-806a2b9d81ed",
"c5a44a1f-2ae4-2140-3acf-74b2609448cc",
"d41d2419-efce-0e36-c96b-e91179a24dc1"
]
},
"warnings": null
}
Signed-off-by: Alexander Scheel <alex.scheel@hashicorp.com>
* Add changelog
Signed-off-by: Alexander Scheel <alex.scheel@hashicorp.com>
* Use field on UI rather than secret.Data
Signed-off-by: Alexander Scheel <alex.scheel@hashicorp.com>
* Only include headers from visitable key_infos
Certain API endpoints return data from non-visitable key_infos, by
virtue of using a hand-rolled response. Limit our headers to those
from visitable key_infos. This means we won't return entire columns with
n/a entries, if no key matches the key_info key that includes that
header.
Signed-off-by: Alexander Scheel <alex.scheel@hashicorp.com>
* Use setupEnv sourced detailed info
Signed-off-by: Alexander Scheel <alex.scheel@hashicorp.com>
* Fix changelog environment variable
Signed-off-by: Alexander Scheel <alex.scheel@hashicorp.com>
* Fix broken tests using setupEnv
Signed-off-by: Alexander Scheel <alex.scheel@hashicorp.com>
2022-05-18 17:00:50 +00:00
|
|
|
// Prepend the header to the formatted rows.
|
|
|
|
output := append([]string{header}, rows...)
|
|
|
|
ui.Output(tableOutput(output, &columnize.Config{
|
2017-09-08 02:04:48 +00:00
|
|
|
Delim: hopeDelim,
|
|
|
|
}))
|
2016-02-12 18:21:42 +00:00
|
|
|
}
|
|
|
|
|
2017-09-08 02:04:48 +00:00
|
|
|
return nil
|
|
|
|
}
|
2016-09-01 19:58:16 +00:00
|
|
|
|
2017-09-08 02:04:48 +00:00
|
|
|
// printWarnings prints any warnings in the secret.
|
|
|
|
func (t TableFormatter) printWarnings(ui cli.Ui, secret *api.Secret) {
|
|
|
|
if secret != nil && len(secret.Warnings) > 0 {
|
|
|
|
ui.Warn("WARNING! The following warnings were returned from Vault:\n")
|
2016-02-25 02:45:14 +00:00
|
|
|
for _, warning := range secret.Warnings {
|
2017-09-08 02:04:48 +00:00
|
|
|
ui.Warn(wrapAtLengthWithPadding(fmt.Sprintf("* %s", warning), 2))
|
2018-07-09 17:57:53 +00:00
|
|
|
ui.Warn("")
|
2016-02-25 02:45:14 +00:00
|
|
|
}
|
|
|
|
}
|
2016-01-14 19:18:27 +00:00
|
|
|
}
|
|
|
|
|
2017-09-08 02:04:48 +00:00
|
|
|
func (t TableFormatter) OutputSecret(ui cli.Ui, secret *api.Secret) error {
|
|
|
|
if secret == nil {
|
|
|
|
return nil
|
2016-09-01 19:58:16 +00:00
|
|
|
}
|
2016-05-17 17:10:12 +00:00
|
|
|
|
2017-09-08 02:04:48 +00:00
|
|
|
t.printWarnings(ui, secret)
|
|
|
|
|
|
|
|
out := make([]string, 0, 8)
|
|
|
|
if secret.LeaseDuration > 0 {
|
|
|
|
if secret.LeaseID != "" {
|
|
|
|
out = append(out, fmt.Sprintf("lease_id %s %s", hopeDelim, secret.LeaseID))
|
2018-07-11 19:09:04 +00:00
|
|
|
out = append(out, fmt.Sprintf("lease_duration %s %v", hopeDelim, humanDurationInt(secret.LeaseDuration)))
|
2017-09-08 02:04:48 +00:00
|
|
|
out = append(out, fmt.Sprintf("lease_renewable %s %t", hopeDelim, secret.Renewable))
|
2016-05-17 17:10:12 +00:00
|
|
|
} else {
|
2017-09-08 02:04:48 +00:00
|
|
|
// This is probably the generic secret backend which has leases, but we
|
|
|
|
// print them as refresh_interval to reduce confusion.
|
2018-07-11 19:09:04 +00:00
|
|
|
out = append(out, fmt.Sprintf("refresh_interval %s %v", hopeDelim, humanDurationInt(secret.LeaseDuration)))
|
2015-09-20 12:34:34 +00:00
|
|
|
}
|
2015-04-27 21:55:29 +00:00
|
|
|
}
|
|
|
|
|
2017-09-08 02:04:48 +00:00
|
|
|
if secret.Auth != nil {
|
2022-05-17 18:03:02 +00:00
|
|
|
if secret.Auth.MFARequirement != nil {
|
|
|
|
out = append(out, fmt.Sprintf("mfa_request_id %s %s", hopeDelim, secret.Auth.MFARequirement.MFARequestID))
|
|
|
|
|
|
|
|
for k, constraintSet := range secret.Auth.MFARequirement.MFAConstraints {
|
|
|
|
for _, constraint := range constraintSet.Any {
|
|
|
|
out = append(out, fmt.Sprintf("mfa_constraint_%s_%s_id %s %s", k, constraint.Type, hopeDelim, constraint.ID))
|
|
|
|
out = append(out, fmt.Sprintf("mfa_constraint_%s_%s_uses_passcode %s %t", k, constraint.Type, hopeDelim, constraint.UsesPasscode))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else { // Token information only makes sense if no further MFA requirement (i.e. if we actually have a token)
|
|
|
|
out = append(out, fmt.Sprintf("token %s %s", hopeDelim, secret.Auth.ClientToken))
|
|
|
|
out = append(out, fmt.Sprintf("token_accessor %s %s", hopeDelim, secret.Auth.Accessor))
|
|
|
|
// If the lease duration is 0, it's likely a root token, so output the
|
|
|
|
// duration as "infinity" to clear things up.
|
|
|
|
if secret.Auth.LeaseDuration == 0 {
|
|
|
|
out = append(out, fmt.Sprintf("token_duration %s %s", hopeDelim, "∞"))
|
|
|
|
} else {
|
|
|
|
out = append(out, fmt.Sprintf("token_duration %s %v", hopeDelim, humanDurationInt(secret.Auth.LeaseDuration)))
|
|
|
|
}
|
|
|
|
out = append(out, fmt.Sprintf("token_renewable %s %t", hopeDelim, secret.Auth.Renewable))
|
|
|
|
out = append(out, fmt.Sprintf("token_policies %s %q", hopeDelim, secret.Auth.TokenPolicies))
|
|
|
|
out = append(out, fmt.Sprintf("identity_policies %s %q", hopeDelim, secret.Auth.IdentityPolicies))
|
|
|
|
out = append(out, fmt.Sprintf("policies %s %q", hopeDelim, secret.Auth.Policies))
|
|
|
|
for k, v := range secret.Auth.Metadata {
|
|
|
|
out = append(out, fmt.Sprintf("token_meta_%s %s %v", k, hopeDelim, v))
|
|
|
|
}
|
2015-06-17 23:59:50 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-09-08 02:04:48 +00:00
|
|
|
if secret.WrapInfo != nil {
|
|
|
|
out = append(out, fmt.Sprintf("wrapping_token: %s %s", hopeDelim, secret.WrapInfo.Token))
|
2018-01-03 19:02:31 +00:00
|
|
|
out = append(out, fmt.Sprintf("wrapping_accessor: %s %s", hopeDelim, secret.WrapInfo.Accessor))
|
2018-07-11 19:09:04 +00:00
|
|
|
out = append(out, fmt.Sprintf("wrapping_token_ttl: %s %v", hopeDelim, humanDurationInt(secret.WrapInfo.TTL)))
|
2017-09-08 02:04:48 +00:00
|
|
|
out = append(out, fmt.Sprintf("wrapping_token_creation_time: %s %s", hopeDelim, secret.WrapInfo.CreationTime.String()))
|
|
|
|
out = append(out, fmt.Sprintf("wrapping_token_creation_path: %s %s", hopeDelim, secret.WrapInfo.CreationPath))
|
|
|
|
if secret.WrapInfo.WrappedAccessor != "" {
|
|
|
|
out = append(out, fmt.Sprintf("wrapped_accessor: %s %s", hopeDelim, secret.WrapInfo.WrappedAccessor))
|
2016-06-13 23:58:17 +00:00
|
|
|
}
|
2016-05-02 05:58:58 +00:00
|
|
|
}
|
|
|
|
|
2017-09-08 02:04:48 +00:00
|
|
|
if len(secret.Data) > 0 {
|
|
|
|
keys := make([]string, 0, len(secret.Data))
|
|
|
|
for k := range secret.Data {
|
2016-09-01 19:58:16 +00:00
|
|
|
keys = append(keys, k)
|
|
|
|
}
|
|
|
|
sort.Strings(keys)
|
2015-12-10 09:01:22 +00:00
|
|
|
|
2016-09-01 19:58:16 +00:00
|
|
|
for _, k := range keys {
|
2018-07-11 16:07:48 +00:00
|
|
|
v := secret.Data[k]
|
|
|
|
|
|
|
|
// If the field "looks" like a TTL, print it as a time duration instead.
|
2018-09-21 13:54:18 +00:00
|
|
|
if looksLikeDuration(k) {
|
2018-07-11 19:09:04 +00:00
|
|
|
v = humanDurationInt(v)
|
2018-07-11 16:07:48 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
out = append(out, fmt.Sprintf("%s %s %v", k, hopeDelim, v))
|
2016-09-01 19:58:16 +00:00
|
|
|
}
|
2015-04-27 21:55:29 +00:00
|
|
|
}
|
|
|
|
|
2017-09-08 02:04:48 +00:00
|
|
|
// If we got this far and still don't have any data, there's nothing to print,
|
|
|
|
// sorry.
|
|
|
|
if len(out) == 0 {
|
|
|
|
return nil
|
2015-10-07 19:30:54 +00:00
|
|
|
}
|
|
|
|
|
2017-09-08 02:04:48 +00:00
|
|
|
// Prepend the header
|
|
|
|
out = append([]string{"Key" + hopeDelim + "Value"}, out...)
|
2016-06-15 21:13:14 +00:00
|
|
|
|
2017-09-08 02:04:48 +00:00
|
|
|
ui.Output(tableOutput(out, &columnize.Config{
|
|
|
|
Delim: hopeDelim,
|
|
|
|
}))
|
2016-02-12 18:21:42 +00:00
|
|
|
return nil
|
2016-01-14 19:18:27 +00:00
|
|
|
}
|
2017-09-21 17:38:39 +00:00
|
|
|
|
2018-09-21 13:54:18 +00:00
|
|
|
func (t TableFormatter) OutputMap(ui cli.Ui, data map[string]interface{}) error {
|
2018-03-21 22:02:41 +00:00
|
|
|
out := make([]string, 0, len(data)+1)
|
|
|
|
if len(data) > 0 {
|
|
|
|
keys := make([]string, 0, len(data))
|
|
|
|
for k := range data {
|
|
|
|
keys = append(keys, k)
|
|
|
|
}
|
|
|
|
sort.Strings(keys)
|
|
|
|
|
|
|
|
for _, k := range keys {
|
2018-09-21 13:54:18 +00:00
|
|
|
v := data[k]
|
|
|
|
|
|
|
|
// If the field "looks" like a TTL, print it as a time duration instead.
|
|
|
|
if looksLikeDuration(k) {
|
|
|
|
v = humanDurationInt(v)
|
|
|
|
}
|
|
|
|
|
|
|
|
out = append(out, fmt.Sprintf("%s %s %v", k, hopeDelim, v))
|
2018-03-21 22:02:41 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// If we got this far and still don't have any data, there's nothing to print,
|
|
|
|
// sorry.
|
|
|
|
if len(out) == 0 {
|
2018-09-21 13:54:18 +00:00
|
|
|
return nil
|
2018-03-21 22:02:41 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Prepend the header
|
|
|
|
out = append([]string{"Key" + hopeDelim + "Value"}, out...)
|
|
|
|
|
|
|
|
ui.Output(tableOutput(out, &columnize.Config{
|
|
|
|
Delim: hopeDelim,
|
|
|
|
}))
|
2018-09-21 13:54:18 +00:00
|
|
|
return nil
|
2018-03-21 22:02:41 +00:00
|
|
|
}
|
|
|
|
|
2018-02-12 23:12:16 +00:00
|
|
|
// OutputSealStatus will print *api.SealStatusResponse in the CLI according to the format provided
|
2017-09-21 17:38:39 +00:00
|
|
|
func OutputSealStatus(ui cli.Ui, client *api.Client, status *api.SealStatusResponse) int {
|
2020-09-23 17:30:01 +00:00
|
|
|
sealStatusOutput := SealStatusOutput{SealStatusResponse: *status}
|
2017-09-21 17:38:39 +00:00
|
|
|
|
|
|
|
// Mask the 'Vault is sealed' error, since this means HA is enabled, but that
|
|
|
|
// we cannot query for the leader since we are sealed.
|
|
|
|
leaderStatus, err := client.Sys().Leader()
|
|
|
|
if err != nil && strings.Contains(err.Error(), "Vault is sealed") {
|
|
|
|
leaderStatus = &api.LeaderResponse{HAEnabled: true}
|
2018-02-18 01:52:42 +00:00
|
|
|
err = nil
|
2020-09-15 22:26:56 +00:00
|
|
|
}
|
2018-02-18 01:52:42 +00:00
|
|
|
if err != nil {
|
|
|
|
ui.Error(fmt.Sprintf("Error checking leader status: %s", err))
|
|
|
|
return 1
|
2017-09-21 17:38:39 +00:00
|
|
|
}
|
|
|
|
|
2020-09-23 17:30:01 +00:00
|
|
|
// copy leaderStatus fields into sealStatusOutput for display later
|
|
|
|
sealStatusOutput.HAEnabled = leaderStatus.HAEnabled
|
|
|
|
sealStatusOutput.IsSelf = leaderStatus.IsSelf
|
2020-12-12 00:50:19 +00:00
|
|
|
sealStatusOutput.ActiveTime = leaderStatus.ActiveTime
|
2020-09-23 17:30:01 +00:00
|
|
|
sealStatusOutput.LeaderAddress = leaderStatus.LeaderAddress
|
|
|
|
sealStatusOutput.LeaderClusterAddress = leaderStatus.LeaderClusterAddress
|
|
|
|
sealStatusOutput.PerfStandby = leaderStatus.PerfStandby
|
|
|
|
sealStatusOutput.PerfStandbyLastRemoteWAL = leaderStatus.PerfStandbyLastRemoteWAL
|
|
|
|
sealStatusOutput.LastWAL = leaderStatus.LastWAL
|
|
|
|
sealStatusOutput.RaftCommittedIndex = leaderStatus.RaftCommittedIndex
|
|
|
|
sealStatusOutput.RaftAppliedIndex = leaderStatus.RaftAppliedIndex
|
|
|
|
OutputData(ui, sealStatusOutput)
|
2017-09-21 17:38:39 +00:00
|
|
|
return 0
|
|
|
|
}
|
2018-09-21 13:54:18 +00:00
|
|
|
|
|
|
|
// looksLikeDuration checks if the given key "k" looks like a duration value.
|
|
|
|
// This is used to pretty-format duration values in responses, especially from
|
|
|
|
// plugins.
|
|
|
|
func looksLikeDuration(k string) bool {
|
|
|
|
return k == "period" || strings.HasSuffix(k, "_period") ||
|
|
|
|
k == "ttl" || strings.HasSuffix(k, "_ttl") ||
|
|
|
|
k == "duration" || strings.HasSuffix(k, "_duration") ||
|
|
|
|
k == "lease_max" || k == "ttl_max"
|
|
|
|
}
|
2020-09-23 17:30:01 +00:00
|
|
|
|
|
|
|
// This struct is responsible for capturing all the fields to be output by a
|
|
|
|
// vault status command, including fields that do not come from the status API.
|
|
|
|
// Currently we are adding the fields from api.LeaderResponse
|
|
|
|
type SealStatusOutput struct {
|
|
|
|
api.SealStatusResponse
|
2020-12-12 00:50:19 +00:00
|
|
|
HAEnabled bool `json:"ha_enabled"`
|
2021-04-07 23:48:40 +00:00
|
|
|
IsSelf bool `json:"is_self,omitempty"`
|
|
|
|
ActiveTime time.Time `json:"active_time,omitempty"`
|
2020-12-12 00:50:19 +00:00
|
|
|
LeaderAddress string `json:"leader_address,omitempty"`
|
|
|
|
LeaderClusterAddress string `json:"leader_cluster_address,omitempty"`
|
|
|
|
PerfStandby bool `json:"performance_standby,omitempty"`
|
|
|
|
PerfStandbyLastRemoteWAL uint64 `json:"performance_standby_last_remote_wal,omitempty"`
|
|
|
|
LastWAL uint64 `json:"last_wal,omitempty"`
|
|
|
|
RaftCommittedIndex uint64 `json:"raft_committed_index,omitempty"`
|
|
|
|
RaftAppliedIndex uint64 `json:"raft_applied_index,omitempty"`
|
2020-09-23 17:30:01 +00:00
|
|
|
}
|