remove overwrite from initProvider-forProvider merge #260
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.
Description of your changes
This resolves a TODO left from #237 where during the
spec.initProvider
tospec.forProvider
merge the fields inspec.initProvider
would overwrite thespec.forProvider
ones, insteadof skipping those fields.
Although we would expect and suggest not to set the same fields for both, it still good to fix this behaviour.
To merge the 2, we used mergo, with the option SliceDeepCopy to merge
the slices from initProvider to forProvider.
Looking deeper, we can see the the
mergo.WithSliceDeepCopy
also sets the Overwrite to trueSo simply setting the overwrite to false does the trick.
Fixes #240
I have:
make reviewable
to ensure this PR is ready for review.Addedbackport release-x.y
labels to auto-backport this PR if necessary.How has this code been tested
Extended the unit test to test for overwrites.