Merge main into feature/q-lsp #5537

aws-toolkit-automation · 2025-04-08T18:19:06Z

Automatic merge failed

Resolve conflicts and push to this PR branch.
Do not squash-merge this PR. Use the "Create a merge commit" option to do a regular merge.

Command line hint

To perform the merge from the command line, you could do something like the following (where "origin" is the name of the remote in your local git repo):

git stash
git fetch --all
git checkout origin/feature/q-lsp
git merge origin/main
git commit
git push origin HEAD:refs/heads/autoMerge/feature/q-lsp

…nged (#2004) * add sessionClear * change listener to project level * change listener param * fx * ensure dev/test/review work * linter * hack * update endpoint * delete loh * revert transform change * cr * update session clear * leave stopModernize in codeModernizerManager --------- Co-authored-by: Will Lo <[email protected]> Co-authored-by: Will Lo <[email protected]>

* add * retain id * sync

* move validate in factory * centralize all clients

* changlog * update

* Add ability to filter tests based on feature * feedback

* fix empty profile name provided as the response * Update plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/profile/QRegionProfileManager.kt Co-authored-by: Richard Li <[email protected]> --------- Co-authored-by: Richard Li <[email protected]> Co-authored-by: evanliu048 <[email protected]>

Avoid calling ListAvailableProfiles at a higher frequency by: -Calling this API only when it's in the ProfileSelection stage -Using AwsResourceCache to cache the api result and retrieve it after the cache expired.

…files is long (#5547) `CodeWhispererStatusBarWidget` attempts to query active connections, but lock is being held while trying to list profiles ``` "AWT-EventQueue-0" prio=0 tid=0x0 nid=0x0 blocked java.lang.Thread.State: BLOCKED on software.aws.toolkits.jetbrains.core.credentials.DefaultToolkitConnectionManager@37995400 owned by "ApplicationImpl pooled thread 5 @coroutine#17104" Id=128 at software.aws.toolkits.jetbrains.core.credentials.DefaultToolkitConnectionManager.activeConnectionForFeature(DefaultToolkitConnectionManager.kt) at software.aws.toolkits.jetbrains.services.amazonq.QUtilsKt.calculateIfIamIdentityCenterConnection(QUtils.kt:18) at software.aws.toolkits.jetbrains.services.codewhisperer.customization.DefaultCodeWhispererModelConfigurator.activeCustomization(CodeWhispererModelConfigurator.kt:171) at software.aws.toolkits.jetbrains.services.codewhisperer.status.CodeWhispererStatusBarWidget.getSelectedValue(CodeWhispererStatusBarWidget.kt:114) at com.intellij.openapi.wm.impl.status.MultipleTextValues.beforeUpdate(IdeStatusBarImpl.kt:983) ``` ``` - "coroutine#17104":BlockingCoroutine{Active}@7dced952, state: RUNNING [CoroutineId(17104), BlockingEventLoop@2da7461c] at java.base/jdk.internal.misc.Unsafe.park(Native Method) at java.base/java.util.concurrent.locks.LockSupport.parkNanos(LockSupport.java:269) at java.base/java.util.concurrent.CompletableFuture$Signaller.block(CompletableFuture.java:1866) at java.base/java.util.concurrent.ForkJoinPool.unmanagedBlock(ForkJoinPool.java:4013) at java.base/java.util.concurrent.ForkJoinPool.managedBlock(ForkJoinPool.java:3961) at java.base/java.util.concurrent.CompletableFuture.timedGet(CompletableFuture.java:1939) at java.base/java.util.concurrent.CompletableFuture.get(CompletableFuture.java:2095) at migration.software.aws.toolkits.jetbrains.core.AwsResourceCache$Companion.wait(AwsResourceCache.kt:150) at migration.software.aws.toolkits.jetbrains.core.AwsResourceCache$Companion.access$wait(AwsResourceCache.kt:145) at migration.software.aws.toolkits.jetbrains.core.AwsResourceCache.getResourceNow(AwsResourceCache.kt:92) at migration.software.aws.toolkits.jetbrains.core.AwsResourceCache.getResourceNow(AwsResourceCache.kt:105) at software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfileManager.listRegionProfiles(QRegionProfileManager.kt:70) at software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfileManager.validateProfile$lambda$0(QRegionProfileManager.kt:50) at software.aws.toolkits.core.utils.ExceptionUtils.tryOrNull(ExceptionUtils.kt:11) at software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfileManager.validateProfile(QRegionProfileManager.kt:49) at software.aws.toolkits.jetbrains.services.amazonq.toolwindow.AmazonQToolWindowFactory$createToolWindowContent$2.activeConnectionChanged(AmazonQToolWindowFactory.kt:68) [...] at software.aws.toolkits.jetbrains.core.credentials.DefaultToolkitConnectionManager.switchConnection(DefaultToolkitConnectionManager.kt:159) ```

…ks (#5539) `@JsonIgnoreProperties` should be a class-level annotation

Fix test deleted in #5544

Conflicts: plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/startup/AmazonQStartupActivity.kt plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/service/CodeWhispererService.kt plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererCodeCoverageTrackerTest.kt plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererServiceTest.kt plugins/amazonq/codewhisperer/jetbrains-community/tstFixtures/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererTestUtil.kt

github-actions · 2025-04-10T17:24:36Z

Qodana Community for JVM

7 new problems were found

Inspection name	Severity	Problems
`Extension class should be final and non-public`	🔶 Warning	2
`Message format validation in properties files`	🔶 Warning	1
`Incorrect string capitalization`	🔶 Warning	1
`Unused symbol`	🔶 Warning	1
`Class naming convention`	◽️ Notice	1
`Nested lambda has shadowed implicit parameter`	◽️ Notice	1

💡 Qodana analysis was run in the pull request mode: only the changed files were checked
☁️ View the detailed Qodana report

Contact Qodana team

Contact us at [email protected]

Or via our issue tracker: https://jb.gg/qodana-issue
Or share your feedback: https://jb.gg/qodana-discussions

...ware/aws/toolkits/jetbrains/services/codewhisperer/credentials/CodeWhispererClientAdaptor.kt

-        ToolkitConnectionManager.getInstance(project).activeConnectionForFeature(QConnection.getInstance())?.getConnectionSettings()
-            ?.awsClient<CodeWhispererRuntimeClient>()
-            ?: throw Exception("attempt to get bearer client while there is no valid credential")
+open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeWhispererClientAdaptor {


...ware/aws/toolkits/jetbrains/services/codewhisperer/explorer/QStatusBarLoggedInActionGroup.kt

            add(CodeWhispererShowSettingsAction())
+            (
+                ToolkitConnectionManager.getInstance(it).activeConnectionForFeature(QConnection.getInstance()) as? AwsBearerTokenConnection
+                )?.takeIf { !it.isSono() }


...hared/jetbrains-community/resources/software/aws/toolkits/resources/AmazonQBundle.properties

 amazonq.workspace.settings.open.prompt=Workspace index is now enabled. You can disable it from Amazon Q settings.
-q.hello=Hello
+action.q.profile.usage.text=You changed profile
+action.q.profile.usage=You're using the '<b>{0}</b>' profile for Amazon Q.


...munity/src/software/aws/toolkits/jetbrains/services/amazonq/actions/QSwitchProfilesAction.kt

+import software.aws.toolkits.telemetry.MetricResult
+import software.aws.toolkits.telemetry.Telemetry
+
+class QSwitchProfilesAction : AnAction(message("action.q.switchProfiles.text")), DumbAware {


...tbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/profile/QEndpoints.kt

+    private val LOG = getLogger<QRegionEndpoint>()
+    data class QRegionEndpoint(val region: String, val endpoint: String)
+
+    object Q_DEFAULT_SERVICE_CONFIG {


...munity/src/software/aws/toolkits/jetbrains/services/amazonq/profile/QRegionProfileManager.kt

+
+@Service(Service.Level.APP)
+@State(name = "qProfileStates", storages = [Storage("aws.xml")])
+class QRegionProfileManager : PersistentStateComponent<QProfileState>, Disposable {


aws-toolkit-automation added 30 commits January 15, 2025 00:39

Merge public/main to private/staging

c3ddd40

Merge public/main to private/staging

33e8530

Merge public/main to private/staging

a6bc09c

Merge public/main to private/staging

7f85f6d

Merge public/main to private/staging

eb5d551

Merge public/main to private/staging

f806491

Merge public/main to private/staging

2b6ce05

Merge public/main to private/staging

9c9fa32

Merge public/main to private/staging

cad3f25

Merge public/main to private/staging

957e329

Merge public/main to private/staging

d6f3a2d

Merge public/main to private/staging

e604b8b

Merge public/main to private/staging

29205ed

Merge public/main to private/staging

1d11b7d

Merge public/main to private/staging

7877e7b

Merge public/main to private/staging

33a1b8e

Merge public/main to private/staging

cb0e587

Merge public/main to private/staging

0d02b1b

Merge public/main to private/staging

b2a5e4e

Merge public/main to private/staging

fcb70d7

Merge public/main to private/staging

5dc4aeb

Merge public/main to private/staging

92ad2cb

Merge public/main to private/staging

c566925

Merge public/main to private/staging

897126d

Merge public/main to private/staging

52c11da

Merge public/main to private/staging

be87d33

Merge public/main to private/staging

cde19fd

Merge public/main to private/staging

e594ace

Merge public/main to private/staging

02f92f5

Merge public/main to private/staging

61b9275

aws-toolkit-automation and others added 7 commits April 3, 2025 18:56

Merge staging into feature/q-region-expansion

2a9f303

fix(amazonq): update text in profile selection page and dialog (#2011)

066fd1d

* add * retain id * sync

fix(amazonq): validate outdated profile (#2012)

de4b199

* move validate in factory * centralize all clients

Merge public/main to private/staging

13a4e2c

Merge staging into feature/q-region-expansion

fbc3135

feat(amazonq): q region expansion changelog (#2013)

90d34be

* changlog * update

aws-toolkit-automation requested review from a team as code owners April 8, 2025 18:19

aws-toolkit-automation and others added 13 commits April 8, 2025 18:25

Updating version to 3.63

69d136c

Updating SNAPSHOT version to 3.64-SNAPSHOT

1d94b45

ci: Add ability to filter tests based on feature (#5496)

e2c709c

* Add ability to filter tests based on feature * feedback

fix(amazonq): cache the listAvailableProfiles result (#5544)

736a831

Avoid calling ListAvailableProfiles at a higher frequency by: -Calling this API only when it's in the ProfileSelection stage -Using AwsResourceCache to cache the api result and retrieve it after the cache expired.

docs: Fix changelog date

289a722

fix(amazonq): auto select profile when users only have 1 (#5548)

13436a4

Updating version to 3.64

52193e5

Updating SNAPSHOT version to 3.65-SNAPSHOT

ab902a3

fix(amazonq): fix deserialization failure from workspace context chun…

60bf703

…ks (#5539) `@JsonIgnoreProperties` should be a class-level annotation

fix(amazonq): fix failing QRegionProfileManagerTest (#5546)

3a66543

Fix test deleted in #5544

github-advanced-security bot found potential problems Apr 10, 2025

View reviewed changes

compile

35bab00

rli merged commit d03a641 into feature/q-lsp Apr 10, 2025
11 of 18 checks passed

rli deleted the autoMerge/feature/q-lsp branch April 10, 2025 18:23

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Merge main into feature/q-lsp #5537

Merge main into feature/q-lsp #5537

Uh oh!

aws-toolkit-automation commented Apr 8, 2025

Uh oh!

github-actions bot commented Apr 10, 2025 •

edited

Loading

Uh oh!

Check warning

Check notice

Check warning

Check warning

Check notice

Check warning

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Merge main into feature/q-lsp #5537

Merge main into feature/q-lsp #5537

Uh oh!

Conversation

aws-toolkit-automation commented Apr 8, 2025

Automatic merge failed

Command line hint

Uh oh!

github-actions bot commented Apr 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Qodana Community for JVM

Uh oh!

Check warning

Check notice

Check warning

Check warning

Check notice

Check warning

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

github-actions bot commented Apr 10, 2025 •

edited

Loading