fix: duplicate code

Author: yuxianrz

packages/amazonq/src/inlineChat/provider/inlineChatProvider.ts

@@ -74,15 +74,13 @@ export class InlineChatProvider {
         switch (triggerEvent?.type) {
             case 'editor_context_command':
                 return triggerEvent.command?.triggerType === 'keybinding' ? 'hotkeys' : 'contextMenu'
-            case 'follow_up':
-            case 'chat_message':
             default:
                 return 'click'
         }
     }
 
     public async processPromptMessageLSP(message: PromptMessage): Promise<InlineChatResult> {
-        const triggerInteraction = this.getTriggerInteractionFromTriggerEvent(
+        const triggerInteractionLSP = this.getTriggerInteractionFromTriggerEvent(
             this.triggerEventsStorage.getLastTriggerEventByTabID(message.tabID)
         )
         if (!AuthUtil.instance.isSsoSession()) {
@@ -91,7 +89,7 @@ export class InlineChatProvider {
                 cwsprChatConversationType: 'Chat',
                 cwsprChatRequestLength: message.message?.length ?? 0,
                 cwsprChatResponseCode: 401,
-                cwsprChatTriggerInteraction: triggerInteraction,
+                cwsprChatTriggerInteraction: triggerInteractionLSP,
                 reason: 'AuthenticationError',
                 reasonDesc: 'Inline chat requires SSO authentication, but current session is not',
             })

packages/amazonq/test/unit/codewhisperer/util/authUtil.test.ts

@@ -367,13 +367,13 @@ describe('AuthUtil', async function () {
                 auth.session = new auth2.SsoLogin(auth.profileName, auth.lspAuth, auth.eventEmitter)
             }
 
-            const updateProfileStub = sinon.stub((auth as any).session, 'updateProfile').resolves()
+            const updateProfileStubNew = sinon.stub((auth as any).session, 'updateProfile').resolves()
 
             await auth.migrateSsoConnectionToLsp('test-client')
 
-            assert.ok(updateProfileStub.calledOnce)
+            assert.ok(updateProfileStubNew.calledOnce)
             assert.ok(memento.update.calledWith('auth.profiles', undefined))
-            assert.deepStrictEqual(updateProfileStub.firstCall.args[0], {
+            assert.deepStrictEqual(updateProfileStubNew.firstCall.args[0], {
                 startUrl: validProfile.startUrl,
                 region: validProfile.ssoRegion,
                 scopes: validProfile.scopes,
@@ -396,12 +396,12 @@ describe('AuthUtil', async function () {
                 auth.session = new auth2.SsoLogin(auth.profileName, auth.lspAuth, auth.eventEmitter)
             }
 
-            const updateProfileStub = sinon.stub((auth as any).session, 'updateProfile').resolves()
+            const updateProfileStubNext = sinon.stub((auth as any).session, 'updateProfile').resolves()
 
             await auth.migrateSsoConnectionToLsp('test-client')
 
             assert.ok(
-                updateProfileStub.calledWith({
+                updateProfileStubNext.calledWith({
                     startUrl: validProfile.startUrl,
                     region: validProfile.ssoRegion,
                     scopes: validProfile.scopes,
@@ -450,28 +450,36 @@ describe('AuthUtil', async function () {
                     accessKeyId: 'encrypted-access-key',
                     secretAccessKey: 'encrypted-secret-key',
                     sessionToken: 'encrypted-session-token',
+                    roleArn: 'arn:aws:iam::123456789012:role/TestRole',
                 },
                 updateCredentialsParams: {
                     data: 'credential-data',
                 },
             }
-            
+
             const mockIamLogin = {
                 login: sinon.stub().resolves(mockResponse),
                 loginType: 'iam',
             }
-            
+
             sinon.stub(auth2, 'IamLogin').returns(mockIamLogin as any)
-            
-            const response = await auth.loginIam('accessKey', 'secretKey', 'sessionToken', 'arn:aws:iam::123456789012:role/TestRole')
-            
+
+            const response = await auth.loginIam(
+                'accessKey',
+                'secretKey',
+                'sessionToken',
+                'arn:aws:iam::123456789012:role/TestRole'
+            )
+
             assert.ok(mockIamLogin.login.calledOnce)
-            assert.ok(mockIamLogin.login.calledWith({
-                accessKey: 'accessKey',
-                secretKey: 'secretKey',
-                sessionToken: 'sessionToken',
-                roleArn: 'arn:aws:iam::123456789012:role/TestRole',
-            }))
+            assert.ok(
+                mockIamLogin.login.calledWith({
+                    accessKey: 'accessKey',
+                    secretKey: 'secretKey',
+                    sessionToken: 'sessionToken',
+                    roleArn: 'arn:aws:iam::123456789012:role/TestRole',
+                })
+            )
             assert.strictEqual(response, mockResponse)
         })
     })
@@ -574,4 +582,4 @@ describe('AuthUtil', async function () {
             assert.strictEqual(mockLspAuth.updateIamCredential.firstCall.args[0].data, 'fake-data')
         })
     })
-})
+})

packages/core/src/test/amazonq/utils.ts

@@ -87,8 +87,8 @@ export async function sessionRegisterProvider(session: Session, uri: vscode.Uri,
 
 export function generateVirtualMemoryUri(uploadID: string, filePath: string, scheme: string) {
     const generationFilePath = path.join(uploadID, filePath)
-    const uri = vscode.Uri.from({ scheme, path: generationFilePath })
-    return uri
+    const uriNew = vscode.Uri.from({ scheme, path: generationFilePath })
+    return uriNew
 }
 
 export async function sessionWriteFile(session: Session, uri: vscode.Uri, encodedContent: Uint8Array) {