Merge branch 'aws:main' into feature/q

Author: laileni-aws

.changes/2.19.json

@@ -0,0 +1,14 @@
+{
+  "date" : "2024-04-19",
+  "version" : "2.19",
+  "entries" : [ {
+    "type" : "feature",
+    "description" : "Enable Amazon Q feature development and Amazon Q transform capabilities (/dev and /transform) for AWS Builder ID users."
+  }, {
+    "type" : "bugfix",
+    "description" : "Amazon Q Code Transformation: ensure full error message shown in notifications"
+  }, {
+    "type" : "bugfix",
+    "description" : "Fix issue with competing SDK proxy configuration (#4279)"
+  } ]
+}

.changes/next-release/feature-7af4897f-efe2-4b02-b029-f1e9042b1b64.json

@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "Connection id is now shown beside CodeCatalyst dropdown"
+}

.github/workflows/prerelease.yml

@@ -95,7 +95,7 @@ jobs:
           java-version: '17'
       - name: Generate artifact
         run: |
-          ./gradlew -PideProfileName=${{ matrix.supported_versions }} :plugin-amazonq:buildPlugin --exclude-task buildResharperPlugin
+          ./gradlew -PideProfileName=${{ matrix.supported_versions }} :plugin-amazonq:buildPlugin
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:

.gitignore

@@ -4,6 +4,7 @@ target/
 .idea
 !.run/
 build/
+gradle_build/
 *.iml
 .DS_Store
 Build/

CHANGELOG.md

@@ -1,3 +1,8 @@
+# _2.19_ (2024-04-19)
+- **(Feature)** Enable Amazon Q feature development and Amazon Q transform capabilities (/dev and /transform) for AWS Builder ID users.
+- **(Bug Fix)** Amazon Q Code Transformation: ensure full error message shown in notifications
+- **(Bug Fix)** Fix issue with competing SDK proxy configuration ([#4279](https://github.com/aws/aws-toolkit-jetbrains/issues/4279))
+
 # _2.18_ (2024-04-12)
 - **(Feature)** Add support for Lambda runtime Java 21
 - **(Feature)** Add support for Lambda runtime Node.js 20

buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt

@@ -107,20 +107,20 @@ object IdeVersions {
             ),
             community = ProductProfile(
                 sdkFlavor = IdeFlavor.IC,
-                sdkVersion = "241.14494-EAP-CANDIDATE-SNAPSHOT",
+                sdkVersion = "2024.1",
                 plugins = commonPlugins + listOf(
                     "java",
                     "com.intellij.gradle",
                     "org.jetbrains.idea.maven",
                     // transitive for python
-                    "org.toml.lang:241.14494.33",
-                    "PythonCore:241.14494.17",
-                    "Docker:241.14494.28"
+                    "org.toml.lang:241.14494.150",
+                    "PythonCore:241.14494.240",
+                    "Docker:241.14494.251"
                 )
             ),
             ultimate = ProductProfile(
                 sdkFlavor = IdeFlavor.IU,
-                sdkVersion = "241.14494-EAP-CANDIDATE-SNAPSHOT",
+                sdkVersion = "2024.1",
                 plugins = commonPlugins + listOf(
                     "JavaScript",
                     // Transitive dependency needed for javascript
@@ -130,21 +130,21 @@ object IdeVersions {
                     "com.intellij.database",
                     "com.jetbrains.codeWithMe",
                     // transitive for python
-                    "org.toml.lang:241.14494.33",
-                    "Pythonid:241.14494.17",
-                    "org.jetbrains.plugins.go:241.14494.17",
+                    "org.toml.lang:241.14494.150",
+                    "Pythonid:241.14494.314",
+                    "org.jetbrains.plugins.go:241.14494.240",
                     // https://github.com/JetBrains/gradle-intellij-plugin/issues/1056
                     "org.intellij.intelliLang"
                 )
             ),
             rider = RiderProfile(
-                sdkVersion = "2024.1-EAP8-SNAPSHOT",
+                sdkVersion = "2024.1",
                 plugins = commonPlugins + listOf(
                     "rider-plugins-appender" // Workaround for https://youtrack.jetbrains.com/issue/IDEA-179607
                 ),
                 netFrameworkTarget = "net472",
                 rdGenVersion = "2024.1.1",
-                nugetVersion = "2024.1.0-eap08"
+                nugetVersion = "2024.1.0"
             )
         ),
 

gradle.properties

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

gradle/libs.versions.toml

@@ -3,7 +3,7 @@ apache-commons-collections = "4.4"
 apache-commons-io = "2.16.0"
 assertJ = "3.20.2" # Upgrading leads to SAM errors: https://youtrack.jetbrains.com/issue/KT-17765
 # match with <root>/settings.gradle.kts
-awsSdk = "2.21.33"
+awsSdk = "2.25.33"
 commonmark = "0.17.1"
 detekt = "1.23.6"
 intellijGradle = "1.17.3"
@@ -12,22 +12,22 @@ jackson = "2.16.1"
 jacoco = "0.8.11"
 jgit = "6.5.0.202303070854-r"
 junit4 = "4.13.2"
-junit5 = "5.10.1"
+junit5 = "5.10.2"
 # https://plugins.jetbrains.com/docs/intellij/kotlin.html#adding-kotlin-support
 # https://kotlinlang.org/docs/releases.html#release-details
 kotlin = "1.9.23"
 # set in <root>/settings.gradle.kts
 kotlinCoroutines = "1.7.3"
-mockito = "5.10.0"
+mockito = "5.11.0"
 mockitoKotlin = "5.2.1"
-mockk = "1.13.8"
+mockk = "1.13.10"
 node-gradle = "7.0.1"
 telemetryGenerator = "1.0.201"
 testLogger = "4.0.0"
 testRetry = "1.5.2"
 # test-only; platform provides slf4j transitively at runtime. <233, 1.7.36; >=233, 2.0.9
 slf4j = "2.0.9"
-sshd = "2.11.0"
+sshd = "2.12.1"
 wiremock = "3.3.1"
 undercouch-download = "5.2.1"
 zjsonpatch = "0.4.16"

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/auth/AuthController.kt

@@ -28,10 +28,10 @@ class AuthController {
         val connectionState = checkBearerConnectionValidity(project, BearerTokenFeatureSet.Q)
         val codeWhispererState = checkBearerConnectionValidity(project, BearerTokenFeatureSet.CODEWHISPERER)
 
-        // CW chat is enabled for Builder and IDC users, Amazon Q is only valid for IDC users
+        // CW chat is enabled for Builder and IDC users, same for Amazon Q
         return AuthNeededStates(
             chat = getAuthNeededState(connectionState, codeWhispererState),
-            amazonQ = getAuthNeededState(connectionState, codeWhispererState, true)
+            amazonQ = getAuthNeededState(connectionState, codeWhispererState)
         )
     }
 

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

@@ -11,5 +11,6 @@ import software.aws.toolkits.jetbrains.core.gettingstarted.editor.checkBearerCon
 
 fun isFeatureDevAvailable(project: Project): Boolean {
     val connection = checkBearerConnectionValidity(project, BearerTokenFeatureSet.Q)
-    return connection.connectionType == ActiveConnectionType.IAM_IDC && connection is ActiveConnection.ValidBearer
+    return (connection.connectionType == ActiveConnectionType.IAM_IDC || connection.connectionType == ActiveConnectionType.BUILDER_ID) &&
+        connection is ActiveConnection.ValidBearer
 }