-
Notifications
You must be signed in to change notification settings - Fork 116
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
Fix diff panic for malformed kubeconfig #1581
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -106,7 +106,7 @@ func parseKubeconfigPropertyValue(kubeconfig resource.PropertyValue) (*clientapi | |
|
||
// getActiveClusterFromConfig gets the current cluster from a kubeconfig, accounting for provider overrides. | ||
func getActiveClusterFromConfig(config *clientapi.Config, overrides resource.PropertyMap) *clientapi.Cluster { | ||
if len(config.Clusters) == 0 { | ||
if config == nil || len(config.Clusters) == 0 { | ||
return &clientapi.Cluster{} | ||
} | ||
|
||
|
@@ -115,12 +115,19 @@ func getActiveClusterFromConfig(config *clientapi.Config, overrides resource.Pro | |
currentContext = val.StringValue() | ||
} | ||
|
||
activeClusterName := config.Contexts[currentContext].Cluster | ||
activeContext := config.Contexts[currentContext] | ||
if activeContext == nil { | ||
return &clientapi.Cluster{} | ||
} | ||
activeClusterName := activeContext.Cluster | ||
|
||
activeCluster := config.Clusters[activeClusterName] | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can the same issue occur here as well? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Looks like it. Good catch. |
||
if val := overrides["cluster"]; !val.IsNull() { | ||
activeCluster = config.Clusters[val.StringValue()] | ||
} | ||
if activeCluster == nil { | ||
return &clientapi.Cluster{} | ||
} | ||
|
||
return activeCluster | ||
} |
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
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.
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.
This means we don't report up a useful error about what caused this. Should this function return a useful error?
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.
I'm not sure it's possible to tell if this is actually an error since this runs during preview and Outputs may not yet be fully resolved. I suspect that it might lead to erroneous warnings.
This particular case was a bit odd because the outdented YAML still parsed cleanly, but changed the semantics of the configuration. This change fixes the panic, and now correctly shows a replacement in the preview. This should be sufficient for a user to notice that something is going wrong if they weren't expecting a change.