refactor: use api types in status and core pkg (#719)

pkg/apis/core/v1/intent.go

@@ -7,6 +7,15 @@ const (
 	Terraform  Type = "Terraform"
 )
 
+const (
+	// ResourceExtensionGVK is the key for resource extension, which is used to
+	// store the GVK of the resource.
+	ResourceExtensionGVK = "GVK"
+	// ResourceExtensionKubeConfig is the key for resource extension, which is used
+	// to indicate the path of kubeConfig for Kubernetes type resource.
+	ResourceExtensionKubeConfig = "kubeConfig"
+)
+
 // Intent describes the desired state how the infrastructure should look like: which workload to run,
 // the load-balancer setup, the location of the database schema, and so on. Based on that information,
 // the Kusion engine takes care of updating the production state to match the Intent.

pkg/apis/core/v1/resource.go

@@ -0,0 +1,51 @@
+package v1
+
+import "encoding/json"
+
+func (r *Resource) ResourceKey() string {
+	return r.ID
+}
+
+// DeepCopy return a copy of resource
+func (r *Resource) DeepCopy() *Resource {
+	var out Resource
+	data, err := json.Marshal(r)
+	if err != nil {
+		panic(err)
+	}
+	_ = json.Unmarshal(data, &out)
+	return &out
+}
+
+func (rs Resources) Index() map[string]*Resource {
+	m := make(map[string]*Resource)
+	for i := range rs {
+		m[rs[i].ResourceKey()] = &rs[i]
+	}
+	return m
+}
+
+// GVKIndex returns a map of GVK to resources, for now, only Kubernetes resources.
+func (rs Resources) GVKIndex() map[string][]*Resource {
+	m := make(map[string][]*Resource)
+	for i := range rs {
+		resource := &rs[i]
+		if resource.Type != Kubernetes {
+			continue
+		}
+		gvk := resource.Extensions[ResourceExtensionGVK].(string)
+		m[gvk] = append(m[gvk], resource)
+	}
+	return m
+}
+
+func (rs Resources) Len() int      { return len(rs) }
+func (rs Resources) Swap(i, j int) { rs[i], rs[j] = rs[j], rs[i] }
+func (rs Resources) Less(i, j int) bool {
+	switch {
+	case rs[i].ID != rs[j].ID:
+		return rs[i].ID < rs[j].ID
+	default:
+		return false
+	}
+}

pkg/apis/internal/group.go → pkg/apis/status/group.go

@@ -1,3 +1,3 @@
-package internal
+package status
 
 const Group = "internal.kusionstack.io"

pkg/cmd/apply/options.go

@@ -10,8 +10,8 @@ import (
 	"github.com/AlecAivazis/survey/v2"
 	"github.com/pterm/pterm"
 
-	"kusionstack.io/kusion/pkg/apis/intent"
-	"kusionstack.io/kusion/pkg/apis/status"
+	apiv1 "kusionstack.io/kusion/pkg/apis/core/v1"
+	v1 "kusionstack.io/kusion/pkg/apis/status/v1"
 	"kusionstack.io/kusion/pkg/cmd/build"
 	cmdintent "kusionstack.io/kusion/pkg/cmd/build/builders"
 	previewcmd "kusionstack.io/kusion/pkg/cmd/preview"
@@ -75,7 +75,7 @@ func (o *Options) Run() error {
 	}
 
 	// Generate Intent
-	var sp *intent.Intent
+	var sp *apiv1.Intent
 	if o.IntentFile != "" {
 		sp, err = build.IntentFromFile(o.IntentFile)
 	} else {
@@ -187,7 +187,7 @@ func (o *Options) Run() error {
 func Apply(
 	o *Options,
 	storage states.StateStorage,
-	planResources *intent.Intent,
+	planResources *apiv1.Intent,
 	changes *opsmodels.Changes,
 	out io.Writer,
 ) error {
@@ -294,7 +294,7 @@ func Apply(
 				Intent:   planResources,
 			},
 		})
-		if status.IsErr(st) {
+		if v1.IsErr(st) {
 			return fmt.Errorf("apply failed, status:\n%v", st)
 		}
 	}
@@ -323,7 +323,7 @@ func Apply(
 //	}
 func Watch(
 	o *Options,
-	planResources *intent.Intent,
+	planResources *apiv1.Intent,
 	changes *opsmodels.Changes,
 ) error {
 	if o.DryRun {
@@ -332,7 +332,7 @@ func Watch(
 	}
 
 	// Filter out unchanged resources
-	toBeWatched := intent.Resources{}
+	toBeWatched := apiv1.Resources{}
 	for _, res := range planResources.Resources {
 		if changes.ChangeOrder.ChangeSteps[res.ResourceKey()].Action != opsmodels.UnChanged {
 			toBeWatched = append(toBeWatched, res)
@@ -345,7 +345,7 @@ func Watch(
 		Request: opsmodels.Request{
 			Project: changes.Project(),
 			Stack:   changes.Stack(),
-			Intent:  &intent.Intent{Resources: toBeWatched},
+			Intent:  &apiv1.Intent{Resources: toBeWatched},
 		},
 	}); err != nil {
 		return err