From f83f8c8e02757df710c8fed00303cd66f3fb6906 Mon Sep 17 00:00:00 2001
From: Ethan Katnic <ekatnic@amazon.com>
Date: Wed, 21 Aug 2024 08:49:42 -0700
Subject: [PATCH] Upgrade DefaultCredentialsProvider and AwsBasicCredentials to
 AWS SDK v2

---
 .../amazon/kinesis/multilang/MultiLangDaemonConfigTest.java | 4 ++--
 .../multilang/config/KinesisClientLibConfiguratorTest.java  | 6 +++---
 .../src/test/resources/multilang.properties                 | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/amazon-kinesis-client-multilang/src/test/java/software/amazon/kinesis/multilang/MultiLangDaemonConfigTest.java b/amazon-kinesis-client-multilang/src/test/java/software/amazon/kinesis/multilang/MultiLangDaemonConfigTest.java
index de5a1405..8a244ee0 100644
--- a/amazon-kinesis-client-multilang/src/test/java/software/amazon/kinesis/multilang/MultiLangDaemonConfigTest.java
+++ b/amazon-kinesis-client-multilang/src/test/java/software/amazon/kinesis/multilang/MultiLangDaemonConfigTest.java
@@ -65,7 +65,7 @@ public class MultiLangDaemonConfigTest {
         String properties = String.format(
                 "executableName = %s\n"
                         + "applicationName = %s\n"
-                        + "AWSCredentialsProvider = DefaultAWSCredentialsProviderChain\n"
+                        + "AWSCredentialsProvider = DefaultCredentialsProvider\n"
                         + "processingLanguage = malbolge\n"
                         + "regionName = %s\n",
                 EXE, APPLICATION_NAME, "us-east-1");
@@ -182,7 +182,7 @@ public class MultiLangDaemonConfigTest {
     @Test
     public void testPropertyValidation() {
         String propertiesNoExecutableName = "applicationName = testApp \n" + "streamName = fakeStream \n"
-                + "AWSCredentialsProvider = DefaultAWSCredentialsProviderChain\n" + "processingLanguage = malbolge";
+                + "AWSCredentialsProvider = DefaultCredentialsProvider\n" + "processingLanguage = malbolge";
         ClassLoader classLoader = Mockito.mock(ClassLoader.class);
 
         Mockito.doReturn(new ByteArrayInputStream(propertiesNoExecutableName.getBytes()))
diff --git a/amazon-kinesis-client-multilang/src/test/java/software/amazon/kinesis/multilang/config/KinesisClientLibConfiguratorTest.java b/amazon-kinesis-client-multilang/src/test/java/software/amazon/kinesis/multilang/config/KinesisClientLibConfiguratorTest.java
index 4ac6521e..b5c51841 100644
--- a/amazon-kinesis-client-multilang/src/test/java/software/amazon/kinesis/multilang/config/KinesisClientLibConfiguratorTest.java
+++ b/amazon-kinesis-client-multilang/src/test/java/software/amazon/kinesis/multilang/config/KinesisClientLibConfiguratorTest.java
@@ -538,7 +538,7 @@ public class KinesisClientLibConfiguratorTest {
     public static class AlwaysSucceedCredentialsProviderKinesis implements AwsCredentialsProvider {
         @Override
         public AwsCredentials resolveCredentials() {
-            return AwsBasicCredentials.create("", "");
+            return AwsBasicCredentials.create("DUMMY_ACCESS_KEY_ID", "DUMMY_SECRET_ACCESS_KEY");
         }
     }
 
@@ -548,7 +548,7 @@ public class KinesisClientLibConfiguratorTest {
     public static class AlwaysSucceedCredentialsProviderDynamoDB implements AwsCredentialsProvider {
         @Override
         public AwsCredentials resolveCredentials() {
-            return AwsBasicCredentials.create("", "");
+            return AwsBasicCredentials.create("DUMMY_ACCESS_KEY_ID", "DUMMY_SECRET_ACCESS_KEY");
         }
     }
 
@@ -558,7 +558,7 @@ public class KinesisClientLibConfiguratorTest {
     public static class AlwaysSucceedCredentialsProviderCloudWatch implements AwsCredentialsProvider {
         @Override
         public AwsCredentials resolveCredentials() {
-            return AwsBasicCredentials.create("", "");
+            return AwsBasicCredentials.create("DUMMY_ACCESS_KEY_ID", "DUMMY_SECRET_ACCESS_KEY");
         }
     }
 
diff --git a/amazon-kinesis-client-multilang/src/test/resources/multilang.properties b/amazon-kinesis-client-multilang/src/test/resources/multilang.properties
index 34cb0c1a..347d4e8a 100644
--- a/amazon-kinesis-client-multilang/src/test/resources/multilang.properties
+++ b/amazon-kinesis-client-multilang/src/test/resources/multilang.properties
@@ -20,7 +20,7 @@ applicationName = MultiLangTest
 # The DefaultAWSCredentialsProviderChain checks several other providers, which is
 # described here:
 # http://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/com/amazonaws/auth/DefaultAWSCredentialsProviderChain.html
-AWSCredentialsProvider = DefaultAWSCredentialsProviderChain
+AWSCredentialsProvider = DefaultCredentialsProvider
 
 # Appended to the user agent of the KCL. Does not impact the functionality of the
 # KCL in any other way.