refactor to key by node, rather than string

Author: Hweinstock

src/ec2/explorer/ec2InstanceNode.ts

@@ -65,7 +65,7 @@ export class Ec2InstanceNode extends AWSTreeNodeBase implements AWSResourceNode
         }
     }
 
-    public get status(): string {
+    public getStatus(): string {
         return this.instance.status!
     }
 

src/ec2/explorer/ec2ParentNode.ts

@@ -11,7 +11,6 @@ import { Ec2Client } from '../../shared/clients/ec2Client'
 import { updateInPlace } from '../../shared/utilities/collectionUtils'
 import { Commands } from '../../shared/vscode/commands'
 import globals from '../../shared/extensionGlobals'
-import { ToolkitError } from '../../shared/errors'
 
 export const parentContextValue = 'awsEc2ParentNode'
 export type Ec2Node = Ec2InstanceNode | Ec2ParentNode
@@ -22,7 +21,7 @@ export class Ec2ParentNode extends AWSTreeNodeBase {
     protected readonly placeHolderMessage = '[No EC2 Instances Found]'
     protected ec2InstanceNodes: Map<string, Ec2InstanceNode>
     public override readonly contextValue: string = parentContextValue
-    protected pollingNodes: Set<string> = new Set<string>()
+    protected pollingNodes: Set<Ec2InstanceNode> = new Set<Ec2InstanceNode>()
     private pollTimer?: NodeJS.Timeout
 
     public constructor(
@@ -60,34 +59,23 @@ export class Ec2ParentNode extends AWSTreeNodeBase {
         return this.pollingNodes.size !== 0
     }
 
-    public startPolling(instanceId: string) {
-        this.pollingNodes.add(instanceId)
+    public startPolling(childNode: Ec2InstanceNode) {
+        this.pollingNodes.add(childNode)
         this.pollTimer =
             this.pollTimer ?? globals.clock.setInterval(this.updatePollingNodes.bind(this), pollingInterval)
     }
 
     public updatePollingNodes() {
-        console.log('here')
-        this.pollingNodes.forEach(async value => {
-            const instanceNode = this.getChild(value)
-            await instanceNode.updateStatus()
+        this.pollingNodes.forEach(async childNode => {
+            await childNode.updateStatus()
 
-            if (instanceNode.status != 'pending') {
-                this.pollingNodes.delete(value)
+            if (childNode.getStatus() != 'pending') {
+                this.pollingNodes.delete(childNode)
             }
         })
         this.refreshNode()
     }
 
-    public getChild(instanceId: string): Ec2InstanceNode {
-        if (!this.ec2InstanceNodes.has(instanceId)) {
-            throw new ToolkitError(`Unable to retrieve child instance requested with id: ${instanceId}`, {
-                code: 'MissingChild',
-            })
-        }
-        return this.ec2InstanceNodes.get(instanceId)!
-    }
-
     public async clearChildren() {
         this.ec2InstanceNodes = new Map<string, Ec2InstanceNode>()
     }

src/test/ec2/explorer/ec2ParentNode.test.ts

@@ -6,7 +6,6 @@
 import * as assert from 'assert'
 import * as FakeTimers from '@sinonjs/fake-timers'
 import * as sinon from 'sinon'
-import { verify, anything, instance, mock, when } from 'ts-mockito'
 import { Ec2ParentNode } from '../../../ec2/explorer/ec2ParentNode'
 import { stub } from '../../utilities/stubber'
 import { Ec2Client, Ec2Instance } from '../../../shared/clients/ec2Client'
@@ -17,7 +16,7 @@ import {
 } from '../../utilities/explorerNodeAssertions'
 import { Ec2InstanceNode } from '../../../ec2/explorer/ec2InstanceNode'
 import { installFakeClock } from '../../testUtil'
-import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
+import { mock, when } from 'ts-mockito'
 
 describe('ec2ParentNode', function () {
     let testNode: Ec2ParentNode
@@ -113,4 +112,19 @@ describe('ec2ParentNode', function () {
     it('is not polling on initialization', async function () {
         assert.strictEqual(testNode.isPolling(), false)
     })
+
+    it('updates the nodes when the timer is up', async function () {
+        const mockChildNode: Ec2InstanceNode = mock()
+        testNode.startPolling(mockChildNode)
+        await clock.tickAsync(4000)
+        sinon.assert.calledOn(refreshStub, testNode)
+    })
+
+    it('deletes node from polling set when state changes', async function () {
+        const mockChildNode: Ec2InstanceNode = mock()
+        when(mockChildNode.getStatus()).thenReturn('running')
+        testNode.startPolling(mockChildNode)
+        await clock.tickAsync(4000)
+        assert.strictEqual(testNode.isPolling(), false)
+    })
 })