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 main into feature/dev-execution #5135

Open
wants to merge 30 commits into
base: feature/dev-execution
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/dev-execution
git merge origin/main
git commit
git push origin HEAD:refs/heads/autoMerge/feature/dev-execution

Add `Dockerfile`, `Dockerfile.build` and `*.dockerfile` to list of supported file extensions for /dev
@aws-toolkit-automation aws-toolkit-automation requested a review from a team as a code owner November 26, 2024 19:44
* enable implicit project context ab test

* patch
@aws-toolkit-automation aws-toolkit-automation requested a review from a team as a code owner November 26, 2024 20:19
@aws-toolkit-automation aws-toolkit-automation requested a review from a team as a code owner November 26, 2024 20:48
The agent may generate files with or without a leading slash in the generated file path. In JetBrains, this results in an exception thrown when attempting to write to the root directory on MacOS. (Various other failure modes may occur due to lack of normalization, depending on OS.)

This change normalized handling within /dev, to avoid breakage or other side effects of non-normalized file paths.
@aws-toolkit-automation aws-toolkit-automation requested a review from a team as a code owner November 26, 2024 21:14
leigaol and others added 6 commits November 26, 2024 13:17
…indings (#5133)

When you select - Map Key bindings from Q's status bar - It takes you to a settings panel with setting to change "JB's Inline Suggestion". You must select Q's settings & then update.

This is to update the search text to Amazon Q inline suggestion to avoid confusion with JB's keybindings
* Add framework for processing notifications (#5112)

* Add deserialization for notification messages retrieved from the notification file and criteria on whether it should be displayed (#5093)

* Display toast notifications with actions

* Condition matcher for displaying notifications

* Modified deserialization cases and added tests

* not required file change

* feedback 1

* modified the base class

* modified test instance lifecycle

* Show toasts for notifications and notification banner on critical notifications(#5097)

* Display toast notifications with actions

* Condition matcher for displaying notifications

* Show notification banner

* feedback 1

* Modified deserialization cases and added tests

* not required file change

* feedback 1

* feedback 1

* modified the base class

* merge conflicts resolved

* rearranged call site

* show notifications when panel is opened

* fixed tests

* detekt

* feedback

* convert panels into wrappers

* fixed test

* Adding update/restart action to notifications (#5136)

* Poll for new notifications (#5119)

* initial commit

* run on startup

* detekt

* move vals

* remote resource implementation

* comments

* detekt

* Validate file before saving

* cache path

* observer implementation

* deserialize notifs from file

* detekt

* remove unused interface

* internal class

* Fix observer

* etag singleton state component

* add telemetry

* atomicBoolean

* initialize once per IDE startup

* code scan

* Omit (Unit)

* specify etag storage location

* detekt

* fix detekt issues

* basic tests

* no star imports

* coroutine scope delay instead of thread.sleep

* feedback fixes

* test fix

* Application Exists for tests

* endpoint object

* detekt

* detekt fixes

* boolean flag

* boolean flag

* update tests

* move startup flag handling to processBase

* fix delay

* fix delay

* Notification dismissal state tracking  (#5129)

* split notifications into separated lists.

* add persistent notification dismissal state logic

* boolean changes

* group persistant states

* comments

* Service initialized automatically

* isStartup global

* Deserialized notification schedule type

* tests

* persistent state syntax

* convert to light services

* Remove state from companion object

* detekt

* endpoint as registryKey

* detekt

* fix startup issues

* Expiry issues

* Add logging info to IDE notification polling and processing (#5138)

* add logs for polling and processing notifs

* redundant

* finish log

* fix isFirstPoll not setting to false on first pass

---------

Co-authored-by: aws-toolkit-automation <[email protected]>
Co-authored-by: manodnyab <[email protected]>
Co-authored-by: Bryce Ito <[email protected]>
* Add framework for processing notifications (#5112)

* Add deserialization for notification messages retrieved from the notification file and criteria on whether it should be displayed (#5093)

* Display toast notifications with actions

* Condition matcher for displaying notifications

* Modified deserialization cases and added tests

* not required file change

* feedback 1

* modified the base class

* modified test instance lifecycle

* Show toasts for notifications and notification banner on critical notifications(#5097)

* Display toast notifications with actions

* Condition matcher for displaying notifications

* Show notification banner

* feedback 1

* Modified deserialization cases and added tests

* not required file change

* feedback 1

* feedback 1

* modified the base class

* merge conflicts resolved

* rearranged call site

* show notifications when panel is opened

* fixed tests

* detekt

* feedback

* convert panels into wrappers

* fixed test

* Adding update/restart action to notifications (#5136)

* Poll for new notifications (#5119)

* initial commit

* run on startup

* detekt

* move vals

* remote resource implementation

* comments

* detekt

* Validate file before saving

* cache path

* observer implementation

* deserialize notifs from file

* detekt

* remove unused interface

* internal class

* Fix observer

* etag singleton state component

* add telemetry

* atomicBoolean

* initialize once per IDE startup

* code scan

* Omit (Unit)

* specify etag storage location

* detekt

* fix detekt issues

* basic tests

* no star imports

* coroutine scope delay instead of thread.sleep

* feedback fixes

* test fix

* Application Exists for tests

* endpoint object

* detekt

* detekt fixes

* boolean flag

* boolean flag

* update tests

* move startup flag handling to processBase

* fix delay

* fix delay

* Notification dismissal state tracking  (#5129)

* split notifications into separated lists.

* add persistent notification dismissal state logic

* boolean changes

* group persistant states

* comments

* Service initialized automatically

* isStartup global

* Deserialized notification schedule type

* tests

* persistent state syntax

* convert to light services

* Remove state from companion object

* detekt

* endpoint as registryKey

* detekt

* fix startup issues

* Expiry issues

* Add logging info to IDE notification polling and processing (#5138)

* add logs for polling and processing notifs

* redundant

* finish log

* show message instead of yesNoDialogue

* initialize ProcessNotificationsBase listener before Polling service

* fix isFirstPoll not setting to false on first pass

---------

Co-authored-by: aws-toolkit-automation <[email protected]>
Co-authored-by: manodnyab <[email protected]>
Co-authored-by: Bryce Ito <[email protected]>
@aws-toolkit-automation aws-toolkit-automation requested a review from a team as a code owner December 3, 2024 14:18
samgst-amazon and others added 15 commits December 3, 2024 07:50
Co-authored-by: Andrew Yu <[email protected]>
Co-authored-by: Ashish Podduturi <[email protected]>
Co-authored-by: Bodie Weedop <[email protected]>
Co-authored-by: C Tidd <[email protected]>
Co-authored-by: Grant G <[email protected]>
Co-authored-by: Kevin Ding <[email protected]>
Co-authored-by: Laxman Reddy <[email protected]>
Co-authored-by: Matt Lee <[email protected]>
Co-authored-by: Matthew McDonald <[email protected]>
Co-authored-by: Randall Jiang <[email protected]>
Co-authored-by: Richard Li <[email protected]>
Co-authored-by: Tai Lai <[email protected]>
Co-authored-by: Zoe Lin <[email protected]>
Cherry-pick approved changes from staging
rli and others added 5 commits December 3, 2024 20:55
`onCustomFormAction` was not delegating to `codetransform` button click handler
…enaming (#5162)

As part of the renaming of "DEXP" to "Flare", the team name on GitHub has changed, and so the codeowners file in this repository should be updated accordingly.
@willyyhuang willyyhuang force-pushed the autoMerge/feature/dev-execution branch from 4396d87 to cc5e50f Compare December 4, 2024 19:02
Copy link

github-actions bot commented Dec 4, 2024

Qodana Community for JVM

359 new problems were found

Inspection name Severity Problems
Incorrect service retrieving 🔴 Failure 2
Invalid property key 🔴 Failure 2
Usage of redundant or deprecated syntax or deprecated symbols 🔶 Warning 265
Unused symbol 🔶 Warning 29
Incorrect string capitalization 🔶 Warning 5
Mismatch between light service level and its constructor 🔶 Warning 4
Local 'var' is never modified and can be declared as 'val' 🔶 Warning 3
Extension class should be final and non-public 🔶 Warning 3
Unresolved reference in KDoc 🔶 Warning 3
Obvious explicit type 🔶 Warning 3
Component/Action not registered 🔶 Warning 2
Possibly blocking call in non-blocking context 🔶 Warning 1
Property is explicitly assigned to constructor parameter 🔶 Warning 1
Control flow with empty body 🔶 Warning 1
Redundant modality modifier 🔶 Warning 1
Redundant nullable return type 🔶 Warning 1
Redundant call of conversion method 🔶 Warning 1
Redundant qualifier name 🔶 Warning 1
Class member can have 'private' visibility ◽️ Notice 23
Size zero check can be replaced with 'isEmpty()' ◽️ Notice 2
Cascade 'if' can be replaced with 'when' ◽️ Notice 1
Const property naming convention ◽️ Notice 1
Join declaration and assignment ◽️ Notice 1
Variable declaration could be moved inside 'when' ◽️ Notice 1
Redundant 'if' statement ◽️ Notice 1
Accessor call that can be replaced with property access syntax ◽️ Notice 1

💡 Qodana analysis was run in the pull request mode: only the changed files were checked
☁️ View the detailed Qodana report

Contact Qodana team

Contact us at [email protected]

Copy link

@github-advanced-security github-advanced-security bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

QDJVMC found more than 20 potential problems in the proposed changes. Check the Files changed tab for more details.

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.