tst

Author: rli

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/auth/DefaultAuthCredentialsService.kt

@@ -26,6 +26,7 @@ import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.credential
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.credentials.UpdateCredentialsPayload
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.credentials.UpdateCredentialsPayloadData
 import software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfile
+import software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfileManager
 import software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfileSelectedListener
 import software.aws.toolkits.jetbrains.utils.isQConnected
 import software.aws.toolkits.jetbrains.utils.isQExpired
@@ -184,7 +185,7 @@ class DefaultAuthCredentialsService(
         val payload = UpdateConfigurationParams(
             section = "aws.q",
             settings = mapOf(
-                "profileArn" to "invalidinvalidinvalid"
+                "profileArn" to QRegionProfileManager.getInstance().activeProfile(project)?.arn
             )
         )
         return AmazonQLspService.executeIfRunning(project) { server ->

plugins/amazonq/shared/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonq/lsp/auth/DefaultAuthCredentialsServiceTest.kt

@@ -30,6 +30,8 @@ import software.aws.toolkits.jetbrains.core.credentials.sso.bearer.InteractiveBe
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.AmazonQLanguageServer
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.AmazonQLspService
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.encryption.JwtEncryptionManager
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.credentials.ConnectionMetadata
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.credentials.SsoProfileData
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.credentials.UpdateCredentialsPayload
 import software.aws.toolkits.jetbrains.utils.isQConnected
 import software.aws.toolkits.jetbrains.utils.isQExpired
@@ -112,6 +114,7 @@ class DefaultAuthCredentialsServiceTest {
         connectionId: String = "test-connection-id",
     ): AwsBearerTokenConnection = mockk {
         every { id } returns connectionId
+        every { startUrl } returns "startUrl"
         every { getConnectionSettings() } returns createMockTokenSettings(accessToken)
     }
 
@@ -192,17 +195,18 @@ class DefaultAuthCredentialsServiceTest {
 
     @Test
     fun `test updateTokenCredentials unencrypted success`() {
-        sut = DefaultAuthCredentialsService(project, mockEncryptionManager, mockk())
-
-        val token = "unencryptedToken"
         val isEncrypted = false
+        sut = DefaultAuthCredentialsService(project, mockEncryptionManager, mockk())
 
-        sut.updateTokenCredentials(token, isEncrypted)
+        sut.updateTokenCredentials(mockConnection, isEncrypted)
 
         verify(exactly = 1) {
             mockLanguageServer.updateTokenCredentials(
                 UpdateCredentialsPayload(
-                    token,
+                    "test-access-token",
+                    ConnectionMetadata(
+                        SsoProfileData("startUrl")
+                    ),
                     isEncrypted
                 )
             )
@@ -219,12 +223,15 @@ class DefaultAuthCredentialsServiceTest {
 
         every { mockEncryptionManager.encrypt(any()) } returns encryptedToken
 
-        sut.updateTokenCredentials(decryptedToken, isEncrypted)
+        sut.updateTokenCredentials(mockConnection, isEncrypted)
 
         verify(atLeast = 1) {
             mockLanguageServer.updateTokenCredentials(
                 UpdateCredentialsPayload(
                     encryptedToken,
+                    ConnectionMetadata(
+                        SsoProfileData("startUrl")
+                    ),
                     isEncrypted
                 )
             )