fix changes

Signed-off-by: Shubham Gupta <iamshubhamgupta2001@gmail.com>

pkg/apis/testharness/v1beta1/test_types.go

@@ -166,10 +166,6 @@ type Assert struct {
 }
 
 type Options struct {
-	Kind        string        `json:"kind,omitempty"`
-	ApiVersion  string        `json:"apiVersion,omitempty"`
-	Name        string        `json:"name,omitempty"`
-	Namespace   string        `json:"namespace,omitempty"`
 	AssertArray []AssertArray `json:"arrays,omitempty"`
 }
 
@@ -178,7 +174,9 @@ type AssertArray struct {
 	// Path indicates the location within the YAML file to extract data for verification.
 	Path string `json:"path"`
 	// Strategy defines how the extracted data should be compared against the Kubernetes resource.
-	Strategy Strategy `json:"strategy"`
+	Strategy Strategy          `json:"strategy"`
+	Metadata metav1.ObjectMeta `json:"metadata,omitempty"`
+	metav1.TypeMeta
 }
 
 // UnmarshalJSON implements the json.Unmarshaller interface.

pkg/test/step.go

@@ -432,20 +432,18 @@ func pathMatches(pattern, path string) bool {
 	return wildcard.Match(strings.TrimSuffix(pattern, "/"), path)
 }
 
-func metadataMatches(opt *harness.Options, obj client.Object) bool {
-	if opt.Name != "" && opt.Name != obj.GetName() {
-		return false
-	}
+func metaTypeMatches(assertArray harness.AssertArray, obj client.Object) bool {
+	unstructuredObj := obj.(*unstructured.Unstructured).Object
 
-	if opt.Namespace != "" && opt.Namespace != obj.GetNamespace() {
+	if err := testutils.IsSubset(assertArray.Metadata, unstructuredObj["metadata"], "/", testutils.DefaultStrategyFactory()); err != nil {
 		return false
 	}
 
-	if opt.Kind != "" && opt.Kind != obj.GetObjectKind().GroupVersionKind().Kind {
+	if err := testutils.IsSubset(assertArray.TypeMeta.Kind, unstructuredObj["kind"], "/", testutils.DefaultStrategyFactory()); err != nil {
 		return false
 	}
 
-	if opt.ApiVersion != "" && opt.ApiVersion != obj.GetObjectKind().GroupVersionKind().GroupVersion().String() {
+	if err := testutils.IsSubset(assertArray.TypeMeta.APIVersion, unstructuredObj["apiVersion"], "/", testutils.DefaultStrategyFactory()); err != nil {
 		return false
 	}
 
@@ -456,9 +454,9 @@ func metadataMatches(opt *harness.Options, obj client.Object) bool {
 func NewStrategyFactory(a asserts) func(path string) testutils.ArrayComparisonStrategy {
 	var strategyFactory func(path string) testutils.ArrayComparisonStrategy
 	recursiveStrategyFactory := func(path string) testutils.ArrayComparisonStrategy {
-		if a.options != nil && len(a.options.AssertArray) > 0 && metadataMatches(a.options, a.object) {
+		if a.options != nil && len(a.options.AssertArray) > 0 {
 			for _, assertArr := range a.options.AssertArray {
-				if pathMatches(assertArr.Path, path) {
+				if pathMatches(assertArr.Path, path) && metaTypeMatches(assertArr, a.object) {
 					switch assertArr.Strategy {
 					case harness.StrategyExact:
 						return testutils.StrategyExact(path, strategyFactory)

pkg/test/utils/subset.go

@@ -8,12 +8,12 @@ import (
 type ArrayComparisonStrategyFactory = func(path string) ArrayComparisonStrategy
 type ArrayComparisonStrategy = func(expectedData, actualData interface{}) error
 
-func defaultStrategyFactory() ArrayComparisonStrategyFactory {
+func DefaultStrategyFactory() ArrayComparisonStrategyFactory {
 	return alwaysExact
 }
 
 func alwaysExact(path string) ArrayComparisonStrategy {
-	return StrategyExact(path, defaultStrategyFactory())
+	return StrategyExact(path, DefaultStrategyFactory())
 }
 
 // SubsetError is an error type used by IsSubset for tracking the path in the struct.
@@ -61,7 +61,7 @@ func IsSubset(expected, actual interface{}, currentPath string, strategyFactory
 	switch reflect.TypeOf(expected).Kind() {
 	case reflect.Slice:
 		if strategyFactory == nil {
-			strategyFactory = defaultStrategyFactory()
+			strategyFactory = DefaultStrategyFactory()
 		}
 		strategy := strategyFactory(currentPath)