Merge branch 'master' of github.com:leigaol/aws-toolkit-vscode into internal_falcon_release

Author: leigaol

buildspec/release/80notify.yml

@@ -0,0 +1,28 @@
+version: 0.2
+
+phases:
+    install:
+        runtime-versions:
+            nodejs: 20
+
+    pre_build:
+        commands:
+            # Check for implicit env vars passed from the release pipeline.
+            - test -n "${NOTIFY_URL}"
+            - test -n "${TARGET_EXTENSION}"
+
+    build:
+        commands:
+            - echo "TARGET_EXTENSION=${TARGET_EXTENSION}"
+            - EXTENSION_NAME=$([ "$TARGET_EXTENSION" = "amazonq" ] && echo "Amazon Q" || echo "AWS Toolkit")
+            - VERSION=$(node -e "console.log(require('./packages/${TARGET_EXTENSION}/package.json').version);")
+            - CHANGELOG=$(cat packages/${TARGET_EXTENSION}/CHANGELOG.md | perl -ne 'BEGIN{$/="\n\n"} print if $. == 2')
+            - MESSAGE=$(envsubst < "$GITHUB_WORKSPACE/buildspec/release/notify.txt")
+            - DATA="{'Content':'${MESSAGE}'}"
+            - |
+                # TODO: Enable for prod only after testing
+                if [ "$STAGE" = "prod" ]; then
+                  echo "SKIPPED (stage=${STAGE}): 'curl -v POST \"[SLACK_URL]\" -H \"Content-Type:application/json\" --data $DATA'"
+                  exit 0
+                fi
+                curl -v POST "${NOTIFY_URL}" -H "Content-Type:application/json" --data $DATA

buildspec/release/notify.txt

@@ -0,0 +1,6 @@
+Released ${EXTENSION_NAME} v${VERSION} for VSCode
+
+${CHANGELOG}
+
+Changelog: https://github.com/aws/aws-toolkit-vscode/blob/master/packages/${TARGET_EXTENSION}/CHANGELOG.md
+Release Arifact: https://github.com/aws/aws-toolkit-vscode/releases/tag/${TARGET_EXTENSION}/v${VERSION}

packages/amazonq/.changes/next-release/Bug Fix-037e19bd-95f5-4cdf-8408-6eb273ff7ebd.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "/dev and /doc: Multi-root workspace with duplicate files causes infinite 'Uploading code...' loop"
+}

packages/amazonq/.changes/next-release/Bug Fix-eac82ab9-bdab-47c4-834d-600cb1a0b6a2.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "/transform: allow View Summary button to work even after accepting diff"
+}

packages/amazonq/test/e2e/amazonq/testGen.test.ts

@@ -9,9 +9,10 @@ import { qTestingFramework } from './framework/framework'
 import sinon from 'sinon'
 import { Messenger } from './framework/messenger'
 import { FollowUpTypes } from 'aws-core-vscode/amazonq'
-import { registerAuthHook, using, TestFolder, closeAllEditors } from 'aws-core-vscode/test'
+import { registerAuthHook, using, TestFolder, closeAllEditors, getTestWorkspaceFolder } from 'aws-core-vscode/test'
 import { loginToIdC } from './utils/setup'
 import { waitUntil, workspaceUtils } from 'aws-core-vscode/shared'
+import * as path from 'path'
 
 describe('Amazon Q Test Generation', function () {
     let framework: qTestingFramework
@@ -20,11 +21,13 @@ describe('Amazon Q Test Generation', function () {
     const testFiles = [
         {
             language: 'python',
-            filePath: 'python3.7-image-sam-app/hello_world/app.py',
+            filePath: 'testGenFolder/src/main/math.py',
+            testFilePath: 'testGenFolder/src/test/test_math.py',
         },
         {
             language: 'java',
-            filePath: 'java17-gradle/HelloWorldFunction/src/main/java/helloworld/App.java',
+            filePath: 'testGenFolder/src/main/Math.java',
+            testFilePath: 'testGenFolder/src/test/MathTest.java',
         },
     ]
 
@@ -33,14 +36,15 @@ describe('Amazon Q Test Generation', function () {
         // must be atleast one unsupported language here for testing
         {
             language: 'typescript',
-            filePath: 'ts-plain-sam-app/src/app.ts',
+            filePath: 'testGenFolder/src/main/math.ts',
         },
         {
             language: 'javascript',
-            filePath: 'js-plain-sam-app/src/app.js',
+            filePath: 'testGenFolder/src/main/math.js',
         },
     ]
 
+    // handles opening the file since /test must be called on an active file
     async function setupTestDocument(filePath: string, language: string) {
         const document = await waitUntil(async () => {
             const doc = await workspaceUtils.openTextDocument(filePath)
@@ -57,7 +61,7 @@ describe('Amazon Q Test Generation', function () {
 
         const activeEditor = vscode.window.activeTextEditor
         if (!activeEditor || activeEditor.document.uri.fsPath !== document.uri.fsPath) {
-            assert.fail(`Failed to make temp file active`)
+            assert.fail(`Failed to make ${language} file active`)
         }
     }
 
@@ -68,6 +72,15 @@ describe('Amazon Q Test Generation', function () {
         })
     }
 
+    // clears test file to a blank file
+    // not cleaning up test file may possibly cause bloat in CI since testFixtures does not get reset
+    async function cleanupTestFile(testFilePath: string) {
+        const workspaceFolder = getTestWorkspaceFolder()
+        const absoluteTestFilePath = path.join(workspaceFolder, testFilePath)
+        const testFileUri = vscode.Uri.file(absoluteTestFilePath)
+        await vscode.workspace.fs.writeFile(testFileUri, Buffer.from('', 'utf-8'))
+    }
+
     before(async function () {
         await using(registerAuthHook('amazonq-test-account'), async () => {
             await loginToIdC()
@@ -112,7 +125,7 @@ describe('Amazon Q Test Generation', function () {
     })
 
     describe('/test entry', () => {
-        describe('Unsupported language', () => {
+        describe('Unsupported language file', () => {
             const { language, filePath } = unsupportedLanguages[0]
 
             beforeEach(async () => {
@@ -134,13 +147,13 @@ describe('Amazon Q Test Generation', function () {
             })
         })
 
-        describe('External file', async () => {
+        describe('External file out of project', async () => {
             let testFolder: TestFolder
             let fileName: string
 
             beforeEach(async () => {
                 testFolder = await TestFolder.create()
-                fileName = 'test.py'
+                fileName = 'math.py'
                 const filePath = await testFolder.write(fileName, 'def add(a, b): return a + b')
 
                 const document = await vscode.workspace.openTextDocument(filePath)
@@ -162,10 +175,8 @@ describe('Amazon Q Test Generation', function () {
             })
         })
 
-        for (const { language, filePath } of testFiles) {
-            // skipping for now since this test is flaky. passes locally, but only half the time in CI
-            // have tried retries for setupTestDocument, openTextDocument, and showTextDocument
-            describe.skip(`${language} file`, () => {
+        for (const { language, filePath, testFilePath } of testFiles) {
+            describe(`/test on ${language} file`, () => {
                 beforeEach(async () => {
                     await waitUntil(async () => await setupTestDocument(filePath, language), {})
 
@@ -177,7 +188,7 @@ describe('Amazon Q Test Generation', function () {
                     await tab.waitForChatFinishesLoading()
                 })
 
-                describe('View diff', async () => {
+                describe('View diff of test file', async () => {
                     it('Clicks on view diff', async () => {
                         const chatItems = tab.getChatItems()
                         const viewDiffMessage = chatItems[5]
@@ -190,7 +201,14 @@ describe('Amazon Q Test Generation', function () {
                     })
                 })
 
-                describe('Accept code', async () => {
+                describe('Accept unit tests', async () => {
+                    afterEach(async () => {
+                        // this e2e test generates unit tests, so we want to clean them up after this test is done
+                        await waitUntil(async () => {
+                            await cleanupTestFile(testFilePath)
+                        }, {})
+                    })
+
                     it('Clicks on accept', async () => {
                         await tab.waitForButtons([FollowUpTypes.AcceptCode, FollowUpTypes.RejectCode])
                         tab.clickButton(FollowUpTypes.AcceptCode)
@@ -204,7 +222,7 @@ describe('Amazon Q Test Generation', function () {
                     })
                 })
 
-                describe('Reject code', async () => {
+                describe('Reject unit tests', async () => {
                     it('Clicks on reject', async () => {
                         await tab.waitForButtons([FollowUpTypes.AcceptCode, FollowUpTypes.RejectCode])
                         tab.clickButton(FollowUpTypes.RejectCode)

packages/amazonq/test/unit/amazonqFeatureDev/util/files.test.ts

@@ -15,6 +15,8 @@ import { fs, AmazonqCreateUpload, ZipStream } from 'aws-core-vscode/shared'
 import { MetricName, Span } from 'aws-core-vscode/telemetry'
 import sinon from 'sinon'
 import { CodeWhispererSettings } from 'aws-core-vscode/codewhisperer'
+import { CurrentWsFolders } from 'aws-core-vscode/amazonq'
+import path from 'path'
 
 const testDevfilePrepareRepo = async (devfileEnabled: boolean) => {
     const files: Record<string, string> = {
@@ -44,19 +46,24 @@ const testDevfilePrepareRepo = async (devfileEnabled: boolean) => {
         .stub(CodeWhispererSettings.instance, 'getAutoBuildSetting')
         .returns(devfileEnabled ? { [workspace.uri.fsPath]: true } : {})
 
-    await testPrepareRepoData(workspace, expectedFiles)
+    await testPrepareRepoData([workspace], expectedFiles)
 }
 
 const testPrepareRepoData = async (
-    workspace: vscode.WorkspaceFolder,
+    workspaces: vscode.WorkspaceFolder[],
     expectedFiles: string[],
     expectedTelemetryMetrics?: Array<{ metricName: MetricName; value: any }>
 ) => {
     expectedFiles.sort((a, b) => a.localeCompare(b))
     const telemetry = new TelemetryHelper()
-    const result = await prepareRepoData([workspace.uri.fsPath], [workspace], telemetry, {
-        record: () => {},
-    } as unknown as Span<AmazonqCreateUpload>)
+    const result = await prepareRepoData(
+        workspaces.map((ws) => ws.uri.fsPath),
+        workspaces as CurrentWsFolders,
+        telemetry,
+        {
+            record: () => {},
+        } as unknown as Span<AmazonqCreateUpload>
+    )
 
     assert.strictEqual(Buffer.isBuffer(result.zipFileBuffer), true)
     // checksum is not the same across different test executions because some unique random folder names are generated
@@ -87,7 +94,7 @@ describe('file utils', () => {
             await folder.write('file2.md', 'test content')
             const workspace = getWorkspaceFolder(folder.path)
 
-            await testPrepareRepoData(workspace, ['file1.md', 'file2.md'])
+            await testPrepareRepoData([workspace], ['file1.md', 'file2.md'])
         })
 
         it('prepareRepoData ignores denied file extensions', async function () {
@@ -96,7 +103,7 @@ describe('file utils', () => {
             const workspace = getWorkspaceFolder(folder.path)
 
             await testPrepareRepoData(
-                workspace,
+                [workspace],
                 [],
                 [{ metricName: 'amazonq_bundleExtensionIgnored', value: { filenameExt: 'mp4', count: 1 } }]
             )
@@ -126,5 +133,18 @@ describe('file utils', () => {
                 ContentLengthError
             )
         })
+
+        it('prepareRepoData properly handles multi-root workspaces', async function () {
+            const folder = await TestFolder.create()
+            const testFilePath = 'innerFolder/file.md'
+            await folder.write(testFilePath, 'test content')
+
+            // Add a folder and its subfolder to the workspace
+            const workspace1 = getWorkspaceFolder(folder.path)
+            const workspace2 = getWorkspaceFolder(folder.path + '/innerFolder')
+            const folderName = path.basename(folder.path)
+
+            await testPrepareRepoData([workspace1, workspace2], [`${folderName}_${workspace1.name}/${testFilePath}`])
+        })
     })
 })

packages/core/src/amazonq/util/files.ts

@@ -48,8 +48,14 @@ export async function prepareRepoData(
 
         let totalBytes = 0
         const ignoredExtensionMap = new Map<string, number>()
+        const addedFilePaths = new Set()
 
         for (const file of files) {
+            if (addedFilePaths.has(file.zipFilePath)) {
+                continue
+            }
+            addedFilePaths.add(file.zipFilePath)
+
             let fileSize
             try {
                 fileSize = (await fs.stat(file.fileUri)).size

packages/core/src/amazonq/webview/ui/main.ts

@@ -639,7 +639,7 @@ export const createMynahUI = (
                 mynahUI.addChatItem(tabID, {
                     type: ChatItemType.ANSWER_STREAM,
                 })
-            } else if (tabType === 'gumby') {
+            } else if (tabType === 'gumby' || tabType === 'testgen') {
                 connector.requestAnswer(tabID, {
                     chatMessage: prompt.prompt ?? '',
                 })