feat: use new style platform ids for audit

Author: marc0der

src/main/kotlin/io/sdkman/broker/application/service/AuditCommand.kt

@@ -21,9 +21,9 @@ data class AuditCommand(
             candidate = versionEntity.candidate,
             version =
                 versionEntity.vendor
-                    .map { vendor -> versionEntity.version.replace("-$vendor", "") }
+                    .map { vendor -> versionEntity.version.removeSuffix("-$vendor") }
                     .getOrElse { versionEntity.version },
-            platform = clientPlatform.persistentId,
+            platform = clientPlatform.auditId,
             dist = versionEntity.resolveActualDistribution(clientPlatform),
             vendor = versionEntity.vendor,
             host = auditContext.host,
@@ -33,7 +33,7 @@ data class AuditCommand(
 
     private fun Version.resolveActualDistribution(sourcePlatform: Platform): String =
         when (this.platform) {
-            Platform.Universal.persistentId -> Platform.Universal.persistentId
-            else -> sourcePlatform.persistentId
+            Platform.Universal.persistentId -> Platform.Universal.auditId
+            else -> sourcePlatform.auditId
         }
 }

src/main/kotlin/io/sdkman/broker/domain/model/Platform.kt

@@ -2,29 +2,35 @@ package io.sdkman.broker.domain.model
 
 import arrow.core.Option
 
-sealed class Platform(val code: String, val persistentId: String) {
-    data object LinuxX64 : Platform("linuxx64", "LINUX_64")
+sealed class Platform(val code: String, val persistentId: String, val auditId: String) {
+    data object LinuxX64 : Platform("linuxx64", "LINUX_64", "LINUX_X64")
 
-    data object LinuxARM64 : Platform("linuxarm64", "LINUX_ARM64")
+    data object LinuxARM64 : Platform("linuxarm64", "LINUX_ARM64", "LINUX_ARM64")
 
-    data object LinuxX32 : Platform("linuxx32", "LINUX_32")
+    data object LinuxX32 : Platform("linuxx32", "LINUX_32", "LINUX_X32")
 
-    data object DarwinX64 : Platform("darwinx64", "MAC_OSX")
+    data object LinuxARM32HF : Platform("linuxarm32hf", "LINUX_ARM32HF", "LINUX_ARM32HF")
 
-    data object DarwinARM64 : Platform("darwinarm64", "MAC_ARM64")
+    data object LinuxARM32SF : Platform("linuxarm32sf", "LINUX_ARM32SF", "LINUX_ARM32SF")
 
-    data object WindowsX64 : Platform("windowsx64", "WINDOWS_64")
+    data object DarwinX64 : Platform("darwinx64", "MAC_OSX", "MAC_X64")
 
-    data object Exotic : Platform("exotic", "EXOTIC")
+    data object DarwinARM64 : Platform("darwinarm64", "MAC_ARM64", "MAC_ARM64")
 
-    data object Universal : Platform("universal", "UNIVERSAL")
+    data object WindowsX64 : Platform("windowsx64", "WINDOWS_64", "WINDOWS_X64")
+
+    data object Exotic : Platform("exotic", "EXOTIC", "EXOTIC")
+
+    data object Universal : Platform("universal", "UNIVERSAL", "UNIVERSAL")
 
     companion object {
         private val platformMap =
             mapOf(
                 "linuxx64" to LinuxX64,
                 "linuxarm64" to LinuxARM64,
                 "linuxx32" to LinuxX32,
+                "linuxarm32hf" to LinuxARM32HF,
+                "linuxarm32sf" to LinuxARM32SF,
                 "darwinx64" to DarwinX64,
                 "darwinarm64" to DarwinARM64,
                 "windowsx64" to WindowsX64,

src/test/kotlin/io/sdkman/broker/acceptance/VersionDownloadAuditAcceptanceSpec.kt

@@ -123,14 +123,14 @@ class VersionDownloadAuditAcceptanceSpec : ShouldSpec({
                     database = database,
                     candidate = "groovy",
                     version = "4.0.0",
-                    platform = "LINUX_64"
+                    platform = "LINUX_X64"
                 )
 
             savedRecord shouldBeSomeAnd { record ->
                 record[AuditTable.command] shouldBe "install"
                 record[AuditTable.candidate] shouldBe "groovy"
                 record[AuditTable.version] shouldBe "4.0.0"
-                record[AuditTable.platform] shouldBe "LINUX_64"
+                record[AuditTable.platform] shouldBe "LINUX_X64"
                 record[AuditTable.dist] shouldBe "UNIVERSAL"
                 record[AuditTable.vendor] shouldBe null
                 record[AuditTable.host] shouldBe "192.168.1.100"
@@ -175,7 +175,7 @@ class VersionDownloadAuditAcceptanceSpec : ShouldSpec({
                     database = database,
                     candidate = "kotlin",
                     version = "1.6.0",
-                    platform = "WINDOWS_64"
+                    platform = "WINDOWS_X64"
                 )
 
             savedRecord shouldBeSomeAnd { record ->
@@ -210,7 +210,7 @@ class VersionDownloadAuditAcceptanceSpec : ShouldSpec({
                     database = database,
                     candidate = "nonexistent",
                     version = "1.0.0",
-                    platform = "LINUX_64"
+                    platform = "LINUX_X64"
                 )
 
             savedRecord.shouldBeNone()

src/test/kotlin/io/sdkman/broker/application/service/VersionServiceSpec.kt

@@ -120,7 +120,7 @@ class VersionServiceSpec : ShouldSpec({
             command shouldBe "install"
             candidate shouldBe "groovy"
             version shouldBe "4.0.0"
-            platform shouldBe "LINUX_64"
+            platform shouldBe "LINUX_X64"
             dist shouldBe "UNIVERSAL"
             vendor shouldBe none()
             host shouldBe testAuditContext.host