Merge branch 'aws:main' into feature/qca

Author: laileni-aws

.changes/3.6.json

@@ -0,0 +1,8 @@
+{
+  "date" : "2024-05-28",
+  "version" : "3.6",
+  "entries" : [ {
+    "type" : "bugfix",
+    "description" : "Fix recurring popup \"refreshing token\" whne users're typing in the IDE and Q connection expires"
+  } ]
+}

.changes/3.7.json

@@ -0,0 +1,11 @@
+{
+  "date" : "2024-05-29",
+  "version" : "3.7",
+  "entries" : [ {
+    "type" : "bugfix",
+    "description" : "(featureDev): Revert fix for file rejection. Reason: The plan disappears after clicking generate Code"
+  }, {
+    "type" : "bugfix",
+    "description" : "Amazon Q Code Transformation: show more specific error messages on failure cases"
+  } ]
+}

.changes/next-release/bugfix-34e86cbc-9ae3-4d53-ac6b-67f2215c1930.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : " fix(featureDev): File Rejection stopped working"
+}

.changes/next-release/bugfix-6871c109-4229-4247-a897-debfba52d980.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Amazon Q Feature Development: Update error message when repo size larger than 200 megabytes"
+}

.changes/next-release/bugfix-a7b4a2f3-fa0a-4924-9d53-933ab31b817c.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Always show device code prompt when performing device code grant through a legacy SSO configuration"
+}

.changes/next-release/bugfix-d0098f52-0f36-4a5d-92d9-aa957e952c11.json

@@ -1,3 +1,10 @@
+# _3.7_ (2024-05-29)
+- **(Bug Fix)** (featureDev): Revert fix for file rejection. Reason: The plan disappears after clicking generate Code
+- **(Bug Fix)** Amazon Q Code Transformation: show more specific error messages on failure cases
+
+# _3.6_ (2024-05-28)
+- **(Bug Fix)** Fix recurring popup "refreshing token" whne users're typing in the IDE and Q connection expires
+
 # _3.5_ (2024-05-23)
 - **(Bug Fix)** Amazon Q Code Transformation: show exact error messages in chat when job fails
 

CHANGELOG.md

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

gradle.properties

@@ -13,3 +13,6 @@ const val CODE_GENERATION_RETRY_LIMIT = 3
 
 // The default retry limit used when the session could not be found
 const val DEFAULT_RETRY_LIMIT = 0
+
+// Max allowed size for a repository in bytes
+const val MAX_PROJECT_SIZE_BYTES: Long = 200 * 1024 * 1024

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/FeatureDevConstants.kt

@@ -3,11 +3,12 @@
 
 package software.aws.toolkits.jetbrains.services.amazonqFeatureDev
 
+import software.aws.toolkits.jetbrains.services.amazonq.RepoSizeError
 import software.aws.toolkits.resources.message
 
 open class FeatureDevException(override val message: String?, override val cause: Throwable? = null) : RuntimeException()
 
-class ContentLengthError(override val message: String, override val cause: Throwable?) : RuntimeException()
+class ContentLengthError(override val message: String, override val cause: Throwable?) : RepoSizeError, RuntimeException()
 
 class PlanIterationLimitError(override val message: String, override val cause: Throwable?) : RuntimeException()