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

Jump to bottom
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

merged 4 commits into from
Apr 17, 2025

Conversation

@opieter-aws
Copy link
Contributor

@opieter-aws opieter-aws commented Apr 16, 2025

Problem

With the old VSCode auth, customization was stored in global state (indexed by connection ID). With the new auth from the Flare identity server, this no longer applies since there is only a single connection

Solution

  • Consume the new AuthUtil in the customizationUtil
  • Change CODEWHISPERER_SELECTED_CUSTOMIZATION in the global state to be a single value instead of a map

Follow-up

Investigate if it's possible to hook up the customization to the Q profile from the new Region Manager, so customizations are persisted between different logins

  • Treat all work as PUBLIC. Private feature/x branches will not be squash-merged at release time.
  • Your code changes must meet the guidelines in CONTRIBUTING.md.
  • License: I confirm that my contribution is made under the terms of the Apache 2.0 license.

@github-actions
Copy link

github-actions bot commented Apr 16, 2025

  • This pull request modifies code in src/* but no tests were added/updated.
    • Confirm whether tests should be added or ensure the PR description explains why tests are not required.
  • This pull request implements a feat or fix, so it must include a changelog entry (unless the fix is for an unreleased feature). Review the changelog guidelines.
    • Note: beta or "experiment" features that have active users should announce fixes in the changelog.
    • If this is not a feature or fix, use an appropriate type from the title guidelines. For example, telemetry-only changes should use the telemetry type.

@opieter-aws opieter-aws marked this pull request as ready for review April 16, 2025 16:23
@opieter-aws opieter-aws requested a review from a team as a code owner April 16, 2025 16:23
@opieter-aws opieter-aws requested a review from hayemaxi April 16, 2025 17:23
@justinmk3
Copy link
Contributor

justinmk3 commented Apr 16, 2025

  • Change CODEWHISPERER_SELECTED_CUSTOMIZATION in the global state to be a single value instead of a map

If you need to add logic to migrate the old value (for existing users), a good place to do that is adding a new function to the GlobalState module. That's one of its purposes. Example:

aws-toolkit-vscode/packages/core/src/shared/globalState.ts

Line 212 in a264377

getRedshiftConnection(warehouseArn: string): redshift.ConnectionParams | undefined | 'DELETE_CONNECTION' {

Analogous case for settings (as opposed to globalState):

aws-toolkit-vscode/packages/core/src/shared/settings.ts

Lines 663 to 672 in a264377

public isPromptEnabled(promptName: amazonQPromptName): boolean {
try {
// Legacy migration for old globalState settings:
if (promptName === 'amazonQChatDisclaimer') {
const acknowledged = globals.globalState.tryGet('aws.amazonq.disclaimerAcknowledged', Boolean, false)
if (acknowledged) {
void this.update(promptName, true)
globals.globalState.tryUpdate('aws.amazonq.disclaimerAcknowledged', undefined)
}
}

hayemaxi
hayemaxi reviewed Apr 16, 2025
View reviewed changes
@opieter-aws opieter-aws requested a review from a team as a code owner April 16, 2025 20:26
hayemaxi
hayemaxi reviewed Apr 16, 2025
View reviewed changes
@opieter-aws opieter-aws requested a review from hayemaxi April 16, 2025 21:32
justinmk3
justinmk3 reviewed Apr 16, 2025
View reviewed changes
justinmk3
justinmk3 reviewed Apr 16, 2025
View reviewed changes
@opieter-aws opieter-aws requested a review from justinmk3 April 17, 2025 10:48
@opieter-aws opieter-aws merged commit e61ab96 into aws:feature/amazonqLSP-auth Apr 17, 2025
2 of 22 checks passed
@opieter-aws opieter-aws deleted the feature/amazonqLSP-auth-customizations branch April 18, 2025 19:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@hayemaxi hayemaxi Awaiting requested review from hayemaxi

1 more reviewer

@justinmk3 justinmk3 justinmk3 approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@opieter-aws @justinmk3 @hayemaxi