feat: refactor response struct

KusionStack · Nov 28, 2023 · 8cde216 · 8cde216
1 parent 39dc419
commit 8cde216
Show file tree

Hide file tree

Showing 13 changed files with 407 additions and 183 deletions.
diff --git a/pkg/apis/search/register.go b/pkg/apis/search/register.go
@@ -55,10 +55,10 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 		&TransformRuleList{},
 		&UniResource{},
 		&UniResourceList{},
-		&UniresourceTopology{},
-		&UniresourceTopologyList{},
-		&UniresourceYAML{},
-		&UniresourceYAMLList{},
+		&UniResourceTopology{},
+		&UniResourceTopologyList{},
+		&UniResourceYAML{},
+		&UniResourceYAMLList{},
 	)
 	return nil
 }
diff --git a/pkg/apis/search/types.go b/pkg/apis/search/types.go
@@ -182,8 +182,16 @@ type ResourceSyncCondition struct {
 
 type UniResource struct {
 	metav1.TypeMeta
-	Topology UniresourceTopology
-	YAML     UniresourceYAML
+	Topology UniResourceTopology
+	YAML     UniResourceYAML
+}
+
+// +k8s:deepcopy-gen=true
+
+type UniresourceNode struct {
+	Identifier string
+	Parents    []string
+	Children   []string
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
@@ -195,25 +203,27 @@ type UniResourceList struct {
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
-type UniresourceTopology struct {
+type UniResourceTopology struct {
 	metav1.TypeMeta
+	Graph map[string]UniresourceNode
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-type UniresourceTopologyList struct {
+type UniResourceTopologyList struct {
 	metav1.TypeMeta
-	Items []UniresourceTopology
+	Items []UniResourceTopology
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
-type UniresourceYAML struct {
+type UniResourceYAML struct {
 	metav1.TypeMeta
+	YAMLString string
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
-type UniresourceYAMLList struct {
+type UniResourceYAMLList struct {
 	metav1.TypeMeta
-	Items []UniresourceYAML
+	Items []UniResourceYAML
 }
diff --git a/pkg/apis/search/v1beta1/register.go b/pkg/apis/search/v1beta1/register.go
@@ -57,10 +57,10 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 		&TransformRuleList{},
 		&UniResource{},
 		&UniResourceList{},
-		&UniresourceTopology{},
-		&UniresourceTopologyList{},
-		&UniresourceYAML{},
-		&UniresourceYAMLList{},
+		&UniResourceTopology{},
+		&UniResourceTopologyList{},
+		&UniResourceYAML{},
+		&UniResourceYAMLList{},
 	)
 	metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
 	return nil

diff --git a/pkg/apis/search/v1beta1/types.go b/pkg/apis/search/v1beta1/types.go
@@ -219,8 +219,8 @@ type ResourceSyncCondition struct {
 
 type UniResource struct {
 	metav1.TypeMeta `json:",inline"`
-	Topology        UniresourceTopology
-	YAML            UniresourceYAML
+	Topology        UniResourceTopology
+	YAML            UniResourceYAML
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
@@ -230,27 +230,37 @@ type UniResourceList struct {
 	Items           []runtime.RawExtension `json:"items"`
 }
 
+// +k8s:deepcopy-gen=true
+
+type UniresourceNode struct {
+	Identifier string
+	Parents    []string
+	Children   []string
+}
+
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
-type UniresourceTopology struct {
+type UniResourceTopology struct {
 	metav1.TypeMeta
+	Graph map[string]UniresourceNode
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-type UniresourceTopologyList struct {
+type UniResourceTopologyList struct {
 	metav1.TypeMeta
-	Items []UniresourceTopology
+	Items []UniResourceTopology
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
-type UniresourceYAML struct {
+type UniResourceYAML struct {
 	metav1.TypeMeta
+	YAMLString string
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
-type UniresourceYAMLList struct {
+type UniResourceYAMLList struct {
 	metav1.TypeMeta
-	Items []UniresourceYAML
+	Items []UniResourceYAML
 }
diff --git a/pkg/apis/search/v1beta1/zz_generated.conversion.go b/pkg/apis/search/v1beta1/zz_generated.conversion.go
diff --git a/pkg/apis/search/v1beta1/zz_generated.deepcopy.go b/pkg/apis/search/v1beta1/zz_generated.deepcopy.go