Merge branch 'main' into finding-telemetry

Author: ctlai95

.changes/3.59.json

@@ -0,0 +1,14 @@
+{
+  "date" : "2025-03-13",
+  "version" : "3.59",
+  "entries" : [ {
+    "type" : "feature",
+    "description" : "AmazonQ /dev and /doc: Add support for complex workspaces."
+  }, {
+    "type" : "bugfix",
+    "description" : "/review: normalize relative file path before unzipping"
+  }, {
+    "type" : "bugfix",
+    "description" : "fix Q chat request timeout"
+  } ]
+}

.changes/next-release/bugfix-d14f113a-e931-4247-aecb-26e8dd713467.json

@@ -1,3 +1,8 @@
+# _3.59_ (2025-03-13)
+- **(Feature)** AmazonQ /dev and /doc: Add support for complex workspaces.
+- **(Bug Fix)** /review: normalize relative file path before unzipping
+- **(Bug Fix)** fix Q chat request timeout
+
 # _3.58_ (2025-03-06)
 - **(Bug Fix)** Amazon Q: Fix data isolation between tabs to prevent interference when using /doc in multiple tabs
 - **(Removal)** The Amazon Q inline suggestion popup goes back to being under the suggestions and is always showing.

.changes/next-release/bugfix-fd9065e5-2661-4250-852c-ec51deedd10f.json

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Toolkit Version
-toolkitVersion=3.59-SNAPSHOT
+toolkitVersion=3.60-SNAPSHOT
 
 # Publish Settings
 publishToken=

.changes/next-release/feature-2c04c975-cdbf-4361-94e6-4010e68af8d9.json

@@ -17,6 +17,8 @@ import com.intellij.ui.components.JBScrollPane
 import com.intellij.util.Alarm
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
+import software.aws.toolkits.core.utils.getLogger
+import software.aws.toolkits.core.utils.warn
 import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.context.CodeScanIssueDetailsDisplayType
 import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.utils.additionBackgroundColor
 import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.utils.additionForegroundColor
@@ -55,6 +57,7 @@ import javax.swing.ScrollPaneConstants
 import javax.swing.event.HyperlinkEvent
 import javax.swing.text.html.HTMLEditorKit
 
+private val logger = getLogger<CodeWhispererCodeScanIssueDetailsPanel>()
 internal class CodeWhispererCodeScanIssueDetailsPanel(
     private val project: Project,
     issue: CodeWhispererCodeScanIssue,
@@ -66,6 +69,10 @@ internal class CodeWhispererCodeScanIssueDetailsPanel(
     private val codeScanManager = CodeWhispererCodeScanManager.getInstance(project)
 
     private suspend fun handleGenerateFix(issue: CodeWhispererCodeScanIssue, isRegenerate: Boolean = false) {
+        if (issue.ruleId == "sbom-software-assurance-services") {
+            logger.warn { "GenerateFix is not available for SAS findings." }
+            return
+        }
         editorPane.text = getCodeScanIssueDetailsHtml(
             issue, CodeScanIssueDetailsDisplayType.DetailsPane, CodeWhispererConstants.FixGenerationState.GENERATING,
             project = project
@@ -235,6 +242,7 @@ internal class CodeWhispererCodeScanIssueDetailsPanel(
     }
     private val generateFixButton = JButton(message("codewhisperer.codescan.generate_fix_button_label")).apply {
         putClientProperty(DarculaButtonUI.DEFAULT_STYLE_KEY, true)
+        isEnabled = issue.ruleId != "sbom-software-assurance-services"
         addActionListener {
             defaultScope.launch {
                 handleGenerateFix(issue)

CHANGELOG.md

@@ -52,7 +52,6 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.time.withTimeout
 import kotlinx.coroutines.withContext
 import org.jetbrains.annotations.TestOnly
-import software.amazon.awssdk.services.codewhisperer.model.CodeWhispererException
 import software.amazon.awssdk.services.codewhispererruntime.model.CodeWhispererRuntimeException
 import software.amazon.awssdk.services.codewhispererruntime.model.ThrottlingException
 import software.aws.toolkits.core.utils.WaiterTimeoutException
@@ -592,7 +591,7 @@ class CodeWhispererCodeScanManager(val project: Project) {
         }
     fun handleException(coroutineContext: CoroutineContext, e: Exception, scope: CodeWhispererConstants.CodeAnalysisScope): String {
         val errorMessage = when (e) {
-            is CodeWhispererException -> e.awsErrorDetails().errorMessage() ?: message("codewhisperer.codescan.run_scan_error")
+            is CodeWhispererRuntimeException -> e.awsErrorDetails().errorMessage() ?: message("codewhisperer.codescan.run_scan_error")
             is CodeWhispererCodeScanException -> getCodeScanExceptionMessage(e)
             is CodeWhispererCodeScanServerException -> getCodeScanServerExceptionMessage(e)
             is WaiterTimeoutException, is TimeoutCancellationException -> message("codewhisperer.codescan.scan_timed_out")
@@ -601,8 +600,8 @@ class CodeWhispererCodeScanManager(val project: Project) {
             else -> null
         } ?: message("codewhisperer.codescan.run_scan_error")
 
-        val errorCode = (e as? CodeWhispererException)?.awsErrorDetails()?.errorCode()
-        val requestId = if (e is CodeWhispererException) e.requestId() else null
+        val errorCode = (e as? CodeWhispererRuntimeException)?.awsErrorDetails()?.errorCode()
+        val requestId = if (e is CodeWhispererRuntimeException) e.requestId() else null
 
         if (!coroutineContext.isActive) {
             codeScanResultsPanel.setDefaultUI()
@@ -627,7 +626,7 @@ class CodeWhispererCodeScanManager(val project: Project) {
         }
 
         val telemetryErrorMessage = when (e) {
-            is CodeWhispererException -> e.awsErrorDetails().errorMessage() ?: message("codewhisperer.codescan.run_scan_error_telemetry")
+            is CodeWhispererRuntimeException -> e.awsErrorDetails().errorMessage() ?: message("codewhisperer.codescan.run_scan_error_telemetry")
             is CodeWhispererCodeScanException -> when (e.message) {
                 message("codewhisperer.codescan.no_file_open") -> message("codewhisperer.codescan.no_file_open_telemetry")
                 message("codewhisperer.codescan.unsupported_language_error") -> message("codewhisperer.codescan.unsupported_language_error_telemetry")

gradle.properties

@@ -17,18 +17,18 @@ import kotlinx.coroutines.ensureActive
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.time.withTimeout
 import kotlinx.coroutines.withContext
-import software.amazon.awssdk.services.codewhisperer.model.ArtifactType
-import software.amazon.awssdk.services.codewhisperer.model.CodeScanFindingsSchema
-import software.amazon.awssdk.services.codewhisperer.model.CodeScanStatus
-import software.amazon.awssdk.services.codewhisperer.model.CodeWhispererException
-import software.amazon.awssdk.services.codewhisperer.model.CreateCodeScanRequest
-import software.amazon.awssdk.services.codewhisperer.model.CreateCodeScanResponse
-import software.amazon.awssdk.services.codewhisperer.model.GetCodeScanRequest
-import software.amazon.awssdk.services.codewhisperer.model.GetCodeScanResponse
-import software.amazon.awssdk.services.codewhisperer.model.ListCodeScanFindingsRequest
-import software.amazon.awssdk.services.codewhisperer.model.ListCodeScanFindingsResponse
+import software.amazon.awssdk.services.codewhispererruntime.model.ArtifactType
+import software.amazon.awssdk.services.codewhispererruntime.model.CodeAnalysisFindingsSchema
+import software.amazon.awssdk.services.codewhispererruntime.model.CodeAnalysisStatus
+import software.amazon.awssdk.services.codewhispererruntime.model.CodeWhispererRuntimeException
 import software.amazon.awssdk.services.codewhispererruntime.model.CreateUploadUrlResponse
+import software.amazon.awssdk.services.codewhispererruntime.model.GetCodeAnalysisRequest
+import software.amazon.awssdk.services.codewhispererruntime.model.GetCodeAnalysisResponse
+import software.amazon.awssdk.services.codewhispererruntime.model.ListCodeAnalysisFindingsRequest
+import software.amazon.awssdk.services.codewhispererruntime.model.ListCodeAnalysisFindingsResponse
 import software.amazon.awssdk.services.codewhispererruntime.model.Reference
+import software.amazon.awssdk.services.codewhispererruntime.model.StartCodeAnalysisRequest
+import software.amazon.awssdk.services.codewhispererruntime.model.StartCodeAnalysisResponse
 import software.aws.toolkits.core.utils.Waiters.waitUntil
 import software.aws.toolkits.core.utils.debug
 import software.aws.toolkits.core.utils.getLogger
@@ -146,7 +146,7 @@ class CodeWhispererCodeScanSession(val sessionContext: CodeScanSessionContext) {
                 }
             }
             var codeScanStatus = createCodeScanResponse.status()
-            if (codeScanStatus == CodeScanStatus.FAILED) {
+            if (codeScanStatus == CodeAnalysisStatus.FAILED) {
                 if (isProjectScope()) {
                     LOG.debug {
                         "CodeWhisperer service error occurred. Something went wrong when creating a code review: $createCodeScanResponse " +
@@ -166,7 +166,7 @@ class CodeWhispererCodeScanSession(val sessionContext: CodeScanSessionContext) {
 
             // 5. Keep polling the API GetCodeScan to wait for results for a given timeout period.
             waitUntil(
-                succeedOn = { codeScanStatus == CodeScanStatus.COMPLETED },
+                succeedOn = { codeScanStatus == CodeAnalysisStatus.COMPLETED },
                 maxDuration = Duration.ofSeconds(sessionContext.sessionConfig.overallJobTimeoutInSeconds())
             ) {
                 currentCoroutineContext.ensureActive()
@@ -183,7 +183,7 @@ class CodeWhispererCodeScanSession(val sessionContext: CodeScanSessionContext) {
                     }
                 }
                 delay(CODE_SCAN_POLLING_INTERVAL_IN_SECONDS * TOTAL_MILLIS_IN_SECOND)
-                if (codeScanStatus == CodeScanStatus.FAILED) {
+                if (codeScanStatus == CodeAnalysisStatus.FAILED) {
                     if (isProjectScope()) {
                         LOG.debug {
                             "CodeWhisperer service error occurred. Something went wrong fetching results for code review: $getCodeScanResponse " +
@@ -206,12 +206,12 @@ class CodeWhispererCodeScanSession(val sessionContext: CodeScanSessionContext) {
             )
 
             val documents = mutableListOf<String>()
-            documents.add(listCodeScanFindingsResponse.codeScanFindings())
+            documents.add(listCodeScanFindingsResponse.codeAnalysisFindings())
             // coroutineContext helps to actively cancel the bigger projects quickly
             withContext(currentCoroutineContext) {
                 while (listCodeScanFindingsResponse.nextToken() != null && currentCoroutineContext.isActive) {
                     listCodeScanFindingsResponse = listCodeScanFindings(jobId, listCodeScanFindingsResponse.nextToken())
-                    documents.add(listCodeScanFindingsResponse.codeScanFindings())
+                    documents.add(listCodeScanFindingsResponse.codeAnalysisFindings())
                 }
             }
 
@@ -230,7 +230,7 @@ class CodeWhispererCodeScanSession(val sessionContext: CodeScanSessionContext) {
             codeScanResponseContext = codeScanResponseContext.copy(reason = "Succeeded")
             return CodeScanResponse.Success(issues, codeScanResponseContext)
         } catch (e: Exception) {
-            val exception = e as? CodeWhispererException
+            val exception = e as? CodeWhispererRuntimeException
             val awsError = exception?.awsErrorDetails()
 
             if (awsError != null) {
@@ -254,7 +254,7 @@ class CodeWhispererCodeScanSession(val sessionContext: CodeScanSessionContext) {
         }
     }
 
-    fun createCodeScan(language: String, codeScanName: String): CreateCodeScanResponse {
+    fun createCodeScan(language: String, codeScanName: String): StartCodeAnalysisResponse {
         val artifactsMap = mapOf(
             ArtifactType.SOURCE_CODE to urlResponse[ArtifactType.SOURCE_CODE]?.uploadId(),
             ArtifactType.BUILT_JARS to urlResponse[ArtifactType.BUILT_JARS]?.uploadId()
@@ -268,7 +268,7 @@ class CodeWhispererCodeScanSession(val sessionContext: CodeScanSessionContext) {
 
         try {
             return clientAdaptor.createCodeScan(
-                CreateCodeScanRequest.builder()
+                StartCodeAnalysisRequest.builder()
                     .clientToken(clientToken.toString())
                     .programmingLanguage { it.languageName(language) }
                     .artifacts(artifactsMap)
@@ -283,9 +283,9 @@ class CodeWhispererCodeScanSession(val sessionContext: CodeScanSessionContext) {
         }
     }
 
-    fun getCodeScan(jobId: String): GetCodeScanResponse = try {
+    fun getCodeScan(jobId: String): GetCodeAnalysisResponse = try {
         clientAdaptor.getCodeScan(
-            GetCodeScanRequest.builder()
+            GetCodeAnalysisRequest.builder()
                 .jobId(jobId)
                 .build()
         )
@@ -295,11 +295,11 @@ class CodeWhispererCodeScanSession(val sessionContext: CodeScanSessionContext) {
         throw codeScanServerException("GetCodeReviewException: $errorMessage")
     }
 
-    fun listCodeScanFindings(jobId: String, nextToken: String?): ListCodeScanFindingsResponse = try {
+    fun listCodeScanFindings(jobId: String, nextToken: String?): ListCodeAnalysisFindingsResponse = try {
         clientAdaptor.listCodeScanFindings(
-            ListCodeScanFindingsRequest.builder()
+            ListCodeAnalysisFindingsRequest.builder()
                 .jobId(jobId)
-                .codeScanFindingsSchema(CodeScanFindingsSchema.CODESCAN_FINDINGS_1_0)
+                .codeAnalysisFindingsSchema(CodeAnalysisFindingsSchema.CODEANALYSIS_FINDINGS_1_0)
                 .nextToken(nextToken)
                 .build()
         )