Skip to content

feat(amazonq): enable client-side build #5704

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type" : "feature",
"description" : "/transform: run all builds client-side"
}
10 changes: 6 additions & 4 deletions plugins/amazonq/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0

import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType
import software.aws.toolkits.gradle.changelog.tasks.GeneratePluginChangeLog
import software.aws.toolkits.gradle.intellij.IdeFlavor
import software.aws.toolkits.gradle.intellij.IdeVersions
import software.aws.toolkits.gradle.intellij.toolkitIntelliJ

plugins {
id("toolkit-publishing-conventions")
Expand All @@ -19,6 +15,12 @@ val changelog = tasks.register<GeneratePluginChangeLog>("pluginChangeLog") {
changeLogFile.value(layout.buildDirectory.file("changelog/change-notes.xml"))
}

tasks.prepareSandbox {
from("contrib/QCT-Maven.jar") {
into("/plugin-amazonq/lib")
}
}

tasks.jar {
dependsOn(changelog)
from(changelog) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,21 @@
package software.aws.toolkits.jetbrains.services.codemodernizer.controller

import com.intellij.ide.BrowserUtil
import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.application.runInEdt
import com.intellij.openapi.fileChooser.FileChooser
import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory
import com.intellij.openapi.fileEditor.FileEditorManager
import com.intellij.openapi.module.ModuleUtil
import com.intellij.openapi.projectRoots.JavaSdkVersion
import com.intellij.openapi.projectRoots.ProjectJdkTable
import com.intellij.openapi.util.io.FileUtil.createTempDirectory
import com.intellij.openapi.vfs.VirtualFile
import com.intellij.testFramework.LightVirtualFile
import kotlinx.coroutines.delay
import kotlinx.coroutines.runBlocking
import kotlinx.coroutines.withContext
import org.jetbrains.yaml.YAMLFileType
import software.amazon.awssdk.services.codewhispererstreaming.model.TransformationDownloadArtifactType
import software.aws.toolkits.core.utils.debug
import software.aws.toolkits.core.utils.error
Expand Down Expand Up @@ -76,6 +80,7 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildTr
import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildTransformStoppingChatContent
import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserCancelledChatContent
import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserHilSelection
import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserInputCustomDependencyVersionsChatContent
import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserInputLanguageUpgradeChatContent
import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserInputOneOrMultipleDiffsChatIntroContent
import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserInputOneOrMultipleDiffsFlagChatContent
Expand All @@ -92,6 +97,7 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.messages.Authenti
import software.aws.toolkits.jetbrains.services.codemodernizer.messages.CodeTransformChatMessage
import software.aws.toolkits.jetbrains.services.codemodernizer.messages.CodeTransformCommandMessage
import software.aws.toolkits.jetbrains.services.codemodernizer.messages.IncomingCodeTransformMessage
import software.aws.toolkits.jetbrains.services.codemodernizer.model.CLIENT_SIDE_BUILD
import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeModernizerArtifact
import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeModernizerJobCompletedResult
import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeTransformConversationState
Expand Down Expand Up @@ -427,23 +433,22 @@ class CodeTransformChatController(

override suspend fun processCodeTransformOneOrMultipleDiffs(message: IncomingCodeTransformMessage.CodeTransformConfirmOneOrMultipleDiffs) {
val transformCapabilities = when (message.oneOrMultipleDiffsSelection) {
// TODO: add CLIENT_SIDE_BUILD to both below when releasing CSB
message("codemodernizer.chat.message.one_or_multiple_diffs_form.multiple_diffs") -> listOf(
EXPLAINABILITY_V1,
SELECTIVE_TRANSFORMATION_V1
SELECTIVE_TRANSFORMATION_V1,
CLIENT_SIDE_BUILD
)
else -> listOf(
EXPLAINABILITY_V1,
CLIENT_SIDE_BUILD
)
}
telemetry.submitSelection(message.oneOrMultipleDiffsSelection)
codeTransformChatHelper.addNewMessage(buildUserOneOrMultipleDiffsSelectionChatContent(message.oneOrMultipleDiffsSelection))
codeModernizerManager.codeTransformationSession?.let {
it.sessionContext.transformCapabilities = transformCapabilities
codeModernizerManager.runLocalMavenBuild(context.project, it)
}
// TODO: when releasing CSB, delete "runLocalMavenBuild" line above and uncomment line below
// promptForCustomYamlFile()
promptForCustomYamlFile()
}

override suspend fun processCodeTransformCustomDependencyVersions(message: IncomingCodeTransformMessage.CodeTransformConfirmCustomDependencyVersions) {
Expand Down Expand Up @@ -485,14 +490,11 @@ class CodeTransformChatController(
}
}

// TODO: uncomment when releasing CSB
/*
private suspend fun promptForCustomYamlFile() {
codeTransformChatHelper.addNewMessage(buildUserInputCustomDependencyVersionsChatContent())
val sampleYAML = """
name: "custom-dependency-management"
name: "dependency-upgrade"
description: "Custom dependency version management for Java migration from JDK 8/11/17 to JDK 17/21"

dependencyManagement:
dependencies:
- identifier: "com.example:library1"
Expand All @@ -503,18 +505,18 @@ dependencyManagement:
targetVersion: "3.0.0"
originType: "THIRD_PARTY"
plugins:
- identifier: "com.example.plugin"
- identifier: "com.example:plugin"
targetVersion: "1.2.0"
versionProperty: "plugin.version" # Optional
""".trimIndent()

val virtualFile = LightVirtualFile("sample-dependency-management.yaml", YAMLFileType.YML, sampleYAML)
val virtualFile = LightVirtualFile("sample-dependency-upgrade.yaml", YAMLFileType.YML, sampleYAML)
virtualFile.isWritable = true
ApplicationManager.getApplication().invokeLater {
FileEditorManager.getInstance(context.project).openFile(virtualFile, true)
}
}
*/

override suspend fun processCodeTransformContinueAction(message: IncomingCodeTransformMessage.CodeTransformContinue) {
codeTransformChatHelper.addNewMessage(buildContinueTransformationChatContent())
promptForTargetJdkName(message.tabId)
Expand Down
Loading
Loading