From ed76beabec90e94460bac5a1008a06cece5efa35 Mon Sep 17 00:00:00 2001
From: Qiu Jian <qiujian@yunionyun.com>
Date: Tue, 28 Nov 2023 07:37:20 +0800
Subject: [PATCH] fix: customized show content of get-property

---
 cmd/climc/shell/helper.go | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/cmd/climc/shell/helper.go b/cmd/climc/shell/helper.go
index 3eee9ac560..258402f60a 100644
--- a/cmd/climc/shell/helper.go
+++ b/cmd/climc/shell/helper.go
@@ -229,7 +229,7 @@ type IPropertyOpt interface {
 	Property() string
 }
 
-func (cmd ResourceCmd) GetProperty(args IPropertyOpt) {
+func (cmd ResourceCmd) GetPropertyWithShowFunc(args IPropertyOpt, showFunc func(jsonutils.JSONObject) error) {
 	man := cmd.manager
 	callback := func(s *mcclient.ClientSession, args IPropertyOpt) error {
 		params, err := args.Params()
@@ -240,6 +240,17 @@ func (cmd ResourceCmd) GetProperty(args IPropertyOpt) {
 		if err != nil {
 			return err
 		}
+		err = showFunc(ret)
+		if err != nil {
+			return err
+		}
+		return nil
+	}
+	cmd.RunWithDesc(args.Property(), fmt.Sprintf("Get property of a %s", man.GetKeyword()), args, callback)
+}
+
+func (cmd ResourceCmd) GetProperty(args IPropertyOpt) {
+	cmd.GetPropertyWithShowFunc(args, func(ret jsonutils.JSONObject) error {
 		if _, ok := ret.(*jsonutils.JSONArray); ok {
 			data, _ := ret.GetArray()
 			PrintList(&printutils.ListResult{
@@ -249,8 +260,7 @@ func (cmd ResourceCmd) GetProperty(args IPropertyOpt) {
 			PrintObject(ret)
 		}
 		return nil
-	}
-	cmd.RunWithDesc(args.Property(), fmt.Sprintf("Get property of a %s", man.GetKeyword()), args, callback)
+	})
 }
 
 func (cmd ResourceCmd) Show(args IShowOpt) {