Addressing PR

Author: laileni-aws

packages/core/src/amazonqTest/chat/controller/controller.ts

@@ -295,30 +295,31 @@ export class TestController {
                     tabID,
                     'answer'
                 )
-            } else {
-                getLogger().error('Too many requests.')
+            }
+            if (error.message.includes('Too many requests')) {
+                getLogger().error(error.message)
                 return this.messenger.sendErrorMessage(tooManyRequestErrorMessage, tabID)
             }
         }
         if (isAwsError(error)) {
             if (error.code === 'ThrottlingException') {
                 // TODO: use the explicitly modeled exception reason for quota vs throttle{
-                getLogger().error('Too many requests.')
+                getLogger().error(error.message)
                 this.messenger.sendErrorMessage(tooManyRequestErrorMessage, tabID)
-            } else {
-                // other service errors:
-                // AccessDeniedException - should not happen because access is validated before this point in the client
-                // ValidationException - shouldn't happen because client should not send malformed requests
-                // ConflictException - should not happen because the client will maintain proper state
-                // InternalServerException - shouldn't happen but needs to be caught
-                getLogger().error('Other error message: %s', error.message)
-                this.messenger.sendErrorMessage('', tabID)
+                return
             }
-        } else {
-            // other unexpected errors (TODO enumerate all other failure cases)
-            getLogger().error('Other error message: %s', error.uiMessage)
+            // other service errors:
+            // AccessDeniedException - should not happen because access is validated before this point in the client
+            // ValidationException - shouldn't happen because client should not send malformed requests
+            // ConflictException - should not happen because the client will maintain proper state
+            // InternalServerException - shouldn't happen but needs to be caught
+            getLogger().error('Other error message: %s', error.message)
             this.messenger.sendErrorMessage('', tabID)
+            return
         }
+        // other unexpected errors (TODO enumerate all other failure cases)
+        getLogger().error('Other error message: %s', error.uiMessage)
+        this.messenger.sendErrorMessage('', tabID)
     }
 
     // This function handles actions if user clicked on any Button one of these cases will be executed

packages/core/src/amazonqTest/error.ts

@@ -4,7 +4,7 @@
  */
 import { ToolkitError } from '../shared/errors'
 
-export const techinalErrorCustomerFacingMessage =
+export const technicalErrorCustomerFacingMessage =
     'I am experiencing technical difficulties at the moment. Please try again in a few minutes.'
 const defaultTestGenErrorMessage = 'Amazon Q encountered an error while generating tests. Try again later.'
 export class TestGenError extends ToolkitError {
@@ -29,17 +29,17 @@ export class InvalidSourceZipError extends TestGenError {
 }
 export class CreateUploadUrlError extends TestGenError {
     constructor(errorMessage: string, errorCode: string) {
-        super(errorMessage, 'CreateUploadUrlError', errorCode, techinalErrorCustomerFacingMessage)
+        super(errorMessage, 'CreateUploadUrlError', errorCode, technicalErrorCustomerFacingMessage)
     }
 }
 export class UploadTestArtifactToS3Error extends TestGenError {
-    constructor(error: string) {
-        super(error, 'UploadTestArtifactToS3Error', '500', techinalErrorCustomerFacingMessage)
+    constructor(error: string, statusCode?: string) {
+        super(error, 'UploadTestArtifactToS3Error', statusCode ?? '400', technicalErrorCustomerFacingMessage)
     }
 }
 export class CreateTestJobError extends TestGenError {
     constructor(error: string, code: string) {
-        super(error, 'CreateTestJobError', code, techinalErrorCustomerFacingMessage)
+        super(error, 'CreateTestJobError', code, technicalErrorCustomerFacingMessage)
     }
 }
 export class TestGenTimedOutError extends TestGenError {
@@ -48,7 +48,7 @@ export class TestGenTimedOutError extends TestGenError {
             'Test generation failed. Amazon Q timed out.',
             'TestGenTimedOutError',
             '500',
-            techinalErrorCustomerFacingMessage
+            technicalErrorCustomerFacingMessage
         )
     }
 }
@@ -63,7 +63,7 @@ export class TestGenFailedError extends TestGenError {
             error ?? 'Test generation failed',
             'TestGenFailedError',
             code,
-            error ?? techinalErrorCustomerFacingMessage
+            error ?? technicalErrorCustomerFacingMessage
         )
     }
 }
@@ -73,7 +73,7 @@ export class ExportResultsArchiveError extends TestGenError {
             error ?? 'Test generation failed',
             'ExportResultsArchiveError',
             statusCode ?? '400',
-            techinalErrorCustomerFacingMessage
+            technicalErrorCustomerFacingMessage
         )
     }
 }

packages/core/src/codewhisperer/service/securityScanHandler.ts

@@ -384,7 +384,9 @@ export async function uploadArtifactToS3(
         } else {
             errorMessage = errorDesc ?? defaultMessage
         }
-        throw isCodeScan ? new UploadArtifactToS3Error(errorMessage) : new UploadTestArtifactToS3Error(errorMessage)
+        throw isCodeScan
+            ? new UploadArtifactToS3Error(errorMessage)
+            : new UploadTestArtifactToS3Error(errorMessage, (error as any).statusCode)
     }
 }