migrate amazonq off of aws-sdk v2

Author: chungjac

packages/amazonq/test/unit/codewhisperer/service/codewhisperer.test.ts

@@ -12,7 +12,6 @@ import {
     codeWhispererClient,
 } from 'aws-core-vscode/codewhisperer'
 import { globals, getClientId, getOperatingSystem } from 'aws-core-vscode/shared'
-import { AWSError, Request } from 'aws-sdk'
 import { createSpyClient } from 'aws-core-vscode/test'
 
 describe('codewhisperer', async function () {
@@ -102,14 +101,11 @@ describe('codewhisperer', async function () {
     })
 
     it('sendTelemetryEvent should be called with UserContext payload', async function () {
-        const clientSpyStub = sinon.stub(clientSpy, 'sendTelemetryEvent').returns({
-            promise: () =>
-                Promise.resolve({
-                    $response: {
-                        requestId: '',
-                    },
-                }),
-        } as Request<SendTelemetryEventResponse, AWSError>)
+        const clientSpyStub = sinon.stub(clientSpy, 'sendTelemetryEvent').resolves({
+            $metadata: {
+                requestId: '',
+            },
+        } as SendTelemetryEventResponse)
 
         const expectedUserContext = {
             ideCategory: 'VSCODE',
@@ -127,14 +123,11 @@ describe('codewhisperer', async function () {
         isSso: boolean,
         isTelemetryEnabled: boolean
     ) {
-        const clientSpyStub = sinon.stub(clientSpy, 'sendTelemetryEvent').returns({
-            promise: () =>
-                Promise.resolve({
-                    $response: {
-                        requestId: '',
-                    },
-                }),
-        } as Request<SendTelemetryEventResponse, AWSError>)
+        const clientSpyStub = sinon.stub(clientSpy, 'sendTelemetryEvent').resolves({
+            $metadata: {
+                requestId: '',
+            },
+        } as SendTelemetryEventResponse)
 
         const authUtilStub = sinon.stub(AuthUtil.instance, 'isValidEnterpriseSsoInUse').returns(isSso)
         await globals.telemetry.setTelemetryEnabled(isTelemetryEnabled)

packages/amazonq/test/unit/codewhisperer/service/securityScanHandler.test.ts

@@ -3,9 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { PromiseResult } from 'aws-sdk/lib/request'
 import { Stub, stub } from 'aws-core-vscode/test'
-import { AWSError, HttpResponse } from 'aws-sdk'
 import {
     CodeAnalysisScope,
     RawCodeScanIssue,
@@ -52,20 +50,15 @@ const buildRawCodeScanIssue = (params?: Partial<RawCodeScanIssue>): RawCodeScanI
 const buildMockListCodeScanFindingsResponse = (
     codeScanFindings: string = JSON.stringify([buildRawCodeScanIssue()]),
     nextToken?: boolean
-): Awaited<Promise<PromiseResult<ListCodeScanFindingsResponse, AWSError>>> => ({
-    $response: {
-        hasNextPage: () => false,
-        nextPage: () => null, // eslint-disable-line unicorn/no-null
-        data: undefined,
-        error: undefined,
-        requestId: '',
-        redirectCount: 0,
-        retryCount: 0,
-        httpResponse: new HttpResponse(),
-    },
-    codeScanFindings,
-    nextToken: nextToken ? 'nextToken' : undefined,
-})
+): Promise<ListCodeScanFindingsResponse> =>
+    Promise.resolve({
+        $metadata: {
+            httpStatusCode: 200,
+            requestId: '',
+        },
+        codeScanFindings,
+        nextToken: nextToken ? 'nextToken' : undefined,
+    })
 
 function getWorkspaceFolder(): string {
     return (