Extract AWS Key from KeyChain instead of using potential null value #19560
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
|
@rjernst Could you look at this one please? |
While I was working on elastic#18703, I discovered a bad behavior when people don't provide AWS key/secret as part as their `elasticsearch.yml` but rely on SysProps or env. variables... In [`InternalAwsS3Service#getClient(...)`](https://github.com/elastic/elasticsearch/blob/d4366f8493ac8d2f7091404ffd346e4f3c0f9af9/plugins/repository-s3/src/main/java/org/elasticsearch/cloud/aws/InternalAwsS3Service.java#L76-L141), we have: ```java Tuple<String, String> clientDescriptor = new Tuple<>(endpoint, account); AmazonS3Client client = clients.get(clientDescriptor); ``` But if people don't provide credentials, `account` is `null`. Even if it actually could work, I think that we should use the `AWSCredentialsProvider` we create later on and extract from it the `account` (AWS KEY actually) and then use it as the second value of the tuple. Closes elastic#19557.
dadoonet
force-pushed
the
pr/19557-extract-aws-key
branch
from
a8aa7e0
to
f8e0557
Compare
|
If nobody objects, I'll merge this PR next week. |
|
LGTM |
clintongormley
added
:Distributed/Snapshot/Restore
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.
While I was working on #18703, I discovered a bad behavior when people don't provide AWS key/secret as part as their
elasticsearch.ymlbut rely on SysProps or env. variables...In
InternalAwsS3Service#getClient(...), we have:But if people don't provide credentials,
accountisnull.Even if it actually could work, I think that we should use the
AWSCredentialsProviderwe create later on and extract from it theAWS keyand then use it as the second value of the tuple.Closes #19557.