PR fixes: refactoring, syntax changes

tgodara-aws · tgodara-aws · commit d9ccc41435de · 2025-08-01T12:22:28.000-07:00
diff --git a/packages/core/src/amazonqGumby/activation.ts b/packages/core/src/amazonqGumby/activation.ts
@@ -72,6 +72,13 @@ export async function activate(context: ExtContext) {
             )
         }),
 
+        Commands.register(
+            'aws.amazonq.transformationHub.updateContent',
+            async (button, startTime, historyFileUpdated) => {
+                await transformationHubViewProvider.updateContent(button, startTime, historyFileUpdated)
+            }
+        ),
+
         workspaceChangeEvent
     )
 }
diff --git a/packages/core/src/amazonqGumby/chat/controller/controller.ts b/packages/core/src/amazonqGumby/chat/controller/controller.ts
@@ -193,11 +193,11 @@ export class GumbyController {
         // check if any jobs potentially still in progress on backend
         const history = readHistoryFile()
         let numInProgress = 0
-        history.forEach((job) => {
+        for (const job of history) {
             if (job.status === 'FAILED') {
                 numInProgress += 1
             }
-        })
+        }
         this.messenger.sendViewHistoryMessage(message.tabID, numInProgress)
         if (transformByQState.isRefreshInProgress()) {
             this.messenger.sendMessage(CodeWhispererConstants.refreshInProgressChatMessage, message.tabID, 'ai-prompt')
diff --git a/packages/core/src/codewhisperer/commands/startTransformByQ.ts b/packages/core/src/codewhisperer/commands/startTransformByQ.ts
@@ -749,15 +749,14 @@ export async function postTransformationJob() {
             })
     }
 
+    // delete original upload ZIP at very end of transformation
+    fs.rmSync(transformByQState.getPayloadFilePath(), { force: true })
+
     if (
         transformByQState.isSucceeded() ||
         transformByQState.isPartiallySucceeded() ||
         transformByQState.isCancelled()
     ) {
-        if (transformByQState.getPayloadFilePath()) {
-            // delete original upload ZIP at very end of transformation
-            fs.rmSync(transformByQState.getPayloadFilePath(), { force: true })
-        }
         // delete the copy of the upload ZIP
         fs.rmSync(path.join(transformByQState.getJobHistoryPath(), 'zipped-code.zip'), { force: true })
         // delete transformation job metadata file (no longer needed)
@@ -801,7 +800,7 @@ export async function postTransformationJob() {
         ]
 
         const jobDetails = fields.join('\t') + '\n'
-        fs.writeFileSync(historyLogFilePath, jobDetails, { flag: 'a' })
+        fs.writeFileSync(historyLogFilePath, jobDetails, { flag: 'a' }) // 'a' flag used to append to file
         await vscode.commands.executeCommand(
             'aws.amazonq.transformationHub.updateContent',
             'job history',
diff --git a/packages/core/src/codewhisperer/models/constants.ts b/packages/core/src/codewhisperer/models/constants.ts
@@ -935,3 +935,13 @@ export const predictionTrackerDefaultConfig = {
 }
 
 export const findingsSuffix = '_codeReviewFindings'
+
+export interface HistoryObject {
+    startTime: string
+    projectName: string
+    status: string
+    duration: string
+    diffPath: string
+    summaryPath: string
+    jobId: string
+}
diff --git a/packages/core/src/codewhisperer/models/model.ts b/packages/core/src/codewhisperer/models/model.ts
@@ -1157,6 +1157,7 @@ export class TransformByQState {
         this.buildLog = ''
         this.customBuildCommand = ''
         this.intervalId = undefined
+        this.jobHistoryPath = ''
     }
 }
 
diff --git a/packages/core/src/codewhisperer/service/transformByQ/transformationHubViewProvider.ts b/packages/core/src/codewhisperer/service/transformByQ/transformationHubViewProvider.ts
@@ -26,36 +26,19 @@ import { startInterval, pollTransformationStatusUntilComplete } from '../../comm
 import { CodeTransformTelemetryState } from '../../../amazonqGumby/telemetry/codeTransformTelemetryState'
 import { convertToTimeString, isWithin30Days } from '../../../shared/datetime'
 import { AuthUtil } from '../../util/authUtil'
-import fs from 'fs'
+import fs from 'fs' // eslint-disable-line no-restricted-imports
 import path from 'path'
 import os from 'os'
 import { ChatSessionManager } from '../../../amazonqGumby/chat/storages/chatSession'
 import { setMaven } from './transformFileHandler'
 
-interface HistoryObject {
-    startTime: string
-    projectName: string
-    status: string
-    duration: string
-    diffPath: string
-    summaryPath: string
-    jobId: string
-}
-
 export class TransformationHubViewProvider implements vscode.WebviewViewProvider {
     public static readonly viewType = 'aws.amazonq.transformationHub'
     private _view?: vscode.WebviewView
     private lastClickedButton: string = ''
     private _extensionUri: vscode.Uri = globals.context.extensionUri
-    private transformationHistory: HistoryObject[] = []
-    constructor() {
-        vscode.commands.registerCommand(
-            'aws.amazonq.transformationHub.updateContent',
-            (button: 'job history' | 'plan progress', startTime?: number, historyFileUpdated?: boolean) => {
-                return this.updateContent(button, startTime, historyFileUpdated)
-            }
-        )
-    }
+    private transformationHistory: CodeWhispererConstants.HistoryObject[] = []
+    constructor() {}
     static #instance: TransformationHubViewProvider
 
     public async updateContent(
@@ -101,13 +84,13 @@ export class TransformationHubViewProvider implements vscode.WebviewViewProvider
         this._view.webview.onDidReceiveMessage((message) => {
             switch (message.command) {
                 case 'refreshJob':
-                    this.refreshJob(message.jobId, message.currentStatus, message.projectName)
+                    void this.refreshJob(message.jobId, message.currentStatus, message.projectName)
                     break
                 case 'openSummaryPreview':
-                    vscode.commands.executeCommand('markdown.showPreview', vscode.Uri.file(message.filePath))
+                    void vscode.commands.executeCommand('markdown.showPreview', vscode.Uri.file(message.filePath))
                     break
                 case 'openDiffFile':
-                    vscode.commands.executeCommand('vscode.open', vscode.Uri.file(message.filePath))
+                    void vscode.commands.executeCommand('vscode.open', vscode.Uri.file(message.filePath))
                     break
             }
         })
@@ -132,7 +115,7 @@ export class TransformationHubViewProvider implements vscode.WebviewViewProvider
     }
 
     private showJobHistory(): string {
-        const jobsToDisplay: HistoryObject[] = [...this.transformationHistory]
+        const jobsToDisplay: CodeWhispererConstants.HistoryObject[] = [...this.transformationHistory]
         if (transformByQState.isRunning()) {
             const current = sessionJobHistory[transformByQState.getJobId()]
             jobsToDisplay.unshift({
@@ -202,7 +185,7 @@ export class TransformationHubViewProvider implements vscode.WebviewViewProvider
             </html>`
     }
 
-    private getTableMarkup(history: HistoryObject[]) {
+    private getTableMarkup(history: CodeWhispererConstants.HistoryObject[]) {
         return `
             <style>
             .refresh-btn {
@@ -286,16 +269,16 @@ export class TransformationHubViewProvider implements vscode.WebviewViewProvider
                     transformationJobId: jobId,
                     profileArn: undefined,
                 })
-                status = response.transformationJob.status!
+                status = response.transformationJob.status ?? currentStatus
                 if (response.transformationJob.endExecutionTime && response.transformationJob.creationTime) {
                     duration = convertToTimeString(
                         response.transformationJob.endExecutionTime.getTime() -
                             response.transformationJob.creationTime.getTime()
                     )
                 }
 
-                getLogger().info(
-                    'Code Transformation: Job Id: %s\nFetched status: %s\nDuration: %s',
+                getLogger().debug(
+                    'Code Transformation: Job refresh - Fetched status for job id: %s\n{Status: %s; Duration: %s}',
                     jobId,
                     status,
                     duration
@@ -333,94 +316,34 @@ export class TransformationHubViewProvider implements vscode.WebviewViewProvider
             }
             transformByQState.setRefreshInProgress(true)
             const messenger = transformByQState.getChatMessenger()
-            if (messenger) {
-                messenger.sendJobRefreshInProgressMessage(ChatSessionManager.Instance.getSession().tabID!, jobId)
-            }
+            const tabID = ChatSessionManager.Instance.getSession().tabID
+            messenger?.sendJobRefreshInProgressMessage(tabID!, jobId)
+            void this.updateContent('job history') // refreshing the table disables all jobs' refresh buttons while this one is resuming
 
-            // set state to prepare to resume job
-            transformByQState.setJobId(jobId)
-            transformByQState.setPolledJobStatus(status)
+            // resume job and bring to completion
             try {
-                transformByQState.setJobHistoryPath(path.join(os.homedir(), '.aws', 'transform', projectName, jobId))
-                const metadataFile = fs.readFileSync(path.join(transformByQState.getJobHistoryPath(), 'metadata.txt'), {
-                    encoding: 'utf8',
-                    flag: 'r',
-                })
-                const metadata = metadataFile.split('\t')
-                transformByQState.setTransformationType(metadata[1] as TransformationType)
-                transformByQState.setSourceJDKVersion(metadata[2] as JDKVersion)
-                transformByQState.setTargetJDKVersion(metadata[3] as JDKVersion)
-                transformByQState.setCustomDependencyVersionFilePath(metadata[4])
-                transformByQState.setPayloadFilePath(
-                    path.join(os.homedir(), '.aws', 'transform', projectName, jobId, 'zipped-code.zip')
-                )
-                setMaven()
-                transformByQState.setCustomBuildCommand(metadata[5])
-                transformByQState.setTargetJavaHome(metadata[6])
-                transformByQState.setProjectPath(metadata[7])
-                transformByQState.setStartTime(metadata[8])
+                status = await this.resumeJob(jobId, projectName, status)
             } catch (e: any) {
-                // reaching this means there was most likely a problem with the metadata file
-                getLogger().error('Code Transformation: Error setting job state: %s', (e as Error).message)
+                getLogger().error('Code Transformation: Error resuming job (id: %s): %s', jobId, (e as Error).message)
                 transformByQState.setJobDefaults()
-                if (messenger) {
-                    messenger.sendJobFinishedMessage(
-                        ChatSessionManager.Instance.getSession().tabID!,
-                        CodeWhispererConstants.refreshErrorChatMessage
-                    )
-                }
+                messenger?.sendJobFinishedMessage(tabID!, CodeWhispererConstants.refreshErrorChatMessage)
                 void vscode.window.showErrorMessage(CodeWhispererConstants.refreshErrorNotification(jobId))
+                void this.updateContent('job history')
                 return
             }
 
-            // resume polling job
-            try {
-                this.updateContent('job history') // refreshing the table disables all jobs' refresh buttons while this one is polling
-                status = await pollTransformationStatusUntilComplete(
-                    jobId,
-                    AuthUtil.instance.regionProfileManager.activeRegionProfile
-                )
-                if (
-                    CodeWhispererConstants.validStatesForCheckingDownloadUrl.includes(status) &&
-                    !CodeWhispererConstants.failureStates.includes(status)
-                ) {
-                    duration = convertToTimeString(
-                        new Date().getTime() - new Date(transformByQState.getStartTime()).getTime()
-                    )
-                    jobHistoryPath = await this.retrieveArtifacts(jobId, projectName)
-                    // delete payload and metadata files
-                    if (transformByQState.getPayloadFilePath()) {
-                        fs.rmSync(transformByQState.getPayloadFilePath(), { force: true })
-                    }
-                    fs.rmSync(path.join(transformByQState.getJobHistoryPath(), 'metadata.txt'), { 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 })
-                    }
-                }
-            } catch (e: any) {
-                getLogger().error('Code Transformation: Error resuming job (id: %s): %s', jobId, (e as Error).message)
-                transformByQState.setJobDefaults()
-                if (messenger) {
-                    messenger.sendJobFinishedMessage(
-                        ChatSessionManager.Instance.getSession().tabID!,
-                        CodeWhispererConstants.refreshErrorChatMessage
-                    )
-                }
-                void vscode.window.showErrorMessage(CodeWhispererConstants.refreshErrorNotification(jobId))
-                this.updateContent('job history') // re-enable refresh buttons
-                return
+            // download artifacts if available
+            if (
+                CodeWhispererConstants.validStatesForCheckingDownloadUrl.includes(status) &&
+                !CodeWhispererConstants.failureStates.includes(status)
+            ) {
+                duration = convertToTimeString(Date.now() - new Date(transformByQState.getStartTime()).getTime())
+                jobHistoryPath = await this.retrieveArtifacts(jobId, projectName)
             }
 
             // reset state
             transformByQState.setJobDefaults()
-            if (messenger) {
-                messenger.sendJobFinishedMessage(
-                    ChatSessionManager.Instance.getSession().tabID!,
-                    CodeWhispererConstants.refreshCompletedChatMessage
-                )
-            }
+            messenger?.sendJobFinishedMessage(tabID!, CodeWhispererConstants.refreshCompletedChatMessage)
         } else {
             // FAILED or STOPPED job
             getLogger().info('Code Transformation: No artifacts available to download (job status = %s)', status)
@@ -472,10 +395,8 @@ export class TransformationHubViewProvider implements vscode.WebviewViewProvider
             } catch (error) {
                 jobHistoryPath = ''
             } finally {
-                if (fs.existsSync(resultsPath)) {
-                    fs.rmSync(resultsPath, { recursive: true, force: true })
-                }
-                getLogger().info('Code Transformation: Deleted temporary extraction directory')
+                // delete temporary extraction directory
+                fs.rmSync(resultsPath, { recursive: true, force: true })
             }
         }
         return jobHistoryPath
@@ -489,7 +410,7 @@ export class TransformationHubViewProvider implements vscode.WebviewViewProvider
             const jobs = historyFile.split('\n')
             jobs.shift() // removes headers
             if (jobs.length > 0) {
-                jobs.forEach((job) => {
+                for (const job of jobs) {
                     if (job) {
                         const jobInfo = job.split('\t')
                         // startTime: jobInfo[0], projectName: jobInfo[1], status: jobInfo[2], duration: jobInfo[3], diffPath: jobInfo[4], summaryPath: jobInfo[5], jobId: jobInfo[6]
@@ -506,7 +427,7 @@ export class TransformationHubViewProvider implements vscode.WebviewViewProvider
                         }
                         history.push(jobInfo)
                     }
-                })
+                }
             }
         }
         if (history.length > 0) {
@@ -520,6 +441,50 @@ export class TransformationHubViewProvider implements vscode.WebviewViewProvider
         }
     }
 
+    private async resumeJob(jobId: string, projectName: string, status: string) {
+        // set state to prepare to resume job
+        await this.setupTransformationState(jobId, projectName, status)
+        // resume polling the job
+        return await this.pollAndCompleteTransformation(jobId)
+    }
+
+    private async setupTransformationState(jobId: string, projectName: string, status: string) {
+        transformByQState.setJobId(jobId)
+        transformByQState.setPolledJobStatus(status)
+        transformByQState.setJobHistoryPath(path.join(os.homedir(), '.aws', 'transform', projectName, jobId))
+        const metadataFile = fs.readFileSync(path.join(transformByQState.getJobHistoryPath(), 'metadata.txt'), {
+            encoding: 'utf8',
+            flag: 'r',
+        })
+        const metadata = metadataFile.split('\t')
+        transformByQState.setTransformationType(metadata[1] as TransformationType)
+        transformByQState.setSourceJDKVersion(metadata[2] as JDKVersion)
+        transformByQState.setTargetJDKVersion(metadata[3] as JDKVersion)
+        transformByQState.setCustomDependencyVersionFilePath(metadata[4])
+        transformByQState.setPayloadFilePath(
+            path.join(os.homedir(), '.aws', 'transform', projectName, jobId, 'zipped-code.zip')
+        )
+        setMaven()
+        transformByQState.setCustomBuildCommand(metadata[5])
+        transformByQState.setTargetJavaHome(metadata[6])
+        transformByQState.setProjectPath(metadata[7])
+        transformByQState.setStartTime(metadata[8])
+    }
+
+    private async pollAndCompleteTransformation(jobId: string) {
+        const status = await pollTransformationStatusUntilComplete(
+            jobId,
+            AuthUtil.instance.regionProfileManager.activeRegionProfile
+        )
+        // delete payload and metadata files
+        fs.rmSync(transformByQState.getPayloadFilePath(), { force: true })
+        fs.rmSync(path.join(transformByQState.getJobHistoryPath(), 'metadata.txt'), { force: true })
+        // delete temporary build logs file
+        const logFilePath = path.join(os.tmpdir(), 'build-logs.txt')
+        fs.rmSync(logFilePath, { force: true })
+        return status
+    }
+
     private generateTransformationStepMarkup(
         name: string,
         startTime: Date | undefined,
@@ -928,8 +893,8 @@ export class TransformationHubViewProvider implements vscode.WebviewViewProvider
     }
 }
 
-export function readHistoryFile(): HistoryObject[] {
-    const history: HistoryObject[] = []
+export function readHistoryFile(): CodeWhispererConstants.HistoryObject[] {
+    const history: CodeWhispererConstants.HistoryObject[] = []
     const jobHistoryFilePath = path.join(os.homedir(), '.aws', 'transform', 'transformation_history.tsv')
     if (fs.existsSync(jobHistoryFilePath)) {
         const historyFile = fs.readFileSync(jobHistoryFilePath, { encoding: 'utf8', flag: 'r' })
diff --git a/packages/core/src/test/amazonqGumby/transformationJobHistory.test.ts b/packages/core/src/test/amazonqGumby/transformationJobHistory.test.ts

Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,13 @@ export async function activate(context: ExtContext) {`
`72`	`72`	`)`
`73`	`73`	`}),`
`74`	`74`
	`75`	`+ Commands.register(`
	`76`	`+ 'aws.amazonq.transformationHub.updateContent',`
	`77`	`+ async (button, startTime, historyFileUpdated) => {`
	`78`	`+ await transformationHubViewProvider.updateContent(button, startTime, historyFileUpdated)`
	`79`	`+ }`
	`80`	`+ ),`
	`81`	`+`
`75`	`82`	`workspaceChangeEvent`
`76`	`83`	`)`
`77`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1157,6 +1157,7 @@ export class TransformByQState {`
`1157`	`1157`	`this.buildLog = ''`
`1158`	`1158`	`this.customBuildCommand = ''`
`1159`	`1159`	`this.intervalId = undefined`
	`1160`	`+ this.jobHistoryPath = ''`
`1160`	`1161`	`}`
`1161`	`1162`	`}`
`1162`	`1163`