Bug fix for listCodeScanFindings request by adding nextToken object f… (

#4429) * Bug fix for listCodeScanFindings request by adding nextToken object for pagination. * Update .changes/next-release/bugfix-c8f493ab-c035-4df4-b46d-4ffcec8c4cbd.json Co-authored-by: Richard Li <742829+rli@users.noreply.github.com> --------- Co-authored-by: Richard Li <742829+rli@users.noreply.github.com>
aws · May 3, 2024 · a26137f · a26137f
1 parent e060c57
commit a26137f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/.changes/next-release/bugfix-c8f493ab-c035-4df4-b46d-4ffcec8c4cbd.json b/.changes/next-release/bugfix-c8f493ab-c035-4df4-b46d-4ffcec8c4cbd.json
@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Amazon Q: Fix issue where items listed by Amazon Q Code Scan were duplicated or missing"
+}
diff --git a/...re/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanSession.kt b/...re/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanSession.kt
@@ -189,7 +189,7 @@ class CodeWhispererCodeScanSession(val sessionContext: CodeScanSessionContext) {
 
             // 6. Return the results from the ListCodeScan API.
             currentCoroutineContext.ensureActive()
-            var listCodeScanFindingsResponse = listCodeScanFindings(jobId)
+            var listCodeScanFindingsResponse = listCodeScanFindings(jobId, null)
             val serviceInvocationDuration = now() - serviceInvocationStartTime
             codeScanResponseContext = codeScanResponseContext.copy(
                 serviceInvocationContext = codeScanResponseContext.serviceInvocationContext.copy(serviceInvocationDuration = serviceInvocationDuration)
@@ -198,10 +198,10 @@ class CodeWhispererCodeScanSession(val sessionContext: CodeScanSessionContext) {
             val documents = mutableListOf<String>()
             documents.add(listCodeScanFindingsResponse.codeScanFindings())
             // coroutineContext helps to actively cancel the bigger projects quickly
-            withContext(coroutineContext) {
-                while (listCodeScanFindingsResponse.nextToken() != null && coroutineContext.isActive) {
+            withContext(currentCoroutineContext) {
+                while (listCodeScanFindingsResponse.nextToken() != null && currentCoroutineContext.isActive) {
+                    listCodeScanFindingsResponse = listCodeScanFindings(jobId, listCodeScanFindingsResponse.nextToken())
                     documents.add(listCodeScanFindingsResponse.codeScanFindings())
-                    listCodeScanFindingsResponse = listCodeScanFindings(jobId)
                 }
             }
 
@@ -335,11 +335,12 @@ class CodeWhispererCodeScanSession(val sessionContext: CodeScanSessionContext) {
         throw e
     }
 
-    fun listCodeScanFindings(jobId: String): ListCodeScanFindingsResponse = try {
+    fun listCodeScanFindings(jobId: String, nextToken: String?): ListCodeScanFindingsResponse = try {
         clientAdaptor.listCodeScanFindings(
             ListCodeScanFindingsRequest.builder()
                 .jobId(jobId)
                 .codeScanFindingsSchema(CodeScanFindingsSchema.CODESCAN_FINDINGS_1_0)
+                .nextToken(nextToken)
                 .build()
         )
     } catch (e: Exception) {

diff --git a/...e/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeFileScanTest.kt b/...e/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeFileScanTest.kt
@@ -170,7 +170,7 @@ class CodeWhispererCodeFileScanTest : CodeWhispererCodeScanTestBase(PythonCodeIn
         inOrder.verify(codeScanSessionSpy, Times(1)).createUploadUrlAndUpload(eq(file), eq("SourceCode"), anyString())
         inOrder.verify(codeScanSessionSpy, Times(1)).createCodeScan(eq(CodewhispererLanguage.Python.toString()), anyString())
         inOrder.verify(codeScanSessionSpy, Times(1)).getCodeScan(any())
-        inOrder.verify(codeScanSessionSpy, Times(1)).listCodeScanFindings(eq("jobId"))
+        inOrder.verify(codeScanSessionSpy, Times(1)).listCodeScanFindings(eq("jobId"), eq(null))
     }
 
     @Test

diff --git a/...tware/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanTest.kt b/...tware/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanTest.kt
@@ -159,7 +159,7 @@ class CodeWhispererCodeScanTest : CodeWhispererCodeScanTestBase(PythonCodeInsigh
         inOrder.verify(codeScanSessionSpy, Times(1)).createUploadUrlAndUpload(eq(file), eq("SourceCode"), anyString())
         inOrder.verify(codeScanSessionSpy, Times(1)).createCodeScan(eq(CodewhispererLanguage.Python.toString()), anyString())
         inOrder.verify(codeScanSessionSpy, Times(1)).getCodeScan(any())
-        inOrder.verify(codeScanSessionSpy, Times(1)).listCodeScanFindings(eq("jobId"))
+        inOrder.verify(codeScanSessionSpy, Times(1)).listCodeScanFindings(eq("jobId"), eq(null))
     }
 
     @Test