From b8b79acb4363b371d9197216a69f2cd31e915eba Mon Sep 17 00:00:00 2001 From: Richard Li <742829+rli@users.noreply.github.com> Date: Fri, 25 Jul 2025 12:42:22 -0700 Subject: [PATCH 1/2] ci: bump qodana action version (#5925) --- .github/workflows/qodana-check-duplicatedcode.yml | 4 ++-- .github/workflows/qodana-check.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/qodana-check-duplicatedcode.yml b/.github/workflows/qodana-check-duplicatedcode.yml index d1ef9a0eaec..c331ec621a3 100644 --- a/.github/workflows/qodana-check-duplicatedcode.yml +++ b/.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 diff --git a/.github/workflows/qodana-check.yml b/.github/workflows/qodana-check.yml index fef67e81c3c..354996fa923 100644 --- a/.github/workflows/qodana-check.yml +++ b/.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: From 4b41495582db6507a0f22f00884c80301f42740a Mon Sep 17 00:00:00 2001 From: Richard Li <742829+rli@users.noreply.github.com> Date: Tue, 29 Jul 2025 12:18:59 -0700 Subject: [PATCH 2/2] fix(amazonq): isolate flare from user aws config files (#5906) due to an AWS JS SDK v2 bug (which is EoL), profile redeclarion, though spec compliant, will result in a flare crash --- .../jetbrains/services/amazonq/lsp/AmazonQLspService.kt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLspService.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLspService.kt index c4a57f2312a..8f5bedd115c 100644 --- a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLspService.kt +++ b/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)