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

@aws-toolkit-automation aws-toolkit-automation requested a review from a team as a code owner October 2, 2024 16:47
@aws-toolkit-automation aws-toolkit-automation requested a review from a team as a code owner December 3, 2024 22:16
aws-toolkit-automation and others added 25 commits August 5, 2025 16:38
**Description**

Added a mechanism to create Connection profiles and track it across
session for SMUS. UX after this PR :
- User login flow where they provide Domain URL -> Authenticate and have
an active session for however long SSO session is valid (default - 8
hours)

- User connection info is persisted and tracked across VSCode sessions.
User can close/reopen/quit and the session information is retained.

- User can have multiple connections - 1 in explorer and other in SMUS.
They can choose to use the SMUS connection in explorer also if they
want. For now, SMUS required login and no connection selection.

- SSO tokens are stored in the SSO token cache at `.aws/sso/cache`

- Tokens are refreshed reactively if it it close to expiry.

- When connection expires, user gets a notification and an option to
reauthenticate.

- User has ability to Sign Out from connection. This will also remove
the connection metadata. (No past connections history etc for now to
keep things simple).

Next steps :

- Provide credential provider to go from tokens to DER/Project role
credentials.

**Motivation**

Support auth flow in SMUS.

**Testing Done**

Unit tests and also tested all flows locally.

## 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: Bhargava Varadharajan <vabharga@amazon.com>
Co-authored-by: chungjac <chungjac@amazon.com>
## Problem
There is no change log for the auto debug feature.

## Solution

Add the needed 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.
## Problem
Need backend logic to fetch notebook training jobs for rendering pages

## Solution
- Add SageMaker client for fetching notebook training jobs
- Call SageMaker client in extension host, where it has access to
project role credentials for making API calls
- Add backend logic to transfer jobs between frontend and backend 
- Use Vue composable to store fetched data for reactive state rendering
- Update JobList page to consume fetched data from composable to render
page
- Update JobDetail page to consume fetched data from composable to
render job details

#### TODO
- Based on comments, move time formatting related utils to shared usage

#### List jobs page consuming fetched data for rendering jobs list
<img width="1372" height="1152" alt="Screenshot 2025-08-05 at 10 25
29 AM"
src="https://github.com/user-attachments/assets/c94277ac-024b-41e7-868d-a025a5f20b31"
/>

#### Job detail page using fetch jobs data for rendering job details
<img width="1372" height="1267" alt="Screenshot 2025-08-05 at 10 25
47 AM"
src="https://github.com/user-attachments/assets/d6c1f54c-7e31-4339-9794-de307cb3c7d1"
/>

---

- 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: chungjac <chungjac@amazon.com>
## Problem

related aws/language-servers#2058

Edits as a newly introduced feature, previously the implementation was
living in the same flow as Completion. However the 2 suggestion types
have few different product requirements, thus we decided to completely
separate these 2 suggestions out in terms of their code path.

Key difference

- Language server will process Completion request on receiving request
from IDE clients, and will BLOCK following requests if in-flight request
is not fulfilled yet. Edits, on the other hand, it debounces/delay the
execution time for the sake of "latest" file context to ensure the
suggestion reflects the CORRECT changes users attempt to make.
- Triggering heuristic. For example, Completion is not supposed to be
invoked when users are deleting the code, whereas Edits allow such
scenario to go through.


## Solution
- Introduce a new `onEditCompletion` language server API which is purely
for Edits suggestion.
- Invoke 2 Flare API and serve the response which first arrives (First
come first served).
- Allow Edits suggestion on code deletion




---

- 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

Sometimes a `.yaml` file QCT asks for from the customer is malformed and
users don't see what exactly is wrong.

## Solution

Validate the file and provide a more specific error message.

---

- 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 <davhasan@amazon.com>
Co-authored-by: invictus <149003065+ashishrp-aws@users.noreply.github.com>
Co-authored-by: Laxman Reddy <141967714+laileni-aws@users.noreply.github.com>
## Problem
Job history-related code is scattered throughout various files, making
it difficult to review and understand.

## Solution
Centralize existing history functions in a new file and add helper
functions to declutter transformation flow. Update and simplify unit
tests accordingly.

---

- 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
discard when it's not yet shown.
reject when user's typing and makes the diff invalid.

## 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.
…or agentic chat (#7857)

## Problem
In order to set appropriate Origin Info on LSP side for SMAI CodeEditor,
[link](https://github.com/aws/language-servers/blob/68adf18d7ec46a7ecf9c66fd9d52b1b8f7bc236e/server/aws-lsp-codewhisperer/src/shared/utils.ts#L377),
clientInfo needs to be distinct
- related [PR to support
SMUS](#7817)

## Solution
- To check if the environment is SageMaker and a Unified Studio instance
and set corresponding clientInfo Name which is ```AmazonQ-For-SMUS-CE```

## Testing
- Built artefact locally using ```npm run compile && npm run package```
and tested on a SMAI CE space
- Ran ```npm run test -w packages/toolkit``` which succeeded
- LSP logs show the respective client Info details
```

---

- 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 <141967714+laileni-aws@users.noreply.github.com>
…7839)

## Problem
Inline completion suggestions were being shown even when edit
suggestions were active, creating a confusing user experience where both
types of suggestions could appear simultaneously.

## Solution
1. Added conflict prevention logic in provideInlineCompletionItems() to
check for active edit suggestions using the existing
aws.amazonq.editSuggestionActive context flag
1. Created isEditSuggestionActive() method to encapsulate context
checking
1. Implemented DISCARD telemetry for completion suggestions that can't
be shown due to active edits
1. Added unit tests covering the new functionality, including edge cases
for mixed suggestion types and items without IDs
1. Updated displayImage.ts to properly set/unset the context flag when
edit suggestions are displayed/cleared
1. The solution ensures only one type of suggestion is active at a time
while maintaining telemetry compliance and following existing codebase
patterns.

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

Added credential providers for DER, Project role credentials and
Connections credentials. Added in memory caching for now.

The credential providers currently are structured so that it can be used
with CredentialStore but a lot of things to do with credential store is
really old. In the coming days, while we do bug bashes and tests, if the
in memory caching fares well enough, will simplify the credential
provider to implement the AWS SDK CredentialProvider directly.


**Motivation**

Support auth for SMUS and ensure all clients get credentials and don't
fail due to lack of credentials.

**Testing Done**

Updated unit tests and tested flow locally. 

---

- 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: Bhargava Varadharajan <vabharga@amazon.com>
manodnyab and others added 30 commits November 19, 2025 07:34
feat(cloudformation): Update CloudFormation feature with latest changes
## Problem

-
https://d1ihu6zq92vp9p.cloudfront.net/45451b0f-383e-4f4a-adc0-ce623f5765be/report.html
```
Error: Activating extension 'redhat.java' failed: Java 21 or more recent is required to run the Java extension. Please download and install a recent JDK. You can still compile your projects with older JDKs by configuring ['java.configuration.runtimes'](https://github.com/redhat-developer/vscode-java/wiki/JDK-Requirements#java.configuration.runtimes).
    at v.n (/tmp/.vscode-test/vscode-linux-x64-1.83.0/resources/app/out/vs/workbench/api/node/extensionHostProcess.js:125:6274)
    at async v.m (/tmp/.vscode-test/vscode-linux-x64-1.83.0/resources/app/out/vs/workbench/api/node/extensionHostProcess.js:125:6168)
    at async v.l (/tmp/.vscode-test/vscode-linux-x64-1.83.0/resources/app/out/vs/workbench/api/node/extensionHostProcess.js:125:5625)
```

- The Python 3.14 version is coming from the external Serverless Land
repository pattern (aws-samples/serverless-patterns)
## Solution
- Fixed 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.
build(amazonq): merge release candidate version rc-20251119
## Problem
Remote debugging doesn't work well on custom function types which
doesn't support SnapStart

## Solution
disable until it's supported

---

- 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


## 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: Austin Jang <ajangg@amazon.com>
Co-authored-by: Arkaprava De <arkaprava08@gmail.com>
Co-authored-by: Roger Zhang <ruojiazh@amazon.com>
## Problem
need createToken metric

## Solution
add createToken metric

## Testing
<img width="1510" height="131" alt="vsc"
src="https://github.com/user-attachments/assets/496bd6dc-dce3-4ddb-9471-f55aad6b27a0"
/>



---

- 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.
## Notes:
This merges the released changes for rc-20251120 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 <>
## Description

This PR merges changes to add support in SMUS to use IAM-based domains.
Previously we only supported IdC-based domains and with this, customers
have the flexibility to use both the authentication options.

---

- 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 <43144436+aws-toolkit-automation@users.noreply.github.com>
Co-authored-by: aws-ides-bot <github-aws-toolkit-automation@amazon.com>
Co-authored-by: Bhargava Varadharajan <vabharga@amazon.com>
Co-authored-by: kzr <kzr@amazon.com>
Co-authored-by: Laxman Reddy <141967714+laileni-aws@users.noreply.github.com>
Co-authored-by: Sherry Lu <xiaoluk@amazon.com>
Co-authored-by: Sherry Lu <75588211+XiaoxuanLu@users.noreply.github.com>
Co-authored-by: zulil <31738836+liuzulin@users.noreply.github.com>
Co-authored-by: Zulin Liu <zulil@amazon.com>
Co-authored-by: David <60020664+dhasani23@users.noreply.github.com>
Co-authored-by: David Hasani <davhasan@amazon.com>
Co-authored-by: Arkaprava De <arkaprava08@gmail.com>
Co-authored-by: Arkaprava De <arkaprav@amazon.com>
Co-authored-by: Keyu Wu <Keyu.Wu.Wky@gmail.com>
Co-authored-by: chungjac <chungjac@amazon.com>
Co-authored-by: aws-asolidu <asolidu@amazon.com>
Co-authored-by: Newton Der <dernewtz@amazon.com>
Co-authored-by: Newton Der <newton.der@gmail.com>
Co-authored-by: Will Lo <96078566+Will-ShaoHua@users.noreply.github.com>
Co-authored-by: Boyu <wangby56@gmail.com>
Co-authored-by: atontb <104926752+atonaamz@users.noreply.github.com>
Co-authored-by: Richard Li <742829+rli@users.noreply.github.com>
Co-authored-by: Shruti Sinha <44882001+shruti0085@users.noreply.github.com>
Co-authored-by: Bhavya Sharma <bhavya2109sharma@gmail.com>
Co-authored-by: Roger Zhang <ruojiazh@amazon.com>
Co-authored-by: Tai Lai <ctlai95@gmail.com>
Co-authored-by: invictus <149003065+ashishrp-aws@users.noreply.github.com>
Co-authored-by: Dylan Ross <90357952+dylanraws@users.noreply.github.com>
Co-authored-by: BlakeLazarine <blake.l.lazarine@gmail.com>
Co-authored-by: Blake Lazarine <blakelaz@amazon.com>
Co-authored-by: tobixlea <tobixlea@amazon.com>
Co-authored-by: seshubaws <116689586+seshubaws@users.noreply.github.com>
Co-authored-by: Bhavya Sharma <bhavyssh@amazon.com>
Co-authored-by: manodnyab <66754471+manodnyab@users.noreply.github.com>
…t interrupting execution (#8346)

## Problem
- User experiences pop up error when connecting with a stopped space.
- Attempt to connect without waiting for space to transition to running
state.
- Listing needs to check all clusters without stopping execution flow on
initial discovered error

## Solution
- Added delay for space to fully transition state before attempting to
connect
- Change throwing error to logging warnings

---

- 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 <141967714+laileni-aws@users.noreply.github.com>
## Problem
new lambda runtime release in Nov (python3.14, nodejs24.x, java25) are
currently shown as not supported in AppBuilder & remote debugging

## Solution
New lambda runtime can be used in AWS Explorer, AppBuilder, and Remote
Debugging.

---

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

…n startup

## Problem
New CloudFormation feature eagerly loaded stacks resulting in error
notification if credentials were not set properly. Eager loading is not
desirable even if credentials would work because user may not open the
panel or intend to use the data.

## Solution
Lazy load stacks.
Tested:
- stacks do not load on startup
- switching regions does not eagerly load stacks
- pagination with load more works as before
- deploying template if stacks were never loaded triggers loading as
stacks are refreshed (desired behavior)
- if StacksNode is expanded and region is switched then stacks are
loaded (desired behavior)

Dead code removal: polling was disabled earlier and unused.

---

- 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.
…ere setting is not registered (#8343)

## Problem
When the extension is upgraded and user does not do a full restart, it
is possible for new cloudformation telemetry setting to not be
registered yet, resulting in error trying to save it.

## Solution
Skip the save and do it the next time the extension starts.

---

- 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: Akila Tennakoon <tennakoo@amazon.com>
Co-authored-by: manodnyab <66754471+manodnyab@users.noreply.github.com>
## Problem
Stacks remained in panel as REVIEW_IN_PROGRESS status after ChangeSet
was deleted due to the lack of refresh.

## Solution
Refresh stacks after change set deletion. On create change sets, this
would clear out the stack from panel.

Removing some dead code as well. Since view/delete change set is
disabled from command palette the `params` would never be undefined.

---

- 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
- replacement may produce '&' characters that are double-unescaped

## Solution
- change the order of the .replace() calls in the decoding of both wsUrl
and token such that &amp; is decoded after all other HTML entities have
been decoded

- Addressing bot suggestion in
#8341

---

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