diff --git a/packages/core/src/awsService/redshift/explorer/redshiftWarehouseNode.ts b/packages/core/src/awsService/redshift/explorer/redshiftWarehouseNode.ts index 4301d45378b..26947893c82 100644 --- a/packages/core/src/awsService/redshift/explorer/redshiftWarehouseNode.ts +++ b/packages/core/src/awsService/redshift/explorer/redshiftWarehouseNode.ts @@ -15,7 +15,7 @@ import { ChildNodeLoader, ChildNodePage } from '../../../awsexplorer/childNodeLo import { DefaultRedshiftClient } from '../../../shared/clients/redshiftClient' import { deleteConnection, ConnectionParams, ConnectionType, RedshiftWarehouseType } from '../models/models' import { RedshiftNodeConnectionWizard } from '../wizards/connectionWizard' -import { ListDatabasesResponse } from 'aws-sdk/clients/redshiftdata' +import { ListDatabasesResponse } from '@aws-sdk/client-redshift-data' import { getIcon } from '../../../shared/icons' import { AWSCommandTreeNode } from '../../../shared/treeview/nodes/awsCommandTreeNode' import { telemetry } from '../../../shared/telemetry/telemetry' diff --git a/packages/core/src/awsService/redshift/wizards/connectionWizard.ts b/packages/core/src/awsService/redshift/wizards/connectionWizard.ts index a42494a09db..251cfd22e20 100644 --- a/packages/core/src/awsService/redshift/wizards/connectionWizard.ts +++ b/packages/core/src/awsService/redshift/wizards/connectionWizard.ts @@ -14,7 +14,7 @@ import { DefaultRedshiftClient } from '../../../shared/clients/redshiftClient' import { Region } from '../../../shared/regions/endpoints' import { RegionProvider } from '../../../shared/regions/regionProvider' import { createRegionPrompter } from '../../../shared/ui/common/region' -import { ClustersMessage } from 'aws-sdk/clients/redshift' +import { ClustersMessage } from '@aws-sdk/client-redshift' import { Prompter } from '../../../shared/ui/prompter' import { ListSecretsResponse } from '@aws-sdk/client-secrets-manager' import { SecretsManagerClient } from '../../../shared/clients/secretsManagerClient' diff --git a/packages/core/src/awsService/sagemaker/explorer/sagemakerParentNode.ts b/packages/core/src/awsService/sagemaker/explorer/sagemakerParentNode.ts index dd445f344fb..104eb7662a2 100644 --- a/packages/core/src/awsService/sagemaker/explorer/sagemakerParentNode.ts +++ b/packages/core/src/awsService/sagemaker/explorer/sagemakerParentNode.ts @@ -4,7 +4,7 @@ */ import * as vscode from 'vscode' -import { GetCallerIdentityResponse } from 'aws-sdk/clients/sts' +import { GetCallerIdentityCommandOutput } from '@aws-sdk/client-sts' import { DescribeDomainResponse } from '@amzn/sagemaker-client' import { SagemakerClient, SagemakerSpaceApp } from '../../../shared/clients/sagemaker' import { DefaultStsClient } from '../../../shared/clients/stsClient' @@ -34,7 +34,7 @@ export class SagemakerParentNode extends AWSTreeNodeBase { public override readonly contextValue: string = parentContextValue domainUserProfiles: Map = new Map() spaceApps: Map = new Map() - callerIdentity: GetCallerIdentityResponse = {} + callerIdentity: Partial = {} public readonly pollingSet: PollingSet = new PollingSet(5000, this.updatePendingNodes.bind(this)) public constructor( diff --git a/packages/core/src/codewhisperer/region/regionProfileManager.ts b/packages/core/src/codewhisperer/region/regionProfileManager.ts index 24d58d7f588..aab2ed04dab 100644 --- a/packages/core/src/codewhisperer/region/regionProfileManager.ts +++ b/packages/core/src/codewhisperer/region/regionProfileManager.ts @@ -18,7 +18,8 @@ import { import globals from '../../shared/extensionGlobals' import { once } from '../../shared/utilities/functionUtils' import CodeWhispererUserClient from '../client/codewhispereruserclient' -import { Credentials, Service } from 'aws-sdk' +import { AwsCredentialIdentity } from '@aws-sdk/types' +import { Service } from 'aws-sdk' import { ServiceOptions } from '../../shared/awsClientBuilder' import userApiConfig = require('../client/user-service-2.json') import { createConstantMap } from '../../shared/utilities/tsUtils' @@ -394,7 +395,7 @@ export class RegionProfileManager { apiConfig: userApiConfig, region: region, endpoint: endpoint, - credentials: new Credentials({ accessKeyId: 'xxx', secretAccessKey: 'xxx' }), + credentials: { accessKeyId: 'xxx', secretAccessKey: 'xxx' } as AwsCredentialIdentity, onRequestSetup: [ (req) => { req.on('build', ({ httpRequest }) => { diff --git a/packages/core/src/dynamicResources/commands/saveResource.ts b/packages/core/src/dynamicResources/commands/saveResource.ts index 1f696513c65..be395bc7f48 100644 --- a/packages/core/src/dynamicResources/commands/saveResource.ts +++ b/packages/core/src/dynamicResources/commands/saveResource.ts @@ -13,7 +13,7 @@ import { ResourceNode } from '../explorer/nodes/resourceNode' import { ResourceTypeNode } from '../explorer/nodes/resourceTypeNode' import { AwsResourceManager } from '../awsResourceManager' import { CloudControlClient } from '../../shared/clients/cloudControl' -import { CloudControl } from 'aws-sdk' +import { ResourceDescription } from '@aws-sdk/client-cloudcontrol' import globals from '../../shared/extensionGlobals' import { telemetry } from '../../shared/telemetry/telemetry' @@ -224,7 +224,7 @@ export async function updateResource( ) } -function computeDiff(currentDefinition: CloudControl.ResourceDescription, updatedDefinition: string): Operation[] { +function computeDiff(currentDefinition: ResourceDescription, updatedDefinition: string): Operation[] { const current = JSON.parse(currentDefinition.Properties!) const updated = JSON.parse(updatedDefinition) return compare(current, updated) diff --git a/packages/core/src/dynamicResources/explorer/nodes/resourceTypeNode.ts b/packages/core/src/dynamicResources/explorer/nodes/resourceTypeNode.ts index cba2274b162..afc21ff5d16 100644 --- a/packages/core/src/dynamicResources/explorer/nodes/resourceTypeNode.ts +++ b/packages/core/src/dynamicResources/explorer/nodes/resourceTypeNode.ts @@ -15,7 +15,7 @@ import { localize } from '../../../shared/utilities/vsCodeUtils' import { ResourcesNode } from './resourcesNode' import { ResourceNode } from './resourceNode' import { Result } from '../../../shared/telemetry/telemetry' -import { CloudControl } from 'aws-sdk' +import { ResourceDescription } from '@aws-sdk/client-cloudcontrol' import { ResourceTypeMetadata } from '../../model/resources' import { S3Client } from '../../../shared/clients/s3' import { telemetry } from '../../../shared/telemetry/telemetry' @@ -123,15 +123,12 @@ export class ResourceTypeNode extends AWSTreeNodeBase implements LoadMoreNode { }) newResources = response.ResourceDescriptions - ? response.ResourceDescriptions.reduce( - (accumulator: ResourceNode[], current: CloudControl.ResourceDescription) => { - if (current.Identifier) { - accumulator.push(new ResourceNode(this, current.Identifier, this.childContextValue)) - } - return accumulator - }, - [] - ) + ? response.ResourceDescriptions.reduce((accumulator: ResourceNode[], current: ResourceDescription) => { + if (current.Identifier) { + accumulator.push(new ResourceNode(this, current.Identifier, this.childContextValue)) + } + return accumulator + }, []) : [] nextToken = response.NextToken } diff --git a/packages/core/src/stepFunctions/workflowStudio/types.ts b/packages/core/src/stepFunctions/workflowStudio/types.ts index 5edf944eb2c..22a93a8404d 100644 --- a/packages/core/src/stepFunctions/workflowStudio/types.ts +++ b/packages/core/src/stepFunctions/workflowStudio/types.ts @@ -2,8 +2,8 @@ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ -import { IAM } from 'aws-sdk' -import * as StepFunctions from '@aws-sdk/client-sfn' +import { ListRolesCommandInput } from '@aws-sdk/client-iam' +import { TestStateInput } from '@aws-sdk/client-sfn' import * as vscode from 'vscode' export enum WorkflowMode { @@ -94,8 +94,8 @@ export enum ApiAction { } type ApiCallRequestMapping = { - [ApiAction.IAMListRoles]: IAM.ListRolesRequest - [ApiAction.SFNTestState]: StepFunctions.TestStateInput + [ApiAction.IAMListRoles]: ListRolesCommandInput + [ApiAction.SFNTestState]: TestStateInput } interface ApiCallRequestMessageBase extends Message { diff --git a/packages/core/src/test/awsService/cloudWatchLogs/document/logDataDocumentProvider.test.ts b/packages/core/src/test/awsService/cloudWatchLogs/document/logDataDocumentProvider.test.ts index 221d0a6fee3..3457623cb79 100644 --- a/packages/core/src/test/awsService/cloudWatchLogs/document/logDataDocumentProvider.test.ts +++ b/packages/core/src/test/awsService/cloudWatchLogs/document/logDataDocumentProvider.test.ts @@ -21,7 +21,7 @@ import { import { Settings } from '../../../../shared/settings' import { LogDataCodeLensProvider } from '../../../../awsService/cloudWatchLogs/document/logDataCodeLensProvider' import { CLOUDWATCH_LOGS_SCHEME } from '../../../../shared/constants' -import { FilteredLogEvent } from 'aws-sdk/clients/cloudwatchlogs' +import { FilteredLogEvent } from '@aws-sdk/client-cloudwatch-logs' const getLogEventsMessage = 'This is from getLogEvents' diff --git a/packages/core/src/test/awsService/cloudWatchLogs/registry/logDataRegistry.test.ts b/packages/core/src/test/awsService/cloudWatchLogs/registry/logDataRegistry.test.ts index 6f65bc2438c..1a00bb49c69 100644 --- a/packages/core/src/test/awsService/cloudWatchLogs/registry/logDataRegistry.test.ts +++ b/packages/core/src/test/awsService/cloudWatchLogs/registry/logDataRegistry.test.ts @@ -25,7 +25,7 @@ import { testLogData, unregisteredData, } from '../utils.test' -import { FilteredLogEvents } from 'aws-sdk/clients/cloudwatchlogs' +import { FilteredLogEvent } from '@aws-sdk/client-cloudwatch-logs' import { formatDateTimestamp } from '../../../../shared/datetime' describe('LogDataRegistry', async function () { @@ -128,8 +128,8 @@ describe('LogDataRegistry', async function () { const pageToken1 = 'page1Token' const pageToken2 = 'page2Token' - function createCwlEvents(id: string, count: number): FilteredLogEvents { - let events: FilteredLogEvents = [] + function createCwlEvents(id: string, count: number): FilteredLogEvent[] { + let events: FilteredLogEvent[] = [] for (let i = 0; i < count; i++) { events = events.concat({ message: `message-${id}`, logStreamName: `stream-${id}` }) } diff --git a/packages/core/src/test/credentials/provider/ecsCredentialsProvider.test.ts b/packages/core/src/test/credentials/provider/ecsCredentialsProvider.test.ts index 143a987242e..0008e044902 100644 --- a/packages/core/src/test/credentials/provider/ecsCredentialsProvider.test.ts +++ b/packages/core/src/test/credentials/provider/ecsCredentialsProvider.test.ts @@ -4,14 +4,14 @@ */ import assert from 'assert' -import { Credentials } from 'aws-sdk' +import { AwsCredentialIdentity } from '@aws-sdk/types' import { EcsCredentialsProvider } from '../../../auth/providers/ecsCredentialsProvider' import { EnvironmentVariables } from '../../../shared/environmentVariables' describe('EcsCredentialsProvider', function () { const dummyUri = 'dummyUri' const dummyRegion = 'dummmyRegion' - const dummyCredentials = { accessKeyId: 'dummyKey' } as Credentials + const dummyCredentials = { accessKeyId: 'dummyKey' } as AwsCredentialIdentity const dummyProvider = () => { return Promise.resolve(dummyCredentials) } diff --git a/packages/core/src/test/dynamicResources/explorer/resourceTypeNode.test.ts b/packages/core/src/test/dynamicResources/explorer/resourceTypeNode.test.ts index 96130761f0d..86296885df2 100644 --- a/packages/core/src/test/dynamicResources/explorer/resourceTypeNode.test.ts +++ b/packages/core/src/test/dynamicResources/explorer/resourceTypeNode.test.ts @@ -13,7 +13,7 @@ import { assertNodeListOnlyHasPlaceholderNode, } from '../../utilities/explorerNodeAssertions' import { CloudControlClient } from '../../../shared/clients/cloudControl' -import { CloudControl } from 'aws-sdk' +import { ResourceDescription } from '@aws-sdk/client-cloudcontrol' import { ResourceTypeMetadata } from '../../../dynamicResources/model/resources' import sinon from 'sinon' @@ -183,7 +183,7 @@ describe('ResourceTypeNode', function () { cloudControl.listResources = sinon.stub().resolves({ TypeName: fakeTypeName, NextToken: undefined, - ResourceDescriptions: resourceIdentifiers.map((identifier) => { + ResourceDescriptions: resourceIdentifiers.map((identifier) => { return { Identifier: identifier, ResourceModel: '', diff --git a/packages/core/src/test/shared/defaultAwsContext.test.ts b/packages/core/src/test/shared/defaultAwsContext.test.ts index 8f4ade282a4..6623fa5dee7 100644 --- a/packages/core/src/test/shared/defaultAwsContext.test.ts +++ b/packages/core/src/test/shared/defaultAwsContext.test.ts @@ -4,7 +4,7 @@ */ import assert from 'assert' -import * as AWS from 'aws-sdk' +import { AwsCredentialIdentity } from '@aws-sdk/types' import { AwsContextCredentials } from '../../shared/awsContext' import { DefaultAwsContext } from '../../shared/awsContext' @@ -125,7 +125,7 @@ describe('DefaultAwsContext', function () { function makeSampleAwsContextCredentials(endpointUrl?: string): AwsContextCredentials { return { - credentials: {} as any as AWS.Credentials, + credentials: {} as AwsCredentialIdentity, credentialsId: 'qwerty', accountId: testAccountIdValue, endpointUrl, diff --git a/packages/core/src/test/shared/sam/sync.test.ts b/packages/core/src/test/shared/sam/sync.test.ts index 843b0e0bbcd..da7a8086f38 100644 --- a/packages/core/src/test/shared/sam/sync.test.ts +++ b/packages/core/src/test/shared/sam/sync.test.ts @@ -43,7 +43,7 @@ import sinon from 'sinon' import { getTestWindow } from '../vscode/window' import { S3Client } from '../../../shared/clients/s3' import { RequiredProps } from '../../../shared/utilities/tsUtils' -import S3 from 'aws-sdk/clients/s3' +import { Bucket } from '@aws-sdk/client-s3' import { CloudFormationClient } from '../../../shared/clients/cloudFormation' import { intoCollection } from '../../../shared/utilities/collectionUtils' import { SamConfig, Environment, parseConfig } from '../../../shared/sam/config' @@ -2174,7 +2174,7 @@ describe('SAM sync helper functions', () => { }) const s3BucketListSummary: Array< - RequiredProps & { + RequiredProps & { readonly region: string } > = [