Merge pull request aws#6447 from aws/autoMerge/feature/amazonqLSP

Merge master into feature/amazonqLSP
hayemaxi · Jan 28, 2025 · beed965 · beed965
2 parents b17b3fa + 2fe8109
commit beed965
Show file tree

Hide file tree

Showing 6 changed files with 77 additions and 26 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -40,7 +40,7 @@
         "mergeReports": "ts-node ./scripts/mergeReports.ts"
     },
     "devDependencies": {
-        "@aws-toolkits/telemetry": "^1.0.293",
+        "@aws-toolkits/telemetry": "^1.0.295",
         "@playwright/browser-chromium": "^1.43.1",
         "@stylistic/eslint-plugin": "^2.11.0",
         "@types/he": "^1.2.3",

diff --git a/packages/amazonq/test/unit/codewhisperer/service/securityScanHandler.test.ts b/packages/amazonq/test/unit/codewhisperer/service/securityScanHandler.test.ts
@@ -131,6 +131,31 @@ describe('securityScanHandler', function () {
             assert.equal(aggregatedCodeScanIssueList.length, 2)
             assert.equal(aggregatedCodeScanIssueList[0].issues.length, 3)
         })
+
+        it('should set autoDetected based on scope', async function () {
+            mockClient.listCodeScanFindings.resolves(
+                buildMockListCodeScanFindingsResponse(JSON.stringify([buildRawCodeScanIssue()]))
+            )
+            for (const [scope, expectedValue] of [
+                [CodeAnalysisScope.FILE_AUTO, true],
+                [CodeAnalysisScope.FILE_ON_DEMAND, false],
+                [CodeAnalysisScope.PROJECT, false],
+            ] as [CodeAnalysisScope, boolean][]) {
+                const aggregatedCodeScanIssueList = await listScanResults(
+                    mockClient,
+                    'jobId',
+                    'codeScanFindingsSchema',
+                    ['projectPath'],
+                    scope,
+                    undefined
+                )
+                assert.ok(
+                    aggregatedCodeScanIssueList.every((item) =>
+                        item.issues.every((issue) => issue.autoDetected === expectedValue)
+                    )
+                )
+            }
+        })
     })
 
     describe('mapToAggregatedList', () => {

diff --git a/packages/core/src/codewhisperer/commands/basicCommands.ts b/packages/core/src/codewhisperer/commands/basicCommands.ts
@@ -447,6 +447,8 @@ export const applySecurityFix = Commands.declare(
             result: 'Succeeded',
             credentialStartUrl: AuthUtil.instance.startUrl,
             codeFixAction: 'applyFix',
+            autoDetected: targetIssue.autoDetected,
+            codewhispererCodeScanJobId: targetIssue.scanJobId,
         }
         let languageId = undefined
         try {
@@ -711,6 +713,7 @@ export const generateFix = Commands.declare(
                     } else {
                         hasSuggestedFix = suggestedFix !== undefined
                     }
+                    telemetry.record({ includesFix: hasSuggestedFix })
                     const updatedIssue: CodeScanIssue = {
                         ...targetIssue,
                         fixJobId: jobId,
@@ -755,6 +758,8 @@ export const generateFix = Commands.declare(
                         findingId: targetIssue.findingId,
                         ruleId: targetIssue.ruleId,
                         variant: refresh ? 'refresh' : undefined,
+                        autoDetected: targetIssue.autoDetected,
+                        codewhispererCodeScanJobId: targetIssue.scanJobId,
                     })
                 }
             })

diff --git a/packages/core/src/codewhisperer/models/model.ts b/packages/core/src/codewhisperer/models/model.ts
@@ -487,6 +487,7 @@ export interface CodeScanIssue {
     scanJobId: string
     language: string
     fixJobId?: string
+    autoDetected?: boolean
 }
 
 export interface AggregatedCodeScanIssue {

diff --git a/packages/core/src/codewhisperer/service/securityScanHandler.ts b/packages/core/src/codewhisperer/service/securityScanHandler.ts
@@ -83,7 +83,7 @@ export async function listScanResults(
             if (existsSync(filePath) && statSync(filePath).isFile()) {
                 const aggregatedCodeScanIssue: AggregatedCodeScanIssue = {
                     filePath: filePath,
-                    issues: issues.map((issue) => mapRawToCodeScanIssue(issue, editor, jobId)),
+                    issues: issues.map((issue) => mapRawToCodeScanIssue(issue, editor, jobId, scope)),
                 }
                 aggregatedCodeScanIssueList.push(aggregatedCodeScanIssue)
             }
@@ -92,7 +92,7 @@ export async function listScanResults(
         if (existsSync(maybeAbsolutePath) && statSync(maybeAbsolutePath).isFile()) {
             const aggregatedCodeScanIssue: AggregatedCodeScanIssue = {
                 filePath: maybeAbsolutePath,
-                issues: issues.map((issue) => mapRawToCodeScanIssue(issue, editor, jobId)),
+                issues: issues.map((issue) => mapRawToCodeScanIssue(issue, editor, jobId, scope)),
             }
             aggregatedCodeScanIssueList.push(aggregatedCodeScanIssue)
         }
@@ -103,7 +103,8 @@ export async function listScanResults(
 function mapRawToCodeScanIssue(
     issue: RawCodeScanIssue,
     editor: vscode.TextEditor | undefined,
-    jobId: string
+    jobId: string,
+    scope: CodeWhispererConstants.CodeAnalysisScope
 ): CodeScanIssue {
     const isIssueTitleIgnored = CodeWhispererSettings.instance.getIgnoredSecurityIssues().includes(issue.title)
     const isSingleIssueIgnored =
@@ -130,6 +131,7 @@ function mapRawToCodeScanIssue(
         visible: !isIssueTitleIgnored && !isSingleIssueIgnored,
         scanJobId: jobId,
         language,
+        autoDetected: scope === CodeWhispererConstants.CodeAnalysisScope.FILE_AUTO,
     }
 }