Repository: hadoop Updated Branches: refs/heads/branch-3.1 dd70b1f53 -> 3f35946c6
HADOOP-15781. S3A assumed role tests failing due to changed error text in AWS exceptions. Contributed by Steve Loughran This is a subset of c07715e37895a2e406 to track changes in the AWS STS error messages. If the later AWS SDK is ever backported to older branches, the rest of that patch will need cherry-picking Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3f35946c Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3f35946c Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3f35946c Branch: refs/heads/branch-3.1 Commit: 3f35946c6eaa3b3214dadfa414364743035d2144 Parents: dd70b1f Author: Steve Loughran <[email protected]> Authored: Thu Nov 1 12:52:48 2018 +0000 Committer: Steve Loughran <[email protected]> Committed: Thu Nov 1 12:52:48 2018 +0000 ---------------------------------------------------------------------- .../java/org/apache/hadoop/fs/s3a/auth/ITestAssumeRole.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/3f35946c/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/auth/ITestAssumeRole.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/auth/ITestAssumeRole.java b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/auth/ITestAssumeRole.java index c6985b0..c2501ef 100644 --- a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/auth/ITestAssumeRole.java +++ b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/auth/ITestAssumeRole.java @@ -61,6 +61,7 @@ import static org.apache.hadoop.fs.s3a.auth.RoleTestUtils.*; import static org.apache.hadoop.fs.s3a.auth.RoleModel.*; import static org.apache.hadoop.fs.s3a.auth.RolePolicies.*; import static org.apache.hadoop.fs.s3a.auth.RoleTestUtils.forbidden; +import static org.apache.hadoop.test.GenericTestUtils.assertExceptionContains; import static org.apache.hadoop.test.LambdaTestUtils.*; /** @@ -148,7 +149,7 @@ public class ITestAssumeRole extends AbstractS3ATestBase { Configuration conf = new Configuration(); conf.set(ASSUMED_ROLE_ARN, ROLE_ARN_EXAMPLE); interceptClosing(AWSSecurityTokenServiceException.class, - E_BAD_ROLE, + "", () -> new AssumedRoleCredentialProvider(uri, conf)); } @@ -157,8 +158,7 @@ public class ITestAssumeRole extends AbstractS3ATestBase { describe("Attemnpt to create the FS with an invalid ARN"); Configuration conf = createAssumedRoleConfig(); conf.set(ASSUMED_ROLE_ARN, ROLE_ARN_EXAMPLE); - expectFileSystemCreateFailure(conf, AccessDeniedException.class, - E_BAD_ROLE); + expectFileSystemCreateFailure(conf, AccessDeniedException.class, ""); } @Test @@ -284,7 +284,6 @@ public class ITestAssumeRole extends AbstractS3ATestBase { () -> new AssumedRoleCredentialProvider(uri, conf)); } - @Test public void testAssumeRoleCreateFS() throws IOException { describe("Create an FS client with the role and do some basic IO"); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
