tst

Author: rli

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLspService.kt

@@ -373,34 +373,34 @@ private class AmazonQServerInstance(private val project: Project, private val cs
 
         val node = if (SystemInfo.isWindows) "node.exe" else "node"
         val cmd = NodeExePatcher.patch(artifact.resolve(node))
-        .withParameters(
-            LspSettings.getInstance().getArtifactPath() ?: artifact.resolve("aws-lsp-codewhisperer.js").toString(),
-            "--stdio",
-            "--set-credentials-encryption-key",
-        ).withEnvironment(
-            buildMap {
-                put("NODE_EXTRA_CA_CERTS", extraCaCerts.toAbsolutePath().toString())
-
-                val proxy = JdkProxyProvider.getInstance().proxySelector.select(qUri)
-                    // log if only socks proxy available
-                    .firstOrNull { it.type() == Proxy.Type.HTTP }
-
-                if (proxy != null) {
-                    val address = proxy.address()
-                    if (address is java.net.InetSocketAddress) {
-                        put(
-                            "HTTPS_PROXY",
-                            URIBuilder("http://${address.hostName}:${address.port}").apply {
-                                val login = HttpConfigurable.getInstance().proxyLogin
-                                if (login != null) {
-                                    setUserInfo(login, HttpConfigurable.getInstance().plainProxyPassword)
-                                }
-                            }.build().toASCIIString()
-                        )
+            .withParameters(
+                LspSettings.getInstance().getArtifactPath() ?: artifact.resolve("aws-lsp-codewhisperer.js").toString(),
+                "--stdio",
+                "--set-credentials-encryption-key",
+            ).withEnvironment(
+                buildMap {
+                    put("NODE_EXTRA_CA_CERTS", extraCaCerts.toAbsolutePath().toString())
+
+                    val proxy = JdkProxyProvider.getInstance().proxySelector.select(qUri)
+                        // log if only socks proxy available
+                        .firstOrNull { it.type() == Proxy.Type.HTTP }
+
+                    if (proxy != null) {
+                        val address = proxy.address()
+                        if (address is java.net.InetSocketAddress) {
+                            put(
+                                "HTTPS_PROXY",
+                                URIBuilder("http://${address.hostName}:${address.port}").apply {
+                                    val login = HttpConfigurable.getInstance().proxyLogin
+                                    if (login != null) {
+                                        setUserInfo(login, HttpConfigurable.getInstance().plainProxyPassword)
+                                    }
+                                }.build().toASCIIString()
+                            )
+                        }
                     }
                 }
-            }
-        )
+            )
             .withParentEnvironmentType(GeneralCommandLine.ParentEnvironmentType.CONSOLE)
 
         launcherHandler = KillableColoredProcessHandler.Silent(cmd)

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/NodeExePatcher.kt

@@ -14,8 +14,8 @@ import java.nio.file.Path
  * @see https://github.com/aws/aws-toolkit-vscode/commit/6081f890bdbb91fcd8b60c4cc0abb65b15d4a38d
  */
 object NodeExePatcher {
-    private const val GLIBC_LINKER_VAR = "VSCODE_SERVER_CUSTOM_GLIBC_LINKER"
-    private const val GLIBC_PATH_VAR = "VSCODE_SERVER_CUSTOM_GLIBC_PATH"
+    const val GLIBC_LINKER_VAR = "VSCODE_SERVER_CUSTOM_GLIBC_LINKER"
+    const val GLIBC_PATH_VAR = "VSCODE_SERVER_CUSTOM_GLIBC_PATH"
 
     fun patch(node: Path): GeneralCommandLine {
         val linker = System.getenv(GLIBC_LINKER_VAR)

plugins/amazonq/shared/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonq/lsp/NodeExePatcherTest.kt

@@ -0,0 +1,33 @@
+// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.services.amazonq.lsp
+
+import com.intellij.execution.configurations.GeneralCommandLine
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Rule
+import org.junit.Test
+import software.aws.toolkits.core.rules.EnvironmentVariableHelper
+import kotlin.io.path.Path
+
+class NodeExePatcherTest {
+    @get:Rule
+    val envVarHelper = EnvironmentVariableHelper()
+
+    @Test
+    fun `patches if path available`() {
+        envVarHelper[NodeExePatcher.GLIBC_LINKER_VAR] = "/opt/vsc-sysroot/lib/ld-linux-x86-64.so.2"
+        envVarHelper[NodeExePatcher.GLIBC_PATH_VAR] = "/opt/vsc-sysroot/lib/"
+
+        assertThat(NodeExePatcher.patch(Path("/path/to/node")))
+            .usingComparator(Comparator.comparing { it.commandLineString })
+            .isEqualTo(GeneralCommandLine("/opt/vsc-sysroot/lib/ld-linux-x86-64.so.2", "--library-path", "/opt/vsc-sysroot/lib/", "/path/to/node"))
+    }
+
+    @Test
+    fun `noop if no patch available`() {
+        assertThat(NodeExePatcher.patch(Path("/path/to/node")))
+            .usingComparator(Comparator.comparing { it.commandLineString })
+            .isEqualTo(GeneralCommandLine("/path/to/node"))
+    }
+}