Bruk Aiven Redis overalt

apps/aktiveorgnrservice/src/main/kotlin/no/nav/helsearbeidsgiver/inntektsmelding/aktiveorgnrservice/App.kt

@@ -12,7 +12,13 @@ import no.nav.helsearbeidsgiver.utils.log.logger
 private val logger = "helsearbeidsgiver-im-aktiveorgnrservice".logger()
 
 fun main() {
-    val redisConnection = RedisConnection(Env.redisUrl)
+    val redisConnection =
+        RedisConnection(
+            host = Env.redisHost,
+            port = Env.redisPort,
+            username = Env.redisUsername,
+            password = Env.redisPassword,
+        )
 
     RapidApplication
         .create(System.getenv())

apps/aktiveorgnrservice/src/main/kotlin/no/nav/helsearbeidsgiver/inntektsmelding/aktiveorgnrservice/Env.kt

@@ -3,5 +3,8 @@ package no.nav.helsearbeidsgiver.inntektsmelding.aktiveorgnrservice
 import no.nav.helsearbeidsgiver.felles.utils.fromEnv
 
 object Env {
-    val redisUrl = "REDIS_URL".fromEnv()
+    val redisHost = "REDIS_HOST_INNTEKTSMELDING".fromEnv()
+    val redisPort = "REDIS_PORT_INNTEKTSMELDING".fromEnv().toInt()
+    val redisUsername = "REDIS_USERNAME_INNTEKTSMELDING".fromEnv()
+    val redisPassword = "REDIS_PASSWORD_INNTEKTSMELDING".fromEnv()
 }

apps/api/build.gradle.kts

@@ -6,7 +6,6 @@ tasks {
     test {
         environment("IDPORTEN_WELL_KNOWN_URL", "http://localhost:6666/idporten-issuer/.well-known/openid-configuration")
         environment("IDPORTEN_AUDIENCE", "aud-localhost")
-        environment("REDIS_URL", "redis://test_url:6379/0")
     }
 }
 

apps/api/src/main/kotlin/no/nav/helsearbeidsgiver/inntektsmelding/api/App.kt

@@ -58,31 +58,28 @@ object Routes {
 
 fun main() {
     val rapid = RapidApplication.create(System.getenv())
-    val aivenRedisConnection =
+    val redisConnection =
         RedisConnection(
             host = Env.Redis.host,
             port = Env.Redis.port,
             username = Env.Redis.username,
             password = Env.Redis.password,
         )
-    val redisConnection = RedisConnection(Env.Redis.url)
 
     embeddedServer(
         factory = Netty,
         port = 8080,
-        module = { apiModule(rapid, aivenRedisConnection, redisConnection) },
+        module = { apiModule(rapid, redisConnection) },
     ).start(wait = true)
 
     rapid
         .registerShutdownLifecycle {
-            aivenRedisConnection.close()
             redisConnection.close()
         }.start()
 }
 
 fun Application.apiModule(
     rapid: RapidsConnection,
-    aivenRedisConnection: RedisConnection,
     redisConnection: RedisConnection,
 ) {
     val tilgangskontroll =
@@ -121,8 +118,8 @@ fun Application.apiModule(
 
         authenticate {
             route(Routes.PREFIX) {
-                hentForespoersel(rapid, tilgangskontroll, aivenRedisConnection)
-                hentForespoerselIdListe(rapid, tilgangskontroll, aivenRedisConnection)
+                hentForespoersel(rapid, tilgangskontroll, redisConnection)
+                hentForespoerselIdListe(rapid, tilgangskontroll, redisConnection)
                 inntektRoute(rapid, tilgangskontroll, redisConnection)
                 inntektSelvbestemtRoute(rapid, tilgangskontroll, redisConnection)
                 innsending(rapid, tilgangskontroll, redisConnection)

apps/api/src/main/kotlin/no/nav/helsearbeidsgiver/inntektsmelding/api/Env.kt

@@ -13,7 +13,5 @@ object Env {
         val port = "REDIS_PORT_INNTEKTSMELDING".fromEnv().toInt()
         val username = "REDIS_USERNAME_INNTEKTSMELDING".fromEnv()
         val password = "REDIS_PASSWORD_INNTEKTSMELDING".fromEnv()
-
-        val url = "REDIS_URL".fromEnv()
     }
 }

apps/api/src/test/kotlin/no/nav/helsearbeidsgiver/inntektsmelding/api/AuthorizationTest.kt

@@ -48,7 +48,7 @@ class AuthorizationTest : ApiTest() {
             val path = "/test/auth"
 
             application {
-                apiModule(mockk(relaxed = true), mockk(), mockk())
+                apiModule(mockk(relaxed = true), mockk())
 
                 routing {
                     authenticate {

apps/api/src/test/kotlin/no/nav/helsearbeidsgiver/inntektsmelding/api/utils/TestUtils.kt

@@ -39,7 +39,7 @@ abstract class ApiTest : MockAuthToken() {
     fun testApi(block: suspend TestClient.() -> Unit): Unit =
         testApplication {
             application {
-                apiModule(mockk(relaxed = true), mockRedisConnection, mockRedisConnection)
+                apiModule(mockk(relaxed = true), mockRedisConnection)
             }
 
             val testClient = TestClient(this, ::mockAuthToken)

apps/felles/src/main/kotlin/no/nav/helsearbeidsgiver/felles/rapidsrivers/redis/RedisConnection.kt

@@ -7,14 +7,12 @@ import io.lettuce.core.api.sync.RedisCommands
 import no.nav.helsearbeidsgiver.utils.collection.mapValuesNotNull
 
 class RedisConnection(
-    redisUri: String,
+    host: String,
+    port: Int,
+    username: String,
+    password: String,
 ) {
-    constructor(
-        host: String,
-        port: Int,
-        username: String,
-        password: String,
-    ) : this(
+    private val client: RedisClient =
         RedisURI
             .builder()
             .withSsl(true)
@@ -23,11 +21,7 @@ class RedisConnection(
             .withAuthentication(username, password)
             .withDatabase(0)
             .build()
-            .toURI()
-            .toString(),
-    )
-
-    private val client: RedisClient = RedisClient.create(redisUri)
+            .let(RedisClient::create)
     private val connection: StatefulRedisConnection<String, String> = client.connect()
     private val syncCommands: RedisCommands<String, String> = connection.sync()
 

apps/felles/src/testFixtures/kotlin/no/nav/helsearbeidsgiver/felles/test/mock/MockRedis.kt

@@ -1,6 +1,7 @@
 package no.nav.helsearbeidsgiver.felles.test.mock
 
 import io.lettuce.core.RedisClient
+import io.lettuce.core.RedisURI
 import io.lettuce.core.api.sync.RedisCommands
 import io.mockk.every
 import io.mockk.mockk
@@ -16,8 +17,8 @@ class MockRedis(
     private val mockCommands = mockk<RedisCommands<String, String>>()
     private val redis =
         mockStatic(RedisClient::class) {
-            every { RedisClient.create(any<String>()) } returns mockRedisClient(mockCommands)
-            RedisConnection("")
+            every { RedisClient.create(any<RedisURI>()) } returns mockRedisClient(mockCommands)
+            RedisConnection("host", 0, "username", "password")
         }
 
     val store: RedisStore

apps/felles/src/testFixtures/kotlin/no/nav/helsearbeidsgiver/felles/test/mock/MockRedisClient.kt

@@ -2,6 +2,7 @@ package no.nav.helsearbeidsgiver.felles.test.mock
 
 import io.lettuce.core.KeyValue
 import io.lettuce.core.RedisClient
+import io.lettuce.core.RedisURI
 import io.lettuce.core.api.StatefulRedisConnection
 import io.lettuce.core.api.sync.RedisCommands
 import io.mockk.every
@@ -13,8 +14,8 @@ import no.nav.helsearbeidsgiver.utils.test.mock.mockStatic
 fun redisWithMockRedisClient(mockStorageInit: Map<String, String?>): RedisConnection {
     val mockCommands = mockk<RedisCommands<String, String>>().setupMock(mockStorageInit)
     return mockStatic(RedisClient::class) {
-        every { RedisClient.create(any<String>()) } returns mockRedisClient(mockCommands)
-        RedisConnection("")
+        every { RedisClient.create(any<RedisURI>()) } returns mockRedisClient(mockCommands)
+        RedisConnection("host", 0, "username", "password")
     }
 }
 

apps/innsending/src/main/kotlin/no/nav/helsearbeidsgiver/inntektsmelding/innsending/App.kt

@@ -13,7 +13,13 @@ import no.nav.helsearbeidsgiver.utils.log.logger
 private val logger = "helsearbeidsgiver-im-innsending".logger()
 
 fun main() {
-    val redisConnection = RedisConnection(Env.redisUrl)
+    val redisConnection =
+        RedisConnection(
+            host = Env.redisHost,
+            port = Env.redisPort,
+            username = Env.redisUsername,
+            password = Env.redisPassword,
+        )
 
     RapidApplication
         .create(System.getenv())

apps/innsending/src/main/kotlin/no/nav/helsearbeidsgiver/inntektsmelding/innsending/Env.kt

@@ -3,5 +3,8 @@ package no.nav.helsearbeidsgiver.inntektsmelding.innsending
 import no.nav.helsearbeidsgiver.felles.utils.fromEnv
 
 object Env {
-    val redisUrl = "REDIS_URL".fromEnv()
+    val redisHost = "REDIS_HOST_INNTEKTSMELDING".fromEnv()
+    val redisPort = "REDIS_PORT_INNTEKTSMELDING".fromEnv().toInt()
+    val redisUsername = "REDIS_USERNAME_INNTEKTSMELDING".fromEnv()
+    val redisPassword = "REDIS_PASSWORD_INNTEKTSMELDING".fromEnv()
 }

apps/inntekt-selvbestemt-service/src/main/kotlin/no/nav/helsearbeidsgiver/inntektsmelding/inntektselvbestemtservice/App.kt

@@ -12,7 +12,13 @@ import no.nav.helsearbeidsgiver.utils.log.logger
 private val logger = "helsearbeidsgiver-im-inntektselvbestemtservice".logger()
 
 fun main() {
-    val redisConnection = RedisConnection(Env.redisUrl)
+    val redisConnection =
+        RedisConnection(
+            host = Env.redisHost,
+            port = Env.redisPort,
+            username = Env.redisUsername,
+            password = Env.redisPassword,
+        )
 
     RapidApplication
         .create(System.getenv())

apps/inntekt-selvbestemt-service/src/main/kotlin/no/nav/helsearbeidsgiver/inntektsmelding/inntektselvbestemtservice/Env.kt

@@ -3,5 +3,8 @@ package no.nav.helsearbeidsgiver.inntektsmelding.inntektselvbestemtservice
 import no.nav.helsearbeidsgiver.felles.utils.fromEnv
 
 object Env {
-    val redisUrl = "REDIS_URL".fromEnv()
+    val redisHost = "REDIS_HOST_INNTEKTSMELDING".fromEnv()
+    val redisPort = "REDIS_PORT_INNTEKTSMELDING".fromEnv().toInt()
+    val redisUsername = "REDIS_USERNAME_INNTEKTSMELDING".fromEnv()
+    val redisPassword = "REDIS_PASSWORD_INNTEKTSMELDING".fromEnv()
 }

apps/inntektservice/src/main/kotlin/no/nav/helsearbeidsgiver/inntektsmelding/inntektservice/App.kt

@@ -12,7 +12,13 @@ import no.nav.helsearbeidsgiver.utils.log.logger
 private val logger = "helsearbeidsgiver-im-inntektservice".logger()
 
 fun main() {
-    val redisConnection = RedisConnection(Env.redisUrl)
+    val redisConnection =
+        RedisConnection(
+            host = Env.redisHost,
+            port = Env.redisPort,
+            username = Env.redisUsername,
+            password = Env.redisPassword,
+        )
 
     RapidApplication
         .create(System.getenv())

apps/inntektservice/src/main/kotlin/no/nav/helsearbeidsgiver/inntektsmelding/inntektservice/Env.kt

@@ -3,5 +3,8 @@ package no.nav.helsearbeidsgiver.inntektsmelding.inntektservice
 import no.nav.helsearbeidsgiver.felles.utils.fromEnv
 
 object Env {
-    val redisUrl = "REDIS_URL".fromEnv()
+    val redisHost = "REDIS_HOST_INNTEKTSMELDING".fromEnv()
+    val redisPort = "REDIS_PORT_INNTEKTSMELDING".fromEnv().toInt()
+    val redisUsername = "REDIS_USERNAME_INNTEKTSMELDING".fromEnv()
+    val redisPassword = "REDIS_PASSWORD_INNTEKTSMELDING".fromEnv()
 }

apps/integrasjonstest/src/test/kotlin/no/nav/helsearbeidsgiver/inntektsmelding/integrasjonstest/utils/ContainerTest.kt

@@ -15,7 +15,7 @@ abstract class ContainerTest {
     private val topic = "helsearbeidsgiver.inntektsmelding"
 
     private val kafkaContainer = KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:7.7.2"))
-    val redisContainer = RedisContainer(DockerImageName.parse("redis:7"))
+    val redisContainer = RedisContainer(DockerImageName.parse("redis:latest"))
     val postgresContainerOne = postgresContainer()
     val postgresContainerTwo = postgresContainer()
 

apps/integrasjonstest/src/test/kotlin/no/nav/helsearbeidsgiver/inntektsmelding/integrasjonstest/utils/EndToEndTest.kt

@@ -3,6 +3,8 @@ package no.nav.helsearbeidsgiver.inntektsmelding.integrasjonstest.utils
 import com.github.navikt.tbd_libs.rapids_and_rivers.JsonMessage
 import com.github.navikt.tbd_libs.rapids_and_rivers_api.MessageProblems
 import io.kotest.matchers.nulls.shouldNotBeNull
+import io.lettuce.core.RedisClient
+import io.lettuce.core.RedisURI
 import io.micrometer.core.instrument.simple.SimpleMeterRegistry
 import io.mockk.clearAllMocks
 import io.mockk.coEvery
@@ -70,6 +72,7 @@ import no.nav.helsearbeidsgiver.utils.json.parseJson
 import no.nav.helsearbeidsgiver.utils.json.toJson
 import no.nav.helsearbeidsgiver.utils.test.date.august
 import no.nav.helsearbeidsgiver.utils.test.date.mai
+import no.nav.helsearbeidsgiver.utils.test.mock.mockStatic
 import no.nav.helsearbeidsgiver.utils.test.wrapper.genererGyldig
 import no.nav.helsearbeidsgiver.utils.wrapper.Fnr
 import org.intellij.lang.annotations.Language
@@ -156,7 +159,11 @@ abstract class EndToEndTest : ContainerTest() {
         return@lazy withRetries(
             feilmelding = "Klarte ikke koble til Redis.",
         ) {
-            RedisConnection(redisContainer.redisURI)
+            // Hijacker RedisClient her pga. vanskeligheter med å sette opp RedisContainer med SSL og autentisering
+            mockStatic(RedisClient::class) {
+                every { RedisClient.create(any<RedisURI>()) } returns RedisClient.create(redisContainer.redisURI)
+                RedisConnection("host", 0, "username", "password")
+            }
         }
     }
 

apps/selvbestemt-hent-im-service/src/main/kotlin/no/nav/helsearbeidsgiver/inntektsmelding/selvbestemthentimservice/App.kt

@@ -12,7 +12,13 @@ import no.nav.helsearbeidsgiver.utils.log.logger
 private val logger = "im-selvbestemt-hent-im-service".logger()
 
 fun main() {
-    val redisConnection = RedisConnection(Env.redisUrl)
+    val redisConnection =
+        RedisConnection(
+            host = Env.redisHost,
+            port = Env.redisPort,
+            username = Env.redisUsername,
+            password = Env.redisPassword,
+        )
 
     RapidApplication
         .create(System.getenv())

apps/selvbestemt-hent-im-service/src/main/kotlin/no/nav/helsearbeidsgiver/inntektsmelding/selvbestemthentimservice/Env.kt

@@ -3,5 +3,8 @@ package no.nav.helsearbeidsgiver.inntektsmelding.selvbestemthentimservice
 import no.nav.helsearbeidsgiver.felles.utils.fromEnv
 
 object Env {
-    val redisUrl = "REDIS_URL".fromEnv()
+    val redisHost = "REDIS_HOST_INNTEKTSMELDING".fromEnv()
+    val redisPort = "REDIS_PORT_INNTEKTSMELDING".fromEnv().toInt()
+    val redisUsername = "REDIS_USERNAME_INNTEKTSMELDING".fromEnv()
+    val redisPassword = "REDIS_PASSWORD_INNTEKTSMELDING".fromEnv()
 }

apps/selvbestemt-lagre-im-service/src/main/kotlin/no/nav/helsearbeidsgiver/inntektsmelding/selvbestemtlagreimservice/App.kt

@@ -12,7 +12,13 @@ import no.nav.helsearbeidsgiver.utils.log.logger
 private val logger = "im-selvbestemt-lagre-im-service".logger()
 
 fun main() {
-    val redisConnection = RedisConnection(Env.redisUrl)
+    val redisConnection =
+        RedisConnection(
+            host = Env.redisHost,
+            port = Env.redisPort,
+            username = Env.redisUsername,
+            password = Env.redisPassword,
+        )
 
     RapidApplication
         .create(System.getenv())

apps/selvbestemt-lagre-im-service/src/main/kotlin/no/nav/helsearbeidsgiver/inntektsmelding/selvbestemtlagreimservice/Env.kt

@@ -3,5 +3,8 @@ package no.nav.helsearbeidsgiver.inntektsmelding.selvbestemtlagreimservice
 import no.nav.helsearbeidsgiver.felles.utils.fromEnv
 
 object Env {
-    val redisUrl = "REDIS_URL".fromEnv()
+    val redisHost = "REDIS_HOST_INNTEKTSMELDING".fromEnv()
+    val redisPort = "REDIS_PORT_INNTEKTSMELDING".fromEnv().toInt()
+    val redisUsername = "REDIS_USERNAME_INNTEKTSMELDING".fromEnv()
+    val redisPassword = "REDIS_PASSWORD_INNTEKTSMELDING".fromEnv()
 }

apps/tilgangservice/src/main/kotlin/no/nav/helsearbeidsgiver/inntektsmelding/tilgangservice/App.kt

@@ -12,7 +12,13 @@ import no.nav.helsearbeidsgiver.utils.log.logger
 private val logger = "helsearbeidsgiver-im-tilgangservice".logger()
 
 fun main() {
-    val redisConnection = RedisConnection(Env.redisUrl)
+    val redisConnection =
+        RedisConnection(
+            host = Env.redisHost,
+            port = Env.redisPort,
+            username = Env.redisUsername,
+            password = Env.redisPassword,
+        )
 
     RapidApplication
         .create(System.getenv())

apps/tilgangservice/src/main/kotlin/no/nav/helsearbeidsgiver/inntektsmelding/tilgangservice/Env.kt

@@ -3,5 +3,8 @@ package no.nav.helsearbeidsgiver.inntektsmelding.tilgangservice
 import no.nav.helsearbeidsgiver.felles.utils.fromEnv
 
 object Env {
-    val redisUrl = "REDIS_URL".fromEnv()
+    val redisHost = "REDIS_HOST_INNTEKTSMELDING".fromEnv()
+    val redisPort = "REDIS_PORT_INNTEKTSMELDING".fromEnv().toInt()
+    val redisUsername = "REDIS_USERNAME_INNTEKTSMELDING".fromEnv()
+    val redisPassword = "REDIS_PASSWORD_INNTEKTSMELDING".fromEnv()
 }

config/aktiveorgnrservice/dev-gcp.yml

@@ -1,6 +1,2 @@
 kafkaPool: nav-dev
-env:
-  - name: REDIS_URL
-    value: redis://helsearbeidsgiver-redis.helsearbeidsgiver.svc.cluster.local:6379/0
-apps:
-  - name: helsearbeidsgiver-redis
+redisAccess: readwrite

config/api/dev-gcp.yml

@@ -2,13 +2,8 @@ kafkaPool: nav-dev
 idportenEnabled: true
 azure:
   enabled: true
-ingress: https://helsearbeidsgiver-im-api.intern.dev.nav.no
 redisAccess: read
-env:
-  - name: REDIS_URL
-    value: redis://helsearbeidsgiver-redis.helsearbeidsgiver.svc.cluster.local:6379/0
-apps:
-  - name: helsearbeidsgiver-redis
+ingress: https://helsearbeidsgiver-im-api.intern.dev.nav.no
 inboundApps:
   - name: spinntektsmelding-frontend
 

config/innsending/dev-gcp.yml

@@ -1,9 +1,2 @@
 kafkaPool: nav-dev
-azure:
-  enabled: true
-ingress: https://helsearbeidsgiver-im-innsending.intern.dev.nav.no
-env:
-- name: REDIS_URL
-  value: redis://helsearbeidsgiver-redis.helsearbeidsgiver.svc.cluster.local:6379/0
-apps:
-  - name: helsearbeidsgiver-redis
+redisAccess: readwrite