Merge branch 'main' into ignore-extra-field

Author: chengoramazon

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

@@ -100,10 +100,6 @@ object IdeVersions {
         ),
         Profile(
             name = "2024.2",
-            gateway = ProductProfile(
-                sdkVersion = "242.23726-EAP-CANDIDATE-SNAPSHOT",
-                bundledPlugins = listOf("org.jetbrains.plugins.terminal")
-            ),
             community = ProductProfile(
                 sdkVersion = "2024.2",
                 bundledPlugins = commonPlugins + listOf(

buildSrc/src/main/kotlin/toolkit-integration-testing.gradle.kts

@@ -79,6 +79,11 @@ extensions.findByType<IntelliJPlatformTestingExtension>()?.let {
         task {
             integrationTestConfiguration(this)
         }
+
+        // https://github.com/JetBrains/intellij-platform-gradle-plugin/issues/1844
+        prepareSandboxTask {
+            disabledPlugins.add("com.intellij.swagger")
+        }
     }
 } ?: run {
     val integrationTest by tasks.registering(Test::class, integrationTestConfiguration)

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

@@ -3,6 +3,7 @@
 
 import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType
 import org.jetbrains.intellij.platform.gradle.TestFrameworkType
+import org.jetbrains.intellij.platform.gradle.tasks.PrepareSandboxTask
 import software.aws.toolkits.gradle.findFolders
 import software.aws.toolkits.gradle.intellij.IdeVersions
 import software.aws.toolkits.gradle.intellij.toolkitIntelliJ
@@ -103,7 +104,8 @@ dependencies {
     }
 }
 
-tasks.prepareTestSandbox {
+// https://github.com/JetBrains/intellij-platform-gradle-plugin/issues/1844
+tasks.withType<PrepareSandboxTask>().configureEach {
     disabledPlugins.addAll(
         "com.intellij.swagger",
         "org.jetbrains.plugins.kotlin.jupyter",

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CodeWhispererConstants.kt

@@ -155,7 +155,7 @@ object CodeWhispererConstants {
 
     object Config {
         val CODEWHISPERER_ENDPOINT
-            get() = Registry.get("amazon.q.endpoint").asString()
+            get() = System.getenv("__CODEWHISPERER_ENDPOINT") ?: Registry.get("amazon.q.endpoint").asString()
 
         const val CODEWHISPERER_IDPOOL_ID = "us-east-1:70717e99-906f-4add-908c-bd9074a2f5b9"
         val Sigv4ClientRegion = Region.US_EAST_1