Skip to content

feat(core): Store codewhisperer customization in global state as single value and consume new authUtil #7067

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 4 commits into from
Apr 17, 2025
Merged

feat(core): Store codewhisperer customization in global state as single value and consume new authUtil #7067

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fa57ed1
feat(core): Store codewhisperer customization in global state as sing…
opieter-aws Apr 16, 2025
b7fc59a
fix(core): add migration for codewhisperer selected customization glo…
opieter-aws Apr 16, 2025
c024704
fix(core): Add globalState migration for CODEWHISPERER_PERSISTED_CUST…
opieter-aws Apr 16, 2025
d3572de
Rename functions
opieter-aws Apr 17, 2025
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
33 changes: 11 additions & 22 deletions packages/core/src/codewhisperer/util/customizationUtil.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,20 +94,14 @@ export const baseCustomization = {
* @returns customization selected by users, `baseCustomization` if none is selected
*/
export const getSelectedCustomization = (): Customization => {
if (
!AuthUtil.instance.isCustomizationFeatureEnabled ||
!AuthUtil.instance.isValidEnterpriseSsoInUse() ||
!AuthUtil.instance.conn
) {
if (!AuthUtil.instance.isCustomizationFeatureEnabled || !AuthUtil.instance.isIdcConnection()) {
return baseCustomization
}

const selectedCustomizationArr = globals.globalState.tryGet<{ [label: string]: Customization }>(
const selectedCustomization = globals.globalState.tryGet<Customization>(
'CODEWHISPERER_SELECTED_CUSTOMIZATION',
Object,
{}
Object
)
const selectedCustomization = selectedCustomizationArr[AuthUtil.instance.conn.label]

if (selectedCustomization && selectedCustomization.name !== '') {
return selectedCustomization
Expand All @@ -124,7 +118,7 @@ export const getSelectedCustomization = (): Customization => {
* 2. the override customization arn is different from the previous override customization if any. The purpose is to only do override once on users' behalf.
*/
export const setSelectedCustomization = async (customization: Customization, isOverride: boolean = false) => {
if (!AuthUtil.instance.isValidEnterpriseSsoInUse() || !AuthUtil.instance.conn) {
if (!AuthUtil.instance.isIdcConnection()) {
return
}
if (isOverride) {
Expand All @@ -133,15 +127,10 @@ export const setSelectedCustomization = async (customization: Customization, isO
return
}
}
const selectedCustomizationObj = globals.globalState.tryGet<{ [label: string]: Customization }>(
'CODEWHISPERER_SELECTED_CUSTOMIZATION',
Object,
{}
)
selectedCustomizationObj[AuthUtil.instance.conn.label] = customization
getLogger().debug(`Selected customization ${customization.name} for ${AuthUtil.instance.conn.label}`)

await globals.globalState.update('CODEWHISPERER_SELECTED_CUSTOMIZATION', selectedCustomizationObj)
await globals.globalState.update('CODEWHISPERER_SELECTED_CUSTOMIZATION', customization)
getLogger().debug(`Selected customization ${customization.name} for ${AuthUtil.instance.profileName}`)

if (isOverride) {
await globals.globalState.update('aws.amazonq.customization.overrideV2', customization.arn)
}
Expand All @@ -150,27 +139,27 @@ export const setSelectedCustomization = async (customization: Customization, isO
}

export const getPersistedCustomizations = (): Customization[] => {
if (!AuthUtil.instance.isValidEnterpriseSsoInUse() || !AuthUtil.instance.conn) {
if (!AuthUtil.instance.isIdcConnection()) {
return []
}
const persistedCustomizationsObj = globals.globalState.tryGet<{ [label: string]: Customization[] }>(
'CODEWHISPERER_PERSISTED_CUSTOMIZATIONS',
Object,
{}
)
return persistedCustomizationsObj[AuthUtil.instance.conn.label] || []
return persistedCustomizationsObj[AuthUtil.instance.profileName] || []
}

export const setPersistedCustomizations = async (customizations: Customization[]) => {
if (!AuthUtil.instance.isValidEnterpriseSsoInUse() || !AuthUtil.instance.conn) {
if (!AuthUtil.instance.isIdcConnection()) {
return
}
const persistedCustomizationsObj = globals.globalState.tryGet<{ [label: string]: Customization[] }>(
'CODEWHISPERER_PERSISTED_CUSTOMIZATIONS',
Object,
{}
)
persistedCustomizationsObj[AuthUtil.instance.conn.label] = customizations
persistedCustomizationsObj[AuthUtil.instance.profileName] = customizations
await globals.globalState.update('CODEWHISPERER_PERSISTED_CUSTOMIZATIONS', persistedCustomizationsObj)
}

Expand Down
Loading