refactor such that only instance node is refreshed

Author: Hweinstock

src/ec2/activation.ts

@@ -30,17 +30,17 @@ export async function activate(ctx: ExtContext): Promise<void> {
 
         Commands.register('aws.ec2.startInstance', async (node?: Ec2Node) => {
             await startInstance(node)
-            refreshExplorer(node)
+            await refreshExplorer(node)
         }),
 
         Commands.register('aws.ec2.stopInstance', async (node?: Ec2Node) => {
             await stopInstance(node)
-            refreshExplorer(node)
+            await refreshExplorer(node)
         }),
 
         Commands.register('aws.ec2.rebootInstance', async (node?: Ec2Node) => {
             await rebootInstance(node)
-            refreshExplorer(node)
+            await refreshExplorer(node)
         })
     )
 }

src/ec2/commands.ts

@@ -11,10 +11,8 @@ import { Ec2Prompter, instanceFilter } from './prompter'
 import { Ec2Selection } from './utils'
 import { Ec2Instance } from '../shared/clients/ec2Client'
 
-export function refreshExplorer(node?: Ec2Node) {
-    if (node) {
-        node instanceof Ec2InstanceNode ? node.parent.refreshNode() : node.refreshNode()
-    }
+export async function refreshExplorer(node?: Ec2Node) {
+    await node?.refreshNode()
 }
 
 export async function openTerminal(node?: Ec2Node) {

src/ec2/explorer/ec2InstanceNode.ts

@@ -10,6 +10,7 @@ import { Ec2Instance } from '../../shared/clients/ec2Client'
 import globals from '../../shared/extensionGlobals'
 import { Ec2Selection, getIconCodeForInstanceStatus } from '../utils'
 import { Ec2ParentNode } from './ec2ParentNode'
+import { Commands } from '../../shared/vscode/commands'
 
 export const Ec2InstanceRunningContext = 'awsEc2RunningNode'
 export const Ec2InstanceStoppedContext = 'awsEc2StoppedNode'
@@ -90,4 +91,9 @@ export class Ec2InstanceNode extends AWSTreeNodeBase implements AWSResourceNode
             this.regionCode
         }:${globals.awsContext.getCredentialAccountId()}:instance/${this.InstanceId}`
     }
+
+    public async refreshNode(): Promise<void> {
+        await this.updateStatus()
+        Commands.vscode().execute('aws.refreshAwsExplorerNode', this)
+    }
 }

src/ec2/explorer/ec2ParentNode.ts

@@ -65,16 +65,19 @@ export class Ec2ParentNode extends AWSTreeNodeBase {
             this.pollTimer ?? globals.clock.setInterval(this.updatePollingNodes.bind(this), pollingInterval)
     }
 
-    public updatePollingNodes() {
+    private checkForPendingNodes() {
         this.pollingNodes.forEach(async instanceId => {
             const childNode = this.ec2InstanceNodes.get(instanceId)!
             await childNode.updateStatus()
-
             if (!childNode.isPending()) {
                 this.pollingNodes.delete(instanceId)
+                childNode.refreshNode()
             }
         })
-        this.refreshNode()
+    }
+
+    public updatePollingNodes() {
+        this.checkForPendingNodes()
         if (!this.isPolling()) {
             this.clearPollTimer()
         }

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

@@ -23,6 +23,7 @@ describe('ec2ParentNode', function () {
     let clock: FakeTimers.InstalledClock
     let refreshStub: sinon.SinonStub<[], Promise<void>>
     let clearTimerStub: sinon.SinonStub<[], void>
+    let statusUpdateFromClient: string
 
     const testRegion = 'testRegion'
     const testPartition = 'testPartition'
@@ -38,13 +39,14 @@ describe('ec2ParentNode', function () {
                 }))
             )
         )
+        client.getInstanceStatus.callsFake(async () => statusUpdateFromClient)
 
         return client
     }
 
     before(function () {
         clock = installFakeClock()
-        refreshStub = sinon.stub(Ec2ParentNode.prototype, 'refreshNode')
+        refreshStub = sinon.stub(Ec2InstanceNode.prototype, 'refreshNode')
         clearTimerStub = sinon.stub(Ec2ParentNode.prototype, 'clearPollTimer')
     })
 
@@ -126,15 +128,24 @@ describe('ec2ParentNode', function () {
         assert.strictEqual(testNode.pollingNodes.size, 1)
     })
 
-    it('refreshes explorer when timer goes off', async function () {
+    it('does not refresh explorer when timer goes off if status unchanged', async function () {
+        statusUpdateFromClient = 'pending'
         instances = [
             { name: 'firstOne', InstanceId: '0', status: 'pending' },
             { name: 'secondOne', InstanceId: '1', status: 'stopped' },
             { name: 'thirdOne', InstanceId: '2', status: 'running' },
         ]
         await testNode.updateChildren()
         await clock.tickAsync(6000)
-        sinon.assert.calledOn(refreshStub, testNode)
+        sinon.assert.notCalled(refreshStub)
+    })
+
+    it('does refresh explorer when timer goes and status changed', async function () {
+        sinon.assert.notCalled(refreshStub)
+        statusUpdateFromClient = 'running'
+        testNode.pollingNodes.add('0')
+        await clock.tickAsync(6000)
+        sinon.assert.called(refreshStub)
     })
 
     it('stops timer once polling nodes are empty', async function () {