Merge branch 'aws:main' into add-generate-tests

aws · Sep 30, 2024 · 5abad70 · 5abad70
2 parents 88fb53a + b88f7d8
commit 5abad70
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 15 deletions.
diff --git a/.changes/3.30.json b/.changes/3.30.json
@@ -0,0 +1,11 @@
+{
+  "date" : "2024-09-27",
+  "version" : "3.30",
+  "entries" : [ {
+    "type" : "bugfix",
+    "description" : "Amazon Q Code Transformation: notify users when no JDK is set in Project Structure settings"
+  }, {
+    "type" : "bugfix",
+    "description" : "Automatically terminate orphaned process for `@workspace` helper"
+  } ]
+}
diff --git a/.changes/next-release/bugfix-79dc3ea8-07f6-4eff-ae0f-0ea0a02db7f7.json b/.changes/next-release/bugfix-79dc3ea8-07f6-4eff-ae0f-0ea0a02db7f7.json
diff --git a/.changes/next-release/bugfix-bc7645c1-aa53-4eaa-abac-4498255e0c19.json b/.changes/next-release/bugfix-bc7645c1-aa53-4eaa-abac-4498255e0c19.json
diff --git a/.changes/next-release/feature-e16b5994-34c8-465b-b0a9-386590a7d9ea.json b/.changes/next-release/feature-e16b5994-34c8-465b-b0a9-386590a7d9ea.json
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# _3.30_ (2024-09-27)
+- **(Bug Fix)** Amazon Q Code Transformation: notify users when no JDK is set in Project Structure settings
+- **(Bug Fix)** Automatically terminate orphaned process for `@workspace` helper
+
 # _3.29_ (2024-09-19)
 - **(Feature)** Support `@workspace` queries for specific files like "`@workspace` what does test.ts do?".
 - **(Bug Fix)** Amazon Q Feature Dev: fix iteration count messaging during code insertion

diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Toolkit Version
-toolkitVersion=3.30-SNAPSHOT
+toolkitVersion=3.31-SNAPSHOT
 
 # Publish Settings
 publishToken=

diff --git a/.../aws/toolkits/jetbrains/services/codemodernizer/controller/CodeTransformChatController.kt b/.../aws/toolkits/jetbrains/services/codemodernizer/controller/CodeTransformChatController.kt
@@ -55,8 +55,6 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildTr
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserCancelledChatContent
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserHilSelection
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserInputChatContent
-import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserInputSkipTestsFlagChatContent
-import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserInputSkipTestsFlagChatIntroContent
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserSelectionSummaryChatContent
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserSkipTestsFlagSelectionChatContent
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserStopTransformChatContent
@@ -229,10 +227,16 @@ class CodeTransformChatController(
         // Publish metric to capture user selection before local build starts
         telemetry.submitSelection("Confirm", selection)
 
+        // TO-DO: delete this line when backend issue is fixed
+        codeModernizerManager.codeTransformationSession?.let { codeModernizerManager.runLocalMavenBuild(context.project, it) }
+
+        // TO-DO: uncomment these lines when backend issue is fixed
+        /*
         codeTransformChatHelper.run {
             addNewMessage(buildUserInputSkipTestsFlagChatIntroContent())
             addNewMessage(buildUserInputSkipTestsFlagChatContent())
         }
+         */
     }
 
     override suspend fun processCodeTransformConfirmSkipTests(message: IncomingCodeTransformMessage.CodeTransformConfirmSkipTests) {