Merge pull request aws#6706 from aws/feature/sdkv3

feat(sdkv3): start migration to sdkv3

Author: Hweinstock

package-lock.json

@@ -504,11 +504,15 @@
         "@aws-sdk/client-lambda": "<3.696.0",
         "@aws-sdk/client-sso": "<3.696.0",
         "@aws-sdk/client-sso-oidc": "<3.696.0",
+        "@aws-sdk/client-ssm": "<3.696.0",
+        "@aws-sdk/client-ec2": "<3.696.0",
+        "@aws-sdk/client-iam": "<3.696.0",
         "@aws-sdk/credential-provider-env": "<3.696.0",
         "@aws-sdk/credential-provider-process": "<3.696.0",
         "@aws-sdk/credential-provider-sso": "<3.696.0",
         "@aws-sdk/property-provider": "<3.696.0",
         "@aws-sdk/smithy-client": "<3.696.0",
+        "@aws-sdk/protocol-http": "<3.696.0",
         "@aws-sdk/util-arn-parser": "<3.696.0",
         "@aws/mynah-ui": "^4.23.0",
         "@gerhobbelt/gitignore-parser": "^0.2.0-9",
@@ -518,6 +522,8 @@
         "@smithy/service-error-classification": "^3.0.0",
         "@smithy/shared-ini-file-loader": "^3.0.0",
         "@smithy/util-retry": "^3.0.0",
+        "@smithy/fetch-http-handler": "^3.0.0",
+        "@smithy/node-http-handler": "^3.0.0",
         "@vscode/debugprotocol": "^1.57.0",
         "@zip.js/zip.js": "^2.7.41",
         "adm-zip": "^0.5.10",
@@ -557,7 +563,8 @@
         "winston": "^3.11.0",
         "winston-transport": "^4.6.0",
         "xml2js": "^0.6.1",
-        "yaml-cfn": "^0.3.2"
+        "yaml-cfn": "^0.3.2",
+        "http2": "^3.3.6"
     },
     "overrides": {
         "webfont": {

packages/core/package.json

@@ -15,7 +15,7 @@ import { AppRunnerCodeRepositoryWizard } from './codeRepositoryWizard'
 import { GitExtension } from '../../../shared/extensions/git'
 import { makeDeploymentButton } from './deploymentButton'
 import { createExitPrompter } from '../../../shared/ui/common/exitPrompter'
-import { DefaultIamClient } from '../../../shared/clients/iamClient'
+import { IamClient } from '../../../shared/clients/iam'
 import { DefaultEcrClient } from '../../../shared/clients/ecrClient'
 import { DefaultAppRunnerClient } from '../../../shared/clients/apprunnerClient'
 import { getAppRunnerCreateServiceDocUrl } from '../../../shared/extensionUtilities'
@@ -102,7 +102,7 @@ export class CreateAppRunnerServiceWizard extends Wizard<AppRunner.CreateService
         initState: WizardState<AppRunner.CreateServiceRequest> = {},
         implicitState: WizardState<AppRunner.CreateServiceRequest> = {},
         clients = {
-            iam: new DefaultIamClient(region),
+            iam: new IamClient(region),
             ecr: new DefaultEcrClient(region),
             apprunner: new DefaultAppRunnerClient(region),
         }

packages/core/src/awsService/apprunner/wizards/apprunnerCreateServiceWizard.ts

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { AppRunner, IAM } from 'aws-sdk'
+import { AppRunner } from 'aws-sdk'
 import { createCommonButtons, QuickInputButton, QuickInputToggleButton } from '../../../shared/ui/buttons'
 import { toArrayAsync } from '../../../shared/utilities/collectionUtils'
 import { EcrClient, EcrRepository } from '../../../shared/clients/ecrClient'
@@ -17,7 +17,7 @@ import * as nls from 'vscode-nls'
 import { WizardForm } from '../../../shared/wizards/wizardForm'
 import { createVariablesPrompter } from '../../../shared/ui/common/variablesPrompter'
 import { makeDeploymentButton } from './deploymentButton'
-import { IamClient } from '../../../shared/clients/iamClient'
+import { IamClient, IamRole } from '../../../shared/clients/iam'
 import { createRolePrompter } from '../../../shared/ui/common/roles'
 import { getLogger } from '../../../shared/logger/logger'
 import { getAppRunnerCreateServiceDocUrl, isCloud9 } from '../../../shared/extensionUtilities'
@@ -35,7 +35,7 @@ interface ImagePrompterOptions {
     extraButtons?: QuickInputButton<void | WizardControl>
 }
 
-function createEcrRole(client: IamClient): Promise<IAM.Role> {
+function createEcrRole(client: IamClient): Promise<IamRole> {
     const policy = {
         Version: '2008-10-17',
         Statement: [
@@ -257,14 +257,13 @@ export class AppRunnerImageRepositoryWizard extends Wizard<AppRunner.SourceConfi
     constructor(ecrClient: EcrClient, iamClient: IamClient, autoDeployButton = makeDeploymentButton()) {
         super()
         const form = this.form
-        const createAccessRolePrompter = () => {
-            return createRolePrompter(iamClient, {
+        const createAccessRolePrompter = () =>
+            createRolePrompter(iamClient, {
                 title: localize('AWS.apprunner.createService.selectRole.title', 'Select a role to pull from ECR'),
                 helpUrl: getAppRunnerCreateServiceDocUrl(),
                 roleFilter: (role) => (role.AssumeRolePolicyDocument ?? '').includes(appRunnerEcrEntity),
                 createRole: createEcrRole.bind(undefined, iamClient),
             }).transform((resp) => resp.Arn)
-        }
 
         form.ImageRepository.applyBoundForm(createImageRepositorySubForm(ecrClient, autoDeployButton))
         form.AuthenticationConfiguration.AccessRoleArn.bindPrompter(createAccessRolePrompter, {

packages/core/src/awsService/apprunner/wizards/imageRepositoryWizard.ts

@@ -4,15 +4,15 @@
  */
 import { Ec2InstanceNode } from './explorer/ec2InstanceNode'
 import { Ec2Node } from './explorer/ec2ParentNode'
-import { SafeEc2Instance, Ec2Client } from '../../shared/clients/ec2Client'
+import { Ec2Instance, Ec2Client } from '../../shared/clients/ec2'
 import { copyToClipboard } from '../../shared/utilities/messages'
 import { ec2LogSchema } from './ec2LogDocumentProvider'
 import { getAwsConsoleUrl } from '../../shared/awsConsole'
 import { showRegionPrompter } from '../../auth/utils'
 import { openUrl } from '../../shared/utilities/vsCodeUtils'
 import { showFile } from '../../shared/utilities/textDocumentUtilities'
 import { Ec2ConnecterMap } from './connectionManagerMap'
-import { Ec2Prompter, Ec2Selection, instanceFilter } from './prompter'
+import { getSelection } from './prompter'
 
 export async function openTerminal(connectionManagers: Ec2ConnecterMap, node?: Ec2Node) {
     const selection = await getSelection(node)
@@ -27,14 +27,14 @@ export async function openRemoteConnection(connectionManagers: Ec2ConnecterMap,
 }
 
 export async function startInstance(node?: Ec2Node) {
-    const prompterFilter = (instance: SafeEc2Instance) => instance.LastSeenStatus !== 'running'
+    const prompterFilter = (instance: Ec2Instance) => instance.LastSeenStatus !== 'running'
     const selection = await getSelection(node, prompterFilter)
     const client = new Ec2Client(selection.region)
     await client.startInstanceWithCancel(selection.instanceId)
 }
 
 export async function stopInstance(node?: Ec2Node) {
-    const prompterFilter = (instance: SafeEc2Instance) => instance.LastSeenStatus !== 'stopped'
+    const prompterFilter = (instance: Ec2Instance) => instance.LastSeenStatus !== 'stopped'
     const selection = await getSelection(node, prompterFilter)
     const client = new Ec2Client(selection.region)
     await client.stopInstanceWithCancel(selection.instanceId)
@@ -52,12 +52,6 @@ export async function linkToLaunchInstance(node?: Ec2Node) {
     await openUrl(url)
 }
 
-async function getSelection(node?: Ec2Node, filter?: instanceFilter): Promise<Ec2Selection> {
-    const prompter = new Ec2Prompter(filter)
-    const selection = node && node instanceof Ec2InstanceNode ? node.toSelection() : await prompter.promptUser()
-    return selection
-}
-
 export async function copyInstanceId(instanceId: string): Promise<void> {
     await copyToClipboard(instanceId, 'Id')
 }

packages/core/src/awsService/ec2/commands.ts

@@ -4,7 +4,7 @@
  */
 import * as vscode from 'vscode'
 import { Ec2Selection } from './prompter'
-import { Ec2Client } from '../../shared/clients/ec2Client'
+import { Ec2Client } from '../../shared/clients/ec2'
 import { ec2LogsScheme } from '../../shared/constants'
 import { UriSchema } from '../../shared/utilities/uriUtils'
 

packages/core/src/awsService/ec2/ec2LogDocumentProvider.ts

@@ -3,16 +3,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import * as vscode from 'vscode'
-import { Ec2Client, getNameOfInstance } from '../../../shared/clients/ec2Client'
+import { Ec2Client, getNameOfInstance } from '../../../shared/clients/ec2'
 import { AWSResourceNode } from '../../../shared/treeview/nodes/awsResourceNode'
 import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
-import { SafeEc2Instance } from '../../../shared/clients/ec2Client'
+import { Ec2Instance } from '../../../shared/clients/ec2'
 import globals from '../../../shared/extensionGlobals'
 import { getIconCode } from '../utils'
 import { Ec2Selection } from '../prompter'
 import { Ec2Node, Ec2ParentNode } from './ec2ParentNode'
-import { EC2 } from 'aws-sdk'
 import { getLogger } from '../../../shared/logger/logger'
+import { InstanceStateName } from '@aws-sdk/client-ec2'
 
 export const Ec2InstanceRunningContext = 'awsEc2RunningNode'
 export const Ec2InstanceStoppedContext = 'awsEc2StoppedNode'
@@ -27,15 +27,15 @@ export class Ec2InstanceNode extends AWSTreeNodeBase implements AWSResourceNode
         public override readonly regionCode: string,
         private readonly partitionId: string,
         // XXX: this variable is marked as readonly, but the 'status' attribute is updated when polling the nodes.
-        public readonly instance: SafeEc2Instance
+        public readonly instance: Ec2Instance
     ) {
         super('')
         this.parent.addChild(this)
         this.updateInstance(instance)
         this.id = this.InstanceId
     }
 
-    public updateInstance(newInstance: SafeEc2Instance) {
+    public updateInstance(newInstance: Ec2Instance) {
         this.setInstanceStatus(newInstance.LastSeenStatus)
         this.label = `${this.name} (${this.InstanceId}) ${this.instance.LastSeenStatus.toUpperCase()}`
         this.contextValue = this.getContext()
@@ -68,7 +68,7 @@ export class Ec2InstanceNode extends AWSTreeNodeBase implements AWSResourceNode
         return Ec2InstancePendingContext
     }
 
-    public setInstanceStatus(instanceStatus: string) {
+    public setInstanceStatus(instanceStatus: InstanceStateName) {
         this.instance.LastSeenStatus = instanceStatus
     }
 
@@ -79,12 +79,12 @@ export class Ec2InstanceNode extends AWSTreeNodeBase implements AWSResourceNode
         }
     }
 
-    public getStatus(): EC2.InstanceStateName {
+    public getStatus(): InstanceStateName {
         return this.instance.LastSeenStatus
     }
 
     public get name(): string {
-        return getNameOfInstance(this.instance) ?? `(no name)`
+        return this.instance.Name ?? getNameOfInstance(this.instance) ?? `(no name)`
     }
 
     public get InstanceId(): string {

packages/core/src/awsService/ec2/explorer/ec2InstanceNode.ts

@@ -7,7 +7,7 @@ import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
 import { makeChildrenNodes } from '../../../shared/treeview/utils'
 import { PlaceholderNode } from '../../../shared/treeview/nodes/placeholderNode'
 import { Ec2InstanceNode } from './ec2InstanceNode'
-import { Ec2Client } from '../../../shared/clients/ec2Client'
+import { Ec2Client } from '../../../shared/clients/ec2'
 import { updateInPlace } from '../../../shared/utilities/collectionUtils'
 import { PollingSet } from '../../../shared/utilities/pollingSet'
 
@@ -30,7 +30,7 @@ export class Ec2ParentNode extends AWSTreeNodeBase {
     }
 
     public override async getChildren(): Promise<AWSTreeNodeBase[]> {
-        return await makeChildrenNodes({
+        const result = await makeChildrenNodes({
             getChildNodes: async () => {
                 await this.updateChildren()
 
@@ -39,6 +39,7 @@ export class Ec2ParentNode extends AWSTreeNodeBase {
             getNoChildrenPlaceholderNode: async () => new PlaceholderNode(this, this.placeHolderMessage),
             sort: (nodeA, nodeB) => nodeA.name.localeCompare(nodeB.name),
         })
+        return result
     }
 
     public trackPendingNode(instanceId: string) {
@@ -47,15 +48,18 @@ export class Ec2ParentNode extends AWSTreeNodeBase {
         }
         this.pollingSet.add(instanceId)
     }
-
+    // TODO: make use of childNodeLoader to avoid loading all of this at once.
     public async updateChildren(): Promise<void> {
-        const ec2Instances = await (await this.ec2Client.getInstances()).toMap((instance) => instance.InstanceId)
+        const instanceMap = await this.ec2Client
+            .getInstances()
+            .flatten()
+            .toMap((instance) => instance.InstanceId)
+
         updateInPlace(
             this.ec2InstanceNodes,
-            ec2Instances.keys(),
-            (key) => this.ec2InstanceNodes.get(key)!.updateInstance(ec2Instances.get(key)!),
-            (key) =>
-                new Ec2InstanceNode(this, this.ec2Client, this.regionCode, this.partitionId, ec2Instances.get(key)!)
+            instanceMap.keys(),
+            (key) => this.ec2InstanceNodes.get(key)!.updateInstance(instanceMap.get(key)!),
+            (key) => new Ec2InstanceNode(this, this.ec2Client, this.regionCode, this.partitionId, instanceMap.get(key)!)
         )
     }