-
Notifications
You must be signed in to change notification settings - Fork 746
Merge master into feature/ui-e2e-tests #7680
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
Merged
Hweinstock
merged 83 commits into
feature/ui-e2e-tests
from
autoMerge/feature/ui-e2e-tests
Jul 25, 2025
Merged
Merge master into feature/ui-e2e-tests #7680
Hweinstock
merged 83 commits into
feature/ui-e2e-tests
from
autoMerge/feature/ui-e2e-tests
Jul 25, 2025
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…7678) ## Problem * Enhanced Developer Experience - Current Remote Lambda debugging options are limited, primarily relying on print statements. LDK will significantly improve the developer experience by allowing real-time inspection of variables and execution flow. * Authentic Environment Debugging - Customers are eager to debug in the actual Lambda environment. However, Lambda doesn't allow direct SSH connections from external sources, making it challenging to access the runtime for debugging purposes. * Advantages over Local Debugging - While local debugging is a common alternative, Remote debugging offers significant benefits: Access to resources within VPCs, Ability to follow specific IAM rules and permissions which are typically not possible in a local debugging solution. * Efficient Problem Resolution - Debugging in the real Lambda environment provides the shortest path to identifying and resolving issues, as it eliminates [discrepancies](aws/aws-lambda-base-images#112) between local and real Lambda environments. ## Solution Remote debugging (LDK) enable developers to remote debug live Lambda functions from AWS Toolkit for Visual Studio Code. LDK creates a secure tunnel between a developer’s local computer and a live Lambda function running in the cloud. With LDK, developers can use Visual Studio Code debugger to debug a running Lambda function, set break points, inspect variables, and step through the code. ### File structure - ldkClient.ts - Implement API calls to IoT & Lambda - localproxy.ts - Implement the local proxy to connect to the IoT SecureTunneling(ST) websocket and create a proxy tcp server - ldkController.ts - Control the debug workflow ### UI update  ### Arch  ### Sequence Diagram  --- - 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 Duplicate code linter was finding errors in the `utils` tests for Lambda ## Solution Remove duplicate code (now relying on already existing `mockLambda`) --- - 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.
## Notes - feat(sagemaker): Merging Feature/sagemaker-connect-phase-2 to master - Reference PR: #7677 --- - 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: aws-toolkit-automation <[email protected]> Co-authored-by: Roger Zhang <[email protected]> Co-authored-by: Reed Hamilton <[email protected]> Co-authored-by: Jacob Chung <[email protected]> Co-authored-by: aws-ides-bot <[email protected]> Co-authored-by: aws-asolidu <[email protected]> Co-authored-by: Newton Der <[email protected]> Co-authored-by: Newton Der <[email protected]>
… to reconnect (#7684) ## Problem - When reconnecting to multiple SageMaker Spaces (either via deeplink or from within the VS Code extension), a **race condition** occurs when writing to shared temporary files. This can cause the local SageMaker server to crash due to concurrent access. - Need clearer error messaging when reconnection to a deeplinked space is attempted without an active Studio login. ## Solution - For connections initiated from the VS Code extension, we generate **unique temporary files** to read the response json. - For deeplink-based reconnections, we introduce a **queue** to process session requests sequentially. - Add `remote_access_token_refresh` flag to the refresh URL to enable the Studio server to return more specific error messages. --- - 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.
## Changes Adding the simple chat prompt test. --- - 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.
…rigger on acceptance
…logs (#7689) ## Problem - Removing feature flag for Code Review tool - Removed change logs for the above too --- - 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.
… keep it consistent in all places
feat(amazonq): write logs to disk with rotation & cleanup
fix(amazonq): handle suppress single finding, change icon
## Problem applyDiff may fail and the consequence is the `newCode` to update become empty string, thus deleting all users' code. ## Before https://github.com/user-attachments/assets/6524bae2-1374-452d-bb4e-3ec6f865c258 ## After https://github.com/user-attachments/assets/75d5ed7a-6940-4432-a8d9-73c485afb2c3 ## Solution --- - 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 This pr: #7670 didn't been covered by the unit test ## Solution Add unit test for the activation initialize method. --- - 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.
…nput (#7697) ## Problem The auto trigger classifier needs the entire document change event as input to correctly predict whether to make auto trigger or not. This code path was lost when we migrate inline completion to Flare (language server). ## Solution Implement the IDE side changes for below PRs: aws/language-server-runtimes#618 aws/language-servers#1912 https://github.com/aws/language-servers/pull/1914/files --- - 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.
…ation (#7728) ## Problem This change has no customer facing impact. duration -> sessionDuration (correct) Previously this metrics is wrongly recorded to duration and got overwritten by the metrics wrapper ## Solution Change to use sessionDuration correctly --- - 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 needed a solution to 1 click access the logs on the disk. ## Solution Implemented a button for it. And also wired the related language server changes for this. --- - 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.
fix(amazonq): fix finding suppression, change icon, change tool name
## Change This is a large PR for all the baseline setup of the framework. It includes the auth, setup, 4 test suites and the abstractions for each, and the cleanup functions. --- - 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.
…ace condition (#7734) ## Problem When Q is editing (on accept, on reject is in progress), if we trigger again, the session is not closed yet, global state varaibles are still in progress to be cleared, and we will report wrong user trigger decision telemetry. This is worse for acceptance since it has a await sleep for diagnostics to update. ## Solution Do not let it trigger when Q is editing! This is not customer facing so no change log. --- - 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.
feat(auth): Display second quickpick for SSO linked IAM profiles
) ## Problem Currently, users need to manually click buttons or use the command palette to execute common shell commands (reject/run/stop) in the IDE. This creates friction in the developer workflow, especially for power users who prefer keyboard shortcuts. ## Solution Reopen [Na's PR](#7178) that added keyboard shortcuts for reject/run/stop shell commands Update to align with new requirements. Add VS Code feature flag (shortcut) Only available if Q is focused ## Screenshots https://github.com/user-attachments/assets/84df262e-2b92-456d-a8ae-bc2f1fd6318c --- - 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.
This reverts commit d0082e6.
… properly placing resources in new directory
## Problem Unnecessary notes doc not needed in repo. ## Solution Remove doc. --- - 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 Log folder was getting highlighted instead of the file. ## Solution Pointed to the file itself instead of the folder. --- - 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.
fix(amazonq): re-name shortcut to re-use for MCP tools
…e highlightedRanges
## Problem Needed to add a new drop down show logs button at the top. Having just a web view button would lead to this functionality not work incase the LS doesnt work. ## Solution Added the same show logs functionality in the top drop down. <img width="933" height="448" alt="image" src="https://github.com/user-attachments/assets/00121f11-52b6-4aba-a183-4b2fd10c5c38" /> --- - 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.
## Change I added the gitignore fix --- - 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 - There is lot of duplicate and unwanted redundant code in [aws-toolkit-vscode](https://github.com/aws/aws-toolkit-vscode) repository. ## Solution - This is the first PR to remove unwanted code. --- - 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.
…e highlightedRanges
## Problem Added another code setting for show logs. ## Solution Added another code setting for show logs. --- - 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.
Hweinstock
approved these changes
Jul 25, 2025
laura-codess
added a commit
to laura-codess/aws-toolkit-vscode
that referenced
this pull request
Aug 10, 2025
- 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. 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/ui-e2e-tests git merge origin/master git commit git push origin HEAD:refs/heads/autoMerge/feature/ui-e2e-tests ``` --------- Co-authored-by: Roger Zhang <[email protected]> Co-authored-by: 🥩 Flora <[email protected]> Co-authored-by: Reed Hamilton <[email protected]> Co-authored-by: Laxman Reddy <[email protected]> Co-authored-by: Roger Zhang <[email protected]> Co-authored-by: Jacob Chung <[email protected]> Co-authored-by: aws-asolidu <[email protected]> Co-authored-by: Newton Der <[email protected]> Co-authored-by: Newton Der <[email protected]> Co-authored-by: aws-toolkit-automation <> Co-authored-by: laura-codess <[email protected]> Co-authored-by: Tyrone Smith <[email protected]> Co-authored-by: Aidan Ton <[email protected]> Co-authored-by: abhraina-aws <[email protected]> Co-authored-by: atontb <[email protected]> Co-authored-by: Nitish <[email protected]> Co-authored-by: Nitish Kumar Singh <[email protected]> Co-authored-by: Blake Lazarine <[email protected]> Co-authored-by: mkovelam <[email protected]> Co-authored-by: BlakeLazarine <[email protected]> Co-authored-by: Will Lo <[email protected]> Co-authored-by: Na Yue <[email protected]> Co-authored-by: Lei Gao <[email protected]> Co-authored-by: tsmithsz <[email protected]> Co-authored-by: Reed Hamilton <[email protected]> Co-authored-by: surajrdy-aws <[email protected]> Co-authored-by: Boyu <[email protected]> Co-authored-by: Dung Dong <[email protected]>
laura-codess
added a commit
to laura-codess/aws-toolkit-vscode
that referenced
this pull request
Aug 11, 2025
- 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. 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/ui-e2e-tests git merge origin/master git commit git push origin HEAD:refs/heads/autoMerge/feature/ui-e2e-tests ``` --------- Co-authored-by: Roger Zhang <[email protected]> Co-authored-by: 🥩 Flora <[email protected]> Co-authored-by: Reed Hamilton <[email protected]> Co-authored-by: Laxman Reddy <[email protected]> Co-authored-by: Roger Zhang <[email protected]> Co-authored-by: Jacob Chung <[email protected]> Co-authored-by: aws-asolidu <[email protected]> Co-authored-by: Newton Der <[email protected]> Co-authored-by: Newton Der <[email protected]> Co-authored-by: aws-toolkit-automation <> Co-authored-by: laura-codess <[email protected]> Co-authored-by: Tyrone Smith <[email protected]> Co-authored-by: Aidan Ton <[email protected]> Co-authored-by: abhraina-aws <[email protected]> Co-authored-by: atontb <[email protected]> Co-authored-by: Nitish <[email protected]> Co-authored-by: Nitish Kumar Singh <[email protected]> Co-authored-by: Blake Lazarine <[email protected]> Co-authored-by: mkovelam <[email protected]> Co-authored-by: BlakeLazarine <[email protected]> Co-authored-by: Will Lo <[email protected]> Co-authored-by: Na Yue <[email protected]> Co-authored-by: Lei Gao <[email protected]> Co-authored-by: tsmithsz <[email protected]> Co-authored-by: Reed Hamilton <[email protected]> Co-authored-by: surajrdy-aws <[email protected]> Co-authored-by: Boyu <[email protected]> Co-authored-by: Dung Dong <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Automatic merge failed
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):