rename classes to avoid vague manager word

Author: Hweinstock

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

@@ -16,9 +16,9 @@ import {
     stopInstance,
     linkToLaunchInstance,
 } from './commands'
-import { Ec2ConnectionManagerMap } from './connectionManagerMap'
+import { Ec2ConnecterMap } from './connectionManagerMap'
 
-const connectionManagers = new Ec2ConnectionManagerMap()
+const connectionManagers = new Ec2ConnecterMap()
 
 export async function activate(ctx: ExtContext): Promise<void> {
     ctx.extensionContext.subscriptions.push(

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

@@ -11,15 +11,15 @@ import { showRegionPrompter } from '../../auth/utils'
 import { openUrl } from '../../shared/utilities/vsCodeUtils'
 import { Ec2Prompter, Ec2Selection, instanceFilter } from './prompter'
 import { Ec2InstanceNode } from './explorer/ec2InstanceNode'
-import { Ec2ConnectionManagerMap } from './connectionManagerMap'
+import { Ec2ConnecterMap } from './connectionManagerMap'
 
-export async function openTerminal(connectionManagers: Ec2ConnectionManagerMap, node?: Ec2Node) {
+export async function openTerminal(connectionManagers: Ec2ConnecterMap, node?: Ec2Node) {
     const selection = await getSelection(node)
     const connectionManager = connectionManagers.getOrInit(selection.region)
     await connectionManager.attemptToOpenEc2Terminal(selection)
 }
 
-export async function openRemoteConnection(connectionManagers: Ec2ConnectionManagerMap, node?: Ec2Node) {
+export async function openRemoteConnection(connectionManagers: Ec2ConnecterMap, node?: Ec2Node) {
     const selection = await getSelection(node)
     const connectionManager = connectionManagers.getOrInit(selection.region)
     await connectionManager.tryOpenRemoteConnection(selection)

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

@@ -4,22 +4,22 @@
  */
 
 import { getLogger } from '../../shared'
-import { Ec2ConnectionManager } from './model'
+import { Ec2Connecter } from './model'
 
-export class Ec2ConnectionManagerMap extends Map<string, Ec2ConnectionManager> {
+export class Ec2ConnecterMap extends Map<string, Ec2Connecter> {
     private static warnSize: number = 25
 
     public getOrInit(regionCode: string) {
         return this.has(regionCode) ? this.get(regionCode)! : this.initiateManager(regionCode)
     }
 
-    private initiateManager(regionCode: string): Ec2ConnectionManager {
-        if (this.size >= Ec2ConnectionManagerMap.warnSize) {
+    private initiateManager(regionCode: string): Ec2Connecter {
+        if (this.size >= Ec2ConnecterMap.warnSize) {
             getLogger().warn(
-                `Connection manager exceeded threshold of ${Ec2ConnectionManagerMap.warnSize} with ${this.size} active connections`
+                `Connection manager exceeded threshold of ${Ec2ConnecterMap.warnSize} with ${this.size} active connections`
             )
         }
-        const newConnectionManager = new Ec2ConnectionManager(regionCode)
+        const newConnectionManager = new Ec2Connecter(regionCode)
         this.set(regionCode, newConnectionManager)
         return newConnectionManager
     }

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

@@ -29,7 +29,7 @@ import { showMessageWithCancel } from '../../shared/utilities/messages'
 import { SshConfig } from '../../shared/sshConfig'
 import { SshKeyPair } from './sshKeyPair'
 import globals from '../../shared/extensionGlobals'
-import { Ec2RemoteSessionManager } from './remoteSessionManager'
+import { Ec2SessionTracker } from './remoteSessionManager'
 import { getEc2SsmEnv } from './utils'
 
 export type Ec2ConnectErrorCode = 'EC2SSMStatus' | 'EC2SSMPermission' | 'EC2SSMConnect' | 'EC2SSMAgentStatus'
@@ -40,11 +40,11 @@ export interface Ec2RemoteEnv extends VscodeRemoteConnection {
     ssmSession: SSM.StartSessionResponse
 }
 
-export class Ec2ConnectionManager implements vscode.Disposable {
+export class Ec2Connecter implements vscode.Disposable {
     protected ssmClient: SsmClient
     protected ec2Client: Ec2Client
     protected iamClient: DefaultIamClient
-    protected sessionManager: Ec2RemoteSessionManager
+    protected sessionManager: Ec2SessionTracker
 
     private policyDocumentationUri = vscode.Uri.parse(
         'https://docs.aws.amazon.com/systems-manager/latest/userguide/session-manager-getting-started-instance-profile.html'
@@ -58,7 +58,7 @@ export class Ec2ConnectionManager implements vscode.Disposable {
         this.ssmClient = this.createSsmSdkClient()
         this.ec2Client = this.createEc2SdkClient()
         this.iamClient = this.createIamSdkClient()
-        this.sessionManager = new Ec2RemoteSessionManager(regionCode, this.ssmClient)
+        this.sessionManager = new Ec2SessionTracker(regionCode, this.ssmClient)
     }
 
     protected createSsmSdkClient(): SsmClient {

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

@@ -7,7 +7,7 @@ import { EC2, SSM } from 'aws-sdk'
 import { SsmClient } from '../../shared/clients/ssmClient'
 import { Disposable } from 'vscode'
 
-export class Ec2RemoteSessionManager extends Map<EC2.InstanceId, SSM.SessionId> implements Disposable {
+export class Ec2SessionTracker extends Map<EC2.InstanceId, SSM.SessionId> implements Disposable {
     public constructor(
         readonly regionCode: string,
         protected ssmClient: SsmClient

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

@@ -5,13 +5,13 @@
 
 import assert from 'assert'
 import { Ec2Selection } from '../../../awsService/ec2/prompter'
-import { Ec2ConnectionManagerMap } from '../../../awsService/ec2/connectionManagerMap'
+import { Ec2ConnecterMap } from '../../../awsService/ec2/connectionManagerMap'
 
 describe('getConnectionManager', async function () {
-    let connectionManagers: Ec2ConnectionManagerMap
+    let connectionManagers: Ec2ConnecterMap
 
     beforeEach(function () {
-        connectionManagers = new Ec2ConnectionManagerMap()
+        connectionManagers = new Ec2ConnecterMap()
     })
 
     it('only creates new connection managers once for each region ', async function () {

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

@@ -5,7 +5,7 @@
 
 import assert from 'assert'
 import * as sinon from 'sinon'
-import { Ec2ConnectionManager } from '../../../awsService/ec2/model'
+import { Ec2Connecter } from '../../../awsService/ec2/model'
 import { SsmClient } from '../../../shared/clients/ssmClient'
 import { Ec2Client } from '../../../shared/clients/ec2Client'
 import { Ec2Selection } from '../../../awsService/ec2/prompter'
@@ -15,10 +15,10 @@ import { SshKeyPair } from '../../../awsService/ec2/sshKeyPair'
 import { DefaultIamClient } from '../../../shared/clients/iamClient'
 
 describe('Ec2ConnectClient', function () {
-    let client: Ec2ConnectionManager
+    let client: Ec2Connecter
 
     before(function () {
-        client = new Ec2ConnectionManager('test-region')
+        client = new Ec2Connecter('test-region')
     })
 
     describe('getAttachedIamRole', async function () {
@@ -82,7 +82,7 @@ describe('Ec2ConnectClient', function () {
         })
 
         it('throws EC2SSMStatus error if instance is not running', async function () {
-            sinon.stub(Ec2ConnectionManager.prototype, 'isInstanceRunning').resolves(false)
+            sinon.stub(Ec2Connecter.prototype, 'isInstanceRunning').resolves(false)
 
             try {
                 await client.checkForStartSessionError(instanceSelection)
@@ -93,8 +93,8 @@ describe('Ec2ConnectClient', function () {
         })
 
         it('throws EC2SSMPermission error if instance is running but has no role', async function () {
-            sinon.stub(Ec2ConnectionManager.prototype, 'isInstanceRunning').resolves(true)
-            sinon.stub(Ec2ConnectionManager.prototype, 'getAttachedIamRole').resolves(undefined)
+            sinon.stub(Ec2Connecter.prototype, 'isInstanceRunning').resolves(true)
+            sinon.stub(Ec2Connecter.prototype, 'getAttachedIamRole').resolves(undefined)
 
             try {
                 await client.checkForStartSessionError(instanceSelection)
@@ -105,9 +105,9 @@ describe('Ec2ConnectClient', function () {
         })
 
         it('throws EC2SSMAgent error if instance is running and has IAM Role, but agent is not running', async function () {
-            sinon.stub(Ec2ConnectionManager.prototype, 'isInstanceRunning').resolves(true)
-            sinon.stub(Ec2ConnectionManager.prototype, 'getAttachedIamRole').resolves({ Arn: 'testRole' } as IAM.Role)
-            sinon.stub(Ec2ConnectionManager.prototype, 'hasProperPermissions').resolves(true)
+            sinon.stub(Ec2Connecter.prototype, 'isInstanceRunning').resolves(true)
+            sinon.stub(Ec2Connecter.prototype, 'getAttachedIamRole').resolves({ Arn: 'testRole' } as IAM.Role)
+            sinon.stub(Ec2Connecter.prototype, 'hasProperPermissions').resolves(true)
             sinon.stub(SsmClient.prototype, 'getInstanceAgentPingStatus').resolves('offline')
 
             try {
@@ -119,9 +119,9 @@ describe('Ec2ConnectClient', function () {
         })
 
         it('does not throw an error if all checks pass', async function () {
-            sinon.stub(Ec2ConnectionManager.prototype, 'isInstanceRunning').resolves(true)
-            sinon.stub(Ec2ConnectionManager.prototype, 'getAttachedIamRole').resolves({ Arn: 'testRole' } as IAM.Role)
-            sinon.stub(Ec2ConnectionManager.prototype, 'hasProperPermissions').resolves(true)
+            sinon.stub(Ec2Connecter.prototype, 'isInstanceRunning').resolves(true)
+            sinon.stub(Ec2Connecter.prototype, 'getAttachedIamRole').resolves({ Arn: 'testRole' } as IAM.Role)
+            sinon.stub(Ec2Connecter.prototype, 'hasProperPermissions').resolves(true)
             sinon.stub(SsmClient.prototype, 'getInstanceAgentPingStatus').resolves('Online')
 
             assert.doesNotThrow(async () => await client.checkForStartSessionError(instanceSelection))

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

@@ -5,12 +5,12 @@
 
 import assert from 'assert'
 import * as sinon from 'sinon'
-import { Ec2RemoteSessionManager } from '../../../awsService/ec2/remoteSessionManager'
+import { Ec2SessionTracker } from '../../../awsService/ec2/remoteSessionManager'
 import { SsmClient } from '../../../shared/clients/ssmClient'
 
 describe('Ec2RemoteSessionManager', async function () {
     it('maintains connections to instances', async function () {
-        const envManager = new Ec2RemoteSessionManager('test-region', new SsmClient('test-region'))
+        const envManager = new Ec2SessionTracker('test-region', new SsmClient('test-region'))
         await envManager.addSession('test-instance', 'test-env')
         await envManager.addSession('test-instance2', 'test-env2')
         await envManager.addSession('test-instance3', 'test-env3')
@@ -22,7 +22,7 @@ describe('Ec2RemoteSessionManager', async function () {
     })
 
     it('only allows for single connection with any given instance', async function () {
-        const envManager = new Ec2RemoteSessionManager('test-region', new SsmClient('test-region'))
+        const envManager = new Ec2SessionTracker('test-region', new SsmClient('test-region'))
         const terminateStub = sinon.stub(SsmClient.prototype, 'terminateSessionFromId')
 
         await envManager.addSession('test-instance', 'test-env')
@@ -37,7 +37,7 @@ describe('Ec2RemoteSessionManager', async function () {
     })
 
     it('closes all active connections', async function () {
-        const envManager = new Ec2RemoteSessionManager('test-region', new SsmClient('test-region'))
+        const envManager = new Ec2SessionTracker('test-region', new SsmClient('test-region'))
         const terminateStub = sinon.stub(SsmClient.prototype, 'terminateSessionFromId')
 
         await envManager.addSession('test-instance', 'test-env')