HADOOP-18980. S3A credential provider remapping: make extensible #6406
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
|
Tested against
|
|
💔 -1 overall
This message was automatically generated. |
|
💔 -1 overall
This message was automatically generated. |
|
@steveloughran could you please review this PR? |
|
🎊 +1 overall
This message was automatically generated. |
|
@mukund-thakur could you please review this PR if you have bandwidth? |
steveloughran
requested changes
Jan 25, 2024
| @@ -68,6 +68,10 @@ private Constants() { | |||
| public static final String AWS_CREDENTIALS_PROVIDER = | |||
| "fs.s3a.aws.credentials.provider"; | |||
|
|
|||
| // aws credentials providers mapping with key/value pairs | |||
There was a problem hiding this comment.
nit: javadocs with @value
| @@ -233,6 +236,11 @@ public static AWSCredentialProviderList buildAWSProviderList( | |||
| key, className, mapped); | |||
| className = mapped; | |||
| } | |||
| if (awsCredsMappedClasses != null && awsCredsMappedClasses.containsKey(className)) { | |||
There was a problem hiding this comment.
make an else unless we really want to support remapping of the standard map to different values. Which I suppose we might...
| @@ -233,6 +236,11 @@ public static AWSCredentialProviderList buildAWSProviderList( | |||
| key, className, mapped); | |||
| className = mapped; | |||
| } | |||
| if (awsCredsMappedClasses != null && awsCredsMappedClasses.containsKey(className)) { | |||
| final String mapped = awsCredsMappedClasses.get(className); | |||
| LOG_REMAPPED_ENTRY.info("Credential entry {} is mapped to {}", className, mapped); | |||
| ASSUMED_ROLE_CREDENTIALS_PROVIDER, | ||
| new ArrayList<>(), | ||
| new HashSet<>()); | ||
| assertEquals("Credentials not matching", 3, credentials.size()); |
| AWS_CREDENTIALS_PROVIDER, | ||
| new ArrayList<>(), | ||
| new HashSet<>()); | ||
| assertEquals("Credentials not matching", 4, credentials.size()); |
There was a problem hiding this comment.
assertJ. It's predictable I'll expect these, save time by embracing the api
There was a problem hiding this comment.
It's really good one, API rich, gives nice error msg. I really wish to start using it for all other projects too.
Some don't even use "error msg string for AssertionError" for assertEquals etc, making flaky tests debugging annoying at times.
There was a problem hiding this comment.
I like its collection assertion reporting, as well as other things. If you look at IOStatisticAssertions you can also see how it is possible to write new ones
There was a problem hiding this comment.
Indeed, IOStatisticAssertions is another level :)
|
Addressed all comments. |
|
🎊 +1 overall
This message was automatically generated. |
|
🎊 +1 overall
This message was automatically generated. |
|
🎊 +1 overall
This message was automatically generated. |
4 tasks
|
I still need to remove the utility from conf and use StringUtils directly in aws module. |
This is done in the latest revision. |
|
🎊 +1 overall
This message was automatically generated. |
|
🎊 +1 overall
This message was automatically generated. |
| conf.set("custom_key", ""); | ||
| Map<String, String> splitMap = | ||
| conf.getTrimmedStringCollectionSplitByEquals("custom_key"); | ||
| Assertions |
There was a problem hiding this comment.
use
assertThat(splitMap).hasSize(0)
There was a problem hiding this comment.
Done, btw TestConfiguration changes are removed after reverting Configuration class changes as per your previous feedback.
steveloughran
requested changes
Feb 1, 2024
| pair provided by this config. | ||
|
|
||
| For example, if `fs.s3a.aws.credentials.provider.mapping` is set with value: | ||
|
|
There was a problem hiding this comment.
nit: prefer triple backslash over indentation as it allows for us to specify the format.
now: should we actually include this as an XML snippet or not? I'm of mixed feelings here.
There was a problem hiding this comment.
Just tried xml snippet to see how it looks and actually it looks better because now the example is much clear. Please let me know what you think of the latest revision.
| With the above key-value pairs, if `fs.s3a.aws.credentials.provider` specifies | ||
| `com.amazonaws.auth.AnonymousAWSCredentials`, it will be remapped to | ||
| `org.apache.hadoop.fs.s3a.AnonymousAWSCredentialsProvider` by S3A while preparing | ||
| AWS credential provider list. |
There was a problem hiding this comment.
nit: "the AWS credential provider list"
|
🎊 +1 overall
This message was automatically generated. |
|
🎊 +1 overall
This message was automatically generated. |
virajjasani
added a commit
to virajjasani/hadoop
that referenced
this pull request
Feb 2, 2024
…che#6406) Contributed by Viraj Jasani
|
branch-3.4 backport PR: #6525 |
jiajunmao
pushed a commit
to jiajunmao/hadoop-MLEC
that referenced
this pull request
Feb 6, 2024
…che#6406) Contributed by Viraj Jasani
steveloughran
pushed a commit
that referenced
this pull request
Feb 9, 2024
Contributed by Viraj Jasani
slfan1989
pushed a commit
that referenced
this pull request
Feb 10, 2024
Contributed by Viraj Jasani
steveloughran
pushed a commit
that referenced
this pull request
Mar 26, 2024
…als (ADDENDUM) (#6546) This is a followup to #6406: HADOOP-18980. S3A credential provider remapping: make extensible It adds extra validation of key-value pairs in a configuration option, with tests. Contributed by Viraj Jasani
steveloughran
pushed a commit
that referenced
this pull request
Mar 26, 2024
…als (ADDENDUM) (#6546) This is a followup to #6406: HADOOP-18980. S3A credential provider remapping: make extensible It adds extra validation of key-value pairs in a configuration option, with tests. Contributed by Viraj Jasani
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.
Jira: HADOOP-18980