Merge main into feature/model-selection

Author: aws-toolkit-automation

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

@@ -34,13 +34,13 @@ 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:
           # --config points to the DuplicatedCode-only Qodana config
           args:
-            --config,${{ github.workspace }}/qodana-configs/duplicated-code/qodana.yaml
+            --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

.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/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLspService.kt

@@ -463,6 +463,7 @@ private class AmazonQServerInstance(private val project: Project, private val cs
 
         val node = if (SystemInfo.isWindows) "node.exe" else "node"
         val nodePath = getNodeRuntimePath(artifact.resolve(node))
+        val emptyFile = Files.createTempFile("empty", null).toAbsolutePath().toString()
 
         val cmd = NodeExePatcher.patch(nodePath)
             .withParameters(
@@ -476,6 +477,9 @@ private class AmazonQServerInstance(private val project: Project, private val cs
                         put("NODE_EXTRA_CA_CERTS", it)
                     }
 
+                    put("AWS_CONFIG_FILE", emptyFile)
+                    put("AWS_SHARED_CREDENTIALS_FILE", emptyFile)
+
                     // assume default endpoint will pick correct proxy if needed
                     val qUri = URI(QDefaultServiceConfig.ENDPOINT)
                     val proxy = JdkProxyProvider.getInstance().proxySelector.select(qUri)