fix(amazonq): show build logs when pre-build fails

.changes/next-release/bugfix-8a4575bc-0263-45cb-bf85-04620e306a8f.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Amazon Q Code Transformation: show build logs when server-side build fails"
+}

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

@@ -84,7 +84,6 @@ import software.aws.toolkits.resources.message
 import software.aws.toolkits.telemetry.CodeTransformBuildSystem
 import software.aws.toolkits.telemetry.CodeTransformCancelSrcComponents
 import software.aws.toolkits.telemetry.CodeTransformPreValidationError
-import software.aws.toolkits.telemetry.CodeTransformVCSViewerSrcComponents
 import java.io.File
 import java.nio.file.Path
 import java.time.Instant
@@ -630,7 +629,7 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
             is CodeModernizerJobCompletedResult.JobPartiallySucceeded -> {
                 notifyStickyInfo(
                     message("codemodernizer.notification.info.modernize_partial_complete.title"),
-                    message("codemodernizer.notification.info.modernize_partial_complete.content", result.targetJavaVersion.description),
+                    message("codemodernizer.notification.info.modernize_partial_complete.content"),
                     project,
                     listOf(displaySummaryNotificationAction(result.jobId), displayFeedbackNotificationAction()),
                 )
@@ -770,12 +769,6 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
         codeTransformationSession?.tryOpenTransformationPlanEditor()
     }
 
-    fun showDiff() {
-        val job = codeTransformationSession?.getActiveJobId() ?: return
-        // Use "TreeViewHeader" for Hub
-        artifactHandler.displayDiffAction(job, CodeTransformVCSViewerSrcComponents.TreeViewHeader)
-    }
-
     fun handleCredentialsChanged() {
         codeTransformationSession?.dispose()
         codeModernizerBottomWindowPanelManager.reset()

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

@@ -493,10 +493,7 @@ class CodeModernizerSession(
                     message("codemodernizer.notification.warn.unknown_status_response")
                 )
 
-                result.state == TransformationStatus.PARTIALLY_COMPLETED -> CodeModernizerJobCompletedResult.JobPartiallySucceeded(
-                    jobId,
-                    sessionContext.targetJavaVersion
-                )
+                result.state == TransformationStatus.PARTIALLY_COMPLETED -> CodeModernizerJobCompletedResult.JobPartiallySucceeded(jobId)
 
                 result.state == TransformationStatus.FAILED -> {
                     if (!passedStart) {

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

@@ -431,6 +431,11 @@ fun buildTransformStoppedChatContent() = CodeTransformChatMessageContent(
     type = CodeTransformChatMessageType.FinalizedAnswer,
 )
 
+fun buildTransformFailedChatContent(failureReason: String) = CodeTransformChatMessageContent(
+    message = message("codemodernizer.chat.message.transform_failed", failureReason),
+    type = CodeTransformChatMessageType.FinalizedAnswer,
+)
+
 fun buildUserSQLConversionSelectionSummaryChatContent(moduleName: String, schema: String) = CodeTransformChatMessageContent(
     type = CodeTransformChatMessageType.Prompt,
     message = getUserSQLConversionSelectionFormattedMarkdown(moduleName, schema)
@@ -537,7 +542,7 @@ fun buildTransformResumingChatContent() = CodeTransformChatMessageContent(
     type = CodeTransformChatMessageType.PendingAnswer,
 )
 
-fun buildTransformResultChatContent(result: CodeModernizerJobCompletedResult, totalPatchFiles: Int): CodeTransformChatMessageContent {
+fun buildTransformResultChatContent(result: CodeModernizerJobCompletedResult, totalPatchFiles: Int? = null): CodeTransformChatMessageContent {
     val resultMessage = when (result) {
         is CodeModernizerJobCompletedResult.JobAbortedZipTooLarge -> {
             "${message(

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

@@ -61,6 +61,7 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildSt
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildTransformAwaitUserInputChatContent
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildTransformBeginChatContent
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildTransformDependencyErrorChatContent
+import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildTransformFailedChatContent
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildTransformFindingLocalAlternativeDependencyChatContent
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildTransformInProgressChatContent
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildTransformResultChatContent
@@ -183,7 +184,7 @@ class CodeTransformChatController(
     private suspend fun getUserObjective(tabId: String) {
         codeTransformChatHelper.addNewMessage(buildChooseTransformationObjectiveChatContent())
         codeTransformChatHelper.sendChatInputEnabledMessage(tabId, true)
-        codeTransformChatHelper.sendUpdatePlaceholderMessage(tabId, message("codemodernizer.chat.message.choose_objective"))
+        codeTransformChatHelper.sendUpdatePlaceholderMessage(tabId, message("codemodernizer.chat.message.choose_objective_placeholder"))
     }
 
     private suspend fun validateAndReplyOnError(transformationType: CodeTransformType): ValidationResult? {
@@ -665,9 +666,21 @@ class CodeTransformChatController(
         codeTransformChatHelper.addNewMessage(buildStartNewTransformFollowup())
     }
 
+    private suspend fun handleCodeTransformJobFailed(failureReason: String) {
+        codeTransformChatHelper.updateLastPendingMessage(buildTransformFailedChatContent(failureReason))
+        codeTransformChatHelper.addNewMessage(buildStartNewTransformFollowup())
+    }
+
+    private suspend fun handleCodeTransformJobFailedPreBuild(result: CodeModernizerJobCompletedResult.JobFailedInitialBuild) =
+        codeTransformChatHelper.addNewMessage(
+            buildTransformResultChatContent(result)
+        )
+
     private suspend fun handleCodeTransformResult(result: CodeModernizerJobCompletedResult) {
         when (result) {
             is CodeModernizerJobCompletedResult.Stopped, CodeModernizerJobCompletedResult.JobAbortedBeforeStarting -> handleCodeTransformStoppedByUser()
+            is CodeModernizerJobCompletedResult.JobFailed -> handleCodeTransformJobFailed(result.failureReason)
+            is CodeModernizerJobCompletedResult.JobFailedInitialBuild -> handleCodeTransformJobFailedPreBuild(result)
             else -> {
                 if (result is CodeModernizerJobCompletedResult.ZipUploadFailed && result.failureReason is UploadFailureReason.CREDENTIALS_EXPIRED) {
                     return

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

@@ -3,15 +3,13 @@
 
 package software.aws.toolkits.jetbrains.services.codemodernizer.model
 
-import com.intellij.openapi.projectRoots.JavaSdkVersion
-
 sealed class CodeModernizerJobCompletedResult {
     data class RetryableFailure(val jobId: JobId, val failureReason: String) : CodeModernizerJobCompletedResult()
     data class UnableToCreateJob(val failureReason: String, val retryable: Boolean = false) : CodeModernizerJobCompletedResult()
     data class JobFailed(val jobId: JobId, val failureReason: String) : CodeModernizerJobCompletedResult()
     data class ZipUploadFailed(val failureReason: UploadFailureReason) : CodeModernizerJobCompletedResult()
     data class JobCompletedSuccessfully(val jobId: JobId) : CodeModernizerJobCompletedResult()
-    data class JobPartiallySucceeded(val jobId: JobId, val targetJavaVersion: JavaSdkVersion) : CodeModernizerJobCompletedResult()
+    data class JobPartiallySucceeded(val jobId: JobId) : CodeModernizerJobCompletedResult()
 
     data class JobPaused(val jobId: JobId, val downloadArtifactId: String) : CodeModernizerJobCompletedResult()
 

plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/panels/CodeModernizerBanner.kt

@@ -5,17 +5,15 @@ package software.aws.toolkits.jetbrains.services.codemodernizer.panels
 
 import com.intellij.icons.AllIcons
 import com.intellij.openapi.project.Project
-import com.intellij.serviceContainer.AlreadyDisposedException
 import com.intellij.ui.JBColor
 import com.intellij.ui.border.CustomLineBorder
 import com.intellij.ui.components.ActionLink
 import com.intellij.ui.components.JBLabel
 import com.intellij.util.ui.JBInsets
 import com.intellij.util.ui.JBUI
 import icons.AwsIcons
-import software.aws.toolkits.core.utils.getLogger
-import software.aws.toolkits.core.utils.warn
 import software.aws.toolkits.jetbrains.services.codemodernizer.CodeModernizerManager
+import software.aws.toolkits.jetbrains.services.codemodernizer.model.JobId
 import software.aws.toolkits.jetbrains.services.codewhisperer.layout.CodeWhispererLayoutConfig
 import software.aws.toolkits.jetbrains.services.codewhisperer.layout.CodeWhispererLayoutConfig.addHorizontalGlue
 import software.aws.toolkits.jetbrains.ui.feedback.CodeTransformFeedbackDialog
@@ -42,11 +40,13 @@ class CodeModernizerBanner(val project: Project) : JPanel(BorderLayout()) {
         border = BorderFactory.createEmptyBorder(0, 5, 0, 0)
     }
 
+    private val infoLabelJobId = JBLabel().apply {
+        foreground = JBColor.GRAY
+        border = BorderFactory.createEmptyBorder(0, 5, 0, 0)
+    }
+
     private val infoPanel = JPanel(GridBagLayout())
 
-    val showDiffAction = ActionLink(message("codemodernizer.toolwindow.banner.action.diff")) {
-        CodeModernizerManager.getInstance(project).showDiff()
-    }
     val showPlanAction = ActionLink(message("codemodernizer.toolwindow.banner.action.plan")) {
         CodeModernizerManager.getInstance(project).showTransformationPlan()
     }
@@ -84,6 +84,7 @@ class CodeModernizerBanner(val project: Project) : JPanel(BorderLayout()) {
                 )
             }
             add(infoLabelRunningTime, CodeWhispererLayoutConfig.kebabMenuConstraints)
+            add(infoLabelJobId, CodeWhispererLayoutConfig.kebabMenuConstraints)
         }
         infoPanel.revalidate()
         infoPanel.repaint()
@@ -114,28 +115,23 @@ class CodeModernizerBanner(val project: Project) : JPanel(BorderLayout()) {
     }
 
     fun updateRunningTime(runTime: Duration?) {
-        try {
-            if (runTime == null) {
-                infoLabelRunningTime.text = ""
-            } else {
-                val timeTaken = runTime.toKotlinDuration().inWholeSeconds.seconds.toString()
-                infoLabelRunningTime.text = message(
-                    "codemodernizer.toolwindow.transformation.progress.running_time",
-                    timeTaken
-                )
-            }
-        } catch (exception: AlreadyDisposedException) {
-            LOG.warn { "Disposed when about to create the loading panel" }
-            return
+        infoLabelRunningTime.text = if (runTime != null) {
+            message("codemodernizer.toolwindow.transformation.progress.running_time", runTime.toKotlinDuration().inWholeSeconds.seconds.toString())
+        } else {
+            ""
+        }
+    }
+
+    fun updateJobId(jobId: JobId?) {
+        infoLabelJobId.text = if (jobId != null) {
+            message("codemodernizer.toolwindow.transformation.progress.job_id", jobId.id)
+        } else {
+            ""
         }
     }
 
     fun clearActions() {
         currentlyShownOptions.clear()
         buildContent()
     }
-
-    companion object {
-        private val LOG = getLogger<CodeModernizerBanner>()
-    }
 }

plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/panels/managers/CodeModernizerBottomWindowPanelManager.kt

@@ -88,6 +88,16 @@ class CodeModernizerBottomWindowPanelManager(private val project: Project) : JPa
         }
     }
 
+    private fun updateJobId() {
+        try {
+            val jobId = CodeModernizerSessionState.getInstance(project).currentJobId
+            banner.updateJobId(jobId)
+        } catch (e: AlreadyDisposedException) {
+            LOG.warn { "Disposed when about to update the jobId" }
+            return
+        }
+    }
+
     fun setJobStartingUI() = setUI {
         add(BorderLayout.CENTER, fullSizeLoadingPanel)
         banner.clearActions()
@@ -123,6 +133,7 @@ class CodeModernizerBottomWindowPanelManager(private val project: Project) : JPa
     fun setJobRunningUI() = setUI {
         add(BorderLayout.CENTER, buildProgressSplitterPanelManager)
         banner.updateContent(message("codemodernizer.toolwindow.banner.job_is_running"), AllIcons.General.BalloonInformation)
+        updateJobId()
         buildProgressSplitterPanelManager.apply {
             reset()
             statusTreePanel.setDefaultUI()

plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformChatTest.kt

@@ -0,0 +1,60 @@
+// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.services.codemodernizer
+
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertNull
+import org.junit.Assert.fail
+import org.junit.Test
+import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildTransformResultChatContent
+import software.aws.toolkits.jetbrains.services.codemodernizer.messages.CodeTransformButtonId
+import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeModernizerJobCompletedResult
+import software.aws.toolkits.jetbrains.services.codemodernizer.model.JobId
+import software.aws.toolkits.resources.message
+
+class CodeTransformChatTest {
+
+    @Test
+    fun `test that transform result chat item includes view build log button and message when pre-build fails`() {
+        val result = CodeModernizerJobCompletedResult.JobFailedInitialBuild(JobId("dummy-job-id-123"), "Build failed in Java 8 sandbox", true)
+        val chatItem = buildTransformResultChatContent(result)
+        assertEquals(chatItem.message, message("codemodernizer.chat.message.result.fail_initial_build"))
+        assertNotNull(chatItem.buttons)
+        assertEquals(chatItem.buttons?.size ?: fail("buttons is null"), 1)
+        assertEquals(chatItem.buttons?.get(0)?.id ?: fail("buttons is null"), CodeTransformButtonId.ViewBuildLog.id)
+    }
+
+    @Test
+    fun `test that transform result chat item includes view summary button and view diff button with correct label when job fully succeeded with 5 patch files`() {
+        val result = CodeModernizerJobCompletedResult.JobCompletedSuccessfully(JobId("dummy-job-id-123"))
+        val chatItem = buildTransformResultChatContent(result, 5)
+        assertEquals(chatItem.message, message("codemodernizer.chat.message.result.success.multiple_diffs"))
+        assertNotNull(chatItem.buttons)
+        assertEquals(chatItem.buttons?.size ?: fail("buttons is null"), 2)
+        assertEquals(chatItem.buttons?.get(0)?.id ?: fail("buttons is null"), CodeTransformButtonId.ViewDiff.id)
+        assertEquals(chatItem.buttons?.get(0)?.text ?: fail("buttons is null"), "View diff 1/5")
+        assertEquals(chatItem.buttons?.get(1)?.id ?: fail("buttons is null"), CodeTransformButtonId.ViewSummary.id)
+    }
+
+    @Test
+    fun `test that transform result chat item includes view summary button and view diff button with correct label when job partially succeeded with 1 patch file`() {
+        val result = CodeModernizerJobCompletedResult.JobPartiallySucceeded(JobId("dummy-job-id-123"))
+        val chatItem = buildTransformResultChatContent(result, 1)
+        assertEquals(chatItem.message, message("codemodernizer.chat.message.result.partially_success"))
+        assertNotNull(chatItem.buttons)
+        assertEquals(chatItem.buttons?.size ?: fail("buttons is null"), 2)
+        assertEquals(chatItem.buttons?.get(0)?.id ?: fail("buttons is null"), CodeTransformButtonId.ViewDiff.id)
+        assertEquals(chatItem.buttons?.get(0)?.text ?: fail("buttons is null"), "View diff")
+        assertEquals(chatItem.buttons?.get(1)?.id ?: fail("buttons is null"), CodeTransformButtonId.ViewSummary.id)
+    }
+
+    @Test
+    fun `test that transform result chat item does not include any buttons when job failed with known reason`() {
+        val result = CodeModernizerJobCompletedResult.JobFailed(JobId("dummy-job-id-123"), message("codemodernizer.file.invalid_pom_version"))
+        val chatItem = buildTransformResultChatContent(result)
+        assertEquals(chatItem.message, message("codemodernizer.chat.message.result.fail_with_known_reason", result.failureReason))
+        assertNull(chatItem.buttons)
+    }
+}

plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/CodeWhispererCodeModernizerSessionTest.kt

@@ -532,7 +532,7 @@ class CodeWhispererCodeModernizerSessionTest : CodeWhispererCodeModernizerTestBa
 
         doNothing().whenever(testSessionStateSpy).updateJobHistory(any(), any(), any())
         val result = testSessionSpy.pollUntilJobCompletion(CodeTransformType.LANGUAGE_UPGRADE, jobId) { _, _ -> }
-        assertEquals(CodeModernizerJobCompletedResult.JobPartiallySucceeded(jobId, testSessionContextSpy.targetJavaVersion), result)
+        assertEquals(CodeModernizerJobCompletedResult.JobPartiallySucceeded(jobId), result)
         verify(clientAdaptorSpy, times(4)).getCodeModernizationJob(any())
         verify(clientAdaptorSpy, atLeastOnce()).getCodeModernizationPlan(any())
     }

plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/panels/managers/CodeModernizerBottomWindowPanelManagerTest.kt

@@ -32,6 +32,7 @@ class CodeModernizerBottomWindowPanelManagerTest : PanelTestBase() {
         val layout = codeModernizerBottomWindowPanelManagerMock.layout as BorderLayout
         assertThat(codeModernizerBottomWindowPanelManagerMock.toolbar.component.isVisible).isTrue()
         assertThat(codeModernizerBottomWindowPanelManagerMock.fullSizeLoadingPanel.isVisible).isTrue()
+        assertThat(codeModernizerBottomWindowPanelManagerMock.banner.isVisible).isTrue()
         assertThat(BorderLayout.WEST).isEqualTo(layout.getConstraints(codeModernizerBottomWindowPanelManagerMock.toolbar.component))
         assertThat(BorderLayout.NORTH).isEqualTo(layout.getConstraints(codeModernizerBottomWindowPanelManagerMock.banner))
         assertThat(layout.getLayoutComponent(BorderLayout.EAST)).isNull()