short circuit lang upgrades

Author: David Hasani

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

@@ -194,14 +194,28 @@ export class GumbyController {
         try {
             embeddedSQLProjects = await getValidSQLConversionCandidateProjects()
         } catch (err) {
-            getLogger().error(`Error validating SQL conversion projects: ${err}`)
+            getLogger().error(`CodeTransformation: error validating SQL conversion projects: ${err}`)
         }
 
         if (embeddedSQLProjects.length === 0) {
             await this.handleLanguageUpgrade(message)
             return
         }
 
+        let javaUpgradeProjects: TransformationCandidateProject[] = []
+        try {
+            javaUpgradeProjects = await getValidLanguageUpgradeCandidateProjects()
+        } catch (err) {
+            getLogger().error(`CodeTransformation: error validating Java upgrade projects: ${err}`)
+        }
+
+        // TO-DO: in this case, should we say "I can't do a language upgrade, but I found embedded SQL I can convert..."
+        // and vice-versa for the case above with handleLanguageUpgrade
+        if (javaUpgradeProjects.length === 0) {
+            await this.handleSQLConversion(message)
+            return
+        }
+
         // if previous transformation was already running, show correct message to user
         switch (this.sessionStorage.getSession().conversationState) {
             case ConversationState.JOB_SUBMITTED:
@@ -230,7 +244,10 @@ export class GumbyController {
         this.sessionStorage.getSession().conversationState = ConversationState.WAITING_FOR_TRANSFORMATION_OBJECTIVE
         this.messenger.sendStaticTextResponse('choose-transformation-objective', message.tabID)
         this.messenger.sendChatInputEnabled(message.tabID, true)
-        this.messenger.sendUpdatePlaceholder(message.tabID, CodeWhispererConstants.chooseTransformationObjective)
+        this.messenger.sendUpdatePlaceholder(
+            message.tabID,
+            CodeWhispererConstants.chooseTransformationObjectivePlaceholder
+        )
     }
 
     private async beginTransformation(message: any) {
@@ -316,13 +333,7 @@ export class GumbyController {
 
     private async validateSQLConversionProjects(message: any) {
         try {
-            const validProjects = await telemetry.codeTransform_validateProject.run(async () => {
-                telemetry.record({
-                    codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId(),
-                })
-                const validProjects = await getValidSQLConversionCandidateProjects()
-                return validProjects
-            })
+            const validProjects = await getValidSQLConversionCandidateProjects()
             return validProjects
         } catch (e: any) {
             if (e instanceof NoJavaProjectsFoundError) {

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

@@ -422,6 +422,7 @@ export class Messenger {
                 message = CodeWhispererConstants.noJavaProjectsFoundChatMessage
                 break
             case 'no-maven-java-project-found':
+                // shown when user has no pom.xml, but at this point also means they have no eligible SQL conversion projects
                 message = CodeWhispererConstants.noPomXmlFoundChatMessage
                 break
             case 'could-not-compile-project':
@@ -706,6 +707,13 @@ ${codeSnippet}
     }
 
     public async sendSelectSQLMetadataFileMessage(tabID: string) {
+        this.dispatcher.sendAsyncEventProgress(
+            new AsyncEventProgressMessage(tabID, {
+                inProgress: true,
+                message: 'I can convert the embedded Oracle SQL in your project to PostgreSQL.',
+            })
+        )
+
         const message = CodeWhispererConstants.selectSQLMetadataFileHelpMessage
         const buttons: ChatItemButton[] = []
 

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

@@ -730,37 +730,59 @@ export async function finalizeTransformationJob(status: string) {
 export async function getValidLanguageUpgradeCandidateProjects() {
     const openProjects = await getOpenProjects()
     const javaMavenProjects = await validateOpenProjects(openProjects)
+    getLogger().info(`CodeTransformation: found ${javaMavenProjects.length} projects eligible for language upgrade`)
     return javaMavenProjects
 }
 
 export async function getValidSQLConversionCandidateProjects() {
-    const openProjects = await getOpenProjects()
-    const javaProjects = await getJavaProjects(openProjects)
     const embeddedSQLProjects: TransformationCandidateProject[] = []
-    for (const project of javaProjects) {
-        // as long as at least one of these strings is found, project contains embedded SQL statements
-        const searchStrings = ['oracle.jdbc.OracleDriver', 'jdbc:oracle:thin:@//', 'jdbc:oracle:oci:@//']
-        for (const str of searchStrings) {
-            const command = process.platform === 'win32' ? 'findstr' : 'grep'
-            // case-insensitive, recursive search
-            const args = command === 'findstr' ? ['/i', '/s', str] : ['-i', '-r', str]
-            const spawnResult = spawnSync(command, args, {
-                cwd: project.path,
-                shell: false,
-                encoding: 'utf-8',
-            })
-            /*
-            in case the search unexpectedly fails, still allow user to transform that project.
-            error is set when command fails to spawn; stderr is set when command itself fails.
-            status of 0 plus anything in stdout means search string was detected.
-            status will be non-zero and stdout / stderr / error will be empty when search string is not detected. 
-            */
-            if (spawnResult.error || spawnResult.stderr || (spawnResult.status === 0 && spawnResult.stdout.trim())) {
-                embeddedSQLProjects.push(project)
-                break
+    await telemetry.codeTransform_validateProject.run(async () => {
+        telemetry.record({
+            codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId(),
+        })
+        const openProjects = await getOpenProjects()
+        const javaProjects = await getJavaProjects(openProjects)
+        let errorLog = ''
+        for (const project of javaProjects) {
+            // as long as at least one of these strings is found, project contains embedded SQL statements
+            const searchStrings = ['oracle.jdbc.OracleDriver', 'jdbc:oracle:thin:@//', 'jdbc:oracle:oci:@//']
+            for (const str of searchStrings) {
+                const command = process.platform === 'win32' ? 'findstr' : 'grep'
+                // case-insensitive, recursive search
+                const args = command === 'findstr' ? ['/i', '/s', str] : ['-i', '-r', str]
+                const spawnResult = spawnSync(command, args, {
+                    cwd: project.path,
+                    shell: false,
+                    encoding: 'utf-8',
+                })
+                // just for telemetry purposes
+                if (spawnResult.error || spawnResult.stderr) {
+                    errorLog += `${JSON.stringify(spawnResult)}---`
+                } else {
+                    errorLog += `${command} succeeded: ${spawnResult.status}`
+                }
+                /*
+                note:
+                error is set when command fails to spawn; stderr is set when command itself fails.
+                status of 0 means search string was detected (will be printed to stdout).
+                status will be non-zero and stdout / stderr / error will be empty when search string is not detected.
+                */
+                getLogger().info(
+                    `CodeTransformation: searching for ${str} in ${project.path}, result = ${JSON.stringify(spawnResult)}`
+                )
+                if (spawnResult.status === 0) {
+                    embeddedSQLProjects.push(project)
+                    break
+                }
             }
         }
-    }
+        getLogger().info(
+            `CodeTransformation: found ${embeddedSQLProjects.length} projects with embedded SQL statements`
+        )
+        telemetry.record({
+            codeTransformMetadata: errorLog,
+        })
+    })
     return embeddedSQLProjects
 }
 

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

@@ -452,7 +452,9 @@ export const codeTransformLocThreshold = 100000
 export const jobStartedChatMessage =
     'I am starting to transform your code. It can take 10 to 30 minutes to upgrade your code, depending on the size of your project. To monitor progress, go to the Transformation Hub. If I run into any issues, I might pause the transformation to get input from you on how to proceed.'
 
-export const chooseTransformationObjective = 'Enter "language upgrade" or "sql conversion"'
+export const chooseTransformationObjective = `I can help you with the following tasks:\n- Upgrade your Java 8 and Java 11 codebases to Java 17, or upgrade Java 17 code with up to date libraries and other dependencies.\n- Convert embedded SQL code for Oracle to PostgreSQL database migrations in AWS DMS.\n\nWhat would you like to do? You can enter "language upgrade" or "sql conversion".`
+
+export const chooseTransformationObjectivePlaceholder = 'Enter "language upgrade" or "sql conversion"'
 
 export const uploadingCodeStepMessage = 'Upload your code'
 
@@ -591,7 +593,7 @@ export const jobPartiallyCompletedChatMessage = `I ${getTransformationActionStri
 
 export const jobPartiallyCompletedNotification = `Amazon Q ${getTransformationActionString()} part of your code. You can review the diff to see my proposed changes and accept or reject them. The transformation summary has details about the files I updated and the errors that prevented a complete transformation.`
 
-export const noPomXmlFoundChatMessage = `Sorry, I couldn\'t find a project that I can upgrade. I couldn\'t find a pom.xml file in any of your open projects. Currently, I can only upgrade Java 8 or Java 11 projects built on Maven. For more information, see the [Amazon Q documentation](${codeTransformPrereqDoc}).`
+export const noPomXmlFoundChatMessage = `Sorry, I couldn\'t find a project that I can upgrade. I couldn\'t find a pom.xml file in any of your open projects, nor could I find any embedded SQL statements. Currently, I can only upgrade Java 8 or Java 11 projects built on Maven, or Oracle SQL to PostgreSQL in Java projects. For more information, see the [Amazon Q documentation](${codeTransformPrereqDoc}).`
 
 export const noJavaHomeFoundChatMessage = `Sorry, I couldn\'t locate your Java installation. For more information, see the [Amazon Q documentation](${codeTransformPrereqDoc}).`