[hadoop] 08/12: updates new providers in TestS3AAWSCredentialsProvider to V2

[stevel]

This is an automated email from the ASF dual-hosted git repository.

stevel pushed a commit to branch feature-HADOOP-18073-s3a-sdk-upgrade
in repository https://gitbox.apache.org/repos/asf/hadoop.git

commit 644a32f9d276d4ae7c7374c245465d1c47602b4f
Author: Ahmar Suhail <ahma...@amazon.co.uk>
AuthorDate: Fri Dec 9 15:06:19 2022 +0000

    updates new providers in TestS3AAWSCredentialsProvider to V2
---
 .../hadoop/fs/s3a/TestS3AAWSCredentialsProvider.java   | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git 
a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/TestS3AAWSCredentialsProvider.java
 
b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/TestS3AAWSCredentialsProvider.java
index 7c3d6d8548b..957db1a038f 100644
--- 
a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/TestS3AAWSCredentialsProvider.java
+++ 
b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/TestS3AAWSCredentialsProvider.java
@@ -34,6 +34,7 @@ import javax.annotation.Nullable;
 
 import com.amazonaws.auth.AWSCredentials;
 import com.amazonaws.auth.AWSCredentialsProvider;
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
 import software.amazon.awssdk.auth.credentials.AwsCredentials;
 import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
 import 
software.amazon.awssdk.auth.credentials.EnvironmentVariableCredentialsProvider;
@@ -482,17 +483,8 @@ public class TestS3AAWSCredentialsProvider {
     }
   }
 
-  private static final AWSCredentials EXPECTED_CREDENTIALS = new 
AWSCredentials() {
-    @Override
-    public String getAWSAccessKeyId() {
-      return "expectedAccessKey";
-    }
-
-    @Override
-    public String getAWSSecretKey() {
-      return "expectedSecret";
-    }
-  };
+  private static final AwsCredentials EXPECTED_CREDENTIALS =
+      AwsBasicCredentials.create("expectedAccessKey", "expectedSecret");
 
   /**
    * Credential provider that takes a long time.
@@ -504,7 +496,7 @@ public class TestS3AAWSCredentialsProvider {
     }
 
     @Override
-    protected AWSCredentials createCredentials(Configuration config) throws 
IOException {
+    protected AwsCredentials createCredentials(Configuration config) throws 
IOException {
       // yield to other callers to induce race condition
       Thread.yield();
       return EXPECTED_CREDENTIALS;
@@ -578,7 +570,7 @@ public class TestS3AAWSCredentialsProvider {
     }
 
     @Override
-    protected AWSCredentials createCredentials(Configuration config) throws 
IOException {
+    protected AwsCredentials createCredentials(Configuration config) throws 
IOException {
       throw new IOException("expected error");
     }
   }


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org