From 518417cad5c8175f946689ae454ef24850c8f4cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= <qu_xuan@icloud.com>
Date: Tue, 9 Nov 2021 19:33:36 +0800
Subject: [PATCH] fix(climc): json output (#12652)

Co-authored-by: Qu Xuan <quxuan@yunionyun.com>
---
 cmd/climc/shell/helper.go | 24 ++++++++++++------------
 cmd/climc/shell/utils.go  | 10 +---------
 2 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/cmd/climc/shell/helper.go b/cmd/climc/shell/helper.go
index a2aad72b5a..487f28f11f 100644
--- a/cmd/climc/shell/helper.go
+++ b/cmd/climc/shell/helper.go
@@ -160,7 +160,7 @@ func (cmd ResourceCmd) List(args IListOpt) {
 			ExportList(result, exportFile, args.GetExportKeys(), args.GetExportTexts(), man.GetColumns(s))
 			return nil
 		}
-		printList(result, man.GetColumns(s))
+		PrintList(result, man.GetColumns(s))
 		return nil
 	}
 	cmd.Run("list", args, callback)
@@ -184,7 +184,7 @@ func (cmd ResourceCmd) create(s *mcclient.ClientSession, args ICreateOpt) error
 	if err != nil {
 		return err
 	}
-	printObject(ret)
+	PrintObject(ret)
 	return nil
 }
 
@@ -240,7 +240,7 @@ func (cmd ResourceCmd) GetProperty(args IPropertyOpt) {
 		if err != nil {
 			return err
 		}
-		printObject(ret)
+		PrintObject(ret)
 		return nil
 	}
 	cmd.RunWithDesc(args.Property(), fmt.Sprintf("Get property of a %s", man.GetKeyword()), args, callback)
@@ -257,7 +257,7 @@ func (cmd ResourceCmd) Show(args IShowOpt) {
 		if err != nil {
 			return err
 		}
-		printObject(ret)
+		PrintObject(ret)
 		return nil
 	}
 	cmd.RunWithDesc("show", fmt.Sprintf("Show details of a %s", man.GetKeyword()), args, callback)
@@ -274,7 +274,7 @@ func (cmd ResourceCmd) ClassShow(args IShowOpt) {
 		if err != nil {
 			return err
 		}
-		printObject(ret)
+		PrintObject(ret)
 		return nil
 	}
 	cmd.RunWithDesc(args.GetId(), fmt.Sprintf("Show %s of a %s", args.GetId(), man.GetKeyword()), args, callback)
@@ -320,7 +320,7 @@ func (cmd ResourceCmd) Custom(action TCustomAction, funcname string, args IGetAc
 		if reterr.IsNil() {
 			v, ok := retobj.Interface().(jsonutils.JSONObject)
 			if ok {
-				printObject(v)
+				PrintObject(v)
 				return nil
 			}
 		}
@@ -349,7 +349,7 @@ func (cmd ResourceCmd) Delete(args IDeleteOpt) {
 		if err != nil {
 			return err
 		}
-		printObject(ret)
+		PrintObject(ret)
 		return nil
 	}
 	cmd.RunWithDesc("delete", fmt.Sprintf("Delete %s", man.GetKeyword()), args, callback)
@@ -461,7 +461,7 @@ func (cmd ResourceCmd) GetWithCustomShow(specific string, show func(data jsonuti
 }
 
 func (cmd ResourceCmd) Get(specific string, args IGetOpt) {
-	cmd.GetWithCustomShow(specific, printObject, args)
+	cmd.GetWithCustomShow(specific, PrintObject, args)
 }
 
 type IUpdateOpt interface {
@@ -485,7 +485,7 @@ func (cmd ResourceCmd) UpdateWithKeyword(keyword string, args IUpdateOpt) {
 		if err != nil {
 			return err
 		}
-		printObject(ret)
+		PrintObject(ret)
 		return nil
 	}
 	cmd.Run(keyword, args, callback)
@@ -511,7 +511,7 @@ func (cmd ResourceCmd) GetMetadata(args IMetadataOpt) {
 		if err != nil {
 			return err
 		}
-		printObject(ret)
+		PrintObject(ret)
 		return nil
 	}
 	cmd.RunWithDesc("metadata", fmt.Sprintf("Show metadata of a %s", man.GetKeyword()), args, callback)
@@ -612,7 +612,7 @@ func (cmd JointCmd) List(args IJointListOpt) {
 		if err != nil {
 			return err
 		}
-		printList(result, man.GetColumns(s))
+		PrintList(result, man.GetColumns(s))
 		return nil
 	}
 	cmd.RunWithDesc("list", fmt.Sprintf("list %s %s pairs", man.MasterManager().KeyString(), man.SlaveManager().KeyString()), args, callback)
@@ -635,7 +635,7 @@ func (cmd JointCmd) Show(args IJointShowOpt) {
 		if err != nil {
 			return err
 		}
-		printObject(result)
+		PrintObject(result)
 		return nil
 	}
 	cmd.Run("show", args, callback)
diff --git a/cmd/climc/shell/utils.go b/cmd/climc/shell/utils.go
index 9939d4f355..7bea7c16c1 100644
--- a/cmd/climc/shell/utils.go
+++ b/cmd/climc/shell/utils.go
@@ -53,15 +53,7 @@ func PrintList(list *modulebase.ListResult, columns []string) {
 	}
 }
 
-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:
 		printutils.PrintJSONObject(obj)
@@ -104,7 +96,7 @@ func printObjectFmtKv(obj jsonutils.JSONObject) {
 }
 
 func printObjectRecursive(obj jsonutils.JSONObject) {
-	printutils.PrintJSONObjectRecursive(obj)
+	PrintObject(obj)
 }
 
 func printObjectRecursiveEx(obj jsonutils.JSONObject, cb printutils.PrintJSONObjectRecursiveExFunc) {