fix(amazonq):support chat in al2 aarch64 and CDM #7270
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
jpinkney-aws
approved these changes
May 8, 2025
justinmk3
reviewed
May 9, 2025
justinmk3
reviewed
May 9, 2025
packages/amazonq/src/lsp/client.ts
Outdated
| export async function getGlibcPatch(): Promise<string | undefined> { | ||
| for (const file of [ | ||
| '/opt/vsc-sysroot/lib64/ld-linux-x86-64.so.2', | ||
| '/opt/vsc-sysroot/lib64/ld-linux-aarch64.so.1', |
Contributor
There was a problem hiding this comment.
wasn't there a generic path (symlink or something like that) that the team mentioned?
There was a problem hiding this comment.
Thanks for the call-out. Lei and I are going to chat today.
Contributor
Author
There was a problem hiding this comment.
I am using the API interface now.
Contributor
There was a problem hiding this comment.
you mean VSCODE_SERVER_CUSTOM_GLIBC_LINKER ?
Contributor
Author
There was a problem hiding this comment.
Yes exactly. These are the AL2 "APIs"
leigaol
changed the title
murkvin
reviewed
May 9, 2025
Contributor
Author
|
test failure is not relevant to this change |
justinmk3
reviewed
May 9, 2025
justinmk3
reviewed
May 9, 2025
murkvin
approved these changes
May 9, 2025
justinmk3
approved these changes
May 13, 2025
nkomonen-amazon
approved these changes
May 14, 2025
laileni-aws
added a commit
that referenced
this pull request
Sep 24, 2025
…r Linux/Ubuntu in web/container env as AL2 (#8073) ## Problem PR: #7270 introduced a bug where the `isAmazonLinux2()` function incorrectly identifies regular Linux/Ubuntu systems in web/container environments as Amazon Linux 2. This happens because: 1. The function checks `os.release()` for `.amzn2.` or `.amzn2int.` patterns 2. In containerized environments (like VS Code web/remote), `os.release()` returns the __host's kernel version__, not the container's OS 3. If the host is Amazon Linux 2 but the container is Ubuntu/Linux, the function incorrectly returns `true` 4. This prevents Amazon Q LSP from starting because it thinks it's on AL2 without the required GLIBC patch ## Solution - __Skip AL2 detection for web environments__ - Returns `false` immediately since web mode runs in a browser - __Check `/etc/os-release` first__ - In containerized environments, this file contains the actual container OS, not the host OS - __Trust container OS over kernel version__ - If `/etc/os-release` shows it's not AL2 (e.g., Ubuntu), return `false` regardless of kernel version - __Fall back to kernel check only when necessary__ - Only use `os.release()` if we can't read `/etc/os-release` or if it confirms AL2 - Prioritized container OS detection over kernel version detection - Maintained backward compatibility for actual AL2 systems - Added comprehensive test coverage for the new scenarios --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Problem
LSP cannot start without GLIBC>=2.28 in AL2 aarch64 and CloudDevMachine
Solution
feature/xbranches will not be squash-merged at release time.