diff --git a/packages/amazonq/.changes/next-release/Bug Fix-3fa18fc3-cf5c-4816-86fa-07d9a90077c5.json b/packages/amazonq/.changes/next-release/Bug Fix-3fa18fc3-cf5c-4816-86fa-07d9a90077c5.json new file mode 100644 index 00000000000..c105d94c34b --- /dev/null +++ b/packages/amazonq/.changes/next-release/Bug Fix-3fa18fc3-cf5c-4816-86fa-07d9a90077c5.json @@ -0,0 +1,4 @@ +{ + "type": "Bug Fix", + "description": "Fix(Amazon Q Code Transformation): show correct diff when running consecutive transformations" +} diff --git a/packages/core/src/amazonq/webview/ui/quickActions/generator.ts b/packages/core/src/amazonq/webview/ui/quickActions/generator.ts index ee7da0e4995..81513a3e143 100644 --- a/packages/core/src/amazonq/webview/ui/quickActions/generator.ts +++ b/packages/core/src/amazonq/webview/ui/quickActions/generator.ts @@ -86,7 +86,7 @@ export class QuickActionGenerator { ? [ { command: '/transform', - description: 'Transform your Java 8, 11, or 17 Maven projects', + description: 'Transform your Java project', icon: MynahIcons.TRANSFORM, }, ] diff --git a/packages/core/src/codewhisperer/models/constants.ts b/packages/core/src/codewhisperer/models/constants.ts index bd2245fe3da..460778db349 100644 --- a/packages/core/src/codewhisperer/models/constants.ts +++ b/packages/core/src/codewhisperer/models/constants.ts @@ -579,7 +579,7 @@ export const absolutePathDetectedMessage = (numPaths: number, buildFile: string, `I detected ${numPaths} potential absolute file path(s) in your ${buildFile} file: **${listOfPaths}**. Absolute file paths might cause issues when I build your code. Any errors will show up in the build log.` export const selectSQLMetadataFileHelpMessage = - 'Okay, I can convert the embedded SQL code for your Oracle to PostgreSQL transformation. To get started, upload the zipped metadata file from your schema conversion in AWS Data Migration Service (DMS). To retrieve the metadata file:\n1. Open your database migration project in the AWS DMS console.\n2. Open the schema conversion and choose **Convert the embedded SQL in your application**.\n3. Choose the link to Amazon S3 console.\n\nYou can download the metadata file from the {schema-conversion-project}/ directory. For more info, refer to the [documentation](https://docs.aws.amazon.com/dms/latest/userguide/schema-conversion-save-apply.html#schema-conversion-save).' + 'Okay, I can convert the embedded SQL code for your Oracle to PostgreSQL transformation. To get started, upload the zipped metadata file from your schema conversion in AWS Data Migration Service (DMS). To retrieve the metadata file:\n1. Open your database migration project in the AWS DMS console.\n2. Open the schema conversion and choose **Convert the embedded SQL in your application**.\n3. Once you complete the conversion, close the project and go to the S3 bucket where your project is stored.\n4. Open the folder and find the project folder ("sct-project").\n5. Download the object inside the project folder. This will be a zip file.\n\nFor more info, refer to the [documentation](https://docs.aws.amazon.com/dms/latest/userguide/schema-conversion-save-apply.html#schema-conversion-save).' export const invalidMetadataFileUnsupportedSourceDB = 'I can only convert SQL for migrations from an Oracle source database. The provided .sct file indicates another source database for this migration.' diff --git a/packages/core/src/codewhisperer/service/transformByQ/transformationResultsViewProvider.ts b/packages/core/src/codewhisperer/service/transformByQ/transformationResultsViewProvider.ts index 13951f7508a..28f7dd81406 100644 --- a/packages/core/src/codewhisperer/service/transformByQ/transformationResultsViewProvider.ts +++ b/packages/core/src/codewhisperer/service/transformByQ/transformationResultsViewProvider.ts @@ -325,7 +325,7 @@ export class ProposedTransformationExplorer { treeDataProvider: transformDataProvider, }) - const patchFiles: string[] = [] + let patchFiles: string[] = [] let singlePatchFile: string = '' let patchFilesDescriptions: DescriptionContent | undefined = undefined @@ -430,6 +430,7 @@ export class ProposedTransformationExplorer { let deserializeErrorMessage = undefined let pathContainingArchive = '' + patchFiles = [] // reset patchFiles if there was a previous transformation try { // Download and deserialize the zip pathContainingArchive = path.dirname(pathToArchive)