Minor fixes and PR fixes

Author: tgodara-aws

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

@@ -17,6 +17,8 @@ import { AbsolutePathDetectedError } from '../../../amazonqGumby/errors'
 import { getLogger } from '../../../shared/logger/logger'
 import AdmZip from 'adm-zip'
 import { IManifestFile } from './humanInTheLoopManager'
+import { ExportResultArchiveStructure } from '../../../shared/utilities/download'
+import { isFileNotFoundError } from '../../../shared/errors'
 
 export async function getDependenciesFolderInfo(): Promise<FolderInfo> {
     const dependencyFolderName = `${CodeWhispererConstants.dependencyFolderName}${globals.clock.Date.now()}`
@@ -348,3 +350,40 @@ export async function parseVersionsListFromPomFile(xmlString: string): Promise<I
 
     return { latestVersion, majorVersions, minorVersions, status }
 }
+
+/**
+ * Saves a copy of the diff patch, summary, and build logs (if any) locally
+ *
+ * @param pathToArchiveDir path to the archive directory where the artifacts are unzipped
+ * @param pathToDestinationDir destination directory (will create directories if path doesn't exist already)
+ */
+export async function copyArtifacts(pathToArchiveDir: string, pathToDestinationDir: string) {
+    // create destination path if doesn't exist already
+    // mkdir() will not raise an error if path exists
+    await fs.mkdir(pathToDestinationDir)
+
+    const diffPath = path.join(pathToArchiveDir, ExportResultArchiveStructure.PathToDiffPatch)
+    const summaryPath = path.join(pathToArchiveDir, ExportResultArchiveStructure.PathToSummary)
+
+    try {
+        await fs.copy(diffPath, path.join(pathToDestinationDir, 'diff.patch'))
+        // make summary directory if needed
+        await fs.mkdir(path.join(pathToDestinationDir, 'summary'))
+        await fs.copy(summaryPath, path.join(pathToDestinationDir, 'summary', 'summary.md'))
+    } catch (error) {
+        getLogger().error('Code Transformation: Error saving local copy of artifacts: %s', (error as Error).message)
+    }
+
+    const buildLogsPath = path.join(path.dirname(summaryPath), 'buildCommandOutput.log')
+    try {
+        await fs.copy(buildLogsPath, path.join(pathToDestinationDir, 'summary', 'buildCommandOutput.log'))
+    } catch (error) {
+        // build logs won't exist for SQL conversions (not an error)
+        if (!isFileNotFoundError(error)) {
+            getLogger().error(
+                'Code Transformation: Error saving local copy of build logs: %s',
+                (error as Error).message
+            )
+        }
+    }
+}

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

@@ -11,14 +11,12 @@ import * as CodeWhispererConstants from '../../models/constants'
 import { JDKVersion, TransformationType, transformByQState } from '../../models/model'
 import { getLogger } from '../../../shared/logger/logger'
 import { codeWhispererClient } from '../../../codewhisperer/client/codewhisperer'
-import { pollTransformationStatusUntilComplete } from '../../commands/startTransformByQ'
-import { downloadAndExtractResultArchive } from './transformApiHandler'
+import { downloadAndExtractResultArchive, pollTransformationJob } from './transformApiHandler'
 import { ChatSessionManager } from '../../../amazonqGumby/chat/storages/chatSession'
 import { AuthUtil } from '../../util/authUtil'
 import { setMaven } from './transformFileHandler'
 import { convertToTimeString, isWithin30Days } from '../../../shared/datetime'
-import { ExportResultArchiveStructure } from '../../../shared/utilities/download'
-import { isFileNotFoundError } from '../../../shared/errors'
+import { copyArtifacts } from './transformFileHandler'
 
 export interface HistoryObject {
     startTime: string
@@ -111,43 +109,6 @@ export async function createMetadataFile(payloadFilePath: string, metadata: JobM
     return jobHistoryPath
 }
 
-/**
- * Saves a copy of the diff patch, summary, and build logs (if any) locally
- *
- * @param pathToArchiveDir path to the archive directory where the artifacts are unzipped
- * @param pathToDestinationDir destination directory (will create directories if path doesn't exist already)
- */
-export async function copyArtifacts(pathToArchiveDir: string, pathToDestinationDir: string) {
-    // create destination path if doesn't exist already
-    // mkdir() will not raise an error if path exists
-    await fs.mkdir(pathToDestinationDir)
-
-    const diffPath = path.join(pathToArchiveDir, ExportResultArchiveStructure.PathToDiffPatch)
-    const summaryPath = path.join(pathToArchiveDir, ExportResultArchiveStructure.PathToSummary)
-
-    try {
-        await fs.copy(diffPath, path.join(pathToDestinationDir, 'diff.patch'))
-        // make summary directory if needed
-        await fs.mkdir(path.join(pathToDestinationDir, 'summary'))
-        await fs.copy(summaryPath, path.join(pathToDestinationDir, 'summary', 'summary.md'))
-    } catch (error) {
-        getLogger().error('Code Transformation: Error saving local copy of artifacts: %s', (error as Error).message)
-    }
-
-    const buildLogsPath = path.join(summaryPath, 'buildCommandOutput.log')
-    try {
-        await fs.copy(buildLogsPath, path.join(pathToDestinationDir, 'summary', 'buildCommandOutput.log'))
-    } catch (error) {
-        // build logs won't exist for SQL conversions (not an error)
-        if (!isFileNotFoundError(error)) {
-            getLogger().error(
-                'Code Transformation: Error saving local copy of build logs: %s',
-                (error as Error).message
-            )
-        }
-    }
-}
-
 /**
  * Writes job details to history file
  *
@@ -248,7 +209,7 @@ export async function refreshJob(jobId: string, currentStatus: string, projectNa
             getLogger().error('Code Transformation: Error fetching status (job id: %s): %s', jobId, errorMessage)
             if (errorMessage.includes('not authorized to make this call')) {
                 // job not available on backend
-                status = 'FAILED'
+                status = 'FAILED' // won't allow retries for this job
             } else {
                 // some other error (e.g. network error)
                 return
@@ -418,8 +379,9 @@ async function setupTransformationState(jobId: string, projectName: string, stat
 }
 
 async function pollAndCompleteTransformation(jobId: string) {
-    const status = await pollTransformationStatusUntilComplete(
+    const status = await pollTransformationJob(
         jobId,
+        CodeWhispererConstants.validStatesForCheckingDownloadUrl,
         AuthUtil.instance.regionProfileManager.activeRegionProfile
     )
     await cleanupTempJobFiles(transformByQState.getJobHistoryPath(), status, transformByQState.getPayloadFilePath())

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

@@ -22,7 +22,7 @@ import { setContext } from '../../../shared/vscode/setContext'
 import * as codeWhisperer from '../../client/codewhisperer'
 import { UserWrittenCodeTracker } from '../../tracker/userWrittenCodeTracker'
 import { AuthUtil } from '../../util/authUtil'
-import { copyArtifacts } from './transformationHistoryHandler'
+import { copyArtifacts } from './transformFileHandler'
 
 export abstract class ProposedChangeNode {
     abstract readonly resourcePath: string

packages/core/src/test/amazonqGumby/transformationJobHistory.test.ts

@@ -15,16 +15,37 @@ import {
     readHistoryFile,
     writeToHistoryFile,
     createMetadataFile,
-    copyArtifacts,
     cleanupTempJobFiles,
     refreshJob,
     JobMetadata,
 } from '../../codewhisperer/service/transformByQ/transformationHistoryHandler'
+import { copyArtifacts } from '../../codewhisperer/service/transformByQ/transformFileHandler'
 import * as transformApiHandler from '../../codewhisperer/service/transformByQ/transformApiHandler'
 import { ExportResultArchiveStructure } from '../../shared/utilities/download'
 import { JDKVersion, TransformationType } from '../../codewhisperer'
 
 describe('Transformation History Handler', function () {
+    function setupFileSystemMocks() {
+        const createdFiles = new Map<string, string>()
+        const createdDirs = new Set<string>()
+
+        // Mock file operations to track what gets created
+        sinon.stub(fs, 'mkdir').callsFake(async (dirPath: any) => {
+            createdDirs.add(dirPath.toString())
+        })
+        sinon.stub(fs, 'copy').callsFake(async (src: any, dest: any) => {
+            createdFiles.set(dest.toString(), `copied from ${src.toString()}`)
+        })
+        sinon.stub(fs, 'writeFile').callsFake(async (filePath: any, content: any) => {
+            createdFiles.set(filePath.toString(), content.toString())
+        })
+        sinon.stub(fs, 'delete').callsFake(async (filePath: any) => {
+            createdFiles.delete(filePath.toString())
+        })
+
+        return { createdFiles, createdDirs }
+    }
+
     afterEach(function () {
         sinon.restore()
     })
@@ -157,22 +178,9 @@ describe('Transformation History Handler', function () {
         }
 
         beforeEach(function () {
-            createdFiles = new Map()
-            createdDirs = new Set()
-
-            // Mock file operations to track what gets created
-            sinon.stub(fs, 'mkdir').callsFake(async (dirPath: any) => {
-                createdDirs.add(dirPath.toString())
-            })
-            sinon.stub(fs, 'copy').callsFake(async (src: any, dest: any) => {
-                createdFiles.set(dest.toString(), `copied from ${src.toString()}`)
-            })
-            sinon.stub(fs, 'writeFile').callsFake(async (filePath: any, content: any) => {
-                createdFiles.set(filePath.toString(), content.toString())
-            })
-            sinon.stub(fs, 'delete').callsFake(async (filePath: any) => {
-                createdFiles.delete(filePath.toString())
-            })
+            const mocks = setupFileSystemMocks()
+            createdFiles = mocks.createdFiles
+            createdDirs = mocks.createdDirs
         })
 
         it('Creates job history directory and metadata files', async function () {
@@ -229,16 +237,9 @@ describe('Transformation History Handler', function () {
         let createdDirs: Set<string>
 
         beforeEach(function () {
-            createdFiles = new Map()
-            createdDirs = new Set()
-
-            // Mock file operations to track what gets created
-            sinon.stub(fs, 'mkdir').callsFake(async (dirPath: any) => {
-                createdDirs.add(dirPath.toString())
-            })
-            sinon.stub(fs, 'copy').callsFake(async (src: any, dest: any) => {
-                createdFiles.set(dest.toString(), `copied from ${src.toString()}`)
-            })
+            const mocks = setupFileSystemMocks()
+            createdFiles = mocks.createdFiles
+            createdDirs = mocks.createdDirs
         })
 
         it('Copies diff patch and summary files to destination', async function () {