Skip to content

Setting customization name to AB variation for display in status bar #5090

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 20, 2024
Merged

Setting customization name to AB variation for display in status bar #5090

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .changes/next-release/feature-625c1f2c-3dfd-47cb-8907-408041a3642c.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type" : "feature",
"description" : "Uses AB variation as the name for overriden customizations"
Copy link
Contributor

@rli rli Nov 15, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe bug fix: fix issue where incorrect customization is shown when local setting is overridden by the amazon q service

Copy link
Contributor Author

@spfink spfink Nov 15, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We didn't really have a contract for how we plumb this additional data through so marked it as a feature because it's new but could go either way

}
8 changes: 4 additions & 4 deletions ...toolkits/jetbrains/services/codewhisperer/customization/CodeWhispererModelConfigurator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,11 +161,11 @@ class DefaultCodeWhispererModelConfigurator : CodeWhispererModelConfigurator, Pe
val result = calculateIfIamIdentityCenterConnection(project) { connectionIdToActiveCustomizationArn[it.id] }

// A/B case
val customizationArnFromAB = CodeWhispererFeatureConfigService.getInstance().getCustomizationArnOverride()
if (customizationArnFromAB.isEmpty()) return result
val customizationFeature = CodeWhispererFeatureConfigService.getInstance().getCustomizationFeature()
if (customizationFeature == null || customizationFeature.value.stringValue().isEmpty()) return result
return CodeWhispererCustomization(
arn = customizationArnFromAB,
name = result?.name.orEmpty(),
arn = customizationFeature.value.stringValue(),
name = customizationFeature.variation,
description = result?.description
)
}
Expand Down
8 changes: 5 additions & 3 deletions ...re/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererFeatureConfigServiceTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import org.junit.Rule
import org.mockito.kotlin.any
import org.mockito.kotlin.doReturn
import org.mockito.kotlin.eq
import org.mockito.kotlin.isNull
import org.mockito.kotlin.mock
import org.mockito.kotlin.stub
import software.amazon.awssdk.services.codewhispererruntime.CodeWhispererRuntimeClient
Expand Down Expand Up @@ -80,7 +81,7 @@ class CodeWhispererFeatureConfigServiceTest {
listOf(
FeatureEvaluation.builder()
.feature(CodeWhispererFeatureConfigService.CUSTOMIZATION_ARN_OVERRIDE_NAME)
.variation("customizationARN")
.variation("customization-name")
.value(FeatureValue.fromStringValue("test arn"))
.build()
)
Expand Down Expand Up @@ -122,9 +123,10 @@ class CodeWhispererFeatureConfigServiceTest {
}

if (!isIdc || !isInListAvailableCustomizations) {
assertThat(CodeWhispererFeatureConfigService.getInstance().getCustomizationArnOverride()).isEqualTo("")
assertThat(CodeWhispererFeatureConfigService.getInstance().getCustomizationFeature()).isNull()
} else {
assertThat(CodeWhispererFeatureConfigService.getInstance().getCustomizationArnOverride()).isEqualTo("test arn")
assertThat(CodeWhispererFeatureConfigService.getInstance().getCustomizationFeature()?.value?.stringValue()).isEqualTo("test arn")
assertThat(CodeWhispererFeatureConfigService.getInstance().getCustomizationFeature()?.variation).isEqualTo("customization-name")
}
}

Expand Down
8 changes: 5 additions & 3 deletions ...tware/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererModelConfiguratorTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import org.mockito.kotlin.stub
import software.amazon.awssdk.regions.Region
import software.amazon.awssdk.services.codewhispererruntime.CodeWhispererRuntimeClient
import software.amazon.awssdk.services.codewhispererruntime.model.Customization
import software.amazon.awssdk.services.codewhispererruntime.model.FeatureValue
import software.amazon.awssdk.services.codewhispererruntime.model.ListAvailableCustomizationsRequest
import software.amazon.awssdk.services.codewhispererruntime.model.ListAvailableCustomizationsResponse
import software.amazon.awssdk.services.ssooidc.SsoOidcClient
Expand All @@ -38,6 +39,7 @@ import software.aws.toolkits.jetbrains.core.credentials.sono.SONO_URL
import software.aws.toolkits.jetbrains.core.credentials.sono.isSono
import software.aws.toolkits.jetbrains.core.region.MockRegionProviderRule
import software.aws.toolkits.jetbrains.services.amazonq.CodeWhispererFeatureConfigService
import software.aws.toolkits.jetbrains.services.amazonq.FeatureContext
import software.aws.toolkits.jetbrains.services.codewhisperer.customization.CodeWhispererCustomization
import software.aws.toolkits.jetbrains.services.codewhisperer.customization.CodeWhispererCustomizationState
import software.aws.toolkits.jetbrains.services.codewhisperer.customization.DefaultCodeWhispererModelConfigurator
Expand Down Expand Up @@ -100,7 +102,7 @@ class CodeWhispererModelConfiguratorTest {
}

abManager = mock {
on { getCustomizationArnOverride() }.thenReturn("")
on { getCustomizationFeature() }.thenReturn(null)
}

ApplicationManager.getApplication().replaceService(
Expand All @@ -119,9 +121,9 @@ class CodeWhispererModelConfiguratorTest {
assertThat(sut.activeCustomization(projectRule.project)).isEqualTo(CodeWhispererCustomization("foo", "customization_1", "description_1"))

abManager.stub {
on { getCustomizationArnOverride() }.thenReturn("bar")
on { getCustomizationFeature() }.thenReturn(FeatureContext("customizationArnOverride", "foo", FeatureValue.builder().stringValue("bar").build()))
}
assertThat(sut.activeCustomization(projectRule.project)).isEqualTo(CodeWhispererCustomization("bar", "customization_1", "description_1"))
assertThat(sut.activeCustomization(projectRule.project)).isEqualTo(CodeWhispererCustomization("bar", "foo", "description_1"))
}

@Test
Expand Down
7 changes: 5 additions & 2 deletions ...src/software/aws/toolkits/jetbrains/services/amazonq/CodeWhispererFeatureConfigService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ class CodeWhispererFeatureConfigService {
// 6) Add a test case for this feature.
fun getTestFeature(): String = getFeatureValueForKey(TEST_FEATURE_NAME).stringValue()

fun getCustomizationArnOverride(): String = getFeatureValueForKey(CUSTOMIZATION_ARN_OVERRIDE_NAME).stringValue()
fun getCustomizationFeature(): FeatureContext? = getFeature(CUSTOMIZATION_ARN_OVERRIDE_NAME)

fun getNewAutoTriggerUX(): Boolean = getFeatureValueForKey(NEW_AUTO_TRIGGER_UX).stringValue() == "TREATMENT"

Expand All @@ -118,9 +118,12 @@ class CodeWhispererFeatureConfigService {
// Get the feature value for the given key.
// In case of a misconfiguration, it will return a default feature value of Boolean false.
private fun getFeatureValueForKey(name: String): FeatureValue =
featureConfigs[name]?.value ?: FEATURE_DEFINITIONS[name]?.value
getFeature(name)?.value ?: FEATURE_DEFINITIONS[name]?.value
?: FeatureValue.builder().boolValue(false).build()

// Gets the feature context for a given feature name.
private fun getFeature(name: String): FeatureContext? = featureConfigs[name]

private fun connection(project: Project) =
ToolkitConnectionManager.getInstance(project).activeConnectionForFeature(QConnection.getInstance())

Expand Down
Loading