final CSB commit

Author: David Hasani

plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/constants/CodeTransformChatItems.kt

@@ -89,7 +89,7 @@ private val confirmOneOrMultipleDiffsSelectionButton = Button(
 
 private val confirmCustomDependencyVersionsButton = Button(
     keepCardAfterClick = true,
-    waitMandatoryFormItems = true, // TODO: what does this do?
+    waitMandatoryFormItems = true,
     text = "Select file",
     id = CodeTransformButtonId.ConfirmCustomDependencyVersions.id,
 )
@@ -396,7 +396,7 @@ fun buildUserInputCustomDependencyVersionsChatContent() = CodeTransformChatMessa
         confirmCustomDependencyVersionsButton,
         continueTransformationButton,
     ),
-    type = CodeTransformChatMessageType.FinalizedAnswer,
+    type = CodeTransformChatMessageType.PendingAnswer,
 )
 
 fun buildPromptTargetJDKNameChatContent(version: String) = CodeTransformChatMessageContent(

plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/controller/CodeTransformChatController.kt

@@ -4,18 +4,22 @@
 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.openapi.vfs.readText
+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
@@ -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
@@ -93,7 +98,6 @@ 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
@@ -430,23 +434,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,
-                CLIENT_SIDE_BUILD,
                 SELECTIVE_TRANSFORMATION_V1
             )
             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)
         }
-        promptForTargetJdkName(message.tabId)
-        // TODO: when custom 1P upgrades ready, delete line above and uncomment line below
+        // TODO: when releasing CSB, delete "runLocalMavenBuild" line above and uncomment line below
         // promptForCustomYamlFile()
     }
 
@@ -458,14 +461,14 @@ class CodeTransformChatController(
             val selectedFile = FileChooser.chooseFile(descriptor, null, null) ?: return@withContext
             val isValid = validateYamlFile(selectedFile.readText())
             if (!isValid) {
-                codeTransformChatHelper.addNewMessage(buildCustomDependencyVersionsFileInvalidChatContent())
+                codeTransformChatHelper.updateLastPendingMessage(buildCustomDependencyVersionsFileInvalidChatContent())
                 codeTransformChatHelper.addNewMessage(buildStartNewTransformFollowup())
                 return@withContext
             }
             codeModernizerManager.codeTransformationSession?.let {
                 it.sessionContext.customDependencyVersionsFile = selectedFile
             }
-            codeTransformChatHelper.addNewMessage(buildCustomDependencyVersionsFileValidChatContent())
+            codeTransformChatHelper.updateLastPendingMessage(buildCustomDependencyVersionsFileValidChatContent())
             promptForTargetJdkName(message.tabId)
         }
     }
@@ -490,7 +493,6 @@ class CodeTransformChatController(
         }
     }
 
-/*
     private suspend fun promptForCustomYamlFile() {
         codeTransformChatHelper.addNewMessage(buildUserInputCustomDependencyVersionsChatContent())
         val sampleYAML = """
@@ -518,7 +520,6 @@ dependencyManagement:
             FileEditorManager.getInstance(context.project).openFile(virtualFile, true)
         }
     }
-*/
 
     override suspend fun processCodeTransformContinueAction(message: IncomingCodeTransformMessage.CodeTransformContinue) {
         codeTransformChatHelper.addNewMessage(buildContinueTransformationChatContent())

plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/ZipManifest.kt

@@ -10,7 +10,8 @@ data class ZipManifest(
     val buildLogs: String = BUILD_LOG_PATH,
     val version: String = UPLOAD_ZIP_MANIFEST_VERSION,
     val hilCapabilities: List<String> = listOf(HIL_1P_UPGRADE_CAPABILITY),
-    val transformCapabilities: List<String> = listOf(EXPLAINABILITY_V1, CLIENT_SIDE_BUILD),
+    // TODO: add CLIENT_SIDE_BUILD to transformCapabilities when releasing CSB
+    val transformCapabilities: List<String> = listOf(EXPLAINABILITY_V1),
     val customBuildCommand: String = MAVEN_BUILD_RUN_UNIT_TESTS,
     val requestedConversions: RequestedConversions? = null, // only used for SQL conversions for now
 )

plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/utils/CodeTransformApiUtils.kt

@@ -64,6 +64,8 @@ data class PollingResult(
     val transformationPlan: TransformationPlan?,
 )
 
+private const val isClientSideBuildEnabled = false
+
 /**
  * Wrapper around [waitUntil] that polls the API DescribeMigrationJob to check the migration job status.
  */
@@ -117,7 +119,8 @@ suspend fun JobId.pollTransformationStatusAndPlan(
                     delay(sleepDurationMillis)
                     newPlan = clientAdaptor.getCodeModernizationPlan(this).transformationPlan()
                 }
-                if (newStatus == TransformationStatus.TRANSFORMING && newPlan != null) {
+                // TODO: remove flag when releasing CSB
+                if (isClientSideBuildEnabled && newStatus == TransformationStatus.TRANSFORMING && newPlan != null) {
                     attemptLocalBuild(newPlan, this, project)
                 }
                 if (newStatus != state) {

plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties

@@ -642,8 +642,8 @@ codemodernizer.chat.message.download_failed_invalid_artifact=Sorry, I was unable
 codemodernizer.chat.message.download_failed_other=Sorry, I ran into an issue while trying to download your {0}. Please try again. {1}
 codemodernizer.chat.message.download_failed_ssl=Sorry, I couldn''t download your {0} because of an issue with your certificate. Please make sure all your certificates for your proxy client have been set up correctly for your IDE.
 codemodernizer.chat.message.download_failed_wildcard=Sorry, I couldn''t download your {0} because of an issue with your proxy client. Please check your IDE proxy settings and remove any wildcard (*) references, then restart your IDE.
-codemodernizer.chat.message.enter_jdk_name=Enter the name of the {0} you are using. You can find the name in Settings > Project Structure > Platform Settings > SDKs. If you do not see the name of your JDK in the SDK settings, add your JDK, and then return to this chat and enter the name here.
-codemodernizer.chat.message.enter_jdk_name_error=I could not find "{0}" in Settings > Project Structure > Platform Settings > SDKs. Please add the target JDK there and try again.
+codemodernizer.chat.message.enter_jdk_name=Enter the name of the {0} you are using. You can find the name in File > Project Structure > Platform Settings > SDKs. If you do not see the name of your JDK in the SDK settings, add your JDK, and then return to this chat and enter the name here.
+codemodernizer.chat.message.enter_jdk_name_error=I could not find "{0}" in File > Project Structure > Platform Settings > SDKs. Please add the target JDK there and try again.
 codemodernizer.chat.message.error_request=Request failed
 codemodernizer.chat.message.follow_up.new_transformation=Start a new transformation
 codemodernizer.chat.message.hil.cannot_resume=I ran into an issue trying to resume your transformation.
@@ -681,7 +681,7 @@ codemodernizer.chat.message.result.success=I successfully completed your transfo
 codemodernizer.chat.message.result.success.multiple_diffs=I successfully completed your transformation. You will be able to accept changes from one diff at a time. If you reject changes in one diff, you will not be able to view or accept changes in the other diffs. The transformation summary has details about the changes I'm proposing.
 codemodernizer.chat.message.result.zip_too_large=Sorry, your project size exceeds the Amazon Q Code Transformation upload limit of 2GB.
 codemodernizer.chat.message.resume_ongoing=I'm still transforming your code. It can take 10 to 30 minutes to upgrade your code, depending on the size of your module. To monitor progress, go to the Transformation Hub.
-codemodernizer.chat.message.skip_tests=I will build generated code in your local environment, not on the server side. For information on how I scan code to reduce security risks associated with building the code in your local environment, see the [Amazon Q Developer documentation](https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/code-transformation.html#java-local-builds).\n\nI will build your project using `mvn clean test` by default. If you would like me to build your project without running unit tests, I will use `mvn clean test-compile`.
+codemodernizer.chat.message.skip_tests=I will build your project using `mvn clean test` by default. If you would like me to build your project without running unit tests, I will use `mvn clean test-compile`.
 codemodernizer.chat.message.skip_tests_form.response=Okay, I will {0} when building your module.
 codemodernizer.chat.message.skip_tests_form.run_tests=Run unit tests
 codemodernizer.chat.message.skip_tests_form.skip=Skip unit tests

ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/transformTests/TransformChatTest.kt

@@ -81,7 +81,25 @@ async function testNavigation() {
                 const button = document.querySelector('button[action-id="codetransform-input-confirm-one-or-multiple-diffs"]')
                 button.click()
             })
-              
+/*
+            const selectCustomVersionsForm = await page.waitForSelector('button[action-id="codetransform-input-confirm-custom-dependency-versions"]', {
+                timeout: 5000
+            })
+            console.log('Custom dependency versions file form appeared:', selectCustomVersionsForm !== null)
+
+            await page.evaluate(() => {
+                const button = document.querySelector('button[action-id="codetransform-input-continue"]')
+                button.click()
+            })
+
+            await page.type('.mynah-chat-prompt-input', 'dummy-target-jdk-name-here')
+            await page.keyboard.press('Enter')
+
+            const errorMessage = await page.waitForSelector('text/I could not find "dummy-target-jdk-name-here" in File > Project Structure > Platform Settings > SDKs.', {
+                timeout: 5000
+            })
+*/
+            // TODO: delete errorMessage below, and uncomment the above when releasing CSB
             const errorMessage = await page.waitForSelector('text/Sorry, I couldn\'t run the Maven clean install command', {
                 timeout: 5000
             })
@@ -149,6 +167,9 @@ class TransformChatTest {
                     "Skip tests form appeared: true",
                     "One or multiple diffs form appeared: true",
                     "couldn't run the Maven clean install command"
+                    // TODO: delete line above, and uncomment lines below when releasing CSB
+                    // "I could not find \"dummy-target-jdk-name-here\"",
+                    // "Custom dependency versions file form appeared: true",
                 )
             }
     }