This PR changes delete behavior: * On success, a 204 is returned rather than a 200 with an empty JSON object * The CLI now passes through the 404 error if encountered instead of swallowing it It also updates formatting for JSON to use the response body, which means that the item (or items) in the JSON format are actually the format across the wire, instead of being reinterpreted by unmarshaling into the Go SDK and then remarshaling.
312 lines
7.8 KiB
Go
312 lines
7.8 KiB
Go
package base
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"os"
|
|
"sort"
|
|
"strings"
|
|
"unicode"
|
|
"unicode/utf8"
|
|
|
|
"github.com/hashicorp/boundary/api"
|
|
"github.com/hashicorp/boundary/api/scopes"
|
|
"github.com/mitchellh/cli"
|
|
"github.com/mitchellh/go-wordwrap"
|
|
"github.com/pkg/errors"
|
|
)
|
|
|
|
// This is adapted from the code in the strings package for TrimSpace
|
|
var asciiSpace = [256]uint8{'\t': 1, '\n': 1, '\v': 1, '\f': 1, '\r': 1, ' ': 1}
|
|
|
|
func ScopeInfoForOutput(scp *scopes.ScopeInfo, maxLength int) string {
|
|
vals := map[string]interface{}{
|
|
"ID": scp.Id,
|
|
"Type": scp.Type,
|
|
"Name": scp.Name,
|
|
}
|
|
if scp.ParentScopeId != "" {
|
|
vals["Parent Scope ID"] = scp.ParentScopeId
|
|
}
|
|
return WrapMap(4, maxLength, vals)
|
|
}
|
|
|
|
func MaxAttributesLength(nonAttributesMap, attributesMap map[string]interface{}, keySubstMap map[string]string) int {
|
|
// We always print a scope ID and in some cases this particular key ends up
|
|
// being the longest key, so start with it as a baseline. It's always
|
|
// indented by 2 in addition to the normal offset so take that into account.
|
|
maxLength := len("Parent Scope ID") + 2
|
|
for k := range nonAttributesMap {
|
|
if len(k) > maxLength {
|
|
maxLength = len(k)
|
|
}
|
|
}
|
|
if len(attributesMap) > 0 {
|
|
for k, v := range attributesMap {
|
|
if keySubstMap != nil {
|
|
if keySubstMap[k] != "" {
|
|
attributesMap[keySubstMap[k]] = v
|
|
delete(attributesMap, k)
|
|
}
|
|
}
|
|
}
|
|
for k := range attributesMap {
|
|
if len(k) > maxLength {
|
|
maxLength = len(k)
|
|
}
|
|
}
|
|
}
|
|
return maxLength
|
|
}
|
|
|
|
func trimSpaceRight(in string) string {
|
|
for stop := len(in); stop > 0; stop-- {
|
|
c := in[stop-1]
|
|
if c >= utf8.RuneSelf {
|
|
return strings.TrimFunc(in[:stop], unicode.IsSpace)
|
|
}
|
|
if asciiSpace[c] == 0 {
|
|
return in[0:stop]
|
|
}
|
|
}
|
|
return ""
|
|
}
|
|
|
|
func WrapForHelpText(lines []string) string {
|
|
var ret []string
|
|
for _, line := range lines {
|
|
line = trimSpaceRight(line)
|
|
trimmed := strings.TrimSpace(line)
|
|
diff := uint(len(line) - len(trimmed))
|
|
wrapped := wordwrap.WrapString(trimmed, TermWidth-diff)
|
|
splitWrapped := strings.Split(wrapped, "\n")
|
|
for i := range splitWrapped {
|
|
splitWrapped[i] = fmt.Sprintf("%s%s", strings.Repeat(" ", int(diff)), strings.TrimSpace(splitWrapped[i]))
|
|
}
|
|
ret = append(ret, strings.Join(splitWrapped, "\n"))
|
|
}
|
|
|
|
return strings.Join(ret, "\n")
|
|
}
|
|
|
|
func WrapSlice(prefixSpaces int, input []string) string {
|
|
var ret []string
|
|
for _, v := range input {
|
|
ret = append(ret, fmt.Sprintf("%s%s",
|
|
strings.Repeat(" ", prefixSpaces),
|
|
v,
|
|
))
|
|
}
|
|
|
|
return strings.Join(ret, "\n")
|
|
}
|
|
|
|
func WrapMap(prefixSpaces, maxLengthOverride int, input map[string]interface{}) string {
|
|
maxKeyLength := maxLengthOverride
|
|
if maxKeyLength == 0 {
|
|
for k := range input {
|
|
if len(k) > maxKeyLength {
|
|
maxKeyLength = len(k)
|
|
}
|
|
}
|
|
}
|
|
|
|
var sortedKeys []string
|
|
for k := range input {
|
|
sortedKeys = append(sortedKeys, k)
|
|
}
|
|
sort.Strings(sortedKeys)
|
|
|
|
var ret []string
|
|
for _, k := range sortedKeys {
|
|
v := input[k]
|
|
spaces := maxKeyLength - len(k)
|
|
if spaces < 0 {
|
|
spaces = 0
|
|
}
|
|
ret = append(ret, fmt.Sprintf("%s%s%s%s",
|
|
strings.Repeat(" ", prefixSpaces),
|
|
fmt.Sprintf("%s: ", k),
|
|
strings.Repeat(" ", spaces),
|
|
fmt.Sprintf("%v", v),
|
|
))
|
|
}
|
|
|
|
return strings.Join(ret, "\n")
|
|
}
|
|
|
|
// PrintApiError prints the given API error, optionally with context
|
|
// information, to the UI in the appropriate format
|
|
func (c *Command) PrintApiError(in *api.Error, contextStr string) {
|
|
switch Format(c.UI) {
|
|
case "json":
|
|
output := struct {
|
|
Context string `json:"context,omitempty"`
|
|
Status int `json:"status"`
|
|
ApiError json.RawMessage `json:"api_error"`
|
|
}{
|
|
Context: contextStr,
|
|
Status: in.Response().StatusCode(),
|
|
ApiError: in.Response().Body.Bytes(),
|
|
}
|
|
b, _ := JsonFormatter{}.Format(output)
|
|
c.UI.Error(string(b))
|
|
|
|
default:
|
|
nonAttributeMap := map[string]interface{}{
|
|
"Status": in.Response().StatusCode(),
|
|
"Kind": in.Kind,
|
|
"Message": in.Message,
|
|
}
|
|
if contextStr != "" {
|
|
nonAttributeMap["context"] = contextStr
|
|
}
|
|
if in.Op != "" {
|
|
nonAttributeMap["Operation"] = in.Op
|
|
}
|
|
|
|
maxLength := MaxAttributesLength(nonAttributeMap, nil, nil)
|
|
|
|
var output []string
|
|
if contextStr != "" {
|
|
output = append(output, contextStr)
|
|
}
|
|
output = append(output,
|
|
"",
|
|
"Error information:",
|
|
WrapMap(2, maxLength+2, nonAttributeMap),
|
|
)
|
|
|
|
if in.Details != nil {
|
|
if len(in.Details.WrappedErrors) > 0 {
|
|
output = append(output,
|
|
"",
|
|
" Wrapped Errors:",
|
|
)
|
|
for _, we := range in.Details.WrappedErrors {
|
|
output = append(output,
|
|
fmt.Sprintf(" Message: %s", we.Message),
|
|
fmt.Sprintf(" Operation: %s", we.Op),
|
|
)
|
|
}
|
|
}
|
|
|
|
if len(in.Details.RequestFields) > 0 {
|
|
output = append(output,
|
|
"",
|
|
" Field-specific Errors:",
|
|
)
|
|
for _, field := range in.Details.RequestFields {
|
|
if field.Name == "update_mask" {
|
|
// TODO: Report useful error messages related to "update_mask".
|
|
continue
|
|
}
|
|
output = append(output,
|
|
fmt.Sprintf(" Name: -%s", strings.ReplaceAll(strings.TrimPrefix(field.Name, "attributes."), "_", "-")),
|
|
fmt.Sprintf(" Error: %s", field.Description),
|
|
)
|
|
}
|
|
}
|
|
}
|
|
|
|
c.UI.Error(WrapForHelpText(output))
|
|
}
|
|
}
|
|
|
|
// PrintCliError prints the given CLI error to the UI in the appropriate format
|
|
func (c *Command) PrintCliError(err error) {
|
|
switch Format(c.UI) {
|
|
case "table":
|
|
c.UI.Error(err.Error())
|
|
case "json":
|
|
output := struct {
|
|
Error string `json:"error"`
|
|
}{
|
|
Error: err.Error(),
|
|
}
|
|
b, _ := JsonFormatter{}.Format(output)
|
|
c.UI.Error(string(b))
|
|
}
|
|
}
|
|
|
|
// PrintJsonItem prints the given item to the UI in JSON format
|
|
func (c *Command) PrintJsonItem(result api.GenericResult) bool {
|
|
resp := result.GetResponse()
|
|
if resp == nil {
|
|
c.PrintCliError(errors.New("Error formatting as JSON: no response given to item formatter"))
|
|
return false
|
|
}
|
|
output := struct {
|
|
StatusCode int `json:"status_code"`
|
|
Item json.RawMessage `json:"item,omitempty"`
|
|
}{
|
|
StatusCode: resp.HttpResponse().StatusCode,
|
|
Item: resp.Body.Bytes(),
|
|
}
|
|
b, err := JsonFormatter{}.Format(output)
|
|
if err != nil {
|
|
c.PrintCliError(fmt.Errorf("Error formatting as JSON: %w", err))
|
|
return false
|
|
}
|
|
c.UI.Output(string(b))
|
|
return true
|
|
}
|
|
|
|
// PrintJsonItems prints the given items to the UI in JSON format
|
|
func (c *Command) PrintJsonItems(result api.GenericListResult) bool {
|
|
resp := result.GetResponse()
|
|
if resp == nil {
|
|
c.PrintCliError(errors.New("Error formatting as JSON: no response given to items formatter"))
|
|
return false
|
|
}
|
|
// First we need to grab the items out. The reason is that if we simply
|
|
// embed the raw message as with PrintJsonItem above, it will have {"items":
|
|
// {"items": []}}. However, we decode into a RawMessage which makes it much
|
|
// more efficient on both the decoding and encoding side.
|
|
type inMsg struct {
|
|
Items json.RawMessage `json:"items"`
|
|
}
|
|
var input inMsg
|
|
if resp.Body.Bytes() != nil {
|
|
if err := json.Unmarshal(resp.Body.Bytes(), &input); err != nil {
|
|
c.PrintCliError(fmt.Errorf("Error unmarshaling response body at format time: %w", err))
|
|
return false
|
|
}
|
|
}
|
|
output := struct {
|
|
StatusCode int `json:"status_code"`
|
|
Items json.RawMessage `json:"items"`
|
|
}{
|
|
StatusCode: resp.HttpResponse().StatusCode,
|
|
Items: input.Items,
|
|
}
|
|
b, err := JsonFormatter{}.Format(output)
|
|
if err != nil {
|
|
c.PrintCliError(fmt.Errorf("Error formatting as JSON: %w", err))
|
|
return false
|
|
}
|
|
c.UI.Output(string(b))
|
|
return true
|
|
}
|
|
|
|
// An output formatter for json output of an object
|
|
type JsonFormatter struct{}
|
|
|
|
func (j JsonFormatter) Format(data interface{}) ([]byte, error) {
|
|
return json.Marshal(data)
|
|
}
|
|
|
|
func Format(ui cli.Ui) string {
|
|
switch t := ui.(type) {
|
|
case *BoundaryUI:
|
|
return t.Format
|
|
}
|
|
|
|
format := os.Getenv(EnvBoundaryCLIFormat)
|
|
if format == "" {
|
|
format = "table"
|
|
}
|
|
|
|
return format
|
|
}
|