run maven JAR

Author: David Hasani

packages/amazonq/.changes/next-release/Feature-d46a67ff-b237-46cc-b6e7-8de8f2e87f45.json

@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "/transform: run all builds client-side"
+}

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

@@ -150,8 +150,6 @@ describe('Amazon Q Code Transformation', function () {
                 waitIntervalInMs: 1000,
             })
 
-            // TO-DO: add this back when releasing CSB
-            /*
             const customDependencyVersionPrompt = tab.getChatItems().pop()
             assert.strictEqual(
                 customDependencyVersionPrompt?.body?.includes('You can optionally upload a YAML file'),
@@ -164,15 +162,14 @@ describe('Amazon Q Code Transformation', function () {
                 waitTimeoutInMs: 5000,
                 waitIntervalInMs: 1000,
             })
-            */
 
             const sourceJdkPathPrompt = tab.getChatItems().pop()
             assert.strictEqual(sourceJdkPathPrompt?.body?.includes('Enter the path to JDK 8'), true)
 
             tab.addChatMessage({ prompt: '/dummy/path/to/jdk8' })
 
             // 2 additional chat messages get sent after JDK path submitted; wait for both of them
-            await tab.waitForEvent(() => tab.getChatItems().length > 13, {
+            await tab.waitForEvent(() => tab.getChatItems().length > 15, {
                 waitTimeoutInMs: 5000,
                 waitIntervalInMs: 1000,
             })
@@ -194,7 +191,7 @@ describe('Amazon Q Code Transformation', function () {
                 text: 'View summary',
             })
 
-            await tab.waitForEvent(() => tab.getChatItems().length > 14, {
+            await tab.waitForEvent(() => tab.getChatItems().length > 16, {
                 waitTimeoutInMs: 5000,
                 waitIntervalInMs: 1000,
             })

packages/core/resources/amazonqTransform/QCT-Maven.jar

@@ -41,13 +41,9 @@ import {
 } from '../../errors'
 import * as CodeWhispererConstants from '../../../codewhisperer/models/constants'
 import MessengerUtils, { ButtonActions, GumbyCommands } from './messenger/messengerUtils'
-import { CancelActionPositions, JDKToTelemetryValue, telemetryUndefined } from '../../telemetry/codeTransformTelemetry'
+import { CancelActionPositions } from '../../telemetry/codeTransformTelemetry'
 import { openUrl } from '../../../shared/utilities/vsCodeUtils'
-import {
-    telemetry,
-    CodeTransformJavaTargetVersionsAllowed,
-    CodeTransformJavaSourceVersionsAllowed,
-} from '../../../shared/telemetry/telemetry'
+import { telemetry } from '../../../shared/telemetry/telemetry'
 import { CodeTransformTelemetryState } from '../../telemetry/codeTransformTelemetryState'
 import DependencyVersions from '../../models/dependencies'
 import { getStringHash } from '../../../shared/utilities/textUtilities'
@@ -308,7 +304,6 @@ export class GumbyController {
     }
 
     private async validateLanguageUpgradeProjects(message: any) {
-        let telemetryJavaVersion = JDKToTelemetryValue(JDKVersion.UNSUPPORTED) as CodeTransformJavaSourceVersionsAllowed
         try {
             const validProjects = await telemetry.codeTransform_validateProject.run(async () => {
                 telemetry.record({
@@ -317,12 +312,6 @@ export class GumbyController {
                 })
 
                 const validProjects = await getValidLanguageUpgradeCandidateProjects()
-                if (validProjects.length > 0) {
-                    // validProjects[0].JDKVersion will be undefined if javap errors out or no .class files found, so call it UNSUPPORTED
-                    const javaVersion = validProjects[0].JDKVersion ?? JDKVersion.UNSUPPORTED
-                    telemetryJavaVersion = JDKToTelemetryValue(javaVersion) as CodeTransformJavaSourceVersionsAllowed
-                }
-                telemetry.record({ codeTransformLocalJavaVersion: telemetryJavaVersion })
                 return validProjects
             })
             return validProjects
@@ -460,9 +449,7 @@ export class GumbyController {
             })
 
             this.messenger.sendOneOrMultipleDiffsMessage(oneOrMultipleDiffsSelection, message.tabID)
-            this.promptJavaHome('source', message.tabID)
-            // TO-DO: delete line above and uncomment line below when releasing CSB
-            // await this.messenger.sendCustomDependencyVersionMessage(message.tabID)
+            await this.messenger.sendCustomDependencyVersionMessage(message.tabID)
         })
     }
 
@@ -488,16 +475,9 @@ export class GumbyController {
             const fromJDKVersion: JDKVersion = message.formSelectedValues['GumbyTransformJdkFromForm']
 
             telemetry.record({
-                // TODO: remove JavaSource/TargetVersionsAllowed when BI is updated to use source/target
-                codeTransformJavaSourceVersionsAllowed: JDKToTelemetryValue(
-                    fromJDKVersion
-                ) as CodeTransformJavaSourceVersionsAllowed,
-                codeTransformJavaTargetVersionsAllowed: JDKToTelemetryValue(
-                    toJDKVersion
-                ) as CodeTransformJavaTargetVersionsAllowed,
                 source: fromJDKVersion,
                 target: toJDKVersion,
-                codeTransformProjectId: pathToProject === undefined ? telemetryUndefined : getStringHash(pathToProject),
+                codeTransformProjectId: pathToProject === undefined ? undefined : getStringHash(pathToProject),
                 userChoice: 'Confirm-Java',
             })
 
@@ -526,7 +506,7 @@ export class GumbyController {
             const schema: string = message.formSelectedValues['GumbyTransformSQLSchemaForm']
 
             telemetry.record({
-                codeTransformProjectId: pathToProject === undefined ? telemetryUndefined : getStringHash(pathToProject),
+                codeTransformProjectId: pathToProject === undefined ? undefined : getStringHash(pathToProject),
                 source: transformByQState.getSourceDB(),
                 target: transformByQState.getTargetDB(),
                 userChoice: 'Confirm-SQL',

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

@@ -451,7 +451,7 @@ export class Messenger {
                 message = CodeWhispererConstants.noPomXmlFoundChatMessage
                 break
             case 'could-not-compile-project':
-                message = CodeWhispererConstants.cleanInstallErrorChatMessage
+                message = CodeWhispererConstants.cleanTestCompileErrorChatMessage
                 break
             case 'invalid-java-home':
                 message = CodeWhispererConstants.noJavaHomeFoundChatMessage
@@ -779,7 +779,7 @@ ${codeSnippet}
                 tabID
             )
         )
-        const sampleYAML = `name: "custom-dependency-management"
+        const sampleYAML = `name: dependency-upgrade
 description: "Custom dependency version management for Java migration from JDK 8/11/17 to JDK 17/21"
 
 dependencyManagement:
@@ -792,7 +792,7 @@ dependencyManagement:
       targetVersion: "3.0.0"
       originType: "THIRD_PARTY"
   plugins:
-    - identifier: "com.example.plugin"
+    - identifier: "com.example:plugin"
       targetVersion: "1.2.0"
       versionProperty: "plugin.version"  # Optional`
 

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

@@ -30,12 +30,6 @@ export class NoMavenJavaProjectsFoundError extends ToolkitError {
     }
 }
 
-export class ZipExceedsSizeLimitError extends ToolkitError {
-    constructor() {
-        super('Zip file exceeds size limit', { code: 'ZipFileExceedsSizeLimit' })
-    }
-}
-
 export class AlternateDependencyVersionsNotFoundError extends Error {
     constructor() {
         super('No available versions for dependency update')

packages/core/src/amazonqGumby/errors.ts

@@ -286,7 +286,7 @@ export class DefaultCodeWhispererClient {
     /**
      * @description Use this function to get the status of the code transformation. We should
      * be polling this function periodically to get updated results. When this function
-     * returns COMPLETED we know the transformation is done.
+     * returns PARTIALLY_COMPLETED or COMPLETED we know the transformation is done.
      */
     public async codeModernizerGetCodeTransformation(
         request: CodeWhispererUserClient.GetTransformationRequest
@@ -296,15 +296,15 @@ export class DefaultCodeWhispererClient {
     }
 
     /**
-     * @description After the job has been PAUSED we need to get user intervention. Once that user
-     * intervention has been handled we can resume the transformation job.
+     * @description During client-side build, or after the job has been PAUSED we need to get user intervention.
+     * Once that user action has been handled we can resume the transformation job.
      * @params transformationJobId - String id returned from StartCodeTransformationResponse
      * @params userActionStatus - String to determine what action the user took, if any.
      */
     public async codeModernizerResumeTransformation(
         request: CodeWhispererUserClient.ResumeTransformationRequest
     ): Promise<PromiseResult<CodeWhispererUserClient.ResumeTransformationResponse, AWSError>> {
-        return (await this.createUserSdkClient()).resumeTransformation(request).promise()
+        return (await this.createUserSdkClient(8)).resumeTransformation(request).promise()
     }
 
     /**

packages/core/src/codewhisperer/client/codewhisperer.ts

@@ -5,6 +5,7 @@
 
 import * as vscode from 'vscode'
 import * as fs from 'fs' // eslint-disable-line no-restricted-imports
+import os from 'os'
 import path from 'path'
 import { getLogger } from '../../shared/logger/logger'
 import * as CodeWhispererConstants from '../models/constants'
@@ -16,7 +17,6 @@ import {
     jobPlanProgress,
     FolderInfo,
     ZipManifest,
-    TransformByQStatus,
     TransformationType,
     TransformationCandidateProject,
     RegionProfile,
@@ -44,7 +44,6 @@ import {
     validateOpenProjects,
 } from '../service/transformByQ/transformProjectValidationHandler'
 import {
-    getVersionData,
     prepareProjectDependencies,
     runMavenDependencyUpdateCommands,
 } from '../service/transformByQ/transformMavenHandler'
@@ -83,7 +82,7 @@ import { AuthUtil } from '../util/authUtil'
 
 export function getFeedbackCommentData() {
     const jobId = transformByQState.getJobId()
-    const s = `Q CodeTransform jobId: ${jobId ? jobId : 'none'}`
+    const s = `Q CodeTransformation jobId: ${jobId ? jobId : 'none'}`
     return s
 }
 
@@ -113,8 +112,8 @@ export async function compileProject() {
     try {
         const dependenciesFolder: FolderInfo = getDependenciesFolderInfo()
         transformByQState.setDependencyFolderInfo(dependenciesFolder)
-        const modulePath = transformByQState.getProjectPath()
-        await prepareProjectDependencies(dependenciesFolder, modulePath)
+        const projectPath = transformByQState.getProjectPath()
+        await prepareProjectDependencies(dependenciesFolder.path, projectPath)
     } catch (err) {
         // open build-logs.txt file to show user error logs
         await writeAndShowBuildLogs(true)
@@ -176,18 +175,15 @@ export async function humanInTheLoopRetryLogic(jobId: string, profile: RegionPro
         if (status === 'PAUSED') {
             const hilStatusFailure = await initiateHumanInTheLoopPrompt(jobId)
             if (hilStatusFailure) {
-                // We rejected the changes and resumed the job and should
-                // try to resume normal polling asynchronously
+                // resume polling
                 void humanInTheLoopRetryLogic(jobId, profile)
             }
         } else {
             await finalizeTransformByQ(status)
         }
     } catch (error) {
         status = 'FAILED'
-        // TODO if we encounter error in HIL, do we stop job?
         await finalizeTransformByQ(status)
-        // bubble up error to callee function
         throw error
     }
 }
@@ -226,11 +222,9 @@ export async function preTransformationUploadCode() {
 
             const payloadFilePath = zipCodeResult.tempFilePath
             const zipSize = zipCodeResult.fileSize
-            const dependenciesCopied = zipCodeResult.dependenciesCopied
 
             telemetry.record({
                 codeTransformTotalByteSize: zipSize,
-                codeTransformDependenciesCopied: dependenciesCopied,
             })
 
             transformByQState.setPayloadFilePath(payloadFilePath)
@@ -409,7 +403,7 @@ export async function finishHumanInTheLoop(selectedDependency?: string) {
 
         // 7) We need to take that output of maven and use CreateUploadUrl
         const uploadFolderInfo = humanInTheLoopManager.getUploadFolderInfo()
-        await prepareProjectDependencies(uploadFolderInfo, uploadFolderInfo.path)
+        await prepareProjectDependencies(uploadFolderInfo.path, uploadFolderInfo.path)
         // zipCode side effects deletes the uploadFolderInfo right away
         const uploadResult = await zipCode({
             dependenciesFolder: uploadFolderInfo,
@@ -450,13 +444,11 @@ export async function finishHumanInTheLoop(selectedDependency?: string) {
         await terminateHILEarly(jobId)
         void humanInTheLoopRetryLogic(jobId, profile)
     } finally {
-        // Always delete the dependency directories
         telemetry.codeTransform_humanInTheLoop.emit({
             codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId(),
             codeTransformJobId: jobId,
             codeTransformMetadata: CodeTransformTelemetryState.instance.getCodeTransformMetaDataString(),
             result: hilResult,
-            // TODO: make a generic reason field for telemetry logging so we don't log sensitive PII data
             reason: hilResult === MetadataResult.Fail ? 'Runtime error occurred' : undefined,
         })
         await HumanInTheLoopManager.instance.cleanUpArtifacts()
@@ -505,7 +497,7 @@ export async function startTransformationJob(
         throw new JobStartError()
     }
 
-    await sleep(2000) // sleep before polling job to prevent ThrottlingException
+    await sleep(5000) // sleep before polling job status to prevent ThrottlingException
     throwIfCancelled()
 
     return jobId
@@ -524,9 +516,7 @@ export async function pollTransformationStatusUntilPlanReady(jobId: string, prof
             transformByQState.setJobFailureErrorChatMessage(CodeWhispererConstants.failedToCompleteJobChatMessage)
         }
 
-        // Since we don't yet have a good way of knowing what the error was,
-        // we try to fetch any build failure artifacts that may exist so that we can optionally
-        // show them to the user if they exist.
+        // try to download pre-build error logs if available
         let pathToLog = ''
         try {
             const tempToolkitFolder = await makeTemporaryToolkitFolder()
@@ -713,23 +703,16 @@ export async function postTransformationJob() {
     const durationInMs = calculateTotalLatency(CodeTransformTelemetryState.instance.getStartTime())
     const resultStatusMessage = transformByQState.getStatus()
 
-    if (transformByQState.getTransformationType() !== TransformationType.SQL_CONVERSION) {
-        // the below is only applicable when user is doing a Java 8/11 language upgrade
-        const versionInfo = await getVersionData()
-        const mavenVersionInfoMessage = `${versionInfo[0]} (${transformByQState.getMavenName()})`
-        const javaVersionInfoMessage = `${versionInfo[1]} (${transformByQState.getMavenName()})`
-
-        telemetry.codeTransform_totalRunTime.emit({
-            buildSystemVersion: mavenVersionInfoMessage,
-            codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId(),
-            codeTransformJobId: transformByQState.getJobId(),
-            codeTransformResultStatusMessage: resultStatusMessage,
-            codeTransformRunTimeLatency: durationInMs,
-            codeTransformLocalJavaVersion: javaVersionInfoMessage,
-            result: resultStatusMessage === TransformByQStatus.Succeeded ? MetadataResult.Pass : MetadataResult.Fail,
-            reason: `${resultStatusMessage}-${chatMessage}`,
-        })
-    }
+    telemetry.codeTransform_totalRunTime.emit({
+        codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId(),
+        codeTransformJobId: transformByQState.getJobId(),
+        codeTransformResultStatusMessage: resultStatusMessage,
+        codeTransformRunTimeLatency: durationInMs,
+        result:
+            transformByQState.isSucceeded() || transformByQState.isPartiallySucceeded()
+                ? MetadataResult.Pass
+                : MetadataResult.Fail,
+    })
 
     if (transformByQState.isSucceeded()) {
         void vscode.window.showInformationMessage(CodeWhispererConstants.jobCompletedNotification(diffMessage), {
@@ -752,9 +735,14 @@ export async function postTransformationJob() {
             })
     }
 
-    if (transformByQState.getPayloadFilePath() !== '') {
+    if (transformByQState.getPayloadFilePath()) {
         // delete original upload ZIP at very end of transformation
-        fs.rmSync(transformByQState.getPayloadFilePath(), { recursive: true, force: true })
+        fs.rmSync(transformByQState.getPayloadFilePath(), { force: true })
+    }
+    // delete temporary build logs file
+    const logFilePath = path.join(os.tmpdir(), 'build-logs.txt')
+    if (fs.existsSync(logFilePath)) {
+        fs.rmSync(logFilePath, { force: true })
     }
 
     // attempt download for user
@@ -772,12 +760,9 @@ export async function transformationJobErrorHandler(error: any) {
         // jobFailureErrorNotification should always be defined here
         let displayedErrorMessage =
             transformByQState.getJobFailureErrorNotification() ?? CodeWhispererConstants.failedToCompleteJobNotification
-        if (transformByQState.getJobFailureMetadata() !== '') {
-            displayedErrorMessage += ` ${transformByQState.getJobFailureMetadata()}`
-            transformByQState.setJobFailureErrorChatMessage(
-                `${transformByQState.getJobFailureErrorChatMessage()} ${transformByQState.getJobFailureMetadata()}`
-            )
-        }
+        transformByQState.setJobFailureErrorChatMessage(
+            transformByQState.getJobFailureErrorChatMessage() ?? CodeWhispererConstants.failedToCompleteJobChatMessage
+        )
         void vscode.window
             .showErrorMessage(displayedErrorMessage, CodeWhispererConstants.amazonQFeedbackText)
             .then((choice) => {