fix arn fetching

Author: samgst-amazon

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

@@ -19,8 +19,7 @@ import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.credential
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.credentials.SsoProfileData
 import software.aws.toolkits.jetbrains.settings.CodeWhispererSettings
 import java.util.concurrent.CompletableFuture
-import migration.software.aws.toolkits.jetbrains.services.codewhisperer.customization.CodeWhispererModelConfigurator
-
+import software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfileManager
 /**
  * Concrete implementation of [AmazonQLanguageClient] to handle messages sent from server
  */
@@ -94,7 +93,7 @@ class AmazonQLanguageClientImpl(private val project: Project) : AmazonQLanguageC
                             add(
                                 AmazonQLspConfiguration(
                                     optOutTelemetry = AwsSettings.getInstance().isTelemetryEnabled,
-                                    customization = CodeWhispererModelConfigurator.getInstance().activeCustomization(project)?.arn
+                                    customization = QRegionProfileManager.getInstance().activeProfile(project)?.arn
                                 )
                             )
                         }

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

@@ -7,7 +7,7 @@ object AmazonQLspConstants {
     const val AWS_BUILDER_ID_URL = "https://view.awsapps.com/start"
     const val LSP_CW_CONFIGURATION_KEY = "aws.codeWhisperer"
     const val LSP_CW_OPT_OUT_KEY = "shareCodeWhispererContentWithAWS"
-    const val LSP_CODE_REFERENCES_OPT_OUT_KEY = "includeSuggestionsWithCodeReferences
+    const val LSP_CODE_REFERENCES_OPT_OUT_KEY = "includeSuggestionsWithCodeReferences"
     const val LSP_Q_CONFIGURATION_KEY = "aws.q"
     const val LSP_OPT_OUT_TELEMETRY_CONFIGURATION_KEY = "optOutTelemetry"
     const val LSP_ENABLE_TELEMETRY_EVENTS_CONFIGURATION_KEY = "enableTelemetryEventsToDestination"

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

@@ -22,6 +22,10 @@ import software.aws.toolkits.jetbrains.core.credentials.pinning.QConnection
 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.settings.CodeWhispererSettings
+import io.mockk.mockkObject
+import software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfile
+import software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfileManager
+
 
 @ExtendWith(ApplicationExtension::class)
 class AmazonQLanguageClientImplTest {
@@ -127,25 +131,61 @@ class AmazonQLanguageClientImplTest {
     }
 
     @Test
-    fun `configuration for Amazon Q respects telemetry enabled`() {
-        AwsSettings.getInstance().isTelemetryEnabled = true
+    fun `configuration for Amazon Q respects telemetry disabled`() {
+        // Mock ToolkitConnectionManager
+        val mockConnectionManager = mockk<ToolkitConnectionManager>()
+        every { project.service<ToolkitConnectionManager>() } returns mockConnectionManager
+
+        // Mock QRegionProfileManager
+        val mockProfileManager = mockk<QRegionProfileManager>()
+        mockkObject(QRegionProfileManager.Companion)
+        every { QRegionProfileManager.getInstance() } returns mockProfileManager
+
+        // Mock the active profile with an ARN
+        val mockProfile = mockk<QRegionProfile> {
+            every { arn } returns "test:arn:123"
+        }
+        every { mockProfileManager.activeProfile(project) } returns mockProfile
+
+        // Mock AWS Settings
+        AwsSettings.getInstance().isTelemetryEnabled = false
+
         assertThat(sut.configuration(configurationParams("aws.q")).get())
             .singleElement()
             .isEqualTo(
                 AmazonQLspConfiguration(
-                    optOutTelemetry = true
+                    optOutTelemetry = false,
+                    customization = "test:arn:123"
                 )
             )
     }
 
     @Test
-    fun `configuration for Amazon Q respects telemetry disabled`() {
-        AwsSettings.getInstance().isTelemetryEnabled = false
+    fun `configuration for Amazon Q respects telemetry enabled`() {
+        // Mock ToolkitConnectionManager
+        val mockConnectionManager = mockk<ToolkitConnectionManager>()
+        every { project.service<ToolkitConnectionManager>() } returns mockConnectionManager
+
+        // Mock QRegionProfileManager
+        val mockProfileManager = mockk<QRegionProfileManager>()
+        mockkObject(QRegionProfileManager.Companion)
+        every { QRegionProfileManager.getInstance() } returns mockProfileManager
+
+        // Mock the active profile with an ARN
+        val mockProfile = mockk<QRegionProfile> {
+            every { arn } returns "test:arn:123"
+        }
+        every { mockProfileManager.activeProfile(project) } returns mockProfile
+
+        // Mock AWS Settings
+        AwsSettings.getInstance().isTelemetryEnabled = true
+
         assertThat(sut.configuration(configurationParams("aws.q")).get())
             .singleElement()
             .isEqualTo(
                 AmazonQLspConfiguration(
-                    optOutTelemetry = false
+                    optOutTelemetry = true,
+                    customization = "test:arn:123"
                 )
             )
     }