Skip to content

Merge main into feature/dev-execution #5939

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Merge main into feature/dev-execution #5939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8b79ac
ci: bump qodana action version (#5925)
rli Jul 25, 2025
4b41495
fix(amazonq): isolate flare from user aws config files (#5906)
rli Jul 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/qodana-check-duplicatedcode.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/qodana-check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 4 additions & 0 deletions ...s-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLspService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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)
Expand Down
Loading