Merge main into feature/jb-partial-indexing

Author: aws-toolkit-automation

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/lsp/LspUtils.kt

@@ -21,7 +21,8 @@ internal fun getCurrentOS(): String = when {
 }
 
 internal fun getCurrentArchitecture(): String = when (CpuArch.CURRENT) {
-    CpuArch.X86_64 -> "x64"
-    CpuArch.ARM64 -> "arm64"
-    else -> "unknown"
+    CpuArch.ARM32,
+    CpuArch.ARM64,
+    -> "arm64"
+    else -> "x64"
 }

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cfnlsp/server/GitHubManifestAdapter.kt

@@ -70,7 +70,7 @@ internal class GitHubManifestAdapter(
         var versions: List<ManifestVersion> = mapper.readValue(root.get(envKey).toString())
 
         if (SystemInfo.isLinux && legacyLinuxDetector.useLegacyLinux()) {
-            LOG.info { "Legacy Linux environment detected, remapping to linuxglib2.28" }
+            LOG.info { "Legacy Linux environment detected, using $LEGACY_LINUX_PLATFORM builds" }
             versions = remapLegacyLinux(versions)
         }
 
@@ -82,7 +82,7 @@ internal class GitHubManifestAdapter(
 
         val version = latestCompatibleVersion(versions)
 
-        val platform = getEffectivePlatform()
+        val platform = getCurrentOS()
         val arch = getCurrentArchitecture()
 
         val target = version.targets.firstOrNull { it.platform == platform && it.arch == arch }
@@ -140,13 +140,6 @@ internal class GitHubManifestAdapter(
 
     fun getCachedManifest(): String? = cachedManifestJson
 
-    private fun getEffectivePlatform(): String {
-        if (SystemInfo.isLinux && legacyLinuxDetector.useLegacyLinux()) {
-            return LEGACY_LINUX_PLATFORM
-        }
-        return getCurrentOS()
-    }
-
     companion object {
         private val LOG = getLogger<GitHubManifestAdapter>()
         private const val LEGACY_LINUX_PLATFORM = "linuxglib2.28"

plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/core/lsp/LspUtilsTest.kt

@@ -40,9 +40,8 @@ class LspUtilsTest {
         val arch = getCurrentArchitecture()
 
         when (CpuArch.CURRENT) {
-            CpuArch.X86_64 -> assertThat(arch).isEqualTo("x64")
-            CpuArch.ARM64 -> assertThat(arch).isEqualTo("arm64")
-            else -> assertThat(arch).isEqualTo("unknown")
+            CpuArch.ARM32, CpuArch.ARM64 -> assertThat(arch).isEqualTo("arm64")
+            else -> assertThat(arch).isEqualTo("x64")
         }
     }
 }