Merge branch 'main' into main

Author: KevinDing1

.changes/next-release/bugfix-6a2d9629-1cc1-4143-8950-cfd117fcabe3.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Amazon Q /dev: Fix issue when files are deleted while preparing context"
+}

.changes/next-release/bugfix-b6572d91-e5b4-4b2d-bb43-6a331aacc79c.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Prevent customization override if user has manually selected a customization"
+}

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/customization/CodeWhispererModelConfigurator.kt

@@ -157,17 +157,24 @@ class DefaultCodeWhispererModelConfigurator : CodeWhispererModelConfigurator, Pe
             return@calculateIfIamIdentityCenterConnection customizationUiItems
         }
 
+    /**
+     * Gets the active customization for a user. If a user has manually selected a customization,
+     * respect that choice. If a user has not selected a customization, check if they have a customization
+     * assigned to them via an AB feature. If so, use that customization.
+     */
     override fun activeCustomization(project: Project): CodeWhispererCustomization? {
-        val result = calculateIfIamIdentityCenterConnection(project) { connectionIdToActiveCustomizationArn[it.id] }
-
-        // A/B case
-        val customizationFeature = CodeWhispererFeatureConfigService.getInstance().getCustomizationFeature()
-        if (customizationFeature == null || customizationFeature.value.stringValue().isEmpty()) return result
-        return CodeWhispererCustomization(
-            arn = customizationFeature.value.stringValue(),
-            name = customizationFeature.variation,
-            description = result?.description
-        )
+        val selectedCustomization = calculateIfIamIdentityCenterConnection(project) { connectionIdToActiveCustomizationArn[it.id] }
+
+        if (selectedCustomization != null) {
+            return selectedCustomization
+        } else {
+            val customizationOverride = CodeWhispererFeatureConfigService.getInstance().getCustomizationFeature()
+            if (customizationOverride == null || customizationOverride.value.stringValue().isEmpty()) return null
+            return CodeWhispererCustomization(
+                arn = customizationOverride.value.stringValue(),
+                name = customizationOverride.variation,
+            )
+        }
     }
 
     override fun switchCustomization(project: Project, newCustomization: CodeWhispererCustomization?) {

plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererModelConfiguratorTest.kt

@@ -113,17 +113,37 @@ class CodeWhispererModelConfiguratorTest {
     }
 
     @Test
-    fun `should override customization arn if there is one under AB test`() {
+    fun `should not override customization arn if there is one under AB test and manual selection has been made`() {
         val ssoConn = spy(LegacyManagedBearerSsoConnection(region = "us-east-1", startUrl = "url 1", scopes = Q_SCOPES))
         ToolkitConnectionManager.getInstance(projectRule.project).switchConnection(ssoConn)
 
-        sut.switchCustomization(projectRule.project, CodeWhispererCustomization("foo", "customization_1", "description_1"))
-        assertThat(sut.activeCustomization(projectRule.project)).isEqualTo(CodeWhispererCustomization("foo", "customization_1", "description_1"))
+        sut.switchCustomization(projectRule.project, CodeWhispererCustomization("selectedCustomizationArn", "customization_1", "description_1"))
+        assertThat(sut.activeCustomization(projectRule.project))
+            .isEqualTo(CodeWhispererCustomization("selectedCustomizationArn", "customization_1", "description_1"))
 
         abManager.stub {
             on { getCustomizationFeature() }.thenReturn(FeatureContext("customizationArnOverride", "foo", FeatureValue.builder().stringValue("bar").build()))
         }
-        assertThat(sut.activeCustomization(projectRule.project)).isEqualTo(CodeWhispererCustomization("bar", "foo", "description_1"))
+        assertThat(sut.activeCustomization(projectRule.project))
+            .isEqualTo(CodeWhispererCustomization("selectedCustomizationArn", "customization_1", "description_1"))
+    }
+
+    @Test
+    fun `should override customization arn if there is one under AB test and manual selection has not been made`() {
+        val ssoConn = spy(LegacyManagedBearerSsoConnection(region = "us-east-1", startUrl = "url 1", scopes = Q_SCOPES))
+        ToolkitConnectionManager.getInstance(projectRule.project).switchConnection(ssoConn)
+
+        sut.switchCustomization(projectRule.project, CodeWhispererCustomization("selectedCustomizationArn", "customization_1", "description_1"))
+        assertThat(sut.activeCustomization(projectRule.project))
+            .isEqualTo(CodeWhispererCustomization("selectedCustomizationArn", "customization_1", "description_1"))
+        sut.invalidateCustomization("selectedCustomizationArn")
+
+        abManager.stub {
+            on { getCustomizationFeature() }.thenReturn(
+                FeatureContext("customizationArnOverride", "foo", FeatureValue.builder().stringValue("overrideArn").build())
+            )
+        }
+        assertThat(sut.activeCustomization(projectRule.project)).isEqualTo(CodeWhispererCustomization("overrideArn", "foo", null))
     }
 
     @Test

plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/FeatureDevSessionContext.kt

@@ -189,8 +189,12 @@ class FeatureDevSessionContext(val project: Project, val maxProjectSizeBytes: Lo
 
         createTemporaryZipFileAsync { zipOutput ->
             filesToIncludeFlow.collect { file ->
-                val relativePath = Path(file.path).relativeTo(projectRoot.toNioPath())
-                zipOutput.putNextEntry(relativePath.toString(), Path(file.path))
+                try {
+                    val relativePath = Path(file.path).relativeTo(projectRoot.toNioPath())
+                    zipOutput.putNextEntry(relativePath.toString(), Path(file.path))
+                } catch (e: NoSuchFileException) {
+                    // Noop: Skip if file was deleted
+                }
             }
         }
     }.toFile()