Introduce region expansion feature #424

taldekar · 2025-04-21T22:02:25Z

Description of changes:

Add profile selection page
Add profile selection action in drop downs
Add current selected profile notification
Enable Q developer profiles

Justification of changes:

Authentication and Profile Management

Added QDeveloperProfileState event to force chat refresh every time the user switches the profile.
Introduced QDeveloperProfileUtil to centralize profile-related functionality.
Implemented delayed auth state change event publishing using a CompletableFuture in DefaultAuthStateManager.
Added profile caching support for re-authentication on restart.
Implemented profile clearing on logout.
Added SSO token hydration with start URL as required for IAM login.

Browser Handling

Consolidated browser management in AmazonQBrowserProvider, which now handles creating the browser as well as maintaining state.
AmazonQView is now the base class for stateful, browser-based views.
Optimized BrowserCompatibilityState publishing (now only published once unless changes occur).

View updates

Made views static in AmazonQViewContainer to introduce caching and prevent new views from being created everytime.
Converted ToolkitLoginWebView to be stateful.
Added "Change profile" option to drow-downs.

Miscellaneous

Updated GetConfigurationServerParams to require passing in the expected response type to minimize programmer errors when using this lsp call.

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

breedloj · 2025-04-23T19:16:14Z

.../src/software/aws/toolkits/eclipse/amazonq/configuration/profiles/QDeveloperProfileUtil.java

+    private QDeveloperProfile savedDeveloperProfile;
+    private QDeveloperProfile selectedDeveloperProfile;
+    private CompletableFuture<Void> profileSelectionTask;
+    private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();


ObjectMapperFactory

breedloj · 2025-04-23T19:19:51Z

.../src/software/aws/toolkits/eclipse/amazonq/configuration/profiles/QDeveloperProfileUtil.java

+        try {
+            return OBJECT_MAPPER.writeValueAsString(developerProfile);
+        } catch (JsonProcessingException e) {
+            e.printStackTrace();


Would at least need to go to our log - but these methods should probably bubble their exceptions up so they can be handled in the higher level workflows.

Makes sense. Will make the change.

breedloj · 2025-04-23T19:21:46Z

.../src/software/aws/toolkits/eclipse/amazonq/configuration/profiles/QDeveloperProfileUtil.java

+        String section = "aws.q";
+        Map<String, Object> settings = Map.of("profileArn", selectedDeveloperProfile.getArn());
+        Activator.getLspProvider().getAmazonQServer()
+                .thenCompose(server -> server.updateConfiguration(new UpdateConfigurationParams(section, settings)))


Ideally this and other configuration update logic should live in a specific component. The CustomizationUtil originally served that purpose but we've outgrown it.

Ahh I see, I'll look into this.

breedloj · 2025-04-23T19:22:49Z

plugin/src/software/aws/toolkits/eclipse/amazonq/lsp/QLspTypeAdapterFactory.java


 public class QLspTypeAdapterFactory implements TypeAdapterFactory {

    @Override
    @SuppressWarnings("unchecked")
    public final <T> TypeAdapter<T> create(final Gson gson, final TypeToken<T> type) {
+        if (type.getRawType() == LspServerConfigurations.class) {


Why do we need a specialized type adapter for this?

This was required because the getConfigurationFromServer call could return either a customization or profiles, and GSON wasn't able to handle the generics out of the box.

I see..that's unfortunate.

breedloj · 2025-04-23T19:24:00Z

plugin/src/software/aws/toolkits/eclipse/amazonq/lsp/manager/LspConstants.java

@@ -32,7 +32,7 @@ private LspConstants() {

    private static VersionRange createVersionRange() {
        try {
-            return VersionRange.createFromVersionSpec("[3.1.2, 3.10.0)");
+            return VersionRange.createFromVersionSpec("[3.1.100, 3.4.0)");


This was just for testing. Will narrow this down before merging, once I know the actual version spec.

breedloj · 2025-04-23T19:24:37Z

plugin/src/software/aws/toolkits/eclipse/amazonq/providers/assets/ChatWebViewAssetProvider.java

@@ -222,8 +222,7 @@ private String generateJS(final String jsEntrypoint) {
                                    quickActionCommands: %s,
                                    disclaimerAcknowledged: %b
                                });
-                            })
-                            .catch(error => console.error('Error initializing chat:', error));


Is there a reason we dropped this?

Oh dang. This is a regression. Wasn't intentional. I'll revert this.

breedloj · 2025-04-23T22:52:52Z

plugin/.settings/org.eclipse.m2e.core.prefs

+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1


What is the impact of checking this in?

This is a maven file. Wasn't sure if this was necessitated by other updates. I'll remove this.

I'll update the .gitignore as well.

breedloj · 2025-04-23T23:00:49Z

plugin/src/software/aws/toolkits/eclipse/amazonq/views/ChangeProfileDialog.java

+    private static final String WINDOW_TITLE = "Amazon Q Developer Profile";
+    private static final String HEADER = "Change your Q Developer profile";


nit: let's keep the casing consistent whenever we reference "Developer Profile"

breedloj · 2025-04-23T23:05:38Z

plugin/webview/src/q-ui/components/login.vue

@@ -4,8 +4,7 @@
 <!-- This Vue File is the login webview of AWS Toolkit and Amazon Q.-->
 <template>
    <div v-bind:class="[disabled ? 'disabled-form' : '']" class="auth-container centered-with-max-width">
-        <button v-if="(stage !== 'START' || cancellable) && stage !== 'AUTHENTICATING'" class="back-button" @click="handleBackButtonClick" tabindex="-1">
-            <svg width="24" height="24" viewBox="0 -3 13 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+        <button v-if="!['START', 'AUTHENTICATING', 'PROFILE_SELECT'].includes(stage) || cancellable" class="back-button" @click="handleBackButtonClick" tabindex="-1">            <svg width="24" height="24" viewBox="0 -3 13 16" fill="none" xmlns="http://www.w3.org/2000/svg">


Not sure this was intentional

This was intentional, but fixed the formatting issue.

breedloj · 2025-04-23T23:06:01Z

plugin/webview/src/q-ui/components/login.vue

@@ -74,11 +91,11 @@ export default defineComponent({
            if (this.cancellable) {
                window.ideApi.postMessage({command: 'toggleBrowser'})
            }
-            window.telemetryApi.postClickEvent("backButton")
+			window.telemetryApi.postClickEvent("backButton")


Seeing a lot of new tab characters in this file.

This is properly formatted on my machine. I believe Github is glitching with the webview files.

* Refactor to improve code quality * Improve user experience when changing profiles * Remove unnecessary getProfiles call * Preempt potential bug * Preempt potential bug * Add down arrow when scrollable * Add down arrow when scrollable * Fix checkstyle and minor QDeveloperProfileUtil interface update * Fix fetch profile loading indicator indent

Co-authored-by: Jonathan Breedlove <[email protected]> Co-authored-by: Ishan Taldekar <[email protected]>

…xpansion

Merge main into feature/regionExpansion

…sent

taldekar added 16 commits April 21, 2025 17:49

Add region expansion changes

607ffb4

Fix bug in remove listener

8cc4e24

Fix AmazonQBrowserProvider initialization bug

30d0c88

Move away from gamma

81d81a1

Revert DefaultLoginServiceTest

6c9754d

Revert internal codewhisperer flags

361258f

Fix DefaultLoginServiceTest

99781cb

Fix DefaultLoginServiceTest

f993305

Remove raw lsp message logging

829609a

Fix minor formatting issues

398b3c9

Fix minor formatting issues

f621afa

Fix browser preserving in login webview

ca945a4

Fix login view browser caching

f964453

Rename browser provider function for clarity

6c92606

Revert plugin.xml changes

1eee603

Revert plugin.xml changes

e289726

breedloj reviewed Apr 23, 2025

View reviewed changes

taldekar added 2 commits April 23, 2025 15:52

Cleanup addressing comments

a4df970

Fix asset provider regression

db49167

breedloj reviewed Apr 23, 2025

View reviewed changes

taldekar added 2 commits April 24, 2025 10:12

Fix formatting issues

935bf3d

Remove maven settings

d42d6e6

nborges-aws approved these changes Apr 25, 2025

View reviewed changes

taldekar and others added 7 commits April 29, 2025 11:45

Address blocking in LspStartupActivity (#425) (#428)

54a98a8

Co-authored-by: Jonathan Breedlove <[email protected]> Co-authored-by: Ishan Taldekar <[email protected]>

Merge branch 'feature/regionExpansion' into autoMerge/feature/regionE…

656d0a4

…xpansion

Merge pull request #430 from aws/autoMerge/feature/regionExpansion

45ba81e

Merge main into feature/regionExpansion

Partial region expansion

1083257

Add support for cross-profile customizations

9a00b6d

Fix tests

9e419ee

taldekar added 7 commits May 14, 2025 16:12

Fix minor UX bugs

d0f6984

Add line when not scrollable instead of empty space

f57d7bd

Add profile name to customization dialog

93dbc9c

Add logic to verify profile and customization selection on start up

b9a9914

Remove unused initialization future

63f665b

Fix light theme in profile selection view

c692094

Validate incoming profiles to ensure that all required fields are pre…

7a57c81

…sent

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Introduce region expansion feature #424

Introduce region expansion feature #424

taldekar commented Apr 21, 2025 •

edited

Loading

breedloj Apr 23, 2025

breedloj Apr 23, 2025

taldekar Apr 23, 2025

breedloj Apr 23, 2025

taldekar Apr 23, 2025

breedloj Apr 23, 2025

taldekar Apr 23, 2025

breedloj Apr 23, 2025 •

edited

Loading

breedloj Apr 23, 2025

taldekar Apr 23, 2025

breedloj Apr 23, 2025

taldekar Apr 23, 2025

breedloj Apr 23, 2025

taldekar Apr 24, 2025

taldekar Apr 24, 2025

breedloj Apr 23, 2025

taldekar Apr 24, 2025

breedloj Apr 23, 2025

taldekar Apr 24, 2025

breedloj Apr 23, 2025

taldekar Apr 24, 2025

		private static final String WINDOW_TITLE = "Amazon Q Developer Profile";
		private static final String HEADER = "Change your Q Developer profile";

Introduce region expansion feature #424

Are you sure you want to change the base?

Introduce region expansion feature #424

Conversation

taldekar commented Apr 21, 2025 • edited Loading

Description of changes:

Justification of changes:

Authentication and Profile Management

Browser Handling

View updates

Miscellaneous

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

breedloj Apr 23, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

taldekar commented Apr 21, 2025 •

edited

Loading

breedloj Apr 23, 2025 •

edited

Loading