refactor(sdkv3): migrate ec2 to sdkv3 (#6672)

## Problem
EC2 currently uses the old sdkv2, we can start the migration to v3. 

## Solution
- migrate existing use cases and provide small clean ups along the way. 
- Re-work pagination to use `AsyncCollection` abstraction. 

## Testing
- Manually tested Ec2Connect, Explorer (polling functionality), Command
Palette, and some edge cases including instances missing a name,
duplicate names, and windows instance (for remote terminal).

## Future Work
- Allow quickpicks to support `AsyncIterator` of individual items, to
avoid loading entire collection. Alternatively, add a `batchIterator` to
`AsyncCollection` that returns an `AsyncIterator` with batches of size
`k`.
- built-in explorer support for pagination. 
- automated E2E testing for EC2?

---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.

Author: Hweinstock

package-lock.json

@@ -505,6 +505,7 @@
         "@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/credential-provider-env": "<3.696.0",
         "@aws-sdk/credential-provider-process": "<3.696.0",
         "@aws-sdk/credential-provider-sso": "<3.696.0",

packages/core/package.json

@@ -4,7 +4,7 @@
  */
 import { Ec2InstanceNode } from './explorer/ec2InstanceNode'
 import { Ec2Node } from './explorer/ec2ParentNode'
-import { SafeEc2Instance, Ec2Client } from '../../shared/clients/ec2Client'
+import { SafeEc2Instance, Ec2Client } from '../../shared/clients/ec2'
 import { copyToClipboard } from '../../shared/utilities/messages'
 import { ec2LogSchema } from './ec2LogDocumentProvider'
 import { getAwsConsoleUrl } from '../../shared/awsConsole'

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 { SafeEc2Instance } 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'
@@ -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) {

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

@@ -3,13 +3,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import * as vscode from 'vscode'
-import { EC2, IAM } from 'aws-sdk'
+import { IAM } from 'aws-sdk'
 import { Ec2Selection } from './prompter'
 import { getOrInstallCli } from '../../shared/utilities/cliUtils'
 import { isCloud9 } from '../../shared/extensionUtilities'
 import { ToolkitError } from '../../shared/errors'
 import { SsmClient } from '../../shared/clients/ssm'
-import { Ec2Client } from '../../shared/clients/ec2Client'
+import { Ec2Client } from '../../shared/clients/ec2'
 import {
     VscodeRemoteConnection,
     createBoundProcess,
@@ -83,7 +83,7 @@ export class Ec2Connecter implements vscode.Disposable {
         return new DefaultIamClient(this.regionCode)
     }
 
-    public async addActiveSession(sessionId: string, instanceId: EC2.InstanceId): Promise<void> {
+    public async addActiveSession(sessionId: string, instanceId: string): Promise<void> {
         await this.sessionManager.addSession(instanceId, sessionId)
     }
 

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

@@ -5,13 +5,13 @@
 
 import { RegionSubmenu, RegionSubmenuResponse } from '../../shared/ui/common/regionSubmenu'
 import { DataQuickPickItem } from '../../shared/ui/pickerPrompter'
-import { Ec2Client, SafeEc2Instance } from '../../shared/clients/ec2Client'
+import { Ec2Client, SafeEc2Instance } from '../../shared/clients/ec2'
 import { isValidResponse } from '../../shared/wizards/wizard'
 import { CancellationError } from '../../shared/utilities/timeoutUtils'
-import { AsyncCollection } from '../../shared/utilities/asyncCollection'
 import { getIconCode } from './utils'
 import { Ec2Node } from './explorer/ec2ParentNode'
 import { Ec2InstanceNode } from './explorer/ec2InstanceNode'
+import { AsyncCollection } from '../../shared/utilities/asyncCollection'
 
 export type instanceFilter = (instance: SafeEc2Instance) => boolean
 export interface Ec2Selection {
@@ -58,16 +58,19 @@ export class Ec2Prompter {
         return await client.getInstances()
     }
 
+    // TODO: implement a batched generator to avoid loading all instances into UI.
     protected async getInstancesAsQuickPickItems(region: string): Promise<DataQuickPickItem<string>[]> {
-        return (await this.getInstancesFromRegion(region))
+        return await (
+            await this.getInstancesFromRegion(region)
+        )
             .filter(this.filter ? (instance) => this.filter!(instance) : (instance) => true)
             .map((instance) => Ec2Prompter.asQuickPickItem(instance))
             .promise()
     }
 
     private createEc2ConnectPrompter(): RegionSubmenu<string> {
         return new RegionSubmenu(
-            async (region) => this.getInstancesAsQuickPickItems(region),
+            async (region) => await this.getInstancesAsQuickPickItems(region),
             { title: 'Select EC2 Instance', matchOnDetail: true },
             { title: 'Select Region for EC2 Instance' },
             'Instances'

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

@@ -3,19 +3,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { EC2 } from 'aws-sdk'
 import { SsmClient } from '../../shared/clients/ssm'
 import { Disposable } from 'vscode'
 
-export class Ec2SessionTracker extends Map<EC2.InstanceId, string> implements Disposable {
+export class Ec2SessionTracker extends Map<string, string> implements Disposable {
     public constructor(
         readonly regionCode: string,
         protected ssm: SsmClient
     ) {
         super()
     }
 
-    public async addSession(instanceId: EC2.InstanceId, sessionId: string): Promise<void> {
+    public async addSession(instanceId: string, sessionId: string): Promise<void> {
         if (this.isConnectedTo(instanceId)) {
             const existingSessionId = this.get(instanceId)!
             await this.ssm.terminateSessionFromId(existingSessionId)
@@ -25,7 +24,7 @@ export class Ec2SessionTracker extends Map<EC2.InstanceId, string> implements Di
         }
     }
 
-    private async disconnectEnv(instanceId: EC2.InstanceId): Promise<void> {
+    private async disconnectEnv(instanceId: string): Promise<void> {
         await this.ssm.terminateSessionFromId(this.get(instanceId)!)
         this.delete(instanceId)
     }
@@ -35,7 +34,7 @@ export class Ec2SessionTracker extends Map<EC2.InstanceId, string> implements Di
         this.forEach(async (_sessionId, instanceId) => await this.disconnectEnv(instanceId))
     }
 
-    public isConnectedTo(instanceId: EC2.InstanceId): boolean {
+    public isConnectedTo(instanceId: string): boolean {
         return this.has(instanceId)
     }
 }

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

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { SafeEc2Instance } from '../../shared/clients/ec2Client'
+import { SafeEc2Instance } from '../../shared/clients/ec2'
 import { copyToClipboard } from '../../shared/utilities/messages'
 import { Ec2Selection } from './prompter'
 import { sshLogFileLocation } from '../../shared/sshConfig'