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.

Sign up for GitHub

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

Merged
merged 21 commits into from
Jun 23, 2025
Merged

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

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
128beac
copy JAR
May 9, 2025
d0c758b
remove notify
May 9, 2025
dd8bc0d
remove other notify
May 9, 2025
0f74122
fix detekt and test
May 9, 2025
fa7e08e
resolve conflicts
May 20, 2025
f59049b
add check for empty diff
Jun 5, 2025
6f7c365
rebase
Jun 13, 2025
1ea253c
update JAR
Jun 17, 2025
7b8e2ff
always resume even on empty diff
Jun 17, 2025
cbd8ad6
poll correctly
Jun 19, 2025
6644486
text update
Jun 20, 2025
1c3271a
fix detekt
Jun 20, 2025
3240d29
zip sql metadata correctly
Jun 20, 2025
a60edff
update text
Jun 20, 2025
fc15be8
fix timeout issue
Jun 20, 2025
1e701e0
handle Windows
Jun 21, 2025
87fac4a
refactor
Jun 21, 2025
fbb545c
remove IDE capability
Jun 23, 2025
67c45ac
remove IDE capability everywhere
Jun 23, 2025
7429e6a
address comment
Jun 23, 2025
bc34ade
Update plugins/amazonq/build.gradle.kts
dhasani23 Jun 23, 2025
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
4 changes: 4 additions & 0 deletions .changes/next-release/feature-065d979a-e921-4252-a9a7-f0c2079015f3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type" : "feature",
"description" : "/transform: run all builds client-side"
}
6 changes: 6 additions & 0 deletions plugins/amazonq/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,12 @@ val changelog = tasks.register<GeneratePluginChangeLog>("pluginChangeLog") {
changeLogFile.value(layout.buildDirectory.file("changelog/change-notes.xml"))
}

tasks.prepareSandbox {
from("contrib/QCT-Maven-6-16.jar") {
into("/plugin-amazonq/lib")
}
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you reuse the block at the end of the file

tasks.withType<PrepareSandboxTask>().configureEach {
[...]
    intoChild(intellijPlatform.projectName.map { "$it/lib" })
        .from(file("contrib/QCT-Maven-6-16.jar"))
}


tasks.jar {
dependsOn(changelog)
from(changelog) {
Expand Down
4 changes: 2 additions & 2 deletions ...nity/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeModernizerSession.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,6 @@ import java.util.concurrent.atomic.AtomicBoolean
import javax.net.ssl.SSLHandshakeException

const val MAX_ZIP_SIZE = 2000000000 // 2GB
const val EXPLAINABILITY_V1 = "EXPLAINABILITY_V1"
const val SELECTIVE_TRANSFORMATION_V2 = "SELECTIVE_TRANSFORMATION_V2"

// constants for handling SDKClientException
const val CONNECTION_REFUSED_ERROR: String = "Connection refused"
Expand Down Expand Up @@ -554,6 +552,8 @@ class CodeModernizerSession(

else -> {
LOG.error(e) { e.message.toString() }
LOG.info { "Stopping transformation job [$jobId] due to unexpected error." }
stopTransformation(jobId.id)
CodeModernizerJobCompletedResult.RetryableFailure(
jobId,
message("codemodernizer.notification.info.modernize_failed.connection_failed", e.message.orEmpty()),
Expand Down
8 changes: 4 additions & 4 deletions ...ftware/aws/toolkits/jetbrains/services/codemodernizer/constants/CodeTransformChatItems.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ fun buildUserInputSQLConversionMetadataChatContent() = CodeTransformChatMessageC
)

fun buildUserInputCustomDependencyVersionsChatContent() = CodeTransformChatMessageContent(
message = "Optionally, provide a .YAML file which specifies custom dependency versions you want Q to upgrade to.",
message = message("codemodernizer.chat.message.custom_dependency_upgrades_prompt"),
buttons = listOf(
confirmCustomDependencyVersionsButton,
continueTransformationButton,
Expand All @@ -368,7 +368,7 @@ fun buildInvalidTargetJdkNameChatContent(jdkName: String) = CodeTransformChatMes
)

fun buildCustomDependencyVersionsFileValidChatContent() = CodeTransformChatMessageContent(
message = "I received your .yaml file and will upload it to Q.",
message = message("codemodernizer.chat.message.custom_dependency_upgrades_valid"),
type = CodeTransformChatMessageType.FinalizedAnswer,
)

Expand Down Expand Up @@ -415,7 +415,7 @@ fun buildSQLMetadataValidationErrorChatContent(errorReason: String) = CodeTransf

fun buildCustomDependencyVersionsFileInvalidChatContent() = CodeTransformChatMessageContent(
type = CodeTransformChatMessageType.FinalizedAnswer,
message = "The file you uploaded does not follow the format of the sample YAML file provided.",
message = message("codemodernizer.chat.message.custom_dependency_upgrades_invalid"),
)

fun buildUserCancelledChatContent() = CodeTransformChatMessageContent(
Expand Down Expand Up @@ -455,7 +455,7 @@ fun buildUserLanguageUpgradeSelectionSummaryChatContent(moduleName: String, targ

fun buildContinueTransformationChatContent() = CodeTransformChatMessageContent(
type = CodeTransformChatMessageType.FinalizedAnswer,
message = "Ok, I will continue without this information.",
message = message("codemodernizer.chat.message.custom_dependency_upgrades_continue"),
)

fun buildCompileLocalInProgressChatContent() = CodeTransformChatMessageContent(
Expand Down
29 changes: 15 additions & 14 deletions .../aws/toolkits/jetbrains/services/codemodernizer/controller/CodeTransformChatController.kt
View file
Open in desktop
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 All @@ -28,10 +32,8 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.ArtifactHandler
import software.aws.toolkits.jetbrains.services.codemodernizer.CodeModernizerManager
import software.aws.toolkits.jetbrains.services.codemodernizer.CodeModernizerManager.Companion.LOG
import software.aws.toolkits.jetbrains.services.codemodernizer.CodeTransformTelemetryManager
import software.aws.toolkits.jetbrains.services.codemodernizer.EXPLAINABILITY_V1
import software.aws.toolkits.jetbrains.services.codemodernizer.HilTelemetryMetaData
import software.aws.toolkits.jetbrains.services.codemodernizer.InboundAppMessagesHandler
import software.aws.toolkits.jetbrains.services.codemodernizer.SELECTIVE_TRANSFORMATION_V2
import software.aws.toolkits.jetbrains.services.codemodernizer.client.GumbyClient
import software.aws.toolkits.jetbrains.services.codemodernizer.commands.CodeTransformActionMessage
import software.aws.toolkits.jetbrains.services.codemodernizer.commands.CodeTransformCommand
Expand Down Expand Up @@ -76,6 +78,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.buildUserInputSQLConversionMetadataChatContent
import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserInputSkipTestsFlagChatContent
Expand All @@ -89,6 +92,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 All @@ -97,12 +101,15 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeTransfo
import software.aws.toolkits.jetbrains.services.codemodernizer.model.CustomerSelection
import software.aws.toolkits.jetbrains.services.codemodernizer.model.DownloadArtifactResult
import software.aws.toolkits.jetbrains.services.codemodernizer.model.DownloadFailureReason
import software.aws.toolkits.jetbrains.services.codemodernizer.model.EXPLAINABILITY_V1
import software.aws.toolkits.jetbrains.services.codemodernizer.model.IDE
import software.aws.toolkits.jetbrains.services.codemodernizer.model.InvalidTelemetryReason
import software.aws.toolkits.jetbrains.services.codemodernizer.model.JobId
import software.aws.toolkits.jetbrains.services.codemodernizer.model.MAVEN_BUILD_RUN_UNIT_TESTS
import software.aws.toolkits.jetbrains.services.codemodernizer.model.MAVEN_BUILD_SKIP_UNIT_TESTS
import software.aws.toolkits.jetbrains.services.codemodernizer.model.MavenCopyCommandsResult
import software.aws.toolkits.jetbrains.services.codemodernizer.model.MavenDependencyReportCommandsResult
import software.aws.toolkits.jetbrains.services.codemodernizer.model.SELECTIVE_TRANSFORMATION_V2
import software.aws.toolkits.jetbrains.services.codemodernizer.model.UploadFailureReason
import software.aws.toolkits.jetbrains.services.codemodernizer.model.ValidationResult
import software.aws.toolkits.jetbrains.services.codemodernizer.panels.managers.CodeModernizerBottomWindowPanelManager
Expand Down Expand Up @@ -412,14 +419,11 @@ class CodeTransformChatController(
codeModernizerManager.codeTransformationSession?.let {
it.sessionContext.customBuildCommand = customBuildCommand
}
// TODO: add CLIENT_SIDE_BUILD below when releasing CSB
val transformCapabilities = listOf(EXPLAINABILITY_V1, SELECTIVE_TRANSFORMATION_V2)
val transformCapabilities = listOf(EXPLAINABILITY_V1, CLIENT_SIDE_BUILD, SELECTIVE_TRANSFORMATION_V2, IDE)
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 @@ -461,14 +465,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 @@ -479,18 +480,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("dependency_upgrade.yml", 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