added sdc protos

Author: henderiw

go.mod

@@ -26,7 +26,7 @@ require (
 	github.com/prometheus/client_model v0.6.2
 	github.com/prometheus/prometheus v0.300.1
 	github.com/sdcio/data-server v0.0.62
-	github.com/sdcio/sdc-protos v0.0.44
+	github.com/sdcio/sdc-protos v0.0.45-0.20250818091419-82cddb2deab0
 	github.com/spf13/cobra v1.9.1
 	github.com/stretchr/testify v1.10.0
 	go.opentelemetry.io/otel v1.37.0

go.sum

@@ -250,8 +250,8 @@ github.com/sdcio/data-server v0.0.62 h1:1nHjm8e+zC1O+7sK7g+tDF00p6ZQGXddyQqjj3YA
 github.com/sdcio/data-server v0.0.62/go.mod h1:pDM51uL89Bo7mQXBcJc72vn4XxdKu5xInD+7o7E4L4Q=
 github.com/sdcio/schema-server v0.0.31 h1:gWSSDvyzwWy2xYu2TCQdXYvqCA0gg3RhYKb9PplYeD4=
 github.com/sdcio/schema-server v0.0.31/go.mod h1:qa2bbfKyR4bHeZ85hicRpD4d+VtiPp9xs9/ey3shqZg=
-github.com/sdcio/sdc-protos v0.0.44 h1:YIvP4b4QPGtFJ90QlImGAturBun6vDgeGrynFLGxbgM=
-github.com/sdcio/sdc-protos v0.0.44/go.mod h1:i7eqaPKkw3bVaK3kLOgrnHvuphUQtRCXrDH0grX5n8w=
+github.com/sdcio/sdc-protos v0.0.45-0.20250818091419-82cddb2deab0 h1:Pnv3La9edwua3dpaaq29/4XR2U0A2KnAaGqDrP8v1Oo=
+github.com/sdcio/sdc-protos v0.0.45-0.20250818091419-82cddb2deab0/go.mod h1:i7eqaPKkw3bVaK3kLOgrnHvuphUQtRCXrDH0grX5n8w=
 github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8=
 github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
 github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=

pkg/target/context.go

@@ -288,32 +288,38 @@ func (r *Context) getIntentUpdate(ctx context.Context, key storebackend.Key, con
 	return update, nil
 }
 
-func (r *Context) getDeviationUpdate(ctx context.Context, targetKey storebackend.Key, deviation *config.Deviation) ([]*sdcpb.Update, error) {
+func (r *Context) getDeviationUpdate(ctx context.Context, targetKey storebackend.Key, deviation *config.Deviation) ([]*sdcpb.Update, []*sdcpb.Path, error) {
 	log := log.FromContext(ctx)
-	update := make([]*sdcpb.Update, 0, len(deviation.Spec.Deviations))
+	updates := make([]*sdcpb.Update, 0)
+	deletes := make([]*sdcpb.Path, 0)
 
 	for _, deviation := range deviation.Spec.Deviations {
-		if deviation.Reason == "NOT_APPLIED" && deviation.CurrentValue != "<nil>"{
+		if deviation.Reason == "NOT_APPLIED" && deviation.CurrentValue != "<nil>" {
 			path, err := utils.ParsePath(deviation.Path)
 			if err != nil {
-				return nil, fmt.Errorf("deviation path parsing failed forr target %s, path %s invalid", targetKey.String(), deviation.Path)
+				return nil, nil, fmt.Errorf("deviation path parsing failed forr target %s, path %s invalid", targetKey.String(), deviation.Path)
 			}
 
 			val := &sdcpb.TypedValue{}
 			if err := prototext.Unmarshal([]byte(deviation.CurrentValue), val); err != nil {
 				log.Error("deviation proto unmarshal failed", "key", targetKey.String(), "path", deviation.Path, "currentValue", deviation.CurrentValue)
 				continue
-			} 
+			}
 
-			update = append(update, &sdcpb.Update{
+			updates = append(updates, &sdcpb.Update{
 				Path:  path,
 				Value: val,
 			})
 		} else {
 			// delete case to be updated with the new protos
+			path, err := utils.ParsePath(deviation.Path)
+			if err != nil {
+				return nil, nil, fmt.Errorf("deviation path parsing failed forr target %s, path %s invalid", targetKey.String(), deviation.Path)
+			}
+			deletes = append(deletes, path)
 		}
 	}
-	return update, nil
+	return updates, deletes, nil
 }
 
 /*
@@ -392,7 +398,7 @@ func (r *Context) TransactionSet(ctx context.Context, req *sdcpb.TransactionSetR
 	if req.DryRun {
 		return msg, nil
 	}
-	
+
 	if err := r.TransactionConfirm(ctx, req.DatastoreName, req.TransactionId); err != nil {
 		return msg, err
 	}
@@ -426,7 +432,7 @@ func (r *Context) SetIntent(ctx context.Context, key storebackend.Key, config *c
 	})
 
 	if !config.IsRevertive() {
-		update, err := r.getDeviationUpdate(ctx, key, &deviation)
+		updates, deletes, err := r.getDeviationUpdate(ctx, key, &deviation)
 		if err != nil {
 			return "", err
 		}
@@ -454,7 +460,8 @@ func (r *Context) SetIntent(ctx context.Context, key storebackend.Key, config *c
 				Deviation: true,
 				Intent:    fmt.Sprintf("deviation:%s", GetGVKNSN(config)),
 				Priority:  int32(newPriority),
-				Update:    update,
+				Update:    updates,
+				Deletes:   deletes,
 			})
 		}
 	}
@@ -488,11 +495,11 @@ func (r *Context) DeleteIntent(ctx context.Context, key storebackend.Key, config
 		Timeout:       ptr.To(int32(60)),
 		Intents: []*sdcpb.TransactionIntent{
 			{
-				Intent:   GetGVKNSN(config),
-				Priority: int32(config.Spec.Priority),
-				Delete:   true,
+				Intent:              GetGVKNSN(config),
+				Priority:            int32(config.Spec.Priority),
+				Delete:              true,
 				DeleteIgnoreNoExist: true,
-				Orphan:   config.Orphan(),
+				Orphan:              config.Orphan(),
 			},
 		},
 	})
@@ -511,7 +518,7 @@ func (r *Context) RecoverIntents(ctx context.Context, key storebackend.Key, conf
 	intents := make([]*sdcpb.TransactionIntent, 0, len(configs)+len(deviations))
 	// we only include deviations that have
 	for _, deviation := range deviations {
-		update, err := r.getDeviationUpdate(ctx, key, deviation)
+		updates, deletes, err := r.getDeviationUpdate(ctx, key, deviation)
 		if err != nil {
 			return "", err
 		}
@@ -524,12 +531,13 @@ func (r *Context) RecoverIntents(ctx context.Context, key storebackend.Key, conf
 			newPriority--
 		}
 		// only include items for which deviations exist
-		if len(update) != 0 {
+		if len(updates) != 0 || len(deletes) != 0 {
 			intents = append(intents, &sdcpb.TransactionIntent{
 				Deviation: true,
 				Intent:    fmt.Sprintf("deviation:%s", GetGVKNSN(deviation)),
 				Priority:  int32(newPriority),
-				Update:    update,
+				Update:    updates,
+				Deletes:   deletes,
 			})
 		}
 	}
@@ -579,7 +587,7 @@ func (r *Context) SetIntents(
 	for key, deviation := range deviationsToUpdate {
 		deviationsToUpdateSet.Insert(key)
 
-		update, err := r.getDeviationUpdate(ctx, targetKey, deviation)
+		updates, deletes, err := r.getDeviationUpdate(ctx, targetKey, deviation)
 		if err != nil {
 			log.Error("Transaction getDeviationUpdate deviation", "error", err.Error())
 			return nil, err
@@ -594,12 +602,13 @@ func (r *Context) SetIntents(
 			newPriority--
 		}
 		// only include items for which deviations exist
-		if len(update) != 0 {
+		if len(updates) != 0 || len(deletes) != 0 {
 			intents = append(intents, &sdcpb.TransactionIntent{
 				Deviation: true,
 				Intent:    fmt.Sprintf("deviation:%s", GetGVKNSN(deviation)),
 				Priority:  int32(newPriority),
-				Update:    update,
+				Update:    updates,
+				Deletes:   deletes,
 			})
 		}
 	}
@@ -608,9 +617,9 @@ func (r *Context) SetIntents(
 		deviationsToDeleteSet.Insert(key)
 		// only include items for which deviations exist
 		intents = append(intents, &sdcpb.TransactionIntent{
-			Intent:    fmt.Sprintf("deviation:%s", GetGVKNSN(deviation)),
+			Intent: fmt.Sprintf("deviation:%s", GetGVKNSN(deviation)),
 			//Priority: int32(config.Spec.Priority),
-			Delete:   true,
+			Delete:              true,
 			DeleteIgnoreNoExist: true,
 		})
 	}
@@ -630,9 +639,9 @@ func (r *Context) SetIntents(
 	for key, config := range configsToDelete {
 		configsToDeleteSet.Insert(key)
 		intents = append(intents, &sdcpb.TransactionIntent{
-			Intent:   GetGVKNSN(config),
+			Intent: GetGVKNSN(config),
 			//Priority: int32(config.Spec.Priority),
-			Delete:   true,
+			Delete:              true,
 			DeleteIgnoreNoExist: true,
 		})
 	}