fix(amazonq): cache the listAvailableProfiles result

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QLoginWebview.kt

@@ -264,24 +264,6 @@ class QWebviewBrowser(val project: Project, private val parentDisposable: Dispos
         // TODO: pass "REAUTH" if connection expires
         // Perform the potentially blocking AWS call outside the EDT to fetch available region profiles.
         ApplicationManager.getApplication().executeOnPooledThread {
-            var errorMessage: String? = null
-            val profiles: List<QRegionProfile> = try {
-                QRegionProfileManager.getInstance().listRegionProfiles(project).orEmpty()
-            } catch (e: Exception) {
-                errorMessage = e.message
-                LOG.warn { "Failed to call listRegionProfiles API" }
-                val qConn = ToolkitConnectionManager.getInstance(project).activeConnectionForFeature(QConnection.getInstance())
-                Telemetry.amazonq.didSelectProfile.use { span ->
-                    span.source(QProfileSwitchIntent.Auth.value)
-                        .amazonQProfileRegion(QRegionProfileManager.getInstance().activeProfile(project)?.region ?: "not-set")
-                        .ssoRegion((qConn as? AwsBearerTokenConnection)?.region)
-                        .credentialStartUrl((qConn as? AwsBearerTokenConnection)?.startUrl)
-                        .result(MetricResult.Failed)
-                        .reason(e.message)
-                }
-                emptyList()
-            }
-
             val stage = if (isQExpired(project)) {
                 "REAUTH"
             } else if (isQConnected(project) && QRegionProfileManager.getInstance().isPendingProfileSelection(project)) {
@@ -290,6 +272,27 @@ class QWebviewBrowser(val project: Project, private val parentDisposable: Dispos
                 "START"
             }
 
+            var errorMessage: String? = null
+            var profiles: List<QRegionProfile> = emptyList()
+
+            if (stage == "PROFILE_SELECT") {
+                try {
+                    profiles = QRegionProfileManager.getInstance().listRegionProfiles(project).orEmpty()
+                } catch (e: Exception) {
+                    errorMessage = e.message
+                    LOG.warn { "Failed to call listRegionProfiles API" }
+                    val qConn = ToolkitConnectionManager.getInstance(project).activeConnectionForFeature(QConnection.getInstance())
+                    Telemetry.amazonq.didSelectProfile.use { span ->
+                        span.source(QProfileSwitchIntent.Auth.value)
+                            .amazonQProfileRegion(QRegionProfileManager.getInstance().activeProfile(project)?.region ?: "not-set")
+                            .ssoRegion((qConn as? AwsBearerTokenConnection)?.region)
+                            .credentialStartUrl((qConn as? AwsBearerTokenConnection)?.startUrl)
+                            .result(MetricResult.Failed)
+                            .reason(e.message)
+                    }
+                }
+            }
+
             val jsonData = """
             {
                 stage: '$stage',

plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/QRegionProfileManagerTest.kt

@@ -124,36 +124,7 @@ class QRegionProfileManagerTest {
         assertThat(cnt).isEqualTo(2)
     }
 
-    @Test
-    fun `listProfiles will call each client to get profiles`() {
-        val client = clientRule.create<CodeWhispererRuntimeClient>()
-        val mockResponse: SdkIterable<Profile> = SdkIterable<Profile> {
-            listOf(
-                Profile.builder().profileName("FOO").arn("foo").build(),
-            ).toMutableList().iterator()
-        }
-
-        val mockResponse2: SdkIterable<Profile> = SdkIterable<Profile> {
-            listOf(
-                Profile.builder().profileName("BAR").arn("bar").build(),
-            ).toMutableList().iterator()
-        }
-
-        val iterable: ListAvailableProfilesIterable = mock {
-            on { it.profiles() } doReturn mockResponse doReturn mockResponse2
-        }
-
-        // TODO: not sure if we can mock client with different region different response?
-        client.stub {
-            onGeneric { listAvailableProfilesPaginator(any<Consumer<ListAvailableProfilesRequest.Builder>>()) } doReturn iterable
-        }
-
-        val r = sut.listRegionProfiles(project)
-        assertThat(r).hasSize(2)
-
-        assertThat(r).contains(QRegionProfile("FOO", "foo"))
-        assertThat(r).contains(QRegionProfile("BAR", "bar"))
-    }
+    // TODO: Add two unit tests for listProfiles — one with cache hit, one without
 
     @Test
     fun `validateProfile should cross validate selected profile with latest API response for current project and remove it if its not longer accessible`() {

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/profile/QProfileResources.kt

@@ -0,0 +1,39 @@
+// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.services.amazonq.profile
+
+import software.amazon.awssdk.services.codewhispererruntime.CodeWhispererRuntimeClient
+import software.aws.toolkits.core.ClientConnectionSettings
+import software.aws.toolkits.jetbrains.core.AwsClientManager
+import software.aws.toolkits.jetbrains.core.Resource
+import software.aws.toolkits.jetbrains.core.region.AwsRegionProvider
+import java.time.Duration
+
+/**
+ * Save Amazon Q Profile Resource Cache
+ */
+object QProfileResources {
+    /**
+     * save available Q Profile list as cache with default duration 60 s。
+     */
+    val LIST_REGION_PROFILES = object : Resource.Cached<List<QRegionProfile>>() {
+        override val id: String = "amazonq.allProfiles"
+
+        override fun fetch(connectionSettings: ClientConnectionSettings<*>): List<QRegionProfile> {
+            val mappedProfiles = QEndpoints.listRegionEndpoints().flatMap { (regionKey, _) ->
+                val awsRegion = AwsRegionProvider.getInstance()[regionKey] ?: return@flatMap emptyList()
+                val client = AwsClientManager
+                    .getInstance()
+                    .getClient(CodeWhispererRuntimeClient::class, connectionSettings.withRegion(awsRegion))
+
+                client.listAvailableProfilesPaginator {}
+                    .profiles()
+                    .map { p -> QRegionProfile(arn = p.arn(), profileName = p.profileName() ?: "<no name>") }
+            }
+            return mappedProfiles
+        }
+
+        override fun expiry(): Duration = Duration.ofSeconds(60)
+    }
+}

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/profile/QRegionProfileManager.kt

@@ -14,14 +14,13 @@ import com.intellij.openapi.project.Project
 import com.intellij.util.xmlb.annotations.MapAnnotation
 import com.intellij.util.xmlb.annotations.Property
 import software.amazon.awssdk.core.SdkClient
-import software.amazon.awssdk.services.codewhispererruntime.CodeWhispererRuntimeClient
 import software.aws.toolkits.core.TokenConnectionSettings
 import software.aws.toolkits.core.utils.debug
 import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.core.utils.tryOrNull
 import software.aws.toolkits.core.utils.warn
 import software.aws.toolkits.jetbrains.core.AwsClientManager
-import software.aws.toolkits.jetbrains.core.awsClient
+import software.aws.toolkits.jetbrains.core.AwsResourceCache
 import software.aws.toolkits.jetbrains.core.credentials.AwsBearerTokenConnection
 import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnectionManager
 import software.aws.toolkits.jetbrains.core.credentials.pinning.QConnection
@@ -31,6 +30,7 @@ import software.aws.toolkits.jetbrains.utils.notifyInfo
 import software.aws.toolkits.resources.AmazonQBundle.message
 import software.aws.toolkits.telemetry.MetricResult
 import software.aws.toolkits.telemetry.Telemetry
+import java.time.Duration
 import java.util.Collections
 import kotlin.reflect.KClass
 
@@ -66,16 +66,14 @@ class QRegionProfileManager : PersistentStateComponent<QProfileState>, Disposabl
     fun listRegionProfiles(project: Project): List<QRegionProfile>? {
         val connection = getIdcConnectionOrNull(project) ?: return null
         return try {
-            val mappedProfiles = QEndpoints.listRegionEndpoints()
-                .flatMap { (regionKey, _) ->
-                    val awsRegion = AwsRegionProvider.getInstance()[regionKey] ?: return@flatMap emptyList()
-                    connection.getConnectionSettings()
-                        .withRegion(awsRegion)
-                        .awsClient<CodeWhispererRuntimeClient>()
-                        .listAvailableProfilesPaginator {}
-                        .profiles()
-                        .map { p -> QRegionProfile(arn = p.arn(), profileName = p.profileName() ?: "<no name>") }
-                }
+            val connectionSettings = connection.getConnectionSettings()
+            val mappedProfiles = AwsResourceCache.getInstance().getResourceNow(
+                resource = QProfileResources.LIST_REGION_PROFILES,
+                connectionSettings = connectionSettings,
+                timeout = Duration.ofSeconds(30),
+                useStale = true,
+                forceFetch = false
+            )
             if (mappedProfiles.size == 1) {
                 switchProfile(project, mappedProfiles.first(), intent = QProfileSwitchIntent.Update)
             }