Skip to content

Merge master into feature/stepfunctions-execution #7549

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 179 commits into
base: feature/stepfunctions-execution
Choose a base branch
from

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

samgst-amazon and others added 4 commits June 23, 2025 14:25
…ble deployment from WFS (#7315)

## Problem

- Save telemetry was being recorded for all document saves in VS Code,
not just for the active workflow studio document.
- Save & Deploy functionality required closing Workflow Studio before
starting deployment


## Solution

- Add URI comparison check to ensure telemetry is only recorded when the
saved document matches the current workflow studio document.
- Refactored publishStateMachine.ts to accept an optional TextDocument
parameter and updated activation.ts to support new interface
- Removed closeCustomEditorMessageHandler call from
saveFileAndDeployMessageHandler


---

- 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: Diler Zaza <[email protected]>
@aws-toolkit-automation aws-toolkit-automation requested a review from a team as a code owner June 24, 2025 18:37
Copy link

  • This pull request modifies code in src/* but no tests were added/updated.
    • Confirm whether tests should be added or ensure the PR description explains why tests are not required.

## Problem

Instead of running `mvn dependency:copy-dependencies` and `mvn clean
install`, we have a JAR that we can execute which will gather all of the
project dependencies as well as some important metadata stored in a
`compilations.json` file which our service will use to improve the
quality of transformations.


## Solution

Remove Maven shell commands; add custom JAR execution.


---

- 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]>
@aws-toolkit-automation aws-toolkit-automation requested a review from a team as a code owner June 24, 2025 20:17
samgst-amazon and others added 22 commits June 24, 2025 14:55
fix(amazonq): migrate process.env proxy setting handling to proxyUtil.ts
## Problem

Minor text update request.

## Solution

Update text.

---

- 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]>
fix(amazonq): fix for amazon q app initialization failure on sagemaker
fix(amazonq): Re-enable experimental proxy support
## Problem

step functions still uses sdk v2

## Solution

- Refactor `DefaultStepFunctionsClient` to `StepFunctionsClient` using
ClientWrapper.
- Refactor references to `DefaultStepFunctionsClient` with
`StepFunctionsClient` and reference sdk v3 types

## Verification
- Verified CreateStateMachine, UpdateStateMachine works and
creates/updates StateMachine
- Verified AWS Explorer lists all StateMachines using ListStateMachine
- Verified StartExecution works
- Verified TestState, ListIAMRoles works in Workflow Studio, which also
fixes the bug that variables cannot be used in TestState in Workflow
Studio
- fixes #6819

![TestStateWithVariables](https://github.com/user-attachments/assets/ab981622-b773-4983-a9ce-a70c8fcfc711)
---

- 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.
fix(amazonq): Remove incompatible Node 18 flag
singhAws and others added 27 commits July 20, 2025 16:54
## Problem

This reverts commit ab7fb6a.

## 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.
…ence and imports (#7709)

## Problem
After Flare migration, the code references and imports are not properly
render on suggestion being shown.

## Solution
correctly update the on show inlay hints for code reference and imports

---

- 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.
…ation (#7728)

## Problem
This change has no customer facing impact.
duration -> sessionDuration (correct)
Previously this metrics is wrongly recorded to duration and got
overwritten by the metrics wrapper

## Solution
Change to use sessionDuration correctly

---

- 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
We needed a solution to 1 click access the logs on the disk. 

## Solution
Implemented a button for it. And also wired the related language server
changes for this.

---

- 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.
fix(amazonq): fix finding suppression, change icon, change tool name
…ace condition (#7734)

## Problem

When Q is editing (on accept, on reject is in progress), if we trigger
again, the session is not closed yet, global state varaibles are still
in progress to be cleared, and we will report wrong user trigger
decision telemetry. This is worse for acceptance since it has a await
sleep for diagnostics to update.

## Solution

Do not let it trigger when Q is editing!  

This is not customer facing so no change log. 

---

- 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.
feat(auth): Display second quickpick for SSO linked IAM profiles
)

## Problem

Currently, users need to manually click buttons or use the command
palette to execute common shell
commands (reject/run/stop) in the IDE. This creates friction in the
developer workflow, especially
for power users who prefer keyboard shortcuts.

## Solution

Reopen [Na's PR](#7178)
that added keyboard shortcuts for reject/run/stop shell commands

Update to align with new requirements.

Add VS Code feature flag (shortcut)

Only available if Q is focused

## Screenshots


https://github.com/user-attachments/assets/84df262e-2b92-456d-a8ae-bc2f1fd6318c

---

- 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

Unnecessary notes doc not needed in repo.

## Solution

Remove doc.

---

- 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
Log folder was getting highlighted instead of the file. 

## Solution
Pointed to the file itself instead of the folder.

---

- 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.
fix(amazonq): re-name shortcut to re-use for MCP tools
## Problem
Needed to add a new drop down show logs button at the top. Having just a
web view button would lead to this functionality not work incase the LS
doesnt work.

## Solution
Added the same show logs functionality in the top drop down.
<img width="933" height="448" alt="image"
src="https://github.com/user-attachments/assets/00121f11-52b6-4aba-a183-4b2fd10c5c38"
/>


---

- 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
- There is lot of duplicate and unwanted redundant code in
[aws-toolkit-vscode](https://github.com/aws/aws-toolkit-vscode)
repository.

## Solution

- This is the first PR to remove unwanted 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.
@aws-toolkit-automation aws-toolkit-automation requested a review from a team as a code owner July 24, 2025 17:25
atonaamz and others added 2 commits July 24, 2025 11:03
## Problem
Added another code setting for show logs.

## Solution
Added another code setting for show logs.

---

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