Merge master into feature/sdkv3

Author: aws-toolkit-automation

packages/amazonq/.changes/next-release/Feature-7ffbdb5d-40c5-4c3e-bc20-63d731bc51d2.json

@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "Retrieve and display a customization name when a customization is overridden in an AB test"
+}

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'
 }
 

packages/core/src/codewhisperer/util/customizationUtil.ts

@@ -18,7 +18,7 @@ import { showMessageWithUrl } from '../../shared/utilities/messages'
 import { parse } from '@aws-sdk/util-arn-parser'
 import { Commands } from '../../shared/vscode/commands2'
 import { vsCodeState } from '../models/model'
-import { FeatureConfigProvider } from '../../shared/featureConfig'
+import { FeatureConfigProvider, Features } from '../../shared/featureConfig'
 
 /**
  *
@@ -108,15 +108,17 @@ export const getSelectedCustomization = (): Customization => {
     const result = selectedCustomizationArr[AuthUtil.instance.conn.label] || baseCustomization
 
     // A/B case
-    const arnOverride = FeatureConfigProvider.instance.getCustomizationArnOverride()
+    const customizationFeature = FeatureConfigProvider.getFeature(Features.customizationArnOverride)
+    const arnOverride = customizationFeature?.value.stringValue
+    const customizationOverrideName = customizationFeature?.variation
     if (arnOverride === undefined || arnOverride === '') {
         return result
     } else {
         // A trick to prioritize arn from A/B over user's currently selected(for request and telemetry)
         // but still shows customization info of user's currently selected.
         return {
             arn: arnOverride,
-            name: result.name,
+            name: customizationOverrideName,
             description: result.description,
         }
     }

packages/core/src/shared/featureConfig.ts

@@ -9,6 +9,7 @@ import {
     ListFeatureEvaluationsRequest,
     ListFeatureEvaluationsResponse,
 } from '../codewhisperer/client/codewhispereruserclient'
+import * as vscode from 'vscode'
 import { codeWhispererClient as client } from '../codewhisperer/client/codewhisperer'
 import { AuthUtil } from '../codewhisperer/util/authUtil'
 import { getLogger } from './logger'
@@ -152,6 +153,8 @@ export class FeatureConfigProvider {
                         )
                         this.featureConfigs.delete(Features.customizationArnOverride)
                     }
+
+                    await vscode.commands.executeCommand('aws.amazonq.refreshStatusBar')
                 }
             }
             if (Auth.instance.isInternalAmazonUser()) {

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 () {

packages/core/src/test/fake/mockFeatureConfigData.ts

@@ -21,4 +21,9 @@ export const mockFeatureConfigsData: FeatureEvaluation[] = [
         variation: 'TREATMENT',
         value: { stringValue: 'testValue' },
     },
+    {
+        feature: 'customizationArnOverride',
+        variation: 'customizationName',
+        value: { stringValue: 'customizationARN' },
+    },
 ]

packages/core/src/test/shared/featureConfig.test.ts

@@ -48,7 +48,7 @@ describe('FeatureConfigProvider', () => {
     it('test getFeatureConfigsTelemetry will return expected string', async () => {
         assert.strictEqual(
             FeatureConfigProvider.instance.getFeatureConfigsTelemetry(),
-            `{testFeature: TREATMENT, featureA: CONTROL, featureB: TREATMENT}`
+            `{testFeature: TREATMENT, featureA: CONTROL, featureB: TREATMENT, customizationArnOverride: customizationName}`
         )
     })
 
@@ -77,6 +77,13 @@ describe('FeatureConfigProvider', () => {
                     },
                     variation: 'TREATMENT',
                 },
+                customizationArnOverride: {
+                    name: 'customizationArnOverride',
+                    value: {
+                        stringValue: 'customizationARN',
+                    },
+                    variation: 'customizationName',
+                },
             }
 
             assert.deepStrictEqual(Object.fromEntries(featureConfigs), expectedFeatureConfigs)
@@ -95,6 +102,17 @@ describe('FeatureConfigProvider', () => {
         assert.strictEqual(FeatureConfigProvider.isEnabled('feature-does-not-exist' as FeatureName), false)
     })
 
+    it('should retrieve customization override values', async () => {
+        assert.strictEqual(
+            FeatureConfigProvider.getFeature(Features.customizationArnOverride)?.value.stringValue,
+            'customizationARN'
+        )
+        assert.strictEqual(
+            FeatureConfigProvider.getFeature(Features.customizationArnOverride)?.variation,
+            'customizationName'
+        )
+    })
+
     describe('getProjectContextGroup', function () {
         beforeEach(function () {
             sinon.restore()

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"
+}