fix(amazonq): show exact error message when job fails (#4494)

* fix(amazonq): show exact error message when job fails

* fix detekt issues

---------

Co-authored-by: David Hasani <davhasan@amazon.com>

Author: dhasani23

.changes/next-release/bugfix-af70014a-cb98-43dc-9262-9cc3a6cc4c0c.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Amazon Q Code Transformation: show exact error messages in chat when job fails"
+}

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

@@ -39,7 +39,7 @@ import java.nio.file.Path
 import java.time.Instant
 import java.util.concurrent.atomic.AtomicBoolean
 
-data class DownloadArtifactResult(val artifact: CodeModernizerArtifact?, val zipPath: String)
+data class DownloadArtifactResult(val artifact: CodeModernizerArtifact?, val zipPath: String, val errorMessage: String = "")
 
 class ArtifactHandler(private val project: Project, private val clientAdaptor: GumbyClient) {
     private val telemetry = CodeTransformTelemetryManager.getInstance(project)
@@ -51,7 +51,7 @@ class ArtifactHandler(private val project: Project, private val clientAdaptor: G
         if (isCurrentlyDownloading.get()) return
         val result = downloadArtifact(job)
         if (result.artifact == null) {
-            notifyUnableToApplyPatch(result.zipPath)
+            notifyUnableToApplyPatch(result.zipPath, result.errorMessage)
         } else {
             displayDiffUsingPatch(result.artifact.patch, job)
         }
@@ -123,7 +123,7 @@ class ArtifactHandler(private val project: Project, private val clientAdaptor: G
                     DownloadArtifactResult(artifact, zipPath)
                 } catch (e: RuntimeException) {
                     LOG.error { e.message.toString() }
-                    DownloadArtifactResult(null, zipPath)
+                    DownloadArtifactResult(null, zipPath, e.message.orEmpty())
                 }
             }
 
@@ -148,7 +148,7 @@ class ArtifactHandler(private val project: Project, private val clientAdaptor: G
             } catch (e: RuntimeException) {
                 LOG.error { e.message.toString() }
                 telemetryErrorMessage = "Unexpected error when downloading result ${e.localizedMessage}"
-                DownloadArtifactResult(null, zipPath)
+                DownloadArtifactResult(null, zipPath, e.message.orEmpty())
             } finally {
                 telemetry.jobArtifactDownloadAndDeserializeTime(
                     downloadStartTime,
@@ -158,7 +158,7 @@ class ArtifactHandler(private val project: Project, private val clientAdaptor: G
                 )
             }
         } catch (e: Exception) {
-            return DownloadArtifactResult(null, "")
+            return DownloadArtifactResult(null, "", e.message.orEmpty())
         } finally {
             isCurrentlyDownloading.set(false)
         }
@@ -194,11 +194,11 @@ class ArtifactHandler(private val project: Project, private val clientAdaptor: G
         }
     }
 
-    fun notifyUnableToApplyPatch(patchPath: String) {
+    fun notifyUnableToApplyPatch(patchPath: String, errorMessage: String) {
         LOG.error { "Unable to find patch for file: $patchPath" }
         notifyStickyWarn(
             message("codemodernizer.notification.warn.view_diff_failed.title"),
-            message("codemodernizer.notification.warn.view_diff_failed.content"),
+            message("codemodernizer.notification.warn.view_diff_failed.content", errorMessage),
             project,
             listOf(
                 openTroubleshootingGuideNotificationAction(

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

@@ -342,7 +342,7 @@ class CodeModernizerSession(
                 createUploadUrlResponse.kmsKeyArn().orEmpty(),
             ) { shouldStop.get() }
         } catch (e: Exception) {
-            val errorMessage = "Unexpected error when uploading artifact to S3: ${e.localizedMessage}"
+            val errorMessage = "Unexpected error when uploading artifact to S3: ${e.message}"
             LOG.error { errorMessage }
             // emit this metric here manually since we don't use callApi(), which emits its own metric
             telemetry.apiError(errorMessage, CodeTransformApiNames.UploadZip, createUploadUrlResponse.uploadId())
@@ -461,7 +461,7 @@ class CodeModernizerSession(
                 result.succeeded -> CodeModernizerJobCompletedResult.JobCompletedSuccessfully(jobId)
 
                 // Should not happen
-                else -> CodeModernizerJobCompletedResult.JobFailed(jobId, result.jobDetails?.reason())
+                else -> CodeModernizerJobCompletedResult.JobFailed(jobId, result.jobDetails?.reason().orEmpty())
             }
         } catch (e: Exception) {
             return when (e) {
@@ -474,7 +474,7 @@ class CodeModernizerSession(
                     LOG.error(e) { e.message.toString() }
                     CodeModernizerJobCompletedResult.RetryableFailure(
                         jobId,
-                        message("codemodernizer.notification.info.modernize_failed.connection_failed", e.localizedMessage),
+                        message("codemodernizer.notification.info.modernize_failed.connection_failed", e.message.orEmpty()),
                     )
                 }
             }

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

@@ -206,6 +206,7 @@ class GumbyClient(private val project: Project) {
             .connect { request -> // default connect timeout is 10s
                 val connection = request.connection as HttpURLConnection
                 connection.setFixedLengthStreamingMode(fileToUpload.length())
+                connection.readTimeout = 30 * 60 * 1000 // since pre-signed URL expiration was increased to 30 minutes
                 fileToUpload.inputStream().use { inputStream ->
                     connection.outputStream.use {
                         val bufferSize = 4096

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

@@ -268,7 +268,13 @@ fun buildTransformResultChatContent(result: CodeModernizerJobCompletedResult): C
             message("codemodernizer.chat.message.result.partially_success")
         }
         is CodeModernizerJobCompletedResult.JobFailed -> {
-            message("codemodernizer.chat.message.result.fail_with_known_reason", result.failureReason.orEmpty())
+            message("codemodernizer.chat.message.result.fail_with_known_reason", result.failureReason)
+        }
+        is CodeModernizerJobCompletedResult.UnableToCreateJob -> {
+            result.failureReason
+        }
+        is CodeModernizerJobCompletedResult.RetryableFailure -> {
+            result.failureReason
         }
         else -> {
             message("codemodernizer.chat.message.result.fail")

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

@@ -8,7 +8,7 @@ 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 JobFailed(val jobId: JobId, val failureReason: String) : CodeModernizerJobCompletedResult()
 
     data class JobCompletedSuccessfully(val jobId: JobId) : CodeModernizerJobCompletedResult()
     data class JobPartiallySucceeded(val jobId: JobId, val targetJavaVersion: JavaSdkVersion) : CodeModernizerJobCompletedResult()

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

@@ -39,11 +39,11 @@ class CodeWhispererCodeModernizerTest : CodeWhispererCodeModernizerTestBase() {
     fun `ArtifactHandler notifies users if patch does not exist`() = runBlocking {
         val handler = spy(ArtifactHandler(project, clientAdaptorSpy))
         val path = testCodeModernizerArtifact.zipPath
-        doNothing().whenever(handler).notifyUnableToApplyPatch(path)
+        doNothing().whenever(handler).notifyUnableToApplyPatch(path, "")
         val result = DownloadArtifactResult(null, path)
         doReturn(result).whenever(handler).downloadArtifact(any())
         handler.displayDiff(jobId)
-        verify(handler, times(1)).notifyUnableToApplyPatch(path)
+        verify(handler, times(1)).notifyUnableToApplyPatch(path, "")
     }
 
     @Test
@@ -54,7 +54,7 @@ class CodeWhispererCodeModernizerTest : CodeWhispererCodeModernizerTestBase() {
         doReturn(result).whenever(handler).downloadArtifact(any())
         doNothing().whenever(handler).displayDiffUsingPatch(any(), any())
         handler.displayDiff(jobId)
-        verify(handler, never()).notifyUnableToApplyPatch(path)
+        verify(handler, never()).notifyUnableToApplyPatch(path, "")
         verify(handler, times(1)).displayDiffUsingPatch(testCodeModernizerArtifact.patch, jobId)
     }
 

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

@@ -677,7 +677,7 @@ codemodernizer.notification.warn.submit_feedback=Submit feedback
 codemodernizer.notification.warn.unable_to_start_job=Amazon Q could not begin the transformation. Try starting the transformation again. {0}
 codemodernizer.notification.warn.unknown_start_failure=Amazon Q could not begin the transformation. Try starting the transformation again.
 codemodernizer.notification.warn.unknown_status_response=Amazon Q could not complete the transformation. Try starting the transformation again.
-codemodernizer.notification.warn.view_diff_failed.content=Amazon Q could not download and parse the diff with your upgraded code. Try downloading it again.
+codemodernizer.notification.warn.view_diff_failed.content=Amazon Q could not download and parse the diff with your upgraded code. Try downloading it again. {0}
 codemodernizer.notification.warn.view_diff_failed.title=Failed to download and parse diff
 codemodernizer.notification.warn.view_summary_failed.content=Unable to display the transformation summary due to an error.
 codemodernizer.notification.warn.view_summary_failed.title=Unable to display transformation summary