further cleanup

Author: Will-ShaoHua

plugins/amazonq/codewhisperer/jetbrains-community/src/migration/software/aws/toolkits/jetbrains/services/codewhisperer/explorer/CodeWhispererExplorerActionManager.kt

@@ -20,9 +20,7 @@ import software.aws.toolkits.jetbrains.core.credentials.sso.bearer.BearerTokenPr
 import software.aws.toolkits.jetbrains.services.codewhisperer.credentials.CodeWhispererLoginType
 import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.CodeWhispererExploreActionState
 import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.CodeWhispererExploreStateType
-import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererUtil.getConnectionStartUrl
-import software.aws.toolkits.telemetry.AwsTelemetry
 
 // TODO: refactor this class, now it's managing action and state
 @State(name = "codewhispererStates", storages = [Storage("aws.xml")])
@@ -39,7 +37,10 @@ class CodeWhispererExplorerActionManager : PersistentStateComponent<CodeWhispere
 
     private fun getCodeWhispererConnectionStartUrl(project: Project): String {
         val connection = ToolkitConnectionManager.getInstance(project).activeConnectionForFeature(CodeWhispererConnection.getInstance())
-        return getConnectionStartUrl(connection) ?: CodeWhispererConstants.ACCOUNTLESS_START_URL
+        return getConnectionStartUrl(connection) ?: run {
+            LOG.warn { "fail to retrieve connection start url, not a bearer token connection" }
+            ""
+        }
     }
 
     fun isAutoEnabled(): Boolean = actionState.value.getOrDefault(CodeWhispererExploreStateType.IsAutoEnabled, true)
@@ -81,10 +82,8 @@ class CodeWhispererExplorerActionManager : PersistentStateComponent<CodeWhispere
     }
 
     // Adding Auto CodeScan Function
-    fun setAutoCodeScan(project: Project, isAutoEnabledForCodeScan: Boolean) {
+    fun setAutoCodeScan(isAutoEnabledForCodeScan: Boolean) {
         setAutoEnabledForCodeScan(isAutoEnabledForCodeScan)
-        val autoCodeScanState = if (isAutoEnabledForCodeScan) CodeWhispererConstants.AutoCodeScan.ACTIVATED else CodeWhispererConstants.AutoCodeScan.DEACTIVATED
-        AwsTelemetry.modifySetting(project, settingId = CodeWhispererConstants.AutoCodeScan.SETTING_ID, settingState = autoCodeScanState)
     }
 
     fun getIsFirstRestartAfterQInstall(): Boolean = actionState.value.getOrDefault(CodeWhispererExploreStateType.IsFirstRestartAfterQInstall, true)

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/explorer/actions/PauseCodeScans.kt

@@ -7,7 +7,9 @@ import com.intellij.icons.AllIcons
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.project.DumbAwareAction
 import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.CodeWhispererExplorerActionManager
+import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants
 import software.aws.toolkits.resources.message
+import software.aws.toolkits.telemetry.AwsTelemetry
 
 class PauseCodeScans : DumbAwareAction(
     { message("codewhisperer.explorer.pause_auto_scans") },
@@ -16,6 +18,11 @@ class PauseCodeScans : DumbAwareAction(
     override fun actionPerformed(e: AnActionEvent) {
         val project = e.project ?: return
 
-        CodeWhispererExplorerActionManager.getInstance().setAutoCodeScan(project, false)
+        CodeWhispererExplorerActionManager.getInstance().setAutoCodeScan(false)
+        AwsTelemetry.modifySetting(
+            project,
+            settingId = CodeWhispererConstants.AutoCodeScan.SETTING_ID,
+            settingState = CodeWhispererConstants.AutoCodeScan.DEACTIVATED
+        )
     }
 }

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/explorer/actions/ResumeCodeScans.kt

@@ -11,6 +11,7 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.CodeWhisp
 import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.isUserBuilderId
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants
 import software.aws.toolkits.resources.message
+import software.aws.toolkits.telemetry.AwsTelemetry
 
 class ResumeCodeScans : DumbAwareAction(
     { message("codewhisperer.explorer.resume_auto_scans") },
@@ -20,7 +21,12 @@ class ResumeCodeScans : DumbAwareAction(
         val project = e.project ?: return
 
         val actionManager = CodeWhispererExplorerActionManager.getInstance()
-        actionManager.setAutoCodeScan(project, true)
+        actionManager.setAutoCodeScan(true)
+        AwsTelemetry.modifySetting(
+            project,
+            settingId = CodeWhispererConstants.AutoCodeScan.SETTING_ID,
+            settingState = CodeWhispererConstants.AutoCodeScan.ACTIVATED
+        )
         //  Run Proactive Code File Scan once toggle is enabled
         if (actionManager.isAutoEnabledForCodeScan() && !actionManager.isMonthlyQuotaForCodeScansExceeded() && !isUserBuilderId(project)) {
             CodeWhispererCodeScanManager.getInstance(project).createDebouncedRunCodeScan(CodeWhispererConstants.CodeAnalysisScope.FILE)

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

@@ -86,7 +86,6 @@ object CodeWhispererConstants {
     const val TOTAL_BYTES_IN_MB = 1024 * 1024
     const val TOTAL_MILLIS_IN_SECOND = 1000
     const val TOTAL_SECONDS_IN_MINUTE: Long = 60L
-    const val ACCOUNTLESS_START_URL = "accountless"
     const val FEATURE_CONFIG_POLL_INTERVAL_IN_MS: Long = 30 * 60 * 1000L // 30 mins
     const val USING: String = "using"
     const val GLOBAL_USING: String = "global using"