Merge branch 'main' into regionExpansion_fixlaunch

Author: evanliu048

.changes/next-release/bugfix-00947041-108c-4ef1-bec6-eb749dae7c2f.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Fix issue where Amazon Q cannot process chunks from local `@workspace` context"
+}

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

@@ -29,6 +29,7 @@ import software.amazon.awssdk.services.ssooidc.SsoOidcClient
 import software.aws.toolkits.core.region.AwsRegion
 import software.aws.toolkits.jetbrains.core.MockClientManager
 import software.aws.toolkits.jetbrains.core.MockClientManagerRule
+import software.aws.toolkits.jetbrains.core.MockResourceCacheRule
 import software.aws.toolkits.jetbrains.core.credentials.AwsBearerTokenConnection
 import software.aws.toolkits.jetbrains.core.credentials.ManagedSsoProfile
 import software.aws.toolkits.jetbrains.core.credentials.MockToolkitAuthManagerRule
@@ -39,6 +40,7 @@ import software.aws.toolkits.jetbrains.core.credentials.sono.Q_SCOPES
 import software.aws.toolkits.jetbrains.core.credentials.sso.bearer.BearerTokenAuthState
 import software.aws.toolkits.jetbrains.core.region.MockRegionProviderRule
 import software.aws.toolkits.jetbrains.services.amazonq.profile.QEndpoints
+import software.aws.toolkits.jetbrains.services.amazonq.profile.QProfileResources
 import software.aws.toolkits.jetbrains.services.amazonq.profile.QProfileState
 import software.aws.toolkits.jetbrains.services.amazonq.profile.QProfileSwitchIntent
 import software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfile
@@ -72,6 +74,9 @@ class QRegionProfileManagerTest {
     @Rule
     val disposableRule = DisposableRule()
 
+    @get:Rule
+    val resourceCache = MockResourceCacheRule()
+
     private lateinit var sut: QRegionProfileManager
     private val project: Project
         get() = projectRule.project
@@ -150,7 +155,39 @@ class QRegionProfileManagerTest {
         assertThat(cnt).isEqualTo(2)
     }
 
-    // TODO: Add two unit tests for listProfiles — one with cache hit, one without
+    @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 connectionSettings = sut.getQClientSettings(project)
+        resourceCache.addEntry(connectionSettings, QProfileResources.LIST_REGION_PROFILES, QProfileResources.LIST_REGION_PROFILES.fetch(connectionSettings))
+
+        assertThat(sut.listRegionProfiles(project))
+            .hasSize(2)
+            .containsExactlyInAnyOrder(
+                QRegionProfile("FOO", "foo"),
+                QRegionProfile("BAR", "bar")
+            )
+    }
 
     @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/project/ProjectContextProvider.kt

@@ -74,17 +74,17 @@ class ProjectContextProvider(val project: Project, private val encoderServer: En
     )
 
     // TODO: move to LspMessage.kt
+    @JsonIgnoreProperties(ignoreUnknown = true)
     data class Usage(
-        @JsonIgnoreProperties(ignoreUnknown = true)
         @JsonProperty("memoryUsage")
         val memoryUsage: Int? = null,
         @JsonProperty("cpuUsage")
         val cpuUsage: Int? = null,
     )
 
     // TODO: move to LspMessage.kt
+    @JsonIgnoreProperties(ignoreUnknown = true)
     data class Chunk(
-        @JsonIgnoreProperties(ignoreUnknown = true)
         @JsonProperty("filePath")
         val filePath: String? = null,
         @JsonProperty("content")

plugins/core/jetbrains-community/tstFixtures/software/aws/toolkits/jetbrains/core/MockResourceCache.kt

@@ -13,7 +13,6 @@ import org.junit.jupiter.api.extension.BeforeEachCallback
 import org.junit.jupiter.api.extension.ExtensionContext
 import org.junit.runner.Description
 import software.aws.toolkits.core.ClientConnectionSettings
-import software.aws.toolkits.core.ConnectionSettings
 import software.aws.toolkits.core.credentials.ToolkitAuthenticationProvider
 import software.aws.toolkits.core.credentials.ToolkitBearerTokenProvider
 import software.aws.toolkits.core.credentials.ToolkitCredentialsProvider
@@ -182,8 +181,12 @@ interface MockResourceCacheInterface {
         addEntry(project, resourceId, CompletableFuture.failedFuture<Any>(throws))
     }
 
-    fun <T> addEntry(connectionSettings: ConnectionSettings, resource: Resource.Cached<T>, value: CompletableFuture<T>) {
-        addEntry(resource, connectionSettings.region.id, connectionSettings.credentials.id, value)
+    fun <T> addEntry(connectionSettings: ClientConnectionSettings<*>, resource: Resource.Cached<T>, value: T) {
+        addEntry(resource, connectionSettings.region.id, connectionSettings.providerId, value)
+    }
+
+    fun <T> addEntry(connectionSettings: ClientConnectionSettings<*>, resource: Resource.Cached<T>, value: CompletableFuture<T>) {
+        addEntry(resource, connectionSettings.region.id, connectionSettings.providerId, value)
     }
 
     fun <T> addEntry(resource: Resource.Cached<T>, regionId: String, credentialsId: String, value: T) {