just get .sct file

Author: David Hasani

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

@@ -6,7 +6,7 @@
  * the Gumby extension.
  */
 import nodefs from 'fs' // eslint-disable-line no-restricted-imports
-import os from 'os'
+import * as xml2js from 'xml2js'
 import path from 'path'
 import * as vscode from 'vscode'
 import { GumbyNamedMessages, Messenger } from './messenger/messenger'
@@ -62,7 +62,6 @@ import { getAuthType } from '../../../codewhisperer/service/transformByQ/transfo
 import DependencyVersions from '../../models/dependencies'
 import { getStringHash } from '../../../shared/utilities/textUtilities'
 import { getVersionData } from '../../../codewhisperer/service/transformByQ/transformMavenHandler'
-import AdmZip from 'adm-zip'
 
 // These events can be interactions within the chat,
 // or elsewhere in the IDE
@@ -530,6 +529,9 @@ export class GumbyController {
         const fileUri = await vscode.window.showOpenDialog({
             canSelectMany: false, // Allow only one file to be selected
             openLabel: 'Select', // Label for the open button
+            filters: {
+                'SCT metadata': ['sct'], // Restrict user to only pick a .sct file
+            },
         })
 
         if (!fileUri || fileUri.length === 0) {
@@ -541,26 +543,44 @@ export class GumbyController {
             return
         }
 
-        const metadataZip = new AdmZip(fileUri[0].fsPath)
-        const pathToZip = path.join(os.tmpdir(), 'SCT-metadata')
-        metadataZip.extractAllTo(pathToZip, true)
-        const zipEntries = metadataZip.getEntries()
-        const pathToRules = zipEntries.find((entry) => entry.name === 'sct-rules.json')?.entryName
+        const fileContents = nodefs.readFileSync(fileUri[0].fsPath, 'utf-8')
+        let parsedData: any = undefined
+        xml2js.parseString(fileContents, (err, result) => {
+            if (err) {
+                getLogger().error('Error parsing SCT file:', err)
+            } else {
+                parsedData = result
+            }
+        })
 
-        if (!pathToRules) {
+        if (!parsedData) {
             this.transformationFinished({
-                message: CodeWhispererConstants.invalidMetadataFileNoRulesJson,
+                message: CodeWhispererConstants.invalidMetadataFileUnknownIssueParsing,
                 tabID: message.tabID,
             })
             return
         }
 
-        const sctRulesData = nodefs.readFileSync(path.join(pathToZip, pathToRules), 'utf8')
-        const isValidSctRulesData = await validateSQLMetadataFile(sctRulesData, message)
-        if (!isValidSctRulesData) {
+        const isValidMetadata = await validateSQLMetadataFile(parsedData, message)
+        if (!isValidMetadata) {
             return
         }
 
+        // extract schema names from metadata file
+        // probably if anything throws here we should just continue and not validate the user's schema input
+        // unless we show a form with the schema options, in which case this needs to pass
+        const serverNodeLocations =
+            parsedData['tree']['instances'][0]['ProjectModel'][0]['relations'][0]['server-node-location']
+        const schemaNames = new Set<string>()
+        serverNodeLocations.forEach((serverNodeLocation: any) => {
+            const schemaNodes = serverNodeLocation['FullNameNodeInfoList'][0]['nameParts'][0][
+                'FullNameNodeInfo'
+            ].filter((node: any) => node['$']['typeNode'] === 'schema')
+            schemaNodes.forEach((node: any) => {
+                schemaNames.add(node['$']['nameNode'].toUpperCase())
+            })
+        })
+
         transformByQState.setMetadataPathSQL(fileUri[0].fsPath)
 
         this.messenger.sendAsyncEventProgress(

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

@@ -536,6 +536,8 @@ export class Messenger {
                 message: CodeWhispererConstants.checkingForProjectsChatMessage,
             })
         )
+
+        // TO-DO: add a delay for 2s here to match IntelliJ
     }
 
     public sendLanguageUpgradeProjectSelectionMessage(
@@ -722,7 +724,7 @@ ${codeSnippet}
     }
 
     public sendSelectSQLMetadataFileMessage(tabID: string) {
-        const message = 'Please select your metadata ZIP file.'
+        const message = 'Please select your metadata .sct file.'
         const buttons: ChatItemButton[] = []
 
         buttons.push({

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

@@ -274,11 +274,13 @@ export async function parseBuildFile() {
     return undefined
 }
 
-export async function validateSQLMetadataFile(sctRulesData: any, message: any) {
+export async function validateSQLMetadataFile(sctData: any, message: any) {
     try {
-        const sctRules = JSON.parse(sctRulesData)
-        const sourceDB = sctRules['rules'][0]['locator']['sourceVendor'] as string
-        const targetDB = sctRules['rules'][0]['locator']['targetVendor'] as string
+        const dbEntities = sctData['tree']['instances'][0]['ProjectModel'][0]['entities'][0]
+        const sourceDB = dbEntities['sources'][0]['DbServer'][0]['$']['vendor']
+        const targetDB = dbEntities['targets'][0]['DbServer'][0]['$']['vendor']
+        const sourceServerName = dbEntities['sources'][0]['DbServer'][0]['$']['name']
+        transformByQState.setSourceServerName(sourceServerName)
         if (sourceDB.toUpperCase() !== DB.ORACLE) {
             transformByQState.getChatControllers()?.transformationFinished.fire({
                 message: CodeWhispererConstants.invalidMetadataFileUnsupportedSourceVendor(sourceDB),
@@ -301,6 +303,7 @@ export async function validateSQLMetadataFile(sctRulesData: any, message: any) {
             })
             return false
         }
+        // TO-DO: when more than just Oracle is supported, validate that sourceDB === transformByQState.getSourceDB()
     } catch (e: any) {
         transformByQState.getChatControllers()?.transformationFinished.fire({
             message: CodeWhispererConstants.invalidMetadataFileUnknownIssueParsing,

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

@@ -352,7 +352,7 @@ export const newCustomizationMessage = 'You have access to new Amazon Q customiz
 // Start of QCT Strings
 
 // feature flag for SQL transformations
-export const isSQLTransformReady = false
+export const isSQLTransformReady = true
 
 export const uploadZipSizeLimitInBytes = 2000000000 // 2GB
 
@@ -508,13 +508,13 @@ export const invalidMetadataFileNoRulesJson =
     "Sorry, your metadata ZIP appears to be invalid; it does not contain an 'sct-rules.json' file."
 
 export const invalidMetadataFileUnsupportedSourceVendor = (vendor: string) =>
-    `Sorry, your metadata ZIP appears to be invalid; the source vendor is '${vendor}', but only 'Oracle' is supported.`
+    `Sorry, your metadata file appears to be invalid; the source vendor is '${vendor}', but only Oracle is supported.`
 
 export const invalidMetadataFileUnsupportedTargetVendor = (vendor: string) =>
-    `Sorry, your metadata ZIP appears to be invalid; the target vendor is '${vendor}', but only 'Amazon Aurora PostgreSQL' and 'Amazon RDS for PostgreSQL' are supported.`
+    `Sorry, your metadata file appears to be invalid; the target vendor is '${vendor}', but only Amazon Aurora PostgreSQL and Amazon RDS for PostgreSQL are supported.`
 
 export const invalidMetadataFileTargetVendorMismatch = (foundVendor: string, selectedVendor: string) =>
-    `Sorry, your metadata ZIP appears to be invalid; the target vendor is '${foundVendor}', but you previously selected a target vendor of '${selectedVendor}'.`
+    `Sorry, your metadata file appears to be invalid; the target vendor is '${foundVendor}', but you previously selected a target vendor of '${selectedVendor}'.`
 
 export const invalidMetadataFileUnknownIssueParsing =
     'Sorry, I had an issue parsing the metadata ZIP you provided; please make sure it is valid.'

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

@@ -324,7 +324,13 @@ export class ZipManifest {
     hilCapabilities: string[] = ['HIL_1pDependency_VersionUpgrade']
     transformCapabilities: string[] = ['EXPLAINABILITY_V1']
     customBuildCommand: string = 'clean test'
-    sqlMetadataPath: string | undefined = undefined
+    customConversions: {
+        type: string | undefined
+        source: string | undefined
+        target: string | undefined
+        schema: string | undefined
+        host: string | undefined
+    } = { type: undefined, source: undefined, target: undefined, schema: undefined, host: undefined }
 }
 
 export interface IHilZipManifestParams {
@@ -389,6 +395,8 @@ export class TransformByQState {
 
     private targetDB: DB | undefined = undefined
 
+    private sourceServerName: string = ''
+
     private metadataPathSQL: string = ''
 
     private planFilePath: string = ''
@@ -486,6 +494,10 @@ export class TransformByQState {
         return this.targetDB
     }
 
+    public getSourceServerName() {
+        return this.sourceServerName
+    }
+
     public getMetadataPathSQL() {
         return this.metadataPathSQL
     }
@@ -622,6 +634,10 @@ export class TransformByQState {
         this.targetDB = db
     }
 
+    public setSourceServerName(serverName: string) {
+        this.sourceServerName = serverName
+    }
+
     public setMetadataPathSQL(path: string) {
         this.metadataPathSQL = path
     }
@@ -705,6 +721,7 @@ export class TransformByQState {
         this.jobFailureMetadata = ''
         this.payloadFilePath = ''
         this.metadataPathSQL = ''
+        this.sourceServerName = ''
         this.errorLog = ''
         this.customBuildCommand = ''
         this.intervalId = undefined

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

@@ -315,21 +315,26 @@ export async function zipCode(
             getLogger().info(`CodeTransformation: source code files size = ${sourceFilesSize}`)
         }
 
-        if (transformByQState.getMetadataPathSQL()) {
-            // user is doing a SQL conversion
-            zip.addLocalFile(transformByQState.getMetadataPathSQL())
-            // must be true here, since only other option is HilZipManifest (not used for SQL conversions)
-            if (zipManifest instanceof ZipManifest) {
-                zipManifest.sqlMetadataPath = path.basename(transformByQState.getMetadataPathSQL())
-            }
+        if (transformByQState.getMetadataPathSQL() && zipManifest instanceof ZipManifest) {
+            // user is doing a SQL conversion since metadataPath is defined
+            // also, it must be a ZipManifest since only other option is HilZipManifest which is not used for SQL conversions
+            zip.addLocalFile(
+                transformByQState.getMetadataPathSQL(),
+                path.join(zipManifest.sourcesRoot, 'sct-metadata-random-num')
+            )
+            zipManifest.customConversions['source'] = transformByQState.getSourceDB()
+            zipManifest.customConversions['target'] = transformByQState.getTargetDB()
+            zipManifest.customConversions['type'] = 'SQL'
+            zipManifest.customConversions['schema'] = 'ADMIN-get-from-user'
+            zipManifest.customConversions['host'] = transformByQState.getSourceServerName()
             const sqlMetadataSize = (await nodefs.promises.stat(transformByQState.getMetadataPathSQL())).size
             getLogger().info(`CodeTransformation: SQL metadata file size = ${sqlMetadataSize}`)
         }
 
         throwIfCancelled()
 
         let dependencyFiles: string[] = []
-        if (dependenciesFolder && await fs.exists(dependenciesFolder.path)) {
+        if (dependenciesFolder && (await fs.exists(dependenciesFolder.path))) {
             dependencyFiles = getFilesRecursively(dependenciesFolder.path, true)
         }
 
@@ -367,10 +372,11 @@ export async function zipCode(
 
         tempFilePath = path.join(os.tmpdir(), 'zipped-code.zip')
         await fs.writeFile(tempFilePath, zip.toBuffer())
-        if (dependenciesFolder && await fs.exists(dependenciesFolder.path)) {
+        if (dependenciesFolder && (await fs.exists(dependenciesFolder.path))) {
             await fs.delete(dependenciesFolder.path, { recursive: true, force: true })
         }
     } catch (e: any) {
+        getLogger().error(`CodeTransformation: zipCode error = ${e}`)
         throw Error('Failed to zip project')
     } finally {
         if (logFilePath) {