Skip to content

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/cwltail
git merge origin/master
git commit
git push origin HEAD:refs/heads/autoMerge/feature/cwltail

scottwritescode and others added 3 commits December 2, 2024 15:29
## Problem
The codefileExtensions does not contain an extension type for `.pli`
which is the common extension for PL/1, or for `.bms` which is Basic
Mapping Support and common for screen definition files in IBM mainframe.
Because of this, the files and code in them are not accessible in the
workspace context for Amazon Q using the `/dev` quick action.

When using the Q quick action '\dev' for `.pli` or `.bms` files, Q
responds with the following message:
> This appears to be an empty program or workspace with no source files
present. There is nothing to explain at this time since no code or files
are available for analysis.

## Solution
- Add `.pli` and `.bms` as a known code file extension types.
## Problem
fix #6078 

## Solution
Turn off CodeWhisper scanning after test suite completes.
re-invent 2024 release

---

<!--- REMINDER: Ensure that your PR meets the guidelines in
CONTRIBUTING.md -->

License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.

Co-authored-by: Ashish Reddy Podduturi <[email protected]>
Co-authored-by: Avi Alpert <[email protected]>
Co-authored-by: Blake Lazarine <[email protected]>
Co-authored-by: Bodie Weedop <[email protected]>
Co-authored-by: Chay Nabors <[email protected]>
Co-authored-by: Grant Gurvis <[email protected]>
Co-authored-by: Hweinstock <[email protected]>
Co-authored-by: Justin M. Keyes <[email protected]>
Co-authored-by: KevinDing1 <[email protected]>
Co-authored-by: Laxman Reddy <[email protected]>
Co-authored-by: Matt Lee <[email protected]>
Co-authored-by: Maxim Hayes <[email protected]>
Co-authored-by: Nikolas Komonen <[email protected]>
Co-authored-by: Tai Lai <[email protected]>
Co-authored-by: Vikash Agrawal <[email protected]>
Co-authored-by: Zoe Lin <[email protected]>
Co-authored-by: juusticeTG <[email protected]>
aws-toolkit-automation and others added 15 commits December 3, 2024 14:20
## Problem
/docs should be /doc

## Solution
fix it

---

<!--- REMINDER: Ensure that your PR meets the guidelines in
CONTRIBUTING.md -->

License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.
## Problem
Ignore pattern that is only needed on the vscode minimum version of 1.68,
but we have bumped to 1.83.0.

## Solution
Remove pattern for this case.
…#6114)

## Problem

We didn't have much use for the old "Amazon Q" channel in addition to
"Amazon Q Logs". All the logs we used were in "Amazon Q Logs".

## Solution

- Now, just have the useful "Amazon Q Logs" channel.
- Move the Amazon Q Language Server logs in to Amazon Q Logs to unify
all logs


---

<!--- REMINDER: Ensure that your PR meets the guidelines in
CONTRIBUTING.md -->

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
- UTG toolkit telemetry can not differentiate the users from builderID
users vs internal IAM IDC users vs external enterprise users.

## Solution
- Adding `credentialUrl = AuthUtil.instance.startUrl` field to
differentiate the builderID users vs internal IAM IDC users vs external
enterprise users.

---

- 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-toolkit-automation aws-toolkit-automation requested a review from a team as a code owner December 3, 2024 22:15
"DEXP" was renamed to "Flare".
…6144

## Problem
If a user creates or updates a README using /doc and hits "Cancel"
during the "Scanning source files" step, the prompt input progress bar
persists.

## Solution
Do not display the prompt progress bar if a user has cancelled the
current task.
## Problem
mynah ui has several improvements since we've last updated:
- Fix chat syntax highlighting when using several different themes
- UI improvements to Amazon Q Chat: New splash loader animation, initial
streaming card animation, improved button colours
- Navigate through prompt history by using the up/down arrows

## Solution
Update mynah ui

---

<!--- REMINDER: Ensure that your PR meets the guidelines in
CONTRIBUTING.md -->

License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.
ntarakad-aws and others added 23 commits December 5, 2024 14:30
…6138

## Problem
We were only recording the metrics when the user accepts changes so we
can track which patches were applied based on their description. We
wanted to also keep track of the form in which the user is prompted to
pick whether they want their changes in one or multiple diffs.

## Solution
Adding a telemetry call when we handle the form selection for selective
transformation one or multiple diffs.
## Problem
- disclaimer is too wordy

## Solution
- go back to the old disclaimer and add an ackowledgement button
## Problem
Missing documentation about current behavior of ec2 remote window
connect.

## Solution
Add some detail to the docs. 

---

- 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 want to only log file paths when in debug mode, but the connect
script has no way of determining this.

## Solution
- pass log level to connect script. 
- use it to determine what to log. 

Example logs:
``` 
2024/12/05 15:50:24 ==============================================================================
2024/12/05 15:50:24 LOG_LEVEL=3
2024/12/05 15:50:24 AWS_REGION=us-east-1
2024/12/05 15:50:24 SESSION_ID=...
2024/12/05 15:51:11 ==============================================================================
2024/12/05 15:51:11 LOG_LEVEL=1
2024/12/05 15:51:11 AWS_REGION=us-east-1
2024/12/05 15:51:11 SESSION_ID=...
2024/12/05 15:51:11 AWS_SSM_CLI=.../Amazon/sessionmanagerplugin/bin/session-manager-plugin
2024/12/05 15:51:11 LOG_FILE_LOCATION=/.../ec2.{instanceId}.log
2024/12/05 15:51:55 ==============================================================================
2024/12/05 15:51:55 LOG_LEVEL=2
2024/12/05 15:51:55 AWS_REGION=us-east-1
2024/12/05 15:51:55 SESSION_ID=default-uk9cv4h86y5rdbrzarlkj9opci
2024/12/05 15:51:56 AWS_SSM_CLI=../Amazon/sessionmanagerplugin/bin/session-manager-plugin
2024/12/05 15:51:56 LOG_FILE_LOCATION=/.../ec2.{instanceId}.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.
…_utgGenerateTests event (#6174)

## Problem
- UTG sends plaintext instead of python for amazonq_utgGenerateTests
event.
- In code, `session.fileLanguage = await
this.getLanguageForFilePath(filePath)` reassigned python to plaintext
after test generation.

## Solution
- Removal of `session.fileLanguage = await
this.getLanguageForFilePath(filePath)` should fix the 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 are sending incorrect code issue description to the service.

## Solution
Improved Code Fix generation for code review issues by sending issue
recommendation text as description to the service.

---

- 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
Nested `Dockerfile` files were not supported with
#6107

## Solution
Look at path basename when comparing file to list of well known files.
fix(amazonq): prompt user to choose a folder in the chat for /doc
## Problem
Issues reported in chat sometimes does not match issues tree.

This is happening because the zip artifact uses workspace name (custom
name could be different from fsPath) while git diff output uses fsPath.
This causes the findings to come back as two filePaths that end up
overwriting each other.


## Solution
Update zip to use project name from fsPath instead of
`workspaceFolder.name`
## Problem
- Code diff for file review format has changed in payload to improve LLM
based code review accuracy and is dependent on git.

## Solution
- We are currently send entire file in diff format and run git commands
to extract it. This change will remove git dependency for LLM based code
review issues.
## Problem
Express needs to be updated to a newer version to avoid security
vulnerabilities

## Solution
Update it
## Problem
- explore page has some UI updates

## Solution
- improve the "Quick start" buttons on the explore agents page so that
it shows amazon q colours on hover
## Problem
- Missing data if job fails at `StartTestGeneration` API.

## Solution
- Adding requestId for `amazonq_utgGenerateTests` event, which helps to
debug the reason for job failures from the backend.
## Problem
...

## Solution
- (title)
- Refactor github actions such that JSCPD requires `lint-commits`. 
- Add step to `lint-commits` that verifies branch name according to
rules here:
https://docs.github.com/en/get-started/using-git/dealing-with-special-characters-in-branch-and-tag-names#naming-branches-and-tags
- Note this means that no CI tasks will run on PRs with branches that
don't fit naming conventions.

---

<!--- REMINDER: Ensure that your PR meets the guidelines in
CONTRIBUTING.md -->

License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.
## Problem
It appears that on `push` events the `head_ref` is an empty string,
which is not a valid branch name.

## Solution
- Only validate branch names on pull_request events, and use event info
since its more consistent.

---

- 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-toolkit-automation aws-toolkit-automation requested a review from a team as a code owner December 9, 2024 21:49
@justinmk3 justinmk3 force-pushed the autoMerge/feature/cwltail branch from 949566b to 0ba37d8 Compare December 9, 2024 22:20
@justinmk3 justinmk3 merged commit 8b0bbc9 into feature/cwltail Dec 9, 2024
10 of 17 checks passed
@justinmk3 justinmk3 deleted the autoMerge/feature/cwltail branch December 9, 2024 22:56
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.