Merge master into feature/amazonqLSP

Author: aws-toolkit-automation

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

@@ -39,12 +39,13 @@ import {
     SecurityScanTimedOutError,
     UploadArtifactToS3Error,
 } from '../models/errors'
-import { getTelemetryReasonDesc } from '../../shared/errors'
+import { getTelemetryReasonDesc, isAwsError } from '../../shared/errors'
 import { CodeWhispererSettings } from '../util/codewhispererSettings'
 import { detectCommentAboveLine } from '../../shared/utilities/commentUtils'
 import { runtimeLanguageContext } from '../util/runtimeLanguageContext'
 import { FeatureUseCase } from '../models/constants'
 import { UploadTestArtifactToS3Error } from '../../amazonqTest/error'
+import { ChatSessionManager } from '../../amazonqTest/chat/storages/chatSession'
 
 export async function listScanResults(
     client: DefaultCodeWhispererClient,
@@ -386,6 +387,9 @@ export async function uploadArtifactToS3(
         } else {
             errorMessage = errorDesc ?? defaultMessage
         }
+        if (isAwsError(error) && featureUseCase === FeatureUseCase.TEST_GENERATION) {
+            ChatSessionManager.Instance.getSession().startTestGenerationRequestId = error.requestId
+        }
         throw isCodeScan ? new UploadArtifactToS3Error(errorMessage) : new UploadTestArtifactToS3Error(errorMessage)
     }
 }