馃悰 Fix Matchers bug on ignored paths and add tests #5565
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
k8s-ci-robot
added
area/testing
|
@sbueringer Can you let me know if this fixes the issues you encountered? |
sbueringer
reviewed
Nov 2, 2021
Comment on lines
-129
to
-133
| originalWithModifiedJSON, err := jsonpatch.MergePatch(originalJSON, actualJSON) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| rawDiff, err := jsonpatch.CreateMergePatch(originalJSON, originalWithModifiedJSON) |
There was a problem hiding this comment.
Sorry I did not noticed this before, this is two-ways merge, but we need a plain merge patch like proposed in this change. Good catch
k8s-ci-robot
added
size/XL
killianmuldoon
force-pushed
the
tests/fix-matchers-bug
branch
from
5031e32
to
68948a1
Compare
|
@killianmuldoon Thank you very much! lgtm +/- squash |
Signed-off-by: killianmuldoon <kmuldoon@vmware.com>
killianmuldoon
force-pushed
the
tests/fix-matchers-bug
branch
from
68948a1
to
f117a6c
Compare
k8s-ci-robot
added
the
lgtm
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: fabriziopandini The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
k8s-ci-robot
added
the
approved
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Signed-off-by: killianmuldoon kmuldoon@vmware.com
This PR changes the logic inside the matchers to ensure that any difference in fields between the actual and original object - in either direction - is considered significant for establishing whether the objects are Equal. Previously the matcher did no consider fields in the original object that are not present in the modified object when matching.
This PR also adds unit tests to show the intended usage of the matcher in these, and other cases.
Note: This change significantly modifies the behaviour of the matcher library compared to the mergepatch library used in topology/internal. These changes make #5316 more difficult and less desirable.
Fixes #5563
/area testing