From e9e2d8b27a15ec9aa386eee0b02122a97baf43db Mon Sep 17 00:00:00 2001 From: David <60020664+dhasani23@users.noreply.github.com> Date: Tue, 21 Jan 2025 17:37:15 -0800 Subject: [PATCH] fix(amazonq): check job status directly before completing (#5281) * fix(amazonq): check job status directly before completing * address comment --------- Co-authored-by: David Hasani --- .../services/codemodernizer/CodeModernizerSession.kt | 4 +++- .../panels/CodeModernizerJobHistoryPanelTest.kt | 3 ++- .../software/aws/toolkits/resources/MessagesBundle.properties | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeModernizerSession.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeModernizerSession.kt index 50ec1a935d..9ba17c22cb 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeModernizerSession.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeModernizerSession.kt @@ -533,7 +533,9 @@ class CodeModernizerSession( } } - result.succeeded -> CodeModernizerJobCompletedResult.JobCompletedSuccessfully(jobId) + result.state == TransformationStatus.COMPLETED -> { + CodeModernizerJobCompletedResult.JobCompletedSuccessfully(jobId) + } // Should not happen else -> CodeModernizerJobCompletedResult.JobFailed(jobId, result.jobDetails?.reason().orEmpty()) diff --git a/plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/panels/CodeModernizerJobHistoryPanelTest.kt b/plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/panels/CodeModernizerJobHistoryPanelTest.kt index bba969f91e..d736204350 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/panels/CodeModernizerJobHistoryPanelTest.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/panels/CodeModernizerJobHistoryPanelTest.kt @@ -9,6 +9,7 @@ import org.mockito.kotlin.spy import org.mockito.kotlin.times import org.mockito.kotlin.verify import software.aws.toolkits.jetbrains.services.codemodernizer.model.JobHistoryItem +import software.aws.toolkits.resources.message import java.time.Duration import java.time.Instant @@ -23,7 +24,7 @@ class CodeModernizerJobHistoryPanelTest { tablePanelMock.updateTableData(testData) verify(tablePanelMock, times(1)).setDefaultUI() verify(tablePanelMock, times(1)).updateTableData(testData) - assertThat(tablePanelMock.headerLabel.text).isEqualTo("Job status") + assertThat(tablePanelMock.headerLabel.text).isEqualTo(message("codemodernizer.toolwindow.job_status.header")) assertThat(tablePanelMock.jbTable.columnCount).isEqualTo(5) assertThat(tablePanelMock.jbTable.isEmpty).isFalse() assertThat(tablePanelMock.tableData).isEqualTo(testData) diff --git a/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties b/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties index 561361e352..38038b9b38 100644 --- a/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties +++ b/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties @@ -803,7 +803,7 @@ codemodernizer.toolwindow.banner.job_starting=Job is starting. codemodernizer.toolwindow.banner.no_ongoing_job=No job ongoing. codemodernizer.toolwindow.banner.run_scan_complete=All steps of transformation successful codemodernizer.toolwindow.banner.run_scan_info=Select 'Transform' in toolbar to upgrade this package. -codemodernizer.toolwindow.job_status.header=Job status +codemodernizer.toolwindow.job_status.header=Transformation status codemodernizer.toolwindow.label=Transformation Hub - {0} codemodernizer.toolwindow.label_no_job=Transformation Hub codemodernizer.toolwindow.problems_mvn_window_not_found=Unable to display Code Transform results as the Maven window cannot be fetched.