You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by vv...@apache.org on 2016/07/25 17:26:27 UTC
[41/50] [abbrv] hadoop git commit: HADOOP-13389
TestS3ATemporaryCredentials.testSTS error when using IAM credentials.
Contributed by Steven K. Wong
HADOOP-13389 TestS3ATemporaryCredentials.testSTS error when using IAM credentials. Contributed by Steven K. Wong
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7052ca88
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7052ca88
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7052ca88
Branch: refs/heads/YARN-3926
Commit: 7052ca8804b2c69022cf7cfc6b95f21aee3c3640
Parents: b79ba4f
Author: Steve Loughran <st...@apache.org>
Authored: Sat Jul 23 17:58:46 2016 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Sat Jul 23 18:00:08 2016 +0100
----------------------------------------------------------------------
.../fs/s3a/TestS3ATemporaryCredentials.java | 24 +++++++++-----------
1 file changed, 11 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/7052ca88/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/TestS3ATemporaryCredentials.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/TestS3ATemporaryCredentials.java b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/TestS3ATemporaryCredentials.java
index be5c599..2d45bcc 100644
--- a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/TestS3ATemporaryCredentials.java
+++ b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/TestS3ATemporaryCredentials.java
@@ -19,10 +19,10 @@
package org.apache.hadoop.fs.s3a;
import java.io.IOException;
+import java.net.URI;
import com.amazonaws.auth.AWSCredentials;
-import com.amazonaws.auth.AWSCredentialsProviderChain;
-import com.amazonaws.auth.InstanceProfileCredentialsProvider;
+import com.amazonaws.auth.AWSCredentialsProvider;
import com.amazonaws.services.securitytoken.AWSSecurityTokenServiceClient;
import com.amazonaws.services.securitytoken.model.GetSessionTokenRequest;
import com.amazonaws.services.securitytoken.model.GetSessionTokenResult;
@@ -31,6 +31,7 @@ import com.amazonaws.services.securitytoken.model.Credentials;
import org.apache.hadoop.fs.contract.AbstractFSContract;
import org.apache.hadoop.fs.contract.AbstractFSContractTestBase;
import org.apache.hadoop.fs.contract.s3a.S3AContract;
+import org.apache.hadoop.fs.s3native.S3xLoginHelper;
import org.apache.hadoop.conf.Configuration;
import org.junit.Test;
@@ -54,9 +55,6 @@ public class TestS3ATemporaryCredentials extends AbstractFSContractTestBase {
private static final Logger LOG =
LoggerFactory.getLogger(TestS3ATemporaryCredentials.class);
- private S3AFileSystem fs;
-
-
private static final String PROVIDER_CLASS =
"org.apache.hadoop.fs.s3a.TemporaryAWSCredentialsProvider";
@@ -84,15 +82,15 @@ public class TestS3ATemporaryCredentials extends AbstractFSContractTestBase {
skip("STS functional tests disabled");
}
- String parentAccessKey = conf.getTrimmed(ACCESS_KEY, null);
- String parentSecretKey = conf.getTrimmed(SECRET_KEY, null);
- String stsEndpoint = conf.getTrimmed(TEST_STS_ENDPOINT, "");
- AWSCredentialsProviderChain parentCredentials;
- parentCredentials = new AWSCredentialsProviderChain(
- new BasicAWSCredentialsProvider(parentAccessKey, parentSecretKey),
- new InstanceProfileCredentialsProvider()
- );
+ S3xLoginHelper.Login login = S3AUtils.getAWSAccessKeys(
+ URI.create("s3a://foobar"), conf);
+ if (!login.hasLogin()) {
+ skip("testSTS disabled because AWS credentials not configured");
+ }
+ AWSCredentialsProvider parentCredentials = new BasicAWSCredentialsProvider(
+ login.getUser(), login.getPassword());
+ String stsEndpoint = conf.getTrimmed(TEST_STS_ENDPOINT, "");
AWSSecurityTokenServiceClient stsClient;
stsClient = new AWSSecurityTokenServiceClient(parentCredentials);
if (!stsEndpoint.isEmpty()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org