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 12 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]>
- This merges the released changes for rc-20251022 into main.


---

- 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 <>
…8229)

- migrating this PR:
aws/aws-toolkit-vscode-staging#2248


---

- 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-ides-bot <[email protected]>
Co-authored-by: aws-toolkit-automation <[email protected]>
Co-authored-by: tobixlea <[email protected]>
Co-authored-by: Sherry Lu <[email protected]>
## Problem

<img width="2353" height="362" alt="image"
src="https://github.com/user-attachments/assets/4d98944f-8d7a-4dcd-98d2-8dd0e9fb1891"
/>

## Solution

- Skipping this test for now. Lambda team will work on a fix and
reenable this soon.
---

- 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
The test is checking for a popup to confirm overwrite of the SAM
template. It is most likely getting blocked due to the "Scanning
cloudformation template" warning popup that shows up before.

## Solution
#3510 says disabling AWS
SAM Codelens removes the aforementioned popup so I added a statement to
disable the statement beforehand, and enabled it after this test runs so
as not to impact other tests.

---

- 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 merges the released changes for rc-20251030 into main.
MCM-137408423


## 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: tobixlea <[email protected]>
Co-authored-by: aws-toolkit-automation <>
## Problem

Customer feedback about wanting more job attributes to be present in the
job history table.

## Solution

Add more info columns to the job history table.

---

- 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: David Hasani <[email protected]>
## Problem
In the Amazon Q Welcome Walkthrough, the "Scan your current project"
button under "Check for security vulnerabilities" feature is
non-functional and does not initiate any scanning process when clicked.

#### Steps to Reproduce

- Click the 3-dot menu (⋯) above the chat interface
- Select "Help" from the dropdown menu
- Choose "Welcome Walkthrough" option
- Navigate to "Check for security vulnerabilities" section
- Click the "Scan your current project" button

<img width="2778" height="1896" alt="image"
src="https://github.com/user-attachments/assets/3e1a271a-c617-4e51-ae11-3fa538e54c3b"
/>

## Solution

- Remove this user experience as this is a part of agentic chat
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.

---------

Co-authored-by: seshubaws <[email protected]>
## Problem
One of our previous PR: #7997 removed one of the intended user-agent for
remote debugging. Adding this back

## Solution
Add the intended user-agent back

---

- 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.
#8249)

## Problem
Users will face a host identification issue when reconnecting to a Space
after restarting it, if the Space name has capital letters. This occurs
because the Space's hostname is written to the known_hosts file in
lowercase, but hostname matching during reconnection is case-sensitive.

## Solution
When removing the Space hostname from the known_hosts file, ensure to
remove lines that match the lowercase variant of the Space hostname.

---

- 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]>
…n process (#8247)

## Problem
Users had no idea what was happening during connecting to remote space,
which can take few seconds to connect.
User clicks "Connect" → Nothing visible happens for few seconds → Either
success or failure

## Solution
Adds progress tracking for SageMaker space connections which shows
connection status with space name in progress dialog
Test cases are not being added because it is just showing the user about
progress during Space operations for good user experience.

## Testing 
Tested for both SM-AI and SMUS Spaces. 

1.
https://github.com/user-attachments/assets/20b02db3-7b6b-44d3-8e83-66d4e468da2c

2.
https://github.com/user-attachments/assets/e2196483-b935-45d3-ae00-86e4163d298e
---





- 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]>
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.

10 participants