fix: change to SQLDelight

docker-compose.yaml

@@ -55,23 +55,6 @@ services:
     networks:
       - openid_network
 
-  local-kms:
-    build:
-      context: .
-      dockerfile: ./.docker/local-kms/Dockerfile
-    ports:
-      - "8082:8082"
-    container_name: openid-federation-local-kms
-    environment:
-      DATASOURCE_URL: ${DATASOURCE_URL}
-      DATASOURCE_USER: ${DATASOURCE_USER}
-      DATASOURCE_PASSWORD: ${DATASOURCE_PASSWORD}
-    depends_on:
-      db:
-        condition: service_healthy
-    networks:
-      - openid_network
-
 networks:
   openid_network:
     driver: bridge

modules/local-kms/build.gradle.kts

@@ -1,7 +1,6 @@
 plugins {
-    alias(libs.plugins.springboot)
-    alias(libs.plugins.springDependencyManagement)
-    alias(libs.plugins.kotlinJvm)
+    kotlin("multiplatform") version "2.0.0"
+    id("app.cash.sqldelight") version "2.0.2"
 }
 
 group = "com.sphereon.oid.fed.kms.local"
@@ -13,16 +12,36 @@ repositories {
     google()
 }
 
-dependencies {
-    testImplementation(kotlin("test"))
-    implementation(projects.modules.services)
-    implementation(libs.springboot.data.jdbc)
-    testImplementation(libs.springboot.test)
+sqldelight {
+    databases {
+        create("Database") {
+            packageName = "com.sphereon.oid.fed.kms.local"
+            dialect("app.cash.sqldelight:postgresql-dialect:2.0.2")
+            schemaOutputDirectory = file("src/commonMain/resources/db/migration")
+            migrationOutputDirectory = file("src/commonMain/resources/db/migration")
+            deriveSchemaFromMigrations = true
+            migrationOutputFileFormat = ".sql"
+            srcDirs.from(
+                "src/commonMain/sqldelight"
+            )
+        }
+    }
 }
 
-tasks.test {
-    useJUnitPlatform()
-}
 kotlin {
-    jvmToolchain(21)
+    jvm()
+
+    sourceSets {
+        commonMain {
+            dependencies {
+                implementation(projects.modules.services)
+            }
+        }
+
+        jvmMain {
+            dependencies {
+                implementation("app.cash.sqldelight:sqlite-driver:2.0.2")
+            }
+        }
+    }
 }

modules/local-kms/src/main/kotlin/LocalKmsClient.kt → modules/local-kms/src/commonMain/kotlin/com/sphereon/oid/fed/kms/local/LocalKmsClient.kt

@@ -3,7 +3,7 @@ package com.sphereon.oid.fed.kms.local
 import com.sphereon.oid.fed.persistence.models.Jwk
 import com.sphereon.oid.fed.services.KmsClient
 
-class LocalKmsClient(private val database: LocalKmsDatabaseConnection) : KmsClient {
+class LocalKmsClient(private val database: LocalKmsDatabase) : KmsClient {
 
     override fun generateKeyPair(keyId: String): Jwk {
         TODO("Not yet implemented")

modules/local-kms/src/commonMain/kotlin/com/sphereon/oid/fed/kms/local/LocalKmsDatabase.kt

@@ -0,0 +1,12 @@
+package com.sphereon.oid.fed.kms.local
+
+import com.sphereon.oid.fed.kms.local.models.Keys
+
+expect class LocalKmsDatabase {
+    fun getKey(keyId: String): Keys
+    fun insertKey(keyId: String, privateKey: ByteArray, publicKey: ByteArray, algorithm: String)
+    fun updateKey(keyId: String, privateKey: ByteArray, publicKey: ByteArray, algorithm: String)
+    fun deleteKey(keyId: String)
+}
+
+class KeyNotFoundException(message: String) : Exception(message)

modules/local-kms/src/commonMain/sqldelight/com/sphereon/oid/fed/kms/local/models/Keys.sq

@@ -0,0 +1,6 @@
+CREATE TABLE keys (
+    id TEXT PRIMARY KEY,
+    private_key TEXT NOT NULL,
+    public_key TEXT NOT NULL,
+    algorithm TEXT NOT NULL
+);

modules/local-kms/src/jvmMain/kotlin/com/sphereon/oid/fed/kms/local/LocalKmsDatabase.jvm.kt

@@ -0,0 +1,45 @@
+package com.sphereon.oid.fed.kms.local
+
+import app.cash.sqldelight.db.SqlDriver
+import com.sphereon.oid.fed.kms.local.models.Keys
+import com.sphereon.oid.fed.persistence.Constants
+import com.sphereon.oid.fed.persistence.database.PlatformSqlDriver
+
+
+actual class LocalKmsDatabase {
+
+    init {
+        val driver = getDriver()
+
+        val database = Database(driver)
+
+    }
+
+    private fun getDriver(): SqlDriver {
+        return PlatformSqlDriver().createPostgresDriver(
+            System.getenv(Constants.DATASOURCE_URL),
+            System.getenv(Constants.DATASOURCE_USER),
+            System.getenv(Constants.DATASOURCE_PASSWORD)
+        )
+    }
+
+    actual fun getKey(keyId: String): Keys {
+        TODO("Not yet implemented")
+    }
+
+    actual fun insertKey(
+        keyId: String, privateKey: ByteArray, publicKey: ByteArray, algorithm: String
+    ) {
+        TODO("Not yet implemented")
+    }
+
+    actual fun updateKey(
+        keyId: String, privateKey: ByteArray, publicKey: ByteArray, algorithm: String
+    ) {
+        TODO("Not yet implemented")
+    }
+
+    actual fun deleteKey(keyId: String) {
+        TODO("Not yet implemented")
+    }
+}