Merge SageMaker SSH Kiro integration#8600
Open
kzr-at-amazon wants to merge 265 commits intoaws:masterfrom
Open
Merge SageMaker SSH Kiro integration#8600kzr-at-amazon wants to merge 265 commits intoaws:masterfrom
kzr-at-amazon wants to merge 265 commits intoaws:masterfrom
Conversation
## Problem This is to support the Lambda multi-tenancy feature in toolkit. ## Solution Add conditional Tenant ID field to Remote Invoke panel for multi-tenant Lambda functions. The field appears when function has TenancyConfig and passes the value to AWS Lambda Invoke API. <img width="333" height="381" alt="Screenshot 2026-01-29 at 10 08 54 AM" src="https://github.com/user-attachments/assets/b7048c07-2919-48e9-9bd0-ddfa89660f79" /> --- - 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: Chengjun Li <>
## Notes: - Adding change log for aws/language-servers#2610 --- - 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.
**Description** Added a local cache that will list the last 10 recently used domains during login. The data is stored in the memento storage, which is VSCode's SQLite DB abstraction for storing metadata for extensions. **Motivation** Better UX for login for customers who use multiple domains **Testing Done** Tested locally and also added unit tests ## Problem ## 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. Co-authored-by: Bhargava Varadharajan <vabharga@amazon.com>
This merges the released changes for rc-20260212 into main. MCM-144328882 --- - 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 <>
…ws#8586) ## Problem ## Solution `includePlatform` will append a platform surfix `Visual-Studil-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.
## Description This PR adds support for Cursor IDE by dynamically detecting the editor and using the appropriate Remote SSH extension. ## Changes - Detect Cursor IDE and use appropriate Remote SSH extension (`anysphere.remote-ssh` for Cursor vs `ms-vscode-remote.remote-ssh` for VS Code) - Refactor `VSCODE_EXTENSION_ID.remotessh` to include both `id` and `minVersion` properties - Update all references to use `remotessh.id` instead of direct string access - Remove deprecated `vscodeExtensionMinVersion` object ## Testing - Tested with Cursor IDE - Existing VS Code functionality remains unchanged --------- Co-authored-by: Arkaprava De <arkaprav@amazon.com> Co-authored-by: Newton Der <dernewtz@amazon.com> Co-authored-by: invictus <149003065+ashishrp-aws@users.noreply.github.com> Co-authored-by: msgupta <mgupta@onemedical.com> Co-authored-by: Newton Der <newton.der@gmail.com>
…r fails (aws#8580) ## Problem - aws#8537 introduced setupConsoleConnection() and getFunctionWithFallback() to handle authentication fallback for Lambda console-to-IDE transitions. - When developers click "Open in VSCode" and their local AWS profile is invalid, toolkit automatically triggers browser-based console login as a fallback. However, console login requires prerequisites that not all developers can complete. When developers cancel console login, the CLI never writes the connection profile to disk. The Toolkit then attempts to use this non-existent connection, resulting in "Connection does not exist" errors. <img width="471" height="265" alt="problem-before-the-fix-connection-does-not-exist" src="https://github.com/user-attachments/assets/fd973ce1-7b28-4474-8b55-b0408c67e0ce" /> ## Solution - Verify connection exists in `setupConsoleConnection()` after "aws.toolkit.auth.consoleLogin" completes - Show warning message with link to [prerequisites documentation](https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-sign-in.html#cli-configure-sign-in-prerequisites) when connection verification fails - Throw ToolkitError to halt execution and prevent downstream connection usage <img width="1293" height="302" alt="update-message-with-learnmore" src="https://github.com/user-attachments/assets/a1d35f14-4c42-43c1-8417-b6532ed00e9a" /> <img width="1042" height="625" alt="click-learnmore-show-dialog" src="https://github.com/user-attachments/assets/aace3330-4ea8-4bd8-ad24-e8e956f09c45" /> ### Background The Lambda load-function URI handler enables a seamless workflow where users can click "Open in Visual Studio Code" from the AWS Lambda console to view, edit, and deploy their Lambda functions directly in their preferred IDE. This feature downloads the function code locally, opens it in VS Code, and allows users to make changes and deploy updates back to AWS—all without leaving their development environment. --- - 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.
aws#2330) Create ~/AGENTS.md with SageMaker Unified Studio context when the AWS Toolkit activates on a remote SMUS Space. Uses HTML comment markers to manage a section within the file, preserving any user content outside the markers. Prompts the user before modifying an existing file that doesn't have markers. ## Problem When users connect to their space through their IDE, the code generated through the IDE lacks context about the user's project. We are adding an AGENTS.md and a context file that provides smus-specific context about the user's space. ## Solution When the AWS Toolkit activates on a remote SageMaker Unified Studio Space (isSageMaker('SMUS-SPACE-REMOTE-ACCESS')), it runs createAgentsFile() which creates AGENTS.md and links a separate smus-context.md to it. The AI agent picks this up and gets SMUS-specific context. -> If AGENTS.md doesn't exist, we create smus-context.md and a new AGENTS.md that just imports smus-context.md. -> If AGENTS.md does exist and there is no import statement, we prompt the user to modify their AGENTS.md with the import statement, and create smus-context.md. We do not overwrite any of their changes. -> If somehow smus-context.md exists but is not imported in AGENTS.md we can still write to it, but we shouldn't touch the AGENTS.md. That would mean a user doesn't want SMUS-context.md imported every time and we should respect that. ->If AGENTS.md exists and has the import for smus-context.md, we just write to SMUS-context.md without prompting the user. --- - 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: Ziwei Ba <ziwikiwi@amazon.com>
## Problem These merge artifacts were discovered when comparing the feature/smus-m2-kiro branch to the staging branch. - Entry for aws.smus.refresh command in toolkit/package.json - Duplicate amazonq changelog entry ## Solution Removed the changes. --- - 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: Bhargav <bhargavavaradh@gmail.com> Co-authored-by: Ziwei Ba <ziweichristina@gmail.com>
## Problem - New feature requires change log ## Solution - Added change log for new feature --- - 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: Bhargav <bhargavavaradh@gmail.com> Co-authored-by: Ziwei Ba <ziweichristina@gmail.com>
##Problem Right now, we don't support reconnection from toolkit for hyperpod spaces. ##Solution This PR will add the reconnection functionality which leads to seamless user experience. The duplicate check is failing but we need that code at 2 places, one for initial connection and in detached-server so that when the user closes the main window, detached server is able to provide the seamless user experience. ##Notes Tested the unit test cases and reconnection use cases end to end locally. --- - 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: msgupta <mgupta@onemedical.com> Co-authored-by: Laxman Reddy <141967714+laileni-aws@users.noreply.github.com> Co-authored-by: invictus <149003065+ashishrp-aws@users.noreply.github.com>
|
⏳ I'm reviewing this pull request for security vulnerabilities and code quality issues. I'll provide an update when I'm done |
|
✅ I finished the code review, and didn't find any security or code quality issues. |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
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.
Problem
Solution
feature/xbranches will not be squash-merged at release time.