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.

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

config: fix unmarshalling of secret URLs #1663

Merged
merged 2 commits into from
Dec 13, 2018

Conversation

simonpasquier
Copy link
Member

Closes #1659

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
Copy link
Member

@mxinden mxinden left a comment

Choose a reason for hiding this comment

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

Would you mind adding a comment in the code or in your commit message why you are doing this? E.g. something like

In order to parse a config returned by the Alertmanager API with amtool, `<secret>` needs to be treated specially, as it would not be valid JSON.

Other than that, this looks good to me.

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
@simonpasquier
Copy link
Member Author

Sure, this is done.

@mxinden
Copy link
Member

mxinden commented Dec 13, 2018

Cool, thanks for the quick follow up. Leaving any last comments to @stuartnelson3.

@stuartnelson3 stuartnelson3 merged commit 34f78c9 into prometheus:master Dec 13, 2018
mxinden pushed a commit to mxinden/alertmanager that referenced this pull request Jan 14, 2019
* config: fix unmarshalling of secret URLs

* Add comment describing why we need the special case

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants