Skip to content

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

## Note
**There is still a little bit more work needed for fully migrating
aws-sdk v2 to v3, specifically all of these clients
[here](https://github.com/aws/aws-toolkit-vscode/blob/59fd17fcfa22798e78d0df196290edb4a070f7ec/packages/core/scripts/build/generateServiceClient.ts#L232-L251)
from the `generateServiceClient.ts` script**


## Problem
AWS SDK V2 is at EOL

## Solution
Migrate AWS SDK V2 to V3

This work has been done in the `feature/v2-to-v3-migration` feature
branch and thus merging it into `master`

Here are the PRs, which this does not include the merges from main and
resolving conflicts:
- #8043
- #8042
- #8046
- #8054
- #8041
- #8056
- #8081
- #8069
- #8067
- #8093
- #8095
- #8094
- #8171
- #8159
- #8175
- #8182



## Testing
Manually tested the [prerelease
builds](https://github.com/aws/aws-toolkit-vscode/releases/tag/pre-v2-to-v3-migration)


https://github.com/user-attachments/assets/b1d4795c-4027-462e-a195-509ac4a9d8ae


---

- 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: Tai Lai <[email protected]>
Co-authored-by: invictus <[email protected]>
Co-authored-by: Laxman Reddy <[email protected]>
@aws-toolkit-automation aws-toolkit-automation requested a review from a team as a code owner October 21, 2025 18:31
dylanraws and others added 2 commits October 22, 2025 11:15
## Problem
When a user tries to connect to a SageMaker Space that is in the Stopped
status (i.e., the underlying App is Deleted or has not been created),
the Space will be automatically started by the toolkit before the
connection is attempted. In some cases, the Space reaches the Running
status (i.e., the App reaches the InService status) but the remote
access capability is not yet ready as it starts asynchronously, leading
to the SageMaker:StartSession API receiving an Internal Failure
response. The client already retries, but the retries happen too
quickly, before remote access becomes ready.

## Solution
Adjust the SageMaker client retry configuration for StartSession calls
made from the detached server (called via the `sagemaker_connect`
script) to spread out the retries over multiple seconds.

---

- 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: Laxman Reddy <[email protected]>
## Problem
Some of the unit tests were flakey

## Solution
Remove flakey test. We are okay to do this because the project scan flow
is no longer in use

---

- 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: Blake Lazarine <[email protected]>
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.

4 participants