Merge master into feature/all-dev-changes#8786
Open
aws-toolkit-automation wants to merge 48 commits into
Open
Conversation
…ne-1 Auto merge/feature/smus rain milestone 1
fix(smus): DataExplorer parity with Portal
feat(smus): replace env cred with iam connection creds
feat(smus):replace isExpress logic
Merge staging into M2
…mus-rain-milestone-2
…ne-2 Auto merge/feature/smus rain milestone 2
…cture - Split getHyperpodSession into LC-only (kubectl) and async deeplink routes - Add getHyperpodSessionAsync with polling pattern matching jorus - Restructure hyperpod-space-profiles with localCredential/deepLink sections - Add persistHyperpodConnection to credentialMapping.ts - Add dl/lc connection types (smhp_dl, smhp_lc) with hostname encoding - Update connect scripts (ps1 + bash) with dl/lc routing and async polling - Remove redundant URL parsing from model.ts - Fix requestId mismatch: check initial-connection first in getHyperpodFreshEntry - Add unit tests for hyperpodMappingUtils, getHyperpodSession, getHyperpodSessionAsync
…utes refactor(sagemaker): align HyperPod session routes with jorus architecture
build(amazonq): merge release candidate version rc-20260513
The backend now supports cursor-remote and kiro-remote connection types
in addition to vscode-remote. Pass the IDE type from the caller to
createWorkspaceConnection so the K8s API creates the correct session.
- kubectlClientStub: accept ideType param, send ${ideType}-remote in spec
- kubectlClient: pass ideType through to super
- hyperpodCommands: pass getIdeType() for LC flow
- getHyperpodSession: pass PARENT_IDE_TYPE env var for server reconnection
## Problem Had some lint-duplicate errors when trying to merge in our feature branch to staging from some older commits that were created before the lint checks were running on the old feature branch. ## Solution Fixing them now. Verified in tooling and toolinglite projects in IDC domains, and an IAM domain. --- - 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>
feat(smus): Domain unification milestone 2 changes
## Problem - Transition status was not updating in real time. ## Solution - Modify how the node is updated. This allows for the polling mechanism to fetches the real status from Kubernetes and update the UI when transition completes. ## Testing - Tested locally via vsix --- - 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.
…#8743) ## Problem - On Windows, stale remote.SSH.remotePlatform entries accumulate over time as SageMaker/HyperPod connections are established but never cleaned up. This addresses a long-standing TODO in the codebase. ## Solution - On extension activation (Windows only), remove remotePlatform entries matching SageMaker hostname prefixes (sm_, smc_, smhp_, smhpc_). Runs fire-and-forget. Fresh entries are re-added during normal connection flow. ## Testing 1. Verified stale entries are cleaned on restart 2. Verified new entries are correctly added during connection --- - 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-type feat(sagemaker): pass IDE type to WorkspaceConnection API
Version 4.6.0 became stuck in a corrupt state on the VS Marketplace (partially registered but not installable). The Marketplace rejects re-publishing the same version number, so rolling forward to 4.6.1. ## Problem The first pipeline run for v4.6.0 partially registered the version on the VS Marketplace (metadata created) but the package upload never completed. This left 4.6.0 in a corrupt state: `vsce show` reports it exists, but `code --install-extension` fails and the web UI still shows 4.5.0. Subsequent publish retries all fail with "already exists." `vsce unpublish` did not clear the stuck state. ## Solution Bump the release version from 4.6.0 to 4.6.1. The release content (features, bug fixes) is identical — only the version number changes to bypass the Marketplace's rejection of the corrupted 4.6.0 entry. --- - 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.
build(amazonq): merge release candidate version rc-20260521
Add npm override to update jsonpath-plus to ^10.3.0. The package is pulled in transitively via @kubernetes/client-node and was outdated.
deps: Update transitive jsonpath-plus dependency
feat(sagemaker): Reconnection for parker spaces
feat(sagemaker): route detached server and SSM tunnel through IDE proxy settings
build(toolkits): merge release candidate version rc-20260611
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
13 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.
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):