Merge master into feature/logs #7319
Open
Conversation
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
|
Analistarjx approved these changes Jul 16, 2025
…t and for Remote MCP (#7954) ## Notes: - Adding change log to auto fetch models to Amazon Q chat and for Remote MCP --- - 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** Reduced the DER cred expiry time to 10 min default. The API is being updated as well. Also updated the auth logic to invoke project picker on sign in, re-auth. **Testing Done** Unit tests, tested manually on VSCode as well - The signin, re-auth and sign-out cases. --- - 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>
## Problem There was previously a task "Remove `[Ln 34, Col 1]` from Code Issues panel from each issue`". Originally, this was meant to just mean remove `, Col 1`, but I interpreted it to mean remove the whole blob. ## Solution This change adds the line back, but without the `, Col 1` <img width="432" height="341" alt="image" src="https://github.com/user-attachments/assets/63ed938d-7f2d-4718-8ca4-ceb5b4e50a96" /> --- - 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 <blakelaz@amazon.com> Co-authored-by: Laxman Reddy <141967714+laileni-aws@users.noreply.github.com>
…ests (#7956) ## Problem Keyboard shortcuts for fixCode and generateUnitTests functions are not working on Windows VSC, although they function correctly on Mac The current shortcuts conflict with Windows reserved keyboard combinations. Current Shortcuts (Windows): - fixCode: Windows + Alt + Y - generateUnitTests: Windows + Alt + T New Shortcuts (Windows only): - fixCode: Windows + Alt + H - generateUnitTests: Windows + Alt + N ## Solution This approach results in different letter keys for the same functions across platforms: - generateUnitTests: 'T' on Mac, 'N' on Windows - fixCode: 'Y' on Mac, 'H' on Windows --- - 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: David Hasani <davhasan@amazon.com> Co-authored-by: invictus <149003065+ashishrp-aws@users.noreply.github.com>
…s project, start/stop space and data explorer (#2207) ## Problem Telemetry is missing from the feature. ## Solution - update packages/core/src/shared/telemetry/vscodeTelemetry.json with new types, metrics, and metadata - run npm run generateTelemetry in core package. this will create required obj that are accessible via telemetry.{metric name} - then emit metric in the 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. --------- Co-authored-by: Keyvan Zare Rami <kzr@amazon.com> Co-authored-by: Zulin Liu <zulil@amazon.com>
## 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.
…sec when a completion arrives (#7950) ## 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.
…ccount cases (#2209) ## Problem 1. In a cross region cross account set up. seeing error fetching space 2. The error message when cannot connect is not meaningful. I had to check on telemetry log to see the error message ## Solution Fixed the above issue --- - 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: Zulin Liu <zulil@amazon.com>
## 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.
…ne requests (#7952) ## 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.
## Problem Consistently reproducing a similar issue when attempting to start/connect to a Stopped Space when remote access is initially disabled. The Space is updated, started, and even connected to, but the Space does not show the Connect button anymore, until the Project is refreshed. This suggests the Space metadata is stale after the UpdateSpace call. ## Solution Tried to simply replace the spaceApp variable with the updated one got from describeSpace API call, but find conflicts on variable definitions. so update the variable names and update only remoteAccess variable to minimize impact. ListSpaces(original) https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/sagemaker/command/ListSpacesCommand/ <img width="2556" height="1308" alt="Screenshot 2025-09-01 at 4 11 09 PM" src="https://github.com/user-attachments/assets/64b4439e-4495-4822-9a56-c61470e269c6" /> DescribeSpace(updated) https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-sagemaker/Interface/DescribeSpaceCommandOutput/ <img width="2523" height="1299" alt="Screenshot 2025-09-01 at 5 02 24 PM" src="https://github.com/user-attachments/assets/37860497-8116-4d16-bc08-2562d0ea25bd" /> - pass SpaceSettingsSummary -> SpaceSettings in spaceApp type parameter - update remote access ## Test manually debug and unit test --- - 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 * SMUS users are missing the Call To Action of remotely connecting to the spaces in ToolKit. * Users that are added as project members via Groups were not able to access project in toolkit. ## Solution - Expand SageMaker Unified Studio project and compute nodes by default to improve user experience and discoverability. - Add description and tooltip for spaces to indicate call to action for remote connect - Updated test cases. - Change project access visibility logic to now require ProjectCreds access before displaying compute and data nodes. Projects now only show full details when user has appropriate ProjectCreds permissions. We moved away from the ProjectAccess calls as the user could be in groups too and we don't have a straight path to get groups assignments. - Added isSMUS check for user activity monitoring --- - 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: guntamb <guntamb@amazon.com> Co-authored-by: Laxman Reddy <141967714+laileni-aws@users.noreply.github.com>
**Description** Added a proactive cred check and refresh when SSH connections are established. Also updated the error messages to be actionable for users. **Motivation** Bug : Previously once cred expired, we were throwing blanket error which did not tell user what the issue was and there was no path to recovery as well. Now with proactive cred refresh, user should be able to retry in ~10-15 seconds. **Testing Done** Tested all flows manually. Unit tests partial, needs to be updated.
## Problem This merges the released changes for rc-20250904 into main. MCM-133766629 ## 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: aws-toolkit-automation <>
* SMUS needs to be activated in NodeJS environment only. * Remove Notebook resources * Added changelog
## Problem LMI function contains new property and we have new CapacityProvider property ## Solution - Add support for `AWS::Serverless::CapacityProvider` resource type in explorer - Display capacity provider properties in resource nodes - Stringify CloudFormation intrinsic functions in property nodes for better readability - Add type-safe resource entity interfaces (FunctionResourceEntity, CapacityProviderResourceEntity) - Add type guards (isFunctionResource, isCapacityProviderResource) for safer resource handling - Hide property node if not defined - Fix optional chaining for Architectures array access to prevent undefined errors - Add test coverage for capacity provider resources with intrinsic functions --- - 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>
**Description** Updating the IAM domain check to use the IamSignIns attribute instead of using Domain preferences. **Testing Done** Tested 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>
This merges the released changes for rc-20251209 into main. MCM-140109917 --------- Co-authored-by: aws-toolkit-automation <>
…#8396) ## Summary This PR migrates the GlueCatalog custom API client from the deprecated AWS SDK v2 generator pattern to standalone AWS SDK v3-compatible packages. This migration is required as part of the broader AWS Toolkit repository migration from SDK v2 to v3. The AWS Toolkit VSCode repository is deprecating the centralized generateServiceClient.ts script that generates TypeScript clients from service JSON definitions. The SageMaker Unified Studio (SMUS) team currently uses this v2 generator for GlueCatalog. ## Solution * Created standalone package @amzn/glue-catalog-client * Updated imports to use new standalone package * Removed dependency for `GlueCatalogApi` on the deprecated generateServiceClient.ts script --- - 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.
…8401) ## Problem Users can use a beginner-friendly interface to authenticate with AWS Console credentials to obtain temporary credentials, especially for new AWS users. This GUI-based offers alternative to `aws login` command-line authentication. Reference: https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-sign-in.html ## Solution - Add "Console credentials - recommended" option to login webview - Restrict profile name input to alphanumeric, underscore, and hyphen characters (following [profile name pattern](https://github.com/keenwilson/aws-toolkit-vscode/blob/89739bc176c28321f64cd672664014d1ddfed533/packages/core/src/auth/consoleSessionUtils.ts#L48)) - Show "Opening AWS sign-in in your default browser..." during authentication - Redirect to explorer view upon successful sign-in Note: - The UI flow follows the same pattern as IAM credentials setup, with these key differences: - Console credentials form takes profile name and region (optional) - IAM credentials form takes access key and secret key - Different telemetry emitted for credential source ID: - Console credentials: 'consoleCredentials' - IAM credentials: 'sharedCredentials' - Telemetry for credential source ID is tracked via aws/aws-toolkit-common#1108 - AWS CLI returns exit code 255 if browser-based authentication is not completed, this prevents partial/incomplete authentication states - Reuse `fromLoginCredentials` provider instance to prevent multiple credential resolution attempts and maintain consistent refresh behavior at [resolveProviderWithCancel](https://github.com/aws/aws-toolkit-vscode/blob/eb11eb59318ab83a1f609e472eab760ea38201d1/packages/core/src/auth/providers/sharedCredentialsProvider.ts#L256) in sharedCredentialsProvider ## UI Changes - Added "Console credentials - recommended" as first option in login selection <img width="1122" height="633" alt="1-start" src="https://github.com/user-attachments/assets/3d46b1ee-9730-4834-ac64-328a5b92227c" /> - Created profile name input with validation for letters, numbers, - and _ - Made region selection optional with us-east-1 default <img width="1122" height="631" alt="4-console-profile" src="https://github.com/user-attachments/assets/f1acfffb-40b6-4f7e-a87a-96da6b0ff59d" /> - Shows clear guidance during browser authentication flow <img width="1150" height="765" alt="Opening AWS sign-in in your default browser." src="https://github.com/user-attachments/assets/9f04fea4-0980-4eef-9b3f-e5c2caa9fbc5" /> - Attempt to update AWS CLI if the version < 2.32.0 <img width="1086" height="710" alt="Screenshot 2025-12-11 at 4 31 17 PM" src="https://github.com/user-attachments/assets/77cbc5b6-b238-4db1-bc21-d178081bc298" /> ### Known Issue: Windows PATH Environment After AWS CLI Installation When installing or updating AWS CLI v2 through the toolkit on Windows machine within a managed enterprise or workspace environment, the installation may appear successful, but users receive the error: ``` [error] aws.toolkit.auth.consoleLogin: Error: Failed to verify or install AWS CLI [CliInstallFailed] -> Error: Could not verify installed CLIs ``` This typically occurs because the installer successfully places the necessary files in the default directory (`C:\Program Files\Amazon\AWSCLIV2\`), but security policies or user permissions within the workspace prevent the installer from correctly or immediately updating the system's PATH environment variable. The command prompt doesn't know where to look for the `aws.exe` file. You can verify the installation using the full path and contact your IT support to add the installation path (`C:\Program Files\Amazon\AWSCLIV2\`) to the System variables `PATH` environment variable. ```powershell "C:\Program Files\Amazon\AWSCLIV2\aws.exe" --version ``` --- - 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 Current invoking Lambda durable functions will fail on remote invoke panel ## Solution Apply $LATEST as qualifier when invoking Lambda durable functions --- - 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: Renato Valenzuela <37676028+valerena@users.noreply.github.com>
feat(auth): align text patterns and verify profile after command succeeded
## 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: aws-toolkit-automation <43144436+aws-toolkit-automation@users.noreply.github.com> Co-authored-by: Keen Wilson <40321520+keenwilson@users.noreply.github.com> Co-authored-by: Aseem sharma <198968351+aseemxs@users.noreply.github.com>
## Problem Fixes #8372. Currently, a deploy done using the lambda client will create a new published version of the function without any customer input. This is an issue because a) it is not the expected action for a deploy and b) version creation can take a long time and be expensive for Lambda Managed Instances customers. The cases in which this happened were: 1. Quick deploy through either the popup or the toolkit explorer 2. Direct upload where the user clicks on the node and selects the upload action 3. Remote invoke hot reloading, which will auto deploy code changes. Open to reasons to keep this, but I think that versioning isn't necessary in those cases and can end up being confusing. The original PR that added this was in 2020 (#1269), and based on that PR it seems like the original implementer was testing things out. ## Solution Remove the `Publish: true` field from the `UpdateFunctionCodeCommand`. Now, all deploys are simply updating the 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. Co-authored-by: invictus <149003065+ashishrp-aws@users.noreply.github.com>
#8414) …nt stale data ## Problem - stack views did not render automatically after visibility change ## Solution - render stack views --- - 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.
…redential refresh flow (#8432) ## Problem - Users were blocked when AWS CLI prompted to overwrite an existing console session, with no way to respond from VS Code - Credential refresh flow caused hanging "Getting credentials for profile" progress messages - Extension activation failed with "non-passive metric emitted at startup" error ## Solution <img width="474" height="181" alt="overwrite" src="https://github.com/user-attachments/assets/de836ee0-4821-4b79-9c69-4aa6168974ac" /> - Detect CLI overwrite prompts and show interactive dialog with exact CLI message - Send user's response ("y" or "n") to CLI stdin to proceed or cancel - Invalidate cached credentials after successful login and update connection state without triggering immediate credential fetch - Change telemetry emission from `.run()` to `.emit()` to comply with passive telemetry rules ## Testing - Fresh profile creation - Profile overwrite with user confirmation - User cancellation of overwrite - Credential refresh when session expires --- - 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(auth): Add console session profile overwrite prompt and improve credential refresh flow
…8413) ## Problem The hash algorithm using used to verify downloads is not configurable, make it configurable but default to `sha384` ## 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.
…in webview (#8418) ## Problem - Cx will begin to get used to the new console grouping stack events by operation id and expect the same in the IDE ## Solution - group stack events by operation id similar to console --- - 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 - Hook invocations not visible in stack events ## Solution - show Hook invocations when there is a failure caused by Hook (last column is new and shows conditionally) <img width="1213" height="582" alt="image" src="https://github.com/user-attachments/assets/0e57407d-5fcc-415b-ae2a-e9e39d8d49dc" /> --- - 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-20251218
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
20 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):