Skip to content

refactor(amazonq): combine IAM and SSO implementations of AmazonQServiceManager #1984

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
liramon1 wants to merge 7 commits into
base: liramon/flare-iam-base
Choose a base branch
from
Open

refactor(amazonq): combine IAM and SSO implementations of AmazonQServiceManager #1984

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5f8bb0e
refactor: split codewhisperer service into multiple files (#1974)
liramon1 Jul 25, 2025
fcaf3da
feat: add abstract token methods to CodeWhispererServiceBase
liramon1 Jul 24, 2025
c83c0b7
fix: remove unnecessary file
liramon1 Jul 25, 2025
86614a6
refactor: combine IAM and SSO implementations of AmazonQServiceManager
liramon1 Jul 23, 2025
fc5c9a8
fix: update client references inside unified service manager
liramon1 Jul 25, 2025
eaf4932
chore: sync AmazonQServiceManager with AmazonQTokenServiceManager
liramon1 Jul 25, 2025
42bde1e
refactor: move CodeWhispererServiceIAM construction to factory
liramon1 Jul 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions server/aws-lsp-codewhisperer/src/language-server/agenticChat/agenticChatController.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@ import {
} from '@aws/language-server-runtimes/server-interface'
import { TestFeatures } from '@aws/language-server-runtimes/testing'
import * as assert from 'assert'
import { createIterableResponse, setCredentialsForAmazonQTokenServiceManagerFactory } from '../../shared/testUtils'
import {
createIterableResponse,
setCredentialsForAmazonQTokenServiceManagerFactory,
setIamCredentialsForAmazonQServiceManagerFactory,
} from '../../shared/testUtils'
import sinon from 'ts-sinon'
import { AgenticChatController } from './agenticChatController'
import { ChatSessionManagementService } from '../chat/chatSessionManagementService'
Expand Down Expand Up @@ -179,7 +183,8 @@ describe('AgenticChatController', () => {
let getMessagesStub: sinon.SinonStub
let addMessageStub: sinon.SinonStub

const setCredentials = setCredentialsForAmazonQTokenServiceManagerFactory(() => testFeatures)
const setSsoCredentials = setCredentialsForAmazonQTokenServiceManagerFactory(() => testFeatures)
const setIamCredentials = setIamCredentialsForAmazonQServiceManagerFactory(() => testFeatures)

beforeEach(() => {
// Override the response timeout for tests to avoid long waits
Expand Down Expand Up @@ -272,7 +277,7 @@ describe('AgenticChatController', () => {
}
testFeatures.lsp.window.showDocument = sinon.stub()
testFeatures.setClientParams(cachedInitializeParams)
setCredentials('builderId')
setSsoCredentials('builderId')

activeTabSpy = sinon.spy(ChatTelemetryController.prototype, 'activeTabId', ['get', 'set'])
removeConversationSpy = sinon.spy(ChatTelemetryController.prototype, 'removeConversation')
Expand Down Expand Up @@ -3144,6 +3149,9 @@ ${' '.repeat(8)}}
// Reset the singleton instance
ChatSessionManagementService.reset()

// Store IAM credentials
setIamCredentials()

// Create IAM service manager
AmazonQIAMServiceManager.resetInstance()
iamServiceManager = AmazonQIAMServiceManager.initInstance(testFeatures)
Expand Down
Loading