deps: remove imports of v2 ec2

Author: Hweinstock

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

@@ -11,7 +11,6 @@ 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'
 
@@ -80,7 +79,7 @@ export class Ec2InstanceNode extends AWSTreeNodeBase implements AWSResourceNode
         }
     }
 
-    public getStatus(): EC2.InstanceStateName {
+    public getStatus(): InstanceStateName {
         return this.instance.LastSeenStatus
     }
 

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

@@ -3,7 +3,7 @@
  * 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'
@@ -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/remoteSessionManager.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/test/awsService/ec2/explorer/ec2ParentNode.test.ts

@@ -12,9 +12,9 @@ import {
     assertNodeListOnlyHasPlaceholderNode,
 } from '../../../utilities/explorerNodeAssertions'
 import { Ec2InstanceNode } from '../../../../awsService/ec2/explorer/ec2InstanceNode'
-import { EC2 } from 'aws-sdk'
 import * as FakeTimers from '@sinonjs/fake-timers'
 import { installFakeClock } from '../../../testUtil'
+import { Filter } from '@aws-sdk/client-ec2'
 
 export const testInstance = {
     InstanceId: 'testId',
@@ -32,7 +32,7 @@ export const testParentNode = new Ec2ParentNode('fake-region', 'testPartition',
 describe('ec2ParentNode', function () {
     let testNode: Ec2ParentNode
     let client: Ec2Client
-    let getInstanceStub: sinon.SinonStub<[filters?: EC2.Filter[] | undefined], Promise<SafeEc2Instance[]>>
+    let getInstanceStub: sinon.SinonStub<[filters?: Filter[] | undefined], Promise<SafeEc2Instance[]>>
     let clock: FakeTimers.InstalledClock
     let refreshStub: sinon.SinonStub<[], Promise<void>>
     let statusUpdateStub: sinon.SinonStub<[status: string], Promise<string>>