Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 19 additions & 15 deletions cmd/output.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,30 +62,30 @@ func printJSON(response map[string]interface{}) {
enc.Encode(response)
}

func getItemsFromValue(v interface{}) ([]interface{}, bool) {
valueType := reflect.TypeOf(v)
if valueType.Kind() == reflect.Slice {
func getItemsFromValue(v interface{}) ([]interface{}, reflect.Kind, bool) {
valueKind := reflect.TypeOf(v).Kind()
if valueKind == reflect.Slice {
sliceItems, ok := v.([]interface{})
if !ok {
return nil, false
return nil, valueKind, false
}
return sliceItems, true
} else if valueType.Kind() == reflect.Map {
return sliceItems, valueKind, true
} else if valueKind == reflect.Map {
mapItem, ok := v.(map[string]interface{})
if !ok {
return nil, false
return nil, valueKind, false
}
return []interface{}{mapItem}, true
return []interface{}{mapItem}, valueKind, true
}
return nil, false
return nil, valueKind, false
}

func printText(response map[string]interface{}) {
format := "text"
for k, v := range response {
valueType := reflect.TypeOf(v)
if valueType.Kind() == reflect.Slice || valueType.Kind() == reflect.Map {
items, ok := getItemsFromValue(v)
items, _, ok := getItemsFromValue(v)
if ok {
fmt.Printf("%v:\n", k)
for idx, item := range items {
Expand Down Expand Up @@ -114,7 +114,7 @@ func printTable(response map[string]interface{}, filter []string) {
for k, v := range response {
valueType := reflect.TypeOf(v)
if valueType.Kind() == reflect.Slice || valueType.Kind() == reflect.Map {
items, ok := getItemsFromValue(v)
items, _, ok := getItemsFromValue(v)
if !ok {
continue
}
Expand Down Expand Up @@ -155,7 +155,7 @@ func printColumn(response map[string]interface{}, filter []string) {
for _, v := range response {
valueType := reflect.TypeOf(v)
if valueType.Kind() == reflect.Slice || valueType.Kind() == reflect.Map {
items, ok := getItemsFromValue(v)
items, _, ok := getItemsFromValue(v)
if !ok {
continue
}
Expand Down Expand Up @@ -194,7 +194,7 @@ func printCsv(response map[string]interface{}, filter []string) {
for _, v := range response {
valueType := reflect.TypeOf(v)
if valueType.Kind() == reflect.Slice || valueType.Kind() == reflect.Map {
items, ok := getItemsFromValue(v)
items, _, ok := getItemsFromValue(v)
if !ok {
continue
}
Expand Down Expand Up @@ -247,7 +247,7 @@ func filterResponse(response map[string]interface{}, filter []string, excludeFil
for key, value := range response {
valueType := reflect.TypeOf(value)
if valueType.Kind() == reflect.Slice || valueType.Kind() == reflect.Map {
items, ok := getItemsFromValue(value)
items, originalKind, ok := getItemsFromValue(value)
if !ok {
continue
}
Expand Down Expand Up @@ -280,7 +280,11 @@ func filterResponse(response map[string]interface{}, filter []string, excludeFil

filteredRows = append(filteredRows, filteredRow)
}
filteredResponse[key] = filteredRows
if originalKind == reflect.Map && len(filteredRows) > 0 {
filteredResponse[key] = filteredRows[0]
} else {
filteredResponse[key] = filteredRows
}
} else {
filteredResponse[key] = value
}
Expand Down