Merge master into feature/LSP-gamma

Author: aws-toolkit-automation

packages/amazonq/.changes/next-release/Bug Fix-bb976b5f-7697-42d8-89a9-8e96310a23f4.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Support chat in AL2 aarch64"
+}

packages/amazonq/src/extension.ts

@@ -33,7 +33,7 @@ import {
     maybeShowMinVscodeWarning,
     Experiments,
     isSageMaker,
-    isAmazonInternalOs,
+    isAmazonLinux2,
 } from 'aws-core-vscode/shared'
 import { ExtStartUpSources } from 'aws-core-vscode/telemetry'
 import { VSCODE_EXTENSION_ID } from 'aws-core-vscode/utils'
@@ -123,7 +123,7 @@ export async function activateAmazonQCommon(context: vscode.ExtensionContext, is
     await activateCodeWhisperer(extContext as ExtContext)
     if (
         (Experiments.instance.get('amazonqLSP', true) || Auth.instance.isInternalAmazonUser()) &&
-        (!isAmazonInternalOs() || (await hasGlibcPatch()))
+        (!isAmazonLinux2() || hasGlibcPatch())
     ) {
         // start the Amazon Q LSP for internal users first
         // for AL2, start LSP if glibc patch is found

packages/amazonq/src/lsp/client.ts

@@ -31,8 +31,7 @@ import {
     getLogger,
     undefinedIfEmpty,
     getOptOutPreference,
-    isAmazonInternalOs,
-    fs,
+    isAmazonLinux2,
     getClientId,
     extensionVersion,
 } from 'aws-core-vscode/shared'
@@ -45,8 +44,11 @@ import { telemetry } from 'aws-core-vscode/telemetry'
 const localize = nls.loadMessageBundle()
 const logger = getLogger('amazonqLsp.lspClient')
 
-export async function hasGlibcPatch(): Promise<boolean> {
-    return await fs.exists('/opt/vsc-sysroot/lib64/ld-linux-x86-64.so.2')
+export const glibcLinker: string = process.env.VSCODE_SERVER_CUSTOM_GLIBC_LINKER || ''
+export const glibcPath: string = process.env.VSCODE_SERVER_CUSTOM_GLIBC_PATH || ''
+
+export function hasGlibcPatch(): boolean {
+    return glibcLinker.length > 0 && glibcPath.length > 0
 }
 
 export async function startLanguageServer(
@@ -71,13 +73,8 @@ export async function startLanguageServer(
     const traceServerEnabled = Settings.instance.isSet(`${clientId}.trace.server`)
     let executable: string[] = []
     // apply the GLIBC 2.28 path to node js runtime binary
-    if (isAmazonInternalOs() && (await hasGlibcPatch())) {
-        executable = [
-            '/opt/vsc-sysroot/lib64/ld-linux-x86-64.so.2',
-            '--library-path',
-            '/opt/vsc-sysroot/lib64',
-            resourcePaths.node,
-        ]
+    if (isAmazonLinux2() && hasGlibcPatch()) {
+        executable = [glibcLinker, '--library-path', glibcPath, resourcePaths.node]
         getLogger('amazonqLsp').info(`Patched node runtime with GLIBC to ${executable}`)
     } else {
         executable = [resourcePaths.node]

packages/core/src/amazonq/lsp/lspController.ts

@@ -11,7 +11,7 @@ import { activate as activateLsp, LspClient } from './lspClient'
 import { telemetry } from '../../shared/telemetry/telemetry'
 import { isCloud9 } from '../../shared/extensionUtilities'
 import globals, { isWeb } from '../../shared/extensionGlobals'
-import { isAmazonInternalOs } from '../../shared/vscode/env'
+import { isAmazonLinux2 } from '../../shared/vscode/env'
 import { WorkspaceLspInstaller } from './workspaceInstaller'
 import { lspSetupStage } from '../../shared/lsp/utils/setupStage'
 import { RelevantTextDocumentAddition } from '../../codewhispererChat/controllers/chat/model'
@@ -165,7 +165,7 @@ export class LspController {
     }
 
     async trySetupLsp(context: vscode.ExtensionContext, buildIndexConfig: BuildIndexConfig) {
-        if (isCloud9() || isWeb() || isAmazonInternalOs()) {
+        if (isCloud9() || isWeb() || isAmazonLinux2()) {
             this.logger.warn('Skipping LSP setup. LSP is not compatible with the current environment. ')
             // do not do anything if in Cloud9 or Web mode or in AL2 (AL2 does not support node v18+)
             return

packages/core/src/shared/index.ts

@@ -18,7 +18,7 @@ export * from './extensionUtilities'
 export * from './extensionStartup'
 export { RegionProvider } from './regions/regionProvider'
 export { Commands } from './vscode/commands2'
-export { getMachineId, getServiceEnvVarConfig, isAmazonInternalOs } from './vscode/env'
+export { getMachineId, getServiceEnvVarConfig, isAmazonLinux2 } from './vscode/env'
 export { getLogger } from './logger/logger'
 export { activateExtension, openUrl } from './utilities/vsCodeUtils'
 export { waitUntil, sleep, Timeout } from './utilities/timeoutUtils'

packages/core/src/shared/telemetry/util.ts

@@ -15,7 +15,7 @@ import {
     isAutomation,
     isRemoteWorkspace,
     isCloudDesktop,
-    isAmazonInternalOs,
+    isAmazonLinux2,
 } from '../vscode/env'
 import { addTypeName } from '../utilities/typeConstructors'
 import globals, { isWeb } from '../extensionGlobals'
@@ -290,7 +290,7 @@ export async function getComputeEnvType(): Promise<EnvType> {
     } else if (isSageMaker()) {
         return web ? 'sagemaker-web' : 'sagemaker'
     } else if (isRemoteWorkspace()) {
-        if (isAmazonInternalOs()) {
+        if (isAmazonLinux2()) {
             if (await isCloudDesktop()) {
                 return 'cloudDesktop-amzn'
             }

packages/core/src/shared/vscode/env.ts

@@ -125,23 +125,21 @@ export function isRemoteWorkspace(): boolean {
 }
 
 /**
- * There is Amazon Linux 2, but additionally an Amazon Linux 2 Internal.
- * The internal version is for Amazon employees only. And this version can
- * be used by either EC2 OR CloudDesktop. It is not exclusive to either.
+ * There is Amazon Linux 2.
  *
- * Use {@link isCloudDesktop()} to know if we are specifically using it.
+ * Use {@link isCloudDesktop()} to know if we are specifically using internal Amazon Linux 2.
  *
- * Example: `5.10.220-188.869.amzn2int.x86_64`
+ * Example: `5.10.220-188.869.amzn2int.x86_64` or `5.10.236-227.928.amzn2.x86_64` (Cloud Dev Machine)
  */
-export function isAmazonInternalOs() {
-    return os.release().includes('amzn2int') && process.platform === 'linux'
+export function isAmazonLinux2() {
+    return (os.release().includes('.amzn2int.') || os.release().includes('.amzn2.')) && process.platform === 'linux'
 }
 
 /**
  * Returns true if we are in an internal Amazon Cloud Desktop
  */
 export async function isCloudDesktop() {
-    if (!isAmazonInternalOs()) {
+    if (!isAmazonLinux2()) {
         return false
     }
 

packages/core/src/test/shared/vscode/env.test.ts

@@ -5,13 +5,7 @@
 
 import assert from 'assert'
 import path from 'path'
-import {
-    isCloudDesktop,
-    getEnvVars,
-    getServiceEnvVarConfig,
-    isAmazonInternalOs as isAmazonInternalOS,
-    isBeta,
-} from '../../../shared/vscode/env'
+import { isCloudDesktop, getEnvVars, getServiceEnvVarConfig, isAmazonLinux2, isBeta } from '../../../shared/vscode/env'
 import { ChildProcess } from '../../../shared/utilities/processUtils'
 import * as sinon from 'sinon'
 import os from 'os'
@@ -103,13 +97,16 @@ describe('env', function () {
         assert.strictEqual(isBeta(), expected)
     })
 
-    it('isAmazonInternalOS', function () {
+    it('isAmazonLinux2', function () {
         sandbox.stub(process, 'platform').value('linux')
         const versionStub = stubOsVersion('5.10.220-188.869.amzn2int.x86_64')
-        assert.strictEqual(isAmazonInternalOS(), true)
+        assert.strictEqual(isAmazonLinux2(), true)
+
+        versionStub.returns('5.10.236-227.928.amzn2.x86_64')
+        assert.strictEqual(isAmazonLinux2(), true)
 
         versionStub.returns('5.10.220-188.869.NOT_INTERNAL.x86_64')
-        assert.strictEqual(isAmazonInternalOS(), false)
+        assert.strictEqual(isAmazonLinux2(), false)
     })
 
     it('isCloudDesktop', async function () {