Add Output Fields support (#1192)

This commit is contained in:
Jeff Mitchell authored and GitHub committed 2021-05-04 20:57:35 -04:00
1 parent 1948984ca2
commit 22d5c88a0b
84 files changed
+5688 -2122

No files matched your search

@@ -242,8 +242,7 @@ func (c *Command) Run(args []string) int {
switch base.Format(c.UI) {
case "table":
item := result.GetItem().(*authmethods.AuthMethod)
c.UI.Output(printItemTable(item))
c.UI.Output(printItemTable(result))
case "json":
if ok := c.PrintJsonItem(result); !ok {
+72 -44
View File
@@ -5,7 +5,9 @@ import (
"sort"
"time"
"github.com/hashicorp/boundary/api"
"github.com/hashicorp/boundary/api/authmethods"
"github.com/hashicorp/boundary/globals"
"github.com/hashicorp/boundary/internal/cmd/base"
)
@@ -76,46 +78,54 @@ func (c *Command) printListTable(items []*authmethods.AuthMethod) string {
"",
"Auth Method information:",
}
for i, m := range items {
for i, item := range items {
if i > 0 {
output = append(output, "")
}
if true {
if item.Id != "" {
output = append(output,
fmt.Sprintf(" ID: %s", m.Id),
fmt.Sprintf(" ID: %s", item.Id),
)
} else {
output = append(output,
fmt.Sprintf(" ID: %s", "(not available)"),
)
}
if c.FlagRecursive {
if c.FlagRecursive && item.ScopeId != "" {
output = append(output,
fmt.Sprintf(" Scope ID: %s", m.Scope.Id),
fmt.Sprintf(" Scope ID: %s", item.ScopeId),
)
}
if true {
if item.Version > 0 {
output = append(output,
fmt.Sprintf(" Version: %d", m.Version),
fmt.Sprintf(" Type: %s", m.Type),
fmt.Sprintf(" Version: %d", item.Version),
)
}
if m.Name != "" {
if item.Type != "" {
output = append(output,
fmt.Sprintf(" Name: %s", m.Name),
fmt.Sprintf(" Type: %s", item.Type),
)
}
if m.Description != "" {
if item.Name != "" {
output = append(output,
fmt.Sprintf(" Description: %s", m.Description),
fmt.Sprintf(" Name: %s", item.Name),
)
}
if true {
if item.Description != "" {
output = append(output,
fmt.Sprintf(" Is Primary For Scope: %t", m.IsPrimary),
fmt.Sprintf(" Description: %s", item.Description),
)
}
if item.IsPrimary {
output = append(output,
fmt.Sprintf(" Is Primary For Scope: %t", item.IsPrimary),
)
}
if len(m.AuthorizedActions) > 0 {
if len(item.AuthorizedActions) > 0 {
output = append(output,
" Authorized Actions:",
base.WrapSlice(6, m.AuthorizedActions),
base.WrapSlice(6, item.AuthorizedActions),
)
}
}
@@ -123,45 +133,63 @@ func (c *Command) printListTable(items []*authmethods.AuthMethod) string {
return base.WrapForHelpText(output)
}
func printItemTable(in *authmethods.AuthMethod) string {
nonAttributeMap := map[string]interface{}{
"ID": in.Id,
"Version": in.Version,
"Type": in.Type,
"Created Time": in.CreatedTime.Local().Format(time.RFC1123),
"Updated Time": in.UpdatedTime.Local().Format(time.RFC1123),
"Is Primary For Scope": in.IsPrimary,
func printItemTable(result api.GenericResult) string {
item := result.GetItem().(*authmethods.AuthMethod)
nonAttributeMap := map[string]interface{}{}
if item.Id != "" {
nonAttributeMap["ID"] = item.Id
}
if item.Version != 0 {
nonAttributeMap["Version"] = item.Version
}
if item.Type != "" {
nonAttributeMap["Type"] = item.Type
}
if !item.CreatedTime.IsZero() {
nonAttributeMap["Created Time"] = item.CreatedTime.Local().Format(time.RFC1123)
}
if !item.UpdatedTime.IsZero() {
nonAttributeMap["Updated Time"] = item.UpdatedTime.Local().Format(time.RFC1123)
}
if item.Name != "" {
nonAttributeMap["Name"] = item.Name
}
if item.Description != "" {
nonAttributeMap["Description"] = item.Description
}
if result.GetResponse() != nil && result.GetResponse().Map != nil {
if result.GetResponse().Map[globals.IsPrimaryField] != nil {
nonAttributeMap["Is Primary For Scope"] = item.IsPrimary
}
}
if in.Name != "" {
nonAttributeMap["Name"] = in.Name
}
if in.Description != "" {
nonAttributeMap["Description"] = in.Description
}
maxLength := base.MaxAttributesLength(nonAttributeMap, in.Attributes, keySubstMap)
maxLength := base.MaxAttributesLength(nonAttributeMap, item.Attributes, keySubstMap)
ret := []string{
"",
"Auth Method information:",
base.WrapMap(2, maxLength+2, nonAttributeMap),
"",
" Scope:",
base.ScopeInfoForOutput(in.Scope, maxLength),
}
if len(in.AuthorizedActions) > 0 {
if item.Scope != nil {
ret = append(ret,
"",
" Authorized Actions:",
base.WrapSlice(4, in.AuthorizedActions),
" Scope:",
base.ScopeInfoForOutput(item.Scope, maxLength),
)
}
if len(in.AuthorizedCollectionActions) > 0 {
keys := make([]string, 0, len(in.AuthorizedCollectionActions))
for k := range in.AuthorizedCollectionActions {
if len(item.AuthorizedActions) > 0 {
ret = append(ret,
"",
" Authorized Actions:",
base.WrapSlice(4, item.AuthorizedActions),
)
}
if len(item.AuthorizedCollectionActions) > 0 {
keys := make([]string, 0, len(item.AuthorizedCollectionActions))
for k := range item.AuthorizedCollectionActions {
keys = append(keys, k)
}
sort.Strings(keys)
@@ -172,16 +200,16 @@ func printItemTable(in *authmethods.AuthMethod) string {
for _, key := range keys {
ret = append(ret,
fmt.Sprintf(" %s:", key),
base.WrapSlice(6, in.AuthorizedCollectionActions[key]),
base.WrapSlice(6, item.AuthorizedCollectionActions[key]),
)
}
}
if len(in.Attributes) > 0 {
if len(item.Attributes) > 0 {
ret = append(ret,
"",
" Attributes:",
base.WrapMap(4, maxLength, in.Attributes),
base.WrapMap(4, maxLength, item.Attributes),
)
}
@@ -231,8 +231,7 @@ func (c *OidcCommand) Run(args []string) int {
switch base.Format(c.UI) {
case "table":
item := result.GetItem().(*authmethods.AuthMethod)
c.UI.Output(printItemTable(item))
c.UI.Output(printItemTable(result))
case "json":
if ok := c.PrintJsonItem(result); !ok {
@@ -221,8 +221,7 @@ func (c *PasswordCommand) Run(args []string) int {
switch base.Format(c.UI) {
case "table":
item := result.GetItem().(*authmethods.AuthMethod)
c.UI.Output(printItemTable(item))
c.UI.Output(printItemTable(result))
case "json":
if ok := c.PrintJsonItem(result); !ok {