Merge master into feature/emr

Author: aws-toolkit-automation

packages/amazonq/.changes/next-release/Feature-cd5797a0-6460-4fc6-b3f7-47f55f9bf163.json

@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "Amazon Q Code Transformation: allow users to skip running tests"
+}

packages/core/src/amazonqGumby/activation.ts

@@ -7,7 +7,11 @@ import * as vscode from 'vscode'
 import { Commands } from '../shared/vscode/commands2'
 import { TransformationHubViewProvider } from '../codewhisperer/service/transformByQ/transformationHubViewProvider'
 import { ExtContext } from '../shared/extensions'
-import { stopTransformByQ } from '../codewhisperer/commands/startTransformByQ'
+import {
+    cleanupTransformationJob,
+    postTransformationJob,
+    stopTransformByQ,
+} from '../codewhisperer/commands/startTransformByQ'
 import { transformByQState } from '../codewhisperer/models/model'
 import { ProposedTransformationExplorer } from '../codewhisperer/service/transformByQ/transformationResultsViewProvider'
 import { CodeTransformTelemetryState } from './telemetry/codeTransformTelemetryState'
@@ -48,7 +52,9 @@ export async function activate(context: ExtContext) {
 
         Commands.register('aws.amazonq.stopTransformationInHub', async (cancelSrc: CancelActionPositions) => {
             if (transformByQState.isRunning()) {
-                void stopTransformByQ(transformByQState.getJobId(), cancelSrc)
+                await stopTransformByQ(transformByQState.getJobId(), cancelSrc)
+                await postTransformationJob()
+                await cleanupTransformationJob()
             }
         }),
 

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

@@ -303,6 +303,12 @@ export class GumbyController {
                 })
                 this.messenger.sendJobFinishedMessage(message.tabID, CodeWhispererConstants.jobCancelledChatMessage)
                 break
+            case ButtonActions.CONFIRM_SKIP_TESTS_FORM:
+                await this.handleSkipTestsSelection(message)
+                break
+            case ButtonActions.CANCEL_SKIP_TESTS_FORM:
+                this.messenger.sendJobFinishedMessage(message.tabID, CodeWhispererConstants.jobCancelledChatMessage)
+                break
             case ButtonActions.VIEW_TRANSFORMATION_HUB:
                 await vscode.commands.executeCommand(GumbyCommands.FOCUS_TRANSFORMATION_HUB, CancelActionPositions.Chat)
                 this.messenger.sendJobSubmittedMessage(message.tabID)
@@ -334,6 +340,23 @@ export class GumbyController {
         }
     }
 
+    private async handleSkipTestsSelection(message: any) {
+        const skipTestsSelection = message.formSelectedValues['GumbyTransformSkipTestsForm']
+        if (skipTestsSelection === CodeWhispererConstants.skipUnitTestsMessage) {
+            transformByQState.setCustomBuildCommand(CodeWhispererConstants.skipUnitTestsBuildCommand)
+        } else {
+            transformByQState.setCustomBuildCommand(CodeWhispererConstants.doNotSkipUnitTestsBuildCommand)
+        }
+        telemetry.codeTransform_submitSelection.emit({
+            codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId(),
+            userChoice: skipTestsSelection,
+            result: MetadataResult.Pass,
+        })
+        this.messenger.sendSkipTestsSelectionMessage(skipTestsSelection, message.tabID)
+        // perform local build
+        await this.validateBuildWithPromptOnError(message)
+    }
+
     // prompt user to pick project and specify source JDK version
     private async handleUserProjectSelection(message: any) {
         await telemetry.codeTransform_submitSelection.run(async () => {
@@ -365,7 +388,8 @@ export class GumbyController {
             }
 
             await processTransformFormInput(pathToProject, fromJDKVersion, toJDKVersion)
-            await this.validateBuildWithPromptOnError(message)
+
+            await this.messenger.sendSkipTestsPrompt(message.tabID)
         })
     }
 

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

@@ -109,6 +109,45 @@ export class Messenger {
         this.dispatcher.sendAuthenticationUpdate(new AuthenticationUpdateMessage(gumbyEnabled, authenticatingTabIDs))
     }
 
+    public async sendSkipTestsPrompt(tabID: string) {
+        const formItems: ChatItemFormItem[] = []
+        formItems.push({
+            id: 'GumbyTransformSkipTestsForm',
+            type: 'select',
+            title: CodeWhispererConstants.skipUnitTestsFormTitle,
+            mandatory: true,
+            options: [
+                {
+                    value: CodeWhispererConstants.runUnitTestsMessage,
+                    label: CodeWhispererConstants.runUnitTestsMessage,
+                },
+                {
+                    value: CodeWhispererConstants.skipUnitTestsMessage,
+                    label: CodeWhispererConstants.skipUnitTestsMessage,
+                },
+            ],
+        })
+
+        this.dispatcher.sendAsyncEventProgress(
+            new AsyncEventProgressMessage(tabID, {
+                inProgress: true,
+                message: CodeWhispererConstants.skipUnitTestsFormMessage,
+            })
+        )
+
+        this.dispatcher.sendChatPrompt(
+            new ChatPrompt(
+                {
+                    message: 'Q Code Transformation',
+                    formItems: formItems,
+                },
+                'TransformSkipTestsForm',
+                tabID,
+                false
+            )
+        )
+    }
+
     public async sendProjectPrompt(projects: TransformationCandidateProject[], tabID: string) {
         const projectFormOptions: { value: any; label: string }[] = []
         const detectedJavaVersions = new Array<JDKVersion | undefined>()
@@ -125,7 +164,7 @@ export class Messenger {
         formItems.push({
             id: 'GumbyTransformProjectForm',
             type: 'select',
-            title: 'Choose a project to transform',
+            title: CodeWhispererConstants.chooseProjectFormTitle,
             mandatory: true,
 
             options: projectFormOptions,
@@ -134,7 +173,7 @@ export class Messenger {
         formItems.push({
             id: 'GumbyTransformJdkFromForm',
             type: 'select',
-            title: 'Choose the source code version',
+            title: CodeWhispererConstants.chooseSourceVersionFormTitle,
             mandatory: true,
             options: [
                 {
@@ -155,7 +194,7 @@ export class Messenger {
         formItems.push({
             id: 'GumbyTransformJdkToForm',
             type: 'select',
-            title: 'Choose the target code version',
+            title: CodeWhispererConstants.chooseTargetVersionFormTitle,
             mandatory: true,
             options: [
                 {
@@ -407,7 +446,7 @@ export class Messenger {
         projectName: string,
         fromJDKVersion: JDKVersion,
         toJDKVersion: JDKVersion,
-        tabID: any
+        tabID: string
     ) {
         const message = `### Transformation details
 -------------
@@ -421,6 +460,11 @@ export class Messenger {
         this.dispatcher.sendChatMessage(new ChatMessage({ message, messageType: 'prompt' }, tabID))
     }
 
+    public sendSkipTestsSelectionMessage(skipTestsSelection: string, tabID: string) {
+        const message = `Okay, I will ${skipTestsSelection.toLowerCase()} when building your project.`
+        this.dispatcher.sendChatMessage(new ChatMessage({ message, messageType: 'ai-prompt' }, tabID))
+    }
+
     public sendHumanInTheLoopInitialMessage(tabID: string, codeSnippet: string) {
         let message = `I was not able to upgrade all dependencies. To resolve it, I will try to find an updated depedency in your local Maven repository. I will need additional information from you to continue.`
 

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

@@ -14,7 +14,9 @@ export enum ButtonActions {
     STOP_TRANSFORMATION_JOB = 'gumbyStopTransformationJob',
     VIEW_TRANSFORMATION_HUB = 'gumbyViewTransformationHub',
     CONFIRM_TRANSFORMATION_FORM = 'gumbyTransformFormConfirm',
+    CONFIRM_SKIP_TESTS_FORM = 'gumbyTransformSkipTestsFormConfirm',
     CANCEL_TRANSFORMATION_FORM = 'gumbyTransformFormCancel',
+    CANCEL_SKIP_TESTS_FORM = 'gumbyTransformSkipTestsFormCancel',
     CONFIRM_DEPENDENCY_FORM = 'gumbyTransformDependencyFormConfirm',
     CANCEL_DEPENDENCY_FORM = 'gumbyTransformDependencyFormCancel',
     CONFIRM_JAVA_HOME_FORM = 'gumbyJavaHomeFormConfirm',

packages/core/src/codewhisperer/commands/startTransformByQ.ts

@@ -274,10 +274,13 @@ export async function preTransformationUploadCode() {
         await telemetry.codeTransform_uploadProject.run(async () => {
             telemetry.record({ codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId() })
 
+            const transformZipManifest = new ZipManifest()
+            // if the user chose to skip unit tests, add the custom build command here
+            transformZipManifest.customBuildCommand = transformByQState.getCustomBuildCommand()
             const zipCodeResult = await zipCode({
                 dependenciesFolder: transformByQState.getDependencyFolderInfo()!,
                 modulePath: transformByQState.getProjectPath(),
-                zipManifest: new ZipManifest(),
+                zipManifest: transformZipManifest,
             })
 
             const payloadFilePath = zipCodeResult.tempFilePath

packages/core/src/codewhisperer/models/constants.ts

@@ -626,6 +626,25 @@ export const JDK8VersionNumber = '52'
 
 export const JDK11VersionNumber = '55'
 
+export const chooseProjectFormTitle = 'Choose a project to transform'
+
+export const chooseSourceVersionFormTitle = 'Choose the source code version'
+
+export const chooseTargetVersionFormTitle = 'Choose the target code version'
+
+export const skipUnitTestsFormTitle = 'Choose to skip unit tests'
+
+export const skipUnitTestsFormMessage =
+    'I will build your project using `mvn test` by default. If you would like me to build your project without running unit tests, I will use `mvn test-compile`.'
+
+export const runUnitTestsMessage = 'Run unit tests'
+
+export const doNotSkipUnitTestsBuildCommand = 'clean test'
+
+export const skipUnitTestsMessage = 'Skip unit tests'
+
+export const skipUnitTestsBuildCommand = 'clean test-compile'
+
 export const planTitle = 'Code Transformation plan by Amazon Q'
 
 export const planIntroductionMessage =

packages/core/src/codewhisperer/models/model.ts

@@ -316,6 +316,7 @@ export class ZipManifest {
     version: string = '1.0'
     hilCapabilities: string[] = ['HIL_1pDependency_VersionUpgrade']
     transformCapabilities: string[] = ['EXPLAINABILITY_V1']
+    customBuildCommand: string = 'clean test'
 }
 
 export interface IHilZipManifestParams {
@@ -374,6 +375,8 @@ export class TransformByQState {
 
     private targetJDKVersion: JDKVersion = JDKVersion.JDK17
 
+    private customBuildCommand: string = ''
+
     private planFilePath: string = ''
     private summaryFilePath: string = ''
     private preBuildLogFilePath: string = ''
@@ -437,6 +440,10 @@ export class TransformByQState {
         return this.projectPath
     }
 
+    public getCustomBuildCommand() {
+        return this.customBuildCommand
+    }
+
     public getPreBuildLogFilePath() {
         return this.preBuildLogFilePath
     }
@@ -561,6 +568,10 @@ export class TransformByQState {
         this.projectPath = path
     }
 
+    public setCustomBuildCommand(command: string) {
+        this.customBuildCommand = command
+    }
+
     public setStartTime(time: string) {
         this.startTime = time
     }
@@ -656,6 +667,7 @@ export class TransformByQState {
         this.jobFailureMetadata = ''
         this.payloadFilePath = ''
         this.errorLog = ''
+        this.customBuildCommand = ''
         this.intervalId = undefined
     }
 }

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

@@ -9,7 +9,6 @@ import * as CodeWhispererConstants from '../../models/constants'
 import { spawnSync } from 'child_process' // Consider using ChildProcess once we finalize all spawnSync calls
 import { CodeTransformBuildCommand, telemetry } from '../../../shared/telemetry/telemetry'
 import { CodeTransformTelemetryState } from '../../../amazonqGumby/telemetry/codeTransformTelemetryState'
-import { MetadataResult } from '../../../shared/telemetry/telemetryClient'
 import { ToolkitError } from '../../../shared/errors'
 import { writeLogs } from './transformFileHandler'
 import { throwIfCancelled } from './transformApiHandler'
@@ -59,28 +58,6 @@ function installProjectDependencies(dependenciesFolder: FolderInfo, modulePath:
             getLogger().error(
                 `CodeTransformation: Error in running Maven ${argString} command ${baseCommand} = ${errorLog}`
             )
-            let errorReason = ''
-            if (spawnResult.stdout) {
-                errorReason = `Maven ${argString}: InstallationExecutionError`
-                /*
-                 * adding this check here because these mvn commands sometimes generate a lot of output.
-                 * rarely, a buffer overflow has resulted when these mvn commands are run with -X, -e flags
-                 * which are not being used here (for now), but still keeping this just in case.
-                 */
-                if (Buffer.byteLength(spawnResult.stdout, 'utf-8') > CodeWhispererConstants.maxBufferSize) {
-                    errorReason += '-BufferOverflow'
-                }
-            } else {
-                errorReason = `Maven ${argString}: InstallationSpawnError`
-            }
-            if (spawnResult.error) {
-                const errorCode = (spawnResult.error as any).code ?? 'UNKNOWN'
-                errorReason += `-${errorCode}`
-            }
-
-            // Explicitly set metric as failed since no exception was caught
-            telemetry.record({ result: MetadataResult.Fail, reason: errorReason })
-
             throw new ToolkitError(`Maven ${argString} error`, { code: 'MavenExecutionError' })
         } else {
             transformByQState.appendToErrorLog(`${baseCommand} ${argString} succeeded`)
@@ -102,11 +79,12 @@ function copyProjectDependencies(dependenciesFolder: FolderInfo, modulePath: str
         '-Dmdep.addParentPoms=true',
         '-q',
     ]
+
     let environment = process.env
-    // if JAVA_HOME not found or not matching project JDK, get user input for it and set here
     if (transformByQState.getJavaHome() !== undefined) {
         environment = { ...process.env, JAVA_HOME: transformByQState.getJavaHome() }
     }
+
     const spawnResult = spawnSync(baseCommand, args, {
         cwd: modulePath,
         shell: true,
@@ -119,30 +97,9 @@ function copyProjectDependencies(dependenciesFolder: FolderInfo, modulePath: str
         errorLog += spawnResult.error ? JSON.stringify(spawnResult.error) : ''
         errorLog += `${spawnResult.stderr}\n${spawnResult.stdout}`
         transformByQState.appendToErrorLog(`${baseCommand} copy-dependencies failed: \n ${errorLog}`)
-        let errorReason = ''
-        if (spawnResult.stdout) {
-            errorReason = 'Maven Copy: CopyDependenciesExecutionError'
-            if (Buffer.byteLength(spawnResult.stdout, 'utf-8') > CodeWhispererConstants.maxBufferSize) {
-                errorReason += '-BufferOverflow'
-            }
-        } else {
-            errorReason = 'Maven Copy: CopyDependenciesSpawnError'
-        }
-        if (spawnResult.error) {
-            const errorCode = (spawnResult.error as any).code ?? 'UNKNOWN'
-            errorReason += `-${errorCode}`
-        }
         getLogger().info(
-            `CodeTransformation: Maven copy-dependencies command ${baseCommand} failed, but still continuing with transformation: ${errorReason}, log: ${errorLog}`
+            `CodeTransformation: Maven copy-dependencies command ${baseCommand} failed, but still continuing with transformation: ${errorLog}`
         )
-
-        let mavenBuildCommand = transformByQState.getMavenName()
-        // slashes not allowed in telemetry
-        if (mavenBuildCommand === './mvnw') {
-            mavenBuildCommand = 'mvnw'
-        } else if (mavenBuildCommand === '.\\mvnw.cmd') {
-            mavenBuildCommand = 'mvnw.cmd'
-        }
         throw new Error('Maven copy-deps error')
     } else {
         transformByQState.appendToErrorLog(`${baseCommand} copy-dependencies succeeded`)

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

@@ -142,11 +142,7 @@ export async function validateOpenProjects(
         throw new NoMavenJavaProjectsFoundError()
     }
 
-    /*
-     * These projects we know must contain a pom.xml and a .java file
-     * here we try to get the Java version of each project so that we
-     * can pre-select a default version in the QuickPick for them.
-     */
+    // These projects we know must contain a pom.xml and a .java file
     const projectsValidToTransform = await getProjectsValidToTransform(mavenJavaProjects, onProjectFirstOpen)
 
     return projectsValidToTransform