Merge branch 'main' into main

andrewyuq · web-flow · commit 05402f4d68e5 · 2024-10-10T09:31:28.000-07:00
diff --git a/.changes/next-release/bugfix-e43f051f-5a66-4a46-ac6f-3f351f76cf6e.json b/.changes/next-release/bugfix-e43f051f-5a66-4a46-ac6f-3f351f76cf6e.json
@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Fix inability to sign out in reauth view in Q chat panel"
+}
diff --git a/.changes/next-release/bugfix-e76aa3d8-3d9a-4887-8ce6-018ed4c7c443.json b/.changes/next-release/bugfix-e76aa3d8-3d9a-4887-8ce6-018ed4c7c443.json
@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Raise max `@workspace` indexing size to 4GB"
+}
diff --git a/.changes/next-release/feature-ac28b77d-4b47-4312-afe7-ece71de355ed.json b/.changes/next-release/feature-ac28b77d-4b47-4312-afe7-ece71de355ed.json
@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Automatically pause and resume `@workspace` indexing when OS CPU load is high"
+}
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QLoginWebview.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QLoginWebview.kt
@@ -6,6 +6,7 @@ package software.aws.toolkits.jetbrains.services.amazonq
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.DataContext
+import com.intellij.openapi.application.runInEdt
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.service
 import com.intellij.openapi.project.Project
@@ -177,13 +178,15 @@ class QWebviewBrowser(val project: Project, private val parentDisposable: Dispos
                     ToolkitConnectionManager.getInstance(project)
                         .activeConnectionForFeature(QConnection.getInstance()) as? AwsBearerTokenConnection
                     )?.let { connection ->
-                    SsoLogoutAction(connection).actionPerformed(
-                        AnActionEvent.createFromDataContext(
-                            "qBrowser",
-                            null,
-                            DataContext.EMPTY_CONTEXT
+                    runInEdt {
+                        SsoLogoutAction(connection).actionPerformed(
+                            AnActionEvent.createFromDataContext(
+                                "qBrowser",
+                                null,
+                                DataContext.EMPTY_CONTEXT
+                            )
                         )
-                    )
+                    }
                 }
             }
 
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/auth/AuthController.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/auth/AuthController.kt
@@ -88,7 +88,7 @@ class AuthController {
             AuthFollowUpType.FullAuth,
             -> runInEdt {
                 UiTelemetry.click(project, "amazonq_chatAuthenticate")
-                requestCredentialsForQ(project, connectionInitiatedFromQChatPanel = true)
+                requestCredentialsForQ(project, connectionInitiatedFromQChatPanel = true, isReauth = false)
             }
 
             AuthFollowUpType.ReAuth,
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/explorerActions/SignInToQAction.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/explorerActions/SignInToQAction.kt
@@ -24,7 +24,7 @@ class SignInToQAction : SignInToQActionBase(message("q.sign.in")) {
         UiTelemetry.click(project, "auth_start_Q")
 
         if (!isQWebviewsAvailable()) {
-            requestCredentialsForQ(project)
+            requestCredentialsForQ(project, isReauth = false)
         } else {
             ToolWindowManager.getInstance(project).getToolWindow(AmazonQToolWindowFactory.WINDOW_ID)?.show()
         }
@@ -42,7 +42,7 @@ abstract class SignInToQActionBase(actionName: String) : DumbAwareAction(actionN
             reauthConnectionIfNeeded(project, it, isReAuth = true)
         } ?: run {
             runInEdt {
-                if (requestCredentialsForQ(project)) {
+                if (requestCredentialsForQ(project, isReauth = false)) {
                     if (!openMeetQPage(project)) {
                         return@runInEdt
                     }
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/editor/context/project/manifest/ManifestManager.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/editor/context/project/manifest/ManifestManager.kt
@@ -15,7 +15,7 @@ import software.aws.toolkits.jetbrains.core.getTextFromUrl
 
 class ManifestManager {
     private val cloudFrontUrl = "https://aws-toolkit-language-servers.amazonaws.com/q-context/manifest.json"
-    val currentVersion = "0.1.10"
+    val currentVersion = "0.1.13"
     val currentOs = getOs()
     private val arch = CpuArch.CURRENT
     private val mapper = jacksonObjectMapper()
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/settings/CodeWhispererConfigurable.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/settings/CodeWhispererConfigurable.kt
@@ -124,7 +124,7 @@ class CodeWhispererConfigurable(private val project: Project) :
 
             row(message("aws.settings.codewhisperer.project_context_index_max_size")) {
                 intTextField(
-                    range = IntRange(1, 250)
+                    range = IntRange(1, 4096)
                 ).bindIntText(codeWhispererSettings::getProjectContextIndexMaxSize, codeWhispererSettings::setProjectContextIndexMaxSize)
                     .align(AlignX.FILL).apply {
                         connect.subscribe(
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/settings/CodeWhispererSettings.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/settings/CodeWhispererSettings.kt
@@ -87,7 +87,7 @@ class CodeWhispererSettings : PersistentStateComponent<CodeWhispererConfiguratio
 
     fun getProjectContextIndexMaxSize(): Int = state.intValue.getOrDefault(
         CodeWhispererIntConfigurationType.ProjectContextIndexMaxSize,
-        200
+        250
     )
 
     fun setProjectContextIndexMaxSize(value: Int) {
diff --git a/plugins/core/jetbrains-community/resources/telemetryOverride.json b/plugins/core/jetbrains-community/resources/telemetryOverride.json
@@ -810,50 +810,6 @@
                     "type": "authType"
                 }
             ]
-        },
-        {
-            "name": "auth_addConnection",
-            "description": "Captures the result of adding a new connection in the 'Add New Connection' workflow",
-            "metadata": [
-                {
-                    "type": "attempts",
-                    "required": false
-                },
-                {
-                    "type": "credentialSourceId"
-                },
-                {
-                    "type": "featureId",
-                    "required": false
-                },
-                {
-                    "type": "invalidInputFields",
-                    "required": false
-                },
-                {
-                    "type": "isAggregated",
-                    "required": false
-                },
-                {
-                    "type": "reason",
-                    "required": false
-                },
-                {
-                    "type": "result"
-                },
-                {
-                    "type": "source",
-                    "required": false
-                },
-                {
-                    "type": "credentialStartUrl",
-                    "required": false
-                },
-                {
-                    "type": "isReAuth",
-                    "required": false
-                }
-            ]
         }
     ]
 }
diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/actions/SsoLogoutAction.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/actions/SsoLogoutAction.kt
@@ -13,9 +13,11 @@ import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnectionManager
 import software.aws.toolkits.jetbrains.core.credentials.deleteSsoConnection
 import software.aws.toolkits.jetbrains.core.credentials.logoutFromSsoConnection
 import software.aws.toolkits.resources.AwsCoreBundle
+import software.aws.toolkits.telemetry.UiTelemetry
 
 class SsoLogoutAction(private val value: AwsBearerTokenConnection) : DumbAwareAction(AwsCoreBundle.message("credentials.individual_identity.signout")) {
     override fun actionPerformed(e: AnActionEvent) {
+        UiTelemetry.click(e.project, "signOut")
         if (value is ProfileSsoManagedBearerSsoConnection) {
             val confirmDeletion = MessageDialogBuilder.okCancel(
                 AwsCoreBundle.message("gettingstarted.auth.idc.sign.out.confirmation.title"),
diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/gettingstarted/GettingStartedAuthUtils.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/gettingstarted/GettingStartedAuthUtils.kt
@@ -36,6 +36,7 @@ fun requestCredentialsForCodeWhisperer(
     ),
     isFirstInstance: Boolean = false,
     connectionInitiatedFromExplorer: Boolean = false,
+    isReauth: Boolean = false,
 ): Boolean {
     val authenticationDialog = SetupAuthenticationDialog(
         project,
@@ -87,7 +88,8 @@ fun requestCredentialsForCodeWhisperer(
             credentialSourceId = authenticationDialog.authType,
             isAggregated = true,
             attempts = authenticationDialog.attempts + 1,
-            result = Result.Succeeded
+            result = Result.Succeeded,
+            isReAuth = isReauth
         )
         AuthTelemetry.addedConnections(
             project,
@@ -108,6 +110,7 @@ fun requestCredentialsForCodeWhisperer(
             isAggregated = false,
             attempts = authenticationDialog.attempts + 1,
             result = Result.Cancelled,
+            isReAuth = isReauth
         )
     }
     return isAuthenticationSuccessful
@@ -123,6 +126,7 @@ fun requestCredentialsForQ(
     isFirstInstance: Boolean = false,
     connectionInitiatedFromExplorer: Boolean = false,
     connectionInitiatedFromQChatPanel: Boolean = false,
+    isReauth: Boolean,
 ): Boolean {
     // try to scope upgrade if we have a codewhisperer connection
     val codeWhispererConnection = ToolkitConnectionManager.getInstance(project).activeConnectionForFeature(CodeWhispererConnection.getInstance())
@@ -194,7 +198,8 @@ fun requestCredentialsForQ(
             credentialSourceId = authenticationDialog.authType,
             isAggregated = true,
             attempts = authenticationDialog.attempts + 1,
-            result = Result.Succeeded
+            result = Result.Succeeded,
+            isReAuth = isReauth
         )
         AuthTelemetry.addedConnections(
             project,
@@ -215,6 +220,7 @@ fun requestCredentialsForQ(
             isAggregated = false,
             attempts = authenticationDialog.attempts + 1,
             result = Result.Cancelled,
+            isReAuth = isReauth
         )
     }
     return isAuthenticationSuccessful
diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/gettingstarted/SetupAuthenticationDialog.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/gettingstarted/SetupAuthenticationDialog.kt
@@ -287,7 +287,8 @@ class SetupAuthenticationDialog(
                         isAggregated = false,
                         attempts = ++attempts,
                         result = Result.Failed,
-                        reason = "ConnectionUnsuccessful"
+                        reason = "ConnectionUnsuccessful",
+                        isReAuth = false
                     )
                 } ?: return
 
@@ -339,7 +340,8 @@ class SetupAuthenticationDialog(
                         isAggregated = false,
                         attempts = ++attempts,
                         result = Result.Failed,
-                        reason = "DuplicateProfileName"
+                        reason = "DuplicateProfileName",
+                        isReAuth = false
                     )
                     return
                 }
@@ -365,7 +367,8 @@ class SetupAuthenticationDialog(
                         isAggregated = false,
                         attempts = ++attempts,
                         result = Result.Failed,
-                        reason = "InvalidCredentials"
+                        reason = "InvalidCredentials",
+                        isReAuth = false
                     )
                     return
                 }
@@ -438,7 +441,8 @@ class SetupAuthenticationDialog(
             isAggregated = false,
             attempts = ++attempts,
             result = Result.Failed,
-            reason = errorType
+            reason = errorType,
+            isReAuth = false
         )
 
         LOG.error(e) { errorMessage }
diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/gettingstarted/editor/GettingStartedPanelUtils.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/gettingstarted/editor/GettingStartedPanelUtils.kt
@@ -181,6 +181,7 @@ enum class SourceOfEntry {
     FIRST_STARTUP,
     Q,
     AMAZONQ_CHAT_PANEL,
+    LOGIN_BROWSER,
     UNKNOWN,
     ;
     override fun toString(): String {
diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/webview/LoginBrowser.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/webview/LoginBrowser.kt
@@ -39,6 +39,7 @@ import software.aws.toolkits.jetbrains.core.credentials.sono.SONO_URL
 import software.aws.toolkits.jetbrains.core.credentials.sso.PendingAuthorization
 import software.aws.toolkits.jetbrains.core.credentials.sso.bearer.InteractiveBearerTokenProvider
 import software.aws.toolkits.jetbrains.core.credentials.ssoErrorMessageFromException
+import software.aws.toolkits.jetbrains.core.gettingstarted.editor.SourceOfEntry
 import software.aws.toolkits.jetbrains.utils.pluginAwareExecuteOnPooledThread
 import software.aws.toolkits.jetbrains.utils.pollFor
 import software.aws.toolkits.resources.AwsCoreBundle
@@ -87,7 +88,7 @@ abstract class LoginBrowser(
 
     private var browserOpenTimer: Timer? = null
 
-    private fun startBrowserOpenTimer(startUrl: String, ssoRegion: String) {
+    private fun startBrowserOpenTimer(startUrl: String, ssoRegion: String, scopes: List<String>) {
         browserOpenTimer = Timer()
         browserOpenTimer?.schedule(
             object : TimerTask() {
@@ -103,7 +104,11 @@ abstract class LoginBrowser(
                     AuthTelemetry.addConnection(
                         result = Result.Failed,
                         reason = "Browser authentication idle for more than 15min",
-                        credentialSourceId = if (startUrl == SONO_URL) CredentialSourceId.AwsId else CredentialSourceId.IamIdentityCenter
+                        credentialSourceId = if (startUrl == SONO_URL) CredentialSourceId.AwsId else CredentialSourceId.IamIdentityCenter,
+                        isAggregated = false,
+                        source = SourceOfEntry.LOGIN_BROWSER.toString(),
+                        featureId = getFeatureId(scopes),
+                        isReAuth = isReAuth(scopes, startUrl)
                     )
                     stopAndClearBrowserOpenTimer()
                 }
@@ -121,7 +126,7 @@ abstract class LoginBrowser(
     }
 
     protected val onPendingToken: (InteractiveBearerTokenProvider) -> Unit = { provider ->
-        startBrowserOpenTimer(provider.startUrl, provider.region)
+        startBrowserOpenTimer(provider.startUrl, provider.region, provider.scopes)
         projectCoroutineScope(project).launch {
             val authorization = pollForAuthorization(provider)
             if (authorization != null) {
@@ -180,6 +185,7 @@ abstract class LoginBrowser(
 
     open fun loginBuilderId(scopes: List<String>) {
         val isReauth = isReAuth(scopes, SONO_URL)
+        val featureId = getFeatureId(scopes)
         val onError: (Exception) -> Unit = { e ->
             stopAndClearBrowserOpenTimer()
             isUserCancellation(e)
@@ -196,7 +202,10 @@ abstract class LoginBrowser(
                 result = Result.Failed,
                 credentialSourceId = CredentialSourceId.AwsId,
                 reason = e.message,
-                isReAuth = isReauth
+                isReAuth = isReauth,
+                featureId = featureId,
+                isAggregated = false,
+                source = SourceOfEntry.LOGIN_BROWSER.toString()
             )
         }
         val onSuccess: () -> Unit = {
@@ -212,7 +221,10 @@ abstract class LoginBrowser(
             AuthTelemetry.addConnection(
                 result = Result.Succeeded,
                 credentialSourceId = CredentialSourceId.AwsId,
-                isReAuth = isReauth
+                isReAuth = isReauth,
+                featureId = featureId,
+                isAggregated = true,
+                source = SourceOfEntry.LOGIN_BROWSER.toString()
             )
         }
 
@@ -239,7 +251,7 @@ abstract class LoginBrowser(
         region: AwsRegion,
     ): Pair<(Exception) -> Unit, () -> Unit> {
         val isReAuth = isReAuth(scopes, url)
-
+        val featureId = getFeatureId(scopes)
         val onError: (Exception) -> Unit = { e ->
             stopAndClearBrowserOpenTimer()
             val message = ssoErrorMessageFromException(e)
@@ -269,6 +281,9 @@ abstract class LoginBrowser(
                 credentialSourceId = CredentialSourceId.IamIdentityCenter,
                 reason = message,
                 isReAuth = isReAuth,
+                featureId = featureId,
+                isAggregated = false,
+                source = SourceOfEntry.LOGIN_BROWSER.toString()
             )
         }
         val onSuccess: () -> Unit = {
@@ -286,7 +301,10 @@ abstract class LoginBrowser(
                 project = null,
                 result = Result.Succeeded,
                 isReAuth = isReAuth,
-                credentialSourceId = CredentialSourceId.IamIdentityCenter
+                credentialSourceId = CredentialSourceId.IamIdentityCenter,
+                featureId = featureId,
+                isAggregated = true,
+                source = SourceOfEntry.LOGIN_BROWSER.toString()
             )
         }
         return Pair(onError, onSuccess)
diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/webview/WebviewTelemetryUtils.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/webview/WebviewTelemetryUtils.kt
@@ -4,7 +4,10 @@
 package software.aws.toolkits.jetbrains.core.webview
 
 import com.intellij.openapi.util.registry.Registry
+import software.aws.toolkits.jetbrains.core.credentials.sono.CODECATALYST_SCOPES
+import software.aws.toolkits.jetbrains.core.credentials.sono.Q_SCOPES
 import software.aws.toolkits.telemetry.AuthType
+import software.aws.toolkits.telemetry.FeatureId
 
 fun getAuthType(region: String = "us-east-1"): AuthType {
     val isCommercialRegion = !region.startsWith("us-gov") && !region.startsWith("us-iso") && !region.startsWith("cn")
@@ -14,3 +17,12 @@ fun getAuthType(region: String = "us-east-1"): AuthType {
         return AuthType.DeviceCode
     }
 }
+
+fun getFeatureId(scopes: List<String>): FeatureId =
+    if (scopes.intersect(Q_SCOPES.toSet()).isNotEmpty()) {
+        FeatureId.Q
+    } else if (scopes.intersect(CODECATALYST_SCOPES.toSet()).isNotEmpty()) {
+        FeatureId.Codecatalyst
+    } else {
+        FeatureId.AwsExplorer
+    }
diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/gettingstarted/GettingStartedOnStartup.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/gettingstarted/GettingStartedOnStartup.kt
diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/gettingstarted/ToolkitGettingStartedAuthUtils.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/gettingstarted/ToolkitGettingStartedAuthUtils.kt
diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/gettingstarted/editor/GettingStartedPanel.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/gettingstarted/editor/GettingStartedPanel.kt

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "type" : "bugfix",
 +  "description" : "Fix inability to sign out in reauth view in Q chat panel"
 +}
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ class AuthController {`
`88`	`88`	`AuthFollowUpType.FullAuth,`
`89`	`89`	`-> runInEdt {`
`90`	`90`	`UiTelemetry.click(project, "amazonq_chatAuthenticate")`
`91`		`- requestCredentialsForQ(project, connectionInitiatedFromQChatPanel = true)`
	`91`	`+ requestCredentialsForQ(project, connectionInitiatedFromQChatPanel = true, isReauth = false)`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`AuthFollowUpType.ReAuth,`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ class CodeWhispererSettings : PersistentStateComponent<CodeWhispererConfiguratio`
`87`	`87`
`88`	`88`	`fun getProjectContextIndexMaxSize(): Int = state.intValue.getOrDefault(`
`89`	`89`	`CodeWhispererIntConfigurationType.ProjectContextIndexMaxSize,`
`90`		`- 200`
	`90`	`+ 250`
`91`	`91`	`)`
`92`	`92`
`93`	`93`	`fun setProjectContextIndexMaxSize(value: Int) {`