From 230d4be64997fb4324045fd1dee2224aa03efd17 Mon Sep 17 00:00:00 2001 From: Tai Lai Date: Fri, 17 Jan 2025 13:57:19 -0800 Subject: [PATCH] config(amazonq): lower timeout for auto reviews --- .../codescan/sessionconfig/CodeScanSessionConfig.kt | 10 ++++++---- .../codewhisperer/util/CodeWhispererConstants.kt | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/sessionconfig/CodeScanSessionConfig.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/sessionconfig/CodeScanSessionConfig.kt index d3d9524720f..2722d45f988 100644 --- a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/sessionconfig/CodeScanSessionConfig.kt +++ b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/sessionconfig/CodeScanSessionConfig.kt @@ -36,8 +36,8 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhisperer import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.CodeAnalysisScope import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.DEFAULT_CODE_SCAN_TIMEOUT_IN_SECONDS import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.DEFAULT_PAYLOAD_LIMIT_IN_BYTES +import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.EXPRESS_SCAN_TIMEOUT_IN_SECONDS import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.FILE_SCAN_PAYLOAD_SIZE_LIMIT_IN_BYTES -import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.FILE_SCAN_TIMEOUT_IN_SECONDS import software.aws.toolkits.jetbrains.services.codewhisperer.util.isWithin import software.aws.toolkits.resources.message import software.aws.toolkits.telemetry.CodewhispererLanguage @@ -68,9 +68,11 @@ class CodeScanSessionConfig( /** * Timeout for the overall job - "Run Security Scan". */ - fun overallJobTimeoutInSeconds(): Long = when (scope) { - CodeAnalysisScope.FILE -> FILE_SCAN_TIMEOUT_IN_SECONDS - else -> DEFAULT_CODE_SCAN_TIMEOUT_IN_SECONDS + fun overallJobTimeoutInSeconds(): Long { + if (scope == CodeAnalysisScope.FILE && !initiatedByChat) { + return EXPRESS_SCAN_TIMEOUT_IN_SECONDS + } + return DEFAULT_CODE_SCAN_TIMEOUT_IN_SECONDS } fun getPayloadLimitInBytes(): Long = when (scope) { diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CodeWhispererConstants.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CodeWhispererConstants.kt index d17e82aa404..4f42d57dd98 100644 --- a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CodeWhispererConstants.kt +++ b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CodeWhispererConstants.kt @@ -76,7 +76,7 @@ object CodeWhispererConstants { const val FILE_SCAN_INITIAL_POLLING_INTERVAL_IN_SECONDS: Long = 10 const val PROJECT_SCAN_INITIAL_POLLING_INTERVAL_IN_SECONDS: Long = 30 const val CODE_SCAN_CREATE_PAYLOAD_TIMEOUT_IN_SECONDS: Long = 10 - const val FILE_SCAN_TIMEOUT_IN_SECONDS: Long = 60 * 10 // 10 minutes + const val EXPRESS_SCAN_TIMEOUT_IN_SECONDS: Long = 60 const val FILE_SCAN_PAYLOAD_SIZE_LIMIT_IN_BYTES: Long = 1024 * 200 // 200KB const val AUTO_SCAN_DEBOUNCE_DELAY_IN_SECONDS: Long = 30 const val CODE_FIX_CREATE_PAYLOAD_TIMEOUT_IN_SECONDS: Long = 10