Add nice error message #11859
Merged
Add nice error message #11859
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
| @@ -662,7 +662,7 @@ func postImagesPush(eng *engine.Engine, version version.Version, w http.Response | |||
| } else { | |||
| // the old format is supported for compatibility if there was no authConfig header | |||
| if err := json.NewDecoder(r.Body).Decode(authConfig); err != nil { | |||
| return err | |||
| return fmt.Errorf("Bad parameters and missing X-Registry-Auth") | |||
There was a problem hiding this comment.
I like the idea of a nice error message, but can we include the original error message text too since it might include a clue as to what was wrong with the data that was being decoded?
There was a problem hiding this comment.
Yes, it will be more clear.
|
updated |
Generally, when using Remote API to push images there needs a http Header X-Registry-Auth. For compatibility if there was no authConfig header, everything will be okay if a proper JSON-http-body was applied. But when both X-Registry-Auth Header and the Body are missing, due to the function of decode JSON, it will return an EOF error which was not very clear to user. So I think we can make the respone error be more nice. Signed-off-by: Hu Keping <hukeping@huawei.com>
|
LGTM |
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.
Fixes #9315
Fixes #10983
Generally, when using Remote API to push images there needs a http Header
X-Registry-Auth.
For compatibility if there was no authConfig header, everything will be
okay if a proper JSON-http-body was applied.
But when both X-Registry-Auth Header and the Body are missing, due to
the function of decode JSON, it will return an EOF error which was not
very clear to user.
So I think we can make the respone error be more nice.
Signed-off-by: Hu Keping hukeping@huawei.com