Merge branch 'aws:main' into feature/qca

Author: laileni-aws

.changes/3.5.json

@@ -0,0 +1,8 @@
+{
+  "date" : "2024-05-23",
+  "version" : "3.5",
+  "entries" : [ {
+    "type" : "bugfix",
+    "description" : "Amazon Q Code Transformation: show exact error messages in chat when job fails"
+  } ]
+}

.changes/next-release/bugfix-a7b4a2f3-fa0a-4924-9d53-933ab31b817c.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Fix recurring popup \"refreshing token\" whne users're typing in the IDE and Q connection expires"
+}

CHANGELOG.md

@@ -1,3 +1,6 @@
+# _3.5_ (2024-05-23)
+- **(Bug Fix)** Amazon Q Code Transformation: show exact error messages in chat when job fails
+
 # _3.4_ (2024-05-16)
 - **(Bug Fix)** Amazon Q Chat: Prompt input field in Q Chat tabs doesn't stop after it reaches to the given maxLength
 - **(Bug Fix)** Amazon Q Chat: When window gets focus, even though the autoFocus property is set to true, input field doesn't get focus

buildSrc/src/main/kotlin/software/aws/toolkits/gradle/BuildScriptUtils.kt

@@ -8,7 +8,6 @@ import org.gradle.api.JavaVersion
 import org.gradle.api.Project
 import org.gradle.api.provider.Provider
 import software.aws.toolkits.gradle.intellij.IdeVersions
-import java.io.IOException
 import org.jetbrains.kotlin.gradle.dsl.KotlinVersion as KotlinVersionEnum
 
 /**
@@ -55,7 +54,7 @@ fun Project.buildMetadata() =
                 append(".modified")
             }
         }
-    } catch(e: IOException) {
+    } catch(e: Exception) {
         logger.warn("Could not determine current commit", e)
 
         "unknownCommit"

buildSrc/src/main/kotlin/toolkit-detekt.gradle.kts

@@ -21,9 +21,14 @@ dependencies {
     detektPlugins(project(":detekt-rules"))
 }
 
+private val detektFiles = fileTree(projectDir).asFileTree.matching {
+    include("**/*.kt", "**/*.kts")
+    exclude("**/build/**")
+}
+
 detekt {
     val rulesProject = project(":detekt-rules").projectDir
-    source.setFrom(projectDir)
+    source.setFrom(detektFiles)
     buildUponDefaultConfig = true
     parallel = true
     allRules = false
@@ -40,5 +45,5 @@ tasks.withType<Detekt> {
 
 tasks.withType<DetektCreateBaselineTask> {
     // weird issue where the baseline tasks can't find the source code
-    source.plus(projectDir)
+    source.plus(detektFiles)
 }

gradle.properties

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Toolkit Version
-toolkitVersion=3.5-SNAPSHOT
+toolkitVersion=3.6-SNAPSHOT
 
 # Publish Settings
 publishToken=

gradle/libs.versions.toml

@@ -21,8 +21,8 @@ kotlinCoroutines = "1.7.3"
 mockito = "5.11.0"
 mockitoKotlin = "5.2.1"
 mockk = "1.13.10"
-node-gradle = "7.0.1"
-telemetryGenerator = "1.0.207"
+node-gradle = "7.0.2"
+telemetryGenerator = "1.0.212"
 testLogger = "4.0.0"
 testRetry = "1.5.2"
 # test-only; platform provides slf4j transitively at runtime. <233, 1.7.36; >=233, 2.0.9

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevController.kt

@@ -66,6 +66,7 @@ import software.aws.toolkits.jetbrains.services.cwc.controller.chat.telemetry.ge
 import software.aws.toolkits.jetbrains.ui.feedback.FeatureDevFeedbackDialog
 import software.aws.toolkits.resources.message
 import software.aws.toolkits.telemetry.AmazonqTelemetry
+import software.aws.toolkits.telemetry.Result
 import java.util.UUID
 
 class FeatureDevController(
@@ -230,6 +231,7 @@ class FeatureDevController(
     override suspend fun processFileClicked(message: IncomingFeatureDevMessage.FileClicked) {
         val fileToUpdate = message.filePath
         val session = getSessionInfo(message.tabId)
+        val messageId = message.messageId
 
         var filePaths: List<NewFileZipInfo> = emptyList()
         var deletedFiles: List<DeletedFileInfo> = emptyList()
@@ -244,7 +246,7 @@ class FeatureDevController(
         filePaths.find { it.zipFilePath == fileToUpdate }?.let { it.rejected = !it.rejected }
         deletedFiles.find { it.zipFilePath == fileToUpdate }?.let { it.rejected = !it.rejected }
 
-        messenger.updateFileComponent(message.tabId, filePaths, deletedFiles)
+        messenger.updateFileComponent(message.tabId, filePaths, deletedFiles, messageId)
     }
 
     private suspend fun newTabOpened(tabId: String) {
@@ -613,18 +615,26 @@ class FeatureDevController(
             status = FollowUpStatusType.Info,
         )
 
+        var result: Result = Result.Failed
+        var reason: String? = null
+
         withContext(EDT) {
             val selectedFolder = FileChooser.chooseFile(fileChooserDescriptor, context.project, uri)
+
+            // No folder was selected
             if (selectedFolder == null) {
                 logger.info { "Cancelled dialog and not selected any folder" }
 
                 messenger.sendSystemPrompt(
                     tabId = tabId,
                     followUp = listOf(modifyFolderFollowUp),
                 )
+
+                reason = "ClosedBeforeSelection"
                 return@withContext
             }
 
+            // The folder is not in the workspace
             if (selectedFolder.parent.path != uri.path) {
                 logger.info { "Selected folder not in workspace: ${selectedFolder.path}" }
 
@@ -638,19 +648,29 @@ class FeatureDevController(
                     tabId = tabId,
                     followUp = listOf(modifyFolderFollowUp),
                 )
+
+                reason = "NotInWorkspaceFolder"
                 return@withContext
             }
 
             logger.info { "Selected correct folder inside workspace: ${selectedFolder.path}" }
 
             session.context.projectRoot = selectedFolder
+            result = Result.Succeeded
 
             messenger.sendAnswer(
                 tabId = tabId,
                 messageType = FeatureDevMessageType.Answer,
                 message = message("amazonqFeatureDev.follow_up.modified_source_folder", selectedFolder.path),
             )
         }
+
+        AmazonqTelemetry.modifySourceFolder(
+            amazonqConversationId = session.conversationId,
+            credentialStartUrl = getStartUrl(project = context.project),
+            result = result,
+            reason = reason
+        )
     }
 
     private fun sendFeedback() {

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/messages/FeatureDevMessage.kt

@@ -133,7 +133,8 @@ data class UpdatePlaceholderMessage(
 data class FileComponent(
     @JsonProperty("tabID") override val tabId: String,
     val filePaths: List<NewFileZipInfo>,
-    val deletedFiles: List<DeletedFileInfo>
+    val deletedFiles: List<DeletedFileInfo>,
+    val messageId: String
 ) : UiMessage(
     tabId = tabId,
     type = "updateFileComponent"

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/messages/FeatureDevMessagePublisherExtensions.kt

@@ -58,11 +58,12 @@ suspend fun MessagePublisher.sendSystemPrompt(
     )
 }
 
-suspend fun MessagePublisher.updateFileComponent(tabId: String, filePaths: List<NewFileZipInfo>, deletedFiles: List<DeletedFileInfo>) {
+suspend fun MessagePublisher.updateFileComponent(tabId: String, filePaths: List<NewFileZipInfo>, deletedFiles: List<DeletedFileInfo>, messageId: String) {
     val fileComponentMessage = FileComponent(
         tabId = tabId,
         filePaths = filePaths,
         deletedFiles = deletedFiles,
+        messageId = messageId,
     )
     this.publish(fileComponentMessage)
 }