remove short circuiting steps

Author: ntarakad-aws

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,
     getValidLanguageUpgradeCandidateProjects,
     postTransformationJob,
@@ -534,7 +534,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

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

@@ -76,7 +76,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'
 import { convertDateToTimestamp } from '../../shared/datetime'
 import { findStringInDirectory } from '../../shared/utilities/workspaceUtils'
 
@@ -164,24 +164,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 {
@@ -200,8 +200,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) {

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

@@ -3,27 +3,27 @@
  * 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,
     DescriptionContent,
     TransformationType,
 } 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'
 import * as codeWhisperer from '../../client/codewhisperer'
@@ -325,7 +325,11 @@ export class ProposedTransformationExplorer {
             treeDataProvider: transformDataProvider,
         })
 
+<<<<<<< HEAD
         let patchFiles: string[] = []
+=======
+        const patchFiles: string[] = []
+>>>>>>> d92cadc19 (remove short circuiting steps)
         let singlePatchFile: string = ''
         let patchFilesDescriptions: DescriptionContent | undefined = undefined
 
@@ -377,15 +381,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({
@@ -394,17 +398,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 })
                 })
@@ -425,17 +429,20 @@ 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 = ''
+<<<<<<< HEAD
             patchFiles = [] // reset patchFiles if there was a previous transformation
+=======
+>>>>>>> d92cadc19 (remove short circuiting steps)
             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))
                 if (files.length === 1) {
                     singlePatchFile = path.join(