Skip to content

Commit 138f483

Browse files
aws-toolkit-automationaws-toolkit-automation
authored
Merge main into feature/remote-chat
2 parents 9bdd6c5 + e1cf155 commit 138f483

File tree

13 files changed

+37
-24
lines changed

13 files changed

+37
-24
lines changed

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,11 @@ extensions.findByType<IntelliJPlatformTestingExtension>()?.let {
7979
task {
8080
integrationTestConfiguration(this)
8181
}
82+
83+
// https://github.com/JetBrains/intellij-platform-gradle-plugin/issues/1844
84+
prepareSandboxTask {
85+
disabledPlugins.add("com.intellij.swagger")
86+
}
8287
}
8388
} ?: run {
8489
val integrationTest by tasks.registering(Test::class, integrationTestConfiguration)

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType
55
import org.jetbrains.intellij.platform.gradle.TestFrameworkType
6+
import org.jetbrains.intellij.platform.gradle.tasks.PrepareSandboxTask
67
import software.aws.toolkits.gradle.findFolders
78
import software.aws.toolkits.gradle.intellij.IdeVersions
89
import software.aws.toolkits.gradle.intellij.toolkitIntelliJ
@@ -103,7 +104,8 @@ dependencies {
103104
}
104105
}
105106

106-
tasks.prepareTestSandbox {
107+
// https://github.com/JetBrains/intellij-platform-gradle-plugin/issues/1844
108+
tasks.withType<PrepareSandboxTask>().configureEach {
107109
disabledPlugins.addAll(
108110
"com.intellij.swagger",
109111
"org.jetbrains.plugins.kotlin.jupyter",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ object CodeWhispererConstants {
155155

156156
object Config {
157157
val CODEWHISPERER_ENDPOINT
158-
get() = Registry.get("amazon.q.endpoint").asString()
158+
get() = System.getenv("__CODEWHISPERER_ENDPOINT") ?: Registry.get("amazon.q.endpoint").asString()
159159

160160
const val CODEWHISPERER_IDPOOL_ID = "us-east-1:70717e99-906f-4add-908c-bd9074a2f5b9"
161161
val Sigv4ClientRegion = Region.US_EAST_1

‎ui-tests-starter/.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
allure-results/
2+
package.json
3+
package-lock.json

‎ui-tests-starter/build.gradle.kts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ intellijPlatform {
3838
}
3939

4040
val uiTestImplementation by configurations.getting
41+
val uiTestRuntimeOnly by configurations.getting
4142

4243
configurations.getByName(uiTestSource.compileClasspathConfigurationName) {
4344
extendsFrom(uiTestImplementation)
@@ -53,6 +54,9 @@ dependencies {
5354
uiTestImplementation(platform(libs.junit5.bom))
5455
uiTestImplementation(libs.junit5.jupiter)
5556

57+
// not sure why not coming in transitively for starter
58+
uiTestRuntimeOnly(libs.kotlin.coroutines)
59+
5660
intellijPlatform {
5761
val version = ideProfile.community.sdkVersion
5862
intellijIdeaCommunity(version, !version.contains("SNAPSHOT"))

‎ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class OfflineAmazonQInlineCompletionTest {
4646
LocalProjectInfo(
4747
Paths.get("tstData", "Hello")
4848
)
49-
).useRelease(System.getProperty("org.gradle.project.ideProfileName"))
49+
).withVersion(System.getProperty("org.gradle.project.ideProfileName"))
5050
Paths.get(System.getProperty("user.home"), ".aws", "sso", "cache", "ee1d2538cb8d358377d7661466c866af747a8a3f.json")
5151
.createParentDirectories()
5252
.writeText(

‎ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/chatTests/AmazonQChatTest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class AmazonQChatTest {
5858
LocalProjectInfo(
5959
Paths.get("tstData", "Hello")
6060
)
61-
).useRelease(System.getProperty("org.gradle.project.ideProfileName"))
61+
).withVersion(System.getProperty("org.gradle.project.ideProfileName"))
6262

6363
// inject connection
6464
useExistingConnectionForTest()

‎ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/docTests/createReadmeTests/CreateReadmeTest.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ class CreateReadmeTest {
6565
LocalProjectInfo(
6666
Paths.get("tstData", "qdoc", "createFlow")
6767
)
68-
).useRelease(System.getProperty("org.gradle.project.ideProfileName"))
68+
).withVersion(System.getProperty("org.gradle.project.ideProfileName"))
6969

7070
// inject connection
7171
useExistingConnectionForTest()
@@ -101,7 +101,7 @@ class CreateReadmeTest {
101101
LocalProjectInfo(
102102
Paths.get("tstData", "qdoc", "createFlow")
103103
)
104-
).useRelease(System.getProperty("org.gradle.project.ideProfileName"))
104+
).withVersion(System.getProperty("org.gradle.project.ideProfileName"))
105105

106106
// inject connection
107107
useExistingConnectionForTest()
@@ -137,7 +137,7 @@ class CreateReadmeTest {
137137
LocalProjectInfo(
138138
Paths.get("tstData", "qdoc", "createFlow")
139139
)
140-
).useRelease(System.getProperty("org.gradle.project.ideProfileName"))
140+
).withVersion(System.getProperty("org.gradle.project.ideProfileName"))
141141

142142
// inject connection
143143
useExistingConnectionForTest()
@@ -173,7 +173,7 @@ class CreateReadmeTest {
173173
LocalProjectInfo(
174174
Paths.get("tstData", "qdoc", "createFlow")
175175
)
176-
).useRelease(System.getProperty("org.gradle.project.ideProfileName"))
176+
).withVersion(System.getProperty("org.gradle.project.ideProfileName"))
177177

178178
// inject connection
179179
useExistingConnectionForTest()
@@ -218,7 +218,7 @@ class CreateReadmeTest {
218218
LocalProjectInfo(
219219
Paths.get("tstData", "qdoc", "createFlow")
220220
)
221-
).useRelease(System.getProperty("org.gradle.project.ideProfileName"))
221+
).withVersion(System.getProperty("org.gradle.project.ideProfileName"))
222222

223223
// inject connection
224224
useExistingConnectionForTest()

‎ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/docTests/updateReadmeTests/UpdateReadmeLatestChangesTest.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class UpdateReadmeLatestChangesTest {
6363
LocalProjectInfo(
6464
Paths.get("tstData", "qdoc", "updateFlow")
6565
)
66-
).useRelease(System.getProperty("org.gradle.project.ideProfileName"))
66+
).withVersion(System.getProperty("org.gradle.project.ideProfileName"))
6767

6868
// inject connection
6969
useExistingConnectionForTest()
@@ -101,7 +101,7 @@ class UpdateReadmeLatestChangesTest {
101101
LocalProjectInfo(
102102
Paths.get("tstData", "qdoc", "updateFlow")
103103
)
104-
).useRelease(System.getProperty("org.gradle.project.ideProfileName"))
104+
).withVersion(System.getProperty("org.gradle.project.ideProfileName"))
105105

106106
// inject connection
107107
useExistingConnectionForTest()
@@ -139,7 +139,7 @@ class UpdateReadmeLatestChangesTest {
139139
LocalProjectInfo(
140140
Paths.get("tstData", "qdoc", "updateFlow")
141141
)
142-
).useRelease(System.getProperty("org.gradle.project.ideProfileName"))
142+
).withVersion(System.getProperty("org.gradle.project.ideProfileName"))
143143

144144
// inject connection
145145
useExistingConnectionForTest()

‎ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/docTests/updateReadmeTests/UpdateReadmeSpecificChangesTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class UpdateReadmeSpecificChangesTest {
6262
LocalProjectInfo(
6363
Paths.get("tstData", "qdoc", "updateFlow")
6464
)
65-
).useRelease(System.getProperty("org.gradle.project.ideProfileName"))
65+
).withVersion(System.getProperty("org.gradle.project.ideProfileName"))
6666

6767
// inject connection
6868
useExistingConnectionForTest()
@@ -100,7 +100,7 @@ class UpdateReadmeSpecificChangesTest {
100100
LocalProjectInfo(
101101
Paths.get("tstData", "qdoc", "updateFlow")
102102
)
103-
).useRelease(System.getProperty("org.gradle.project.ideProfileName"))
103+
).withVersion(System.getProperty("org.gradle.project.ideProfileName"))
104104

105105
// inject connection
106106
useExistingConnectionForTest()

0 commit comments

Comments
 (0)