Update to not generate upgrade-sdk-dependencies and change-enum-getters

Author: zoewangg

test/v2-migration-tests/src/test/java/software/amazon/awssdk/v2migrationtests/GradleProjectTest.java

@@ -17,15 +17,21 @@
 
 import static java.util.Collections.addAll;
 import static software.amazon.awssdk.v2migrationtests.TestUtils.assertTwoDirectoriesHaveSameStructure;
+import static software.amazon.awssdk.v2migrationtests.TestUtils.getMigrationToolVersion;
 import static software.amazon.awssdk.v2migrationtests.TestUtils.getVersion;
 import static software.amazon.awssdk.v2migrationtests.TestUtils.replaceVersion;
 import static software.amazon.awssdk.v2migrationtests.TestUtils.run;
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.attribute.PosixFilePermission;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import org.apache.commons.io.FileUtils;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -55,7 +61,19 @@ static void setUp() throws IOException {
         FileUtils.copyDirectory(gradleBefore.toFile(), gradleActual.toFile());
         FileUtils.copyDirectory(gradleAfter.toFile(), gradleExpected.toFile());
 
-        replaceVersion(gradleActual.resolve("init.gradle"), sdkVersion + "-PREVIEW");
+        Path gradlew = gradleActual.resolve("gradlew");
+
+        Set<PosixFilePermission> perms = new HashSet<>();
+        perms.addAll(Arrays.asList(PosixFilePermission.OWNER_READ,
+                                   PosixFilePermission.OWNER_EXECUTE,
+                                   PosixFilePermission.GROUP_EXECUTE,
+                                   PosixFilePermission.GROUP_READ,
+                                   PosixFilePermission.OTHERS_READ,
+                                   PosixFilePermission.OTHERS_EXECUTE));
+
+        Files.setPosixFilePermissions(gradlew, perms);
+
+        replaceVersion(gradleActual.resolve("init.gradle"), getMigrationToolVersion() + "-PREVIEW");
     }
 
     private static void deleteTempDirectories() throws IOException {

test/v2-migration-tests/src/test/java/software/amazon/awssdk/v2migrationtests/MavenProjectTest.java

@@ -17,6 +17,7 @@
 
 import static java.util.Collections.addAll;
 import static software.amazon.awssdk.v2migrationtests.TestUtils.assertTwoDirectoriesHaveSameStructure;
+import static software.amazon.awssdk.v2migrationtests.TestUtils.getMigrationToolVersion;
 import static software.amazon.awssdk.v2migrationtests.TestUtils.getVersion;
 import static software.amazon.awssdk.v2migrationtests.TestUtils.replaceVersion;
 import static software.amazon.awssdk.v2migrationtests.TestUtils.run;
@@ -73,7 +74,7 @@ void mavenProject_shouldConvert() throws IOException {
     private static void verifyTransformation() throws IOException {
         List<String> rewriteArgs = new ArrayList<>();
         addAll(rewriteArgs, "mvn", "org.openrewrite.maven:rewrite-maven-plugin:run",
-               "-Drewrite.recipeArtifactCoordinates=software.amazon.awssdk:v2-migration:"+ sdkVersion + "-PREVIEW",
+               "-Drewrite.recipeArtifactCoordinates=software.amazon.awssdk:v2-migration:"+ getMigrationToolVersion() + "-PREVIEW",
                "-Drewrite.activeRecipes=software.amazon.awssdk.v2migration.AwsSdkJavaV1ToV2");
 
         run(mavenActual, rewriteArgs.toArray(new String[0]));

test/v2-migration-tests/src/test/java/software/amazon/awssdk/v2migrationtests/TestUtils.java

@@ -42,6 +42,24 @@ public static void assertTwoDirectoriesHaveSameStructure(Path a, Path b) {
     }
 
     public static String getVersion() throws IOException {
+        // TODO: uncomment the following code to dynamically get version
+        //  once we update the version
+        // Path root = Paths.get(".").normalize().toAbsolutePath();
+        // Path pomFile = root.resolve("pom.xml");
+        // Optional<String> versionString =
+        //     Files.readAllLines(pomFile)
+        //          .stream().filter(l -> l.contains("<version>")).findFirst();
+        //
+        // if (!versionString.isPresent()) {
+        //     throw new AssertionError("No version is found");
+        // }
+        //
+        // String string = versionString.get().trim();
+        // String substring = string.substring(9, string.indexOf('/') - 1);
+        return "2.27.0";
+    }
+
+    public static String getMigrationToolVersion() throws IOException {
         Path root = Paths.get(".").normalize().toAbsolutePath();
         Path pomFile = root.resolve("pom.xml");
         Optional<String> versionString =

v2-migration/pom.xml

@@ -221,24 +221,6 @@
                     <ignoreNonCompile>false</ignoreNonCompile>
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>exec-maven-plugin</artifactId>
-                <groupId>org.codehaus.mojo</groupId>
-                <version>${exec-maven-plugin.version}</version>
-                <executions>
-                    <execution>
-                        <id>generate-recipe</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                            <executable>python</executable>
-                            <commandlineArgs>${basedir}/src/main/resources/generate-recipes</commandlineArgs>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>