Avoid duplicate expired credential notifications for Q (#4450)

Author: breedloj

.changes/next-release/bugfix-e07306a5-b622-48e3-b3c1-0cb5b8ac90f8.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Amazon Q: Avoid duplicate credential expired notifications during startup"
+}

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanManager.kt

@@ -74,6 +74,7 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhisperer
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererUtil.promptReAuth
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.runIfIdcConnectionOrTelemetryEnabled
 import software.aws.toolkits.jetbrains.utils.isQConnected
+import software.aws.toolkits.jetbrains.utils.isQExpired
 import software.aws.toolkits.jetbrains.utils.isRunningOnRemoteBackend
 import software.aws.toolkits.resources.message
 import software.aws.toolkits.telemetry.Result
@@ -114,7 +115,10 @@ class CodeWhispererCodeScanManager(val project: Project) {
 
     private val isProjectScanInProgress = AtomicBoolean(false)
 
+    private val defaultScope = projectCoroutineScope(project)
+
     private lateinit var codeScanJob: Job
+    private lateinit var debouncedCodeScanJob: Job
 
     /**
      * Returns true if the code scan is in progress.
@@ -142,15 +146,22 @@ class CodeWhispererCodeScanManager(val project: Project) {
     /**
      * Triggers a code scan and displays results in the new tab in problems view panel.
      */
-    fun runCodeScan(scope: CodeWhispererConstants.CodeAnalysisScope) {
+    fun runCodeScan(scope: CodeWhispererConstants.CodeAnalysisScope, isPluginStarting: Boolean = false) {
         if (!isQConnected(project)) return
 
         // Return if a scan is already in progress.
         if (isProjectScanInProgress() && scope == CodeWhispererConstants.CodeAnalysisScope.PROJECT) return
-        if (promptReAuth(project)) {
+
+        val connectionExpired = if (isPluginStarting) {
+            isQExpired(project)
+        } else {
+            promptReAuth(project)
+        }
+        if (connectionExpired) {
             isProjectScanInProgress.set(false)
             return
         }
+
         //  If scope is project
         if (scope == CodeWhispererConstants.CodeAnalysisScope.PROJECT) {
             // Prepare for a project code scan
@@ -169,26 +180,24 @@ class CodeWhispererCodeScanManager(val project: Project) {
         }
     }
 
-    private fun createDebouncedRunCodeScan(
-        waitMs: Long = 300L,
-        coroutineScope: CoroutineScope
-    ): (CodeWhispererConstants.CodeAnalysisScope) -> Unit {
-        var debounceJob: Job? = null
-        return { param: CodeWhispererConstants.CodeAnalysisScope ->
-            debounceJob?.cancel()
-            debounceJob = coroutineScope.launch {
-                delay(waitMs)
-                runCodeScan(param)
-            }
+    /**
+     * Creates a debounced code scan job with a delay.
+     */
+    fun createDebouncedRunCodeScan(
+        scope: CodeWhispererConstants.CodeAnalysisScope,
+        isPluginStarting: Boolean = false,
+        waitMs: Long = CodeWhispererConstants.AUTO_SCAN_DEBOUNCE_DELAY_IN_SECONDS * 1000,
+        coroutineScope: CoroutineScope = defaultScope
+    ) {
+        if (this::debouncedCodeScanJob.isInitialized && debouncedCodeScanJob.isActive) {
+            debouncedCodeScanJob.cancel()
+        }
+        debouncedCodeScanJob = coroutineScope.launch {
+            delay(waitMs)
+            runCodeScan(scope, isPluginStarting)
         }
     }
 
-    val defaultScope = projectCoroutineScope(project)
-    val debouncedRunCodeScan = createDebouncedRunCodeScan(
-        waitMs = CodeWhispererConstants.AUTO_SCAN_DEBOUNCE_DELAY_IN_SECONDS * 1000,
-        coroutineScope = defaultScope
-    )
-
     fun stopCodeScan() {
         // Return if code scan job is not active.
         if (!codeScanJob.isActive) return

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/listeners/CodeWhispererCodeScanDocumentListener.kt

@@ -40,7 +40,7 @@ internal class CodeWhispererCodeScanDocumentListener(val project: Project) : Doc
         scanManager.updateScanNodes(file)
 
         if (editedTextRange.length > 0 && !CodeWhispererExplorerActionManager.getInstance().isMonthlyQuotaForCodeScansExceeded() && !isUserBuilderId(project)) {
-            scanManager.debouncedRunCodeScan(CodeWhispererConstants.CodeAnalysisScope.FILE)
+            scanManager.createDebouncedRunCodeScan(CodeWhispererConstants.CodeAnalysisScope.FILE)
         }
     }
 

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/listeners/CodeWhispererCodeScanFileListener.kt

@@ -14,7 +14,7 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhisperer
 internal class CodeWhispererCodeScanFileListener(val project: Project) : EditorFactoryListener {
     override fun editorCreated(event: EditorFactoryEvent) {
         if (!CodeWhispererExplorerActionManager.getInstance().isMonthlyQuotaForCodeScansExceeded() && !isUserBuilderId(project)) {
-            CodeWhispererCodeScanManager.getInstance(project).debouncedRunCodeScan(CodeWhispererConstants.CodeAnalysisScope.FILE)
+            CodeWhispererCodeScanManager.getInstance(project).createDebouncedRunCodeScan(CodeWhispererConstants.CodeAnalysisScope.FILE)
         }
     }
 }

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/codewhisperer/explorer/actions/ResumeCodeScans.kt

@@ -23,7 +23,7 @@ class ResumeCodeScans : DumbAwareAction(
         actionManager.setAutoCodeScan(project, true)
         //  Run Proactive Code File Scan once toggle is enabled
         if (!actionManager.isMonthlyQuotaForCodeScansExceeded() && !isUserBuilderId(project)) {
-            CodeWhispererCodeScanManager.getInstance(project).debouncedRunCodeScan(CodeWhispererConstants.CodeAnalysisScope.FILE)
+            CodeWhispererCodeScanManager.getInstance(project).createDebouncedRunCodeScan(CodeWhispererConstants.CodeAnalysisScope.FILE)
         }
     }
 }

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/codewhisperer/explorer/nodes/ResumeCodeScanNode.kt

@@ -25,7 +25,7 @@ class ResumeCodeScanNode(nodeProject: Project) : CodeWhispererActionNode(
 
         //  Run Proactive Code File Scan once toggle is enabled
         if (!actionManager.isMonthlyQuotaForCodeScansExceeded() && !isUserBuilderId(project)) {
-            CodeWhispererCodeScanManager.getInstance(project).debouncedRunCodeScan(CodeWhispererConstants.CodeAnalysisScope.FILE)
+            CodeWhispererCodeScanManager.getInstance(project).createDebouncedRunCodeScan(CodeWhispererConstants.CodeAnalysisScope.FILE)
         }
     }
 }

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/codewhisperer/startup/CodeWhispererProjectStartupActivity.kt

@@ -49,7 +49,7 @@ class CodeWhispererProjectStartupActivity : StartupActivity.DumbAware {
         scanManager.setEditorListeners()
         //  Run Proactive Code File Scan and disabling Auto File Scan for Builder ID Users.
         if (!isUserBuilderId(project)) {
-            scanManager.debouncedRunCodeScan(CodeWhispererConstants.CodeAnalysisScope.FILE)
+            scanManager.createDebouncedRunCodeScan(CodeWhispererConstants.CodeAnalysisScope.FILE, isPluginStarting = true)
         }
 
         // ---- Everything below will be triggered once after startup ----