fix(amazonq): change the findings suffix, adjust the stored findings when lines are modified.

Author: blakelaz-amazon

packages/core/src/codewhisperer/activation.ts

@@ -476,6 +476,7 @@ export async function activate(context: ExtContext): Promise<void> {
                               CodeWhispererConstants.amazonqIgnoreNextLine
                           )
                 )
+                SecurityIssueProvider.instance.cleanOldFiles()
             }),
             vscode.window.createTreeView(SecurityIssueTreeViewProvider.viewType, {
                 treeDataProvider: SecurityIssueTreeViewProvider.instance,

packages/core/src/codewhisperer/models/constants.ts

@@ -901,4 +901,4 @@ export const predictionTrackerDefaultConfig = {
     maxSupplementalContext: 15,
 }
 
-export const findingsSuffix = '_qCodeScanFindings'
+export const findingsSuffix = '_qCodeReviewFindings'

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

@@ -8,8 +8,6 @@ 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
@@ -41,15 +39,7 @@ 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)
+    SecurityIssueProvider.instance.cleanOldFiles()
 }
 
 function updateSecurityIssuesForProviders(securityRecommendation: AggregatedCodeScanIssue, isAutoScope?: boolean) {
@@ -67,26 +57,6 @@ 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

@@ -6,6 +6,8 @@
 import * as vscode from 'vscode'
 import { AggregatedCodeScanIssue, CodeScanIssue, SuggestedFix } from '../models/model'
 import { randomUUID } from '../../shared/crypto'
+import fs = require('fs')
+import path from 'path'
 export class SecurityIssueProvider {
     static #instance: SecurityIssueProvider
     public static get instance() {
@@ -167,4 +169,28 @@ export class SecurityIssueProvider {
                 (i) => i.title === issue.title && i.startLine === issue.startLine && i.endLine === issue.endLine
             )
     }
+
+    public cleanOldFiles(maxfiles = 100): void {
+        const issuesJson = JSON.stringify(this._issues)
+        const dirPath = path.join(__dirname, '..', '..', '..', '..', '..', '..', 'findings')
+        fs.existsSync(dirPath) || fs.mkdirSync(dirPath)
+        fs.writeFileSync(path.join(dirPath, `SecurityIssues-${this._id}.json`), issuesJson, 'utf8')
+        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))
+            }
+        }
+    }
 }