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

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

Author: dagnir

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

@@ -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.2</awscrt.version>
+        <awscrt.version>0.19.0</awscrt.version>
 
         <!--Test dependencies -->
         <junit5.version>5.8.1</junit5.version>

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

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

AWSCLIV2.pkg

@@ -18,7 +18,6 @@
 
 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;
@@ -39,11 +38,6 @@ 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);
@@ -53,10 +47,10 @@ public CrtCredentialsProviderAdapter(AwsCredentialsProvider credentialsProvider)
                     sessionTokens =
                         ((AwsSessionCredentials) sdkCredentials).sessionToken().getBytes(StandardCharsets.UTF_8);
                 }
-                return new Credentials(accessKey,
-                                           secreteKey,
-                                           sessionTokens);
 
+                return new Credentials(accessKey,
+                                       secreteKey,
+                                       sessionTokens);
             }).build();
     }
 

pom.xml

@@ -22,7 +22,6 @@
 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;
@@ -92,21 +91,4 @@ public String secretAccessKey() {
         adapter.close();
         verify((SdkAutoCloseable) awsCredentialsProvider).close();
     }
-
-    @Test
-    public 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();
-
-    }
-
-
-
 }