Merge master into feature/q-dev-execution

Author: aws-toolkit-automation

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

@@ -330,17 +330,15 @@ export class ZipManifest {
     hilCapabilities: string[] = ['HIL_1pDependency_VersionUpgrade']
     transformCapabilities: string[] = ['EXPLAINABILITY_V1'] // TO-DO: for SQL conversions, maybe make this = []
     customBuildCommand: string = 'clean test'
-    requestedConversions: {
-        sqlConversion:
-            | {
-                  source: string | undefined
-                  target: string | undefined
-                  schema: string | undefined
-                  host: string | undefined
-                  sctFileName: string | undefined
-              }
-            | undefined
-    } = { sqlConversion: undefined }
+    requestedConversions?: {
+        sqlConversion?: {
+            source?: string
+            target?: string
+            schema?: string
+            host?: string
+            sctFileName?: string
+        }
+    }
 }
 
 export interface IHilZipManifestParams {

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

@@ -327,12 +327,15 @@ export async function zipCode(
         ) {
             // note that zipManifest must be a ZipManifest since only other option is HilZipManifest which is not used for SQL conversions
             const metadataZip = new AdmZip(transformByQState.getMetadataPathSQL())
-            zipManifest.requestedConversions.sqlConversion = {
-                source: transformByQState.getSourceDB(),
-                target: transformByQState.getTargetDB(),
-                schema: transformByQState.getSchema(),
-                host: transformByQState.getSourceServerName(),
-                sctFileName: metadataZip.getEntries().filter((entry) => entry.entryName.endsWith('.sct'))[0].entryName,
+            zipManifest.requestedConversions = {
+                sqlConversion: {
+                    source: transformByQState.getSourceDB(),
+                    target: transformByQState.getTargetDB(),
+                    schema: transformByQState.getSchema(),
+                    host: transformByQState.getSourceServerName(),
+                    sctFileName: metadataZip.getEntries().filter((entry) => entry.entryName.endsWith('.sct'))[0]
+                        .entryName,
+                },
             }
             // TO-DO: later consider making this add to path.join(zipManifest.dependenciesRoot, 'qct-sct-metadata', entry.entryName) so that it's more organized
             metadataZip