From 6a669fa9621fa5062f3e33e8bae3323c9c21abd8 Mon Sep 17 00:00:00 2001
From: lonelyCZ <531187475@qq.com>
Date: Tue, 29 Mar 2022 19:48:12 +0800
Subject: [PATCH] refactor Obj to save more information about resources

Signed-off-by: lonelyCZ <531187475@qq.com>
---
 pkg/karmadactl/get.go     | 20 +++++++++-----------
 pkg/karmadactl/promote.go |  5 ++---
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/pkg/karmadactl/get.go b/pkg/karmadactl/get.go
index 6822d31e5..2fbb3efa9 100644
--- a/pkg/karmadactl/get.go
+++ b/pkg/karmadactl/get.go
@@ -194,8 +194,7 @@ func (g *CommandGetOptions) Complete(cmd *cobra.Command, args []string) error {
 // Obj cluster info
 type Obj struct {
 	Cluster string
-	Infos   runtime.Object
-	Mapping *meta.RESTMapping
+	Info    *resource.Info
 }
 
 // RBInfo resourcebinding info and print info
@@ -246,7 +245,7 @@ func (g *CommandGetOptions) Run(karmadaConfig KarmadaConfig, cmd *cobra.Command,
 
 	// sort objects by resource kind to classify them
 	sort.Slice(objs, func(i, j int) bool {
-		return objs[i].Mapping.Resource.String() < objs[j].Mapping.Resource.String()
+		return objs[i].Info.Mapping.Resource.String() < objs[j].Info.Mapping.Resource.String()
 	})
 
 	if err := g.printObjs(objs, &allErrs, args); err != nil {
@@ -274,7 +273,7 @@ func (g *CommandGetOptions) printObjs(objs []Obj, allErrs *[]error, args []strin
 	w := printers.GetNewTabWriter(separatorWriter)
 	sameKind := make([]Obj, 0)
 	for ix := range objs {
-		mapping := objs[ix].Mapping
+		mapping := objs[ix].Info.Mapping
 		sameKind = append(sameKind, objs[ix])
 
 		printWithNamespace := g.checkPrintWithNamespace(mapping)
@@ -303,7 +302,7 @@ func (g *CommandGetOptions) printObjs(objs []Obj, allErrs *[]error, args []strin
 			lastMapping = mapping
 		}
 
-		if ix == len(objs)-1 || objs[ix].Mapping.Resource != objs[ix+1].Mapping.Resource {
+		if ix == len(objs)-1 || objs[ix].Info.Mapping.Resource != objs[ix+1].Info.Mapping.Resource {
 			table := &metav1.Table{}
 			allTableRows, mapping, err := g.reconstructionRow(sameKind, table)
 			if err != nil {
@@ -399,8 +398,7 @@ func (g *CommandGetOptions) getObjInfo(wg *sync.WaitGroup, mux *sync.Mutex, f cm
 	for ix := range infos {
 		objInfo = Obj{
 			Cluster: cluster,
-			Infos:   infos[ix].Object,
-			Mapping: infos[ix].Mapping,
+			Info:    infos[ix],
 		}
 		*objs = append(*objs, objInfo)
 	}
@@ -412,8 +410,8 @@ func (g *CommandGetOptions) reconstructionRow(objs []Obj, table *metav1.Table) (
 	var allTableRows []metav1.TableRow
 	var mapping *meta.RESTMapping
 	for ix := range objs {
-		mapping = objs[ix].Mapping
-		unstr, ok := objs[ix].Infos.(*unstructured.Unstructured)
+		mapping = objs[ix].Info.Mapping
+		unstr, ok := objs[ix].Info.Object.(*unstructured.Unstructured)
 		if !ok {
 			return nil, nil, fmt.Errorf("attempt to decode non-Unstructured object")
 		}
@@ -738,9 +736,9 @@ func multipleGVKsRequested(objs []Obj) bool {
 	if len(objs) < 2 {
 		return false
 	}
-	gvk := objs[0].Mapping.GroupVersionKind
+	gvk := objs[0].Info.Mapping.GroupVersionKind
 	for _, obj := range objs {
-		if obj.Mapping.GroupVersionKind != gvk {
+		if obj.Info.Mapping.GroupVersionKind != gvk {
 			return true
 		}
 	}
diff --git a/pkg/karmadactl/promote.go b/pkg/karmadactl/promote.go
index 0b657eba2..8f037c3f6 100644
--- a/pkg/karmadactl/promote.go
+++ b/pkg/karmadactl/promote.go
@@ -222,7 +222,7 @@ func RunPromote(_ io.Writer, karmadaConfig KarmadaConfig, opts CommandPromoteOpt
 		return fmt.Errorf("failed to get resource in cluster(%s). err: %v", opts.Cluster, err)
 	}
 
-	obj := objInfo.Infos.(*unstructured.Unstructured)
+	obj := objInfo.Info.Object.(*unstructured.Unstructured)
 
 	opts.gvk = obj.GetObjectKind().GroupVersionKind()
 
@@ -317,8 +317,7 @@ func (o *CommandPromoteOption) getObjInfo(f cmdutil.Factory, cluster string, arg
 
 	obj := &Obj{
 		Cluster: cluster,
-		Infos:   infos[0].Object,
-		Mapping: infos[0].Mapping,
+		Info:    infos[0],
 	}
 
 	return obj, nil