Addressing comments

Author: laileni-aws

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/CodeWhispererUTGChatManager.kt

@@ -39,7 +39,6 @@ import software.aws.toolkits.jetbrains.services.amazonqCodeTest.session.Session
 import software.aws.toolkits.jetbrains.services.amazonqCodeTest.utils.combineBuildAndExecuteLogFiles
 import software.aws.toolkits.jetbrains.services.codemodernizer.utils.calculateTotalLatency
 import software.aws.toolkits.jetbrains.services.codewhisperer.codetest.CodeTestException
-import software.aws.toolkits.jetbrains.services.codewhisperer.codetest.codeTestServerException
 import software.aws.toolkits.jetbrains.services.codewhisperer.codetest.sessionconfig.CodeTestSessionConfig
 import software.aws.toolkits.jetbrains.services.codewhisperer.codetest.testGenStoppedError
 import software.aws.toolkits.jetbrains.services.codewhisperer.credentials.CodeWhispererClientAdaptor
@@ -135,7 +134,7 @@ class CodeWhispererUTGChatManager(val project: Project, private val cs: Coroutin
             }
             LOG.error(e) { "Unexpected error while creating test generation job" }
             val errorMessage = getTelemetryErrorMessage(e, CodeWhispererConstants.FeatureName.TEST_GENERATION)
-            codeTestServerException(
+            throw CodeTestException(
                 "CreateTestJobError: $errorMessage",
                 statusCode,
                 "CreateTestJobError",
@@ -194,7 +193,7 @@ class CodeWhispererUTGChatManager(val project: Project, private val cs: Coroutin
                     // update test summary card
                 } else {
                     // If job status is Completed and has no ShortAnswer then there might be some issue in the backend.
-                    codeTestServerException(
+                    throw CodeTestException(
                         "TestGenFailedError: " + message("testgen.message.failed"),
                         500,
                         "TestGenFailedError",
@@ -209,12 +208,12 @@ class CodeWhispererUTGChatManager(val project: Project, private val cs: Coroutin
                 if (testGenerationResponse.testGenerationJob().shortAnswer() != null) {
                     shortAnswer = parseShortAnswerString(testGenerationResponse.testGenerationJob().shortAnswer())
                     if (shortAnswer.stopIteration == "true") {
-                        codeTestServerException("TestGenFailedError: ${shortAnswer.planSummary}", 400, "TestGenFailedError", shortAnswer.planSummary)
+                        throw CodeTestException("TestGenFailedError: ${shortAnswer.planSummary}", 400, "TestGenFailedError", shortAnswer.planSummary)
                     }
                 }
 
                 // If job status is Failed and has no ShortAnswer then there might be some issue in the backend.
-                codeTestServerException(
+                throw CodeTestException(
                     "TestGenFailedError: " + message("testgen.message.failed"),
                     500,
                     "TestGenFailedError",
@@ -231,7 +230,7 @@ class CodeWhispererUTGChatManager(val project: Project, private val cs: Coroutin
                 if (previousIterationContext == null && testGenerationResponse.testGenerationJob().shortAnswer() != null) {
                     shortAnswer = parseShortAnswerString(testGenerationResponse.testGenerationJob().shortAnswer())
                     if (shortAnswer.stopIteration == "true") {
-                        codeTestServerException("TestGenFailedError: ${shortAnswer.planSummary}", 400, "TestGenFailedError", shortAnswer.planSummary)
+                        throw CodeTestException("TestGenFailedError: ${shortAnswer.planSummary}", 400, "TestGenFailedError", shortAnswer.planSummary)
                     }
                     codeTestChatHelper.updateAnswer(
                         CodeTestChatMessageContent(
@@ -263,7 +262,7 @@ class CodeWhispererUTGChatManager(val project: Project, private val cs: Coroutin
             },
             { e ->
                 LOG.error(e) { "ExportResultArchive failed: ${e.message}" }
-                codeTestServerException(
+                throw CodeTestException(
                     "ExportResultsArchiveError: ${e.message}",
                     500,
                     "ExportResultsArchiveError",

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codetest/CodeTestException.kt

@@ -32,15 +32,5 @@ internal fun cannotFindBuildArtifacts(errorMessage: String): Nothing =
 internal fun invalidSourceZipError(): Nothing =
     throw CodeTestException(message("codewhisperer.codescan.invalid_source_zip_telemetry"), 400, "InvalidSourceZipError")
 
-fun codeTestServerException(
-    errorMessage: String,
-    statusCode: Int,
-    code: String? = "DefaultError",
-    uiMessage: String? = message(
-        "testgen.error.generic_technical_error_message"
-    ),
-): Nothing =
-    throw CodeTestException(errorMessage, statusCode, code, uiMessage)
-
 fun testGenStoppedError(): Nothing =
     throw CodeTestException(message("testgen.message.cancelled"), 400, "TestGenCancelled", message("testgen.message.cancelled"))

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CodeWhispererZipUploadManager.kt

@@ -27,7 +27,7 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.CodeWhisp
 import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.CodeWhispererCodeScanSession.Companion.SERVER_SIDE_ENCRYPTION_CONTEXT
 import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.codeScanServerException
 import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.invalidSourceZipError
-import software.aws.toolkits.jetbrains.services.codewhisperer.codetest.codeTestServerException
+import software.aws.toolkits.jetbrains.services.codewhisperer.codetest.CodeTestException
 import software.aws.toolkits.jetbrains.services.codewhisperer.credentials.CodeWhispererClientAdaptor
 import software.aws.toolkits.resources.message
 import java.io.File
@@ -108,7 +108,7 @@ class CodeWhispererZipUploadManager(private val project: Project) {
             val errorMessage = getTelemetryErrorMessage(e, featureUseCase)
             when (featureUseCase) {
                 CodeWhispererConstants.FeatureName.CODE_REVIEW -> codeScanServerException("CreateUploadUrlException: $errorMessage")
-                CodeWhispererConstants.FeatureName.TEST_GENERATION -> codeTestServerException(
+                CodeWhispererConstants.FeatureName.TEST_GENERATION -> throw CodeTestException(
                     "UploadTestArtifactToS3Error: $errorMessage",
                     403,
                     "UploadTestArtifactToS3Error",
@@ -146,7 +146,7 @@ class CodeWhispererZipUploadManager(private val project: Project) {
         val errorMessage = getTelemetryErrorMessage(e, featureUseCase)
         when (featureUseCase) {
             CodeWhispererConstants.FeatureName.CODE_REVIEW -> codeScanServerException("CreateUploadUrlException: $errorMessage")
-            CodeWhispererConstants.FeatureName.TEST_GENERATION -> codeTestServerException(
+            CodeWhispererConstants.FeatureName.TEST_GENERATION -> throw CodeTestException(
                 "CreateUploadUrlError: $errorMessage",
                 500,
                 "CreateUploadUrlError",