fix: handle nil ParseableType from GVKParser #574
Merged
Conversation
This file contains hidden or 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
Signed-off-by: Leonardo Luz Almeida <[email protected]>
Closed
3 tasks
todaywasawesome
suggested changes
May 9, 2024
pkg/diff/diff.go
Outdated
| @@ -208,6 +208,10 @@ func removeWebhookMutation(predictedLive, live *unstructured.Unstructured, gvkPa | |||
| } | |||
| gvk := predictedLive.GetObjectKind().GroupVersionKind() | |||
| pt := gvkParser.Type(gvk) | |||
| if pt == nil { | |||
| return nil, fmt.Errorf("unable to resolve parseableType for gvk: %s", gvk) | |||
There was a problem hiding this comment.
Suggested change
| return nil, fmt.Errorf("unable to resolve parseableType for gvk: %s", gvk) | |
| return nil, fmt.Errorf("unable to resolve parseableType for gvk (Group Version Kind): %s", gvk) |
I think we can make this a bit more clear.
There was a problem hiding this comment.
@todaywasawesome This is an internal error message but I agree with making it a bit more clear. I added a small modification.
PTAL
pkg/diff/diff.go
Outdated
| @@ -316,6 +320,9 @@ func structuredMergeDiff(p *SMDParams) (*DiffResult, error) { | |||
|
|
|||
| gvk := p.config.GetObjectKind().GroupVersionKind() | |||
| pt := gescheme.ResolveParseableType(gvk, p.gvkParser) | |||
| if pt == nil { | |||
| return nil, fmt.Errorf("unable to resolve parseableType for gvk: %s", gvk) | |||
There was a problem hiding this comment.
Suggested change
| return nil, fmt.Errorf("unable to resolve parseableType for gvk: %s", gvk) | |
| return nil, fmt.Errorf("unable to resolve parseableType for gvk (Group Version Kind): %s", gvk) |
Same
There was a problem hiding this comment.
@todaywasawesome This is an internal error message but I agree with making it a bit more clear. I added a small modification.
PTAL
crenshaw-dev
approved these changes
May 9, 2024
Signed-off-by: Leonardo Luz Almeida <[email protected]>
|
todaywasawesome
approved these changes
May 9, 2024
mpelekh
pushed a commit
to mpelekh/gitops-engine
that referenced
this pull request
Aug 27, 2024
* fix: handle nil ParseableType from GVKParser Signed-off-by: Leonardo Luz Almeida <[email protected]> * address review comments Signed-off-by: Leonardo Luz Almeida <[email protected]> --------- Signed-off-by: Leonardo Luz Almeida <[email protected]>
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.
fix argoproj/argo-cd#18020