bugfix: runtime apply and detail prompt cancel unexpectly

pkg/engine/operation/change.go

@@ -29,7 +29,7 @@ type ChangeStep struct {
 // TODO: 3-way diff
 func (cs *ChangeStep) Diff() (string, error) {
 	// Generate diff report
-	diffReport, err := diffToReport(cs.Original, cs.Modified)
+	diffReport, err := diffToReport(cs.Current, cs.Modified)
 	if err != nil {
 		log.Errorf("failed to compute diff with ChangeStep ID: %s", cs.ID)
 		return "", err

pkg/engine/operation/preview.go

@@ -27,7 +27,7 @@ type PreviewResponse struct {
 	Order *ChangeOrder
 }
 
-func (o *Operation) Preview(request *PreviewRequest, operation Type) (rsp *PreviewResponse, s status.Status) {
+func (o *Operation) Preview(request *PreviewRequest) (rsp *PreviewResponse, s status.Status) {
 	defer func() {
 		if e := recover(); e != nil {
 			log.Error("preview panic:%v", e)
@@ -56,11 +56,11 @@ func (o *Operation) Preview(request *PreviewRequest, operation Type) (rsp *Previ
 	// 1. init & build Indexes
 	priorState, resultState = initStates(o.StateStorage, &request.Request)
 
-	switch operation {
-	case Apply:
+	switch o.OperationType {
+	case ApplyPreview:
 		priorStateResourceIndex = priorState.Resources.Index()
 		graph, s = NewApplyGraph(request.Manifest, priorState)
-	case Destroy:
+	case DestroyPreview:
 		resources := request.Request.Manifest.Resources
 		priorStateResourceIndex = resources.Index()
 		graph, s = NewDestroyGraph(resources)
@@ -74,7 +74,7 @@ func (o *Operation) Preview(request *PreviewRequest, operation Type) (rsp *Previ
 
 	previewOperation := &PreviewOperation{
 		Operation: Operation{
-			OperationType:           Preview,
+			OperationType:           o.OperationType,
 			StateStorage:            o.StateStorage,
 			CtxResourceIndex:        map[string]*models.Resource{},
 			PriorStateResourceIndex: priorStateResourceIndex,

pkg/engine/operation/preview_test.go

@@ -29,6 +29,10 @@ var (
 		ID:         "fake-id",
 		Attributes: FakeService,
 	}
+	FakeResourceState2 = models.Resource{
+		ID:         "fake-id-2",
+		Attributes: FakeService,
+	}
 )
 
 var _ runtime.Runtime = (*fakePreviewRuntime)(nil)
@@ -40,6 +44,9 @@ func (f *fakePreviewRuntime) Apply(ctx context.Context, priorState, planState *m
 }
 
 func (f *fakePreviewRuntime) Read(ctx context.Context, resourceState *models.Resource) (*models.Resource, status.Status) {
+	if resourceState.ResourceKey() == "fake-id" {
+		return nil, nil
+	}
 	return resourceState, nil
 }
 
@@ -65,8 +72,7 @@ func TestOperation_Preview(t *testing.T) {
 		lock                    *sync.Mutex
 	}
 	type args struct {
-		request   *PreviewRequest
-		operation Type
+		request *PreviewRequest
 	}
 	tests := []struct {
 		name    string
@@ -78,9 +84,10 @@ func TestOperation_Preview(t *testing.T) {
 		{
 			name: "success-when-apply",
 			fields: fields{
-				Runtime:      &fakePreviewRuntime{},
-				StateStorage: &states.FileSystemState{Path: states.KusionState},
-				Order:        &ChangeOrder{StepKeys: []string{}, ChangeSteps: map[string]*ChangeStep{}},
+				OperationType: ApplyPreview,
+				Runtime:       &fakePreviewRuntime{},
+				StateStorage:  &states.FileSystemState{Path: states.KusionState},
+				Order:         &ChangeOrder{StepKeys: []string{}, ChangeSteps: map[string]*ChangeStep{}},
 			},
 			args: args{
 				request: &PreviewRequest{
@@ -96,7 +103,6 @@ func TestOperation_Preview(t *testing.T) {
 						},
 					},
 				},
-				operation: Apply,
 			},
 			wantRsp: &PreviewResponse{
 				Order: &ChangeOrder{
@@ -117,9 +123,10 @@ func TestOperation_Preview(t *testing.T) {
 		{
 			name: "success-when-destroy",
 			fields: fields{
-				Runtime:      &fakePreviewRuntime{},
-				StateStorage: &states.FileSystemState{Path: states.KusionState},
-				Order:        &ChangeOrder{},
+				OperationType: DestroyPreview,
+				Runtime:       &fakePreviewRuntime{},
+				StateStorage:  &states.FileSystemState{Path: states.KusionState},
+				Order:         &ChangeOrder{},
 			},
 			args: args{
 				request: &PreviewRequest{
@@ -130,23 +137,22 @@ func TestOperation_Preview(t *testing.T) {
 						Operator: "fake-operator",
 						Manifest: &models.Spec{
 							Resources: []models.Resource{
-								FakeResourceState,
+								FakeResourceState2,
 							},
 						},
 					},
 				},
-				operation: Destroy,
 			},
 			wantRsp: &PreviewResponse{
 				Order: &ChangeOrder{
-					StepKeys: []string{"fake-id"},
+					StepKeys: []string{"fake-id-2"},
 					ChangeSteps: map[string]*ChangeStep{
-						"fake-id": {
-							ID:       "fake-id",
+						"fake-id-2": {
+							ID:       "fake-id-2",
 							Action:   Delete,
-							Original: &FakeResourceState,
-							Modified: (*models.Resource)(nil),
-							Current:  &FakeResourceState,
+							Original: &FakeResourceState2,
+							Modified: &FakeResourceState2,
+							Current:  &FakeResourceState2,
 						},
 					},
 				},
@@ -156,27 +162,28 @@ func TestOperation_Preview(t *testing.T) {
 		{
 			name: "fail-because-empty-models",
 			fields: fields{
-				Runtime:      &fakePreviewRuntime{},
-				StateStorage: &states.FileSystemState{Path: states.KusionState},
-				Order:        &ChangeOrder{},
+				OperationType: ApplyPreview,
+				Runtime:       &fakePreviewRuntime{},
+				StateStorage:  &states.FileSystemState{Path: states.KusionState},
+				Order:         &ChangeOrder{},
 			},
 			args: args{
 				request: &PreviewRequest{
 					Request: Request{
 						Manifest: nil,
 					},
 				},
-				operation: Apply,
 			},
 			wantRsp: nil,
 			wantS:   status.NewErrorStatusWithMsg(status.InvalidArgument, "request.Spec is empty. If you want to delete all resources, please use command 'destroy'"),
 		},
 		{
 			name: "fail-because-nonexistent-id",
 			fields: fields{
-				Runtime:      &fakePreviewRuntime{},
-				StateStorage: &states.FileSystemState{Path: states.KusionState},
-				Order:        &ChangeOrder{},
+				OperationType: ApplyPreview,
+				Runtime:       &fakePreviewRuntime{},
+				StateStorage:  &states.FileSystemState{Path: states.KusionState},
+				Order:         &ChangeOrder{},
 			},
 			args: args{
 				request: &PreviewRequest{
@@ -197,7 +204,6 @@ func TestOperation_Preview(t *testing.T) {
 						},
 					},
 				},
-				operation: Apply,
 			},
 			wantRsp: nil,
 			wantS:   status.NewErrorStatusWithMsg(status.IllegalManifest, "can't find resource by key:nonexistent-id in models or state."),
@@ -217,7 +223,7 @@ func TestOperation_Preview(t *testing.T) {
 				resultState:             tt.fields.resultState,
 				lock:                    tt.fields.lock,
 			}
-			gotRsp, gotS := o.Preview(tt.args.request, tt.args.operation)
+			gotRsp, gotS := o.Preview(tt.args.request)
 			if !reflect.DeepEqual(gotRsp, tt.wantRsp) {
 				t.Errorf("Operation.Preview() gotRsp = %v, want %v", kdump.FormatN(gotRsp), kdump.FormatN(tt.wantRsp))
 			}

pkg/engine/operation/resource_node.go

@@ -23,59 +23,67 @@ var _ ExecutableNode = (*ResourceNode)(nil)
 
 func (rn *ResourceNode) Execute(operation *Operation) status.Status {
 	log.Debugf("execute node:%s", rn.ID)
-	// 1. prepare planedState
-	planedState := rn.state
-	if rn.Action != Delete {
-		if operation.OperationType != Preview {
-			// replace implicit references
-			value := reflect.ValueOf(rn.state.Attributes)
-			_, implicitValue, s := ParseImplicitRef(value, operation.CtxResourceIndex, ImplicitReplaceFun)
-			if status.IsErr(s) {
-				return s
-			}
-			rn.state.Attributes = implicitValue.Interface().(map[string]interface{})
+	if operation.OperationType == Apply {
+		// replace implicit references
+		value := reflect.ValueOf(rn.state.Attributes)
+		_, implicitValue, s := ParseImplicitRef(value, operation.CtxResourceIndex, ImplicitReplaceFun)
+		if status.IsErr(s) {
+			return s
 		}
-	} else {
-		planedState = nil
+		rn.state.Attributes = implicitValue.Interface().(map[string]interface{})
 	}
 
+	// 1. prepare planedState
+	planedState := rn.state
+
 	// 2. get prior state which is stored in kusion_state.json
 	key := rn.state.ResourceKey()
 	priorState := operation.PriorStateResourceIndex[key]
 
-	// get the latest resource from runtime
-	liveState, s := operation.Runtime.Read(context.Background(), priorState)
+	// 3. get the latest resource from runtime
+	liveState, s := operation.Runtime.Read(context.Background(), planedState)
 	if status.IsErr(s) {
 		return s
 	}
 
-	// 3. compute ActionType of current resource node between planState and liveState
-	if liveState == nil {
-		rn.Action = Create
-	} else if planedState == nil {
+	// 4. compute ActionType of current resource node between planState and liveState
+	switch operation.OperationType {
+	case Destroy, DestroyPreview:
 		rn.Action = Delete
-	} else if reflect.DeepEqual(liveState, planedState) {
-		rn.Action = UnChange
-	} else {
-		rn.Action = Update
+	case Apply, ApplyPreview:
+		if liveState == nil {
+			rn.Action = Create
+		} else if planedState == nil {
+			rn.Action = Delete
+		} else if reflect.DeepEqual(liveState, planedState) { // TODO: need a better comparable func
+			rn.Action = UnChange
+		} else {
+			rn.Action = Update
+		}
+	default:
+		return status.NewErrorStatus(fmt.Errorf("unknown operation: %v", operation.OperationType))
 	}
 
-	if operation.OperationType == Preview {
+	// 5. apply or return
+	switch operation.OperationType {
+	case ApplyPreview, DestroyPreview:
 		fillResponseChangeSteps(operation, rn, priorState, planedState, liveState)
-		return nil
-	}
-	// 4. apply
-	switch rn.Action {
-	case Create, Delete, Update:
-		s := rn.applyResource(operation, priorState, planedState)
-		if status.IsErr(s) {
-			return s
+	case Apply, Destroy:
+		switch rn.Action {
+		case Create, Delete, Update:
+			s := rn.applyResource(operation, priorState, planedState)
+			if status.IsErr(s) {
+				return s
+			}
+		case UnChange:
+			log.Infof("PriorAttributes and PlanAttributes are equal.")
+		default:
+			return status.NewErrorStatus(fmt.Errorf("unknown action:%s", rn.Action.PrettyString()))
 		}
-	case UnChange:
-		log.Infof("PriorAttributes and PlanAttributes are equal.")
 	default:
-		return status.NewErrorStatus(fmt.Errorf("unknown op:%s", rn.Action.PrettyString()))
+		return status.NewErrorStatus(fmt.Errorf("unknown operation: %v", operation.OperationType))
 	}
+
 	return nil
 }
 

pkg/engine/operation/types.go

@@ -6,6 +6,7 @@ type Type int64
 const (
 	UndefinedOperation Type = iota // invalidate value
 	Apply
-	Preview
+	ApplyPreview
 	Destroy
+	DestroyPreview
 )

pkg/engine/runtime/kubernetest_runtime.go

@@ -21,6 +21,7 @@ import (
 	"kusionstack.io/kusion/pkg/engine/models"
 	"kusionstack.io/kusion/pkg/log"
 	"kusionstack.io/kusion/pkg/status"
+	"kusionstack.io/kusion/pkg/util/json"
 	"kusionstack.io/kusion/pkg/util/kube/config"
 	"kusionstack.io/kusion/pkg/util/yaml"
 )
@@ -57,34 +58,41 @@ func (k *KubernetesRuntime) Apply(ctx context.Context, priorState, planState *mo
 	if err != nil {
 		return nil, status.NewErrorStatus(err)
 	}
-
-	// original equals to last-applied from annotation, kusion store it in kusion_state.json
-	original := yaml.MergeToOneYAML(priorState.Attributes)
-	// modified equals input content
-	modified := yaml.MergeToOneYAML(planState.Attributes)
-	// get live state
-	liveState, err := resource.Get(ctx, planObj.GetName(), metav1.GetOptions{})
-	if err != nil {
-		return nil, status.NewErrorStatus(err)
+	// Get live state
+	liveState, s := k.Read(ctx, planState)
+	if status.IsErr(s) {
+		return nil, s
 	}
-	// current equals live manifest
-	current := yaml.MergeToOneYAML(liveState.Object)
-	// 3-way json merge patch
-	patch, err := jsonmergepatch.CreateThreeWayJSONMergePatch([]byte(original), []byte(modified), []byte(current))
-	if err != nil {
-		return nil, status.NewErrorStatus(err)
-	}
-	// apply patch
-	patchedObj, err := resource.Patch(ctx, planObj.GetName(), types.MergePatchType, patch, metav1.PatchOptions{
-		FieldManager: "kusion",
-	})
-	if err != nil {
-		return nil, status.NewErrorStatus(err)
+
+	// LiveState is nil, fall back to create planObj directly
+	if liveState == nil {
+		if _, err = resource.Create(ctx, planObj, metav1.CreateOptions{}); err != nil {
+			return nil, status.NewErrorStatus(err)
+		}
+	} else {
+		// Original equals to last-applied from annotation, kusion store it in kusion_state.json
+		original := ""
+		if priorState != nil {
+			original = json.MustMarshal2String(priorState.Attributes)
+		}
+		// Modified equals input content
+		modified := json.MustMarshal2String(planState.Attributes)
+		// Current equals live manifest
+		current := json.MustMarshal2String(liveState.Attributes)
+		// 3-way json merge patch
+		patch, err := jsonmergepatch.CreateThreeWayJSONMergePatch([]byte(original), []byte(modified), []byte(current))
+		if err != nil {
+			return nil, status.NewErrorStatus(err)
+		}
+		// Apply patch
+		if _, err = resource.Patch(ctx, planObj.GetName(), types.MergePatchType, patch, metav1.PatchOptions{FieldManager: "kusion"}); err != nil {
+			return nil, status.NewErrorStatus(err)
+		}
 	}
 
 	return &models.Resource{
 		ID:         planState.ResourceKey(),
-		Attributes: patchedObj.Object,
+		Attributes: planObj.Object,
 		DependsOn:  planState.DependsOn,
 	}, nil
 }
@@ -105,6 +113,10 @@ func (k *KubernetesRuntime) Read(ctx context.Context, resourceState *models.Reso
 	// Read resource
 	v, err := resource.Get(ctx, obj.GetName(), metav1.GetOptions{})
 	if err != nil {
+		if k8serrors.IsNotFound(err) {
+			log.Infof("%s not found, ignore", resourceState.ResourceKey())
+			return nil, nil
+		}
 		return nil, status.NewErrorStatus(err)
 	}