Merge pull request #4001 from aws/q-release

Amazon Q

Author: rli

.changes/next-release/feature-48b2c7be-4f28-48ab-b599-58047a59acc1.json

@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "Support for Amazon Q, your generative AI–powered assistant designed for work that can be tailored to your business, code, data, and operations."
+}

.gitignore

@@ -15,3 +15,22 @@ stale_outputs_checked
 
 # dotnet version
 global.json
+
+# local dev files
+unload-PythonCore-*
+unload-aws.toolkit-*
+jetbrains-core/bin/
+jetbrains-ultimate/bin/
+resources/bin/
+core/bin
+jetbrains-gateway/bin
+jetbrains-rider/bin
+sdk-codegen/bin
+ui-tests/bin
+
+#CodeWhispererChat
+
+/jetbrains-rider/testData/NuGet.config
+/jetbrains-core/ui/package-lock.json
+node_modules
+package-lock.json

buildSrc/build.gradle.kts

@@ -12,6 +12,7 @@ plugins {
     `kotlin-dsl`
 }
 
+
 // Note: We can't use our standard source layout due to https://github.com/gradle/gradle/issues/14310
 
 dependencies {

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

@@ -108,7 +108,7 @@ object IdeVersions {
             ),
             community = ProductProfile(
                 sdkFlavor = IdeFlavor.IC,
-                sdkVersion = "2023.2",
+                sdkVersion = "2023.2.2",
                 plugins = commonPlugins + listOf(
                     "java",
                     "com.intellij.gradle",
@@ -119,7 +119,7 @@ object IdeVersions {
             ),
             ultimate = ProductProfile(
                 sdkFlavor = IdeFlavor.IU,
-                sdkVersion = "2023.2",
+                sdkVersion = "2023.2.2",
                 plugins = commonPlugins + listOf(
                     "JavaScript",
                     // Transitive dependency needed for javascript

buildSrc/src/main/kotlin/toolkit-intellij-subplugin.gradle.kts

@@ -1,7 +1,6 @@
 // Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import org.eclipse.jgit.api.Git
 import org.gradle.internal.os.OperatingSystem
 import org.gradle.testing.jacoco.plugins.JacocoTaskExtension.Output
 import org.jetbrains.intellij.tasks.DownloadRobotServerPluginTask
@@ -15,7 +14,6 @@ import software.aws.toolkits.gradle.intellij.IdeFlavor
 import software.aws.toolkits.gradle.intellij.IdeVersions
 import software.aws.toolkits.gradle.intellij.ToolkitIntelliJExtension
 import software.aws.toolkits.gradle.isCi
-import java.io.IOException
 
 val toolkitIntelliJ = project.extensions.create<ToolkitIntelliJExtension>("intellijToolkit")
 
@@ -62,6 +60,11 @@ configurations {
         exclude(group = "software.amazon.awssdk", module = "netty-nio-client")
     }
 
+    testRuntimeClasspath {
+        // Conflicts with CRT in test classpath
+        exclude(group = "software.amazon.awssdk", module = "netty-nio-client")
+    }
+
     // TODO: https://github.com/gradle/gradle/issues/15383
     val versionCatalog = extensions.getByType<VersionCatalogsExtension>().named("libs")
     dependencies {

core/src/software/aws/toolkits/core/ToolkitClientManager.kt

@@ -10,6 +10,7 @@ import software.amazon.awssdk.auth.token.signer.aws.BearerTokenSigner
 import software.amazon.awssdk.awscore.client.builder.AwsClientBuilder
 import software.amazon.awssdk.awscore.client.builder.AwsDefaultClientBuilder
 import software.amazon.awssdk.core.SdkClient
+import software.amazon.awssdk.core.client.builder.SdkSyncClientBuilder
 import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration
 import software.amazon.awssdk.core.client.config.SdkAdvancedClientOption
 import software.amazon.awssdk.core.retry.RetryMode
@@ -148,9 +149,14 @@ abstract class ToolkitClientManager {
 
         @Suppress("UNCHECKED_CAST")
         return builder
-            .httpClient(sdkHttpClient())
             .region(region)
             .apply {
+                if (this is SdkSyncClientBuilder<*, *>) {
+                    // async clients use CRT, and keeps trying to shut down our apache client even though it doesn't respect our client settings
+                    // so only set this for sync clients
+                    httpClient(sdkHttpClient())
+                }
+
                 val clientOverrideConfig = ClientOverrideConfiguration.builder()
 
                 if (credProvider != null) {

gradle.properties

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

gradle/libs.versions.toml

@@ -39,6 +39,7 @@ aws-cloudwatchlogs = { module = "software.amazon.awssdk:cloudwatchlogs", version
 aws-codecatalyst = { module = "software.amazon.awssdk:codecatalyst", version.ref = "awsSdk" }
 aws-codeGen = { module = "software.amazon.awssdk:codegen", version.ref = "awsSdk" }
 aws-cognitoidentity = { module = "software.amazon.awssdk:cognitoidentity", version.ref = "awsSdk" }
+aws-crt = { module = "software.amazon.awssdk:aws-crt-client", version.ref = "awsSdk" }
 aws-dynamodb = { module = "software.amazon.awssdk:dynamodb", version.ref = "awsSdk" }
 aws-ec2 = { module = "software.amazon.awssdk:ec2", version.ref = "awsSdk" }
 aws-ecr = { module = "software.amazon.awssdk:ecr", version.ref = "awsSdk" }
@@ -103,3 +104,6 @@ jackson = ["jackson-datetime", "jackson-kotlin", "jackson-yaml", "jackson-xml"]
 kotlin = ["kotlin-stdLibJdk8", "kotlin-reflect"]
 mockito = ["mockito-core", "mockito-kotlin"]
 sshd = ["sshd-core", "sshd-scp", "sshd-sftp"]
+
+[plugins]
+node-gradle = { id = "com.github.node-gradle.node", version = "7.0.1" }

jetbrains-core/build.gradle.kts

@@ -135,7 +135,10 @@ dependencies {
     api(libs.aws.secretsmanager)
     api(libs.aws.sns)
     api(libs.aws.sqs)
+    api(libs.aws.services)
 
+    implementation(project(":mynah-ui"))
+    implementation(libs.aws.crt)
     implementation(libs.bundles.jackson)
     implementation(libs.zjsonpatch)
     implementation(libs.commonmark)

jetbrains-core/it/software/aws/toolkits/jetbrains/core/credentials/sso/bearer/InteractiveBearerTokenProviderIntegrationTest.kt

@@ -48,7 +48,8 @@ class InteractiveBearerTokenProviderIntegrationTest {
             startUrl = SONO_URL,
             region = SONO_REGION,
             scopes = testScopes,
-            cache = diskCache
+            cache = diskCache,
+            id = "test"
         )
 
         sut.reauthenticate()
@@ -68,7 +69,8 @@ class InteractiveBearerTokenProviderIntegrationTest {
             startUrl = SONO_URL,
             region = SONO_REGION,
             scopes = testScopes,
-            cache = diskCache
+            cache = diskCache,
+            id = "test"
         )
 
         assertThat(sut.resolveToken()).satisfies {