feedback

Author: manodnyab

plugins/amazonq/chat/jetbrains-community/resources/META-INF/plugin-chat.xml

@@ -33,7 +33,7 @@
         <action id="aws.toolkit.open.q.window" class="software.aws.toolkits.jetbrains.services.amazonq.QRefreshPanelAction"/>
         <group id="aws.q.toolwindow.titleBar" popup="false" compact="true">
             <reference id="aws.toolkit.open.q.window"/>
-            <action class="software.aws.toolkits.jetbrains.services.amazonq.GetAmazonQLogsAction"/>
+            <action class="software.aws.toolkits.jetbrains.services.amazonq.GetAmazonQLogsAction" id="q.getLogs"/>
         </group>
         <!-- TODO: q.openchat will eventually be in amazonq, aws.toolkit.q.sign.in will eventually be in core. -->
         <action id="q.openchat" class="software.aws.toolkits.jetbrains.services.amazonq.QOpenPanelAction"/>

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/GetAmazonQLogsAction.kt

@@ -3,35 +3,39 @@
 
 package software.aws.toolkits.jetbrains.services.amazonq
 
-import com.intellij.openapi.actionSystem.ActionManager
-import com.intellij.openapi.actionSystem.ActionPlaces
-import com.intellij.openapi.actionSystem.ActionUiKind
+import com.intellij.icons.AllIcons
+import com.intellij.ide.actions.RevealFileAction
+import com.intellij.ide.logsUploader.LogPacker
 import com.intellij.openapi.actionSystem.ActionUpdateThread
 import com.intellij.openapi.actionSystem.AnActionEvent
-import com.intellij.openapi.actionSystem.CommonDataKeys
-import com.intellij.openapi.actionSystem.impl.SimpleDataContext
 import com.intellij.openapi.project.DumbAwareAction
 import com.intellij.openapi.project.Project
+import com.intellij.openapi.ui.Messages
 import com.intellij.openapi.util.IconLoader
 import com.intellij.ui.ColorUtil
 import com.intellij.ui.JBColor
 import com.intellij.util.IconUtil
 import com.intellij.util.ui.UIUtil
+import kotlinx.coroutines.runBlocking
 import software.aws.toolkits.jetbrains.utils.notifyInfo
-import software.aws.toolkits.resources.AmazonQBundle
+import software.aws.toolkits.jetbrains.utils.runUnderProgressIfNeeded
 import software.aws.toolkits.resources.AmazonQBundle.message
+import software.aws.toolkits.resources.AwsCoreBundle
+
+class GetAmazonQLogsAction : DumbAwareAction(message("amazonq.getLogs.tooltip.text")) {
+    private val baseIcon = IconLoader.getIcon("/icons/file.svg", GetAmazonQLogsAction::class.java)
+
+    private val lightIcon by lazy {
+        IconUtil.colorize(baseIcon, ColorUtil.brighter(UIUtil.getLabelForeground(), 2))
+    }
+
 
-class GetAmazonQLogsAction : DumbAwareAction(
-    AmazonQBundle.message("amazonq.getLogs.tooltip.text")
-) {
 
     override fun update(e: AnActionEvent) {
-        super.update(e)
-        val baseIcon = IconLoader.getIcon("/icons/file.svg", GetAmazonQLogsAction::class.java)
         e.presentation.icon = if (!JBColor.isBright()) {
             baseIcon
         } else {
-            IconUtil.colorize(baseIcon, ColorUtil.brighter(UIUtil.getLabelForeground(), 2))
+            lightIcon
         }
     }
 
@@ -43,13 +47,23 @@ class GetAmazonQLogsAction : DumbAwareAction(
 
     companion object {
         fun showLogCollectionWarningGetLogs(project: Project) {
-            try {
-                val action = ActionManager.getInstance().getAction("CollectZippedLogs")
-                val datacontxt = SimpleDataContext.builder().add(CommonDataKeys.PROJECT, project).build()
-                val ae = AnActionEvent.createEvent(action, datacontxt, null, ActionPlaces.UNKNOWN, ActionUiKind.POPUP, null)
-                action.actionPerformed(ae)
-            } catch (_: Exception) {
-                notifyInfo(message("amazonq.getLogs.tooltip.text"), message("amazonq.logs.warning"))
+            if (Messages.showOkCancelDialog(
+                    message("amazonq.logs.warning"),
+                    message("amazonq.getLogs"),
+                    AwsCoreBundle.message("general.ok"),
+                    AwsCoreBundle.message("general.cancel"),
+                    AllIcons.General.Warning
+                ) == 0
+            ) {
+                runUnderProgressIfNeeded(project, message("amazonq.getLogs"), cancelable = true) {
+                    runBlocking {
+                        try {
+                            RevealFileAction.openFile(LogPacker.packLogs(project))
+                        } catch (_: Exception) {
+                            notifyInfo(message("amazonq.getLogs"), message("amazonq.logs.error"), project)
+                        }
+                    }
+                }
             }
         }
     }

plugins/amazonq/shared/jetbrains-community/resources/software/aws/toolkits/resources/AmazonQBundle.properties

@@ -8,7 +8,8 @@ amazonqInlineChat.popup.reject=Reject \u238B
 amazonqInlineChat.popup.title=Enter Instructions for Q
 amazonq.getLogs=Get Amazon Q logs
 amazonq.getLogs.tooltip.text=Show Logs
-amazonq.logs.warning=Cannot retrieve logs. Please try Help-> Collect Logs and Diagnostic data
+amazonq.logs.error=Cannot retrieve logs. Please try Help-> Collect Logs and Diagnostic data
+amazonq.logs.warning=Log files may contain sensitive information such as account IDs, resource names, and other data. Please be careful when sharing these logs.
 amazonq.refresh.panel=Refresh Chat Session
 amazonq.title=Amazon Q
 amazonq.workspace.settings.open.prompt=Workspace index is now enabled. You can disable it from Amazon Q settings.