Merge master into feature/amazonqLSP-auth #7322
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
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.
This reverts commit d0082e6.
## 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 Need view notebook jobs page. ## Solution - Create view notebook jobs page. It uses table for rendering jobs, has actions for download job artifacts and delete job. Page is rendered with mock data - Create TkTabs component - Create TkIconButton component for rendering icon buttons - Consolidate create notebook job page and view notebook jobs page into one Vue application - Implement backend extension logic to use single webview panel for showing create notebook page and view notebook jobs page - Add context menu items for create job and view jobs #### Context menu <img width="1317" height="872" alt="Screenshot 2025-07-23 at 9 43 56 AM" src="https://github.com/user-attachments/assets/be7bb32d-02da-4882-9ab3-58fe48181954" /> #### View notebook jobs page <img width="1318" height="871" alt="Screenshot 2025-07-23 at 9 44 19 AM" src="https://github.com/user-attachments/assets/a7c1c799-65e2-424c-ac2e-fa358d3346fe" /> --- - 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
…e highlightedRanges
## 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.
* SMUS needs to be activated in NodeJS environment only. * Remove Notebook resources * Added changelog
empty commit to trigger ci
feat(sagemakerunifiedstudio): Support for SageMaker Unified Studio
#2007 The Toolkit doesn't read the endpoint configured in an AWS profile config. The endpoint even before these changes is already being read from the AWS config file, and it's included in the CredentialsProvider object, but there wasn't a way to retrieve that. We're adding `getEndpointUrl()` method to the different providers, and then we're retrieving that endpoint in: 1. when loading the current profile, to add it to the credentialsCache (`auth.ts -> createCachedCredentials()`, `loginManager.ts -> login()`). Because of this, then we can get this endpoint alongside the credentials when creating a new AWS client. 2. when creating the list of connections that then will be displayed for the user to pick (`packages/core/src/auth/auth.ts -> getIamConnection()`) (this required to make `getIamConnection` an async
…Walkthrough Update AppBuilder Walkthrough wording and add LocalStack VS Code extension
…ugh walkthrough But add ts-ignore until this value gets added to metric definitions [1] [1]: https://github.com/aws/aws-toolkit-common/blob/8c88537fae2ac7e6524fb2b29ae336c606850eeb/telemetry/definitions/commonDefinitions.json#L2215-L2221
And general fixes when connection is to non-AWS endpoints - Add helper function to identify when connected to LocalStack - Make LiveTail and DocDB read endpoint URL if exists (they don't use the generic ClientBuilder) - Disable S3 virtual-host-style and host prefix for LocalStack - Disable host prefixes for all services when using LocalStack - Send telemetry for custom endpoints and for LocalStack connections
…lStack - Add LocalStack detection for Lambda debugging webview, by refactoring into two sub classes to handle the lifecycle of the debugging process. - Hide and disable version publishing - Await debugger start to slightly mitigate the race condition - Add LocalStack Lambda Debug Mode config deletion upon stopping debugging - Wait for function to be active before launching debugger - Add user-agent integration - Add temporary workaround to mitigate debugger attach timing issue - Fix debugger attach race condition by waiting using the new GET API - Add LDM error handling - Handle LocalStack Lambda hot reloading gracefully - Disable code download upon LocalStack hot reloading - Skip file watcher for hot-reloaded Lambda function - Disable Convert to SAM application for LocalStack - Show message in Remote Invoke WebView when connected to Localstack - Add telemetry for LocalStack case (including refactor some old telemetry)
The endpointUrl is only really valuable for IAMConnections, but we still add it Optional in SsoConnections to keep TypeScript consistent.
## Problem Better to first open the diff.patch for user to see, then parse it and apply it, so that if it is malformed, it is first visible to user. ## Solution Open diff.patch first. --- - 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]>
**Description** We were seeing intermittent issues where sometimes the context was being returned as undefined. Setting it at the start of the activation to ensure the the context is available always. **Motivation** Bug fix **Testing Done** Tested manually 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 <[email protected]>
…g commands (#7883) ## Problem Amazon Q couldn't make changes to unsaved files. When users apply fix commands to unsaved files, Amazon Q couldn't fix those problems. ## Solution Auto save the file when users clicking on the fix commands. --- - 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 <[email protected]>
## 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: atontb <[email protected]> Co-authored-by: aws-toolkit-automation <[email protected]> Co-authored-by: andrewyuq <[email protected]> Co-authored-by: Will Lo <[email protected]>
## Problem This merges the released changes for rc-20250910 into main. MCM-134160906 ## 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 <>
## Problem Currently there is no telemetry support for auto debug feature. ## Solution Add telemetry support for auto debug feature. --- - 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 <[email protected]> Co-authored-by: Ashish Reddy Podduturi <[email protected]> Co-authored-by: Laxman Reddy <[email protected]>
…iew (#8019) ## Problem Currently users couldn't edit code files on the diff view provided by Amazon Q. Users have to open those files in the workspace to edit them. This is very inconvenient. ## Solution Copy of #7886 Enable users to edit code files directly on the diff view. https://github.com/user-attachments/assets/464d9757-cb6f-4f0f-aa6f-de4f3104cdb5 --- - 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: Lei Gao <[email protected]> Co-authored-by: Lei Gao <[email protected]> Co-authored-by: aws-toolkit-automation <[email protected]> Co-authored-by: andrewyuq <[email protected]> Co-authored-by: Will Lo <[email protected]>
## Problem This merges the released changes for rc-20250911 into main. ## 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 <>
## Problem - Added new UX to inform user about migration of /agents. ## Solution - Removing the migration of /agents ux but need some time to remove entire functionality due to backward compatability issues. - Removed unused and unnecessary code. - Related Flare PR: aws/language-servers#2248 ### Old VSC plugin behavior with new flare version https://github.com/user-attachments/assets/c6966bdb-7bdc-41ca-ae67-acadc4f69ef9 ### New VSC plugin behavior with new flare version https://github.com/user-attachments/assets/9e76779d-6284-4ba3-b206-ddbb862c3d76 --- - 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.
…#8047) ## Problem #8045 #8040 ## Solution fix for path parsing for windows for editable diff view --- - 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
- Require account id to create a more complete product metric on SMUS
feature usage
## Solution
- Add domain account id metadata to smus_login metric
## Test
- on core `npm run generateTelemetry`
- `npm test`
- manually test telemetry
```
2025-09-16 01:21:25.358 [debug] telemetry: smus_login {
Metadata: {
metricId: '43dfab8d-d5a6-4791-9afb-b0b3454efb23',
traceId: 'ba4dd30a-3ad6-4101-84a0-8ae558947fed',
parentId: '4e6f9558-995e-444e-8461-d718bd6434a5',
duration: '1763',
result: 'Cancelled',
reason: 'UserCancelled',
reasonDesc: 'Failed to initiate login. | UserCancelled: User cancelled domain URL input',
awsAccount: 'not-set',
awsRegion: 'us-east-1'
},
Value: 1,
Unit: 'None',
Passive: false
}
2025-09-16 01:22:39.406 [debug] telemetry: smus_login {
Metadata: {
metricId: '4840c7e2-7a68-49a8-8bb6-710d629856ab',
traceId: '65160024-7c03-47c8-80e3-9fdf8493047b',
smusDomainId: 'dzd_bh80g0fbj1h7xl',
awsRegion: 'us-east-2',
smusDomainAccountId: '050752642559',
duration: '34889',
result: 'Succeeded',
awsAccount: 'not-set'
},
Value: 1,
Unit: 'None',
Passive: false
}
2025-09-16 01:22:48.391 [debug] telemetry: smus_accessProject {
Metadata: {
metricId: 'fad0c4d1-49bd-4a87-aed5-72a6e4d04c3a',
traceId: '65160024-7c03-47c8-80e3-9fdf8493047b',
parentId: 'cda698a1-1c85-477c-9722-ca5b81ae6f63',
smusDomainId: 'dzd_bh80g0fbj1h7xl',
smusProjectId: 'c1wqm5rlzb150p',
smusDomainRegion: 'us-east-2',
smusDomainAccountId: '050752642559',
duration: '10451',
result: 'Succeeded',
awsAccount: 'not-set',
awsRegion: 'us-east-1'
},
Value: 1,
Unit: 'None',
Passive: false
}
2025-09-16 01:22:51.374 [debug] telemetry: smus_renderProjectChildrenNode {
Metadata: {
metricId: '0bc6e3e4-a54b-44a2-84d6-b033e656d91e',
traceId: 'e280e0c3-54c5-4aae-8431-ef5724a20e42',
smusToolkitEnv: 'local',
smusDomainId: 'dzd_bh80g0fbj1h7xl',
smusDomainAccountId: '050752642559',
smusProjectId: 'c1wqm5rlzb150p',
smusDomainRegion: 'us-east-2',
duration: '2979',
result: 'Succeeded',
awsAccount: 'not-set',
awsRegion: 'us-east-1'
},
Value: 1,
Unit: 'None',
Passive: true
}
2025-09-16 01:24:25.389 [debug] telemetry: smus_renderLakehouseNode {
Metadata: {
metricId: 'f50b2b04-ffe7-49f6-8d85-a1e5d59438cc',
traceId: '83155b49-3d84-4896-bb04-5ed5182006e6',
smusToolkitEnv: 'local',
smusDomainId: 'dzd_bh80g0fbj1h7xl',
smusDomainAccountId: '050752642559',
smusProjectId: 'c1wqm5rlzb150p',
smusConnectionId: 'c1pnab9bdg3qjt',
smusConnectionType: 'LAKEHOUSE',
smusProjectRegion: 'us-east-2',
duration: '2321',
result: 'Succeeded',
awsAccount: 'not-set',
awsRegion: 'us-east-1'
},
Value: 1,
Unit: 'None',
Passive: false
}
2025-09-16 01:24:54.443 [debug] telemetry: smus_renderS3Node {
Metadata: {
metricId: '74f286b6-1feb-43aa-b15e-4e0919ab272a',
traceId: '9db37019-272f-4963-9e9e-1da9d9f9a26e',
smusToolkitEnv: 'local',
smusDomainId: 'dzd_bh80g0fbj1h7xl',
smusDomainAccountId: '050752642559',
smusProjectId: 'c1wqm5rlzb150p',
smusConnectionId: 'c13ow7arqtblih',
smusConnectionType: 'S3',
smusProjectRegion: 'us-east-2',
duration: '2',
result: 'Succeeded',
awsAccount: 'not-set',
awsRegion: 'us-east-1'
},
Value: 1,
Unit: 'None',
Passive: false
}
2025-09-16 01:25:40.741 [debug] telemetry: smus_openRemoteConnection {
Metadata: {
metricId: '2f32a489-b013-4f47-951f-04d535bc2761',
traceId: '1b90a3dc-f01f-40cc-b0bf-5920b7c6e9cc',
smusSpaceKey: 'd-rxs4hhmzrnho__ce',
smusDomainRegion: 'us-east-2',
smusDomainId: 'dzd_bh80g0fbj1h7xl',
smusDomainAccountId: '050752642559',
smusProjectId: 'c1wqm5rlzb150p',
duration: '18000',
result: 'Succeeded',
awsAccount: 'not-set',
awsRegion: 'us-east-1'
},
Value: 1,
Unit: 'None',
Passive: false
}
2025-09-16 01:26:52.258 [debug] telemetry: smus_stopSpace {
Metadata: {
metricId: 'b0903fd5-ffb5-4a9a-b131-99baf11cb3a7',
traceId: 'c5ec5f41-ae58-46b3-af8e-47c1d8fb737d',
smusSpaceKey: 'd-rxs4hhmzrnho__ce',
smusDomainRegion: 'us-east-2',
smusDomainId: 'dzd_bh80g0fbj1h7xl',
smusDomainAccountId: '050752642559',
smusProjectId: 'c1wqm5rlzb150p',
duration: '2308',
result: 'Succeeded',
awsAccount: 'not-set',
awsRegion: 'us-east-1'
},
Value: 1,
Unit: 'None',
Passive: false
}
2025-09-16 01:27:22.027 [debug] telemetry: smus_signOut {
Metadata: {
metricId: 'e41138b8-9949-4088-b175-73c4d48110cc',
traceId: 'b6a34176-e2a2-47f1-b170-d092488c0d00',
parentId: '51f87fa9-fc1c-4351-914b-c0ce077b8f1b',
smusDomainId: 'dzd_bh80g0fbj1h7xl',
awsRegion: 'us-east-2',
smusDomainAccountId: '050752642559',
duration: '476',
result: 'Succeeded',
awsAccount: 'not-set'
},
Value: 1,
Unit: 'None',
Passive: false
}
```
---
- 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 Customers complained about missing the old deterministic message. ## Solution As the agent to include this message at the start of its explain response. It was stored in the recommendation.text field. The agent does some paraphrasing, so the deterministic message `We detected that this code sets key specifications more than once, key size more than once, or sets both. To make your code more secure, we recommend that you set either KeySpec or NumberOfBytes once. Do not set both.` Gets turned into `The CWE-327,328,326,208,1240 - Insecure cryptography issue at line 63 in CsvIterator.java occurs because the code sets both KeySpec and NumberOfBytes parameters on the same GenerateDataKeyRequest object, which are mutually exclusive in AWS KMS.` There is more information in the explanation after this, but this is the part related to the deterministic recommendation.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: Blake Lazarine <[email protected]> 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
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):