fix(amazonq): diagnostics code is incorrect

Author: ctlai95

packages/amazonq/.changes/next-release/Bug Fix-8331f6fe-6955-4a49-91ac-e4ca3fbe4165.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "/review: Diagnostics in the problems panel are mapped to the wrong code"
+}

packages/amazonq/test/unit/codewhisperer/service/diagnosticsProvider.test.ts

@@ -12,6 +12,8 @@ import {
     removeDiagnostic,
     disposeSecurityDiagnostic,
     SecurityDiagnostic,
+    createSecurityDiagnostic,
+    codewhispererDiagnosticSourceLabel,
 } from 'aws-core-vscode/codewhisperer'
 import { createCodeScanIssue, createMockDocument, createTextDocumentChangeEvent } from 'aws-core-vscode/test'
 
@@ -83,4 +85,16 @@ describe('diagnosticsProvider', function () {
         assert.strictEqual(actual[1].range.start.line, 5)
         assert.strictEqual(actual[1].range.end.line, 6)
     })
+
+    it('should create securityDiagnostic from codeScanIssue', function () {
+        const codeScanIssue = createCodeScanIssue()
+        const securityDiagnostic = createSecurityDiagnostic(codeScanIssue)
+        assert.strictEqual(securityDiagnostic.findingId, codeScanIssue.findingId)
+        assert.strictEqual(securityDiagnostic.message, codeScanIssue.title)
+        assert.strictEqual(securityDiagnostic.range.start.line, codeScanIssue.startLine)
+        assert.strictEqual(securityDiagnostic.range.end.line, codeScanIssue.endLine)
+        assert.strictEqual(securityDiagnostic.severity, vscode.DiagnosticSeverity.Warning)
+        assert.strictEqual(securityDiagnostic.source, codewhispererDiagnosticSourceLabel)
+        assert.strictEqual(securityDiagnostic.code, codeScanIssue.ruleId)
+    })
 })

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

@@ -74,14 +74,7 @@ export function createSecurityDiagnostic(securityIssue: CodeScanIssue) {
         vscode.DiagnosticSeverity.Warning
     )
     securityDiagnostic.source = codewhispererDiagnosticSourceLabel
-    // const detectorUrl = securityIssue.recommendation.url
-    securityDiagnostic.code = securityIssue.findingId
-    // securityDiagnostic.code = detectorUrl
-    //     ? {
-    //           value: securityIssue.detectorId,
-    //           target: vscode.Uri.parse(detectorUrl),
-    //       }
-    //     : securityIssue.detectorId
+    securityDiagnostic.code = securityIssue.ruleId
     securityDiagnostic.findingId = securityIssue.findingId
     return securityDiagnostic
 }