final csb commit

Author: David Hasani

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

@@ -150,7 +150,7 @@ describe('Amazon Q Code Transformation', function () {
                 waitIntervalInMs: 1000,
             })
 
-            // Add this back when custom 1P upgrades support is ready
+            // TO-DO: add this back when releasing CSB
             /*
             const customDependencyVersionPrompt = tab.getChatItems().pop()
             assert.strictEqual(

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

@@ -57,7 +57,7 @@ import {
     openBuildLogFile,
     parseBuildFile,
     validateSQLMetadataFile,
-    validateYamlFile,
+    validateCustomVersionsFile,
 } from '../../../codewhisperer/service/transformByQ/transformFileHandler'
 import { getAuthType } from '../../../auth/utils'
 import fs from '../../../shared/fs/fs'
@@ -461,7 +461,7 @@ export class GumbyController {
 
             this.messenger.sendOneOrMultipleDiffsMessage(oneOrMultipleDiffsSelection, message.tabID)
             this.promptJavaHome('source', message.tabID)
-            // When custom 1P upgrades ready, delete line above and uncomment line below
+            // TO-DO: delete line above and uncomment line below when releasing CSB
             // await this.messenger.sendCustomDependencyVersionMessage(message.tabID)
         })
     }
@@ -586,15 +586,17 @@ export class GumbyController {
             canSelectMany: false,
             openLabel: 'Select',
             filters: {
-                '.YAML file': ['yaml'], // Restrict user to only pick a .yaml file
+                'YAML file': ['yaml'], // restrict user to only pick a .yaml file
             },
         })
         if (!fileUri || fileUri.length === 0) {
             return
         }
         const fileContents = await fs.readFileText(fileUri[0].fsPath)
-        const isValidYaml = await validateYamlFile(fileContents, message)
-        if (!isValidYaml) {
+        const isValidFile = await validateCustomVersionsFile(fileContents)
+
+        if (!isValidFile) {
+            this.messenger.sendUnrecoverableErrorResponse('invalid-custom-versions-file', message.tabID)
             return
         }
         this.messenger.sendMessage('Received custom dependency version YAML file.', message.tabID, 'ai-prompt')
@@ -686,7 +688,13 @@ export class GumbyController {
                 const pathToJavaHome = extractPath(data.message)
                 if (pathToJavaHome) {
                     transformByQState.setSourceJavaHome(pathToJavaHome)
-                    this.promptJavaHome('target', data.tabID) // get target JDK path right after saving source JDK path
+                    // if source and target JDK versions are the same, just re-use the source JAVA_HOME and start the build
+                    if (transformByQState.getTargetJDKVersion() === transformByQState.getSourceJDKVersion()) {
+                        transformByQState.setTargetJavaHome(pathToJavaHome)
+                        await this.prepareLanguageUpgradeProject(data.tabID)
+                    } else {
+                        this.promptJavaHome('target', data.tabID)
+                    }
                 } else {
                     this.messenger.sendUnrecoverableErrorResponse('invalid-java-home', data.tabID)
                 }

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

@@ -50,7 +50,7 @@ export type UnrecoverableErrorType =
     | 'job-start-failed'
     | 'unsupported-source-db'
     | 'unsupported-target-db'
-    | 'missing-yaml-key'
+    | 'invalid-custom-versions-file'
     | 'error-parsing-sct-file'
     | 'invalid-zip-no-sct-file'
     | 'invalid-from-to-jdk'
@@ -462,8 +462,8 @@ export class Messenger {
             case 'unsupported-target-db':
                 message = CodeWhispererConstants.invalidMetadataFileUnsupportedTargetDB
                 break
-            case 'missing-yaml-key':
-                message = CodeWhispererConstants.invalidYamlFileMissingKey
+            case 'invalid-custom-versions-file':
+                message = CodeWhispererConstants.invalidCustomVersionsFileMessage
                 break
             case 'error-parsing-sct-file':
                 message = CodeWhispererConstants.invalidMetadataFileErrorParsing
@@ -647,7 +647,7 @@ ${codeSnippet}
         this.sendInProgressMessage(tabID, message)
     }
 
-    public sendInProgressMessage(tabID: string, message: string, messageName?: string) {
+    public sendInProgressMessage(tabID: string, message: string) {
         this.dispatcher.sendAsyncEventProgress(
             new AsyncEventProgressMessage(tabID, { inProgress: true, message: undefined })
         )

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

@@ -117,7 +117,7 @@ export async function compileProject() {
         await prepareProjectDependencies(dependenciesFolder, modulePath)
     } catch (err) {
         // open build-logs.txt file to show user error logs
-        await writeAndShowBuildLogs()
+        await writeAndShowBuildLogs(true)
         throw err
     }
 }

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

@@ -599,8 +599,8 @@ export const invalidMetadataFileUnsupportedSourceDB =
 export const invalidMetadataFileUnsupportedTargetDB =
     'I can only convert SQL for migrations to Aurora PostgreSQL or Amazon RDS for PostgreSQL target databases. The provided .sct file indicates another target database for this migration.'
 
-export const invalidYamlFileMissingKey =
-    'Your YAML file is not formatted correctly. Make sure that the .yaml file you upload follows the format of the sample file provided.'
+export const invalidCustomVersionsFileMessage =
+    'Your .YAML file is not formatted correctly. Make sure that the .YAML file you upload follows the format of the sample file provided.'
 
 export const invalidMetadataFileErrorParsing =
     "It looks like the .sct file you provided isn't valid. Make sure that you've uploaded the .zip file you retrieved from your schema conversion in AWS DMS."

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

@@ -685,7 +685,8 @@ export class ZipManifest {
     buildLogs: string = 'build-logs.txt'
     version: string = '1.0'
     hilCapabilities: string[] = ['HIL_1pDependency_VersionUpgrade']
-    transformCapabilities: string[] = ['EXPLAINABILITY_V1', 'CLIENT_SIDE_BUILD']
+    // TO-DO: add 'CLIENT_SIDE_BUILD' here when releasing
+    transformCapabilities: string[] = ['EXPLAINABILITY_V1']
     customBuildCommand: string = 'clean test'
     requestedConversions?: {
         sqlConversion?: {

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

@@ -54,6 +54,7 @@ import { UserWrittenCodeTracker } from '../../tracker/userWrittenCodeTracker'
 import { AuthUtil } from '../../util/authUtil'
 import { DiffModel } from './transformationResultsViewProvider'
 import { spawnSync } from 'child_process' // eslint-disable-line no-restricted-imports
+import { isClientSideBuildEnabled } from '../../../dev/config'
 
 export function getSha256(buffer: Buffer) {
     const hasher = crypto.createHash('sha256')
@@ -395,6 +396,7 @@ export async function zipCode(
             dependenciesCopied = true
         }
 
+        // TO-DO: decide where exactly to put the YAML file / what to name it
         if (transformByQState.getCustomDependencyVersionFilePath() && zipManifest instanceof ZipManifest) {
             zip.addLocalFile(
                 transformByQState.getCustomDependencyVersionFilePath(),
@@ -701,7 +703,9 @@ export async function pollTransformationJob(jobId: string, validStates: string[]
                 break
             }
 
+            // TO-DO: remove isClientSideBuildEnabled when releasing CSB
             if (
+                isClientSideBuildEnabled &&
                 status === 'TRANSFORMING' &&
                 transformByQState.getTransformationType() === TransformationType.LANGUAGE_UPGRADE
             ) {

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

@@ -27,13 +27,14 @@ export function getDependenciesFolderInfo(): FolderInfo {
     }
 }
 
-export async function writeAndShowBuildLogs() {
+export async function writeAndShowBuildLogs(isLocalInstall: boolean = false) {
     const logFilePath = path.join(os.tmpdir(), 'build-logs.txt')
     writeFileSync(logFilePath, transformByQState.getBuildLog())
     const doc = await vscode.workspace.openTextDocument(logFilePath)
     if (!transformByQState.getBuildLog().includes('clean install succeeded')) {
-        // only show the log if the build failed
-        await vscode.window.showTextDocument(doc, { viewColumn: vscode.ViewColumn.Two })
+        // only show the log if the build failed; show it in second column for intermediate builds only
+        const options = isLocalInstall ? undefined : { viewColumn: vscode.ViewColumn.Two }
+        await vscode.window.showTextDocument(doc, options)
     }
     return logFilePath
 }
@@ -115,12 +116,11 @@ export async function parseBuildFile() {
     return undefined
 }
 
-export async function validateYamlFile(fileContents: string, message: any) {
+export async function validateCustomVersionsFile(fileContents: string) {
     const requiredKeys = ['dependencyManagement:', 'identifier:', 'targetVersion:']
     for (const key of requiredKeys) {
         if (!fileContents.includes(key)) {
-            getLogger().info(`CodeTransformation: missing yaml key: ${key}`)
-            transformByQState.getChatMessenger()?.sendUnrecoverableErrorResponse('missing-yaml-key', message.tabID)
+            getLogger().info(`CodeTransformation: .YAML file is missing required key: ${key}`)
             return false
         }
     }

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

@@ -11,7 +11,7 @@ import { spawnSync } from 'child_process' // eslint-disable-line no-restricted-i
 import { CodeTransformBuildCommand, telemetry } from '../../../shared/telemetry/telemetry'
 import { CodeTransformTelemetryState } from '../../../amazonqGumby/telemetry/codeTransformTelemetryState'
 import { ToolkitError } from '../../../shared/errors'
-import { setMaven, writeAndShowBuildLogs } from './transformFileHandler'
+import { setMaven } from './transformFileHandler'
 import { throwIfCancelled } from './transformApiHandler'
 import { sleep } from '../../../shared/utilities/timeoutUtils'
 
@@ -58,7 +58,7 @@ function installProjectDependencies(dependenciesFolder: FolderInfo, modulePath:
             )
             throw new ToolkitError(`Maven ${argString} error`, { code: 'MavenExecutionError' })
         } else {
-            transformByQState.appendToBuildLog(`Maven clean install succeeded`)
+            transformByQState.appendToBuildLog(`mvn clean install succeeded`)
         }
     })
 }
@@ -75,8 +75,6 @@ function copyProjectDependencies(dependenciesFolder: FolderInfo, modulePath: str
         '-q',
     ]
 
-    transformByQState.appendToBuildLog(`Running ${baseCommand} ${args.join(' ')}`)
-
     let environment = process.env
     if (transformByQState.getSourceJavaHome()) {
         environment = { ...process.env, JAVA_HOME: transformByQState.getSourceJavaHome() }
@@ -93,13 +91,10 @@ function copyProjectDependencies(dependenciesFolder: FolderInfo, modulePath: str
         let errorLog = ''
         errorLog += spawnResult.error ? JSON.stringify(spawnResult.error) : ''
         errorLog += `${spawnResult.stderr}\n${spawnResult.stdout}`
-        transformByQState.appendToBuildLog(`${baseCommand} ${args} failed: \n ${errorLog}`)
         getLogger().info(
             `CodeTransformation: Maven command ${baseCommand} ${args} failed, but still continuing with transformation: ${errorLog}`
         )
         throw new Error('Maven copy-deps error')
-    } else {
-        transformByQState.appendToBuildLog(`Maven dependency:copy-dependencies succeeded`)
     }
 }
 
@@ -122,8 +117,6 @@ export async function prepareProjectDependencies(dependenciesFolder: FolderInfo,
         installProjectDependencies(dependenciesFolder, rootPomPath)
     } catch (err) {
         void vscode.window.showErrorMessage(CodeWhispererConstants.cleanInstallErrorNotification)
-        // open build-logs.txt file to show user error logs
-        await writeAndShowBuildLogs()
         throw err
     }
 

packages/core/src/dev/config.ts

@@ -10,3 +10,6 @@ export const betaUrl = {
     amazonq: '',
     toolkit: '',
 }
+
+// TO-DO: remove when releasing CSB
+export const isClientSideBuildEnabled = false