Skip to content

Commit ca9816d

Browse files
geir-waagboegeir-waagboe
authored
IS-3066: Use Valkey-cache (#518)
1 parent 63443cd commit ca9816d

File tree

18 files changed

+87
-87
lines changed

18 files changed

+87
-87
lines changed

‎.nais/naiserator-dev.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ spec:
6868
claims:
6969
extra:
7070
- "NAVident"
71-
redis:
71+
valkey:
7272
- instance: cache
7373
access: readwrite
7474
gcp:

‎.nais/naiserator-prod.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ spec:
6969
claims:
7070
extra:
7171
- "NAVident"
72-
redis:
72+
valkey:
7373
- instance: cache
7474
access: readwrite
7575
gcp:

‎src/main/kotlin/no/nav/syfo/App.kt

+10-10
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import io.ktor.server.application.*
55
import io.ktor.server.config.*
66
import io.ktor.server.engine.*
77
import io.ktor.server.netty.*
8-
import no.nav.syfo.application.cache.RedisStore
8+
import no.nav.syfo.application.cache.ValkeyStore
99
import no.nav.syfo.personstatus.application.PersonoversiktStatusService
1010
import no.nav.syfo.personstatus.api.v2.apiModule
1111
import no.nav.syfo.personstatus.api.v2.auth.getWellKnown
@@ -46,23 +46,23 @@ fun main() {
4646
wellKnownUrl = environment.azure.appWellKnownUrl,
4747
)
4848

49-
val redisConfig = environment.redisConfig
50-
val redisStore = RedisStore(
49+
val valkeyConfig = environment.valkeyConfig
50+
val valkeyStore = ValkeyStore(
5151
JedisPool(
5252
JedisPoolConfig(),
53-
HostAndPort(redisConfig.host, redisConfig.port),
53+
HostAndPort(valkeyConfig.host, valkeyConfig.port),
5454
DefaultJedisClientConfig.builder()
55-
.ssl(redisConfig.ssl)
56-
.user(redisConfig.redisUsername)
57-
.password(redisConfig.redisPassword)
58-
.database(redisConfig.redisDB)
55+
.ssl(valkeyConfig.ssl)
56+
.user(valkeyConfig.valkeyUsername)
57+
.password(valkeyConfig.valkeyPassword)
58+
.database(valkeyConfig.valkeyDB)
5959
.build()
6060
)
6161
)
6262

6363
val azureAdClient = AzureAdClient(
6464
azureEnvironment = environment.azure,
65-
redisStore = redisStore,
65+
valkeyStore = valkeyStore,
6666
)
6767

6868
val pdlClient = PdlClient(
@@ -173,7 +173,7 @@ fun main() {
173173
applicationState = applicationState,
174174
database = database,
175175
environment = environment,
176-
redisStore = redisStore,
176+
valkeyStore = valkeyStore,
177177
azureAdClient = azureAdClient,
178178
personBehandlendeEnhetService = personBehandlendeEnhetService,
179179
personoversiktStatusService = personoversiktStatusService,

‎src/main/kotlin/no/nav/syfo/ApplicationEnvironment.kt

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package no.nav.syfo
22

3-
import no.nav.syfo.application.cache.RedisConfig
3+
import no.nav.syfo.application.cache.ValkeyConfig
44
import no.nav.syfo.personstatus.infrastructure.clients.ClientEnvironment
55
import no.nav.syfo.personstatus.infrastructure.clients.ClientsEnvironment
66
import no.nav.syfo.personstatus.infrastructure.database.DatabaseEnvironment
@@ -85,11 +85,11 @@ data class Environment(
8585
clientId = getEnvVar("AKTIVITETSKRAV_CLIENT_ID"),
8686
),
8787
),
88-
val redisConfig: RedisConfig = RedisConfig(
89-
redisUri = URI(getEnvVar("REDIS_URI_CACHE")),
90-
redisDB = 21, // se https://github.com/navikt/istilgangskontroll/blob/master/README.md
91-
redisUsername = getEnvVar("REDIS_USERNAME_CACHE"),
92-
redisPassword = getEnvVar("REDIS_PASSWORD_CACHE"),
88+
val valkeyConfig: ValkeyConfig = ValkeyConfig(
89+
valkeyUri = URI(getEnvVar("VALKEY_URI_CACHE")),
90+
valkeyDB = 21, // se https://github.com/navikt/istilgangskontroll/blob/master/README.md
91+
valkeyUsername = getEnvVar("VALKEY_USERNAME_CACHE"),
92+
valkeyPassword = getEnvVar("VALKEY_PASSWORD_CACHE"),
9393
),
9494

9595
val cronjobBehandlendeEnhetIntervalDelayMinutes: Long = getEnvVar("CRONJOB_BEHANDLENDE_ENHET_INTERVAL_DELAY_MINUTES").toLong(),

‎src/main/kotlin/no/nav/syfo/application/cache/RedisConfig.kt

-14
This file was deleted.

‎src/main/kotlin/no/nav/syfo/application/cache/ValkeyConfig.kt

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package no.nav.syfo.application.cache
2+
3+
import java.net.URI
4+
5+
class ValkeyConfig(
6+
val valkeyUri: URI,
7+
val valkeyDB: Int,
8+
val valkeyUsername: String,
9+
val valkeyPassword: String,
10+
val ssl: Boolean = true
11+
) {
12+
val host: String = valkeyUri.host
13+
val port: Int = valkeyUri.port
14+
}

‎src/main/kotlin/no/nav/syfo/application/cache/RedisStore.kt ‎src/main/kotlin/no/nav/syfo/application/cache/ValkeyStore.kt

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import redis.clients.jedis.*
77
import redis.clients.jedis.exceptions.JedisConnectionException
88
import kotlin.reflect.KClass
99

10-
class RedisStore(
10+
class ValkeyStore(
1111
private val jedisPool: JedisPool,
1212
) {
1313
val objectMapper: ObjectMapper = configuredJacksonMapper()
@@ -28,7 +28,7 @@ class RedisStore(
2828
return jedis.get(key)
2929
}
3030
} catch (e: JedisConnectionException) {
31-
log.warn("Got connection error when fetching from redis! Continuing without cached value", e)
31+
log.warn("Got connection error when fetching from valkey! Continuing without cached value", e)
3232
return null
3333
}
3434
}
@@ -55,7 +55,7 @@ class RedisStore(
5555
jedis.mget(*keyList.toTypedArray()).filterNotNull()
5656
}
5757
} catch (e: JedisConnectionException) {
58-
log.warn("Got connection error when fetching from redis! Continuing without cached value", e)
58+
log.warn("Got connection error when fetching from valkey! Continuing without cached value", e)
5959
emptyList()
6060
}
6161
}
@@ -83,11 +83,11 @@ class RedisStore(
8383
)
8484
}
8585
} catch (e: JedisConnectionException) {
86-
log.warn("Got connection error when storing in redis! Continue without caching", e)
86+
log.warn("Got connection error when storing in valkey! Continue without caching", e)
8787
}
8888
}
8989

9090
companion object {
91-
private val log = LoggerFactory.getLogger(RedisStore::class.java)
91+
private val log = LoggerFactory.getLogger(ValkeyStore::class.java)
9292
}
9393
}

‎src/main/kotlin/no/nav/syfo/personstatus/infrastructure/clients/azuread/AzureAdClient.kt

+6-6
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import io.ktor.client.request.post
99
import io.ktor.client.request.setBody
1010
import io.ktor.client.statement.*
1111
import io.ktor.http.*
12-
import no.nav.syfo.application.cache.RedisStore
12+
import no.nav.syfo.application.cache.ValkeyStore
1313
import no.nav.syfo.personstatus.api.v2.auth.getNAVIdentFromToken
1414
import no.nav.syfo.personstatus.infrastructure.clients.httpClientProxy
1515
import org.slf4j.LoggerFactory
@@ -18,7 +18,7 @@ import kotlin.let
1818

1919
class AzureAdClient(
2020
private val azureEnvironment: AzureEnvironment,
21-
private val redisStore: RedisStore,
21+
private val valkeyStore: ValkeyStore,
2222
private val httpClient: HttpClient = httpClientProxy(),
2323
) {
2424

@@ -28,7 +28,7 @@ class AzureAdClient(
2828
): AzureAdToken? {
2929
val veilederIdent = getNAVIdentFromToken(token)
3030
val cacheKey = "$CACHE_AZUREAD_TOKEN_OBO_KEY_PREFIX$scopeClientId-$veilederIdent"
31-
val cachedOboToken: AzureAdToken? = redisStore.getObject(key = cacheKey)
31+
val cachedOboToken: AzureAdToken? = valkeyStore.getObject(key = cacheKey)
3232
return if (cachedOboToken?.isExpired() == false) {
3333
cachedOboToken
3434
} else {
@@ -45,7 +45,7 @@ class AzureAdClient(
4545
)
4646

4747
azureAdTokenResponse?.toAzureAdToken()?.also { oboToken ->
48-
redisStore.setObject(
48+
valkeyStore.setObject(
4949
key = cacheKey,
5050
value = oboToken,
5151
expireSeconds = azureAdTokenResponse.expires_in,
@@ -58,7 +58,7 @@ class AzureAdClient(
5858
scopeClientId: String,
5959
): AzureAdToken? {
6060
val cacheKey = "${CACHE_AZUREAD_TOKEN_SYSTEM_KEY_PREFIX}$scopeClientId"
61-
val cachedToken = redisStore.getObject<AzureAdToken>(key = cacheKey)
61+
val cachedToken = valkeyStore.getObject<AzureAdToken>(key = cacheKey)
6262
return if (cachedToken?.isExpired() == false) {
6363
COUNT_CALL_AZUREAD_TOKEN_SYSTEM_CACHE_HIT.increment()
6464
cachedToken
@@ -74,7 +74,7 @@ class AzureAdClient(
7474
azureAdTokenResponse?.let { token ->
7575
val azureAdToken = token.toAzureAdToken()
7676
COUNT_CALL_AZUREAD_TOKEN_SYSTEM_CACHE_MISS.increment()
77-
redisStore.setObject(
77+
valkeyStore.setObject(
7878
key = cacheKey,
7979
value = azureAdToken,
8080
expireSeconds = token.expires_in

‎src/main/kotlin/no/nav/syfo/personstatus/infrastructure/clients/ereg/EregClient.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import io.ktor.client.plugins.*
66
import io.ktor.client.request.*
77
import io.ktor.http.*
88
import net.logstash.logback.argument.StructuredArguments
9-
import no.nav.syfo.application.cache.RedisStore
9+
import no.nav.syfo.application.cache.ValkeyStore
1010
import no.nav.syfo.personstatus.infrastructure.clients.ClientEnvironment
1111
import no.nav.syfo.personstatus.infrastructure.clients.httpClientDefault
1212
import no.nav.syfo.personstatus.domain.Virksomhetsnummer
@@ -15,7 +15,7 @@ import org.slf4j.LoggerFactory
1515

1616
class EregClient(
1717
clientEnvironment: ClientEnvironment,
18-
private val redisStore: RedisStore,
18+
private val valkeyStore: ValkeyStore,
1919
private val httpClient: HttpClient = httpClientDefault(),
2020
) {
2121

@@ -26,7 +26,7 @@ class EregClient(
2626
virksomhetsnummer: Virksomhetsnummer,
2727
): EregVirksomhetsnavn? {
2828
val cacheKey = "$CACHE_EREG_VIRKSOMHETSNAVN_KEY_PREFIX${virksomhetsnummer.value}"
29-
val cachedResponse: EregVirksomhetsnavn? = redisStore.getObject(key = cacheKey)
29+
val cachedResponse: EregVirksomhetsnavn? = valkeyStore.getObject(key = cacheKey)
3030

3131
if (cachedResponse != null) {
3232
return cachedResponse
@@ -39,7 +39,7 @@ class EregClient(
3939
}.body<EregOrganisasjonResponse>()
4040
COUNT_CALL_EREG_ORGANISASJON_SUCCESS.increment()
4141
val eregVirksomhetsnavn = response.toEregVirksomhetsnavn()
42-
redisStore.setObject(
42+
valkeyStore.setObject(
4343
key = cacheKey,
4444
value = eregVirksomhetsnavn,
4545
expireSeconds = CACHE_EREG_VIRKSOMHETSNAVN_TIME_TO_LIVE_SECONDS,

‎src/main/kotlin/no/nav/syfo/personstatus/infrastructure/cronjob/CronjobModule.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package no.nav.syfo.personstatus.infrastructure.cronjob
33
import no.nav.syfo.ApplicationState
44
import no.nav.syfo.Environment
55
import no.nav.syfo.launchBackgroundTask
6-
import no.nav.syfo.application.cache.RedisStore
6+
import no.nav.syfo.application.cache.ValkeyStore
77
import no.nav.syfo.personstatus.application.PersonoversiktStatusService
88
import no.nav.syfo.personstatus.infrastructure.database.DatabaseInterface
99
import no.nav.syfo.personstatus.infrastructure.clients.azuread.AzureAdClient
@@ -21,14 +21,14 @@ fun launchCronjobModule(
2121
applicationState: ApplicationState,
2222
database: DatabaseInterface,
2323
environment: Environment,
24-
redisStore: RedisStore,
24+
valkeyStore: ValkeyStore,
2525
azureAdClient: AzureAdClient,
2626
personBehandlendeEnhetService: PersonBehandlendeEnhetService,
2727
personoversiktStatusService: PersonoversiktStatusService,
2828
) {
2929
val eregClient = EregClient(
3030
clientEnvironment = environment.clients.ereg,
31-
redisStore = redisStore,
31+
valkeyStore = valkeyStore,
3232
)
3333
val personOppfolgingstilfelleVirksomhetsnavnService = PersonOppfolgingstilfelleVirksomhetsnavnService(
3434
database = database,

‎src/test/kotlin/no/nav/syfo/cronjob/preloadcache/PreloadCacheCronjobSpek.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ object PreloadCacheCronjobSpek : Spek({
1616
val database = externalMockEnvironment.database
1717
val azureAdClient = AzureAdClient(
1818
azureEnvironment = externalMockEnvironment.environment.azure,
19-
redisStore = externalMockEnvironment.redisStore,
19+
valkeyStore = externalMockEnvironment.valkeyStore,
2020
httpClient = externalMockEnvironment.mockHttpClient
2121
)
2222

‎src/test/kotlin/no/nav/syfo/identhendelse/IdenthendelseServiceSpek.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ object IdenthendelseServiceSpek : Spek({
2525
val pdlClient = PdlClient(
2626
azureAdClient = AzureAdClient(
2727
azureEnvironment = externalMockEnvironment.environment.azure,
28-
redisStore = externalMockEnvironment.redisStore,
28+
valkeyStore = externalMockEnvironment.valkeyStore,
2929
httpClient = externalMockEnvironment.mockHttpClient
3030
),
3131
clientEnvironment = externalMockEnvironment.environment.clients.pdl,

0 commit comments

Comments
 (0)