Skip to content

Commit 198891d

Browse files
laileni-awsaws-toolkit-automationjpinkney-awschungjacHweinstock
authored
Merge from main (#9)
* Release 1.48.0 * Release 3.47.0 * Update version to snapshot version: 3.48.0-SNAPSHOT * Update version to snapshot version: 1.49.0-SNAPSHOT * deps(build): update esbuild-loader to 4.3.0 (aws#6622) ## Problem - we have a couple moderate vulnerabilities due to an old version of esbuild-loader ## Solution - update esbuild-loader + other npm packages that have vulnerabilities ## Notes - In the [3.0.0 esbuild-loader version](https://github.com/privatenumber/esbuild-loader/releases/tag/v3.0.0) ESBuildMinifyPlugin was re-named to EsbuildPlugin, it still does the minification by default though --- - 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): update capability card text for /test (aws#6646) ## Problem - Capability card text should be updated ## Solution - Update capability card with correct text ![vsc](https://github.com/user-attachments/assets/b5a1aca0-25c4-4f75-a4ff-c43ea79f9614) --- - 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. * refactor(util): tryRun() can take a regex aws#6640 ## Problem This is aimed at fixing the following ec2 bug. Attempting to generate the ssh keys via tryRun can log a failure, when there is no failure. Looking at https://github.com/aws/aws-toolkit-vscode/blob/35502be238b1bf7c3ff73e44df8d077a6d32aa85/packages/core/src/awsService/ec2/sshKeyPair.ts#L78-L86 We use `tryRun` to detect if the output contains "unknown key type". This allows us to detect when a certain key type such as RSA or ed25519 is not supported on the local machine. Detecting if the key generated successfully is a harder problem, as the output did not contain a consistent message. However, it results in `tryRun` logging a failure to find "unknown key type" in the output, which means failed to find the expected text in the output, but still generated the key. This is then logged as a failure, but is functionally a success. This is very confusing behavior. The root of this problem is we are trying to use `tryRun` in a way it doesn't naturally support. Rather than use it awkwardly, we can extend it. ## Solution - add support for regex in tryRun New logs: ``` 2025-02-20 12:07:01.624 [info] tryRun: ok: PID 22605: [ssh-keygen -t ed25519 -N -q -f /Users/hkobew/Library/Application Support/Code/User/globalStorage/amazonwebservices.aws-toolkit-vscode/aws-ec2-key] { exitCode: 0, stdout: '/Users/hkobew/Library/Application Support/Code/User/globalStorage/amazonwebservices.aws-toolkit-vscode/aws-ec2-key already exists.\n' + 'Overwrite (y/n)?', stderr: '', error: undefined, signal: undefined } ``` * test(amazon): add more debugging information to inline tests (aws#6644) ## Problem - we have no way to get any information on why an inline test was flaky. It might be because telemetry events are being out of order? - Since fib doesn't have spaces in the contents it's autocompleting on the very first line which may be causing the backend to return no results ## Solution - add more debugging information to understand why there was a failure - add spaces to the test fib function - consider a suggestion shown if the recommendation handler says its visible or if its state has been declared as 'Shown' --- - 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. * test(amazonq): Add e2e tests for /doc to cover different UX flow (aws#6631) ## Problem ## Solution Add e2e tests to cover: 1. /doc update document flow. 2. Create document in a subfolder. 3. Cancel operation. 4. Discard or accept operation. --- - 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: Avi Alpert <[email protected]> * fix(ec2): increase robustness of checking ssm agent ping status. (aws#6621) ## Problem As part of the EC2 Connect process, we check if the SSM agent is pingable on the target instance. This is done here: https://github.com/aws/aws-toolkit-vscode/blob/b9af56c3097242fb796995479f864d95098bf713/packages/core/src/awsService/ec2/model.ts#L153-L162 This check can fail, and is currently does fail a decent amount of the time in telemetry. ## Solution - wrap the check in a `waitUntil`, retrying every half second up to 10 times. --- - 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. * refactor(ec2): improve error information in telemetry. (aws#6624) ## Problem Within telemetry, there are a large group of fatal errors within EC2 Connect being grouped together under the same general error code. Additionally, there is very little information in the error message to determine the source of this error. Specifically, it appears the the test SSM connection done before attempting to pass the connection to VS Code, implemented [here](https://github.com/aws/aws-toolkit-vscode/blob/b9af56c3097242fb796995479f864d95098bf713/packages/core/src/shared/extensions/ssh.ts#L133-L155), can fail, and gives us a general error code with little information about its root cause. ## Solution - Add a specific error code for this connection type. (reused an old unused one) - Pipe the error from the child process into the error message so that we get it in telemetry. - Add a docstring to test connect function, since its not obvious whats happening as it involves both ssh and ssm. Example Error: <img width="465" alt="image" src="https://github.com/user-attachments/assets/8b27746d-9291-48a4-a125-dcea761a2c13" /> --- - 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: Justin M. Keyes <[email protected]> * config(amazonq-chat): disable and remove implicit workspace context experiment (aws#6630) ## Problem Remove as experiment has been disable from the service side, no need to collect workspace context if service doesn't actually utilize it. ## 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. * fix(amazonq): ignored lines should not show up in /review scan issues * Revert "deps(build): update esbuild-loader to 4.3.0 (aws#6622)" (aws#6660) This reverts commit 8d2d335. ## Problem Upgrading esbuild-loader broke loading mynah-ui ## Solution Revert for now --- - 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): skip tests locally (aws#6658) ## Problem When users choose to skip tests, we were skipping them on our server by passing in their choice to our backend, but we weren't also skipping them locally. ## Solution Tell Maven to use `-DskipTests` --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license. Co-authored-by: David Hasani <[email protected]> * fix(amazonq): fix uploading file method error handling for /doc * "Added Stub to tests to make them work" * chore: update according to the comments * Adding additional patterns for file filtering for test generation. * revamp test to not stub files to better simulate real environment * Sorting workspace folders in ziputils for test generation usecase. * removed debugging comment * correction for workspace folder for usecase. * Revamp test to unaccount for windows bug to solve later * Fixed syntax errors and updated the test generation ignore pattern list. * Correction for files ignore patterns * Fixed file to be the core folder * feat(toolkit): Expand data source and output options for Distributed Map in ASL language schema (aws#6680) ## Problem ## Solution Upgrade `amazon-states-language-service` to 1.16.1. The new version expands data source and output options for Distributed Map in ASL. Feature release post: https://aws.amazon.com/about-aws/whats-new/2025/02/aws-step-functions-data-source-output-option-distributed-map/ --- ![Screenshot 2025-02-25 at 12 28 22 PM](https://github.com/user-attachments/assets/8d70d111-558b-4973-b206-2601929d0e9e) - 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: Silvia Chen <[email protected]> * fix(amazonq): Test generation shows incorrect view diff view (aws#6676) ## Problem - When users attempt to generate unit test cases using the /test command for packages other than the primary one in the workspace, they encounter a diff view suggesting the absence of an existing file. However, this is incorrect as there is already an existing test file in the package. ## Solution - Fixed this issue by getting the project path from the target file. --- - 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): adjust feature-config customization ARN-override logic aws#6674 1. change poll interval from 30mins to 180 mins 2. Only call listAvailableCustomizations for new customization override for update 3. Use a new field customizationArnOverrideV2 for a clean override plan * correction for removing usecase from workspaceUtils. * Fix for imports * fix for useCase trype for lint * Fixed test according to comment * Update packages/amazonq/test/unit/codewhisperer/service/securityScanHandler.test.ts Co-authored-by: Tai Lai <[email protected]> * Fix styles * Release 3.48.0 * Release 1.49.0 * Update version to snapshot version: 3.49.0-SNAPSHOT * Update version to snapshot version: 1.50.0-SNAPSHOT --------- Co-authored-by: aws-toolkit-automation <[email protected]> Co-authored-by: aws-toolkit-automation <> Co-authored-by: Josh Pinkney <[email protected]> Co-authored-by: chungjac <[email protected]> Co-authored-by: Hweinstock <[email protected]> Co-authored-by: Kevin Ding <[email protected]> Co-authored-by: Avi Alpert <[email protected]> Co-authored-by: Justin M. Keyes <[email protected]> Co-authored-by: Will Lo <[email protected]> Co-authored-by: Yaofu Zuo <[email protected]> Co-authored-by: David <[email protected]> Co-authored-by: David Hasani <[email protected]> Co-authored-by: Kevin Ding <[email protected]> Co-authored-by: Ashish Reddy Podduturi <[email protected]> Co-authored-by: Silvia Chen <[email protected]> Co-authored-by: Silvia Chen <[email protected]> Co-authored-by: andrewyuq <[email protected]> Co-authored-by: invictus <[email protected]> Co-authored-by: Tai Lai <[email protected]>
1 parent 6e6cb37 commit 198891d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+802
-286
lines changed

package-lock.json

Lines changed: 8 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{
2+
"date": "2025-02-20",
3+
"version": "1.48.0",
4+
"entries": [
5+
{
6+
"type": "Bug Fix",
7+
"description": "/dev and /doc: Multi-root workspace with duplicate files causes infinite 'Uploading code...' loop"
8+
},
9+
{
10+
"type": "Bug Fix",
11+
"description": "Amazon Q /doc: update workspace too large error message "
12+
},
13+
{
14+
"type": "Bug Fix",
15+
"description": "/review: Auto-review should not remove issues from manual reviews"
16+
},
17+
{
18+
"type": "Bug Fix",
19+
"description": "/transform: allow View Summary button to work even after accepting diff"
20+
},
21+
{
22+
"type": "Bug Fix",
23+
"description": "Amazon Q /test: Fixing the issue of target file does not exist."
24+
},
25+
{
26+
"type": "Feature",
27+
"description": "Amazon Q /doc: Add support for infrastructure diagrams"
28+
}
29+
]
30+
}
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"date": "2025-02-27",
3+
"version": "1.49.0",
4+
"entries": [
5+
{
6+
"type": "Bug Fix",
7+
"description": "Amazon Q /test: Unit test generation displays an inaccurate diff view for non-primary packages in the workspace."
8+
},
9+
{
10+
"type": "Bug Fix",
11+
"description": "Amazon Q /doc: Fix uploading file method throwing incorrect workspace too large error message"
12+
},
13+
{
14+
"type": "Bug Fix",
15+
"description": "/transform: skip running tests locally when user chooses to do so"
16+
},
17+
{
18+
"type": "Bug Fix",
19+
"description": "/review: ignored lines should not show up in scan issues"
20+
},
21+
{
22+
"type": "Bug Fix",
23+
"description": "/test: update capability card text"
24+
}
25+
]
26+
}

packages/amazonq/.changes/next-release/Bug Fix-037e19bd-95f5-4cdf-8408-6eb273ff7ebd.json

Lines changed: 0 additions & 4 deletions
This file was deleted.

packages/amazonq/.changes/next-release/Bug Fix-68a8eeb4-2e3d-4f56-9b31-837816e16ab4.json

Lines changed: 0 additions & 4 deletions
This file was deleted.

packages/amazonq/.changes/next-release/Bug Fix-c8a60497-e42c-4141-bcfe-2c44188bc98b.json

Lines changed: 0 additions & 4 deletions
This file was deleted.

packages/amazonq/.changes/next-release/Bug Fix-eac82ab9-bdab-47c4-834d-600cb1a0b6a2.json

Lines changed: 0 additions & 4 deletions
This file was deleted.

packages/amazonq/.changes/next-release/Bug Fix-ee447a9f-6a92-47c5-8e94-069c1aee46ab.json

Lines changed: 0 additions & 4 deletions
This file was deleted.

packages/amazonq/.changes/next-release/Feature-088c8b44-eb51-4495-84fb-2e02878ff4bc.json

Lines changed: 0 additions & 4 deletions
This file was deleted.

packages/amazonq/CHANGELOG.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
## 1.49.0 2025-02-27
2+
3+
- **Bug Fix** Amazon Q /test: Unit test generation displays an inaccurate diff view for non-primary packages in the workspace.
4+
- **Bug Fix** Amazon Q /doc: Fix uploading file method throwing incorrect workspace too large error message
5+
- **Bug Fix** /transform: skip running tests locally when user chooses to do so
6+
- **Bug Fix** /review: ignored lines should not show up in scan issues
7+
- **Bug Fix** /test: update capability card text
8+
9+
## 1.48.0 2025-02-20
10+
11+
- **Bug Fix** /dev and /doc: Multi-root workspace with duplicate files causes infinite 'Uploading code...' loop
12+
- **Bug Fix** Amazon Q /doc: update workspace too large error message
13+
- **Bug Fix** /review: Auto-review should not remove issues from manual reviews
14+
- **Bug Fix** /transform: allow View Summary button to work even after accepting diff
15+
- **Bug Fix** Amazon Q /test: Fixing the issue of target file does not exist.
16+
- **Feature** Amazon Q /doc: Add support for infrastructure diagrams
17+
118
## 1.47.0 2025-02-13
219

320
- **Bug Fix** `Send to prompt` and other context menu options not sent if chat was closed

0 commit comments

Comments
 (0)