From 6e5fa4a602a2c40feab4561d059900c1772848de Mon Sep 17 00:00:00 2001 From: Yaofu Zuo Date: Tue, 11 Mar 2025 13:48:58 -0700 Subject: [PATCH 1/2] fix(amazonq): increase scan timeout threshold --- .../Bug Fix-4f680a31-ba5e-4baa-9984-666e0c1c2b72.json | 4 ++++ packages/core/src/codewhisperer/models/constants.ts | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 packages/amazonq/.changes/next-release/Bug Fix-4f680a31-ba5e-4baa-9984-666e0c1c2b72.json diff --git a/packages/amazonq/.changes/next-release/Bug Fix-4f680a31-ba5e-4baa-9984-666e0c1c2b72.json b/packages/amazonq/.changes/next-release/Bug Fix-4f680a31-ba5e-4baa-9984-666e0c1c2b72.json new file mode 100644 index 00000000000..eb4af6e5f17 --- /dev/null +++ b/packages/amazonq/.changes/next-release/Bug Fix-4f680a31-ba5e-4baa-9984-666e0c1c2b72.json @@ -0,0 +1,4 @@ +{ + "type": "Bug Fix", + "description": "increase scan timeout to reduce front-end timeout errors" +} diff --git a/packages/core/src/codewhisperer/models/constants.ts b/packages/core/src/codewhisperer/models/constants.ts index a52f451f79a..f91c5db59c1 100644 --- a/packages/core/src/codewhisperer/models/constants.ts +++ b/packages/core/src/codewhisperer/models/constants.ts @@ -261,7 +261,7 @@ export const codeScanZipExt = '.zip' export const contextTruncationTimeoutSeconds = 10 -export const standardScanTimeoutMs = 600_000 // 10 minutes +export const standardScanTimeoutMs = 900_000 // 15 minutes export const expressScanTimeoutMs = 60_000 From a19b0255d6c22259e10c77f01b941df809c56105 Mon Sep 17 00:00:00 2001 From: Yaofu Zuo Date: Tue, 11 Mar 2025 14:09:57 -0700 Subject: [PATCH 2/2] change test to accomodate for time out changes --- .../unit/codewhisperer/service/securityScanHandler.test.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/amazonq/test/unit/codewhisperer/service/securityScanHandler.test.ts b/packages/amazonq/test/unit/codewhisperer/service/securityScanHandler.test.ts index 41e3c1d42e2..7baab67200b 100644 --- a/packages/amazonq/test/unit/codewhisperer/service/securityScanHandler.test.ts +++ b/packages/amazonq/test/unit/codewhisperer/service/securityScanHandler.test.ts @@ -15,6 +15,7 @@ import { ListCodeScanFindingsResponse, pollScanJobStatus, SecurityScanTimedOutError, + CodeWhispererConstants, } from 'aws-core-vscode/codewhisperer' import { timeoutUtils } from 'aws-core-vscode/shared' import assert from 'assert' @@ -303,7 +304,7 @@ describe('securityScanHandler', function () { const pollPromise = pollScanJobStatus(mockClient, mockJobId, CodeAnalysisScope.FILE_AUTO, mockStartTime) - const expectedTimeoutMs = 60_000 + const expectedTimeoutMs = CodeWhispererConstants.expressScanTimeoutMs clock.tick(expectedTimeoutMs + 1000) await assert.rejects(() => pollPromise, SecurityScanTimedOutError) @@ -314,7 +315,7 @@ describe('securityScanHandler', function () { const pollPromise = pollScanJobStatus(mockClient, mockJobId, CodeAnalysisScope.PROJECT, mockStartTime) - const expectedTimeoutMs = 600_000 + const expectedTimeoutMs = CodeWhispererConstants.standardScanTimeoutMs clock.tick(expectedTimeoutMs + 1000) await assert.rejects(() => pollPromise, SecurityScanTimedOutError)