Merge branch 'main' into samgst/bump-252

Author: samgst-amazon

.changes/next-release/bugfix-7ceafecb-844d-46ce-a68d-b28360840ab6.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "change to use promptStickyCard to for image verification notification"
+}

.github/workflows/qodana-check-duplicatedcode.yml

@@ -0,0 +1,49 @@
+name: Qodana - Duplicated Code
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [ main, feature/** ]
+  pull_request:
+    branches: [ '**' ]
+
+concurrency:
+  group: ${{ github.workflow }}${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  qodana:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      # PR check
+      checks: write
+      # PR comments
+      pull-requests: write
+      # SARIF upload
+      security-events: write
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+          fetch-depth: 0
+      - name: Maximize Build Space
+        if: runner.os == 'Linux'
+        uses: jlumbroso/free-disk-space@main
+        with:
+          tool-cache: false
+          large-packages: false
+      - name: 'Qodana Scan'
+        uses: JetBrains/[email protected]
+        env:
+          QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}
+        with:
+          # --config points to the DuplicatedCode-only Qodana config
+          args:
+            --config,qodana-configs/duplicated-code/qodana.yaml
+          cache-default-branch-only: true
+          # pr-mode off means that the whole repo should be checked for duplicate code, instead of just copy/pastes within the PR
+          pr-mode: false
+      - uses: github/codeql-action/upload-sarif@v3
+        with:
+          sarif_file: ${{ runner.temp }}/qodana/results/qodana.sarif.json

.github/workflows/qodana-check.yml

@@ -34,7 +34,7 @@ jobs:
           tool-cache: false
           large-packages: false
       - name: 'Qodana Scan'
-        uses: JetBrains/qodana-action@v2024.2.3
+        uses: JetBrains/qodana-action@v2025.1.1
         env:
           QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}
         with:

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

@@ -173,12 +173,15 @@ class AmazonQPanel(val project: Project, private val scope: CoroutineScope) : Di
                                                 0
                                             )
 
-                                            val errorJson = OBJECT_MAPPER.writeValueAsString(errorMessages)
-                                            browserInstance.jcefBrowser.cefBrowser.executeJavaScript(
-                                                "window.handleNativeNotify('$errorJson')",
-                                                browserInstance.jcefBrowser.cefBrowser.url,
-                                                0
-                                            )
+                                            if (errorMessages.isNotEmpty()) {
+                                                val errorJson = OBJECT_MAPPER.writeValueAsString(errorMessages)
+                                                browserInstance.jcefBrowser.cefBrowser.executeJavaScript(
+                                                    "window.handleNativeNotify('$errorJson')",
+                                                    browserInstance.jcefBrowser.cefBrowser.url,
+                                                    0
+                                                )
+                                            }
+
                                             dtde.dropComplete(true)
                                         } else {
                                             dtde.dropComplete(false)

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

@@ -175,11 +175,19 @@ class Browser(parent: Disposable, private val webUri: URI, val project: Project)
                       
                     window.handleNativeNotify = function(errorMessages) {
                         const messages = JSON.parse(errorMessages);
-                        messages.forEach(msg => {
-                            qChat.notify({
-                                content: msg
-                            })
-                        });
+                        let message = messages.join('\n');
+                        qChat.updateStore(qChat.getSelectedTabId(), {
+                            promptInputStickyCard: {
+                                messageId: 'image-verification-banner',
+                                header: {
+                                    icon: 'warning',
+                                    iconStatus: 'warning',
+                                    body: '### Invalid Image',
+                                },
+                                body: message,
+                                canBeDismissed: true,
+                            },
+                        })
                     };
                 }
             </script>        

qodana-configs/duplicated-code/README.md

@@ -0,0 +1,3 @@
+# Duplicated Code Check
+
+This check only runs the Qodana DuplicatedCode check and should post duplicated code to [Github PRs](../../.github/workflows/qodana-check-duplicatedcode.yml).

qodana-configs/duplicated-code/qodana.yaml

@@ -0,0 +1,10 @@
+version: 1.0
+linter: jetbrains/qodana-jvm-community:latest
+projectJDK: "21"
+bootstrap: ./gradlew :plugin-core:sdk-codegen:generateSdks :plugin-core:jetbrains-community:generateTelemetry :plugin-toolkit:jetbrains-rider:generateModels
+exclude:
+  - name: All
+dot-net:
+  solution: ReSharper.AWS.sln
+include:
+  - name: DuplicatedCode

qodana.yaml

@@ -61,3 +61,4 @@ include:
   - name: SimplifiableServiceRetrieving
   - name: QuickFixGetFamilyNameViolation
   - name: TokenSetInParserDefinition
+  - name: DuplicatedCode