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/amazonqLSP #6223

Open
wants to merge 20 commits into
base: feature/amazonqLSP
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/amazonqLSP
git merge origin/master
git commit
git push origin HEAD:refs/heads/autoMerge/feature/amazonqLSP

## Problem
EC2 is currently hidden behind dev mode. 

## Solution
Make it an experimental feature that customers can enable. 
Also, remove some old experiments from settings page description.
@aws-toolkit-automation aws-toolkit-automation requested a review from a team as a code owner December 12, 2024 18:42
@aws-toolkit-automation aws-toolkit-automation requested a review from a team as a code owner December 12, 2024 21:24
vicheey and others added 4 commits December 12, 2024 14:06
…#6166

## Problem
Wizard framework does not support:
- async `showWhen()` provider.
- restoring previous state of WizardPrompter in nested wizard when
  user clicks BACK button.
- skipping prompter in backward direction.

## Solution
- introduce `NestedWizard` class that uses child wizards as prompters with
  support for instantiating and restoring child wizards in backward direction.
- update wizard state controller to support `ControlSingal.Skip` and add concept
  of wizard direction.
- support async `showWhen()` provider.

fix #6094
## Problem
EC2 icons are in an awkward order with the link to launch in-between the
two connect options.

## Solution
https://stackoverflow.com/questions/47613141/how-to-specify-the-order-of-icons-in-an-explorer-view-in-a-vscode-extension.

Also update descriptions to fit UX guidelines.
…#6113

## Problem
contributors may use the low-level node `child_process` library, which
lacks the instrumentation and robustness of the toolkit `ChildProcess`
utility.
Example:
#5925 (comment)

## Solution
- add the node `child_process` library as a "banned import" with a
message pointing to our `ChildProcess` utility.
- Migrate simple cases to use our `ChildProcess`, mark more complex ones
as exceptions.

## Future Work
- To migrate the existing cases marked as exceptions, we will need to
add functionality to our `ChildProcess` api, such as enforcing a
`maxBufferSize` on the output.
- Additionally, some of the current uses of `child_process` are tied to
implementation details in the `child_process` library that make it hard
to change without a larger-scale refactor. These cases were marked as
exceptions.
Hweinstock and others added 7 commits December 12, 2024 18:08
## Problem
Performance test was reliant on dead code removed in
#6218

## Solution
- update thresholds to accommodate the change. 

---

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

Error users were seeing was:

```
Error: SSO cache data unexpectedly missing props: ["refreshToken"]
```

This was due to a change from a previous PR that assumed the
refreshToken was always present in SSO cache.

## Solution:

It looks like the refreshToken does not exist for all cases, so some
research needs to be done.

But for now this reverts the validation that the refreshToken exists.
Though it keeps the validation that the accessToken exists since that is
always guaranteed.

**A temporary workaround should be to sign out/in and things should
start working. If not please downgrade 3.38.0 until we release this fix
next week.**

Fixes #6230 

---

- 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]>
)

## Problem

If a user runs a transformation, rejects changes, then immediately runs
another transformation on the same project (rare, but it happens), we
attempt to show the user the old diff (which has already been deleted at
this point).


## Solution

Reset `patchFiles` before showing the user the patch 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.

Co-authored-by: David Hasani <[email protected]>
## Problem
- the current implementation only opens the first tab as a welcome tab
for the next 3 times you open vscode

## Solution
- the new implementation shows the welcome tab 3 total times, either
when you open a new chat tab or a new vscode window or both

---

- 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
- For the last 8 months or so we've skipped e2e test results, now
they're becoming a lot more crucial and used by other teams

## Solution
- remove the skipping


---

- 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.
…to always use repomap (#6205)

## Problem
Remove client side A/B experiment (control, treatment1, treatment2),
move it to service side and always assume treatment1

## 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.
@justinmk3
Copy link
Contributor

/runintegrationtests

Will-ShaoHua and others added 5 commits December 13, 2024 13:28
… telemetry (#6242)

## Problem
Current `supplementalContextStrategy ` only reflect what group the user
is in, however by doing this it won't help much on our data analysis.
What we need is the context strategy being used so that we know how much
% of users have repomap or opentabs and how % of users have empty
supplemental context etc.

## 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
`jobId` missing in some metrics.


## Solution
Add it.
## Problem

Apply fix removes other issues in the same file. This is happening
because apply fix command will always replace the entire file contents
which triggers a document change event that intersects with all issues
in the file.


## Solution

Look through the diff hunks and apply them in a range.


---

- 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
Techdebt test is failing CI. This is unlikely to be addressed atm. 

## Solution
- Delay until 2025.
@jpinkney-aws
Copy link
Contributor

/runIntegrationTests

1 similar comment
@jpinkney-aws
Copy link
Contributor

/runIntegrationTests

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.

10 participants