feat:validate proxyURL for alertManagerCfg (#6466) #6481
+136
−0
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
afzal442
reviewed
Apr 10, 2024
pkg/alertmanager/amcfg.go
Outdated
| @@ -1724,6 +1724,11 @@ func (hc *httpClientConfig) sanitize(amVersion semver.Version, logger log.Logger | |||
| return err | |||
| } | |||
|
|
|||
| if hc.ProxyURL != "" { | |||
| _, err := url.Parse(hc.ProxyURL) | |||
There was a problem hiding this comment.
taking the idea of validation on proxyurl obj of oauth2 type would be better.
prometheus-operator/pkg/alertmanager/amcfg.go
Lines 1783 to 1785 in 4664990
There was a problem hiding this comment.
Sorry @afzal442 don't follow what you mean 😄
The code snippet you shared is only about log message.
Could you clarify?
There was a problem hiding this comment.
Aha, I see. I didn't look into that much. Nice caught. Parsing was missing. I think only one extra condition to be met here is !amVersion.GTE(semver.MustParse("0.25.0")). 🤔
|
@simonpasquier done the above change |
|
Here is a short version to get you started: simonpasquier@400c2c5 |
…-operator#6466) validate in convertHttpConfig
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.
Description
fixes: #6466
added validation for proxyURL for alertManagerCfg
Type of change
What type of changes does your code introduce to the Prometheus operator? Put an
xin the box that apply.CHANGE(fix or feature that would cause existing functionality to not work as expected)FEATURE(non-breaking change which adds functionality)BUGFIX(non-breaking change which fixes an issue)ENHANCEMENT(non-breaking change which improves existing functionality)NONE(if none of the other choices apply. Example, tooling, build system, CI, docs, etc.)Verification
written unit test
Changelog entry
Please put a one-line changelog entry below. This will be copied to the changelog file during the release process.