test(amazonQ): Q Dev Profile UI tests

buildSrc/src/main/kotlin/temp-toolkit-intellij-root-conventions.gradle.kts

@@ -53,11 +53,13 @@ intellijPlatform {
 tasks.prepareSandbox {
     val pluginName = intellijPlatform.projectName
 
-    intoChild(pluginName.map { "$it/dotnet" })
-        .from(resharperDlls)
+    from(resharperDlls) {
+        into(pluginName.map { "$it/dotnet" })
+    }
 
-    intoChild(pluginName.map { "$it/gateway-resources" })
-        .from(gatewayResources)
+    from(gatewayResources) {
+        into(pluginName.map { "$it/gateway-resources" })
+    }
 }
 
 // We have no source in this project, so skip test task

gradle/libs.versions.toml

@@ -10,7 +10,7 @@ detekt = "1.23.8"
 diff-util = "4.12"
 intellijExt = "1.1.8"
 # match with <root>/settings.gradle.kts
-intellijGradle = "2.6.0"
+intellijGradle = "2.7.1"
 intellijRemoteRobot = "0.11.22"
 jackson = "2.17.2"
 jacoco = "0.8.12"

plugins/amazonq/build.gradle.kts

@@ -133,8 +133,10 @@ val prepareBundledFlare by tasks.registering(Copy::class) {
 }
 
 tasks.withType<PrepareSandboxTask>().configureEach {
-    intoChild(intellijPlatform.projectName.map { "$it/lib" })
-        .from(file("contrib/QCT-Maven-6-16.jar"))
-    intoChild(intellijPlatform.projectName.map { "$it/flare" })
-        .from(prepareBundledFlare)
+    from(file("contrib/QCT-Maven-6-16.jar")) {
+        into(intellijPlatform.projectName.map { "$it/lib" })
+    }
+    from(prepareBundledFlare) {
+        into(intellijPlatform.projectName.map { "$it/flare" })
+    }
 }

plugins/amazonq/codetransform/jetbrains-community/build.gradle.kts

@@ -32,6 +32,7 @@ tasks.prepareTestSandbox {
     val pluginXmlJar = project(":plugin-amazonq").tasks.jar
 
     dependsOn(pluginXmlJar)
-    intoChild(intellijPlatform.projectName.map { "$it/lib" })
-        .from(pluginXmlJar)
+    from(pluginXmlJar) {
+        into(intellijPlatform.projectName.map { "$it/lib" })
+    }
 }

plugins/amazonq/codewhisperer/jetbrains-community/build.gradle.kts

@@ -31,6 +31,7 @@ tasks.prepareTestSandbox {
     val pluginXmlJar = project(":plugin-amazonq").tasks.jar
 
     dependsOn(pluginXmlJar)
-    intoChild(intellijPlatform.projectName.map { "$it/lib" })
-        .from(pluginXmlJar)
+    from(pluginXmlJar) {
+        into(intellijPlatform.projectName.map { "$it/lib" })
+    }
 }

plugins/amazonq/codewhisperer/jetbrains-ultimate/build.gradle.kts

@@ -31,6 +31,7 @@ tasks.prepareTestSandbox {
     val pluginXmlJar = project(":plugin-amazonq").tasks.jar
 
     dependsOn(pluginXmlJar)
-    intoChild(intellijPlatform.projectName.map { "$it/lib" })
-        .from(pluginXmlJar)
+    from(pluginXmlJar) {
+        into(intellijPlatform.projectName.map { "$it/lib" })
+    }
 }

plugins/amazonq/shared/jetbrains-community/build.gradle.kts

@@ -30,6 +30,7 @@ tasks.prepareTestSandbox {
     val pluginXmlJar = project(":plugin-amazonq").tasks.jar
 
     dependsOn(pluginXmlJar)
-    intoChild(intellijPlatform.projectName.map { "$it/lib" })
-        .from(pluginXmlJar)
+    from(pluginXmlJar) {
+        into(intellijPlatform.projectName.map { "$it/lib" })
+    }
 }

plugins/core/jetbrains-community/build.gradle.kts

@@ -95,6 +95,7 @@ tasks.prepareTestSandbox {
     val pluginXmlJar = project(":plugin-core").tasks.jar
 
     dependsOn(pluginXmlJar)
-    intoChild(intellijPlatform.projectName.map { "$it/lib" })
-        .from(pluginXmlJar)
+    from(pluginXmlJar) {
+        into(intellijPlatform.projectName.map { "$it/lib" })
+    }
 }

plugins/toolkit/jetbrains-gateway/build.gradle.kts

@@ -138,8 +138,9 @@ tasks.jar {
 }
 
 tasks.withType<PrepareSandboxTask>().configureEach {
-    intoChild(intellijPlatform.projectName.map { "$it/gateway-resources" })
-        .from(gatewayResourcesDir)
+    from(gatewayResourcesDir) {
+        into(intellijPlatform.projectName.map { "$it/gateway-resources" })
+    }
 }
 
 listOf(
@@ -150,8 +151,9 @@ listOf(
         runtimeClasspath.setFrom(gatewayOnlyRuntimeClasspath)
 
         dependsOn(gatewayOnlyResourcesJar)
-        intoChild(intellijPlatform.projectName.map { "$it/lib" })
-            .from(gatewayOnlyResourcesJar)
+        from(gatewayOnlyResourcesJar) {
+            into(intellijPlatform.projectName.map { "$it/lib" })
+        }
     }
 }
 

plugins/toolkit/jetbrains-rider/build.gradle.kts

@@ -338,8 +338,9 @@ tasks.withType<PrepareSandboxTask>().configureEach {
 
     dependsOn(resharperDllsDir)
 
-    intoChild(intellijPlatform.projectName.map { "$it/dotnet" })
-        .from(resharperDllsDir)
+    from(resharperDllsDir) {
+        into(intellijPlatform.projectName.map { "$it/dotnet" })
+    }
 }
 
 tasks.compileKotlin {

sandbox-all/build.gradle.kts

@@ -6,6 +6,7 @@ import software.aws.toolkits.gradle.intellij.IdeFlavor
 import software.aws.toolkits.gradle.intellij.toolkitIntelliJ
 
 plugins {
+    id("toolkit-jvm-conventions")
     id("toolkit-intellij-plugin")
     id("toolkit-publish-root-conventions")
 }

settings.gradle.kts

@@ -17,20 +17,32 @@ val codeArtifactMavenRepo = fun RepositoryHandler.(): MavenArtifactRepository? {
     } else {
         null
     }
-}.also {
-    pluginManagement {
-        repositories {
-            it()
-            maven("https://oss.sonatype.org/content/repositories/snapshots/")
-            gradlePluginPortal()
+}
+
+pluginManagement {
+    repositories {
+        // unfortunately pluginManagement is special, so we need to duplicate
+        val codeArtifactUrl: Provider<String> = providers.environmentVariable("CODEARTIFACT_URL")
+        val codeArtifactToken: Provider<String> = providers.environmentVariable("CODEARTIFACT_AUTH_TOKEN")
+        if (codeArtifactUrl.isPresent && codeArtifactToken.isPresent) {
+            maven {
+                url = uri(codeArtifactUrl.get())
+                credentials {
+                    username = "aws"
+                    password = codeArtifactToken.get()
+                }
+            }
         }
+
+        gradlePluginPortal()
+        maven("https://central.sonatype.com/repository/maven-snapshots/")
     }
 }
 
 plugins {
     id("com.github.burrunan.s3-build-cache") version "1.5"
     id("com.gradle.develocity") version "3.17.6"
-    id("org.jetbrains.intellij.platform.settings") version "2.6.0"
+    id("org.jetbrains.intellij.platform.settings") version "2.7.1"
 }
 
 dependencyResolutionManagement {

ui-tests-starter/build.gradle.kts

@@ -48,6 +48,14 @@ configurations.getByName(uiTestSource.runtimeClasspathConfigurationName) {
     extendsFrom(uiTestImplementation)
 }
 
+configurations {
+    configureEach {
+        if (name.contains("runtime", ignoreCase = true) && !name.contains("uiTest", ignoreCase = true)) {
+            exclude(group = "org.jetbrains.kotlinx")
+        }
+    }
+}
+
 dependencies {
     // should really be set by the BOM, but too much work to figure out right now
     uiTestImplementation("org.kodein.di:kodein-di-jvm:7.20.2")
@@ -57,10 +65,11 @@ dependencies {
 
     // not sure why not coming in transitively for starter
     uiTestRuntimeOnly(libs.kotlin.coroutines)
+    uiTestRuntimeOnly(libs.junit.platform.launcher)
 
     intellijPlatform {
         val version = ideProfile.community.sdkVersion
-        intellijIdeaCommunity(version, !version.contains("SNAPSHOT"))
+        intellijIdeaCommunity(version, useInstaller = false)
 
         localPlugin(project(":plugin-core"))
         testImplementation(project(":plugin-core:core"))
@@ -87,12 +96,22 @@ val prepareAmazonQTest by intellijPlatformTesting.testIde.registering {
     }
 }
 
+// Task to install npm dependencies
+tasks.register<Exec>("npmInstall") {
+    workingDir = projectDir
+    commandLine("npm", "install")
+    inputs.file("package.json")
+    outputs.dir("node_modules")
+}
+
 tasks.register<Test>("uiTest") {
     testClassesDirs = uiTestSource.output.classesDirs
     classpath = uiTestSource.runtimeClasspath
 
     dependsOn(prepareAmazonQTest)
     dependsOn(testPlugins)
+    dependsOn("npmInstall") // Ensure npm dependencies are installed
+
     systemProperty("ui.test.plugins", testPlugins.get().asPath)
     systemProperty("org.gradle.project.ideProfileName", ideProfile.name)
     val testSuite = System.getenv("TEST_DIR") ?: ""

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

@@ -22,6 +22,7 @@ import org.kodein.di.DI
 import org.kodein.di.bindSingleton
 import software.aws.toolkits.jetbrains.uitests.TestCIServer
 import software.aws.toolkits.jetbrains.uitests.clearAwsXmlFile
+import software.aws.toolkits.jetbrains.uitests.copyExistingConfig
 import software.aws.toolkits.jetbrains.uitests.executePuppeteerScript
 import software.aws.toolkits.jetbrains.uitests.setupTestEnvironment
 import software.aws.toolkits.jetbrains.uitests.useExistingConnectionForTest

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

@@ -24,6 +24,7 @@ import org.kodein.di.DI
 import org.kodein.di.bindSingleton
 import software.aws.toolkits.jetbrains.uitests.TestCIServer
 import software.aws.toolkits.jetbrains.uitests.clearAwsXmlFile
+import software.aws.toolkits.jetbrains.uitests.copyExistingConfig
 import software.aws.toolkits.jetbrains.uitests.docTests.prepTestData
 import software.aws.toolkits.jetbrains.uitests.docTests.scripts.createReadmeScripts.acceptReadmeTestScript
 import software.aws.toolkits.jetbrains.uitests.docTests.scripts.createReadmeScripts.createReadmePromptedToConfirmFolderTestScript

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

@@ -24,6 +24,7 @@ import org.kodein.di.DI
 import org.kodein.di.bindSingleton
 import software.aws.toolkits.jetbrains.uitests.TestCIServer
 import software.aws.toolkits.jetbrains.uitests.clearAwsXmlFile
+import software.aws.toolkits.jetbrains.uitests.copyExistingConfig
 import software.aws.toolkits.jetbrains.uitests.docTests.prepTestData
 import software.aws.toolkits.jetbrains.uitests.docTests.scripts.createReadmeScripts.acceptReadmeTestScript
 import software.aws.toolkits.jetbrains.uitests.docTests.scripts.createReadmeScripts.createReadmeSubFolderPostFolderChangeTestScript

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

@@ -23,6 +23,7 @@ import org.kodein.di.DI
 import org.kodein.di.bindSingleton
 import software.aws.toolkits.jetbrains.uitests.TestCIServer
 import software.aws.toolkits.jetbrains.uitests.clearAwsXmlFile
+import software.aws.toolkits.jetbrains.uitests.copyExistingConfig
 import software.aws.toolkits.jetbrains.uitests.docTests.prepTestData
 import software.aws.toolkits.jetbrains.uitests.docTests.scripts.updateReadmeLatestChangesConfirmOptionsTestScript
 import software.aws.toolkits.jetbrains.uitests.docTests.scripts.updateReadmeLatestChangesMakeChangesFlowTestScript

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

@@ -23,6 +23,7 @@ import org.kodein.di.DI
 import org.kodein.di.bindSingleton
 import software.aws.toolkits.jetbrains.uitests.TestCIServer
 import software.aws.toolkits.jetbrains.uitests.clearAwsXmlFile
+import software.aws.toolkits.jetbrains.uitests.copyExistingConfig
 import software.aws.toolkits.jetbrains.uitests.docTests.prepTestData
 import software.aws.toolkits.jetbrains.uitests.docTests.scripts.updateReadmeSpecificChangesMakeChangesFlowTestScript
 import software.aws.toolkits.jetbrains.uitests.docTests.scripts.updateReadmeSpecificChangesTestScript

ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/featureDevTests/FeatureDevTest.kt

@@ -24,6 +24,7 @@ import org.kodein.di.DI
 import org.kodein.di.bindSingleton
 import software.aws.toolkits.jetbrains.uitests.TestCIServer
 import software.aws.toolkits.jetbrains.uitests.clearAwsXmlFile
+import software.aws.toolkits.jetbrains.uitests.copyExistingConfig
 import software.aws.toolkits.jetbrains.uitests.executePuppeteerScript
 import software.aws.toolkits.jetbrains.uitests.setupTestEnvironment
 import software.aws.toolkits.jetbrains.uitests.useExistingConnectionForTest