fix(amazonq): skip tests locally

Author: David Hasani

.changes/next-release/bugfix-ce55123f-2437-4740-b9c8-c1069856e316.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "/transform: skip running tests locally when user chooses to do so"
+}

plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/constants/CodeTransformChatItems.kt

@@ -204,14 +204,14 @@ private val selectSkipTestsFlagFormItem = FormItem(
     title = message("codemodernizer.chat.form.user_selection.item.choose_skip_tests_option"),
     mandatory = true,
     options = listOf(
+        FormItemOption(
+            label = message("codemodernizer.chat.message.skip_tests_form.skip"),
+            value = message("codemodernizer.chat.message.skip_tests_form.skip"),
+        ),
         FormItemOption(
             label = message("codemodernizer.chat.message.skip_tests_form.run_tests"),
             value = message("codemodernizer.chat.message.skip_tests_form.run_tests"),
         ),
-        FormItemOption(
-            label = message("codemodernizer.chat.message.skip_tests_form.skip"),
-            value = message("codemodernizer.chat.message.skip_tests_form.skip"),
-        )
     )
 )
 

plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/controller/CodeTransformChatController.kt

@@ -710,7 +710,7 @@ class CodeTransformChatController(
             else -> {
                 if (result is CodeModernizerJobCompletedResult.ZipUploadFailed && result.failureReason is UploadFailureReason.CREDENTIALS_EXPIRED) {
                     return
-                } else {
+                } else if (CodeModernizerSessionState.getInstance(context.project).currentJobId != null) {
                     val downloadResult = artifactHandler.downloadArtifact(
                         CodeModernizerSessionState.getInstance(context.project).currentJobId as JobId,
                         TransformationDownloadArtifactType.CLIENT_INSTRUCTIONS

plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/ideMaven/MavenRunnerUtils.kt

@@ -57,7 +57,7 @@ fun runHilMavenCopyDependency(
     return MavenCopyCommandsResult.Success(destinationDir)
 }
 
-fun runMavenCopyCommands(sourceFolder: File, buildlogBuilder: StringBuilder, logger: Logger, project: Project): MavenCopyCommandsResult {
+fun runMavenCopyCommands(sourceFolder: File, buildlogBuilder: StringBuilder, logger: Logger, project: Project, shouldSkipTests: Boolean): MavenCopyCommandsResult {
     val currentTimestamp = System.currentTimeMillis()
     val destinationDir = Files.createTempDirectory("transformation_dependencies_temp_$currentTimestamp")
     val telemetry = CodeTransformTelemetryManager.getInstance(project)
@@ -112,7 +112,7 @@ fun runMavenCopyCommands(sourceFolder: File, buildlogBuilder: StringBuilder, log
         }
 
         // Run install
-        val installRunnable = runMavenInstall(sourceFolder, buildlogBuilder, mvnSettings, transformMvnRunner, logger, destinationDir)
+        val installRunnable = runMavenInstall(sourceFolder, buildlogBuilder, mvnSettings, transformMvnRunner, logger, destinationDir, shouldSkipTests)
         installRunnable.await()
         buildlogBuilder.appendLine(installRunnable.getOutput())
         if (installRunnable.isComplete()) {
@@ -217,13 +217,16 @@ private fun runMavenInstall(
     transformMavenRunner: TransformMavenRunner,
     logger: Logger,
     destinationDir: Path,
+    shouldSkipTests: Boolean,
 ): TransformRunnable {
     buildlogBuilder.appendLine("Command Run: IntelliJ IDEA bundled Maven install")
+    val flags = if (shouldSkipTests) listOf("-Dmaven.repo.local=$destinationDir", "install", "-DskipTests") else
+        listOf("-Dmaven.repo.local=$destinationDir", "install")
     val installParams = MavenRunnerParameters(
         false,
         sourceFolder.absolutePath,
         null,
-        listOf("-Dmaven.repo.local=$destinationDir", "install"),
+        flags,
         emptyList<String>(),
         null
     )

plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/CodeModernizerSessionContext.kt

@@ -99,7 +99,10 @@ data class CodeModernizerSessionContext(
         return excluded
     }
 
-    fun executeMavenCopyCommands(sourceFolder: File, buildLogBuilder: StringBuilder) = runMavenCopyCommands(sourceFolder, buildLogBuilder, LOG, project)
+    fun executeMavenCopyCommands(sourceFolder: File, buildLogBuilder: StringBuilder): MavenCopyCommandsResult {
+        val shouldSkipTests = customBuildCommand == MAVEN_BUILD_SKIP_UNIT_TESTS
+        return runMavenCopyCommands(sourceFolder, buildLogBuilder, LOG, project, shouldSkipTests)
+    }
 
     private fun executeHilMavenCopyDependency(sourceFolder: File, destinationFolder: File, buildLogBuilder: StringBuilder) = runHilMavenCopyDependency(
         sourceFolder,