feat(sagemaker): Merge SageMaker SSH Kiro integration #8542
+3,554
−515
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
…#2323) ## Problem Prior to Kiro v0.8.0, when a user attempted to connect to a SageMaker Space, we would install the required sagemaker-ssh-kiro extension, but it would fail to activate unless the user configured the IDE to permit that extension to use specific proposed APIs (resolvers, contribViewsRemote). ## Solution Kiro v0.8.0 has allow listed the sagemaker-ssh-kiro extension to use the required proposed APIs, so we are updating the minimum required version to be v0.8.0 to streamline the user experience. --- - 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 customers connect to a SageMaker Space in the Kiro IDE via deep link from the SageMaker web portal, the connection fails with an error message if the SageMaker SSH Kiro extension is not installed. This creates a poor user experience as the remote workspace window opens but cannot establish the connection. ## Solution Updated the deep link URI handler (`deeplinkConnect`) to ensure the SageMaker SSH Kiro extension is installed before attempting the remote connection. This brings the deep link flow in line with the existing AWS Toolkit UI flow, which already includes this validation step. --- - 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: invictus <[email protected]>
## 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/smus-m2-kiro git merge origin/staging git commit git push origin HEAD:refs/heads/autoMerge/feature/smus-m2-kiro ``` --------- Co-authored-by: Keen Wilson <[email protected]> Co-authored-by: Bhavya Sharma <[email protected]> Co-authored-by: satyaki <[email protected]> Co-authored-by: Chris Mendoza <[email protected]> Co-authored-by: Kevin DeJong <[email protected]> Co-authored-by: Akila Tennakoon <[email protected]> Co-authored-by: Akila Tennakoon <[email protected]> Co-authored-by: Deep Furiya <[email protected]> Co-authored-by: Deep Furiya <[email protected]> Co-authored-by: Roger Zhang <[email protected]> Co-authored-by: vicheey <[email protected]> Co-authored-by: chungjac <[email protected]> Co-authored-by: Bhargav <[email protected]> Co-authored-by: Bhargava Varadharajan <[email protected]> Co-authored-by: Keyu Wu <[email protected]> Co-authored-by: Renato Valenzuela <[email protected]> Co-authored-by: Aseem sharma <[email protected]> Co-authored-by: invictus <[email protected]> Co-authored-by: Reed Hamilton <[email protected]> Co-authored-by: Zeeshan Ahmed <[email protected]> Co-authored-by: Will Lo <[email protected]> Co-authored-by: aws-toolkit-automation <> Co-authored-by: Shruti Sinha <[email protected]> Co-authored-by: kzr <[email protected]> Co-authored-by: kzr-at-amazon <[email protected]> Co-authored-by: David <[email protected]> Co-authored-by: David Hasani <[email protected]> Co-authored-by: Dylan Ross <[email protected]>
## 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: aws-toolkit-automation <[email protected]> Co-authored-by: Keen Wilson <[email protected]> Co-authored-by: Bhavya Sharma <[email protected]> Co-authored-by: aws-ides-bot <[email protected]> Co-authored-by: satyaki <[email protected]> Co-authored-by: Chris Mendoza <[email protected]> Co-authored-by: Kevin DeJong <[email protected]> Co-authored-by: Akila Tennakoon <[email protected]> Co-authored-by: Akila Tennakoon <[email protected]> Co-authored-by: Deep Furiya <[email protected]> Co-authored-by: Deep Furiya <[email protected]> Co-authored-by: Roger Zhang <[email protected]> Co-authored-by: vicheey <[email protected]> Co-authored-by: chungjac <[email protected]> Co-authored-by: Bhargav <[email protected]> Co-authored-by: Bhargava Varadharajan <[email protected]> Co-authored-by: Keyu Wu <[email protected]> Co-authored-by: Renato Valenzuela <[email protected]> Co-authored-by: Aseem sharma <[email protected]> Co-authored-by: invictus <[email protected]> Co-authored-by: Reed Hamilton <[email protected]> Co-authored-by: Zeeshan Ahmed <[email protected]> Co-authored-by: Will Lo <[email protected]> Co-authored-by: aws-toolkit-automation <> Co-authored-by: Shruti Sinha <[email protected]> Co-authored-by: kzr <[email protected]> Co-authored-by: kzr-at-amazon <[email protected]> Co-authored-by: David <[email protected]> Co-authored-by: David Hasani <[email protected]> Co-authored-by: Dylan Ross <[email protected]>
|
⏳ 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. |
dylanraws
force-pushed
the
feature/smus-kiro
branch
from
ada1f71 to
c1fe34b
Compare
|
KHÔNG BUILD. Mục tiêu duy nhất: RÀ SOÁT – BÁO CÁO HIỆN TRẠNG PROJECT. Hãy trả lời CHỈ DƯỚI DẠNG BÁO CÁO KỸ THUẬT, theo đúng cấu trúc dưới đây. ==============================
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
10 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
SageMaker Studio currently supports the ability for customers to connect their local VS Code IDE to SageMaker Spaces from the AWS Toolkit extension, but this is not supported for the Kiro IDE due to the Remote SSH extension for VS Code not being supported.
Solution
Merge staged feature enhancement which allows SageMaker Studio customers to connect to Spaces from the Kiro IDE. This includes the
sagemaker-ssh-kirosidecar extension as a scoped-down replacement for the Remote SSH for specifically SageMaker use cases, which will be installed on-demand with user consent when needed during the remote access ingress.This PR includes a changelog entry.
feature/xbranches will not be squash-merged at release time.