Skip to content
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.

Sign up for GitHub

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

Jump to bottom

fix: handle nil ParseableType from GVKParser #574

Merged
merged 2 commits into from
May 9, 2024
Merged

fix: handle nil ParseableType from GVKParser #574

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
32c718e
fix: handle nil ParseableType from GVKParser
leoluz May 9, 2024
c13e6d5
address review comments
leoluz May 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions pkg/diff/diff.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@todaywasawesome This is an internal error message but I agree with making it a bit more clear. I added a small modification.
PTAL

}

typedPredictedLive, err := pt.FromUnstructured(predictedLive.Object)
if err != nil {
return nil, fmt.Errorf("error converting predicted live state from unstructured to %s: %w", gvk, err)
Expand Down Expand Up @@ -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)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@todaywasawesome This is an internal error message but I agree with making it a bit more clear. I added a small modification.
PTAL

}

// Build typed value from live and config unstructures
tvLive, err := pt.FromUnstructured(p.live.Object)
Expand Down
Loading