revert recommendationHandler.ts, startSecurityScan.test.ts and skip falky appbuilder walkthrough test

Author: chungjac

packages/core/src/codewhisperer/service/recommendationHandler.ts

@@ -10,8 +10,8 @@ import * as EditorContext from '../util/editorContext'
 import * as CodeWhispererConstants from '../models/constants'
 import { ConfigurationEntry, GetRecommendationsResponse, vsCodeState } from '../models/model'
 import { runtimeLanguageContext } from '../util/runtimeLanguageContext'
-import { ServiceException } from '@smithy/smithy-client'
-import { isServiceException } from '../../shared/errors'
+import { AWSError } from 'aws-sdk'
+import { isAwsError } from '../../shared/errors'
 import { TelemetryHelper } from '../util/telemetryHelper'
 import { getLogger } from '../../shared/logger/logger'
 import { hasVendedIamCredentials } from '../../auth/auth'
@@ -290,14 +290,14 @@ export class RecommendationHandler {
                 latency = startTime !== 0 ? Date.now() - startTime : 0
             }
             getLogger().error('amazonq inline-suggest: Invocation Exception : %s', (error as Error).message)
-            if (isServiceException(error)) {
+            if (isAwsError(error)) {
                 errorMessage = error.message
-                requestId = error.$metadata.requestId || ''
-                errorCode = error.name
-                reason = `CodeWhisperer Invocation Exception: ${error?.name ?? 'unknown'}`
+                requestId = error.requestId || ''
+                errorCode = error.code
+                reason = `CodeWhisperer Invocation Exception: ${error?.code ?? error?.name ?? 'unknown'}`
                 await this.onThrottlingException(error, triggerType)
 
-                if (error?.name === 'AccessDeniedException' && errorMessage?.includes('no identity-based policy')) {
+                if (error?.code === 'AccessDeniedException' && errorMessage?.includes('no identity-based policy')) {
                     getLogger().error('amazonq inline-suggest: AccessDeniedException : %s', (error as Error).message)
                     void vscode.window
                         .showErrorMessage(`CodeWhisperer: ${error?.message}`, CodeWhispererConstants.settingsLearnMore)
@@ -574,9 +574,9 @@ export class RecommendationHandler {
         return true
     }
 
-    async onThrottlingException(awsError: ServiceException, triggerType: CodewhispererTriggerType) {
+    async onThrottlingException(awsError: AWSError, triggerType: CodewhispererTriggerType) {
         if (
-            awsError.name === 'ThrottlingException' &&
+            awsError.code === 'ThrottlingException' &&
             awsError.message.includes(CodeWhispererConstants.throttlingMessage)
         ) {
             if (triggerType === 'OnDemand') {

packages/core/src/test/awsService/appBuilder/walkthrough.test.ts

@@ -83,7 +83,7 @@ const scenarios: TestScenario[] = [
     },
 ]
 
-describe('AppBuilder Walkthrough', function () {
+describe.skip('AppBuilder Walkthrough', function () {
     before(async function () {
         // ensure auto scan is disabled before testrun
         await CodeScansState.instance.setScansEnabled(false)

packages/core/src/test/codewhisperer/startSecurityScan.test.ts

@@ -14,7 +14,7 @@ import * as diagnosticsProvider from '../../codewhisperer/service/diagnosticsPro
 import { getTestWorkspaceFolder } from '../../testInteg/integrationTestsUtilities'
 import { join } from 'path'
 import { assertTelemetry, closeAllEditors, getFetchStubWithResponse } from '../testUtil'
-import { ServiceException } from '@smithy/smithy-client'
+import { AWSError } from 'aws-sdk'
 import { getTestWindow } from '../shared/vscode/window'
 import { SeverityLevel } from '../shared/vscode/message'
 import { cancel } from '../../shared/localizedText'
@@ -334,11 +334,11 @@ describe('startSecurityScan', function () {
         getFetchStubWithResponse({ status: 200, statusText: 'testing stub' })
         const mockClient = createClient()
         mockClient.createCodeScan.throws({
-            name: 'ThrottlingException',
+            code: 'ThrottlingException',
+            time: new Date(),
+            name: 'error name',
             message: scansLimitReachedErrorMessage,
-            $fault: 'client',
-            $metadata: {},
-        } satisfies ServiceException)
+        } satisfies AWSError)
         sinon.stub(errors, 'isAwsError').returns(true)
         const testWindow = getTestWindow()
         await startSecurityScan.startSecurityScan(
@@ -365,11 +365,11 @@ describe('startSecurityScan', function () {
         await model.CodeScansState.instance.setScansEnabled(true)
         const mockClient = createClient()
         mockClient.createCodeScan.throws({
-            name: 'ThrottlingException',
+            code: 'ThrottlingException',
+            time: new Date(),
+            name: 'error name',
             message: 'Maximum file scans count reached for this month',
-            $fault: 'client',
-            $metadata: {},
-        } satisfies ServiceException)
+        } satisfies AWSError)
         sinon.stub(errors, 'isAwsError').returns(true)
         assert.equal(model.CodeScansState.instance.isMonthlyQuotaExceeded(), false)
         await startSecurityScan.startSecurityScan(