Minor fixes and PR fixes

Author: tgodara-aws

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

@@ -11,8 +11,7 @@ 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'
@@ -134,7 +133,7 @@ export async function copyArtifacts(pathToArchiveDir: string, pathToDestinationD
         getLogger().error('Code Transformation: Error saving local copy of artifacts: %s', (error as Error).message)
     }
 
-    const buildLogsPath = path.join(summaryPath, 'buildCommandOutput.log')
+    const buildLogsPath = path.join(path.dirname(summaryPath), 'buildCommandOutput.log')
     try {
         await fs.copy(buildLogsPath, path.join(pathToDestinationDir, 'summary', 'buildCommandOutput.log'))
     } catch (error) {
@@ -248,7 +247,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 +417,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/test/amazonqGumby/transformationJobHistory.test.ts

@@ -25,6 +25,27 @@ 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 () {