fix: duplicate code more

Author: yuxianrz

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

@@ -456,12 +456,12 @@ describe('AuthUtil', async function () {
                 },
             }
 
-            const mockIamLogin = {
+            const mockIamLoginArn = {
                 login: sinon.stub().resolves(mockResponse),
                 loginType: 'iam',
             }
 
-            sinon.stub(auth2, 'IamLogin').returns(mockIamLogin as any)
+            sinon.stub(auth2, 'IamLogin').returns(mockIamLoginArn as any)
 
             const response = await auth.loginIam(
                 'accessKey',
@@ -470,9 +470,9 @@ describe('AuthUtil', async function () {
                 'arn:aws:iam::123456789012:role/TestRole'
             )
 
-            assert.ok(mockIamLogin.login.calledOnce)
+            assert.ok(mockIamLoginArn.login.calledOnce)
             assert.ok(
-                mockIamLogin.login.calledWith({
+                mockIamLoginArn.login.calledWith({
                     accessKey: 'accessKey',
                     secretKey: 'secretKey',
                     sessionToken: 'sessionToken',

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

@@ -73,21 +73,21 @@ export async function createSession({
 
     const client = sinon.createStubInstance(FeatureDevClient)
     client.createConversation.resolves(conversationID)
-    const session = new Session(sessionConfig, messenger, tabID, sessionState, client)
+    const sessionNew = new Session(sessionConfig, messenger, tabID, sessionState, client)
 
-    sinon.stub(session, 'conversationId').get(() => conversationID)
-    sinon.stub(session, 'uploadId').get(() => uploadID)
+    sinon.stub(sessionNew, 'conversationId').get(() => conversationID)
+    sinon.stub(sessionNew, 'uploadId').get(() => uploadID)
 
-    return session
+    return sessionNew
 }
 
 export async function sessionRegisterProvider(session: Session, uri: vscode.Uri, fileContents: Uint8Array) {
     session.config.fs.registerProvider(uri, new VirtualMemoryFile(fileContents))
 }
 
 export function generateVirtualMemoryUri(uploadID: string, filePath: string, scheme: string) {
-    const generationFilePath = path.join(uploadID, filePath)
-    const uriNew = vscode.Uri.from({ scheme, path: generationFilePath })
+    const generationFilePathNew = path.join(uploadID, filePath)
+    const uriNew = vscode.Uri.from({ scheme, path: generationFilePathNew })
     return uriNew
 }