fix(amazonq): fix for merge conflicts for e2e tests branch #8410
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
**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>
## Problem SMUS users need Project Space management functionality ## Solution - Add SageMakerUnifiedStudioSpaceNode for individual space representation - Add SageMakerUnifiedStudioSpacesParentNode for space container management - Add SagemakerSpace class for unified space operations and status management - Enhance SageMaker credential mapping with SMUS project support - Add space-specific icons and detached server credential resolution - Update SageMaker commands and model types for space functionality - Added test 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. ###Note: Due to lot of constriants - I apologies that I had to raise such a big PR. Co-authored-by: guntamb <guntamb@amazon.com>
## Problem The inline completion in Jupyter Notebook is not working. https://github.com/aws/aws-toolkit-vscode/pull/7086/files is gone after inline completion migration to language server. ## Solution 1. Re-implement inline completion in Notebook 2. Re-organize the left and right context given precise cursor position in current cell. Requires aws/language-servers#2114 <img width="723" height="429" alt="Screenshot 2025-08-12 at 4 09 28 PM" src="https://github.com/user-attachments/assets/8335360b-7a83-431c-b967-0547cb60a48a" /> --- - 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.
…d Studio data explorer (aws#2183) ## Problem Need to implement Lakehouse nodes and Redshift nodes for SageMaker Unified Studio data explorer ## Solution 1. Implemented GlueClient and Lakehouse nodes 2. Retrieved all results from pagenation at once 3. Updated node icons and label based on UX requirements 4. Addressed open comments from previous PR: aws/aws-toolkit-vscode-staging#2182 5. Added and updated unit 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. --------- Co-authored-by: Zulin Liu <zulil@amazon.com>
__Description:__ Add 2 folder nodes under compute node to list Redshit and Spark connections. Add tooltip for the listed connections to show critical information. ## Appearance: <img width="360" height="304" alt="image" src="https://github.com/user-attachments/assets/4cb3ca4c-14d2-4373-af1d-35147238895b" /> --- - 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 - remove unnecessary files from buildspec --- - 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.
… telemetry (aws#7893) ## Problem Language server is using `initializeParams.initializationOptions?.aws?.clientInfo?.version` https://github.com/aws/language-servers/blob/main/server/aws-lsp-codewhisperer/src/shared/telemetryUtils.ts#L99-L100 However current we're passing IDE version (vscode) and use the other field as plugin version which is not used by server. ``` clientInfo: { name: getClientName(), version: version, extension: { name: 'AmazonQ-For-VSCode', version: extensionVersion, ``` ## 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 Newly created running Spaces do not have any controls (Stop/Connect) BugBash: https://quip-amazon.com/c9u0AeXRbgx9/Local-IDE-Bug-Bash ## Solution show the stop button when the remote connect status is undefined ## Appearance note: test3 is a newly created space with remote connect status == undefined <img width="1085" height="418" alt="Screenshot 2025-08-14 at 11 23 19 AM" src="https://github.com/user-attachments/assets/9b0d150b-2475-4b0e-b214-a37373e0edad" /> --- - 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 an issue we suspect is related to the recent support we added for proxy auto-discovery on this GitHub issue: aws#7878 ## Solution Disabling the experimental proxy support --- - 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.
Please enter the commit message for your changes. Lines starting
…d bug fixes (aws#2196) ## Problem This PR addressing following problems: 1. Handle rendering s3 access grant node 2. Implement client store to create separate clients for different connections 3. Fix rendering s3 table catalog in Lakehouse node 4. Wire connection credentials provider and bug fixes 5. Adapt connection credentials provider for private model clients (sqlworkbench, gluecatalog) 6. UX: move all s3 nodes under "Buckets" folder Rev 2: 1. Addressed comments 2. bug fixes ## Solution 1. Handle rendering s3 access grant node `createS3AccessGrantNodes` in `sagemakerUnifiedStudioDataNode.ts` and `s3Strategy.ts` 3. Implement client store to create separate clients for different connections `src/sagemakerunifiedstudio/shared/client/clientStore.ts` 4. Fix rendering s3 table catalog in Lakehouse node `src/sagemakerunifiedstudio/explorer/nodes/lakehouseStrategy.ts` 5. Wire connection credentials provider and bug fixes Involving all strategy files and client files 6. Adapt connection credentials provider for private model clients (sqlworkbench, gluecatalog) `src/sagemakerunifiedstudio/shared/client/credentialsAdapter.ts` 7. UX: move all s3 nodes under "Buckets" folder `src/sagemakerunifiedstudio/explorer/nodes/s3Strategy.ts` --- - 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 This merges the released changes for rc-20250815 into main. MCM-132479224 ## 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 <97199248+leigaol@users.noreply.github.com> Co-authored-by: Na Yue <yueny@amazon.com> Co-authored-by: Will Lo <96078566+Will-ShaoHua@users.noreply.github.com> Co-authored-by: Aidan Ton <atona@amazon.com> Co-authored-by: atontb <104926752+atonaamz@users.noreply.github.com>
## Problem When a connection to a remote space is severed, the extension will attempt to reconnect up to 60 times. Each reconnect attempt opens the Space Details page in a new browser tab. Opening up to 60 new tabs is a poor user experience. ## Solution We change the maximum number of retries to 8. --- - 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: Newton Der <dernewtz@amazon.com>
…to Jupyter Notebooks (aws#2169) ## Problem [feat(sagemakerunifiedstudio): Add Connection Magics Selector feature to Jupyter Notebooks](aws/aws-toolkit-vscode-staging@f0a4690): - SageMaker Unified Studio CodeEditor users should have the ability to easily select their SMUS connection/compute cell magics in the Jupyter Notebook experience. - The experience should be available when a SageMaker Unified Studio space is connected either remotely or in the portal. [feat(sagemakerunifiedstudio): Add resource metadata utils for SMUS spaces](aws/aws-toolkit-vscode-staging@55a43ad): - SageMaker Unified Studio depends on resource metadata present in the SageMaker space for various functionality. This includes cases where the space is either remotely connected or in the SMUS web portal. - Depending features include the Connection Magics Selector and other remote SageMaker Unified Studio features. - SageMaker Unified Studio spaces store this resource metadata under the `/opt/ml/metadata/resource-metadata.json` path. This resource metadata file contains SageMaker and DataZone metadata associated with the space. ## Solution [feat(sagemakerunifiedstudio): Add Connection Magics Selector feature to Jupyter Notebooks](aws/aws-toolkit-vscode-staging@f0a4690): - Adding Connection Magics Selector feature for SageMaker Unified Studio spaces. - The Connection Magics Selector allows users to easily select their SMUS connection/compute cell magics in the Jupyter Notebook experience. - This is achieved by adding two new status bar items to each Jupyter Notebook cell that when clicked show quick pick options for their SMUS connections/computes. Once a user chooses a connection/compute, the cell magics are updated accordingly. - When applying the new cell magics, automatic language syntax highlighting is also applied to the modified cell based on the connection's associated language. [feat(sagemakerunifiedstudio): Add resource metadata utils for SMUS spaces](aws/aws-toolkit-vscode-staging@55a43ad): - Adding a resource metadata helper module for SMUS spaces. - Adding `getResourceMetadata()` and other methods that allow for easy resource metadata retrieval for use by SMUS features. ## Screenshots Jupyter Notebook view (w/ Connection and Compute selectors in bottom right of notebook cells): <img width="3840" height="1942" alt="Screenshot 2025-07-30 at 11-30-55 getting_started ipynb — src — SageMaker Code Editor" src="https://github.com/user-attachments/assets/19d4f441-127a-4258-8b2e-0c24b7f40f7d" /> Connection Selector: <img width="847" height="241" alt="Screenshot 2025-07-30 at 11 31 59 AM" src="https://github.com/user-attachments/assets/93aedb12-12c1-4aaf-8629-99d74ac4cadd" /> Compute Selector: <img width="986" height="251" alt="Screenshot 2025-07-30 at 11 32 38 AM" src="https://github.com/user-attachments/assets/f91e1e46-285b-4db8-ad20-5a23b29a33c4" /> ## Testing Done [feat(sagemakerunifiedstudio): Add Connection Magics Selector feature to Jupyter Notebooks](aws/aws-toolkit-vscode-staging@f0a4690): - WIP - will update [feat(sagemakerunifiedstudio): Add resource metadata utils for SMUS spaces](aws/aws-toolkit-vscode-staging@55a43ad): - Added unit tests, new unit tests pass: ``` resourceMetadataUtils getResourceMetadata() ✔ should return metadata when file exists and is valid JSON ✔ should return undefined when file does not exist ✔ should return undefined and log error when file contains invalid JSON ✔ should return undefined and log error when readFileText throws ✔ should cache metadata and not re-read file on subsequent calls ✔ should handle metadata with missing optional fields ✔ should handle metadata with empty AdditionalMetadata ✔ should handle empty JSON file ✔ should set initialized flag to true even when initialization fails ✔ should handle very large JSON files ✔ should handle JSON with unexpected additional fields ✔ should handle JSON with undefined values ✔ should handle concurrent calls to getResourceMetadata resetResourceMetadata() ✔ should reset cached metadata and allow re-initialization resourceMetadataFileExists() ✔ should return true when file exists ✔ should return false when file does not exist ✔ should return false and log error when fs.existsFile throws ``` --- - 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: Boyu <wangby56@gmail.com> Co-authored-by: invictus <149003065+ashishrp-aws@users.noreply.github.com>
…atch (aws#7924) ## Problem Bug: When inline suggestion is active but user types a character that does not match the typeahead, this typing event triggered a inline completion API call that eventually did not manage to display suggestion on screen, which eventually reported as rejected completions. ## Solution Previously, before Flare migration, we had this design: https://github.com/aws/aws-toolkit-vscode/blob/amazonq/v1.74.0/packages/amazonq/src/app/inline/activation.ts#L108 Auto trigger will be disabled if at that moment the suggestion is visible. Under the previous design, the first character that does not match the typeahead will not make a new auto trigger, it simply rejects the current inline completion. This PR is to bring back the old design. It is not customer facing, hence 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.
…E version in telemetry (aws#7929) …" This reverts commit 8be30f1. ## Problem ## Solution should use this instead aws/language-servers#2142 --- - 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.
…ains only space char or empty line (aws#7922) ## Problem The suggestion indicates the empty line (L4) is edited and replaced with suggestion content however there is no diff highlight. Reason behind is because the function `diffWordsWithSpace` will not say the line is removed (since it's be edited). https://github.com/aws/aws-toolkit-vscode/blob/master/packages/amazonq/src/app/inline/EditRendering/svgGenerator.ts#L437-L441 <img width="1299" height="1292" alt="image" src="https://github.com/user-attachments/assets/a2a07ba0-28fe-4f31-9b8a-37d5ef2ff223" /> ## Solution <img width="1299" height="1292" alt="image" src="https://github.com/user-attachments/assets/a8530917-ac06-4b9e-af39-ea037c38b340" /> --- - 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.
…cenarios (aws#2200) ## Problem SageMaker Unified Studio explorer failed to handle scenarios when no projects or spaces are available, causing poor user experience and potential errors. ## Solution - Enhanced DataZone client error handling for missing resources - Added proper handling for empty project and space lists in explorer nodes - Improved error messages and fallback behavior in SageMaker space integration - Updated utility functions to gracefully handle null/undefined scenarios - Should fix the Space tooltip not to include the userId and SM domainId, and fixes the the scenario of after sign out with project already selected - If we sign in again with different domain, project from other domain is still shows up. Thanks to Bhargava for the fix. - Added/Updated the test cases 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. Co-authored-by: guntamb <guntamb@amazon.com> Co-authored-by: Laxman Reddy <141967714+laileni-aws@users.noreply.github.com>
… support (aws#7923) ## Problem The proxy and certificate auto-discovery code occasionally causes issues and there is a need to allow control of this by users. ## Solution Add a checkbox in settings that allow customers to control whether they want Amazon Q's proxy and certificate auto-discovery turned on. ## Testing Experimental proxy util used once setting enabled: <img width="438" height="111" alt="Screenshot 2025-08-19 at 10 49 11 AM" src="https://github.com/user-attachments/assets/bafbc879-41db-4ad7-a164-bb8bb2655de0" /> Standard proxy util used once setting disabled: <img width="438" height="111" alt="Screenshot 2025-08-19 at 10 50 05 AM" src="https://github.com/user-attachments/assets/d38c4a25-ea9b-41be-8b04-25cbc13f49ec" /> --- - 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 - Project node is not loading automatically after re-authentication ## Solution - After re-authentication, set the project, then refresh the node ## User experience - the user will see select project popup after re-authentication --- - 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: Build User <build@amazon.com>
… catalog (aws#8363) ## Problem A bug is reported that when s3 table catalog is empty, there is getDatabases call being made and cause unwanted error ## Solution Handle the issue by not calling getDatabases when a catalog node is an empty parent node --- - 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>
…re remote connections (aws#8328) ## Problem When attempting to connect to a SageMaker Space, if the user's SSH config has syntax errors (even outside the sm_* section), users would see a cryptic error message: ```ssh check against host failed: 255``` This error message: Didn't explain what was wrong Didn't indicate it was an SSH config issue Didn't provide a way to fix the problem ## Solution Enhanced the SSH configuration error handling to provide a better user experience: Shows a clear message explaining the issue. Displays the actual SSH error (including line numbers) Provides an "Open SSH Config" button to directly open the config file for editing https://github.com/user-attachments/assets/ef4f5a0f-0525-4e4c-9e96-a2081997dd81 --- - 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.
…rget old linux builds (aws#8383) ## Problem * Fix potential GitHub API rate limiting issue * Use older build of linux for older machines ## Solution * Attempt using manifest json to resolve cfn lsp versions, fallback to original GitHub releases approach * When in a sandbox environment, or required version of GLIC is not available, use older version of linux build --- - 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#8338) …EATE_COMPLETE and add delete button for CREATE_FAILED change sets ## Problem - The "Deploy Changes" button is present when viewing a change set even if the change set does not have CREATE_COMPLETE status - Additionally, the "Delete Changeset" button is not present when no changes are detected in the change set ## Solution - Added logic to check if the change set has CREATE_COMPLETE status before enabling the deploy changes button - Added the "Delete Changeset" button for the view when no changes are detected - Additionally, upon pressing the "Delete Changeset" button on the "no changes are detected" view, the button disappears to prevent additional delete attempts --- - 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 - Allow for the ability to configure cfn-lint. Minimal impact to the settings panel by using a nest object ## 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.
aws#8367) …g for deployment mode first ## Problem When customer wants to validate/deploy in REVERT_DRIFT mode, they have to answer pre-requisite prompts correctly before they get prompted for deployment mode. ## Solution Ask for deployment mode first and don't ask the other prompts with incompatible answers. --- - 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>
aws#8398) [fix(cloudformation): Only remap legacy linux builds, if they are available](aws@b5a2c7f) ## 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.
## Description - Added existing E2E tests to PR runners for `MacOS`, `Ubuntu` and `Windows` - Configured LSP server to be pre downloaded before the tests starts using the manifest and added a fallback to download directly from Github releases - Printing extension logs in the test runners if there are test failures --- - 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: Deep Furiya <dfuriya@amazon.com>
…#8392) ## Problem ## Solution replacing previous check with LMI checks for `CapacityProviderConfig` ## Notice: Lambda SDK version 3.731 doesn't have this field yet. And updating the SDK causes a lot of compatible 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.
## Problem We removed the test in :https://github.com/aws/aws-toolkit-vscode/pull/8318/files due to localproxy not mocked correctly. ## Solution Fixed the issue and now adding back these tests. This test starts a mock server and captures the actual user-agent being sent to make sure we are sending correct UA. --- - 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 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 <>
…aws#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.
laileni-aws
approved these changes
Dec 11, 2025
ashishrp-aws
changed the title
chungjac
approved these changes
Dec 11, 2025
Contributor
Author
|
/retryBuilds |
1 similar comment
Contributor
Author
|
/retryBuilds |
Contributor
Author
|
/retryBuilds |
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.
Problem
Solution
feature/xbranches will not be squash-merged at release time.