refactor: introduce matching package in core (#502)

Signed-off-by: Charles-Edouard Brétéché <[email protected]>

pkg/core/assertion/assertion.go

@@ -8,9 +8,9 @@ import (
 
 	"github.com/jmespath-community/go-jmespath/pkg/binding"
 	"github.com/kyverno/kyverno-json/pkg/core/expression"
+	"github.com/kyverno/kyverno-json/pkg/core/matching"
 	"github.com/kyverno/kyverno-json/pkg/core/projection"
 	"github.com/kyverno/kyverno-json/pkg/core/templating"
-	"github.com/kyverno/kyverno-json/pkg/engine/match"
 	reflectutils "github.com/kyverno/kyverno-json/pkg/utils/reflect"
 	"k8s.io/apimachinery/pkg/util/validation/field"
 )
@@ -206,7 +206,7 @@ func parseScalar(assertion any, compiler templating.Compiler) (node, error) {
 			expected = projected
 		}
 		var errs field.ErrorList
-		if match, err := match.Match(expected, value); err != nil {
+		if match, err := matching.Match(expected, value); err != nil {
 			return nil, field.InternalError(path, err)
 		} else if !match {
 			errs = append(errs, field.Invalid(path, value, expectValueMessage(expected)))

pkg/utils/reflect/match.go → pkg/core/matching/equal.go

@@ -1,11 +1,13 @@
-package reflect
+package matching
 
 import (
 	"fmt"
 	"reflect"
+
+	reflectutils "github.com/kyverno/kyverno-json/pkg/utils/reflect"
 )
 
-func MatchScalar(expected, actual any) (bool, error) {
+func Equal(expected, actual any) (bool, error) {
 	if actual == nil && expected == nil {
 		return true, nil
 	} else if actual == nil && expected != nil {
@@ -42,5 +44,5 @@ func MatchScalar(expected, actual any) (bool, error) {
 			return a == e, nil
 		}
 	}
-	return false, fmt.Errorf("types are not comparable, %s - %s", GetKind(expected), GetKind(actual))
+	return false, fmt.Errorf("types are not comparable, %s - %s", reflectutils.GetKind(expected), reflectutils.GetKind(actual))
 }

pkg/engine/match/match.go → pkg/core/matching/match.go

@@ -1,4 +1,4 @@
-package match
+package matching
 
 import (
 	"fmt"
@@ -44,5 +44,5 @@ func Match(expected, actual any) (bool, error) {
 			return true, nil
 		}
 	}
-	return reflectutils.MatchScalar(expected, actual)
+	return Equal(expected, actual)
 }

pkg/utils/reflect/number.go → pkg/core/matching/number.go

@@ -1,4 +1,4 @@
-package reflect
+package matching
 
 import (
 	"reflect"

pkg/utils/reflect/number_test.go → pkg/core/matching/number_test.go

@@ -1,4 +1,4 @@
-package reflect
+package matching
 
 import (
 	"reflect"