Merge branch 'main' into rli/caws-endpoint

Author: rli

.changes/1.89.json

@@ -0,0 +1,14 @@
+{
+  "date" : "2023-11-26",
+  "version" : "1.89",
+  "entries" : [ {
+    "type" : "feature",
+    "description" : "CodeWhisperer: Uses Generative AI and automated reasoning to rewrite lines of code flagged for security vulnerabilities during a security scan."
+  }, {
+    "type" : "feature",
+    "description" : "CodeWhisperer now supports new IaC languages: JSON, YAML and Terraform."
+  }, {
+    "type" : "feature",
+    "description" : "CodeWhisperer security scans support typescript, csharp, json, yaml, tf and hcl files."
+  } ]
+}

.changes/2.0.json

@@ -0,0 +1,8 @@
+{
+  "date" : "2023-11-28",
+  "version" : "2.0",
+  "entries" : [ {
+    "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."
+  } ]
+}

.github/workflows/mac.yml

@@ -17,10 +17,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v1
       with:
-        java-version: 11
+        java-version: 17
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Build with Gradle

.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

CHANGELOG.md

@@ -1,3 +1,11 @@
+# _1.89_ (2023-11-26)
+- **(Feature)** CodeWhisperer: Uses Generative AI and automated reasoning to rewrite lines of code flagged for security vulnerabilities during a security scan.
+- **(Feature)** CodeWhisperer now supports new IaC languages: JSON, YAML and Terraform.
+- **(Feature)** CodeWhisperer security scans support typescript, csharp, json, yaml, tf and hcl files.
+
+# _1.88_ (2023-11-17)
+- **(Bug Fix)** Fix issue where the toolkit calls the wrong CodeCatalyst service endpoint
+
 # _1.87_ (2023-11-10)
 - **(Bug Fix)** Fix issue where images in 'Authenticate' panel do not show up
 - **(Deprecation)** An upcoming release will remove support for JetBrains Gateway version 2023.2 and for for IDEs based on the 2022.3 platform

README.md

@@ -23,7 +23,7 @@ We want your feedback!
 - Code contributions. See [our contributing guide](CONTRIBUTING.md) for how to get started.
 
 ## Supported IDEs
-All JetBrains IDEs 2023.3+
+All JetBrains IDEs 2022.3+
 
 ## Installation
 

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 {
@@ -122,7 +125,7 @@ tasks.withType<PatchPluginXmlTask>().all {
 if (!project.isCi()){
     val buildMetadata = buildMetadata()
     tasks.withType<PatchPluginXmlTask>().all {
-        version.set(intellij.version.map { "$it+$buildMetadata" })
+        version.set("${project.version}+$buildMetadata")
     }
 
     tasks.buildPlugin {

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) {