Merge master into feature/q-utg

Author: aws-toolkit-automation

packages/amazonq/.changes/next-release/Bug Fix-8e53fbd9-35d8-40f0-95be-5c7ac2478353.json

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

packages/amazonq/test/e2e/amazonq/transformByQ.test.ts

@@ -162,6 +162,7 @@ describe('Amazon Q Code Transformation', function () {
             const tmpDir = (await TestFolder.create()).path
 
             transformByQState.setSummaryFilePath(path.join(tmpDir, 'summary.md'))
+            transformByQState.setToPartiallySucceeded()
 
             transformByQState
                 .getChatMessenger()

packages/core/src/amazonqGumby/chat/controller/messenger/messenger.ts

@@ -124,14 +124,14 @@ export class Messenger {
             title: CodeWhispererConstants.skipUnitTestsFormTitle,
             mandatory: true,
             options: [
-                {
-                    value: CodeWhispererConstants.runUnitTestsMessage,
-                    label: CodeWhispererConstants.runUnitTestsMessage,
-                },
                 {
                     value: CodeWhispererConstants.skipUnitTestsMessage,
                     label: CodeWhispererConstants.skipUnitTestsMessage,
                 },
+                {
+                    value: CodeWhispererConstants.runUnitTestsMessage,
+                    label: CodeWhispererConstants.runUnitTestsMessage,
+                },
             ],
         })
 
@@ -533,7 +533,7 @@ export class Messenger {
             })
         }
 
-        if (transformByQState.getSummaryFilePath()) {
+        if (transformByQState.isPartiallySucceeded() || transformByQState.isSucceeded()) {
             buttons.push({
                 keepCardAfterClick: true,
                 text: CodeWhispererConstants.viewSummaryButtonText,

packages/core/src/codewhisperer/service/transformByQ/transformMavenHandler.ts

@@ -27,6 +27,11 @@ function installProjectDependencies(dependenciesFolder: FolderInfo, modulePath:
 
         // Note: IntelliJ runs 'clean' separately from 'install'. Evaluate benefits (if any) of this.
         const args = [`-Dmaven.repo.local=${dependenciesFolder.path}`, 'clean', 'install', '-q']
+
+        if (transformByQState.getCustomBuildCommand() === CodeWhispererConstants.skipUnitTestsBuildCommand) {
+            args.push('-DskipTests')
+        }
+
         let environment = process.env
 
         if (transformByQState.getJavaHome() !== undefined) {