Fix scheme required for webhook url in amtool #3509
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
| @@ -168,3 +168,36 @@ receivers: | |||
| t.Errorf("Incorrect number of silences queried, expected: %v, actual: %v", expectedSils, len(sils)) | |||
| } | |||
| } | |||
|
|
|||
| func TestRoutesShow(t *testing.T) { | |||
There was a problem hiding this comment.
Revert the fix and this test fails:
--- FAIL: TestRoutesShow (1.09s)
cli_test.go:202: amtool: error: scheme required for webhook url
cli_test.go:203:
Error Trace: /Users/grobinson/go/src/github.com/prometheus/alertmanager/test/cli/acceptance/cli_test.go:203
Error: Received unexpected error:
exit status 1
Test: TestRoutesShow
FAIL
| @@ -503,11 +503,6 @@ func (c *WebhookConfig) UnmarshalYAML(unmarshal func(interface{}) error) error { | |||
| if c.URL != nil && c.URLFile != "" { | |||
| return fmt.Errorf("at most one of url & url_file must be configured") | |||
| } | |||
| if c.URL != nil { | |||
There was a problem hiding this comment.
We think this is duplicate code as SecretURL is just a URL, whose UnmarshalYaml function also calls parseURL which contains the same check.
|
Thanks! I'd be inclined to have the fix in the release-0.26 branch. |
grobinson-grafana
changed the title
This commit fixes issue prometheus#3505 where amtool would fail with "error: scheme required for webhook url" when using amtool with --alertmanager.url. The issue here is that UnmarshalYaml for WebhookConfig checks if the scheme is present when c.URL is non-nil. However, UnmarshalYaml for SecretURL returns a non-nil, default value url.URL{} if the response from api/v2/status contains <secret> as the webhook URL. Signed-off-by: George Robinson <[email protected]>
grobinson-grafana
force-pushed
the
grobinson/fix-webhook-configs
branch
from
3e63325
to
b6cdd41
Compare
|
Apologies for the force push, there was a spelling mistake in the commit message. |
I believe this warrants a 0.26.1. |
gotjosh
reviewed
Sep 5, 2023
| func (am *Alertmanager) showRouteCommand() ([]byte, error) { | ||
| amURLFlag := "--alertmanager.url=" + am.getURL("/") | ||
| args := []string{amURLFlag, "config", "routes", "show"} | ||
| cmd := exec.Command(amtool, args...) |
There was a problem hiding this comment.
Can we also add one for config routes test?
Signed-off-by: George Robinson <[email protected]>
gotjosh
approved these changes
Sep 5, 2023
gotjosh
pushed a commit
that referenced
this pull request
Sep 13, 2023
* Fix scheme required for webhook url in amtool This commit fixes issue #3505 where amtool would fail with "error: scheme required for webhook url" when using amtool with --alertmanager.url. The issue here is that UnmarshalYaml for WebhookConfig checks if the scheme is present when c.URL is non-nil. However, UnmarshalYaml for SecretURL returns a non-nil, default value url.URL{} if the response from api/v2/status contains <secret> as the webhook URL. Signed-off-by: George Robinson <[email protected]> * Add test for config routes test Signed-off-by: George Robinson <[email protected]> --------- Signed-off-by: George Robinson <[email protected]>
gotjosh
pushed a commit
that referenced
this pull request
Sep 13, 2023
* Fix scheme required for webhook url in amtool This commit fixes issue #3505 where amtool would fail with "error: scheme required for webhook url" when using amtool with --alertmanager.url. The issue here is that UnmarshalYaml for WebhookConfig checks if the scheme is present when c.URL is non-nil. However, UnmarshalYaml for SecretURL returns a non-nil, default value url.URL{} if the response from api/v2/status contains <secret> as the webhook URL. Signed-off-by: George Robinson <[email protected]> * Add test for config routes test Signed-off-by: George Robinson <[email protected]> --------- Signed-off-by: George Robinson <[email protected]> Signed-off-by: gotjosh <[email protected]>
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.
This commit fixes issue #3505 where amtool would fail with
error: scheme required for webhook urlwhen using amtool with--alertmanager.url.The issue here is that
UnmarshalYamlforWebhookConfigchecks if the scheme is present whenc.URLis non-nil. However,UnmarshalYaml forSecretURLreturns a non-nil, default valueurl.URL{}if the response fromapi/v2/statuscontains<secret>as the webhook URL.