Endret til å bruke kafka key client fra lib

apps/api-start-stopp-perioder/build.gradle.kts

@@ -25,6 +25,7 @@ dependencies {
     implementation(otel.annotations)
     implementation(project(":lib:kafka"))
     implementation(project(":lib:hoplite-config"))
+    implementation(project(":lib:kafka-key-generator-client"))
     implementation(hoplite.hopliteCore)
     implementation(hoplite.hopliteToml)
     implementation(hoplite.hopliteYaml)

apps/api-start-stopp-perioder/src/main/kotlin/no/nav/paw/arbeidssokerregisteret/RequestHandlerFactory.kt

@@ -8,10 +8,10 @@ import no.nav.paw.arbeidssokerregisteret.application.RequestValidator
 import no.nav.paw.arbeidssokerregisteret.config.Config
 import no.nav.paw.arbeidssokerregisteret.services.AutorisasjonService
 import no.nav.paw.arbeidssokerregisteret.services.PersonInfoService
-import no.nav.paw.arbeidssokerregisteret.services.kafkakeys.kafkaKeysKlient
 import no.nav.paw.arbeidssokerregisteret.utils.azureAdM2MTokenClient
 import no.nav.paw.config.kafka.KafkaFactory
-import no.nav.paw.migrering.app.kafkakeys.KafkaKeysClient
+import no.nav.paw.kafkakeygenerator.client.KafkaKeysClient
+import no.nav.paw.kafkakeygenerator.client.kafkaKeysClient
 import no.nav.paw.pdl.PdlClient
 import no.nav.poao_tilgang.client.PoaoTilgangHttpClient
 import org.apache.kafka.common.serialization.LongSerializer
@@ -59,7 +59,7 @@ private fun clientsFactory(config: Config): Clients {
         config.poaoTilgangClientConfig.url,
         { createMachineToMachineToken(config.poaoTilgangClientConfig.scope) }
     )
-    val kafkaKeysClient = kafkaKeysKlient(config.kafkaKeysConfig) {
+    val kafkaKeysClient = kafkaKeysClient(config.kafkaKeysConfig) {
         createMachineToMachineToken(config.kafkaKeysConfig.scope)
     }
     return Clients(

apps/api-start-stopp-perioder/src/main/kotlin/no/nav/paw/arbeidssokerregisteret/application/OpplysningerRequestHandler.kt

@@ -9,7 +9,7 @@ import no.nav.paw.arbeidssokerregisteret.domain.http.ValidationResultOk
 import no.nav.paw.arbeidssokerregisteret.domain.http.validerOpplysninger
 import no.nav.paw.arbeidssokerregisteret.intern.v1.Hendelse
 import no.nav.paw.config.kafka.sendDeferred
-import no.nav.paw.migrering.app.kafkakeys.KafkaKeysClient
+import no.nav.paw.kafkakeygenerator.client.KafkaKeysClient
 import org.apache.kafka.clients.producer.Producer
 import org.apache.kafka.clients.producer.ProducerRecord
 import org.slf4j.LoggerFactory
@@ -38,6 +38,7 @@ class OpplysningerRequestHandler(
             return Right(validerOpplysninger)
         }
         val (id, key) = kafkaKeysClient.getIdAndKey(identitetsnummer.verdi)
+
         val hendelse = opplysningerHendelse(id, opplysningerRequest)
         val record = ProducerRecord(
             hendelseTopic,

apps/api-start-stopp-perioder/src/main/kotlin/no/nav/paw/arbeidssokerregisteret/application/StartStoppRequestHandler.kt

@@ -7,7 +7,7 @@ import no.nav.paw.arbeidssokerregisteret.RequestScope
 import no.nav.paw.arbeidssokerregisteret.domain.Identitetsnummer
 import no.nav.paw.arbeidssokerregisteret.intern.v1.Hendelse
 import no.nav.paw.config.kafka.sendDeferred
-import no.nav.paw.migrering.app.kafkakeys.KafkaKeysClient
+import no.nav.paw.kafkakeygenerator.client.KafkaKeysClient
 import org.apache.kafka.clients.producer.Producer
 import org.apache.kafka.clients.producer.ProducerRecord
 import org.apache.kafka.clients.producer.internals.BuiltInPartitioner.partitionForKey

apps/api-start-stopp-perioder/src/main/kotlin/no/nav/paw/arbeidssokerregisteret/config/Config.kt

@@ -1,12 +1,14 @@
 package no.nav.paw.arbeidssokerregisteret.config
 
+import no.nav.paw.kafkakeygenerator.client.KafkaKeyConfig
+
 const val CONFIG_FILE_NAME = "application.yaml"
 
 data class Config(
     val authProviders: AuthProviders,
     val pdlClientConfig: ServiceClientConfig,
     val poaoTilgangClientConfig: ServiceClientConfig,
-    val kafkaKeysConfig: KafkaKeysConfig,
+    val kafkaKeysConfig: KafkaKeyConfig,
     val eventLogTopic: String,
     val naisEnv: NaisEnv = currentNaisEnv
 )
@@ -28,8 +30,3 @@ data class ServiceClientConfig(
     val url: String,
     val scope: String
 )
-
-data class KafkaKeysConfig(
-    val url: String,
-    val scope: String
-)

lib/kafka-key-generator-client/src/main/kotlin/no/nav/paw/kafkakeygenerator/client/Factory.kt

@@ -5,7 +5,7 @@ import io.ktor.client.plugins.contentnegotiation.*
 import io.ktor.serialization.jackson.*
 
 
-fun kafkaKeysKlient(konfigurasjon: KafkaKeyConfig, m2mTokenFactory: () -> String): KafkaKeysClient =
+fun kafkaKeysClient(konfigurasjon: KafkaKeyConfig, m2mTokenFactory: () -> String): KafkaKeysClient =
     when (konfigurasjon.url) {
         "MOCK" -> inMemoryKafkaKeysMock()
         else -> kafkaKeysMedHttpClient(konfigurasjon, m2mTokenFactory)

lib/kafka-key-generator-client/src/main/kotlin/no/nav/paw/kafkakeygenerator/client/KafkaKeysClient.kt

@@ -7,6 +7,7 @@ import io.ktor.client.request.post
 import io.ktor.client.request.setBody
 import io.ktor.http.ContentType
 import io.ktor.http.contentType
+import java.lang.IllegalStateException
 
 data class KafkaKeysResponse(
     val id: Long,
@@ -18,15 +19,17 @@ data class KafkaKeysRequest(
 )
 
 interface KafkaKeysClient {
-    suspend fun getIdAndKey(identitetsnummer: String): KafkaKeysResponse?
+    suspend fun getIdAndKeyOrNull(identitetsnummer: String): KafkaKeysResponse?
+    suspend fun getIdAndKey(identitetsnummer: String): KafkaKeysResponse =
+        getIdAndKeyOrNull(identitetsnummer) ?: throw IllegalStateException("Kafka-key-client: Uventet feil mot server: http-status=404")
 }
 
 class StandardKafkaKeysClient(
     private val httpClient: HttpClient,
     private val kafkaKeysUrl: String,
     private val getAccessToken: () -> String
 ) : KafkaKeysClient {
-    override suspend fun getIdAndKey(identitetsnummer: String): KafkaKeysResponse? =
+    override suspend fun getIdAndKeyOrNull(identitetsnummer: String): KafkaKeysResponse? =
         httpClient.post(kafkaKeysUrl) {
             header("Authorization", "Bearer ${getAccessToken()}")
             contentType(ContentType.Application.Json)

lib/kafka-key-generator-client/src/main/kotlin/no/nav/paw/kafkakeygenerator/client/Mock.kt

@@ -12,7 +12,7 @@ fun inMemoryKafkaKeysMock(): KafkaKeysClient {
     val sekvens = AtomicLong(0)
     val map: ConcurrentMap<String, Long> = ConcurrentHashMap()
     return object: KafkaKeysClient {
-        override suspend fun getIdAndKey(identitetsnummer: String): KafkaKeysResponse {
+        override suspend fun getIdAndKeyOrNull(identitetsnummer: String): KafkaKeysResponse {
             val id = map.computeIfAbsent(identitetsnummer) { sekvens.incrementAndGet() }
             return KafkaKeysResponse(id, id % 2)
         }