Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,8 @@

/**
* Utility methods for S3A code.
* Some methods are marked LimitedPrivate since they are being used in an
* external project.
*/
@InterfaceAudience.Private
@InterfaceStability.Evolving
Expand Down Expand Up @@ -884,6 +886,8 @@ public static String lookupPassword(
/**
* Get a password from a configuration, including JCEKS files, handling both
* the absolute key and bucket override.
* <br>
* <i>Note:</i> LimitedPrivate for ranger repository to get secrets.
* @param bucket bucket or "" if none known
* @param conf configuration
* @param baseKey base key to look up, e.g "fs.s3a.secret.key"
Expand All @@ -894,6 +898,7 @@ public static String lookupPassword(
* @throws IOException on any IO problem
* @throws IllegalArgumentException bad arguments
*/
@InterfaceAudience.LimitedPrivate("Ranger")
public static String lookupPassword(
String bucket,
Configuration conf,
Expand Down Expand Up @@ -1152,10 +1157,15 @@ private static Method getFactoryMethod(Class<?> cl, Class<?> returnType,
* This method does not propagate security provider path information from
* the S3A property into the Hadoop common provider: callers must call
* {@link #patchSecurityCredentialProviders(Configuration)} explicitly.
*
* <br>
* <i>Note:</i> LimitedPrivate for ranger repository to set up
* per-bucket configurations.
* @param source Source Configuration object.
* @param bucket bucket name. Must not be empty.
* @return a (potentially) patched clone of the original.
*/
@InterfaceAudience.LimitedPrivate("Ranger")
public static Configuration propagateBucketOptions(Configuration source,
String bucket) {

Expand Down Expand Up @@ -1351,13 +1361,16 @@ private static void initProtocolSettings(Configuration conf,
/**
* Initializes AWS SDK proxy support in the AWS client configuration
* if the S3A settings enable it.
* <br>
* <i>Note:</i> LimitedPrivate to provide proxy support in ranger repository.
*
* @param conf Hadoop configuration
* @param bucket Optional bucket to use to look up per-bucket proxy secrets
* @param awsConf AWS SDK configuration to update
* @throws IllegalArgumentException if misconfigured
* @throws IOException problem getting username/secret from password source.
*/
@InterfaceAudience.LimitedPrivate("Ranger")
public static void initProxySupport(Configuration conf,
String bucket,
ClientConfiguration awsConf) throws IllegalArgumentException,
Expand Down