Use createAnonymousCredentials() when AnonymousCredentialsProvider is passed in (#3385)

* Adding createAnonymousCredentials

* adding createAnonymousCredentials

* Adding createAnonymousCredentials()

* adding usage of createAnonymousCredentials

* Changelog entry for CRT version bump

* version bump for CRT

* Revert "Merge branch 'master' of github.com:aws/aws-sdk-java-v2 into createAnonymousCredentials"

This reverts commit 7dc8409, reversing
changes made to 3524907.

* Revert "Revert "Merge branch 'master' of github.com:aws/aws-sdk-java-v2 into createAnonymousCredentials""

This reverts commit 6e236eb.

* remove AWSCLIV2.pkg

* Remove public modifier in tests to pass sonar cloud checks

Co-authored-by: Dongie Agnir <[email protected]>

Author: davidh44

.changes/next-release/bugfix-AWSS3-54f8f8c.json

@@ -0,0 +1,7 @@
+{
+    "category": "Amazon S3 Transfer Manager",
+    "contributor": "", 
+    "type": "bugfix", 
+    "description": "Added usage of createAnonymousCredentials to fix issue where NPE was thrown when AnonymousCredentialsProvider was passed in"
+}
+

.changes/next-release/feature-AWSSDKforJavav2-6d1b1b5.json

@@ -0,0 +1,6 @@
+{
+    "category": "AWS SDK for Java v2", 
+    "contributor": "", 
+    "type": "feature", 
+    "description": "Bump CRT version to 0.19.2"
+}

pom.xml

@@ -113,7 +113,7 @@
         <rxjava.version>2.2.21</rxjava.version>
         <commons-codec.verion>1.10</commons-codec.verion>
         <jmh.version>1.29</jmh.version>
-        <awscrt.version>0.19.0</awscrt.version>
+        <awscrt.version>0.19.2</awscrt.version>
 
         <!--Test dependencies -->
         <junit5.version>5.8.1</junit5.version>

services/s3/pom.xml

@@ -143,5 +143,6 @@
             <artifactId>eventstream</artifactId>
             <scope>test</scope>
         </dependency>
+
     </dependencies>
 </project>

services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/crt/CrtCredentialsProviderAdapter.java

@@ -18,6 +18,7 @@
 
 import java.nio.charset.StandardCharsets;
 import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.auth.credentials.AnonymousCredentialsProvider;
 import software.amazon.awssdk.auth.credentials.AwsCredentials;
 import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
 import software.amazon.awssdk.auth.credentials.AwsSessionCredentials;
@@ -38,6 +39,11 @@ public CrtCredentialsProviderAdapter(AwsCredentialsProvider credentialsProvider)
         this.credentialsProvider = credentialsProvider;
         this.crtCredentials = new DelegateCredentialsProvider.DelegateCredentialsProviderBuilder()
             .withHandler(() -> {
+
+                if (credentialsProvider instanceof AnonymousCredentialsProvider) {
+                    return Credentials.createAnonymousCredentials();
+                }
+
                 AwsCredentials sdkCredentials = credentialsProvider.resolveCredentials();
                 byte[] accessKey = sdkCredentials.accessKeyId().getBytes(StandardCharsets.UTF_8);
                 byte[] secreteKey = sdkCredentials.secretAccessKey().getBytes(StandardCharsets.UTF_8);
@@ -47,10 +53,10 @@ public CrtCredentialsProviderAdapter(AwsCredentialsProvider credentialsProvider)
                     sessionTokens =
                         ((AwsSessionCredentials) sdkCredentials).sessionToken().getBytes(StandardCharsets.UTF_8);
                 }
-
                 return new Credentials(accessKey,
-                                       secreteKey,
-                                       sessionTokens);
+                                           secreteKey,
+                                           sessionTokens);
+
             }).build();
     }
 

services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/crt/CrtCredentialProviderAdapterTest.java

@@ -22,6 +22,7 @@
 import java.nio.charset.StandardCharsets;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
+import software.amazon.awssdk.auth.credentials.AnonymousCredentialsProvider;
 import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
 import software.amazon.awssdk.auth.credentials.AwsCredentials;
 import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
@@ -35,7 +36,7 @@
 public class CrtCredentialProviderAdapterTest {
 
     @Test
-    public void crtCredentials_withSession_shouldConvert() {
+    void crtCredentials_withSession_shouldConvert() {
         AwsCredentialsProvider awsCredentialsProvider = StaticCredentialsProvider
             .create(AwsSessionCredentials.create("foo", "bar", "session"));
 
@@ -50,7 +51,7 @@ public void crtCredentials_withSession_shouldConvert() {
     }
 
     @Test
-    public void crtCredentials_withoutSession_shouldConvert() {
+    void crtCredentials_withoutSession_shouldConvert() {
         AwsCredentialsProvider awsCredentialsProvider = StaticCredentialsProvider
             .create(AwsBasicCredentials.create("foo", "bar"));
 
@@ -65,7 +66,7 @@ public void crtCredentials_withoutSession_shouldConvert() {
     }
 
     @Test
-    public void crtCredentials_provideAwsCredentials_shouldInvokeResolveAndClose() {
+    void crtCredentials_provideAwsCredentials_shouldInvokeResolveAndClose() {
         AwsCredentialsProvider awsCredentialsProvider = Mockito.mock(HttpCredentialsProvider.class);
         AwsCredentials credentials = new AwsCredentials() {
             @Override
@@ -91,4 +92,21 @@ public String secretAccessKey() {
         adapter.close();
         verify((SdkAutoCloseable) awsCredentialsProvider).close();
     }
+
+    @Test
+    void crtCredentials_anonymousCredentialsProvider_shouldWork() {
+        AwsCredentialsProvider awsCredentialsProvider = AnonymousCredentialsProvider.create();
+
+        CrtCredentialsProviderAdapter adapter = new CrtCredentialsProviderAdapter(awsCredentialsProvider);
+        CredentialsProvider crtCredentialsProvider = adapter.crtCredentials();
+
+        Credentials crtCredentials = crtCredentialsProvider.getCredentials().join();
+
+        assertThat(crtCredentials.getAccessKeyId()).isNull();
+        assertThat(crtCredentials.getSecretAccessKey()).isNull();
+
+    }
+
+
+
 }