Fix list plugins backward compatibility mechanism #5913
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
briankassouf
reviewed
Dec 6, 2018
| @@ -46,22 +46,14 @@ func (c *Sys) ListPlugins(i *ListPluginsInput) (*ListPluginsResponse, error) { | |||
| ctx, cancelFunc := context.WithCancel(context.Background()) | |||
| defer cancelFunc() | |||
| resp, err := c.c.RawRequestWithContext(ctx, req) | |||
| if err != nil { | |||
| if err != nil && resp == nil { | |||
There was a problem hiding this comment.
If resp == nil we will panic below when we call resp.StatusCode. I think this logic needs reworked a bit, maybe we can check the StatusCode here (if resp != nil) and if it's a 405 continue, otherwise return the error
There was a problem hiding this comment.
From looking at the code of RawRequestWithContext I can say, that resp is always set if there is no error returned.
1 task
|
Going to merge and address concerns after, thanks! |
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.
In this PR I'm trying to fix the backward compatibility mechanism of the ListPlugins API call, the error checking was too early, and the HTTP 405 detection never happened (which happens to work really nice actually).