feat(amazonq): store the findings locally and include a path to them in ChatParams

Author: blakelaz-amazon

packages/amazonq/src/lsp/chat/messages.ts

@@ -72,6 +72,7 @@ import {
     CodeWhispererSettings,
     initSecurityScanRender,
     ReferenceLogViewProvider,
+    SecurityIssueProvider,
     SecurityIssueTreeViewProvider,
     CodeWhispererConstants,
 } from 'aws-core-vscode/codewhisperer'
@@ -89,6 +90,7 @@ import { decryptResponse, encryptRequest } from '../encryption'
 import { getCursorState } from '../utils'
 import { focusAmazonQPanel } from './commands'
 import { ChatMessage } from '@aws/language-server-runtimes/server-interface'
+import path from 'path'
 
 export function registerActiveEditorChangeListener(languageClient: LanguageClient) {
     let debounceTimer: NodeJS.Timeout | undefined
@@ -285,6 +287,17 @@ export function registerMessageListeners(
                 if (editor) {
                     chatParams.cursorState = getCursorState(editor.selections)
                     chatParams.textDocument = { uri: editor.document.uri.toString() }
+                    chatParams.findingsPath = path.join(
+                        __dirname,
+                        '..',
+                        '..',
+                        '..',
+                        '..',
+                        '..',
+                        '..',
+                        'findings',
+                        `SecurityIssues-${SecurityIssueProvider.instance.id}.json`
+                    )
                 }
 
                 const chatRequest = await encryptRequest<ChatParams>(chatParams, encryptionKey)

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

@@ -8,6 +8,8 @@ import { CodeScanIssue, AggregatedCodeScanIssue } from '../models/model'
 import { CodeAnalysisScope, codewhispererDiagnosticSourceLabel } from '../models/constants'
 import { SecurityIssueTreeViewProvider } from './securityIssueTreeViewProvider'
 import { SecurityIssueProvider } from './securityIssueProvider'
+import fs = require('fs')
+import path from 'path'
 
 export interface SecurityDiagnostic extends vscode.Diagnostic {
     findingId?: string
@@ -39,6 +41,15 @@ export function initSecurityScanRender(
         updateSecurityIssuesForProviders(securityRecommendation, scope === CodeAnalysisScope.FILE_AUTO)
     }
     securityScanRender.initialized = true
+    const issuesJson = JSON.stringify(SecurityIssueProvider.instance.issues)
+    const filePath = path.join(__dirname, '..', '..', '..', '..', '..', '..', 'findings')
+    fs.existsSync(filePath) || fs.mkdirSync(filePath)
+    fs.writeFileSync(
+        path.join(filePath, `SecurityIssues-${SecurityIssueProvider.instance.id}.json`),
+        issuesJson,
+        'utf8'
+    )
+    cleanOldFiles(filePath)
 }
 
 function updateSecurityIssuesForProviders(securityRecommendation: AggregatedCodeScanIssue, isAutoScope?: boolean) {
@@ -56,6 +67,26 @@ function updateSecurityIssuesForProviders(securityRecommendation: AggregatedCode
     SecurityIssueTreeViewProvider.instance.refresh()
 }
 
+function cleanOldFiles(dirPath: string, maxfiles = 100) {
+    const files = fs.readdirSync(dirPath)
+    if (files.length > maxfiles) {
+        type Stat = { fileName: string; mtime: number }
+        const stats: Stat[] = []
+        for (const file of files) {
+            const stat = fs.statSync(path.join(dirPath, file[0]))
+            stats.push({
+                fileName: file[0],
+                mtime: stat.mtime.getTime(),
+            })
+        }
+        const sortedStats = stats.sort((a: Stat, b: Stat) => a.mtime - b.mtime)
+        const numberToDelete = files.length - maxfiles
+        for (let i = 0; i < numberToDelete; i++) {
+            fs.rmSync(path.join(dirPath, sortedStats[i].fileName))
+        }
+    }
+}
+
 export function updateSecurityDiagnosticCollection(securityRecommendation: AggregatedCodeScanIssue) {
     const filePath = securityRecommendation.filePath
     const uri = vscode.Uri.file(filePath)

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

@@ -5,6 +5,7 @@
 
 import * as vscode from 'vscode'
 import { AggregatedCodeScanIssue, CodeScanIssue, SuggestedFix } from '../models/model'
+import { randomUUID } from '../../shared/crypto'
 export class SecurityIssueProvider {
     static #instance: SecurityIssueProvider
     public static get instance() {
@@ -20,6 +21,15 @@ export class SecurityIssueProvider {
         this._issues = issues
     }
 
+    private _id: string = randomUUID()
+    public get id() {
+        return this._id
+    }
+
+    public set id(id: string) {
+        this._id = id
+    }
+
     public handleDocumentChange(event: vscode.TextDocumentChangeEvent) {
         // handleDocumentChange function may be triggered while testing by our own code generation.
         if (!event.contentChanges || event.contentChanges.length === 0) {

packages/core/src/shared/settings-toolkit.gen.ts

@@ -44,8 +44,8 @@ export const toolkitSettings = {
         "jsonResourceModification": {},
         "amazonqLSP": {},
         "amazonqLSPInline": {},
-        "amazonqLSPInlineChat": {},
-        "amazonqChatLSP": {}
+        "amazonqChatLSP": {},
+        "amazonqLSPInlineChat": {}
     },
     "aws.resources.enabledResources": {},
     "aws.lambda.recentlyUploaded": {},