Merge branch 'main' into e2e-test

Randall-Jiang · web-flow · commit 12fdc1daeeb5 · 2025-03-28T20:34:27.000-07:00
diff --git a/.changes/3.61.json b/.changes/3.61.json
@@ -0,0 +1,17 @@
+{
+  "date" : "2025-03-27",
+  "version" : "3.61",
+  "entries" : [ {
+    "type" : "feature",
+    "description" : "Amazon Q: Moved \"Include suggestions with code references\" setting to General"
+  }, {
+    "type" : "feature",
+    "description" : "Add support for 2025.1"
+  }, {
+    "type" : "bugfix",
+    "description" : "Amazon Q: Attempt to reduce thread pool contention locking IDE caused by `@workspace` making a large number of requests"
+  }, {
+    "type" : "deprecation",
+    "description" : "An upcoming release will remove support for JetBrains Gateway version 2024.3 and for IDEs based on the 2024.1 platform"
+  } ]
+}
diff --git a/.changes/next-release/bugfix-29d1b3f1-b7e6-489d-b614-49f7d908f221.json b/.changes/next-release/bugfix-29d1b3f1-b7e6-489d-b614-49f7d908f221.json
@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "/transform: prompt user to re-authenticate if credentials expire during transformation"
+}
diff --git a/.changes/next-release/bugfix-7ebf9104-80a4-452e-a07a-0966078fe077.json b/.changes/next-release/bugfix-7ebf9104-80a4-452e-a07a-0966078fe077.json
@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Gracefully handle additional fields in Amazon Q /dev code generation result without throwing errors"
+}
diff --git a/.changes/next-release/bugfix-a9690f2d-611f-45f6-82d1-c3a9e17a6b6b.json b/.changes/next-release/bugfix-a9690f2d-611f-45f6-82d1-c3a9e17a6b6b.json
@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "/review: set programmingLanguage to Plaintext if language is unknown"
+}
diff --git a/.changes/next-release/bugfix-e06391bd-f5ae-4c2a-a102-580d30f3be8d.json b/.changes/next-release/bugfix-e06391bd-f5ae-4c2a-a102-580d30f3be8d.json
diff --git a/.changes/next-release/deprecation-90102050-86a4-4c19-9ecc-70c6e033b949.json b/.changes/next-release/deprecation-90102050-86a4-4c19-9ecc-70c6e033b949.json
diff --git a/.changes/next-release/feature-45f6e6a7-fc5b-4b14-89e2-0d9a2b138c65.json b/.changes/next-release/feature-45f6e6a7-fc5b-4b14-89e2-0d9a2b138c65.json
diff --git a/.changes/next-release/feature-c88b1af5-2318-4ca3-903c-a289e5494b1d.json b/.changes/next-release/feature-c88b1af5-2318-4ca3-903c-a289e5494b1d.json
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# _3.61_ (2025-03-27)
+- **(Feature)** Amazon Q: Moved "Include suggestions with code references" setting to General
+- **(Feature)** Add support for 2025.1
+- **(Bug Fix)** Amazon Q: Attempt to reduce thread pool contention locking IDE caused by `@workspace` making a large number of requests
+- **(Deprecation)** An upcoming release will remove support for JetBrains Gateway version 2024.3 and for IDEs based on the 2024.1 platform
+
 # _3.60_ (2025-03-20)
 - **(Feature)** AmazonQ /test now displays a concise test plan summary to users.
 - **(Bug Fix)** Fix inline completion failure due to context length exceeding the threshold
diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Toolkit Version
-toolkitVersion=3.61-SNAPSHOT
+toolkitVersion=3.62-SNAPSHOT
 
 # Publish Settings
 publishToken=
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/util/FeatureDevService.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/util/FeatureDevService.kt
@@ -3,6 +3,7 @@
 
 package software.aws.toolkits.jetbrains.services.amazonqFeatureDev.util
 
+import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.fasterxml.jackson.module.kotlin.readValue
 import com.intellij.openapi.project.Project
@@ -37,6 +38,9 @@ import software.aws.toolkits.telemetry.Result
 private val logger = getLogger<FeatureDevClient>()
 
 class FeatureDevService(val proxyClient: FeatureDevClient, val project: Project) {
+    private val objectMapper = jacksonObjectMapper()
+        .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
+
     fun createConversation(): String {
         val startTime = System.currentTimeMillis()
         var failureReason: String? = null
@@ -238,7 +242,7 @@ class FeatureDevService(val proxyClient: FeatureDevClient, val project: Project)
         val parsedResult: ExportTaskAssistResultArchiveStreamResult
         try {
             val result = exportResponse.reduce { acc, next -> acc + next } // To map the result it is needed to combine the  full byte array
-            parsedResult = jacksonObjectMapper().readValue(result)
+            parsedResult = objectMapper.readValue(result)
         } catch (e: Exception) {
             logger.error(e) { "Failed to parse downloaded code results" }
             throw ExportParseException(operation = FeatureDevOperation.ExportTaskAssistArchiveResult.toString(), desc = null, e.cause)
diff --git a/plugins/amazonq/chat/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/util/FeatureDevServiceTest.kt b/plugins/amazonq/chat/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/util/FeatureDevServiceTest.kt
@@ -351,6 +351,23 @@ class FeatureDevServiceTest : FeatureDevTestBase() {
         }.isExactlyInstanceOf(ExportParseException::class.java)
     }
 
+    @Test
+    fun `test exportTaskAssistArchiveResult ignore extra fields in the response`() {
+        runTest {
+            val codeGenerationJson = "{" +
+                "\"code_generation_result\":{\"new_file_contents\":{\"test.ts\":\"contents\"},\"deleted_files\":[],\"references\":[],\"extra_filed\":[]}" +
+                "}"
+
+            whenever(featureDevClient.exportTaskAssistResultArchive(testConversationId)).thenReturn(mutableListOf(codeGenerationJson.toByteArray()))
+
+            val actual = featureDevService.exportTaskAssistArchiveResult(testConversationId)
+            assertThat(actual).isInstanceOf(CodeGenerationStreamResult::class.java)
+            assertThat(actual.new_file_contents).isEqualTo(mapOf(Pair("test.ts", "contents")))
+            assertThat(actual.deleted_files).isEqualTo(emptyList<String>())
+            assertThat(actual.references).isEqualTo(emptyList<CodeReferenceGenerated>())
+        }
+    }
+
     @Test
     fun `test exportTaskAssistArchiveResult returns correct parsed result`() =
         runTest {
diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/panels/managers/CodeModernizerBottomWindowPanelManager.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/panels/managers/CodeModernizerBottomWindowPanelManager.kt
@@ -8,6 +8,7 @@ import com.intellij.openapi.actionSystem.ActionGroup
 import com.intellij.openapi.actionSystem.ActionManager
 import com.intellij.openapi.actionSystem.ActionToolbar
 import com.intellij.openapi.application.invokeLater
+import com.intellij.openapi.application.runInEdt
 import com.intellij.openapi.components.service
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.projectRoots.JavaSdkVersion
@@ -38,7 +39,7 @@ import javax.swing.BorderFactory
 import javax.swing.JPanel
 
 class CodeModernizerBottomWindowPanelManager(private val project: Project) : JPanel(BorderLayout()) {
-    private var lastShownProgressPanel: Component? = null
+    private var progressPanel: Component? = null
     val toolbar = createToolbar().apply {
         targetComponent = this@CodeModernizerBottomWindowPanelManager
         component.border = BorderFactory.createCompoundBorder(
@@ -62,14 +63,16 @@ class CodeModernizerBottomWindowPanelManager(private val project: Project) : JPa
     }
 
     private fun setUI(function: () -> Unit) {
-        lastShownProgressPanel = this.components.firstOrNull { it == fullSizeLoadingPanel || it == buildProgressSplitterPanelManager } ?: lastShownProgressPanel
-        removeAll()
-        add(BorderLayout.WEST, toolbar.component)
-        add(BorderLayout.NORTH, banner)
-        function.invoke()
-        updateRunTime()
-        revalidate()
-        repaint()
+        runInEdt {
+            progressPanel = this.components.firstOrNull { it == fullSizeLoadingPanel || it == buildProgressSplitterPanelManager } ?: progressPanel
+            removeAll()
+            add(BorderLayout.WEST, toolbar.component)
+            add(BorderLayout.NORTH, banner)
+            function.invoke()
+            updateRunTime()
+            revalidate()
+            repaint()
+        }
     }
 
     private fun updateRunTime(now: Instant? = null) {
@@ -173,8 +176,8 @@ class CodeModernizerBottomWindowPanelManager(private val project: Project) : JPa
     }
 
     fun showUnalteredJobUI() = setUI {
-        if (lastShownProgressPanel != null) {
-            add(BorderLayout.CENTER, lastShownProgressPanel)
+        if (progressPanel != null) {
+            add(BorderLayout.CENTER, progressPanel)
         } else {
             add(BorderLayout.CENTER, fullSizeLoadingPanel)
             fullSizeLoadingPanel.progressIndicatorLabel.text = "No jobs active"
diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/utils/CodeTransformApiUtils.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/utils/CodeTransformApiUtils.kt
@@ -4,6 +4,7 @@
 package software.aws.toolkits.jetbrains.services.codemodernizer.utils
 
 import com.fasterxml.jackson.module.kotlin.readValue
+import com.intellij.notification.NotificationAction
 import com.intellij.openapi.project.Project
 import com.intellij.serviceContainer.AlreadyDisposedException
 import kotlinx.coroutines.delay
@@ -23,12 +24,14 @@ import software.aws.toolkits.core.utils.WaiterUnrecoverableException
 import software.aws.toolkits.core.utils.Waiters.waitUntil
 import software.aws.toolkits.jetbrains.services.codemodernizer.CodeTransformTelemetryManager
 import software.aws.toolkits.jetbrains.services.codemodernizer.client.GumbyClient
+import software.aws.toolkits.jetbrains.services.codemodernizer.commands.CodeTransformMessageListener
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.BILLING_RATE
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.JOB_STATISTICS_TABLE_KEY
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeModernizerArtifact.Companion.MAPPER
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeTransformType
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.JobId
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.PlanTable
+import software.aws.toolkits.jetbrains.utils.notifyStickyWarn
 import software.aws.toolkits.resources.message
 import java.time.Duration
 import java.util.Locale
@@ -64,8 +67,7 @@ suspend fun JobId.pollTransformationStatusAndPlan(
     val maxRefreshes = 10
     var numRefreshes = 0
 
-    // We refresh token at the start of polling, but for some long jobs that runs for 30 minutes plus, tokens may need to be
-    // refreshed again when AccessDeniedException or InvalidGrantException are caught.
+    // refresh token at start of polling since local build just prior can take a long time
     refreshToken(project)
 
     try {
@@ -113,8 +115,17 @@ suspend fun JobId.pollTransformationStatusAndPlan(
                 refreshToken(project)
                 return@waitUntil state
             } catch (e: InvalidGrantException) {
-                if (numRefreshes++ > maxRefreshes) throw e
-                refreshToken(project)
+                CodeTransformMessageListener.instance.onCheckAuth()
+                notifyStickyWarn(
+                    message("codemodernizer.notification.warn.expired_credentials.title"),
+                    message("codemodernizer.notification.warn.expired_credentials.content"),
+                    project,
+                    listOf(
+                        NotificationAction.createSimpleExpiring(message("codemodernizer.notification.warn.action.reauthenticate")) {
+                            CodeTransformMessageListener.instance.onReauthStarted()
+                        }
+                    )
+                )
                 return@waitUntil state
             } finally {
                 delay(sleepDurationMillis)
diff --git a/plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/CodeWhispererCodeModernizerUtilsTest.kt b/plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/CodeWhispererCodeModernizerUtilsTest.kt
@@ -6,6 +6,7 @@ import io.mockk.every
 import io.mockk.just
 import io.mockk.mockkStatic
 import io.mockk.runs
+import io.mockk.verify
 import kotlinx.coroutines.runBlocking
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Before
@@ -26,7 +27,9 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.utils.parseBuildF
 import software.aws.toolkits.jetbrains.services.codemodernizer.utils.pollTransformationStatusAndPlan
 import software.aws.toolkits.jetbrains.services.codemodernizer.utils.refreshToken
 import software.aws.toolkits.jetbrains.services.codemodernizer.utils.validateSctMetadata
+import software.aws.toolkits.jetbrains.utils.notifyStickyWarn
 import software.aws.toolkits.jetbrains.utils.rules.addFileToModule
+import software.aws.toolkits.resources.message
 import java.util.concurrent.atomic.AtomicBoolean
 import kotlin.io.path.createTempFile
 
@@ -114,18 +117,18 @@ class CodeWhispererCodeModernizerUtilsTest : CodeWhispererCodeModernizerTestBase
     }
 
     @Test
-    fun `refresh on invalid grant`() {
+    fun `show re-auth notification on invalid grant exception`() {
         val mockInvalidGrantException = Mockito.mock(InvalidGrantException::class.java)
 
-        mockkStatic(::refreshToken)
-        every { refreshToken(any()) } just runs
+        mockkStatic(::notifyStickyWarn)
+        every { notifyStickyWarn(any(), any(), any(), any(), any()) } just runs
 
         Mockito.doThrow(
             mockInvalidGrantException
         ).doReturn(
             exampleGetCodeMigrationResponse,
             exampleGetCodeMigrationResponse.replace(TransformationStatus.STARTED),
-            exampleGetCodeMigrationResponse.replace(TransformationStatus.COMPLETED), // Should stop before this point
+            exampleGetCodeMigrationResponse.replace(TransformationStatus.COMPLETED),
         ).whenever(clientAdaptorSpy).getCodeModernizationJob(any())
 
         Mockito.doReturn(exampleGetCodeMigrationPlanResponse)
@@ -152,7 +155,7 @@ class CodeWhispererCodeModernizerUtilsTest : CodeWhispererCodeModernizerTestBase
                 TransformationStatus.STARTED,
             )
         assertThat(expected).isEqualTo(mutableList)
-        io.mockk.verify { refreshToken(any()) }
+        verify { notifyStickyWarn(message("codemodernizer.notification.warn.expired_credentials.title"), any(), any(), any(), any()) }
     }
 
     @Test
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanSession.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanSession.kt
@@ -264,7 +264,11 @@ class CodeWhispererCodeScanSession(val sessionContext: CodeScanSessionContext) {
             return clientAdaptor.createCodeScan(
                 StartCodeAnalysisRequest.builder()
                     .clientToken(clientToken.toString())
-                    .programmingLanguage { it.languageName(language) }
+                    .programmingLanguage {
+                        it.languageName(
+                            if (language == CodewhispererLanguage.Unknown.toString()) CodewhispererLanguage.Plaintext.toString() else language
+                        )
+                    }
                     .artifacts(artifactsMap)
                     .scope(scope.value)
                     .codeScanName(codeScanName)
diff --git a/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties b/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties
@@ -779,6 +779,7 @@ codemodernizer.notification.warn.download_failed_invalid_artifact=Amazon Q was u
 codemodernizer.notification.warn.download_failed_other.content=Amazon Q ran into an issue while trying to download your {0}. Please try again. {1}
 codemodernizer.notification.warn.download_failed_ssl.content=Please make sure all your certificates for your proxy client have been set up correctly for your IDE.
 codemodernizer.notification.warn.download_failed_wildcard.content=Check your IDE proxy settings and remove any wildcard (*) references, and then try viewing the diff again.
+codemodernizer.notification.warn.expired_credentials.content=Unable to check transformation status as your credentials expired. Try signing out of Amazon Q and signing back in again if 'Reauthenticate' below does not work.
 codemodernizer.notification.warn.expired_credentials.title=Your connection to Q has expired
 codemodernizer.notification.warn.invalid_project.description.reason.missing_content_roots=None of your open modules are supported for code transformation with Amazon Q. Amazon Q can upgrade Java 8, Java 11, Java 17, and Java 21 projects built on Maven, with content roots configured.
 codemodernizer.notification.warn.invalid_project.description.reason.not_logged_in=Amazon Q cannot start the transformation as you are not logged in with Identity Center or Builder ID. Also ensure that you are not using IntelliJ version 232.8660.185 and that you are not developing on a remote host (uncommon).

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "type" : "bugfix",
 +  "description" : "/transform: prompt user to re-authenticate if credentials expire during transformation"
 +}