Fix marshalling of URL wrapper with nil value. #303
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
|
(This is currently blocking cortexproject/cortex#4237) |
pstibrany
force-pushed
the
marshalling-url-wrapper-with-nil
branch
from
3e36c22
to
0f50e0c
Compare
Added unit tests documenting unmarshalling. Signed-off-by: Peter Štibraný <pstibrany@gmail.com>
pstibrany
force-pushed
the
marshalling-url-wrapper-with-nil
branch
from
0f50e0c
to
558a787
Compare
|
Based on discussion in prometheus/alertmanager#2607, I've removed changes to unmarshalling in this PR, but still added unit tests documenting the current behaviour. |
stevesg
approved these changes
Jun 3, 2021
| @@ -130,7 +130,7 @@ func (u URL) MarshalJSON() ([]byte, error) { | |||
| if u.URL != nil { | |||
| return json.Marshal(u.URL.String()) | |||
| } | |||
| return nil, nil | |||
| return []byte("null"), nil | |||
There was a problem hiding this comment.
[uber-nit] This might seem like a crazy idea, but we could save hard-coding the null by marshaling nil:
Suggested change
| return []byte("null"), nil | |
| return json.Marshal(nil) |
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.
MarshalJSONmust return valid JSON. This PR fixes marshalling ofconfig.URLwrapper values withnilvalue. It now returnsnull.This PR also changes unmarshalling of(removed from this PR)nullor""JSON strings into URL: in both cases, wrapper withnilvalue is returned.Related to prometheus/alertmanager#2607