fix(amazonq): Fix conflicts from merge with master

Author: opieter-aws

packages/amazonq/test/unit/codewhisperer/region/regionProfileManager.test.ts

@@ -61,7 +61,7 @@ describe('RegionProfileManager', function () {
             }
             const createClientStub = sinon.stub(regionProfileManager, 'createQClient').resolves(mockClient)
 
-            const r = await regionProfileManager.listRegionProfiles()
+            const r = await regionProfileManager.listRegionProfile()
 
             assert.strictEqual(r.length, 2)
             assert.deepStrictEqual(r, [
@@ -177,7 +177,7 @@ describe('RegionProfileManager', function () {
         })
 
         it(`restoreRegionProfile`, async function () {
-            sinon.stub(regionProfileManager, 'listRegionProfiles').resolves([profileFoo])
+            sinon.stub(regionProfileManager, 'listRegionProfile').resolves([profileFoo])
             await setupConnection('idc')
             if (!AuthUtil.instance.isConnected()) {
                 fail('connection should not be undefined')

packages/core/src/codewhisperer/activation.ts

@@ -105,8 +105,6 @@ export async function activate(context: ExtContext): Promise<void> {
     // Import old CodeWhisperer settings into Amazon Q
     await CodeWhispererSettings.instance.importSettings()
 
-    const auth = AuthUtil.instance
-
     // TODO: is this indirection useful?
     registerDeclaredCommands(
         context.extensionContext.subscriptions,
@@ -157,7 +155,7 @@ export async function activate(context: ExtContext): Promise<void> {
 
             if (configurationChangeEvent.affectsConfiguration('amazonQ.showCodeWithReferences')) {
                 ReferenceLogViewProvider.instance.update()
-                if (auth.isIdcConnection()) {
+                if (AuthUtil.instance.isIdcConnection()) {
                     await vscode.window
                         .showInformationMessage(
                             CodeWhispererConstants.ssoConfigAlertMessage,
@@ -172,7 +170,7 @@ export async function activate(context: ExtContext): Promise<void> {
             }
 
             if (configurationChangeEvent.affectsConfiguration('amazonQ.shareContentWithAWS')) {
-                if (auth.isIdcConnection()) {
+                if (AuthUtil.instance.isIdcConnection()) {
                     await vscode.window
                         .showInformationMessage(
                             CodeWhispererConstants.ssoConfigAlertMessageShareData,
@@ -342,7 +340,7 @@ export async function activate(context: ExtContext): Promise<void> {
             SecurityIssueCodeActionProvider.instance
         ),
         vscode.commands.registerCommand('aws.amazonq.openEditorAtRange', openEditorAtRange),
-        auth.regionProfileManager.onDidChangeRegionProfile(() => {
+        AuthUtil.instance.regionProfileManager.onDidChangeRegionProfile(() => {
             // Validate user still has access to the selected customization.
             const selectedCustomization = getSelectedCustomization()
             // No need to validate base customization which has empty arn.
@@ -367,27 +365,27 @@ export async function activate(context: ExtContext): Promise<void> {
     // run the auth startup code with context for telemetry
     await telemetry.function_call.run(
         async () => {
-            if (auth.isConnectionExpired()) {
-                auth.showReauthenticatePrompt().catch((e) => {
+            if (AuthUtil.instance.isConnectionExpired()) {
+                AuthUtil.instance.showReauthenticatePrompt().catch((e) => {
                     const defaulMsg = localize('AWS.generic.message.error', 'Failed to reauth:')
                     void logAndShowError(localize, e, 'showReauthenticatePrompt', defaulMsg)
                 })
-                if (auth.isIdcConnection()) {
-                    await auth.notifySessionConfiguration()
+                if (AuthUtil.instance.isIdcConnection()) {
+                    await AuthUtil.instance.notifySessionConfiguration()
                 }
             }
 
-            if (auth.requireProfileSelection()) {
+            if (AuthUtil.instance.regionProfileManager.requireProfileSelection()) {
                 await notifySelectDeveloperProfile()
             }
         },
         { emit: false, functionId: { name: 'activateCwCore' } }
     )
 
-    if (auth.isIdcConnection() && auth.isConnected()) {
+    if (AuthUtil.instance.isIdcConnection() && AuthUtil.instance.isConnected()) {
         await notifyNewCustomizations()
     }
-    if (auth.isBuilderIdConnection()) {
+    if (AuthUtil.instance.isBuilderIdConnection()) {
         await CodeScansState.instance.setScansEnabled(false)
     }
 
@@ -402,8 +400,8 @@ export async function activate(context: ExtContext): Promise<void> {
         return (
             (isScansEnabled ?? CodeScansState.instance.isScansEnabled()) &&
             !CodeScansState.instance.isMonthlyQuotaExceeded() &&
-            auth.isConnected() &&
-            !auth.isBuilderIdConnection() &&
+            AuthUtil.instance.isConnected() &&
+            !AuthUtil.instance.isBuilderIdConnection() &&
             editor &&
             editor.document.uri.scheme === 'file' &&
             securityScanLanguageContext.isLanguageSupported(editor.document.languageId)

packages/core/src/codewhisperer/region/regionProfileManager.ts

@@ -369,6 +369,10 @@ export class RegionProfileManager {
         return this.authProvider.isIdcConnection() && this.activeRegionProfile === undefined
     }
 
+    async clearCache() {
+        await this.cache.clearCache()
+    }
+
     async createQClient(region: string, endpoint: string): Promise<CodeWhispererUserClient> {
         const token = await this.authProvider.getToken()
         const serviceOption: ServiceOptions = {

packages/core/src/codewhisperer/ui/statusBarMenu.ts

@@ -85,7 +85,7 @@ function getAmazonQCodeWhispererNodes() {
 }
 
 export function getQuickPickItems(): DataQuickPickItem<string>[] {
-    const isUsingEnterpriseSso = AuthUtil.instance.isValidEnterpriseSsoInUse()
+    const isUsingEnterpriseSso = AuthUtil.instance.isIdcConnection()
     const regionProfile = AuthUtil.instance.regionProfileManager.activeRegionProfile
 
     const children = [

packages/core/src/shared/settings-toolkit.gen.ts

@@ -42,6 +42,7 @@ export const toolkitSettings = {
     },
     "aws.experiments": {
         "jsonResourceModification": {},
+        "amazonqLSP": {},
         "amazonqLSPInline": {},
         "amazonqChatLSP": {}
     },