[Amazon Q Security Scans] Refactoring code to improve the performance (aws#5346)

* Refactoring the code

Author: laileni-aws

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

@@ -25,34 +25,30 @@ export class SecurityIssueHoverProvider extends SecurityIssueProvider implements
     ): vscode.Hover {
         const contents: vscode.MarkdownString[] = []
 
-        for (const group of this.issues) {
-            if (document.fileName !== group.filePath) {
-                continue
-            }
-
-            for (const issue of group.issues) {
-                const range = new vscode.Range(issue.startLine, 0, issue.endLine, 0)
-                if (range.contains(position)) {
-                    contents.push(this._getContent(group.filePath, issue))
-                    telemetry.codewhisperer_codeScanIssueHover.emit({
-                        findingId: issue.findingId,
-                        detectorId: issue.detectorId,
-                        ruleId: issue.ruleId,
-                        includesFix: !!issue.suggestedFixes.length,
-                        credentialStartUrl: AuthUtil.instance.startUrl,
-                    })
-                    TelemetryHelper.instance.sendCodeScanRemediationsEvent(
-                        document.languageId,
-                        'CODESCAN_ISSUE_HOVER',
-                        issue.detectorId,
-                        issue.findingId,
-                        issue.ruleId,
-                        undefined,
-                        undefined,
-                        undefined,
-                        !!issue.suggestedFixes.length
-                    )
-                }
+        const fileIssues = this.issues.find((group) => group.filePath === document.fileName)?.issues || []
+
+        for (const issue of fileIssues) {
+            const range = new vscode.Range(issue.startLine, 0, issue.endLine, 0)
+            if (range.contains(position)) {
+                contents.push(this._getContent(document.fileName, issue))
+                telemetry.codewhisperer_codeScanIssueHover.emit({
+                    findingId: issue.findingId,
+                    detectorId: issue.detectorId,
+                    ruleId: issue.ruleId,
+                    includesFix: !!issue.suggestedFixes.length,
+                    credentialStartUrl: AuthUtil.instance.startUrl,
+                })
+                TelemetryHelper.instance.sendCodeScanRemediationsEvent(
+                    document.languageId,
+                    'CODESCAN_ISSUE_HOVER',
+                    issue.detectorId,
+                    issue.findingId,
+                    issue.ruleId,
+                    undefined,
+                    undefined,
+                    undefined,
+                    !!issue.suggestedFixes.length
+                )
             }
         }
 

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

@@ -118,17 +118,17 @@ export function mapToAggregatedList(
     scope: CodeWhispererConstants.CodeAnalysisScope
 ) {
     const codeScanIssues: RawCodeScanIssue[] = JSON.parse(json)
-    const filteredIssues = codeScanIssues.filter((issue) => {
+    const filteredIssues = codeScanIssues.flatMap((issue) => {
         if (scope === CodeWhispererConstants.CodeAnalysisScope.FILE && editor) {
-            for (let lineNumber = issue.startLine; lineNumber <= issue.endLine; lineNumber++) {
+            const isValidIssue = issue.codeSnippet.every((codeIssue, index) => {
+                const lineNumber = issue.startLine + index
                 const line = editor.document.lineAt(lineNumber - 1)?.text
-                const codeContent = issue.codeSnippet.find((codeIssue) => codeIssue.number === lineNumber)?.content
-                if (line !== codeContent) {
-                    return false
-                }
-            }
+                const codeContent = codeIssue.content
+                return line === codeContent
+            })
+            return isValidIssue ? [issue] : []
         }
-        return true
+        return [issue]
     })
 
     filteredIssues.forEach((issue) => {
@@ -306,7 +306,7 @@ export async function uploadArtifactToS3(
             `Amazon Q is unable to upload workspace artifacts to Amazon S3 for security scans. For more information, see the Amazon Q documentation or contact your network or organization administrator.`
         )
         const errorMessage = getTelemetryReasonDesc(error)?.includes(`"PUT" request failed with code "403"`)
-            ? `UploadArtifactToS3Exception: "PUT" request failed with code "403"`
+            ? `"PUT" request failed with code "403"`
             : getTelemetryReasonDesc(error) ?? 'Security scan failed.'
 
         throw new UploadArtifactToS3Error(errorMessage)