Fix import for Provider using server-side diff #1872
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
lblackstone
force-pushed
the
lblackstone/ss-import-fix
branch
from
0353fec
to
df3baaa
Compare
Does the PR have any schema changes?Looking good! No breaking changes found. |
viveklak
reviewed
Jan 18, 2022
| @@ -2552,6 +2552,9 @@ func (k *kubeProvider) tryServerSidePatch(oldInputs, newInputs *unstructured.Uns | |||
| return nil, nil, false | |||
| } | |||
| } | |||
| if err != nil { | |||
| return nil, nil, false | |||
| } | |||
There was a problem hiding this comment.
Should we add an integration test?
There was a problem hiding this comment.
I worked on this for awhile today, but can't figure out a reasonable way to test with our existing framework since the bug is specific to using the CLI import command. Since the fix is just handling an unhandled error case, I'm going to defer automated testing for now. I verified the fix manually.
viveklak
approved these changes
Jan 18, 2022
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.
Proposed changes
Related issues (optional)
Fix #1849