addressing comments from PR and adding feature flag

Author: ntarakad-aws

packages/amazonq/.changes/next-release/Feature-735529a9-8424-4f78-9989-58ec972af100.json

@@ -6,18 +6,14 @@ import assert from 'assert'
 import sinon from 'sinon'
 import { DiffModel, AddedChangeNode, ModifiedChangeNode } from 'aws-core-vscode/codewhisperer/node'
 import { DescriptionContent } from 'aws-core-vscode/codewhisperer'
-import path from 'path'
 import { getTestResourceFilePath } from './amazonQGumbyUtil'
 import { fs } from 'aws-core-vscode/shared'
 import { createTestWorkspace } from 'aws-core-vscode/test'
 
 describe('DiffModel', function () {
     let parsedTestDescriptions: DescriptionContent
-    beforeEach(() => {
-        const fs = require('fs')
-        parsedTestDescriptions = JSON.parse(
-            fs.readFileSync(getTestResourceFilePath('resources/files/diff.json'), 'utf-8')
-        )
+    beforeEach(async () => {
+        parsedTestDescriptions = JSON.parse(await fs.readFileText(getTestResourceFilePath('resources/files/diff.json')))
     })
 
     afterEach(() => {
@@ -60,13 +56,6 @@ describe('DiffModel', function () {
         const fileAmount = 1
         const workspaceFolder = await createTestWorkspace(fileAmount, { fileContent: '' })
 
-        sinon.replace(fs, 'exists', async (path) => true)
-
-        await fs.writeFile(
-            path.join(workspaceFolder.uri.fsPath, 'README.md'),
-            'This guide walks you through using Gradle to build a simple Java project.'
-        )
-
         testDiffModel.parseDiff(
             getTestResourceFilePath('resources/files/modifiedFile.diff'),
             workspaceFolder.uri.fsPath,
@@ -90,13 +79,6 @@ describe('DiffModel', function () {
         const fileAmount = 1
         const workspaceFolder = await createTestWorkspace(fileAmount, { fileContent: '' })
 
-        sinon.replace(fs, 'exists', async (path) => true)
-
-        await fs.writeFile(
-            path.join(workspaceFolder.uri.fsPath, 'README.md'),
-            'This guide walks you through using Gradle to build a simple Java project.'
-        )
-
         testDiffModel.parseDiff(
             getTestResourceFilePath('resources/files/modifiedFile.diff'),
             workspaceFolder.uri.fsPath,

packages/amazonq/test/unit/amazonqGumby/transformationResultsHandler.test.ts

@@ -62,6 +62,7 @@ import { getStringHash } from '../../../shared/utilities/textUtilities'
 import { getVersionData } from '../../../codewhisperer/service/transformByQ/transformMavenHandler'
 import AdmZip from 'adm-zip'
 import { AuthError } from '../../../auth/sso/server'
+import { isSelectiveTransformationReady } from '../../../dev/config'
 
 // These events can be interactions within the chat,
 // or elsewhere in the IDE
@@ -423,7 +424,12 @@ export class GumbyController {
             result: MetadataResult.Pass,
         })
         this.messenger.sendSkipTestsSelectionMessage(skipTestsSelection, message.tabID)
-        await this.messenger.sendOneOrMultipleDiffsPrompt(message.tabID)
+        if (!isSelectiveTransformationReady) {
+            // perform local build
+            await this.validateBuildWithPromptOnError(message)
+        } else {
+            await this.messenger.sendOneOrMultipleDiffsPrompt(message.tabID)
+        }
     }
 
     private async handleOneOrMultipleDiffs(message: any) {

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

@@ -3,8 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { DescriptionContent } from '..'
-
 /**
  * Automated and manual trigger
  */
@@ -35,8 +33,8 @@ const patchDescriptions: { [key: string]: string } = {
         'This diff patch covers the set of upgrades for ArchUnit, Mockito, TestContainers, Cucumber, and additionally, Jenkins plugins and the Maven Wrapper.',
     'Miscellaneous Processing Documentation upgrade':
         'This diff patch covers a diverse set of upgrades spanning ORMs, XML processing, API documentation, and more.',
-    'Upgrade Deprecated API': '',
-    'Updated dependencies to latest version': '',
+    'Deprecated API replacement and dependency upgrades':
+        'This diff patch replaces deprecated APIs and makes additional dependency version upgrades.',
 }
 
 export const JsonConfigFileNamingConvention = new Set([
@@ -483,6 +481,8 @@ I can now divide the transformation results into diff patches (if applicable to
 • Testing Tools Frameworks: Testing tools like ArchUnit, Mockito, and TestContainers and build tools like Jenkins and Maven Wrapper. 
 
 • Miscellaneous Processing Documentation: Upgrades ORMs, XML processing, and Swagger to SpringDoc/OpenAPI.
+
+• Deprecated API replacement and dependency upgrades: Replaces deprecated APIs and makes additional dependency version upgrades.
 `
 
 export const uploadingCodeStepMessage = 'Upload your code'
@@ -621,19 +621,19 @@ export const diffMessage = (multipleDiffs: boolean) => {
 }
 
 export const jobCompletedChatMessage = (multipleDiffsString: string) => {
-    return `I upgraded your code. ${multipleDiffsString} The transformation summary has details about the files I updated.`
+    return `I transformed your code. ${multipleDiffsString} The transformation summary has details about the files I updated.`
 }
 
 export const jobCompletedNotification = (multipleDiffsString: string) => {
-    return `Amazon Q upgraded your code. ${multipleDiffsString} The transformation summary has details about the files I updated.`
+    return `Amazon Q transformed your code. ${multipleDiffsString} The transformation summary has details about the files I updated.`
 }
 
 export const jobPartiallyCompletedChatMessage = (multipleDiffsString: string) => {
-    return `I upgraded part of your code. ${multipleDiffsString} The transformation summary has details about the files I updated and the errors that prevented a complete transformation.`
+    return `I transformed part of your code. ${multipleDiffsString} The transformation summary has details about the files I updated and the errors that prevented a complete transformation.`
 }
 
 export const jobPartiallyCompletedNotification = (multipleDiffsString: string) => {
-    return `Amazon Q upgraded part of your code. ${multipleDiffsString} The transformation summary has details about the files I updated and the errors that prevented a complete transformation.`
+    return `Amazon Q transformed part of your code. ${multipleDiffsString} 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}).`
@@ -685,14 +685,13 @@ export const changesAppliedChatMessageMultipleDiffs = (
 
 export const changesAppliedNotificationOneDiff = 'Amazon Q applied the changes to your project'
 
-export const changesAppliedNotificationMultipleDiffs = (
-    currentPatchIndex: number,
-    totalPatchFiles: number,
-    patchFilesDescriptions: DescriptionContent | undefined
-) =>
-    patchFilesDescriptions
-        ? `Amazon Q applied the changes in diff patch ${currentPatchIndex + 1} of ${totalPatchFiles} to your project.`
-        : 'Amazon Q applied the changes to your project.'
+export const changesAppliedNotificationMultipleDiffs = (currentPatchIndex: number, totalPatchFiles: number) => {
+    if (totalPatchFiles === 1) {
+        return 'Amazon Q applied the changes to your project.'
+    } else {
+        return `Amazon Q applied the changes in diff patch ${currentPatchIndex + 1} of ${totalPatchFiles} to your project.`
+    }
+}
 
 export const noOpenProjectsFoundChatMessage = `I couldn\'t find a project that I can upgrade. Currently, I support Java 8, Java 11, and Java 17 projects built on Maven. Make sure your project is open in the IDE. For more information, see the [Amazon Q documentation](${codeTransformPrereqDoc}).`
 

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

@@ -533,13 +533,16 @@ export class ProposedTransformationExplorer {
 
         vscode.commands.registerCommand('aws.amazonq.transformationHub.reviewChanges.acceptChanges', async () => {
             diffModel.saveChanges()
+            telemetry.codeTransform_submitSelection.emit({
+                codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId(),
+                userChoice: `acceptChanges-${patchFilesDescriptions?.content[diffModel.currentPatchIndex].name}`,
+            })
             telemetry.ui_click.emit({ elementId: 'transformationHub_acceptChanges' })
             if (transformByQState.getMultipleDiffs()) {
                 void vscode.window.showInformationMessage(
                     CodeWhispererConstants.changesAppliedNotificationMultipleDiffs(
                         diffModel.currentPatchIndex,
-                        patchFiles.length,
-                        patchFilesDescriptions
+                        patchFiles.length
                     )
                 )
             } else {

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

@@ -10,3 +10,6 @@ export const betaUrl = {
     amazonq: '',
     toolkit: '',
 }
+
+//feature flag for Selective Transformation
+export const isSelectiveTransformationReady = false