-
Notifications
You must be signed in to change notification settings - Fork 9.1k
HADOOP-19050. Add S3 Access Grants Support in S3A #6544
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
steveloughran
merged 5 commits into
apache:trunk
from
adnanhemani:HADOOP-19050_add_s3_access_grants_support
Mar 19, 2024
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
1073428
HADOOP-19050. Add S3 Access Grants Support in S3A
adnanhemani 369d0d8
add empty line at bottom of file
adnanhemani 5ff42de
PR Revision 1
adnanhemani 67c0d84
PR Revision 2; Various review items
adnanhemani 3cfb18e
PR Revision 2
adnanhemani File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -494,6 +494,11 @@ public class S3AFileSystem extends FileSystem implements StreamCapabilities, | |
*/ | ||
private String configuredRegion; | ||
|
||
/** | ||
* Are S3 Access Grants Enabled? | ||
*/ | ||
private boolean s3AccessGrantsEnabled; | ||
|
||
/** Add any deprecated keys. */ | ||
@SuppressWarnings("deprecation") | ||
private static void addDeprecatedKeys() { | ||
|
@@ -747,6 +752,7 @@ public void initialize(URI name, Configuration originalConf) | |
optimizedCopyFromLocal = conf.getBoolean(OPTIMIZED_COPY_FROM_LOCAL, | ||
OPTIMIZED_COPY_FROM_LOCAL_DEFAULT); | ||
LOG.debug("Using optimized copyFromLocal implementation: {}", optimizedCopyFromLocal); | ||
s3AccessGrantsEnabled = conf.getBoolean(AWS_S3_ACCESS_GRANTS_ENABLED, false); | ||
} catch (SdkException e) { | ||
// amazon client exception: stop all services then throw the translation | ||
cleanupWithLogger(LOG, span); | ||
|
@@ -5516,6 +5522,10 @@ public boolean hasPathCapability(final Path path, final String capability) | |
case FIPS_ENDPOINT: | ||
return fipsEnabled; | ||
|
||
// is S3 Access Grants enabled | ||
case AWS_S3_ACCESS_GRANTS_ENABLED: | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. our bucket-info command has a list of capabilities to probe for -add this to the list |
||
return s3AccessGrantsEnabled; | ||
|
||
default: | ||
return super.hasPathCapability(p, cap); | ||
} | ||
|
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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.