Merge main into feature/q-lsp-chat

aws-toolkit-automation · web-flow · commit 3893b10d5598 · 2025-04-11T19:19:26.000-04:00
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt
@@ -409,6 +409,7 @@ class CodeTestChatController(
             .build()
         return GenerateAssistantResponseRequest.builder()
             .conversationState(conversationState)
+            .profileArn(QRegionProfileManager.getInstance().activeProfile(context.project)?.arn)
             .build()
     }
 
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/clients/chat/v1/ChatSessionV1.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/clients/chat/v1/ChatSessionV1.kt
@@ -210,6 +210,7 @@ class ChatSessionV1(
             .build()
         return GenerateAssistantResponseRequest.builder()
             .conversationState(conversationState)
+            .profileArn(QRegionProfileManager.getInstance().activeProfile(project)?.arn)
             .build()
     }
 

Original file line number	Diff line number	Diff line change
`@@ -409,6 +409,7 @@ class CodeTestChatController(`
`409`	`409`	`.build()`
`410`	`410`	`return GenerateAssistantResponseRequest.builder()`
`411`	`411`	`.conversationState(conversationState)`
	`412`	`+ .profileArn(QRegionProfileManager.getInstance().activeProfile(context.project)?.arn)`
`412`	`413`	`.build()`
`413`	`414`	`}`
`414`	`415`
Original file line number	Diff line number	Diff line change
`@@ -210,6 +210,7 @@ class ChatSessionV1(`
`210`	`210`	`.build()`
`211`	`211`	`return GenerateAssistantResponseRequest.builder()`
`212`	`212`	`.conversationState(conversationState)`
	`213`	`+ .profileArn(QRegionProfileManager.getInstance().activeProfile(project)?.arn)`
`213`	`214`	`.build()`
`214`	`215`	`}`
`215`	`216`