Eksperiment: Bygg Redis-URI selv

navikt · Jan 16, 2025 · 82e6e92 · 82e6e92
1 parent bc6b519
commit 82e6e92
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/apps/api/src/main/kotlin/no/nav/helsearbeidsgiver/inntektsmelding/api/App.kt b/apps/api/src/main/kotlin/no/nav/helsearbeidsgiver/inntektsmelding/api/App.kt
@@ -58,7 +58,12 @@ object Routes {
 
 fun main() {
     val rapid = RapidApplication.create(System.getenv())
-    val aivenRedisConnection = RedisConnection(Env.Redis.aivenUri + "/0")
+    val aivenRedisConnection =
+        RedisConnection(
+            Env.Redis.aivenHost,
+            Env.Redis.aivenPassword,
+            Env.Redis.aivenPort,
+        )
     val redisConnection = RedisConnection(Env.Redis.url)
 
     embeddedServer(

diff --git a/apps/api/src/main/kotlin/no/nav/helsearbeidsgiver/inntektsmelding/api/Env.kt b/apps/api/src/main/kotlin/no/nav/helsearbeidsgiver/inntektsmelding/api/Env.kt
@@ -9,7 +9,11 @@ object Env {
     }
 
     object Redis {
-        val aivenUri: String = "REDIS_URI_INNTEKTSMELDING".fromEnv()
+        val aivenHost: String = "REDIS_HOST_INNTEKTSMELDING".fromEnv()
+        val aivenPassword: String = "REDIS_PASSWORD_INNTEKTSMELDING".fromEnv()
+        val aivenPort: String = "REDIS_PORT_INNTEKTSMELDING".fromEnv()
+
+//        val aivenUri: String = "REDIS_URI_INNTEKTSMELDING".fromEnv()
         val url: String = "REDIS_URL".fromEnv()
     }
 }
diff --git a/...les/src/main/kotlin/no/nav/helsearbeidsgiver/felles/rapidsrivers/redis/RedisConnection.kt b/...les/src/main/kotlin/no/nav/helsearbeidsgiver/felles/rapidsrivers/redis/RedisConnection.kt
@@ -8,6 +8,12 @@ import no.nav.helsearbeidsgiver.utils.collection.mapValuesNotNull
 class RedisConnection(
     redisUri: String,
 ) {
+    constructor(
+        aivenHost: String,
+        aivenPassword: String,
+        aivenPort: String,
+    ) : this("rediss://$aivenPassword@$aivenHost:$aivenPort/0")
+
     private val client: RedisClient = RedisClient.create(redisUri)
     private val connection: StatefulRedisConnection<String, String> = client.connect()
     private val syncCommands: RedisCommands<String, String> = connection.sync()