Merge branch 'main' into main

Author: leigaol

.changes/3.49.json

@@ -0,0 +1,8 @@
+{
+  "date" : "2025-01-17",
+  "version" : "3.49",
+  "entries" : [ {
+    "type" : "bugfix",
+    "description" : "/review: Improved success rate of code reviews for certain workspace configurations"
+  } ]
+}

.changes/next-release/bugfix-02a84512-83ae-4fbe-a527-292ba072e3e0.json

@@ -1,3 +1,6 @@
+# _3.49_ (2025-01-17)
+- **(Bug Fix)** /review: Improved success rate of code reviews for certain workspace configurations
+
 # _3.48_ (2025-01-16)
 - **(Feature)** Enhance Q inline completion context fetching for better suggestion quality
 - **(Feature)** /doc: Add error message if updated README is too large

CHANGELOG.md

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Toolkit Version
-toolkitVersion=3.49-SNAPSHOT
+toolkitVersion=3.50-SNAPSHOT
 
 # Publish Settings
 publishToken=

gradle.properties

@@ -686,6 +686,8 @@ class CodeTransformChatController(
             is CodeModernizerJobCompletedResult.Stopped, CodeModernizerJobCompletedResult.JobAbortedBeforeStarting -> handleCodeTransformStoppedByUser()
             is CodeModernizerJobCompletedResult.JobFailed -> handleCodeTransformJobFailed(result.failureReason)
             is CodeModernizerJobCompletedResult.JobFailedInitialBuild -> handleCodeTransformJobFailedPreBuild(result)
+            is CodeModernizerJobCompletedResult.RetryableFailure -> handleCodeTransformJobFailed(result.failureReason)
+            is CodeModernizerJobCompletedResult.UnableToCreateJob -> handleCodeTransformJobFailed(result.failureReason)
             else -> {
                 if (result is CodeModernizerJobCompletedResult.ZipUploadFailed && result.failureReason is UploadFailureReason.CREDENTIALS_EXPIRED) {
                     return

plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/controller/CodeTransformChatController.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) {

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/sessionconfig/CodeScanSessionConfig.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

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CodeWhispererConstants.kt

@@ -3,7 +3,10 @@
 
 package software.aws.toolkits.jetbrains.services.telemetry
 
-import com.intellij.openapi.components.service
+import com.intellij.openapi.Disposable
+import com.intellij.openapi.application.ApplicationManager
+import com.intellij.openapi.util.Disposer
+import com.intellij.testFramework.replaceService
 import org.junit.jupiter.api.extension.AfterEachCallback
 import org.junit.jupiter.api.extension.BeforeEachCallback
 import org.junit.jupiter.api.extension.ExtensionContext
@@ -13,13 +16,17 @@ import org.mockito.kotlin.spy
 import software.amazon.awssdk.services.toolkittelemetry.model.Sentiment
 import software.aws.toolkits.core.telemetry.DefaultTelemetryBatcher
 import software.aws.toolkits.core.telemetry.MetricEvent
+import software.aws.toolkits.core.telemetry.TelemetryBatcher
 import software.aws.toolkits.core.telemetry.TelemetryPublisher
 
-class NoOpTelemetryService : TelemetryService(publisher, spy(DefaultTelemetryBatcher(publisher))) {
+class NoOpTelemetryService : TelemetryService {
+    constructor(noOpPublisher: NoOpPublisher, batcher: TelemetryBatcher) : super(noOpPublisher, batcher)
+    constructor() : this(NO_OP_PUBLISHER, DefaultTelemetryBatcher(NO_OP_PUBLISHER))
+
     fun batcher() = super.batcher
 
-    private companion object {
-        private val publisher: TelemetryPublisher by lazy { NoOpPublisher() }
+    companion object {
+        val NO_OP_PUBLISHER = NoOpPublisher()
     }
 }
 
@@ -32,11 +39,21 @@ class NoOpPublisher : TelemetryPublisher {
 }
 
 sealed class MockTelemetryServiceBase : ExternalResource() {
-    private val mockTelemetryService: NoOpTelemetryService
-        get() = service<TelemetryService>() as NoOpTelemetryService
+    protected val publisher: NoOpPublisher by lazy { NoOpTelemetryService.NO_OP_PUBLISHER }
+    protected val batcher: TelemetryBatcher by lazy { spy(DefaultTelemetryBatcher(publisher)) }
+    private lateinit var disposableParent: Disposable
+
+    private val mockTelemetryService: NoOpTelemetryService by lazy { NoOpTelemetryService(publisher, batcher) }
+
+    override fun before() {
+        // hack because @TestDisposable doesn't work here as it's not a test
+        disposableParent = Disposer.newDisposable()
+        ApplicationManager.getApplication().replaceService(TelemetryService::class.java, mockTelemetryService, disposableParent)
+    }
 
     override fun after() {
         reset(batcher())
+        Disposer.dispose(disposableParent)
     }
 
     fun telemetryService() = mockTelemetryService