From 785fd3105269a3465f51cfc16b3b1498c03e691c Mon Sep 17 00:00:00 2001 From: hkobew Date: Fri, 22 Nov 2024 12:27:44 -0500 Subject: [PATCH 1/3] change terminated icon --- packages/core/src/awsService/ec2/utils.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/core/src/awsService/ec2/utils.ts b/packages/core/src/awsService/ec2/utils.ts index cd0e374629e..306887f3270 100644 --- a/packages/core/src/awsService/ec2/utils.ts +++ b/packages/core/src/awsService/ec2/utils.ts @@ -18,6 +18,10 @@ export function getIconCode(instance: SafeEc2Instance) { return 'circle-slash' } + if (instance.LastSeenStatus === 'terminated') { + return 'stop' + } + return 'loading~spin' } From 9f8f5a34d7e6992d20455be6d676e18681144910 Mon Sep 17 00:00:00 2001 From: hkobew Date: Fri, 22 Nov 2024 12:47:45 -0500 Subject: [PATCH 2/3] add test case for stop icon --- packages/core/src/test/awsService/ec2/utils.test.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/core/src/test/awsService/ec2/utils.test.ts b/packages/core/src/test/awsService/ec2/utils.test.ts index 6ee6ee65868..228f64c58a0 100644 --- a/packages/core/src/test/awsService/ec2/utils.test.ts +++ b/packages/core/src/test/awsService/ec2/utils.test.ts @@ -28,9 +28,14 @@ describe('utils', async function () { InstanceId: 'XX', LastSeenStatus: 'stopped', } + const terminatedInstance: SafeEc2Instance = { + InstanceId: 'XXX', + LastSeenStatus: 'terminated', + } assert.strictEqual(getIconCode(runningInstance), 'pass') assert.strictEqual(getIconCode(stoppedInstance), 'circle-slash') + assert.strictEqual(getIconCode(terminatedInstance), 'stop') }) it('defaults to loading~spin', function () { From 6165a8818a4ca1ebbe5ed5e2b7138312f903e54b Mon Sep 17 00:00:00 2001 From: hkobew Date: Fri, 22 Nov 2024 12:52:24 -0500 Subject: [PATCH 3/3] update changelog --- .../Bug Fix-f010c52a-8c90-46b2-9def-fb8d9d48cbfb.json | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 packages/toolkit/.changes/next-release/Bug Fix-f010c52a-8c90-46b2-9def-fb8d9d48cbfb.json diff --git a/packages/toolkit/.changes/next-release/Bug Fix-f010c52a-8c90-46b2-9def-fb8d9d48cbfb.json b/packages/toolkit/.changes/next-release/Bug Fix-f010c52a-8c90-46b2-9def-fb8d9d48cbfb.json new file mode 100644 index 00000000000..0ba7948facd --- /dev/null +++ b/packages/toolkit/.changes/next-release/Bug Fix-f010c52a-8c90-46b2-9def-fb8d9d48cbfb.json @@ -0,0 +1,4 @@ +{ + "type": "Bug Fix", + "description": "EC2: terminated instances no longer show pending icon" +}