address feedback

Author: David Hasani

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

@@ -639,6 +639,13 @@ export class GumbyController {
 
             case ConversationState.WAITING_FOR_TRANSFORMATION_OBJECTIVE: {
                 const objective = data.message.trim().toLowerCase()
+                // since we're prompting the user, their project(s) must be eligible for both types of transformations, so track how often this happens here
+                if (objective === 'language upgrade' || objective === 'sql conversion') {
+                    telemetry.codeTransform_submitSelection.emit({
+                        codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId(),
+                        userChoice: objective,
+                    })
+                }
                 if (objective === 'language upgrade') {
                     await this.handleLanguageUpgrade(data)
                 } else if (objective === 'sql conversion') {

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

@@ -3,16 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { TransformationType, transformByQState } from '../../codewhisperer/models/model'
-
 // For uniquely identifiying which chat messages should be routed to Gumby
 export const gumbyChat = 'gumbyChat'
 
 // This sets the tab name
-export const featureName = 'Q - Code Transform'
+export const featureName = 'Q - Code Transformation'
 
 export const dependencyNoAvailableVersions = 'no available versions'
-
-export function getTransformationActionString() {
-    return transformByQState.getTransformationType() === TransformationType.LANGUAGE_UPGRADE ? 'upgraded' : 'converted'
-}

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

@@ -81,7 +81,8 @@ import { setContext } from '../../shared/vscode/setContext'
 import { makeTemporaryToolkitFolder } from '../../shared'
 import globals from '../../shared/extensionGlobals'
 import { convertDateToTimestamp } from '../../shared/datetime'
-import { spawnSync } from 'child_process'
+import { isWin } from '../../shared/vscode/env'
+import { ChildProcess } from '../../shared/utilities/processUtils'
 
 function getFeedbackCommentData() {
     const jobId = transformByQState.getJobId()
@@ -152,7 +153,7 @@ export async function validateSQLMetadataFile(fileContents: string, message: any
 }
 
 export async function setMaven() {
-    let mavenWrapperExecutableName = os.platform() === 'win32' ? 'mvnw.cmd' : 'mvnw'
+    let mavenWrapperExecutableName = isWin() ? 'mvnw.cmd' : 'mvnw'
     const mavenWrapperExecutablePath = path.join(transformByQState.getProjectPath(), mavenWrapperExecutableName)
     if (fs.existsSync(mavenWrapperExecutablePath)) {
         if (mavenWrapperExecutableName === 'mvnw') {
@@ -745,34 +746,31 @@ export async function getValidSQLConversionCandidateProjects() {
         const openProjects = await getOpenProjects()
         const javaProjects = await getJavaProjects(openProjects)
         let errorLog = ''
+        const isWindows = isWin()
+        const command = isWindows ? 'findstr' : 'grep'
         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',
+                const args = isWindows ? ['/i', '/s', str] : ['-i', '-r', str]
+                const spawnResult = await new ChildProcess(command, args).run({
+                    spawnOptions: { cwd: project.path, shell: false },
                 })
                 // just for telemetry purposes
                 if (spawnResult.error || spawnResult.stderr) {
                     errorLog += `${JSON.stringify(spawnResult)}---`
                 } else {
-                    errorLog += `${command} succeeded: ${spawnResult.status}`
+                    errorLog += `${command} succeeded: ${spawnResult.exitCode}`
                 }
                 /*
                 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}, status = ${spawnResult.status} and output = ${spawnResult.output}`
-                )
-                if (spawnResult.status === 0) {
+                getLogger().info(`CodeTransformation: searching for ${str} in ${project.path}, result = ${errorLog}`)
+                if (spawnResult.exitCode === 0) {
                     embeddedSQLProjects.push(project)
                     break
                 }

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

@@ -3,8 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { getTransformationActionString } from '../../amazonqGumby/models/constants'
-
 /**
  * Automated and manual trigger
  */
@@ -585,13 +583,13 @@ export const jobCancelledChatMessage =
 
 export const jobCancelledNotification = 'You cancelled the transformation.'
 
-export const jobCompletedChatMessage = `I ${getTransformationActionString()} 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.`
+export const jobCompletedChatMessage = `I transformed 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.`
 
-export const jobCompletedNotification = `Amazon Q ${getTransformationActionString()} 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.`
+export const jobCompletedNotification = `Amazon Q transformed 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.`
 
-export const jobPartiallyCompletedChatMessage = `I ${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 jobPartiallyCompletedChatMessage = `I transformed 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 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 jobPartiallyCompletedNotification = `Amazon Q transformed 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 = `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 upgrade Java 8 or Java 11 projects built on Maven, or Oracle SQL to PostgreSQL statements in Java projects. For more information, see the [Amazon Q documentation](${codeTransformPrereqDoc}).`