Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge master into feature/dynamodb #5574

Open
wants to merge 1,874 commits into
base: feature/dynamodb
Choose a base branch
from

Conversation

aws-toolkit-automation
Copy link
Collaborator

Automatic merge failed

  • Resolve conflicts and push to this PR branch.
  • Do not squash-merge this PR. Use the "Create a merge commit" option to do a regular merge.

Command line hint

To perform the merge from the command line, you could do something like the following (where "origin" is the name of the remote in your local git repo):

git stash
git fetch --all
git checkout origin/feature/dynamodb
git merge origin/master
git commit
git push origin HEAD:refs/heads/autoMerge/feature/dynamodb

@aws-toolkit-automation aws-toolkit-automation requested a review from a team as a code owner October 2, 2024 16:47
@aws-toolkit-automation aws-toolkit-automation requested a review from a team as a code owner December 3, 2024 22:16
avi-alpert and others added 25 commits January 9, 2025 14:18
fix(amazonq): update messaging for /doc
telemetry(amazonq): Remove unused Telemetry metric for /doc
…eprocessLatency (#6320)

## Problem

t1: user trigger inline suggestion either automatically or manually
t2: start building request with editor context
t3: done building request
t4: call service API

PreprocessLatency is supposed to denote `t3 - t1`, whereas current
implementation isn't which has been using
`codewhispererPreprocessingLatency: session.fetchCredentialStartTime -
session.invokeSuggestionStartTime,`












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

Have 2 unused strings

## Solution

Remove them

---

- 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]>
telemetry(amazonq): numberOfTestsGenerated correctly emits as 0
…ected a customization

## Problem

If a user was part of an AB group with a customization override, they could only ever use the customization from the override regardless of personal choice. 

## Solution

Changes the logic for when a customization will be overridden if the user is part of an AB group that has a customization override. With this change, if the user has manually selected a customization, it will not be overridden by the AB customization.
## Problem
If a request to update a README results in an updated README that
exceeds the size limit, a generic "I'm sorry, I ran into an issue
updating your README" error is displayed.

## Solution
Display a more specific error message when an updated README Exceeds the
size limit

---

- 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.
Reverts
[259ca31](259ca31#diff-53367fa008dcbcfc4cc4e6a9c97bae43ea889adfdec82209a996e7228cdf2c72)

Its purpose was to nudge inline completion users to the new chat
feature. The codepath is now no longer possible in new versions.

---

- 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

The CC tests are failing in the auth lambda step, saying that the
`user_code` value is not a string

## Solution

See code for solution

NOTE: This part is now fixed, but the auth lambda itself has its own
separate issue that needs to first be fixed

---

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

Signed-off-by: nkomonen-amazon <[email protected]>
…as provided #6339

## Problem
The wizard remained in a "not ready" state if a custom `init()` was
provided, requiring manual toggles in the test code.

## Solution
- Wrap the user’s init() with a small decorator that sets _ready = true.
- Remove the manual toggles in wizardTestUtils.ts, letting the wizard
handle readiness on its own.
Hweinstock and others added 30 commits February 21, 2025 11:38
## 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.
## 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]>
…xperiment (#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.
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.
## 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
…Map in ASL language schema (#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]>
## 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.
…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
fix(amazonq): /test file collection usecase adds more patterns to filtering.
fix(amazonq):  ignored lines should not show up in /review scan issues
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.