updated tests to account for no diff.json and performed e2e transformation assuming current download artifact workflow

ntarakad-aws · ntarakad-aws · commit 2e253bf3aeb2 · 2024-10-23T11:12:14.000-07:00
diff --git a/packages/amazonq/test/unit/amazonqGumby/resources/files/diff.json b/packages/amazonq/test/unit/amazonqGumby/resources/files/diff.json
@@ -0,0 +1,7 @@
+[
+    {
+        "name": "Added file",
+        "fileName": "resources/files/addedFile.diff",
+        "isSuccessful": true
+    }
+]
diff --git a/packages/amazonq/test/unit/amazonqGumby/transformationResultsHandler.test.ts b/packages/amazonq/test/unit/amazonqGumby/transformationResultsHandler.test.ts
@@ -12,10 +12,11 @@ import { getTestResourceFilePath } from './amazonQGumbyUtil'
 import { fs } from 'aws-core-vscode/shared'
 
 describe('DiffModel', function () {
-    let parsedTestDescription: PatchInfo
+    let parsedTestDescriptions: PatchInfo[]
     beforeEach(() => {
-        parsedTestDescription = JSON.parse(
-            '{"name": "Added file", "fileName": "resources/files/addedFile.diff", "isSuccessful": true}'
+        const fs = require('fs')
+        parsedTestDescriptions = JSON.parse(
+            fs.readFileSync(getTestResourceFilePath('resources/files/diff.json'), 'utf-8')
         )
     })
 
@@ -36,16 +37,15 @@ describe('DiffModel', function () {
 
             return true
         })
-
         testDiffModel.parseDiff(
             getTestResourceFilePath('resources/files/addedFile.diff'),
             workspacePath,
-            parsedTestDescription
+            parsedTestDescriptions[0]
         )
 
         assert.strictEqual(testDiffModel.patchFileNodes.length, 1)
         assert.strictEqual(testDiffModel.patchFileNodes[0].children.length, 1)
-        assert.strictEqual(testDiffModel.patchFileNodes[0].patchFilePath, parsedTestDescription.name)
+        assert.strictEqual(testDiffModel.patchFileNodes[0].patchFilePath, parsedTestDescriptions[0].name)
         const change = testDiffModel.patchFileNodes[0].children[0]
 
         assert.strictEqual(change instanceof AddedChangeNode, true)
@@ -66,12 +66,39 @@ describe('DiffModel', function () {
         testDiffModel.parseDiff(
             getTestResourceFilePath('resources/files/modifiedFile.diff'),
             workspacePath,
-            parsedTestDescription
+            parsedTestDescriptions[0]
         )
 
         assert.strictEqual(testDiffModel.patchFileNodes.length, 1)
         assert.strictEqual(testDiffModel.patchFileNodes[0].children.length, 1)
-        assert.strictEqual(testDiffModel.patchFileNodes[0].patchFilePath, parsedTestDescription.name)
+        assert.strictEqual(testDiffModel.patchFileNodes[0].patchFilePath, parsedTestDescriptions[0].name)
+        const change = testDiffModel.patchFileNodes[0].children[0]
+
+        assert.strictEqual(change instanceof ModifiedChangeNode, true)
+
+        await fs.delete(path.join(workspacePath, 'README.md'), { recursive: true })
+    })
+
+    it('WHEN parsing a diff patch where diff.json is not present and a file was modified THEN returns an array representing the modified file', async function () {
+        const testDiffModel = new DiffModel()
+
+        const workspacePath = os.tmpdir()
+
+        sinon.replace(fs, 'exists', async (path) => true)
+
+        await fs.writeFile(
+            path.join(workspacePath, 'README.md'),
+            'This guide walks you through using Gradle to build a simple Java project.'
+        )
+
+        testDiffModel.parseDiff(getTestResourceFilePath('resources/files/modifiedFile.diff'), workspacePath, undefined)
+
+        assert.strictEqual(testDiffModel.patchFileNodes.length, 1)
+        assert.strictEqual(testDiffModel.patchFileNodes[0].children.length, 1)
+        assert.strictEqual(
+            testDiffModel.patchFileNodes[0].patchFilePath,
+            getTestResourceFilePath('resources/files/modifiedFile.diff')
+        )
         const change = testDiffModel.patchFileNodes[0].children[0]
 
         assert.strictEqual(change instanceof ModifiedChangeNode, true)
diff --git a/packages/core/src/amazonqGumby/chat/controller/controller.ts b/packages/core/src/amazonqGumby/chat/controller/controller.ts
@@ -17,7 +17,7 @@ import { featureName } from '../../models/constants'
 import { AuthUtil } from '../../../codewhisperer/util/authUtil'
 import {
     cleanupTransformationJob,
-    // compileProject,
+    compileProject,
     finishHumanInTheLoop,
     getValidCandidateProjects,
     openBuildLogFile,
@@ -405,7 +405,7 @@ export class GumbyController {
         try {
             this.sessionStorage.getSession().conversationState = ConversationState.COMPILING
             this.messenger.sendCompilationInProgress(message.tabID)
-            // await compileProject()
+            await compileProject()
         } catch (err: any) {
             this.messenger.sendUnrecoverableErrorResponse('could-not-compile-project', message.tabID)
             // reset state to allow "Start a new transformation" button to work
diff --git a/packages/core/src/codewhisperer/commands/startTransformByQ.ts b/packages/core/src/codewhisperer/commands/startTransformByQ.ts
@@ -73,7 +73,7 @@ import { dependencyNoAvailableVersions } from '../../amazonqGumby/models/constan
 import { HumanInTheLoopManager } from '../service/transformByQ/humanInTheLoopManager'
 import { setContext } from '../../shared/vscode/setContext'
 import { makeTemporaryToolkitFolder } from '../../shared'
-// import globals from '../../shared/extensionGlobals'
+import globals from '../../shared/extensionGlobals'
 
 function getFeedbackCommentData() {
     const jobId = transformByQState.getJobId()
@@ -165,24 +165,24 @@ export function startInterval() {
 
 export async function startTransformByQ() {
     // Set the default state variables for our store and the UI
-    // const transformStartTime = globals.clock.Date.now()
+    const transformStartTime = globals.clock.Date.now()
     await setTransformationToRunningState()
 
     try {
         // Set webview UI to poll for progress
         startInterval()
 
         // step 1: CreateUploadUrl and upload code
-        // const uploadId = await preTransformationUploadCode()
+        const uploadId = await preTransformationUploadCode()
 
         // step 2: StartJob and store the returned jobId in TransformByQState
-        // const jobId = await startTransformationJob(uploadId, transformStartTime)
+        const jobId = await startTransformationJob(uploadId, transformStartTime)
 
         // step 3 (intermediate step): show transformation-plan.md file
-        // await pollTransformationStatusUntilPlanReady(jobId)
+        await pollTransformationStatusUntilPlanReady(jobId)
 
         // step 4: poll until artifacts are ready to download
-        await humanInTheLoopRetryLogic('jobId')
+        await humanInTheLoopRetryLogic(jobId)
     } catch (error: any) {
         await transformationJobErrorHandler(error)
     } finally {
@@ -201,8 +201,7 @@ export async function startTransformByQ() {
 export async function humanInTheLoopRetryLogic(jobId: string) {
     let status = ''
     try {
-        // status = await pollTransformationStatusUntilComplete(jobId)
-        status = 'COMPLETED'
+        status = await pollTransformationStatusUntilComplete(jobId)
         if (status === 'PAUSED') {
             const hilStatusFailure = await initiateHumanInTheLoopPrompt(jobId)
             if (hilStatusFailure) {
diff --git a/packages/core/src/codewhisperer/service/transformByQ/transformationResultsViewProvider.ts b/packages/core/src/codewhisperer/service/transformByQ/transformationResultsViewProvider.ts
@@ -3,21 +3,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-// import AdmZip from 'adm-zip'
+import AdmZip from 'adm-zip'
 import os from 'os'
 import fs from 'fs' // eslint-disable-line no-restricted-imports
 import { parsePatch, applyPatches, ParsedDiff } from 'diff'
 import path from 'path'
 import vscode from 'vscode'
-// import { ExportIntent } from '@amzn/codewhisperer-streaming'
+import { ExportIntent } from '@amzn/codewhisperer-streaming'
 import { TransformByQReviewStatus, transformByQState, PatchInfo } from '../../models/model'
-import { ExportResultArchiveStructure } from '../../../shared/utilities/download'
+import { ExportResultArchiveStructure, downloadExportResultArchive } from '../../../shared/utilities/download'
 import { getLogger } from '../../../shared/logger'
 import { telemetry } from '../../../shared/telemetry/telemetry'
 import { CodeTransformTelemetryState } from '../../../amazonqGumby/telemetry/codeTransformTelemetryState'
 import { MetadataResult } from '../../../shared/telemetry/telemetryClient'
 import * as CodeWhispererConstants from '../../models/constants'
-// import { createCodeWhispererChatStreamingClient } from '../../../shared/clients/codewhispererChatClient'
+import { createCodeWhispererChatStreamingClient } from '../../../shared/clients/codewhispererChatClient'
 import { ChatSessionManager } from '../../../amazonqGumby/chat/storages/chatSession'
 import { setContext } from '../../../shared/vscode/setContext'
 
@@ -154,7 +154,11 @@ export class DiffModel {
      * @param pathToWorkspace Path to the project that was transformed
      * @returns List of nodes containing the paths of files that were modified, added, or removed
      */
-    public parseDiff(pathToDiff: string, pathToWorkspace: string, diffDescription: PatchInfo): PatchFileNode {
+    public parseDiff(
+        pathToDiff: string,
+        pathToWorkspace: string,
+        diffDescription: PatchInfo | undefined
+    ): PatchFileNode {
         this.patchFileNodes = []
         const diffContents = fs.readFileSync(pathToDiff, 'utf8')
         const changedFiles = parsePatch(diffContents)
@@ -190,7 +194,7 @@ export class DiffModel {
                 }
             },
         })
-        const patchFileNode = new PatchFileNode(diffDescription.name)
+        const patchFileNode = new PatchFileNode(diffDescription ? diffDescription.name : pathToDiff)
         patchFileNode.children = changedFiles.flatMap((file) => {
             /* ex. file.oldFileName = 'a/src/java/com/project/component/MyFile.java'
              * ex. file.newFileName = 'b/src/java/com/project/component/MyFile.java'
@@ -304,26 +308,9 @@ export class ProposedTransformationExplorer {
             treeDataProvider: transformDataProvider,
         })
 
-        const pathContainingArchive = '/private/var/folders/mn/l6c4t6sd1jn7g4p4nb6wqhh80000gq/T/ExportResultArchive'
-
+        // const pathContainingArchive = '/private/var/folders/mn/l6c4t6sd1jn7g4p4nb6wqhh80000gq/T/ExportResultArchive'
         const patchFiles: string[] = []
-        fs.readdir(path.join(pathContainingArchive, 'patch'), (err, files) => {
-            if (err) {
-                getLogger().error(err)
-            } else {
-                files.forEach((file) => {
-                    const filePath = path.join(pathContainingArchive, 'patch', file)
-                    if (file.endsWith('.patch')) {
-                        patchFiles.push(filePath)
-                    }
-                })
-            }
-        })
-
-        const pathContainingPatchFileDescriptions = path.join(pathContainingArchive, 'patch', 'diff.json')
-
-        const jsonData = fs.readFileSync(pathContainingPatchFileDescriptions, 'utf-8')
-        const patchFilesDescriptions: PatchInfo[] = JSON.parse(jsonData)
+        let patchFilesDescriptions: PatchInfo[] | undefined = undefined
 
         const reset = async () => {
             await setContext('gumby.transformationProposalReviewInProgress', false)
@@ -373,15 +360,15 @@ export class ProposedTransformationExplorer {
         vscode.commands.registerCommand('aws.amazonq.transformationHub.reviewChanges.startReview', async () => {
             await setContext('gumby.reviewState', TransformByQReviewStatus.PreparingReview)
 
-            // const pathToArchive = path.join(
-            //     ProposedTransformationExplorer.TmpDir,
-            //     transformByQState.getJobId(),
-            //     'ExportResultsArchive.zip'
-            // )
-            const exportResultsArchiveSize = 0
+            const pathToArchive = path.join(
+                ProposedTransformationExplorer.TmpDir,
+                transformByQState.getJobId(),
+                'ExportResultsArchive.zip'
+            )
+            let exportResultsArchiveSize = 0
             let downloadErrorMessage = undefined
 
-            // const cwStreamingClient = await createCodeWhispererChatStreamingClient()
+            const cwStreamingClient = await createCodeWhispererChatStreamingClient()
             try {
                 await telemetry.codeTransform_downloadArtifact.run(async () => {
                     telemetry.record({
@@ -390,17 +377,17 @@ export class ProposedTransformationExplorer {
                         codeTransformJobId: transformByQState.getJobId(),
                     })
 
-                    // await downloadExportResultArchive(
-                    //     cwStreamingClient,
-                    //     {
-                    //         exportId: transformByQState.getJobId(),
-                    //         exportIntent: ExportIntent.TRANSFORMATION,
-                    //     },
-                    //     pathToArchive
-                    // )
+                    await downloadExportResultArchive(
+                        cwStreamingClient,
+                        {
+                            exportId: transformByQState.getJobId(),
+                            exportIntent: ExportIntent.TRANSFORMATION,
+                        },
+                        pathToArchive
+                    )
 
                     // Update downloaded artifact size
-                    // exportResultsArchiveSize = (await fs.promises.stat(pathToArchive)).size
+                    exportResultsArchiveSize = (await fs.promises.stat(pathToArchive)).size
 
                     telemetry.record({ codeTransformTotalByteSize: exportResultsArchiveSize })
                 })
@@ -421,18 +408,34 @@ export class ProposedTransformationExplorer {
                 getLogger().error(`CodeTransformation: ExportResultArchive error = ${downloadErrorMessage}`)
                 throw new Error('Error downloading diff')
             } finally {
-                // cwStreamingClient.destroy()
+                cwStreamingClient.destroy()
             }
 
             let deserializeErrorMessage = undefined
+            let pathContainingArchive = ''
             try {
                 // Download and deserialize the zip
-                // pathContainingArchive = path.dirname(pathToArchive)
-                // const zip = new AdmZip(pathToArchive)
-                // zip.extractAllTo(pathContainingArchive)
+                pathContainingArchive = path.dirname(pathToArchive)
+                const zip = new AdmZip(pathToArchive)
+                zip.extractAllTo(pathContainingArchive)
+
+                const files = fs.readdirSync(path.join(pathContainingArchive, ExportResultArchiveStructure.PathToPatch))
+                files.forEach((file) => {
+                    const filePath = path.join(pathContainingArchive, ExportResultArchiveStructure.PathToPatch, file)
+                    if (file.endsWith('.patch')) {
+                        patchFiles.push(filePath)
+                    } else if (file.endsWith('.json')) {
+                        const jsonData = fs.readFileSync(filePath, 'utf-8')
+                        patchFilesDescriptions = JSON.parse(jsonData)
+                    }
+                })
 
                 //Because multiple patches are returned once the ZIP is downloaded, we want to show the first one to start
-                diffModel.parseDiff(patchFiles[0], transformByQState.getProjectPath(), patchFilesDescriptions[0])
+                diffModel.parseDiff(
+                    patchFiles[0],
+                    transformByQState.getProjectPath(),
+                    patchFilesDescriptions ? patchFilesDescriptions[0] : undefined
+                )
 
                 await setContext('gumby.reviewState', TransformByQReviewStatus.InReview)
                 transformDataProvider.refresh()
@@ -478,7 +481,9 @@ export class ProposedTransformationExplorer {
             diffModel.currentPatchIndex++
             if (diffModel.currentPatchIndex < patchFiles.length) {
                 const nextPatchFile = patchFiles[diffModel.currentPatchIndex]
-                const nextPatchFileDescription = patchFilesDescriptions[diffModel.currentPatchIndex]
+                const nextPatchFileDescription = patchFilesDescriptions
+                    ? patchFilesDescriptions[diffModel.currentPatchIndex]
+                    : undefined
                 diffModel.parseDiff(nextPatchFile, transformByQState.getProjectPath(), nextPatchFileDescription)
                 transformDataProvider.refresh()
             } else {
diff --git a/packages/core/src/shared/utilities/download.ts b/packages/core/src/shared/utilities/download.ts
@@ -13,7 +13,7 @@ import fs from '../fs/fs'
  */
 export class ExportResultArchiveStructure {
     static readonly PathToSummary = path.join('summary', 'summary.md')
-    static readonly PathToDiffPatch = path.join('patch', 'diff.patch')
+    static readonly PathToPatch = 'patch'
     static readonly PathToManifest = 'manifest.json'
 }
 

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ import fs from '../fs/fs'`
`13`	`13`	`*/`
`14`	`14`	`export class ExportResultArchiveStructure {`
`15`	`15`	`static readonly PathToSummary = path.join('summary', 'summary.md')`
`16`		`- static readonly PathToDiffPatch = path.join('patch', 'diff.patch')`
	`16`	`+ static readonly PathToPatch = 'patch'`
`17`	`17`	`static readonly PathToManifest = 'manifest.json'`
`18`	`18`	`}`
`19`	`19`