Merge remote-tracking branch 'origin/master' into HEAD

Author: Hweinstock

package-lock.json

@@ -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/e2e/amazonq/testGen.test.ts

@@ -39,12 +39,13 @@ import {
     SecurityScanTimedOutError,
     UploadArtifactToS3Error,
 } from '../models/errors'
-import { getTelemetryReasonDesc } from '../../shared/errors'
+import { getTelemetryReasonDesc, isAwsError } from '../../shared/errors'
 import { CodeWhispererSettings } from '../util/codewhispererSettings'
 import { detectCommentAboveLine } from '../../shared/utilities/commentUtils'
 import { runtimeLanguageContext } from '../util/runtimeLanguageContext'
 import { FeatureUseCase } from '../models/constants'
 import { UploadTestArtifactToS3Error } from '../../amazonqTest/error'
+import { ChatSessionManager } from '../../amazonqTest/chat/storages/chatSession'
 
 export async function listScanResults(
     client: DefaultCodeWhispererClient,
@@ -386,6 +387,9 @@ export async function uploadArtifactToS3(
         } else {
             errorMessage = errorDesc ?? defaultMessage
         }
+        if (isAwsError(error) && featureUseCase === FeatureUseCase.TEST_GENERATION) {
+            ChatSessionManager.Instance.getSession().startTestGenerationRequestId = error.requestId
+        }
         throw isCodeScan ? new UploadArtifactToS3Error(errorMessage) : new UploadTestArtifactToS3Error(errorMessage)
     }
 }

packages/core/src/codewhisperer/service/securityScanHandler.ts

@@ -13,6 +13,7 @@ import {
     AwsSamDebuggerConfiguration,
     isCodeTargetProperties,
     isTemplateTargetProperties,
+    TemplateTargetProperties,
 } from '../../../shared/sam/debugger/awsSamDebugConfiguration'
 import {
     DefaultAwsSamDebugConfigurationValidator,
@@ -433,15 +434,19 @@ export async function registerSamDebugInvokeVueCommand(
     context: vscode.ExtensionContext,
     params: { resource: ResourceNode }
 ) {
-    const launchConfig: AwsSamDebuggerConfiguration | undefined = undefined
     const resource = params?.resource.resource
     const source = 'AppBuilderLocalInvoke'
+    const launchConfigs = await new LaunchConfiguration(resource.location).getSamDebugConfigurations()
+    const launchConfig = launchConfigs.find(
+        (config) => (config.invokeTarget as TemplateTargetProperties).logicalId === resource.resource.Id
+    )
+
     const webview = new WebviewPanel(context, launchConfig, {
         logicalId: resource.resource.Id ?? '',
         region: resource.region ?? '',
         location: resource.location.fsPath,
         handler: resource.resource.Handler!,
-        runtime: resource.resource.Runtime!,
+        runtime: launchConfig?.lambda?.runtime ?? resource.resource.Runtime!,
         arn: resource.functionArn ?? '',
         stackName: resource.stackName ?? '',
         environment: resource.resource.Environment,

packages/core/src/lambda/vue/configEditor/samInvokeBackend.ts

@@ -0,0 +1,8 @@
+/**
+ * Math functions
+ */
+public class Math {
+    public int add(int a, int b) {
+        return a + b;
+    }
+}

packages/core/src/testFixtures/workspaceFolder/testGenFolder/src/main/Math.java

@@ -0,0 +1,3 @@
+function addNum(num1, num2) {
+    return num1 + num2;
+}

packages/core/src/testFixtures/workspaceFolder/testGenFolder/src/main/math.js

@@ -0,0 +1,3 @@
+# adds two numbers
+def add(a, b):
+    return a + b

packages/core/src/testFixtures/workspaceFolder/testGenFolder/src/main/math.py

@@ -0,0 +1,3 @@
+function addTwoNums(a: number, b: number): number {
+    return a + b;
+}