-
Notifications
You must be signed in to change notification settings - Fork 1.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Bump mergo v0.3.8 #2277
Bump mergo v0.3.8 #2277
Conversation
full diff: darccio/mergo@v0.3.7...v0.3.8 includes: - darccio/mergo#112 Add strict override - fixes darccio/mergo#111 WithOverride should be able to check types - darccio/mergo#106 Fix merging of interface types with concrete values - darccio/mergo#120 should not overwrite pointers directly, instead check embedded values - fixes darccio/mergo#114 Embedded struct of pointer types will overwrite the whole destination struct - darccio/mergo#125 added WithOverrideEmptySlice config flag Signed-off-by: Sebastiaan van Stijn <[email protected]>
c261a0f
to
b968f9c
Compare
The linter is complaining 🦁
|
f8c1131
to
4adfad4
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@zappy-shu I know the bump breaks some tests in the cli and you added those 2 transform functions to fix it, but as the code is not that trivial to review and obviously to refactor too, do you think we could add specific tests cases on this part?
4adfad4
to
19e706a
Compare
19e706a
to
20ac8bf
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
@thaJeztah PTAL |
efd54e5
to
b859dd0
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
left one nit about the imports, but otherwise LGTM
b859dd0
to
71f7334
Compare
Added transforms for when merging compose overrides to preserve the functionality that was broken by bumping mergo to v1.3.8 This includes: - Special transform for ulimits so single overrides both soft/hard and the reverse - Special transform for service network configs so the override replaces all aliases Signed-off-by: Nick Adcock <[email protected]>
71f7334
to
4006c42
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
all green; merging! |
- What I did
Bumps mergo from v0.3.7 to v0.3.8
full diff: imdario/[email protected]
includes:
- How I did it
Updated the vendor and added 2 special transforms to handle a change in how pointers in maps are handled in mergo: darccio/mergo@v0.3.7...v0.3.8#diff-a103b5fee5fb31abebf12ee067c01da8R153
These transforms ensure that:
- How to verify it
The existing unit tests cover the special transforms as they have been put in place to preserve the existing functionality
- Description for the changelog
Bumps mergo dependency from v0.3.7 to v0.3.8
- A picture of a cute animal (not mandatory but encouraged)