IS-3066: Use valkey-cache (#578)

navikt · Feb 10, 2025 · 776e93e · 776e93e
1 parent b4f35af
commit 776e93e
Show file tree

Hide file tree

Showing 24 changed files with 93 additions and 95 deletions.
diff --git a/.nais/naiserator-dev.yaml b/.nais/naiserator-dev.yaml
@@ -84,7 +84,7 @@ spec:
       claims:
         extra:
           - "NAVident"
-  redis:
+  valkey:
     - instance: cache
       access: readwrite
   tokenx:

diff --git a/.nais/naiserator-prod.yaml b/.nais/naiserator-prod.yaml
@@ -84,7 +84,7 @@ spec:
       claims:
         extra:
           - "NAVident"
-  redis:
+  valkey:
     - instance: cache
       access: readwrite
   tokenx:

diff --git a/README.md b/README.md
@@ -65,9 +65,7 @@ Creating a docker image should be as simple as `docker build -t isdialogmote .`
 
 ### Cache
 
-This application uses Redis for caching. Redis is deployed automatically on changes to workflow or config on master
-branch. For manual deploy, run: `kubectl apply -f .nais/redis-config.yaml`
-or `kubectl apply -f .nais/redisexporter.yaml`.
+This application uses Aiven Valkey for caching.
 
 ### Kafka
 

diff --git a/src/main/kotlin/no/nav/syfo/App.kt b/src/main/kotlin/no/nav/syfo/App.kt
@@ -10,7 +10,7 @@ import no.nav.syfo.application.ApplicationState
 import no.nav.syfo.application.Environment
 import no.nav.syfo.application.api.apiModule
 import no.nav.syfo.application.api.authentication.getWellKnown
-import no.nav.syfo.application.cache.RedisStore
+import no.nav.syfo.application.cache.ValkeyStore
 import no.nav.syfo.application.database.applicationDatabase
 import no.nav.syfo.application.database.databaseModule
 import no.nav.syfo.application.isDevGcp
@@ -76,16 +76,16 @@ fun main() {
             kafkaEsyfovarselConfig(environment.kafka)
         ),
     )
-    val redisConfig = environment.redisConfig
-    val cache = RedisStore(
+    val valkeyConfig = environment.valkeyConfig
+    val cache = ValkeyStore(
         JedisPool(
             JedisPoolConfig(),
-            HostAndPort(redisConfig.host, redisConfig.port),
+            HostAndPort(valkeyConfig.host, valkeyConfig.port),
             DefaultJedisClientConfig.builder()
-                .ssl(redisConfig.ssl)
-                .user(redisConfig.redisUsername)
-                .password(redisConfig.redisPassword)
-                .database(redisConfig.redisDB)
+                .ssl(valkeyConfig.ssl)
+                .user(valkeyConfig.valkeyUsername)
+                .password(valkeyConfig.valkeyPassword)
+                .database(valkeyConfig.valkeyDB)
                 .build()
         )
     )
@@ -95,7 +95,7 @@ fun main() {
         aadAppClient = environment.aadAppClient,
         aadAppSecret = environment.aadAppSecret,
         aadTokenEndpoint = environment.aadTokenEndpoint,
-        redisStore = cache,
+        valkeyStore = cache,
     )
     val tokendingsClient = TokendingsClient(
         tokenxClientId = environment.tokenxClientId,
@@ -113,7 +113,7 @@ fun main() {
         azureAdV2Client = azureAdV2Client,
         pdlClientId = environment.pdlClientId,
         pdlUrl = environment.pdlUrl,
-        redisStore = cache,
+        valkeyStore = cache,
     )
     val behandlendeEnhetClient = BehandlendeEnhetClient(
         azureAdV2Client = azureAdV2Client,

diff --git a/src/main/kotlin/no/nav/syfo/application/ApplicationEnvironment.kt b/src/main/kotlin/no/nav/syfo/application/ApplicationEnvironment.kt
@@ -1,7 +1,7 @@
 package no.nav.syfo.application
 
 import io.ktor.server.application.*
-import no.nav.syfo.application.cache.RedisConfig
+import no.nav.syfo.application.cache.ValkeyConfig
 import java.net.URI
 import java.time.LocalDate
 
@@ -29,11 +29,11 @@ data class Environment(
         aivenTruststoreLocation = getEnvVar("KAFKA_TRUSTSTORE_PATH"),
         aivenKeystoreLocation = getEnvVar("KAFKA_KEYSTORE_PATH"),
     ),
-    val redisConfig: RedisConfig = RedisConfig(
-        redisUri = URI(getEnvVar("REDIS_URI_CACHE")),
-        redisDB = 7, // se https://github.com/navikt/istilgangskontroll/blob/master/README.md
-        redisUsername = getEnvVar("REDIS_USERNAME_CACHE"),
-        redisPassword = getEnvVar("REDIS_PASSWORD_CACHE"),
+    val valkeyConfig: ValkeyConfig = ValkeyConfig(
+        valkeyUri = URI(getEnvVar("VALKEY_URI_CACHE")),
+        valkeyDB = 7, // se https://github.com/navikt/istilgangskontroll/blob/master/README.md
+        valkeyUsername = getEnvVar("VALKEY_USERNAME_CACHE"),
+        valkeyPassword = getEnvVar("VALKEY_PASSWORD_CACHE"),
     ),
     val isdialogmoteDbHost: String = getEnvVar("NAIS_DATABASE_ISDIALOGMOTE_ISDIALOGMOTE_DB_HOST"),
     val isdialogmoteDbPort: String = getEnvVar("NAIS_DATABASE_ISDIALOGMOTE_ISDIALOGMOTE_DB_PORT"),

diff --git a/src/main/kotlin/no/nav/syfo/application/cache/RedisConfig.kt b/src/main/kotlin/no/nav/syfo/application/cache/RedisConfig.kt
diff --git a/src/main/kotlin/no/nav/syfo/application/cache/ValkeyConfig.kt b/src/main/kotlin/no/nav/syfo/application/cache/ValkeyConfig.kt
@@ -0,0 +1,14 @@
+package no.nav.syfo.application.cache
+
+import java.net.URI
+
+class ValkeyConfig(
+    val valkeyUri: URI,
+    val valkeyDB: Int,
+    val valkeyUsername: String,
+    val valkeyPassword: String,
+    val ssl: Boolean = true
+) {
+    val host: String = valkeyUri.host
+    val port: Int = valkeyUri.port
+}
diff --git a/.../nav/syfo/application/cache/RedisStore.kt → ...nav/syfo/application/cache/ValkeyStore.kt b/.../nav/syfo/application/cache/RedisStore.kt → ...nav/syfo/application/cache/ValkeyStore.kt
@@ -6,7 +6,7 @@ import org.slf4j.LoggerFactory
 import redis.clients.jedis.JedisPool
 import redis.clients.jedis.exceptions.JedisConnectionException
 
-class RedisStore(private val jedisPool: JedisPool) {
+class ValkeyStore(private val jedisPool: JedisPool) {
 
     private val log: Logger = LoggerFactory.getLogger("no.nav.syfo.application.cache")
     val mapper = configuredJacksonMapper()
@@ -34,7 +34,7 @@ class RedisStore(private val jedisPool: JedisPool) {
         try {
             jedisPool.resource.use { jedis -> return jedis.get(key) }
         } catch (e: JedisConnectionException) {
-            log.warn("Got connection error when fetching from redis! Continuing without cached value", e)
+            log.warn("Got connection error when fetching from valkey! Continuing without cached value", e)
             return null
         }
     }
@@ -53,7 +53,7 @@ class RedisStore(private val jedisPool: JedisPool) {
                 )
             }
         } catch (e: JedisConnectionException) {
-            log.warn("Got connection error when storing in redis! Continue without caching", e)
+            log.warn("Got connection error when storing in valkey! Continue without caching", e)
         }
     }
 }
diff --git a/src/main/kotlin/no/nav/syfo/client/azuread/AzureAdV2Client.kt b/src/main/kotlin/no/nav/syfo/client/azuread/AzureAdV2Client.kt
@@ -9,15 +9,15 @@ import io.ktor.client.statement.*
 import io.ktor.http.*
 import no.nav.syfo.application.api.authentication.getConsumerClientId
 import no.nav.syfo.application.api.authentication.getNAVIdentFromToken
-import no.nav.syfo.application.cache.RedisStore
+import no.nav.syfo.application.cache.ValkeyStore
 import no.nav.syfo.client.httpClientProxy
 import org.slf4j.LoggerFactory
 
 class AzureAdV2Client(
     private val aadAppClient: String,
     private val aadAppSecret: String,
     private val aadTokenEndpoint: String,
-    private val redisStore: RedisStore,
+    private val valkeyStore: ValkeyStore,
     private val httpClient: HttpClient = httpClientProxy(),
 ) {
 
@@ -29,7 +29,7 @@ class AzureAdV2Client(
         val veilederIdent = getNAVIdentFromToken(token)
 
         val cacheKey = "$veilederIdent-$azp-$scopeClientId"
-        val cachedToken: AzureAdV2Token? = redisStore.getObject(key = cacheKey)
+        val cachedToken: AzureAdV2Token? = valkeyStore.getObject(key = cacheKey)
         return if (cachedToken?.isExpired() == false) {
             COUNT_CALL_AZUREAD_TOKEN_OBO_CACHE_HIT.increment()
             cachedToken
@@ -48,7 +48,7 @@ class AzureAdV2Client(
             azureAdTokenResponse?.let { tokenResponse ->
                 val azureAdToken = tokenResponse.toAzureAdV2Token()
                 COUNT_CALL_AZUREAD_TOKEN_OBO_CACHE_MISS.increment()
-                redisStore.setObject(
+                valkeyStore.setObject(
                     expireSeconds = 3600,
                     key = cacheKey,
                     value = azureAdToken,
@@ -60,7 +60,7 @@ class AzureAdV2Client(
 
     suspend fun getSystemToken(scopeClientId: String): AzureAdV2Token? {
         val cacheKey = "${CACHE_AZUREAD_TOKEN_SYSTEM_KEY_PREFIX}$scopeClientId"
-        val cachedToken = redisStore.getObject<AzureAdV2Token>(key = cacheKey)
+        val cachedToken = valkeyStore.getObject<AzureAdV2Token>(key = cacheKey)
         return if (cachedToken?.isExpired() == false) {
             COUNT_CALL_AZUREAD_TOKEN_SYSTEM_CACHE_HIT.increment()
             cachedToken
@@ -76,7 +76,7 @@ class AzureAdV2Client(
             azureAdTokenResponse?.let { token ->
                 val azureAdToken = token.toAzureAdV2Token()
                 COUNT_CALL_AZUREAD_TOKEN_SYSTEM_CACHE_MISS.increment()
-                redisStore.setObject(
+                valkeyStore.setObject(
                     expireSeconds = 3600,
                     key = cacheKey,
                     value = azureAdToken,

diff --git a/src/main/kotlin/no/nav/syfo/client/narmesteleder/NarmesteLederClient.kt b/src/main/kotlin/no/nav/syfo/client/narmesteleder/NarmesteLederClient.kt
@@ -7,7 +7,7 @@ import io.ktor.client.request.*
 import io.ktor.client.statement.*
 import io.ktor.http.*
 import net.logstash.logback.argument.StructuredArguments
-import no.nav.syfo.application.cache.RedisStore
+import no.nav.syfo.application.cache.ValkeyStore
 import no.nav.syfo.client.azuread.AzureAdV2Client
 import no.nav.syfo.client.httpClientDefault
 import no.nav.syfo.client.tokendings.TokendingsClient
@@ -21,7 +21,7 @@ class NarmesteLederClient(
     private val narmestelederClientId: String,
     private val azureAdV2Client: AzureAdV2Client,
     private val tokendingsClient: TokendingsClient,
-    private val cache: RedisStore,
+    private val cache: ValkeyStore,
     private val httpClient: HttpClient = httpClientDefault(),
 ) {
     private val narmesteLederPath = "$narmesteLederBaseUrl$CURRENT_NARMESTELEDER_PATH"

diff --git a/src/main/kotlin/no/nav/syfo/client/oppfolgingstilfelle/OppfolgingstilfelleClient.kt b/src/main/kotlin/no/nav/syfo/client/oppfolgingstilfelle/OppfolgingstilfelleClient.kt
@@ -7,7 +7,7 @@ import io.ktor.client.request.*
 import io.ktor.client.statement.*
 import io.ktor.http.*
 import net.logstash.logback.argument.StructuredArguments
-import no.nav.syfo.application.cache.RedisStore
+import no.nav.syfo.application.cache.ValkeyStore
 import no.nav.syfo.client.azuread.AzureAdV2Client
 import no.nav.syfo.client.httpClientDefault
 import no.nav.syfo.domain.PersonIdent
@@ -22,7 +22,7 @@ class OppfolgingstilfelleClient(
     private val tokendingsClient: TokendingsClient,
     private val isoppfolgingstilfelleClientId: String,
     isoppfolgingstilfelleBaseUrl: String,
-    private val cache: RedisStore,
+    private val cache: ValkeyStore,
     private val httpClient: HttpClient = httpClientDefault()
 ) {
     private val personOppfolgingstilfelleUrl: String =

diff --git a/src/main/kotlin/no/nav/syfo/client/pdl/PdlClient.kt b/src/main/kotlin/no/nav/syfo/client/pdl/PdlClient.kt
@@ -5,7 +5,7 @@ import io.ktor.client.call.*
 import io.ktor.client.request.*
 import io.ktor.client.statement.*
 import io.ktor.http.*
-import no.nav.syfo.application.cache.RedisStore
+import no.nav.syfo.application.cache.ValkeyStore
 import no.nav.syfo.client.azuread.AzureAdV2Client
 import no.nav.syfo.client.azuread.AzureAdV2Token
 import no.nav.syfo.client.httpClientDefault
@@ -20,23 +20,23 @@ class PdlClient(
     private val azureAdV2Client: AzureAdV2Client,
     private val pdlClientId: String,
     private val pdlUrl: String,
-    private val redisStore: RedisStore,
+    private val valkeyStore: ValkeyStore,
     private val httpClient: HttpClient = httpClientDefault(),
 ) {
 
     suspend fun navn(
         personIdent: PersonIdent,
     ): String {
         val cacheKey = "$NAVN_CACHE_KEY_PREFIX${personIdent.value}"
-        val cachedNavn: String? = redisStore.get(key = cacheKey)
+        val cachedNavn: String? = valkeyStore.get(key = cacheKey)
         return if (cachedNavn != null) {
             cachedNavn
         } else {
             val token = azureAdV2Client.getSystemToken(pdlClientId)
                 ?: throw RuntimeException("Failed to send request to PDL: No token was found")
             val navn = person(personIdent, token)?.fullName()
                 ?: throw RuntimeException("PDL returned empty navn for given fnr")
-            redisStore.set(cacheKey, navn, CACHE_EXPIRE_SECONDS)
+            valkeyStore.set(cacheKey, navn, CACHE_EXPIRE_SECONDS)
             navn
         }
     }
@@ -46,7 +46,7 @@ class PdlClient(
         callId: String,
     ): Set<PersonIdent> {
         val cacheKey = "$FOLKEREG_IDENTER_CACHE_KEY_PREFIX${personIdent.value}"
-        val cachedIdenter: Set<PersonIdent>? = redisStore.getSetObject(key = cacheKey)
+        val cachedIdenter: Set<PersonIdent>? = valkeyStore.getSetObject(key = cacheKey)
         return if (cachedIdenter != null) {
             cachedIdenter
         } else {
@@ -62,7 +62,7 @@ class PdlClient(
                     } ?: emptySet()
                 )
             }.toSet().also {
-                redisStore.setObject(cacheKey, it, CACHE_EXPIRE_SECONDS)
+                valkeyStore.setObject(cacheKey, it, CACHE_EXPIRE_SECONDS)
             }
         }
     }

diff --git a/src/main/kotlin/no/nav/syfo/client/person/kontaktinfo/KontaktinformasjonClient.kt b/src/main/kotlin/no/nav/syfo/client/person/kontaktinfo/KontaktinformasjonClient.kt
@@ -7,7 +7,7 @@ import io.ktor.client.request.*
 import io.ktor.client.statement.*
 import io.ktor.http.*
 import net.logstash.logback.argument.StructuredArguments
-import no.nav.syfo.application.cache.RedisStore
+import no.nav.syfo.application.cache.ValkeyStore
 import no.nav.syfo.client.azuread.AzureAdV2Client
 import no.nav.syfo.client.httpClientDefault
 import no.nav.syfo.client.person.COUNT_CALL_PERSON_KONTAKTINFORMASJON_FAIL
@@ -18,7 +18,7 @@ import org.slf4j.LoggerFactory
 
 class KontaktinformasjonClient(
     private val azureAdV2Client: AzureAdV2Client,
-    private val cache: RedisStore,
+    private val cache: ValkeyStore,
     private val clientId: String,
     baseUrl: String,
     private val httpClient: HttpClient = httpClientDefault()

diff --git a/src/main/kotlin/no/nav/syfo/cronjob/CronjobModule.kt b/src/main/kotlin/no/nav/syfo/cronjob/CronjobModule.kt
@@ -3,7 +3,7 @@ package no.nav.syfo.cronjob
 import io.ktor.server.application.Application
 import no.nav.syfo.application.ApplicationState
 import no.nav.syfo.application.Environment
-import no.nav.syfo.application.cache.RedisStore
+import no.nav.syfo.application.cache.ValkeyStore
 import no.nav.syfo.application.database.DatabaseInterface
 import no.nav.syfo.application.launchBackgroundTask
 import no.nav.syfo.brev.arbeidstaker.ArbeidstakerVarselService
@@ -33,7 +33,7 @@ fun Application.cronjobModule(
     applicationState: ApplicationState,
     database: DatabaseInterface,
     environment: Environment,
-    cache: RedisStore,
+    cache: ValkeyStore,
     dialogmotestatusService: DialogmotestatusService,
     dialogmoterelasjonService: DialogmoterelasjonService,
     arbeidstakerVarselService: ArbeidstakerVarselService,
@@ -43,7 +43,7 @@ fun Application.cronjobModule(
         aadAppClient = environment.aadAppClient,
         aadAppSecret = environment.aadAppSecret,
         aadTokenEndpoint = environment.aadTokenEndpoint,
-        redisStore = cache,
+        valkeyStore = cache,
     )
     val dokarkivClient = DokarkivClient(
         azureAdV2Client = azureAdV2Client,
@@ -54,7 +54,7 @@ fun Application.cronjobModule(
         azureAdV2Client = azureAdV2Client,
         pdlClientId = environment.pdlClientId,
         pdlUrl = environment.pdlUrl,
-        redisStore = cache,
+        valkeyStore = cache,
     )
     val eregClient = EregClient(
         baseUrl = environment.eregUrl,

diff --git a/src/test/kotlin/no/nav/syfo/client/azuread/AzureAdClientSpek.kt b/src/test/kotlin/no/nav/syfo/client/azuread/AzureAdClientSpek.kt
@@ -7,7 +7,7 @@ import io.mockk.mockk
 import io.mockk.verify
 import java.time.LocalDateTime
 import kotlinx.coroutines.runBlocking
-import no.nav.syfo.application.cache.RedisStore
+import no.nav.syfo.application.cache.ValkeyStore
 import no.nav.syfo.testhelper.ExternalMockEnvironment
 import no.nav.syfo.testhelper.UserConstants.AZUREAD_TOKEN
 import no.nav.syfo.testhelper.UserConstants.JWT_AZP
@@ -25,13 +25,13 @@ class AzureAdClientSpek : Spek({
 
     describe(AzureAdClientSpek::class.java.simpleName) {
         val externalMockEnvironment = ExternalMockEnvironment.getInstance()
-        val cacheMock = mockk<RedisStore>()
+        val cacheMock = mockk<ValkeyStore>()
 
         val azureAdClient = AzureAdV2Client(
             aadAppClient = externalMockEnvironment.environment.aadAppClient,
             aadAppSecret = externalMockEnvironment.environment.aadAppSecret,
             aadTokenEndpoint = externalMockEnvironment.environment.aadTokenEndpoint,
-            redisStore = cacheMock,
+            valkeyStore = cacheMock,
             httpClient = externalMockEnvironment.mockHttpClient,
         )
         val systemTokenCacheKey =
-Original file line number
+Diff line change
@@ Expand Up / @@ -84,7 +84,7 @@ spec: @@
           claims:
             extra:
               - "NAVident"
-      redis:
+      valkey:
         - instance: cache
           access: readwrite
       tokenx:
@@ Expand Down @@