HADOOP-11670. Regression: s3a auth setup broken. (Adam Budde via stevel)
This commit is contained in:
parent
608ebd52ba
commit
64443490d7
|
@ -1050,6 +1050,8 @@ Release 2.7.0 - UNRELEASED
|
|||
HADOOP-11674. oneByteBuf in CryptoInputStream and CryptoOutputStream
|
||||
should be non static. (Sean Busbey via yliu)
|
||||
|
||||
HADOOP-11670. Regression: s3a auth setup broken. (Adam Budde via stevel)
|
||||
|
||||
Release 2.6.1 - UNRELEASED
|
||||
|
||||
INCOMPATIBLE CHANGES
|
||||
|
|
|
@ -18,8 +18,12 @@
|
|||
|
||||
package org.apache.hadoop.fs.s3a;
|
||||
|
||||
|
||||
public class Constants {
|
||||
// s3 access key
|
||||
public static final String ACCESS_KEY = "fs.s3a.access.key";
|
||||
|
||||
// s3 secret key
|
||||
public static final String SECRET_KEY = "fs.s3a.secret.key";
|
||||
|
||||
// number of simultaneous connections to s3
|
||||
public static final String MAXIMUM_CONNECTIONS = "fs.s3a.connection.maximum";
|
||||
|
|
|
@ -32,8 +32,6 @@ import java.util.concurrent.ThreadPoolExecutor;
|
|||
import java.util.concurrent.TimeUnit;
|
||||
import java.util.concurrent.atomic.AtomicInteger;
|
||||
|
||||
import org.apache.hadoop.fs.s3.S3Credentials;
|
||||
|
||||
import com.amazonaws.AmazonClientException;
|
||||
import com.amazonaws.AmazonServiceException;
|
||||
import com.amazonaws.ClientConfiguration;
|
||||
|
@ -159,12 +157,22 @@ public class S3AFileSystem extends FileSystem {
|
|||
this.getWorkingDirectory());
|
||||
|
||||
// Try to get our credentials or just connect anonymously
|
||||
S3Credentials s3Credentials = new S3Credentials();
|
||||
s3Credentials.initialize(name, conf);
|
||||
String accessKey = conf.get(ACCESS_KEY, null);
|
||||
String secretKey = conf.get(SECRET_KEY, null);
|
||||
|
||||
String userInfo = name.getUserInfo();
|
||||
if (userInfo != null) {
|
||||
int index = userInfo.indexOf(':');
|
||||
if (index != -1) {
|
||||
accessKey = userInfo.substring(0, index);
|
||||
secretKey = userInfo.substring(index + 1);
|
||||
} else {
|
||||
accessKey = userInfo;
|
||||
}
|
||||
}
|
||||
|
||||
AWSCredentialsProviderChain credentials = new AWSCredentialsProviderChain(
|
||||
new BasicAWSCredentialsProvider(s3Credentials.getAccessKey(),
|
||||
s3Credentials.getSecretAccessKey()),
|
||||
new BasicAWSCredentialsProvider(accessKey, secretKey),
|
||||
new InstanceProfileCredentialsProvider(),
|
||||
new AnonymousAWSCredentialsProvider()
|
||||
);
|
||||
|
|
|
@ -141,12 +141,12 @@ If you do any of these: change your credentials immediately!
|
|||
### Authentication properties
|
||||
|
||||
<property>
|
||||
<name>fs.s3a.awsAccessKeyId</name>
|
||||
<name>fs.s3a.access.key</name>
|
||||
<description>AWS access key ID. Omit for Role-based authentication.</description>
|
||||
</property>
|
||||
|
||||
<property>
|
||||
<name>fs.s3a.awsSecretAccessKey</name>
|
||||
<name>fs.s3a.secret.key</name>
|
||||
<description>AWS secret key. Omit for Role-based authentication.</description>
|
||||
</property>
|
||||
|
||||
|
@ -411,13 +411,13 @@ Example:
|
|||
</property>
|
||||
|
||||
<property>
|
||||
<name>fs.s3a.awsAccessKeyId</name>
|
||||
<name>fs.s3a.access.key</name>
|
||||
<description>AWS access key ID. Omit for Role-based authentication.</description>
|
||||
<value>DONOTPCOMMITTHISKEYTOSCM</value>
|
||||
<value>DONOTCOMMITTHISKEYTOSCM</value>
|
||||
</property>
|
||||
|
||||
<property>
|
||||
<name>fs.s3a.awsSecretAccessKey</name>
|
||||
<name>fs.s3a.secret.key</name>
|
||||
<description>AWS secret key. Omit for Role-based authentication.</description>
|
||||
<value>DONOTEVERSHARETHISSECRETKEY!</value>
|
||||
</property>
|
||||
|
|
Loading…
Reference in New Issue