merge in new icons

Author: Hweinstock

package.json

@@ -1120,10 +1120,6 @@
                     "command": "aws.ec2.openTerminal",
                     "when": "aws.isDevMode"
                 },
-                {
-                    "command": "aws.ec2.openTerminal",
-                    "when": "aws.isDevMode"
-                },
                 {
                     "command": "aws.ec2.startInstance",
                     "when": "false"
@@ -1385,11 +1381,6 @@
                     "group": "0@1",
                     "when": "viewItem =~ /^(awsEc2RunningNode)$/"
                 },
-                {
-                    "command": "aws.ec2.rebootInstance",
-                    "group": "inline@1",
-                    "when": "viewItem =~ /^(awsEc2RunningNode)$/"
-                },
                 {
                     "command": "aws.ecr.createRepository",
                     "when": "view == aws.explorer && viewItem == awsEcrNode",

src/ec2/explorer/ec2InstanceNode.ts

@@ -34,7 +34,7 @@ export class Ec2InstanceNode extends AWSTreeNodeBase implements AWSResourceNode
 
     public updateInstance(newInstance: Ec2Instance) {
         this.setInstance(newInstance)
-        this.label = `${this.name} (${this.InstanceId})`
+        this.label = `${this.name} (${this.InstanceId}) ${this.instance.status!.toUpperCase()}`
         this.contextValue = this.getContext()
         this.iconPath = new vscode.ThemeIcon(getIconCode(this.instance))
         this.tooltip = `${this.name}\n${this.InstanceId}\n${this.instance.status}\n${this.arn}`
@@ -45,7 +45,7 @@ export class Ec2InstanceNode extends AWSTreeNodeBase implements AWSResourceNode
     }
 
     public isPending(): boolean {
-        return this.getStatus() != 'running' && this.getStatus() != 'stopped'
+        return this.getStatus() == 'pending'
     }
 
     public async updateStatus() {

src/ec2/prompter.ts

@@ -23,7 +23,7 @@ export class Ec2Prompter {
     protected static asQuickPickItem(instance: Ec2Instance): DataQuickPickItem<string> {
         const icon = `$(${getIconCode(instance)})`
         return {
-            label: `${icon} \t ${instance.name ?? '(no name)'}`,
+            label: `${instance.name ?? '(no name)'} \t ${icon} ${instance.status!.toUpperCase()}`,
             detail: instance.InstanceId,
             data: instance.InstanceId,
         }

src/ec2/utils.ts

@@ -7,11 +7,11 @@ import { Ec2Instance } from '../shared/clients/ec2Client'
 
 export function getIconCode(instance: Ec2Instance) {
     if (instance.status === 'running') {
-        return 'check'
+        return 'pass'
     }
 
     if (instance.status === 'stopped') {
-        return 'stop'
+        return 'circle-slash'
     }
 
     return 'loading~spin'

src/test/ec2/explorer/ec2InstanceNode.test.ts

@@ -48,7 +48,10 @@ describe('ec2InstanceNode', function () {
     })
 
     it('initializes the label', async function () {
-        assert.strictEqual(testNode.label, `${getNameOfInstance(testInstance)} (${testInstance.InstanceId})`)
+        assert.strictEqual(
+            testNode.label,
+            `${getNameOfInstance(testInstance)} (${testInstance.InstanceId}) ${testInstance.status!.toUpperCase()}`
+        )
     })
 
     it('initializes the functionName', async function () {
@@ -86,6 +89,9 @@ describe('ec2InstanceNode', function () {
     it('updates label with new instance', async function () {
         const newIdInstance = { ...testInstance, InstanceId: 'testId2' }
         testNode.updateInstance(newIdInstance)
-        assert.strictEqual(testNode.label, `${getNameOfInstance(newIdInstance)} (${newIdInstance.InstanceId})`)
+        assert.strictEqual(
+            testNode.label,
+            `${getNameOfInstance(newIdInstance)} (${newIdInstance.InstanceId}) ${newIdInstance.status!.toUpperCase()}`
+        )
     })
 })

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

@@ -98,12 +98,12 @@ describe('ec2ParentNode', function () {
     it('sorts child nodes', async function () {
         const sortedText = ['aa', 'ab', 'bb', 'bc', 'cc', 'cd']
         const instances = [
-            { name: 'ab', InstanceId: '0' },
-            { name: 'bb', InstanceId: '1' },
-            { name: 'bc', InstanceId: '2' },
-            { name: 'aa', InstanceId: '3' },
-            { name: 'cc', InstanceId: '4' },
-            { name: 'cd', InstanceId: '5' },
+            { name: 'ab', InstanceId: '0', status: 'running' },
+            { name: 'bb', InstanceId: '1', status: 'running' },
+            { name: 'bc', InstanceId: '2', status: 'running' },
+            { name: 'aa', InstanceId: '3', status: 'running' },
+            { name: 'cc', InstanceId: '4', status: 'running' },
+            { name: 'cd', InstanceId: '5', status: 'running' },
         ]
 
         getInstanceStub.resolves(mapToInstanceCollection(instances))
@@ -124,9 +124,9 @@ describe('ec2ParentNode', function () {
 
     it('is able to handle children with duplicate names', async function () {
         const instances = [
-            { name: 'firstOne', InstanceId: '0' },
-            { name: 'secondOne', InstanceId: '1' },
-            { name: 'firstOne', InstanceId: '2' },
+            { name: 'firstOne', InstanceId: '0', status: 'running' },
+            { name: 'secondOne', InstanceId: '1', status: 'running' },
+            { name: 'firstOne', InstanceId: '2', status: 'running' },
         ]
 
         getInstanceStub.resolves(mapToInstanceCollection(instances))

src/test/ec2/prompter.test.ts

@@ -55,6 +55,7 @@ describe('Ec2Prompter', async function () {
             const testInstance = {
                 name: 'testName',
                 InstanceId: 'testInstanceId',
+                status: 'running',
             }
 
             const result = prompter.testAsQuickPickItem(testInstance)
@@ -69,6 +70,7 @@ describe('Ec2Prompter', async function () {
         it('returns QuickPickItem for non-named instances', function () {
             const testInstance = {
                 InstanceId: 'testInstanceId',
+                status: 'running',
             }
 
             const result = prompter.testAsQuickPickItem(testInstance)
@@ -117,14 +119,17 @@ describe('Ec2Prompter', async function () {
                 {
                     InstanceId: '1',
                     name: 'first',
+                    status: 'running',
                 },
                 {
                     InstanceId: '2',
                     name: 'second',
+                    status: 'running',
                 },
                 {
                     InstanceId: '3',
                     name: 'third',
+                    status: 'running',
                 },
             ]
             prompter.unsetFilter()