opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12644 from ioito/hotfix/qx-climc-output

Browse Source 
fix(climc): climc json output
This commit is contained in:
Zexi Li
2021-11-09 18:13:44 +08:00
committed by GitHub
parent dea48b318d 7012a6bdd2
commit e666c82a46
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/climc/shell/compute/common.go
+2 -2
View File
@@ -21,8 +21,8 @@ import (
var (
R = shell.R
printList = printutils.PrintJSONList
printObject = printutils.PrintJSONObject
printList = shell.PrintList
printObject = shell.PrintObject
printBatchResults = printutils.PrintJSONBatchResults
InvalidUpdateError = shell.InvalidUpdateError
cmd/climc/shell/utils.go
+17 -1
View File
@@ -41,10 +41,26 @@ func OutputFormat(s string) {
outputFormat = s
}
func PrintList(list *modulebase.ListResult, columns []string) {
switch outputFormat {
case OUTPUT_FORMAT_TABLE:
printutils.PrintJSONList(list, columns)
case OUTPUT_FORMAT_JSON:
fmt.Print(jsonutils.Marshal(list).PrettyString())
fmt.Print("\n")
default:
fmt.Fprintf(os.Stderr, "unknown output format: %q\n", outputFormat)
}
}
func printList(list *modulebase.ListResult, columns []string) {
printutils.PrintJSONList(list, columns)
}
func PrintObject(obj jsonutils.JSONObject) {
printObject(obj)
}
func printObject(obj jsonutils.JSONObject) {
switch outputFormat {
case OUTPUT_FORMAT_TABLE:
@@ -52,7 +68,7 @@ func printObject(obj jsonutils.JSONObject) {
case OUTPUT_FORMAT_KV:
printObjectFmtKv(obj)
case OUTPUT_FORMAT_JSON:
fmt.Print(obj.String())
fmt.Print(obj.PrettyString())
fmt.Print("\n")
case OUTPUT_FORMAT_FLATTEN_TABLE:
printObjectRecursive(obj)