Fixed aws.ConfigFromURL() when URL contains @ but no user/pass #198
Conversation
This file contains hidden or 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
Signed-off-by: Marco Pracucci <[email protected]>
pracucci
commented
Aug 28, 2020
| assert.Equal(t, "", tc.expectedKey) | ||
| assert.Equal(t, "", tc.expectedSecret) | ||
| if tc.expectedKey == "" && tc.expectedSecret == "" { | ||
| assert.Nil(t, cfg.Credentials) |
There was a problem hiding this comment.
I changed this assertion to ensure that cfg.Credentials are not set at all when we expect no key and secret.
pracucci
commented
Aug 28, 2020
| require.NotNil(t, cfg.Endpoint) | ||
| assert.Equal(t, tc.expectedEp, *cfg.Endpoint) | ||
| } else { | ||
| assert.Nil(t, cfg.Endpoint) |
There was a problem hiding this comment.
If we expect no endpoint, we should make sure it's not set.
|
LGTM thanks Marco! |
3 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Starting from an issue opened in Cortex cortexproject/cortex#3034, I've realised an edge case in
aws.ConfigFromURL(). If the URL is in the formatscheme://@host/path, the static credentials are configured in the S3 config but with an empty ID / secret, because no user/pass is specified in the URL before the@.In this PR I'm proposing a fix for that.