Fix tests

Author: zoewangg

migration-tool/src/main/java/software/amazon/awssdk/migration/internal/utils/SdkTypeUtils.java

@@ -61,7 +61,6 @@ public final class SdkTypeUtils {
      */
     private static final Set<String> V2_CORE_CLASSES_WITH_BUILDER =
         new HashSet<>(Arrays.asList("software.amazon.awssdk.core.client.ClientOverrideConfiguration",
-                                    "software.amazon.awssdk.auth.credentials.AwsSessionCredentials",
                                     "software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider",
                                     "software.amazon.awssdk.auth.credentials.ProfileCredentialsProvider",
                                     "software.amazon.awssdk.auth.credentials.ContainerCredentialsProvider",

migration-tool/src/main/java/software/amazon/awssdk/migration/recipe/NewClassToStaticFactory.java

@@ -83,6 +83,14 @@ public J visitNewClass(J.NewClass newClass, ExecutionContext executionContext) {
                                        .build()
                                        .apply(getCursor(), newClass.getCoordinates().replace(), newClass.getArguments().get(0),
                                               newClass.getArguments().get(1));
+                case 3:
+                    return JavaTemplate.builder(String.format("%s.create(#{any()}, #{any()}, #{any()})",
+                                                              classType.getClassName()))
+                                       .build()
+                                       .apply(getCursor(), newClass.getCoordinates().replace(),
+                                              newClass.getArguments().get(0),
+                                              newClass.getArguments().get(1),
+                                              newClass.getArguments().get(2));
                 default:
                     throw new UnsupportedOperationException("Unsupported number of parameters: " + numOfParams);
             }

migration-tool/src/main/resources/META-INF/rewrite/change-auth-types.yml

@@ -31,7 +31,13 @@ recipeList:
   - org.openrewrite.java.ChangeType:
       oldFullyQualifiedTypeName: com.amazonaws.auth.BasicAWSCredentials
       newFullyQualifiedTypeName: software.amazon.awssdk.auth.credentials.AwsBasicCredentials
+  - org.openrewrite.java.ChangeType:
+      oldFullyQualifiedTypeName: com.amazonaws.auth.BasicSessionCredentials
+      newFullyQualifiedTypeName: software.amazon.awssdk.auth.credentials.AwsSessionCredentials
 
+  - org.openrewrite.java.ChangeType:
+      oldFullyQualifiedTypeName: com.amazonaws.auth.AWSCredentialsProvider
+      newFullyQualifiedTypeName: software.amazon.awssdk.auth.credentials.AwsCredentialsProvider
   - org.openrewrite.java.ChangeType:
       oldFullyQualifiedTypeName: com.amazonaws.auth.AWSStaticCredentialsProvider
       newFullyQualifiedTypeName: software.amazon.awssdk.auth.credentials.StaticCredentialsProvider

test/migration-tool-tests/src/test/resources/after/src/main/java/foo/bar/Application.java

@@ -29,7 +29,6 @@ private Application() {
     public static void main(String... args) {
         SqsClient sqs = SqsClient.builder()
                                        .region(Region.US_WEST_2)
-                                       .credentials(CredentialsDependencyFactory.defaultCredentialsProviderChain())
                                        .build();
         ListQueuesRequest request = ListQueuesRequest.builder()
             .maxResults(5)

test/migration-tool-tests/src/test/resources/after/src/main/java/foo/bar/CredentialsDependencyFactory.java

@@ -15,10 +15,10 @@
 
 package foo.bar;
 
-import com.amazonaws.auth.AWSCredentialsProvider;
-import com.amazonaws.auth.BasicSessionCredentials;
 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.AwsSessionCredentials;
 import software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider;
 import software.amazon.awssdk.auth.credentials.EnvironmentVariableCredentialsProvider;
 import software.amazon.awssdk.auth.credentials.InstanceProfileCredentialsProvider;
@@ -30,29 +30,29 @@ public final class CredentialsDependencyFactory {
     private CredentialsDependencyFactory() {
     }
 
-    public static AWSCredentialsProvider defaultCredentialsProviderChain() {
+    public static AwsCredentialsProvider defaultCredentialsProviderChain() {
         return DefaultCredentialsProvider.builder().build();
     }
 
-    public static AWSCredentialsProvider environmentCredentialsProvider() {
+    public static AwsCredentialsProvider environmentCredentialsProvider() {
         return EnvironmentVariableCredentialsProvider.create();
     }
 
-    public static AWSCredentialsProvider instanceProfileCredentialsProvider() {
+    public static AwsCredentialsProvider instanceProfileCredentialsProvider() {
         return InstanceProfileCredentialsProvider.create();
     }
 
-    public static AWSCredentialsProvider profileCredentialsProvider() {
+    public static AwsCredentialsProvider profileCredentialsProvider() {
         return ProfileCredentialsProvider.builder().build();
     }
 
-    public static AWSCredentialsProvider staticCredentialsProvider() {
+    public static AwsCredentialsProvider staticCredentialsProvider() {
         AwsCredentials credentials  = AwsBasicCredentials.create("accessKey", "secretKey");
         return StaticCredentialsProvider.create(credentials);
     }
 
-    public static AWSCredentialsProvider staticSessionCredentialsProvider() {
-        AwsCredentials credentials = new BasicSessionCredentials("accessKey", "secretKey", "session");
+    public static AwsCredentialsProvider staticSessionCredentialsProvider() {
+        AwsCredentials credentials = AwsSessionCredentials.create("accessKey", "secretKey", "session");
         return StaticCredentialsProvider.create(credentials);
     }
 }

test/migration-tool-tests/src/test/resources/before/src/main/java/foo/bar/Application.java

@@ -29,7 +29,6 @@ private Application() {
     public static void main(String... args) {
         AmazonSQS sqs = AmazonSQSClient.builder()
                                        .withRegion(Regions.US_WEST_2)
-                                       .withCredentials(CredentialsDependencyFactory.defaultCredentialsProviderChain())
                                        .build();
         ListQueuesRequest request = new ListQueuesRequest()
             .withMaxResults(5)

test/migration-tool-tests/src/test/resources/run-test

@@ -32,6 +32,7 @@ def run_test(version):
     is_same = compare_directory(filecmp.dircmp(TARGET_DIR, AFTER_DIR))
     if not is_same:
         raise Exception("The transformed directory('target/generated-test-sources/project') does not match with the expected one('src/test/resources/after')")
+    result = subprocess.run(["mvn", "package"], cwd=TARGET_DIR, capture_output=True, check=True)
 
 def compare_directory(dcmp):
     if dcmp.diff_files or dcmp.left_only or dcmp.right_only: