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.

Sign up for GitHub

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

Jump to bottom

feat(amazonq): UTG build and execute for internal users. #5436

Open

laileni-aws wants to merge 29 commits into aws:feature/build-execute from laileni-aws:randal/build

Contributor

laileni-aws commented Mar 4, 2025 •

edited

Loading

Types of changes

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)

Description

This PR is an extension implementation for this #5396.
This PR introduces a build-exec loop for internal Amazon users, allowing them to run a customized build command after Amazon Q generates unit tests. The goal is to ensure that the newly generated unit tests do not break the initial build.

Solution

Adding back build and execute logic for internal amazon users to fix the errors when generating unit tests. Allow users to run 3 iterations to fix the codes if there are any issues cause build failure.

Checklist

My code follows the code style of this project
I have added tests to cover my changes
A short description of the change has been added to the CHANGELOG if the change is customer-facing in the IDE.
I have added metrics for my changes (if required)

License

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

Randall-Jiang and others added 16 commits

February 21, 2025 13:43


          add build-execute code

24a0832


          address comment

4168e78


          create progress bar for fixing build failure

b5de261


          fix the bug which might cause user can not execute the build command …

9cf1786

…& add telemetry for build&execute


          fix format error

ca2c128


          correct the logic to send the telemetry

9151dce


          addressed comment

b5792bc

nit


          addressing comments

9e323fe


          add PATH

3601d49


          add gradle file for groovy version of the gradle build script

fc8d07b


          fix UI error

d195b1a


          Fix lint errors

7e6a367


          Merge branch 'feature/build-execute' into build-execute

2c3ddba


          Merge from Feature/build-execute

43dced6

* fix(amazonq):fix cross-tab data interference

* fix(amazonq):fix cross-tab data interference

Co-authored-by: Kevin Ding <102239785+KevinDing1@users.noreply.github.com>
Co-authored-by: aws-toolkit-automation <43144436+aws-toolkit-automation@users.noreply.github.com>


          Merge branch 'feature/build-execute' into randal/build

bc510d0

github-advanced-security bot found potential problems

View reviewed changes

.../src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/CodeWhispererUTGChatManager.kt Fixed Show fixed Hide fixed

.../src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/CodeWhispererUTGChatManager.kt

+                                      jobId = session.testGenerationJob,
+                                      result = if (e.message == message("testgen.message.cancelled")) MetricResult.Cancelled else MetricResult.Failed,
+                                      reason = (e as CodeTestException).code ?: "DefaultError",
+                                      reasonDesc = if (e.message == message("testgen.message.cancelled")) "${e.code}: ${e.message}" else e.message,

Check warning

Code scanning / QDJVMC

Usage of redundant or deprecated syntax or deprecated symbols Warning

'message(String, vararg Any): String' is deprecated. Use extension-specific localization bundle instead

...oftware/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt Fixed Show fixed Hide fixed

...oftware/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt Dismissed Show dismissed Hide dismissed

...oftware/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt Fixed Show fixed Hide fixed

...oftware/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt Dismissed Show dismissed Hide dismissed

.../software/aws/toolkits/jetbrains/services/amazonqCodeTest/model/BuildAndExecuteStatusIcon.kt Fixed Show fixed Hide fixed

...-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/utils/UTGChatUtil.kt Fixed Show fixed Hide fixed

laileni-aws added 3 commits

March 4, 2025 13:30


          Refactoring Build and execute

3c6c33c


          Revert "Refactoring Build and execute"

d139695

This reverts commit 3c6c33c.


          Refactoring Build and execute

b257fed

github-advanced-security bot found potential problems

View reviewed changes

.../src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/CodeWhispererUTGChatManager.kt Fixed Show fixed Hide fixed

.../src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/CodeWhispererUTGChatManager.kt Fixed Show fixed Hide fixed

...oftware/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt Dismissed Show dismissed Hide dismissed

...oftware/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt Fixed Show fixed Hide fixed

...ns-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/session/Session.kt Fixed Show fixed Hide fixed


          Fixing build and execute command issue

1b76a80

github-advanced-security bot found potential problems

View reviewed changes

...-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/utils/UTGChatUtil.kt Fixed Show fixed Hide fixed

laileni-aws added 2 commits

March 5, 2025 16:43


          Bug fixes in build and execute

e87fe92


          Progress bar cancel UX changes

3e129b2

github-advanced-security bot found potential problems

View reviewed changes

...-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/CodeTestChatItems.kt Dismissed Show dismissed Hide dismissed

.../src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/CodeWhispererUTGChatManager.kt Fixed Show fixed Hide fixed

...oftware/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt Fixed Show fixed Hide fixed

...oftware/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt Fixed Show fixed Hide fixed

...oftware/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt Fixed Show fixed Hide fixed

.../software/aws/toolkits/jetbrains/services/amazonqCodeTest/model/BuildAndExecuteStatusIcon.kt Fixed Show fixed Hide fixed

Contributor Author

laileni-aws commented Mar 7, 2025

/retryBuilds


          Fixes

3dcde41

laileni-aws force-pushed the randal/build branch from 464233b to 3dcde41 Compare

March 7, 2025 00:23


          Merge branch 'feature/build-execute' into randal/build

22b1e81


          Fixes

931fca3

github-advanced-security bot found potential problems

View reviewed changes

...oftware/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt Fixed Show fixed Hide fixed

...oftware/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt Fixed Show fixed Hide fixed

...oftware/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt Fixed Show fixed Hide fixed

laileni-aws and others added 3 commits

March 7, 2025 10:39


          Modified impl of progress bar cancel functionality and some UX change…

27b22d5

…s for V1 version of build and execute


          Merge branch 'feature/build-execute' into randal/build

6d039ae


          Minor fixes and refactoring in CTCChatController, CWSPRUTGChatManager…

f7d450e

… and UTGChatUtil files

laileni-aws changed the title ~~Draft[PR]: UTG build and execute~~ feat(amazonq): UTG build and execute for internal users.

laileni-aws marked this pull request as ready for review

March 7, 2025 18:56

laileni-aws requested review from a team as code owners

March 7, 2025 18:56

github-advanced-security bot found potential problems

View reviewed changes

...oftware/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt

-                                  session.charsOfCodeGenerated,
-                                  session.charsOfCodeGenerated
+                              UiTelemetry.click(

Check warning

Code scanning / QDJVMC

Usage of redundant or deprecated syntax or deprecated symbols Warning

'UiTelemetry' is deprecated. Use type-safe metric builders

...oftware/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt

@@ @@ -740,10 +748,11 @@ @@
                                   )
                                   codeTestChatHelper.updateUI(
                                       promptInputDisabledState = true,
+                                      promptInputPlaceholder = message("testgen.placeholder.select_an_action_to_proceed"),

Check warning

Code scanning / QDJVMC

Usage of redundant or deprecated syntax or deprecated symbols Warning

'message(String, vararg Any): String' is deprecated. Use extension-specific localization bundle instead

...oftware/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt

+                                  )
+                                  delay(1000)
+                                  codeTestChatHelper.sendUpdatePromptProgress(session.tabId, null)
+                                  AmazonqTelemetry.unitTestGeneration(

Check warning

Code scanning / QDJVMC

Usage of redundant or deprecated syntax or deprecated symbols Warning

'AmazonqTelemetry' is deprecated. Use type-safe metric builders

...oftware/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt

+                              return
+                          }
+                          "stop_test_gen_build_and_execution" -> {
+                              UiTelemetry.click(context.project, "unitTestGeneration_cancelBuildProgress")

Check warning

Code scanning / QDJVMC

Usage of redundant or deprecated syntax or deprecated symbols Warning

'UiTelemetry' is deprecated. Use type-safe metric builders

...oftware/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt

+                              UiTelemetry.click(context.project, "unitTestGeneration_cancelBuildProgress")
+                              session.buildStatus = BuildStatus.CANCELLED
+                              session.isGeneratingTests = false
+                              AmazonqTelemetry.unitTestGeneration(

Check warning

Code scanning / QDJVMC

Usage of redundant or deprecated syntax or deprecated symbols Warning

'AmazonqTelemetry' is deprecated. Use type-safe metric builders

...oftware/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt

+                              delay(1000)
+                              codeTestChatHelper.addAnswer(
+                                  CodeTestChatMessageContent(
+                                      message = message("testgen.message.cancelled"),

Check warning

Code scanning / QDJVMC

Usage of redundant or deprecated syntax or deprecated symbols Warning

'message(String, vararg Any): String' is deprecated. Use extension-specific localization bundle instead

samgst-amazon reviewed

View reviewed changes

...-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/utils/UTGChatUtil.kt

		}
		// TODO: Commenting out this code to do a better UX in the V2 version after science support

Contributor

samgst-amazon Mar 8, 2025

Leaving a TODO message makes sense but don't include the commented out code block

Contributor Author

laileni-aws Mar 10, 2025

Addressed comment!


          Removing commented code

e770e53

laileni-aws requested a review from samgst-amazon

March 10, 2025 16:54

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet