Skip to content

Merge master into feature/logs #7319

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.

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

Open
wants to merge 28 commits into
base: feature/logs
Choose a base branch
from

Conversation

aws-toolkit-automation
Copy link
Collaborator

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/logs
git merge origin/master
git commit
git push origin HEAD:refs/heads/autoMerge/feature/logs

See individual commits for isolated changes

## Problem

We were seeing the following errors from the Q Language Server on
startup:
- `Amazon Q Profile is not selected for IDC connection type`
- `Amazon Q service is not signed in`

## Solution

We needed to do 2 solutions, each is a separate commit (see their
message). There were also some minor refactors.

In short:
- The Auth bearer token MUST be sent to the Q LSP before Profile is
sent. We were not doing this and it was causing an error
- When sending the Auth to the Q LSP, the startUrl MUST be included in
the request or else it would fail. We thought we were sending it but
based on the logs prefixed with `UpdateBearerToken` it showed`sso` did
not contain the startUrl

---

- 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](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.

---------

Signed-off-by: nkomonen-amazon <[email protected]>
@aws-toolkit-automation aws-toolkit-automation requested a review from a team as a code owner May 15, 2025 15:01
Copy link

  • 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.

ashishrp-aws and others added 9 commits May 15, 2025 12:30
#7314)

## Problem
We need to catch MCP server menu events on VSCode.

## Solution
- Updated runtimes for new VSCode requests for mcp servers.
- Added switch cases for mcp events.

---

- 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](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.
## Problem

We need a way to clear `globalState` since it looks like some users are
getting in to a bad corrputed state where things stop working.

Uninstalling the extension does not clear state, it is intentionally
designed that way by vscode, as we don't want to wipe states on
extension updates.

## Solution:

This creates a new command "Amazon Q: Clear extension cache" which
clears the cache and reloads the window.

There is safety modal which pops up right before clearing after the
command is selected.

---

- 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](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.

Signed-off-by: nkomonen-amazon <[email protected]>
## Problem

/transform was unnecessarily prompting users for their target JDK paths
in some cases.

## Solution

Remove the prompt.

---

- 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](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.

---------

Co-authored-by: David Hasani <[email protected]>
## Problem

In order to coordinate the new
aws/language-servers#1348 change,
GenerateCompletions requests would start expecting the `fileUri` field
to be set.

## Solution

Add `fileUri` to FileContext

---

- 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](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.

---------

Co-authored-by: Jiatong Li <[email protected]>
@aws-toolkit-automation aws-toolkit-automation requested a review from a team as a code owner May 19, 2025 20:05
jguoamz and others added 17 commits May 19, 2025 14:12
## Problem
- AgenticChat will add a grepSearch tool which depends on ripgrep binary

## Solution
- Add ripgrep path and make it executable

---

- 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](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.
## Problem

Our transformation now looks different, so we want the IDE to be able to
handle the new plan response.


## Solution

Implement parsing logic.

---

- 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](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.

---------

Co-authored-by: David Hasani <[email protected]>
## Problem

Prompting users to select one or multiple diffs is a very infrequently
used feature.


## Solution

Remove it.

---

- 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](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.

---------

Co-authored-by: David Hasani <[email protected]>
Team decides to remove .acds and only allow .abap as the file extension of abap language
Sometimes users MAY modify the LSP cache dir for reasons like
development.

We have a feature to clear cache, but right now it does not clear the
LSP cache.
Now we will additionally clear the LSP cache when the user runs the
command `Amazon Q: Clear extension cache`

---

- 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](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.

Signed-off-by: nkomonen-amazon <[email protected]>
Duplicate PR of #7357 into
Flare branch

## Problem
When ListRegionProfile call throttles for a subset of regions, we
currently do not throw, but instead return the available profiles in the
regions where the call succeeded. However, if that list is empty (no
profiles in that region), we return an empty list. This breaks the UI,
and causes a state that is not recoverable

## Solution
Throw an error in the scenario where availableProfiles is empty. This
triggers a retry state in the UI, making the state recoverable.


---

- 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](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.
## Problem:

In ticket V1761315147 it was being reported that createToken could take
9 seconds. This would mean that the SSO client API request would time
out

## Solution:

Bump the timeout to 12 seconds as specified in V1761315147



---

- 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](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.

Signed-off-by: nkomonen-amazon <[email protected]>
## Problem
The workspace LSP has been merged into the Amazon Q LSP (Flare). There
is no need to keep the non-flare workspace LSP, it will consume both CPU
and memory once it starts to index. This will make non agentic chat
experience not having `@file` or `@workspace ` but at this point we want
customers to use agentic chat. As such CPU and memory usage problem is
of higher priority.

## Solution
remove: disable workspace lsp

---

- 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](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.
## Problem

When users have a /transform tab open, then open a new tab and type
/transform, we open the existing /transform tab but don't show a
notification like IntelliJ does.

## Solution

Add notification in top right.

---

- 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](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.

Co-authored-by: David Hasani <[email protected]>
We are bumping the version as it is potentially related to V1793742233


---

- 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](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.

Signed-off-by: nkomonen-amazon <[email protected]>
Did this just to force our codepipeline to retrigger
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants