Merge master into feature/emr

aws-toolkit-automation · web-flow · commit 697c6a0409ab · 2025-01-28T23:15:38.000+01:00
diff --git a/packages/amazonq/.changes/next-release/Bug Fix-1d7e776d-333a-4f39-a8e6-29ea2ecb19c9.json b/packages/amazonq/.changes/next-release/Bug Fix-1d7e776d-333a-4f39-a8e6-29ea2ecb19c9.json
@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Allow AB users with an overridden customization to go back to the default customization"
+}
diff --git a/packages/core/src/codewhisperer/util/customizationUtil.ts b/packages/core/src/codewhisperer/util/customizationUtil.ts
@@ -113,7 +113,7 @@ export const getSelectedCustomization = (): Customization => {
     )
     const selectedCustomization = selectedCustomizationArr[AuthUtil.instance.conn.label]
 
-    if (selectedCustomization && selectedCustomization.name !== baseCustomization.name) {
+    if (selectedCustomization && selectedCustomization.name !== '') {
         return selectedCustomization
     } else {
         const customizationFeature = FeatureConfigProvider.getFeature(Features.customizationArnOverride)
diff --git a/packages/core/src/test/amazonq/customizationUtil.test.ts b/packages/core/src/test/amazonq/customizationUtil.test.ts
@@ -85,7 +85,10 @@ describe('CodeWhisperer-customizationUtils', function () {
     it('Returns AB customization', async function () {
         sinon.stub(AuthUtil.instance, 'isValidEnterpriseSsoInUse').returns(true)
 
-        await setSelectedCustomization(baseCustomization)
+        await setSelectedCustomization({
+            arn: '',
+            name: '',
+        })
 
         const returnedCustomization = getSelectedCustomization()
 

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +	"type": "Bug Fix",
 +	"description": "Allow AB users with an overridden customization to go back to the default customization"
 +}
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ export const getSelectedCustomization = (): Customization => {`
`113`	`113`	`)`
`114`	`114`	`const selectedCustomization = selectedCustomizationArr[AuthUtil.instance.conn.label]`
`115`	`115`
`116`		`- if (selectedCustomization && selectedCustomization.name !== baseCustomization.name) {`
	`116`	`+ if (selectedCustomization && selectedCustomization.name !== '') {`
`117`	`117`	`return selectedCustomization`
`118`	`118`	`} else {`
`119`	`119`	`const customizationFeature = FeatureConfigProvider.getFeature(Features.customizationArnOverride)`