Merge branch 'feature/q-extension' into feature/cw-proactive-scan

Author: laileni-aws

.changes/next-release/bugfix-cfca5f64-baae-4ecc-95ab-8cbbfcf08398.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Amazon Q Chat: Q panel doesn't fit to its parent"
+}

.changes/next-release/feature-95b0b124-c58c-44d3-96c6-fd8beb52df00.json

@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "Amazon Q Chat: Updates quick action commands style and groupings"
+}

.github/workflows/prerelease.yml

@@ -11,37 +11,6 @@ on:
 
 
 jobs:
-  generate_artifact_toolkit:
-    strategy:
-      matrix:
-        supported_versions: [ '2023.3', '2023.2', '2024.1' ]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - name: remove unwanted dependencies
-        run: |
-          sudo rm -rf /usr/share/dotnet
-          sudo rm -rf /opt/ghc
-          sudo rm -rf "/usr/local/share/boost"
-          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
-      - uses: actions/setup-java@v4
-        with:
-          distribution: 'corretto'
-          java-version: '17'
-      - uses: actions/setup-dotnet@v4
-        with:
-          dotnet-version: '6.x'
-      - name: Generate artifact
-        run: |
-          ./gradlew -PideProfileName=${{ matrix.supported_versions }} :plugin-toolkit:intellij:buildPlugin
-      - name: Upload artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: plugin-toolkit-${{ matrix.supported_versions }}
-          path: ./plugins/toolkit/intellij/build/distributions/*.zip
-          retention-days: 1
   generate_artifact_toolkit_standalone:
     strategy:
       matrix:
@@ -177,7 +146,7 @@ jobs:
           echo 'EOF' >> $GITHUB_OUTPUT
 
   publish:
-    needs: [ generate_artifact_toolkit, generate_artifact_toolkit_standalone, generate_artifact_core, generate_artifact_q, generate_changelog ]
+    needs: [  generate_artifact_toolkit_standalone, generate_artifact_core, generate_artifact_q, generate_changelog ]
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       GH_REPO: ${{ github.repository }}
@@ -201,16 +170,13 @@ jobs:
       - name: Publish to GitHub Releases
         run: |
           envsubst < "$GITHUB_WORKSPACE/.github/workflows/prerelease_notes.md" > "$RUNNER_TEMP/prerelease_notes.md"
-          gh release create "$TAG_NAME" --prerelease --notes-file "$RUNNER_TEMP/prerelease_notes.md" --title "$SUBJECT" --target $GITHUB_SHA plugin-toolkit-*/*.zip
+          gh release create "$TAG_NAME" --prerelease --notes-file "$RUNNER_TEMP/prerelease_notes.md" --title "$SUBJECT" --target $GITHUB_SHA plugin-standalone-*/*.zip
       - name: Publish core
         run: |
           gh release upload "$TAG_NAME" plugin-core-*/*.zip
       - name: Publish Q
         run: |
           gh release upload "$TAG_NAME" plugin-amazonq-*/*.zip
-      - name: Publish Toolkit Standalone
-        run: |
-          gh release upload "$TAG_NAME" plugin-standalone-*/*.zip
       - name: Publish XML manifest
         run: |
           gh release view "$TAG_NAME" --repo aws/aws-toolkit-jetbrains --json assets | python3 "$GITHUB_WORKSPACE/.github/workflows/generateUpdatesXml.py" - > updatePlugins.xml

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

@@ -23,6 +23,7 @@ plugins {
     id("org.jetbrains.intellij")
     id("toolkit-testing") // Needed so the coverage configurations are present
     id("toolkit-detekt")
+    id("toolkit-publishing-conventions")
 }
 
 val toolkitIntelliJ = project.extensions.create<ToolkitIntelliJExtension>("intellijToolkit").apply {
@@ -67,15 +68,6 @@ tasks.prepareSandbox {
         .from(gatewayResources)
 }
 
-tasks.publishPlugin {
-    token.set(publishToken)
-    channels.set(publishChannel.split(",").map { it.trim() })
-}
-
-tasks.check {
-    dependsOn(tasks.verifyPlugin)
-}
-
 // We have no source in this project, so skip test task
 tasks.test {
     enabled = false
@@ -94,21 +86,6 @@ dependencies {
     resharperDlls(project(":plugin-toolkit:jetbrains-rider", configuration = "resharperDlls"))
 }
 
-configurations {
-    all {
-        // IDE provides netty
-        exclude("io.netty")
-    }
-
-    // Make sure we exclude stuff we either A) ships with IDE, B) we don't use to cut down on size
-    runtimeClasspath {
-        exclude(group = "org.slf4j")
-        exclude(group = "org.jetbrains.kotlin")
-        exclude(group = "org.jetbrains.kotlinx")
-
-    }
-}
-
 // Enable coverage for the UI test target IDE
 ciOnly {
     extensions.getByType<JacocoPluginExtension>().applyTo(tasks.withType<RunIdeForUiTestTask>())

buildSrc/src/main/kotlin/toolkit-publishing-conventions.gradle.kts

@@ -0,0 +1,46 @@
+// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+import software.aws.toolkits.gradle.intellij.IdeVersions
+
+plugins {
+    id("org.jetbrains.intellij")
+}
+
+val ideProfile = IdeVersions.ideProfile(project)
+
+val toolkitVersion: String by project
+val publishToken: String by project
+val publishChannel: String by project
+
+version = "$toolkitVersion-${ideProfile.shortName}"
+
+intellij {
+    version.set(ideProfile.community.version())
+    localPath.set(ideProfile.community.localPath())
+
+    updateSinceUntilBuild.set(false)
+    instrumentCode.set(false)
+}
+
+configurations {
+    all {
+        // IDE provides netty
+        exclude("io.netty")
+    }
+
+    // Make sure we exclude stuff we either A) ships with IDE, B) we don't use to cut down on size
+    runtimeClasspath {
+        exclude(group = "org.slf4j")
+        exclude(group = "org.jetbrains.kotlin")
+        exclude(group = "org.jetbrains.kotlinx")
+    }
+}
+
+tasks.check {
+    dependsOn(tasks.verifyPlugin)
+}
+
+tasks.publishPlugin {
+    token.set(publishToken)
+    channels.set(publishChannel.split(",").map { it.trim() })
+}

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

@@ -21,6 +21,7 @@ dependencies {
     // Everything uses junit4/5 except rider, which uses TestNG
     testFixturesApi(platform(versionCatalog.findLibrary("junit5-bom").get()))
     testFixturesApi(versionCatalog.findLibrary("junit5-jupiterApi").get())
+    testFixturesApi(versionCatalog.findLibrary("junit5-jupiterParams").get())
 
     testRuntimeOnly(versionCatalog.findLibrary("junit5-jupiterEngine").get())
     testRuntimeOnly(versionCatalog.findLibrary("junit5-jupiterVintage").get())

buildspec/linuxTests.yml

@@ -32,7 +32,7 @@ phases:
         fi
 
       - chmod +x gradlew
-      - su codebuild-user -c "./gradlew -PideProfileName=$ALTERNATIVE_IDE_PROFILE_NAME check coverageReport --info --console plain --continue"
+      - su codebuild-user -c "./gradlew -PideProfileName=$ALTERNATIVE_IDE_PROFILE_NAME check coverageReport --info --stacktrace --console plain --continue"
       - ./gradlew -PideProfileName=$ALTERNATIVE_IDE_PROFILE_NAME :plugin-toolkit:intellij:buildPlugin
       - VCS_COMMIT_ID="${CODEBUILD_RESOLVED_SOURCE_VERSION}"
       - CI_BUILD_URL=$(echo $CODEBUILD_BUILD_URL | sed 's/#/%23/g') # Encode `#` in the URL because otherwise the url is clipped in the Codecov.io site

gradle.properties

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

gradle/libs.versions.toml

@@ -9,7 +9,7 @@ detekt = "1.23.6"
 intellijGradle = "1.17.3"
 intellijRemoteRobot = "0.11.22"
 jackson = "2.16.1"
-jacoco = "0.8.11"
+jacoco = "0.8.12"
 jgit = "6.5.0.202303070854-r"
 junit4 = "4.13.2"
 junit5 = "5.10.2"
@@ -87,6 +87,7 @@ junit4 = { module = "junit:junit", version.ref = "junit4" }
 junit5-bom = { module = "org.junit:junit-bom", version.ref = "junit5" }
 junit5-jupiterApi = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit5" }
 junit5-jupiterEngine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit5" }
+junit5-jupiterParams = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junit5" }
 junit5-jupiterVintage = { module = "org.junit.vintage:junit-vintage-engine", version.ref = "junit5" }
 kotlin-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinCoroutines" }
 kotlin-coroutinesDebug = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-debug", version.ref = "kotlinCoroutines" }

plugins/amazonq/build.gradle.kts

@@ -5,28 +5,15 @@ import software.aws.toolkits.gradle.intellij.IdeFlavor
 import software.aws.toolkits.gradle.intellij.IdeVersions
 
 plugins {
-    id("org.jetbrains.intellij")
+    id("toolkit-publishing-conventions")
 }
 
-val ideProfile = IdeVersions.ideProfile(project)
-
-val toolkitVersion: String by project
-val publishToken: String by project
-val publishChannel: String by project
-
-version = "$toolkitVersion-${ideProfile.shortName}"
-
 intellij {
-    version.set(ideProfile.community.version())
-    localPath.set(ideProfile.community.localPath())
     plugins.set(
         listOf(
             project(":plugin-core")
         )
     )
-
-    updateSinceUntilBuild.set(false)
-    instrumentCode.set(false)
 }
 
 dependencies {
@@ -37,15 +24,6 @@ dependencies {
     implementation(project(":plugin-amazonq:shared"))
 }
 
-configurations {
-    // Make sure we exclude stuff we either A) ships with IDE, B) we don't use to cut down on size
-    runtimeClasspath {
-        exclude(group = "org.slf4j")
-        exclude(group = "org.jetbrains.kotlin")
-        exclude(group = "org.jetbrains.kotlinx")
-    }
-}
-
 val moduleOnlyJar = tasks.create<Jar>("moduleOnlyJar") {
     archiveClassifier.set("module-only")
     // empty jar