Adding a defaultCredentialsProvider for AWS S3 #56
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
| @@ -29,24 +33,26 @@ public class S3PreProcessor<T extends Message> implements PreProcessor<T> { | |||
| private final String region; | |||
| private final String bucket; | |||
| private final @Nullable String textMessageAddition; | |||
| private final StaticCredentialsProvider credentialsProvider; | |||
| private @Nullable StaticCredentialsProvider staticCredentialsProvider; | |||
There was a problem hiding this comment.
should be any reason to remove the final here
There was a problem hiding this comment.
Moved the 2nd assignment to variable in else condition which allows on-time assignment, in turn allowing final
| @@ -75,11 +81,11 @@ public ThreadState<T> run(ThreadState<T> in) { | |||
|
|
|||
| public void sendRequest(byte[] media, String senderID, String extension) { | |||
| String key = senderID + '_' + Instant.now().toEpochMilli() + '.' + extension; | |||
|
|
|||
| AwsCredentialsProvider credentialsProvider = Objects.requireNonNullElse(this.staticCredentialsProvider, DefaultCredentialsProvider.create()); | |||
There was a problem hiding this comment.
why not push this logic up into the constructor so that you don't have to do a null check here?
There was a problem hiding this comment.
Moved this to constructor
added 2 commits
July 11, 2024 13:31
…rovider in a way the variable can be static
| @@ -73,13 +83,12 @@ public ThreadState<T> run(ThreadState<T> in) { | |||
| Identifier.random())); // TODO: remove last message | |||
| } | |||
|
|
|||
| public void sendRequest(byte[] media, String senderID, String extension) { | |||
| public void sendRequest(byte[] media, String senderID, String extension, AwsCredentialsProvider credentials) { | |||
There was a problem hiding this comment.
you shouldn't need to pass the credentials? this should have access to this.credentials
There was a problem hiding this comment.
Fixed it. I was debating making it a local variable and overlooked, but this makes more sense.
hunterjackson
approved these changes
Jul 11, 2024
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.
Since setting up an EC2 instance and loading it with CP4M image would be time consuming, I have manually tested the flow.
Test Cases:
Existing flow with aws credentials in local config file
Result: Works as before
To simulate AWS EC2 instance-like credential behavior, the test uses a specific item in the AWS SDK credentials provider chain: the credentials file located in the local .aws folder. This file occupies the fourth position in the chain. The credentials provided by IAM roles attached to EC2 instances are positioned sixth in this chain
Result: Works by picking the credentials from credentials file
To test a fail case when using defaultCredentialsProvider, deleted the credentials from credentials file in .aws
Result: S3 Client fails with an error
Unable to load credentials from any of the providers in the chain AwsCredentialsProviderChainas expected