add yaml file to zip

Author: David Hasani

packages/core/src/amazonqGumby/chat/controller/controller.ts

@@ -382,6 +382,7 @@ export class GumbyController {
                 break
             case ButtonActions.CONTINUE_TRANSFORMATION_FORM:
                 this.messenger.sendMessage('Ok, I will continue without this information.', message.tabID, 'ai-prompt')
+                transformByQState.setCustomDependencyVersionFilePath('')
                 this.promptJavaHome('source', message.tabID)
                 break
             case ButtonActions.VIEW_TRANSFORMATION_HUB:
@@ -449,7 +450,7 @@ export class GumbyController {
             })
 
             this.messenger.sendOneOrMultipleDiffsMessage(oneOrMultipleDiffsSelection, message.tabID)
-            this.messenger.sendCustomDependencyVersionSelectionMessage(message.tabID)
+            await this.messenger.sendCustomDependencyVersionMessage(message.tabID)
         })
     }
 

packages/core/src/amazonqGumby/chat/controller/messenger/messenger.ts

@@ -747,7 +747,7 @@ ${codeSnippet}
         )
     }
 
-    public async sendCustomDependencyVersionSelectionMessage(tabID: string) {
+    public async sendCustomDependencyVersionMessage(tabID: string) {
         const message = 'You can optionally upload a YAML file to specify which dependency versions to upgrade to.'
         const buttons: ChatItemButton[] = []
 

packages/core/src/codewhisperer/models/model.ts

@@ -666,6 +666,7 @@ export enum BuildSystem {
     Unknown = 'Unknown',
 }
 
+// TO-DO: include the custom YAML file path here somewhere?
 export class ZipManifest {
     sourcesRoot: string = 'sources/'
     dependenciesRoot: string = 'dependencies/'

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

@@ -56,7 +56,7 @@ import { convertToTimeString } from '../../../shared/datetime'
 import { getAuthType } from '../../../auth/utils'
 import { UserWrittenCodeTracker } from '../../tracker/userWrittenCodeTracker'
 import { DiffModel } from './transformationResultsViewProvider'
-import { spawnSync } from 'child_process'
+import { spawnSync } from 'child_process' // eslint-disable-line no-restricted-imports
 
 export function getSha256(buffer: Buffer) {
     const hasher = crypto.createHash('sha256')
@@ -394,6 +394,14 @@ export async function zipCode(
             dependenciesCopied = true
         }
 
+        if (transformByQState.getCustomDependencyVersionFilePath() && zipManifest instanceof ZipManifest) {
+            zip.addLocalFile(
+                transformByQState.getCustomDependencyVersionFilePath(),
+                'custom-upgrades',
+                'dependency-versions.yaml'
+            )
+        }
+
         zip.addFile('manifest.json', Buffer.from(JSON.stringify(zipManifest)), 'utf-8')
 
         throwIfCancelled()

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

@@ -48,7 +48,7 @@ export async function loadManifestFile(directory: string) {
 }
 
 export async function copyDirectory(sourcePath: string, destinationPath: string) {
-    fs.mkdir(destinationPath)
+    await fs.mkdir(destinationPath)
     const files = await fs.readdir(sourcePath)
 
     for (const file of files) {
@@ -78,7 +78,7 @@ export async function createLocalBuildUploadZip(baseDir: string, exitCode: numbe
         exitCode: exitCode,
         commandLogFileName: 'clientBuildLogs.log',
     }
-    const formattedManifest = JSON.stringify(buildResultsManifest, null, 2)
+    const formattedManifest = JSON.stringify(buildResultsManifest)
     await fs.writeFile(manifestFilePath, formattedManifest, 'utf8')
 
     const buildLogsFilePath = path.join(baseDir, 'clientBuildLogs.log')