refactor such that it only updates ec2 parent node

Author: Hweinstock

src/ec2/activation.ts

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

src/ec2/commands.ts

@@ -10,14 +10,10 @@ import { Ec2ConnectionManager } from './model'
 import { Ec2Prompter, instanceFilter } from './prompter'
 import { Ec2Selection } from './utils'
 import { Ec2Instance } from '../shared/clients/ec2Client'
-import { isCloud9 } from '../shared/extensionUtilities'
-import { commands } from 'vscode'
 
 export function refreshExplorer(node?: Ec2Node) {
-    if (isCloud9()) {
-        commands.executeCommand('aws.refreshAwsExplorer', true)
-    } else {
-        commands.executeCommand('aws.refreshAwsExplorerNode', node)
+    if (node) {
+        node instanceof Ec2InstanceNode ? node.parent.refreshNode() : node.refreshNode()
     }
 }
 

src/ec2/explorer/ec2InstanceNode.ts

@@ -3,33 +3,41 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import * as vscode from 'vscode'
-import { getNameOfInstance } from '../../shared/clients/ec2Client'
+import { Ec2Client, getNameOfInstance } from '../../shared/clients/ec2Client'
 import { AWSResourceNode } from '../../shared/treeview/nodes/awsResourceNode'
 import { AWSTreeNodeBase } from '../../shared/treeview/nodes/awsTreeNodeBase'
 import { Ec2Instance } from '../../shared/clients/ec2Client'
 import globals from '../../shared/extensionGlobals'
 import { Ec2Selection, getIconCodeForInstanceStatus } from '../utils'
+import { Ec2ParentNode } from './ec2ParentNode'
 
 type Ec2InstanceNodeContext = 'awsEc2RunningNode' | 'awsEc2StoppedNode' | 'awsEc2PendingNode'
 
 export class Ec2InstanceNode extends AWSTreeNodeBase implements AWSResourceNode {
     public constructor(
+        public readonly parent: Ec2ParentNode,
+        public readonly client: Ec2Client,
         public override readonly regionCode: string,
         private readonly partitionId: string,
         private instance: Ec2Instance
     ) {
         super('')
-        this.update(instance)
+        this.updateInstance(instance)
     }
 
-    public update(newInstance: Ec2Instance) {
+    public updateInstance(newInstance: Ec2Instance) {
         this.setInstance(newInstance)
         this.label = `${this.name} (${this.InstanceId})`
         this.contextValue = this.getContext()
         this.iconPath = new vscode.ThemeIcon(getIconCodeForInstanceStatus(this.instance))
         this.tooltip = `${this.name}\n${this.InstanceId}\n${this.instance.status}\n${this.arn}`
     }
 
+    public async updateStatus() {
+        const newStatus = await this.client.getInstanceStatus(this.InstanceId)
+        this.updateInstance({ ...this.instance, status: newStatus })
+    }
+
     private getContext(): Ec2InstanceNodeContext {
         if (this.instance.status == 'running') {
             return 'awsEc2RunningNode'

src/ec2/explorer/ec2ParentNode.ts

@@ -9,18 +9,19 @@ import { PlaceholderNode } from '../../shared/treeview/nodes/placeholderNode'
 import { Ec2InstanceNode } from './ec2InstanceNode'
 import { Ec2Client } from '../../shared/clients/ec2Client'
 import { updateInPlace } from '../../shared/utilities/collectionUtils'
+import { Commands } from '../../shared/vscode/commands'
 
 export const parentContextValue = 'awsEc2ParentNode'
 export type Ec2Node = Ec2InstanceNode | Ec2ParentNode
 
 export class Ec2ParentNode extends AWSTreeNodeBase {
     protected readonly placeHolderMessage = '[No EC2 Instances Found]'
-    protected readonly ec2InstanceNodes: Map<string, Ec2InstanceNode>
+    protected ec2InstanceNodes: Map<string, Ec2InstanceNode>
     public override readonly contextValue: string = parentContextValue
 
     public constructor(
         public override readonly regionCode: string,
-        private readonly partitionId: string,
+        public readonly partitionId: string,
         protected readonly ec2Client: Ec2Client
     ) {
         super('EC2', vscode.TreeItemCollapsibleState.Collapsed)
@@ -44,8 +45,17 @@ export class Ec2ParentNode extends AWSTreeNodeBase {
         updateInPlace(
             this.ec2InstanceNodes,
             ec2Instances.keys(),
-            key => this.ec2InstanceNodes.get(key)!.update(ec2Instances.get(key)!),
-            key => new Ec2InstanceNode(this.regionCode, this.partitionId, ec2Instances.get(key)!)
+            key => this.ec2InstanceNodes.get(key)!.updateInstance(ec2Instances.get(key)!),
+            key => new Ec2InstanceNode(this, this.ec2Client, this.regionCode, this.partitionId, ec2Instances.get(key)!)
         )
     }
+
+    public async clearChildren() {
+        this.ec2InstanceNodes = new Map<string, Ec2InstanceNode>()
+    }
+
+    public async refreshNode(): Promise<void> {
+        this.clearChildren()
+        Commands.vscode().execute('aws.refreshAwsExplorerNode', this)
+    }
 }