refactor(aws-toolkit-vscode): migrate aws-sdk v2 to v3

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

@@ -12,7 +12,8 @@ import {
     codeWhispererClient,
 } from 'aws-core-vscode/codewhisperer'
 import { globals, getClientId, getOperatingSystem } from 'aws-core-vscode/shared'
-import { AWSError, Request } from 'aws-sdk'
+import { Request } from 'aws-sdk'
+import { ServiceException } from '@smithy/smithy-client'
 import { createSpyClient } from 'aws-core-vscode/test'
 
 describe('codewhisperer', async function () {
@@ -109,7 +110,7 @@ describe('codewhisperer', async function () {
                         requestId: '',
                     },
                 }),
-        } as Request<SendTelemetryEventResponse, AWSError>)
+        } as Request<SendTelemetryEventResponse, ServiceException>)
 
         const expectedUserContext = {
             ideCategory: 'VSCODE',
@@ -134,7 +135,7 @@ describe('codewhisperer', async function () {
                         requestId: '',
                     },
                 }),
-        } as Request<SendTelemetryEventResponse, AWSError>)
+        } as Request<SendTelemetryEventResponse, ServiceException>)
 
         const authUtilStub = sinon.stub(AuthUtil.instance, 'isValidEnterpriseSsoInUse').returns(isSso)
         await globals.telemetry.setTelemetryEnabled(isTelemetryEnabled)

packages/core/package.json

@@ -547,12 +547,13 @@
         "@types/sinon": "^10.0.5",
         "@types/sinonjs__fake-timers": "^8.1.2",
         "@types/stream-buffers": "^3.0.7",
+        "@types/svgdom": "^0.1.2",
         "@types/tcp-port-used": "^1.0.1",
         "@types/uuid": "^9.0.1",
         "@types/whatwg-url": "^11.0.4",
         "@types/xml2js": "^0.4.11",
-        "@types/svgdom": "^0.1.2",
         "@vue/compiler-sfc": "^3.3.2",
+        "aws-sdk-client-mock": "^4.1.0",
         "c8": "^9.0.0",
         "circular-dependency-plugin": "^5.2.2",
         "css-loader": "^6.10.0",
@@ -580,7 +581,7 @@
         "@amzn/amazon-q-developer-streaming-client": "file:../../src.gen/@amzn/amazon-q-developer-streaming-client",
         "@amzn/codewhisperer-streaming": "file:../../src.gen/@amzn/codewhisperer-streaming",
         "@amzn/sagemaker-client": "file:../../src.gen/@amzn/sagemaker-client/1.0.0.tgz",
-        "@aws-sdk/credential-providers": "<3.731.0",
+        "@aws-sdk/client-accessanalyzer": "^3.888.0",
         "@aws-sdk/client-api-gateway": "<3.731.0",
         "@aws-sdk/client-apprunner": "<3.731.0",
         "@aws-sdk/client-cloudcontrol": "<3.731.0",
@@ -592,19 +593,29 @@
         "@aws-sdk/client-docdb": "<3.731.0",
         "@aws-sdk/client-docdb-elastic": "<3.731.0",
         "@aws-sdk/client-ec2": "<3.731.0",
+        "@aws-sdk/client-ecr": "~3.693.0",
+        "@aws-sdk/client-ecs": "~3.693.0",
         "@aws-sdk/client-glue": "^3.852.0",
         "@aws-sdk/client-iam": "<3.731.0",
+        "@aws-sdk/client-iot": "~3.693.0",
+        "@aws-sdk/client-iotsecuretunneling": "~3.693.0",
         "@aws-sdk/client-lambda": "<3.731.0",
+        "@aws-sdk/client-redshift": "~3.693.0",
+        "@aws-sdk/client-redshift-data": "~3.693.0",
+        "@aws-sdk/client-redshift-serverless": "~3.693.0",
         "@aws-sdk/client-s3": "<3.731.0",
         "@aws-sdk/client-s3-control": "^3.830.0",
         "@aws-sdk/client-sagemaker": "<3.696.0",
+        "@aws-sdk/client-schemas": "~3.693.0",
+        "@aws-sdk/client-secrets-manager": "~3.693.0",
+        "@aws-sdk/client-sfn": "<3.731.0",
         "@aws-sdk/client-ssm": "<3.731.0",
         "@aws-sdk/client-sso": "<3.731.0",
         "@aws-sdk/client-sso-oidc": "<3.731.0",
-        "@aws-sdk/client-sfn": "<3.731.0",
         "@aws-sdk/credential-provider-env": "<3.731.0",
         "@aws-sdk/credential-provider-process": "<3.731.0",
         "@aws-sdk/credential-provider-sso": "<3.731.0",
+        "@aws-sdk/credential-providers": "<3.731.0",
         "@aws-sdk/lib-storage": "<3.731.0",
         "@aws-sdk/property-provider": "<3.731.0",
         "@aws-sdk/protocol-http": "<3.731.0",
@@ -621,6 +632,7 @@
         "@smithy/service-error-classification": "^4.0.1",
         "@smithy/shared-ini-file-loader": "^4.0.0",
         "@smithy/util-retry": "^4.0.1",
+        "@svgdotjs/svg.js": "^3.0.16",
         "@vscode/debugprotocol": "^1.57.0",
         "@zip.js/zip.js": "^2.7.41",
         "adm-zip": "^0.5.10",
@@ -639,6 +651,7 @@
         "http2": "^3.3.6",
         "i18n-ts": "^1.0.5",
         "immutable": "^4.3.0",
+        "jaro-winkler": "^0.2.8",
         "jose": "5.4.1",
         "js-yaml": "^4.1.0",
         "jsonc-parser": "^3.2.0",
@@ -648,9 +661,11 @@
         "mime-types": "^2.1.32",
         "node-fetch": "^2.7.0",
         "portfinder": "^1.0.32",
+        "protobufjs": "^7.2.6",
         "semver": "^7.5.4",
         "stream-buffers": "^3.0.2",
         "strip-ansi": "^5.2.0",
+        "svgdom": "^0.1.0",
         "tcp-port-used": "^1.0.1",
         "vscode-languageclient": "^6.1.4",
         "vscode-languageserver": "^6.1.1",
@@ -663,11 +678,7 @@
         "winston-transport": "^4.6.0",
         "ws": "^8.16.0",
         "xml2js": "^0.6.1",
-        "yaml-cfn": "^0.3.2",
-        "protobufjs": "^7.2.6",
-        "@svgdotjs/svg.js": "^3.0.16",
-        "svgdom": "^0.1.0",
-        "jaro-winkler": "^0.2.8"
+        "yaml-cfn": "^0.3.2"
     },
     "overrides": {
         "webfont": {

packages/core/src/awsService/accessanalyzer/vue/constants.ts

@@ -30,8 +30,6 @@ export type PolicyChecksCheckType = 'CheckNoNewAccess' | 'CheckAccessNotGranted'
 
 export type PolicyChecksPolicyType = 'Identity' | 'Resource'
 
-export type ValidatePolicyFindingType = 'ERROR' | 'SECURITY_WARNING' | 'SUGGESTION' | 'WARNING'
-
 export type PolicyChecksResult = 'Success' | 'Warning' | 'Error'
 
 export type PolicyChecksUiClick =

packages/core/src/awsService/accessanalyzer/vue/iamPolicyChecks.ts

@@ -11,7 +11,8 @@ import { localize } from '../../../shared/utilities/vsCodeUtils'
 import { VueWebview, VueWebviewPanel } from '../../../webviews/main'
 import { ExtContext } from '../../../shared/extensions'
 import { telemetry } from '../../../shared/telemetry/telemetry'
-import { AccessAnalyzer, SharedIniFileCredentials } from 'aws-sdk'
+import { AccessAnalyzerClient, ValidatePolicyCommand } from '@aws-sdk/client-accessanalyzer'
+import { fromIni } from '@aws-sdk/credential-providers'
 import { ToolkitError } from '../../../shared/errors'
 import { makeTemporaryToolkitFolder, tryRemoveFolder } from '../../../shared/filesystemUtilities'
 import globals from '../../../shared/extensionGlobals'
@@ -23,7 +24,6 @@ import {
     PolicyChecksPolicyType,
     PolicyChecksResult,
     PolicyChecksUiClick,
-    ValidatePolicyFindingType,
 } from './constants'
 import { S3Client, parseS3Uri } from '../../../shared/clients/s3'
 import { ExpiredTokenException } from '@aws-sdk/client-sso-oidc'
@@ -61,7 +61,7 @@ export class IamPolicyChecksWebview extends VueWebview {
 
     public constructor(
         private readonly data: IamPolicyChecksInitialData,
-        private client: AccessAnalyzer,
+        private client: AccessAnalyzerClient,
         private readonly region: string,
         public readonly onChangeInputPath = new vscode.EventEmitter<string>(),
         public readonly onChangeCheckNoNewAccessFilePath = new vscode.EventEmitter<string>(),
@@ -179,85 +179,94 @@ export class IamPolicyChecksWebview extends VueWebview {
                             documentType,
                             inputPolicyType: policyType ? policyType : 'None',
                         })
-                        this.client.config.credentials = new SharedIniFileCredentials({
+                        this.client.config.credentials = fromIni({
                             profile: `${getProfileName()}`,
                         }) // We need to detect changes in the user's credentials
-                        this.client.validatePolicy(
-                            {
-                                policyDocument: IamPolicyChecksWebview.editedDocument,
-                                policyType: policyType === 'Identity' ? 'IDENTITY_POLICY' : 'RESOURCE_POLICY',
-                            },
-                            (err, data) => {
-                                if (err) {
+                        this.client
+                            .send(
+                                new ValidatePolicyCommand({
+                                    policyDocument: IamPolicyChecksWebview.editedDocument,
+                                    policyType: policyType === 'Identity' ? 'IDENTITY_POLICY' : 'RESOURCE_POLICY',
+                                })
+                            )
+                            .then((data) => {
+                                if (data.findings && data.findings.length > 0) {
                                     span.record({
-                                        findingsCount: 0,
+                                        findingsCount: data.findings.length,
                                     })
-                                    if (err instanceof ExpiredTokenException) {
-                                        this.onValidatePolicyResponse.fire([
-                                            IamPolicyChecksConstants.InvalidAwsCredentials,
-                                            getResultCssColor('Error'),
-                                        ])
-                                    } else {
-                                        this.onValidatePolicyResponse.fire([err.message, getResultCssColor('Error')])
-                                    }
-                                } else {
-                                    if (data.findings.length > 0) {
-                                        span.record({
-                                            findingsCount: data.findings.length,
-                                        })
-                                        // eslint-disable-next-line unicorn/no-array-for-each
-                                        data.findings.forEach((finding: AccessAnalyzer.ValidatePolicyFinding) => {
-                                            const message = `${finding.findingType}: ${finding.issueCode} - ${finding.findingDetails} Learn more: ${finding.learnMoreLink}`
-                                            if ((finding.findingType as ValidatePolicyFindingType) === 'ERROR') {
-                                                diagnostics.push(
-                                                    new vscode.Diagnostic(
-                                                        new vscode.Range(
-                                                            finding.locations[0].span.start.line,
-                                                            finding.locations[0].span.start.offset,
-                                                            finding.locations[0].span.end.line,
-                                                            finding.locations[0].span.end.offset
-                                                        ),
-                                                        message,
-                                                        vscode.DiagnosticSeverity.Error
-                                                    )
-                                                )
-                                                validatePolicyDiagnosticCollection.set(
-                                                    IamPolicyChecksWebview.editedDocumentUri,
-                                                    diagnostics
+                                    // eslint-disable-next-line unicorn/no-array-for-each
+                                    data.findings.forEach((finding) => {
+                                        const locationSpan = finding.locations?.[0].span
+                                        if (
+                                            !locationSpan?.start?.line ||
+                                            !locationSpan.start.offset ||
+                                            !locationSpan.end?.line ||
+                                            !locationSpan.end.offset
+                                        ) {
+                                            return
+                                        }
+                                        const message = `${finding.findingType}: ${finding.issueCode} - ${finding.findingDetails} Learn more: ${finding.learnMoreLink}`
+                                        if (finding.findingType === 'ERROR') {
+                                            diagnostics.push(
+                                                new vscode.Diagnostic(
+                                                    new vscode.Range(
+                                                        locationSpan.start.line,
+                                                        locationSpan.start.offset,
+                                                        locationSpan.end.line,
+                                                        locationSpan.end.offset
+                                                    ),
+                                                    message,
+                                                    vscode.DiagnosticSeverity.Error
                                                 )
-                                            } else {
-                                                diagnostics.push(
-                                                    new vscode.Diagnostic(
-                                                        new vscode.Range(
-                                                            finding.locations[0].span.start.line,
-                                                            finding.locations[0].span.start.offset,
-                                                            finding.locations[0].span.end.line,
-                                                            finding.locations[0].span.end.offset
-                                                        ),
-                                                        message,
-                                                        vscode.DiagnosticSeverity.Warning
-                                                    )
+                                            )
+                                            validatePolicyDiagnosticCollection.set(
+                                                IamPolicyChecksWebview.editedDocumentUri,
+                                                diagnostics
+                                            )
+                                        } else {
+                                            diagnostics.push(
+                                                new vscode.Diagnostic(
+                                                    new vscode.Range(
+                                                        locationSpan.start.line,
+                                                        locationSpan.start.offset,
+                                                        locationSpan.end.line,
+                                                        locationSpan.end.offset
+                                                    ),
+                                                    message,
+                                                    vscode.DiagnosticSeverity.Warning
                                                 )
-                                                validatePolicyDiagnosticCollection.set(
-                                                    IamPolicyChecksWebview.editedDocumentUri,
-                                                    diagnostics
-                                                )
-                                            }
-                                        })
-                                        this.onValidatePolicyResponse.fire([
-                                            IamPolicyChecksConstants.ValidatePolicySuccessWithFindings,
-                                            getResultCssColor('Warning'),
-                                        ])
-                                        void vscode.commands.executeCommand('workbench.actions.view.problems')
-                                    } else {
-                                        this.onValidatePolicyResponse.fire([
-                                            IamPolicyChecksConstants.ValidatePolicySuccessNoFindings,
-                                            getResultCssColor('Success'),
-                                        ])
-                                    }
+                                            )
+                                            validatePolicyDiagnosticCollection.set(
+                                                IamPolicyChecksWebview.editedDocumentUri,
+                                                diagnostics
+                                            )
+                                        }
+                                    })
+                                    this.onValidatePolicyResponse.fire([
+                                        IamPolicyChecksConstants.ValidatePolicySuccessWithFindings,
+                                        getResultCssColor('Warning'),
+                                    ])
+                                    void vscode.commands.executeCommand('workbench.actions.view.problems')
+                                } else {
+                                    this.onValidatePolicyResponse.fire([
+                                        IamPolicyChecksConstants.ValidatePolicySuccessNoFindings,
+                                        getResultCssColor('Success'),
+                                    ])
+                                }
+                            })
+                            .catch((err) => {
+                                span.record({
+                                    findingsCount: 0,
+                                })
+                                if (err instanceof ExpiredTokenException) {
+                                    this.onValidatePolicyResponse.fire([
+                                        IamPolicyChecksConstants.InvalidAwsCredentials,
+                                        getResultCssColor('Error'),
+                                    ])
+                                } else {
+                                    this.onValidatePolicyResponse.fire([err.message, getResultCssColor('Error')])
                                 }
-                            }
-                        )
+                            })
                     })
                     return
                 } else {
@@ -781,7 +790,7 @@ const Panel = VueWebview.compilePanel(IamPolicyChecksWebview)
 export async function renderIamPolicyChecks(context: ExtContext): Promise<VueWebviewPanel | undefined> {
     const logger: Logger = getLogger()
     try {
-        const client = new AccessAnalyzer({ region: context.regionProvider.defaultRegionId })
+        const client = new AccessAnalyzerClient({ region: context.regionProvider.defaultRegionId })
         // Read from settings to auto-fill some inputs
         const checkNoNewAccessFilePath: string = vscode.workspace
             .getConfiguration()

packages/core/src/awsService/apigateway/commands/copyUrl.ts

@@ -11,7 +11,7 @@ import * as picker from '../../../shared/ui/picker'
 import * as vscode from 'vscode'
 import { ProgressLocation } from 'vscode'
 
-import { Stage } from 'aws-sdk/clients/apigateway'
+import { Stage } from '@aws-sdk/client-api-gateway'
 import { ApiGatewayClient } from '../../../shared/clients/apiGateway'
 import { defaultDnsSuffix, RegionProvider } from '../../../shared/regions/regionProvider'
 import { getLogger } from '../../../shared/logger/logger'

packages/core/src/awsService/apigateway/explorer/apiGatewayNodes.ts

@@ -12,7 +12,7 @@ import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
 import { PlaceholderNode } from '../../../shared/treeview/nodes/placeholderNode'
 import { compareTreeItems, makeChildrenNodes } from '../../../shared/treeview/utils'
 import { ApiGatewayClient } from '../../../shared/clients/apiGateway'
-import { RestApi } from 'aws-sdk/clients/apigateway'
+import { RestApi } from '@aws-sdk/client-api-gateway'
 import { toArrayAsync, toMap, updateInPlace } from '../../../shared/utilities/collectionUtils'
 import { RestApiNode } from './apiNodes'