fix: Remove the @unwind index cache hack

Author: rg0now

pkg/pipeline/default_engine.go

@@ -7,7 +7,6 @@ import (
 	"strings"
 
 	"github.com/go-logr/logr"
-	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	toolscache "k8s.io/client-go/tools/cache"
 
 	"github.com/hsnlab/dcontroller/pkg/cache"
@@ -253,8 +252,9 @@ func (eng *defaultEngine) evalStage(e *expression.Expression, u unstruct) ([]uns
 
 	// @demux is one to many
 	case "@unwind", "@demux":
-		if _, err := Normalize(eng, u); err != nil {
-			return nil, errors.New("@demux requires a valid .metadata.name")
+		name, err := expression.GetJSONPathExp("$.metadata.name", u)
+		if err != nil {
+			return nil, errors.New("@valid .metadata.name required")
 		}
 
 		arg, err := e.Arg.Evaluate(expression.EvalCtx{Object: u, Log: eng.log})
@@ -275,19 +275,6 @@ func (eng *defaultEngine) evalStage(e *expression.Expression, u unstruct) ([]uns
 				return nil, errors.New("could not deepcopy object content")
 			}
 
-			// update the index stack
-			stack, ok, err := unstructured.NestedSlice(v, "metadata", demuxIndexStack)
-			if err != nil {
-				return nil, fmt.Errorf("@demux: cannot get index stack: %w", err)
-			}
-			if !ok {
-				stack = []any{}
-			}
-			stack = append(stack, int64(i))
-			if err := unstructured.SetNestedSlice(v, stack, "metadata", demuxIndexStack); err != nil {
-				return nil, fmt.Errorf("@demux: cannot set index: %w", err)
-			}
-
 			// the elem to the corresponding jsonpath
 			jp, err := e.Arg.GetLiteralString()
 			if err != nil {
@@ -299,6 +286,11 @@ func (eng *defaultEngine) evalStage(e *expression.Expression, u unstruct) ([]uns
 				return nil, err
 			}
 
+			// add index to name
+			if err := expression.SetJSONPathExp("$.metadata.name", fmt.Sprintf("%s-%d", name, i), v); err != nil {
+				return nil, fmt.Errorf("could add index to .metadata.name")
+			}
+
 			v, err = expression.AsObject(v)
 			if err != nil {
 				return nil, err

pkg/pipeline/engine.go

@@ -3,18 +3,14 @@ package pipeline
 import (
 	"fmt"
 	"reflect"
-	"strings"
 
 	"github.com/go-logr/logr"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 
 	"github.com/hsnlab/dcontroller/pkg/cache"
-	"github.com/hsnlab/dcontroller/pkg/expression"
 	"github.com/hsnlab/dcontroller/pkg/object"
 )
 
-const demuxIndexStack = "__demux-index-stack"
-
 type gvk = schema.GroupVersionKind
 
 type Engine interface {
@@ -74,26 +70,6 @@ func Normalize(eng Engine, content unstruct) (object.Object, error) {
 	}
 	metaMap["name"] = nameStr
 
-	// demux/unwind may add the index at the end of the name: unpack the index stack and update
-	// the name
-	is, ok := metaMap[demuxIndexStack]
-	if ok {
-		stack, err := expression.AsIntList(is)
-		if err != nil {
-			return nil, NewInvalidObjectError(fmt.Sprintf("invalid demux index stack: %q", is))
-		}
-		strs := make([]string, len(stack))
-		for i, x := range stack {
-			strs[i] = fmt.Sprintf("%d", x)
-		}
-		nameStr += fmt.Sprintf("-%s", strings.Join(strs, "-"))
-		metaMap["name"] = nameStr
-
-		// remove stack
-		delete(metaMap, demuxIndexStack)
-		content["metadata"] = metaMap
-	}
-
 	object.SetContent(obj, content)
 	// still needed
 	obj.SetName(nameStr)