Merge pull request #5565 from killianmuldoon/tests/fix-matchers-bug

🐛 Fix Matchers bug on ignored paths and add tests
kubernetes-sigs · Nov 4, 2021 · 572819d · 572819d
2 parents 1b2a319 + f117a6c
commit 572819d
Show file tree

Hide file tree

Showing 2 changed files with 503 additions and 6 deletions.
diff --git a/internal/matchers/matchers.go b/internal/matchers/matchers.go
@@ -126,17 +126,13 @@ func (m *Matcher) calculateDiff(actual interface{}) ([]byte, error) {
 	}
 
 	// Use a mergePatch to produce a diff between the two objects.
-	originalWithModifiedJSON, err := jsonpatch.MergePatch(originalJSON, actualJSON)
-	if err != nil {
-		return nil, err
-	}
-	rawDiff, err := jsonpatch.CreateMergePatch(originalJSON, originalWithModifiedJSON)
+	diff, err := jsonpatch.CreateMergePatch(originalJSON, actualJSON)
 	if err != nil {
 		return nil, err
 	}
 
 	// Filter the diff according to the rules attached to the Matcher.
-	diff, err := filterDiff(rawDiff, m.options.allowPaths, m.options.ignorePaths)
+	diff, err = filterDiff(diff, m.options.allowPaths, m.options.ignorePaths)
 	if err != nil {
 		return nil, err
 	}