Merge branch 'aws:main' into main

neilk-aws · web-flow · commit a018d60b8c66 · 2025-03-11T22:30:15.000-07:00
diff --git a/.changes/next-release/bugfix-d14f113a-e931-4247-aecb-26e8dd713467.json b/.changes/next-release/bugfix-d14f113a-e931-4247-aecb-26e8dd713467.json
@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "/review: normalize relative file path before unzipping"
+}
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/CodeWhispererUTGChatManager.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/CodeWhispererUTGChatManager.kt
@@ -29,6 +29,7 @@ import software.aws.toolkits.core.utils.debug
 import software.aws.toolkits.core.utils.error
 import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.core.utils.info
+import software.aws.toolkits.jetbrains.core.credentials.sono.isInternalUser
 import software.aws.toolkits.jetbrains.services.amazonq.clients.AmazonQStreamingClient
 import software.aws.toolkits.jetbrains.services.amazonqCodeTest.controller.CodeTestChatHelper
 import software.aws.toolkits.jetbrains.services.amazonqCodeTest.messages.Button
@@ -559,12 +560,25 @@ class CodeWhispererUTGChatManager(val project: Project, private val cs: Coroutin
                     e is JsonParseException -> message("testgen.error.generic_technical_error_message")
                     else -> message("testgen.error.generic_error_message")
                 }
-
+                val buttonList = mutableListOf<Button>()
+                if (isInternalUser(getStartUrl(project))) {
+                    buttonList.add(
+                        Button(
+                            "utg_feedback",
+                            message("testgen.button.feedback"),
+                            keepCardAfterClick = true,
+                            position = "outside",
+                            status = "info",
+                            icon = "comment"
+                        ),
+                    )
+                }
                 codeTestChatHelper.addAnswer(
                     CodeTestChatMessageContent(
                         message = errorMessage,
                         type = ChatMessageType.Answer,
-                        canBeVoted = false
+                        canBeVoted = false,
+                        buttons = buttonList
                     )
                 )
 
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt
@@ -9,6 +9,7 @@ import com.intellij.diff.DiffManagerEx
 import com.intellij.diff.requests.SimpleDiffRequest
 import com.intellij.ide.BrowserUtil
 import com.intellij.openapi.application.ApplicationManager
+import com.intellij.openapi.application.runInEdt
 import com.intellij.openapi.fileEditor.FileEditorManager
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.project.guessProjectDir
@@ -53,6 +54,7 @@ import software.aws.toolkits.jetbrains.core.AwsClientManager
 import software.aws.toolkits.jetbrains.core.coroutines.EDT
 import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnectionManager
 import software.aws.toolkits.jetbrains.core.credentials.pinning.QConnection
+import software.aws.toolkits.jetbrains.core.credentials.sono.isInternalUser
 import software.aws.toolkits.jetbrains.services.amazonq.apps.AmazonQAppInitContext
 import software.aws.toolkits.jetbrains.services.amazonq.auth.AuthController
 import software.aws.toolkits.jetbrains.services.amazonq.project.RelevantDocument
@@ -92,6 +94,7 @@ import software.aws.toolkits.jetbrains.services.cwc.editor.context.ExtractionTri
 import software.aws.toolkits.jetbrains.services.cwc.editor.context.file.FileContext
 import software.aws.toolkits.jetbrains.services.cwc.messages.ChatMessageType
 import software.aws.toolkits.jetbrains.services.telemetry.TelemetryService
+import software.aws.toolkits.jetbrains.ui.feedback.TestGenFeedbackDialog
 import software.aws.toolkits.jetbrains.utils.notifyError
 import software.aws.toolkits.resources.message
 import software.aws.toolkits.telemetry.AmazonqTelemetry
@@ -168,13 +171,14 @@ class CodeTestChatController(
     override suspend fun processStartTestGen(message: IncomingCodeTestMessage.StartTestGen) {
         codeTestChatHelper.setActiveCodeTestTabId(message.tabId)
         val session = codeTestChatHelper.getActiveSession()
+        if (session.isGeneratingTests) {
+            return
+        }
+        sessionCleanUp(session.tabId)
         // check if IDE has active file open, yes return (fileName and filePath) else return null
         val project = context.project
         val fileInfo = checkActiveFileInIDE(project, message) ?: return
         session.programmingLanguage = fileInfo.fileLanguage
-        if (session.isGeneratingTests === true) {
-            return
-        }
         session.startTimeOfTestGeneration = Instant.now().toEpochMilli().toDouble()
         session.isGeneratingTests = true
 
@@ -565,7 +569,7 @@ class CodeTestChatController(
                     session.linesOfCodeGenerated = lineDifference.coerceAtLeast(0)
                     session.charsOfCodeGenerated = charDifference.coerceAtLeast(0)
                     session.latencyOfTestGeneration = (Instant.now().toEpochMilli() - session.startTimeOfTestGeneration)
-                    UiTelemetry.click(null as Project?, "unitTestGeneration_viewDiff")
+                    UiTelemetry.click(context.project, "unitTestGeneration_viewDiff")
 
                     val buttonList = mutableListOf<Button>()
                     buttonList.add(
@@ -662,7 +666,7 @@ class CodeTestChatController(
                         testGenerationEventResponse.responseMetadata().requestId()}"
                 }
 
-                UiTelemetry.click(null as Project?, "unitTestGeneration_acceptDiff")
+                UiTelemetry.click(context.project, "unitTestGeneration_acceptDiff")
 
                 AmazonqTelemetry.utgGenerateTests(
                     cwsprChatProgrammingLanguage = session.programmingLanguage.languageId,
@@ -691,10 +695,10 @@ class CodeTestChatController(
                     CodeTestChatMessageContent(
                         message = message("testgen.message.success"),
                         type = ChatMessageType.Answer,
-                        canBeVoted = false
+                        canBeVoted = false,
+                        buttons = this.showFeedbackButton()
                     )
                 )
-                sessionCleanUp(session.tabId)
                 codeTestChatHelper.updateUI(
                     promptInputDisabledState = false,
                     promptInputPlaceholder = message("testgen.placeholder.enter_slash_quick_actions"),
@@ -840,7 +844,8 @@ class CodeTestChatController(
                     CodeTestChatMessageContent(
                         message = message("testgen.message.success"),
                         type = ChatMessageType.Answer,
-                        canBeVoted = false
+                        canBeVoted = false,
+                        buttons = this.showFeedbackButton()
                     )
                 )
                 val testGenerationEventResponse = client.sendTestGenerationEvent(
@@ -884,7 +889,10 @@ class CodeTestChatController(
                     requestId = session.startTestGenerationRequestId,
                     status = Status.REJECTED,
                 )
-                sessionCleanUp(message.tabId)
+            }
+            "utg_feedback" -> {
+                sendFeedback()
+                UiTelemetry.click(context.project, "unitTestGeneration_provideFeedback")
             }
             "utg_skip_and_finish" -> {
                 codeTestChatHelper.addAnswer(
@@ -1373,6 +1381,33 @@ class CodeTestChatController(
         println(message)
     }
 
+    private fun sendFeedback() {
+        runInEdt {
+            TestGenFeedbackDialog(
+                context.project,
+                codeTestChatHelper.getActiveSession().startTestGenerationRequestId,
+                codeTestChatHelper.getActiveSession().testGenerationJob
+            ).show()
+        }
+    }
+
+    private fun showFeedbackButton(): MutableList<Button> {
+        val buttonList = mutableListOf<Button>()
+        if (isInternalUser(getStartUrl(context.project))) {
+            buttonList.add(
+                Button(
+                    "utg_feedback",
+                    message("testgen.button.feedback"),
+                    keepCardAfterClick = true,
+                    position = "outside",
+                    status = "info",
+                    icon = "comment"
+                ),
+            )
+        }
+        return buttonList
+    }
+
     companion object {
         private val LOG = getLogger<CodeTestChatController>()
 
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/sessionconfig/CodeScanSessionConfig.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/sessionconfig/CodeScanSessionConfig.kt
@@ -30,13 +30,13 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.utils.Ama
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.CodeWhispererProgrammingLanguage
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererUnknownLanguage
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.programmingLanguage
-import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.CodeWhispererTelemetryService
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.CODE_SCAN_CREATE_PAYLOAD_TIMEOUT_IN_SECONDS
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.CodeAnalysisScope
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.DEFAULT_CODE_SCAN_TIMEOUT_IN_SECONDS
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.DEFAULT_PAYLOAD_LIMIT_IN_BYTES
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.EXPRESS_SCAN_TIMEOUT_IN_SECONDS
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.FILE_SCAN_PAYLOAD_SIZE_LIMIT_IN_BYTES
+import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererUtil.getNormalizedRelativePath
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.GitIgnoreFilteringUtil
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.isWithin
 import software.aws.toolkits.resources.message
@@ -196,12 +196,9 @@ class CodeScanSessionConfig(
     private fun zipFiles(files: List<Path>, codeDiff: String? = null): File = createTemporaryZipFile {
         files.forEach { file ->
             try {
-                val relativePath = "${project.name}/${file.relativeTo(projectRoot.toNioPath())}"
-                if (relativePath.contains("../") || relativePath.contains("..\\")) {
-                    CodeWhispererTelemetryService.getInstance().sendInvalidZipEvent(file, projectRoot.toNioPath(), relativePath)
-                }
+                val relativePath = getNormalizedRelativePath(project.name, file.relativeTo(projectRoot.toNioPath()))
                 LOG.debug { "Selected file for truncation: $file" }
-                it.putNextEntry(relativePath.toString(), file)
+                it.putNextEntry(relativePath, file)
             } catch (e: Exception) {
                 cannotFindFile("Zipping error: ${e.message}", file.pathString)
             }
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CodeWhispererUtil.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CodeWhispererUtil.kt
@@ -56,6 +56,8 @@ import software.aws.toolkits.resources.message
 import software.aws.toolkits.telemetry.CodewhispererCompletionType
 import software.aws.toolkits.telemetry.CodewhispererGettingStartedTask
 import software.aws.toolkits.telemetry.CredentialSourceId
+import java.nio.file.Path
+import java.nio.file.Paths
 
 // Controls the condition to send telemetry event to CodeWhisperer service, currently:
 // 1. It will be sent for Builder ID users, only if they have optin telemetry sharing.
@@ -329,6 +331,9 @@ object CodeWhispererUtil {
             WindowManager.getInstance().setAlphaModeRatio(it, alpha)
         }
     }
+
+    fun getNormalizedRelativePath(projectName: String, relativePath: Path): String =
+        Paths.get(projectName).resolve(relativePath).normalize().toString()
 }
 
 enum class CaretMovement {
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererProjectCodeScanTest.kt b/plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererProjectCodeScanTest.kt
@@ -14,11 +14,13 @@ import org.mockito.kotlin.spy
 import org.mockito.kotlin.stub
 import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.sessionconfig.CodeScanSessionConfig
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants
+import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererUtil.getNormalizedRelativePath
 import software.aws.toolkits.jetbrains.utils.rules.PythonCodeInsightTestFixtureRule
 import software.aws.toolkits.jetbrains.utils.rules.addFileToModule
 import software.aws.toolkits.jetbrains.utils.rules.addModule
 import software.aws.toolkits.telemetry.CodewhispererLanguage
 import java.io.BufferedInputStream
+import java.nio.file.Paths
 import java.util.zip.ZipInputStream
 import kotlin.io.path.relativeTo
 import kotlin.test.assertNotNull
@@ -108,6 +110,16 @@ class CodeWhispererProjectCodeScanTest : CodeWhispererCodeScanTestBase(PythonCod
         assertE2ERunsSuccessfully(sessionConfigSpy, project, totalLines, 10, totalSize, 1)
     }
 
+    @Test
+    fun `test getNormalizedRelativePath()`() {
+        assertThat(
+            listOf("projectName\\src\\PackageName", "projectName/src/PackageName")
+        ).contains(getNormalizedRelativePath("projectName", Paths.get("src/PackageName")))
+        assertThat(
+            listOf("projectName\\src\\Package2", "projectName/src/Package2")
+        ).contains(getNormalizedRelativePath("projectName", Paths.get("src/./Package1/../Package2")))
+    }
+
     private fun setupCsharpProject() {
         val testModule = projectRule.fixture.addModule("testModule")
         val testModule2 = projectRule.fixture.addModule("testModule2")
diff --git a/plugins/amazonq/mynah-ui/src/mynah-ui/ui/apps/codeTestChatConnector.ts b/plugins/amazonq/mynah-ui/src/mynah-ui/ui/apps/codeTestChatConnector.ts
@@ -151,7 +151,7 @@ export class CodeTestChatConnector {
                 text: '',
                 options: messageData.followUps,
             } : undefined,
-            canBeVoted: true,
+            canBeVoted: messageData.canBeVoted ?? false,
             fileList: messageData.fileList ? {
                 rootFolderTitle: messageData.projectRootName,
                 fileTreeTitle: 'READY FOR REVIEW',
@@ -477,7 +477,20 @@ export class CodeTestChatConnector {
                         disabled: true
                     }
                 ]
-                break;
+                break
+
+            case FormButtonIds.CodeTestProvideFeedback:
+                answer.buttons = [
+                    {
+                        keepCardAfterClick: true,
+                        text: 'Thanks for providing feedback.',
+                        id: 'utg_provided_feedback',
+                        status: 'success',
+                        position: 'outside',
+                        disabled: true
+                    }
+                ]
+                break
             default:
                 console.warn(`Unhandled action ID: ${action.id}`);
                 break;
diff --git a/plugins/amazonq/mynah-ui/src/mynah-ui/ui/forms/constants.ts b/plugins/amazonq/mynah-ui/src/mynah-ui/ui/forms/constants.ts
@@ -27,6 +27,7 @@ export const enum FormButtonIds {
   CodeTestStartGeneration = "code_test_start_generation",
   CodeTestViewDiff = "utg_view_diff",
   CodeTestAccept = "utg_accept",
+  CodeTestProvideFeedback = "utg_feedback",
   CodeTestRegenerate = "utg_regenerate",
   CodeTestReject = "utg_reject",
   CodeTestBuildAndExecute = "utg_build_and_execute",
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/ui/feedback/FeatureDevFeedbackDialog.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/ui/feedback/FeatureDevFeedbackDialog.kt
@@ -16,6 +16,6 @@ class FeatureDevFeedbackDialog(project: Project) : FeedbackDialog(project) {
     }
 
     init {
-        title = message("feedback.title.amazonq.feature_dev")
+        title = message("feedback.title.amazonq.send_feedback")
     }
 }
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/ui/feedback/TestGenFeedbackDialog.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/ui/feedback/TestGenFeedbackDialog.kt
@@ -0,0 +1,25 @@
+// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.ui.feedback
+
+import com.intellij.openapi.project.Project
+import software.aws.toolkits.jetbrains.services.telemetry.TelemetryService
+import software.aws.toolkits.resources.message
+
+class TestGenFeedbackDialog(
+    project: Project,
+    private val requestId: String? = null,
+    private val jobId: String? = null,
+) : FeedbackDialog(project) {
+    override fun notificationTitle() = message("aws.notification.title.amazonq.test_generation")
+    override fun feedbackPrompt() = message("feedback.comment.textbox.title.amazonq.test_generation")
+    override fun productName() = "Amazon Q Test Generation"
+    override suspend fun sendFeedback() {
+        TelemetryService.getInstance().sendFeedback(sentiment, "UserComment: $commentText, RequestId: $requestId, TestGenerationJobId: $jobId")
+    }
+
+    init {
+        title = message("feedback.title.amazonq.send_feedback")
+    }
+}
diff --git a/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties b/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties
@@ -234,6 +234,7 @@ aws.notification.sam_cli_not_valid=Error: {0}. Click <a href="">here</a> to reco
 aws.notification.title=AWS Toolkit
 aws.notification.title.amazonq=Amazon Q
 aws.notification.title.amazonq.feature_dev=Amazon Q FeatureDev
+aws.notification.title.amazonq.test_generation=Amazon Q Test Generation
 aws.notification.title.codewhisperer=Amazon Q
 aws.onboarding.getstarted.panel.bottom_text=<a href="https://docs.aws.amazon.com/toolkit-for-jetbrains/latest/userguide/auth-access.html">Learn more about authenticating with the Toolkit</a>
 aws.onboarding.getstarted.panel.bottom_text_question=Why do these have different authentication requirements?
@@ -1308,6 +1309,7 @@ feedback.comment.textbox.initial.length=2000 characters remaining
 feedback.comment.textbox.title=What do you like about {0}? What can we improve?
 feedback.comment.textbox.title.amazonq=How was your experience with the upgrade of your Java application?
 feedback.comment.textbox.title.amazonq.feature_dev=How has your experience with Amazon Q been? What can we improve?
+feedback.comment.textbox.title.amazonq.test_generation=How has your experience with Amazon Q Test Generation been? What can we improve?
 feedback.connect.with.github.title=Join us on GitHub
 feedback.customer.alert.info=Please don't add personally identifiable information (PII), confidential or sensitive information in your feedback.<br>Remove any PII when sharing file paths, error messages, etc.
 feedback.description=Submit quick feedback about the AWS Toolkit for JetBrains
@@ -1327,7 +1329,7 @@ feedback.submit_success=Thanks for the feedback!
 feedback.submitting=Sharing...
 feedback.title=Share Feedback for {0}...
 feedback.title.amazonq=Send feedback for Code Transformation by Amazon Q
-feedback.title.amazonq.feature_dev=Send feedback for Amazon Q
+feedback.title.amazonq.send_feedback=Send feedback for Amazon Q
 feedback.validation.comment_too_long=Comment is too long.
 feedback.validation.empty_comment=Please provide a comment.
 feedback.validation.no_sentiment=Please select how you're feeling.
@@ -2064,6 +2066,7 @@ sqs.subscribe.sns.validation.empty_topic=Topic must be specified.
 sqs.toolwindow=SQS
 sqs.url.parse_error=Error parsing SQS queue URL
 tags.title=Tags
+testgen.button.feedback=How can we make /test better?
 testgen.error.generic_error_message=Amazon Q encountered an error while generating tests. Try again later.
 testgen.error.generic_technical_error_message=I am experiencing technical difficulties at the moment. Please try again in a few minutes.
 testgen.error.maximum_generations_reach=You've reached the monthly quota for Amazon Q Developer's agent capabilities. You can try again next month. For more information on usage limits, see the <a href=\"https://aws.amazon.com/q/developer/pricing/\" target=\"_blank\">Amazon Q Developer pricing page</a>.

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "type" : "bugfix",
 +  "description" : "/review: normalize relative file path before unzipping"
 +}
Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,8 @@ import software.aws.toolkits.resources.message`
`56`	`56`	`import software.aws.toolkits.telemetry.CodewhispererCompletionType`
`57`	`57`	`import software.aws.toolkits.telemetry.CodewhispererGettingStartedTask`
`58`	`58`	`import software.aws.toolkits.telemetry.CredentialSourceId`
	`59`	`+import java.nio.file.Path`
	`60`	`+import java.nio.file.Paths`
`59`	`61`
`60`	`62`	`// Controls the condition to send telemetry event to CodeWhisperer service, currently:`
`61`	`63`	`// 1. It will be sent for Builder ID users, only if they have optin telemetry sharing.`
`@@ -329,6 +331,9 @@ object CodeWhispererUtil {`
`329`	`331`	`WindowManager.getInstance().setAlphaModeRatio(it, alpha)`
`330`	`332`	`}`
`331`	`333`	`}`
	`334`	`+`
	`335`	`+ fun getNormalizedRelativePath(projectName: String, relativePath: Path): String =`
	`336`	`+ Paths.get(projectName).resolve(relativePath).normalize().toString()`
`332`	`337`	`}`
`333`	`338`
`334`	`339`	`enum class CaretMovement {`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,6 @@ class FeatureDevFeedbackDialog(project: Project) : FeedbackDialog(project) {`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`init {`
`19`		`- title = message("feedback.title.amazonq.feature_dev")`
	`19`	`+ title = message("feedback.title.amazonq.send_feedback")`
`20`	`20`	`}`
`21`	`21`	`}`