Skip to content

fix(amazonq): increase scan timeout threshold #6765

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 11, 2025
Merged

fix(amazonq): increase scan timeout threshold #6765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e5fa4a
fix(amazonq): increase scan timeout threshold
zuoyaofu Mar 11, 2025
a19b025
change test to accomodate for time out changes
zuoyaofu Mar 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions packages/amazonq/.changes/next-release/Bug Fix-4f680a31-ba5e-4baa-9984-666e0c1c2b72.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type": "Bug Fix",
"description": "increase scan timeout to reduce front-end timeout errors"
}
5 changes: 3 additions & 2 deletions packages/amazonq/test/unit/codewhisperer/service/securityScanHandler.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/codewhisperer/models/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor

@nkomonen-amazon nkomonen-amazon Mar 11, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: I typically prefer breaking down the calculation for better readability, 60_000 * 15


export const expressScanTimeoutMs = 60_000

Expand Down
Loading