path

Signed-off-by: Charles-Edouard Brétéché <[email protected]>
kyverno · Sep 17, 2024 · c167017 · c167017
1 parent 2cc0104
commit c167017
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/pkg/engine/assert/parse.go b/pkg/engine/assert/parse.go
@@ -15,13 +15,13 @@ import (
 	"k8s.io/apimachinery/pkg/util/validation/field"
 )
 
-func Parse(ctx context.Context, assertion any) (Assertion, error) {
+func Parse(ctx context.Context, path *field.Path, assertion any) (Assertion, error) {
 	switch reflectutils.GetKind(assertion) {
 	case reflect.Slice:
 		node := sliceNode{}
 		valueOf := reflect.ValueOf(assertion)
 		for i := 0; i < valueOf.Len(); i++ {
-			sub, err := Parse(ctx, valueOf.Index(i).Interface())
+			sub, err := Parse(ctx, path.Index(i), valueOf.Index(i).Interface())
 			if err != nil {
 				return nil, err
 			}
@@ -32,16 +32,16 @@ func Parse(ctx context.Context, assertion any) (Assertion, error) {
 		node := mapNode{}
 		iter := reflect.ValueOf(assertion).MapRange()
 		for iter.Next() {
-			sub, err := Parse(ctx, iter.Value().Interface())
+			// TODO: key in path
+			sub, err := Parse(ctx, path, iter.Value().Interface())
 			if err != nil {
 				return nil, err
 			}
 			node[iter.Key().Interface()] = sub
 		}
 		return node, nil
 	default:
-		// TODO: propagate path
-		return newScalarNode(ctx, nil, assertion)
+		return newScalarNode(ctx, path, assertion)
 	}
 }
 

diff --git a/pkg/matching/match.go b/pkg/matching/match.go
@@ -48,7 +48,7 @@ func MatchAssert(ctx context.Context, path *field.Path, match *v1alpha1.Assert,
 			var fails []Result
 			path := path.Child("any")
 			for i, assertion := range match.Any {
-				parsed, err := assert.Parse(ctx, assertion.Check.Value)
+				parsed, err := assert.Parse(ctx, path.Index(i).Child("check"), assertion.Check.Value)
 				if err != nil {
 					return fails, err
 				}
@@ -76,7 +76,7 @@ func MatchAssert(ctx context.Context, path *field.Path, match *v1alpha1.Assert,
 			var fails []Result
 			path := path.Child("all")
 			for i, assertion := range match.All {
-				parsed, err := assert.Parse(ctx, assertion.Check.Value)
+				parsed, err := assert.Parse(ctx, path.Index(i).Child("check"), assertion.Check.Value)
 				if err != nil {
 					return fails, err
 				}
@@ -126,7 +126,7 @@ func Match(ctx context.Context, path *field.Path, match *v1alpha1.Match, actual
 func MatchAny(ctx context.Context, path *field.Path, assertions []v1alpha1.Any, actual any, bindings binding.Bindings, opts ...template.Option) (field.ErrorList, error) {
 	var errs field.ErrorList
 	for i, assertion := range assertions {
-		parsed, err := assert.Parse(ctx, assertion.Value)
+		parsed, err := assert.Parse(ctx, path.Index(i), assertion.Value)
 		if err != nil {
 			return errs, err
 		}
@@ -145,7 +145,7 @@ func MatchAny(ctx context.Context, path *field.Path, assertions []v1alpha1.Any,
 func MatchAll(ctx context.Context, path *field.Path, assertions []v1alpha1.Any, actual any, bindings binding.Bindings, opts ...template.Option) (field.ErrorList, error) {
 	var errs field.ErrorList
 	for i, assertion := range assertions {
-		parsed, err := assert.Parse(ctx, assertion.Value)
+		parsed, err := assert.Parse(ctx, path.Index(i), assertion.Value)
 		if err != nil {
 			return errs, err
 		}