Rapid

.github/workflows/deploy.yaml

@@ -1,12 +1,12 @@
 name: Build and deploy
-on: [ push, workflow_dispatch ]
+on: [push, workflow_dispatch]
 
 jobs:
   call-build-and-deploy:
     uses: navikt/toi-github-actions-workflows/.github/workflows/build-and-deploy.yaml@v1
     with:
-      java-version: '21'
-      deploy-to-dev-if-branch-name-is: 'eksponer-kanal-frontend'
+      java-version: "21"
+      deploy-to-dev-if-branch-name-is: "rapid"
     permissions:
       contents: read
       id-token: write

build.gradle.kts

@@ -1,14 +1,14 @@
 plugins {
     application
-    kotlin("jvm") version "1.9.21"
+    kotlin("jvm") version "2.2.21"
 }
 
 group = "no.nav"
 version = "1.0-SNAPSHOT"
 
-val mockOAuth2ServerVersion = "2.1.0"
+val mockOAuth2ServerVersion = "2.2.1"
 val fuelVersion = "2.3.1"
-val javalinVersion = "6.1.3"
+val javalinVersion = "6.7.0"
 
 application {
     mainClass.set("no.nav.toi.kandidatvarsel.MainKt")
@@ -22,36 +22,44 @@ repositories {
 
 dependencies {
     implementation("io.javalin:javalin:$javalinVersion")
-    implementation("ch.qos.logback:logback-classic:1.4.12")
-    implementation("net.logstash.logback:logstash-logback-encoder:7.2")
-    implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.14.0")
-    implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.0")
-    implementation("com.auth0:java-jwt:4.4.0")
-    implementation("com.auth0:jwks-rsa:0.22.1")
+    implementation("ch.qos.logback:logback-classic:1.5.18")
+    implementation("net.logstash.logback:logstash-logback-encoder:8.1")
+    implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.19.0")
+    implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.19.0")
+    implementation("com.auth0:java-jwt:4.5.0")
+    implementation("com.auth0:jwks-rsa:0.22.2")
     implementation("no.nav.common:audit-log:3.2023.12.12_13.53-510909d4aa1a")
-    implementation("org.codehaus.janino:janino:3.1.11")
-    implementation("com.fasterxml.uuid:java-uuid-generator:5.0.0")
+    implementation("org.codehaus.janino:janino:3.1.12")
+    implementation("com.fasterxml.uuid:java-uuid-generator:5.1.0")
     implementation("com.github.kittinunf.fuel:fuel:$fuelVersion")
     implementation("com.github.kittinunf.fuel:fuel-jackson:$fuelVersion")
 
-    implementation("org.apache.kafka:kafka-clients:3.7.0")
+    implementation("org.apache.kafka:kafka-clients:4.1.0")
     implementation("no.nav.tms.varsel:kotlin-builder:1.0.0")
 
-    implementation("com.zaxxer:HikariCP:5.1.0")
+    implementation("com.zaxxer:HikariCP:6.3.0")
     implementation("org.springframework:spring-jdbc:6.1.5")
     implementation("org.postgresql:postgresql:42.7.3")
     implementation("org.flywaydb:flyway-core:10.10.0")
     implementation("org.flywaydb:flyway-database-postgresql:10.10.0")
+
+    // Rapids and rivers fra tbd-libs (uten Ktor)
+    val tbdLibsVersion = "2024.11.25-10.59-6f263a10"
+    implementation("com.github.navikt.tbd-libs:rapids-and-rivers:$tbdLibsVersion")
+    implementation("com.github.navikt.tbd-libs:rapids-and-rivers-api:$tbdLibsVersion")
+    implementation("com.github.navikt.tbd-libs:kafka:$tbdLibsVersion")
+    testImplementation("com.github.navikt.tbd-libs:rapids-and-rivers-test:$tbdLibsVersion")
 
     testImplementation(platform("org.junit:junit-bom:5.10.2"))
     testImplementation("org.junit.jupiter:junit-jupiter")
-    testImplementation("uk.org.webcompere:system-stubs-jupiter:2.1.6")
+    testImplementation("uk.org.webcompere:system-stubs-jupiter:2.1.8")
     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
     testImplementation("org.assertj:assertj-core:3.23.1")
     testImplementation("no.nav.security:mock-oauth2-server:$mockOAuth2ServerVersion")
     testImplementation("org.wiremock:wiremock:3.3.1")
     testImplementation("org.skyscreamer:jsonassert:1.5.1")
-    testImplementation("org.testcontainers:postgresql:1.19.7")
+    testImplementation("org.testcontainers:postgresql:1.21.3")
+    testImplementation("io.mockk:mockk:1.14.6")
 }
 
 tasks.test {

nais/dev-gcp.json

@@ -12,5 +12,6 @@
     },
     "dbTier": "db-f1-micro",
     "kafkaPool": "nav-dev",
-    "fssCluster": "dev-fss"
+    "fssCluster": "dev-fss",
+    "kafka_consumer_group_id": "rekrutteringsbistand-kandidatvarsel-api-1"
 }

nais/nais.yaml

@@ -42,6 +42,12 @@ spec:
         - application: rekrutteringsbistand-stilling-api
         - application: rekrutteringsbistand-kandidatsok-api
   env:
+    - name: KAFKA_RAPID_TOPIC
+      value: toi.rapid-1
+    - name: KAFKA_CONSUMER_GROUP_ID
+      value: {{ kafka_consumer_group_id }}
+    - name: KAFKA_RESET_POLICY
+      value: "earliest"
     - name: AD_GROUP_REKBIS_ARBEIDSGIVERRETTET
       value: {{adGroupRekbisArbeidsgiverrettet}}
     - name: AD_GROUP_REKBIS_JOBBSOKERRETTET
@@ -50,6 +56,7 @@ spec:
       value: {{adGroupRekbisUtvikler}}
     - name: KANDIDATSOK_API_URL
       value: http://rekrutteringsbistand-kandidatsok-api
+
     {{#each env }}
     - name: {{ @key }}
       value: {{ this }}

nais/prod-gcp.json

@@ -8,5 +8,6 @@
     "env": {},
     "dbTier": "db-custom-1-3840",
     "kafkaPool": "nav-prod",
-    "fssCluster": "prod-fss"
+    "fssCluster": "prod-fss",
+    "kafka_consumer_group_id": "rekrutteringsbistand-kandidatvarsel-api-1"
 }

src/main/kotlin/no/nav/toi/kandidatvarsel/Javalin.kt

@@ -4,6 +4,7 @@ import auth.obo.KandidatsokApiKlient
 import com.fasterxml.jackson.databind.SerializationFeature
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.github.navikt.tbd_libs.rapids_and_rivers.KafkaRapid
 import com.zaxxer.hikari.HikariDataSource
 import io.javalin.Javalin
 import io.javalin.http.HttpStatus
@@ -18,6 +19,7 @@ fun startJavalin(
     dataSource: HikariDataSource,
     migrateResult: AtomicReference<MigrateResult>,
     kandidatsokApiKlient: KandidatsokApiKlient,
+    kafkaRapid: KafkaRapid,
     port: Int = 8080,
 ): Javalin = Javalin
     .create {
@@ -37,7 +39,7 @@ fun startJavalin(
     }
     .apply {
         azureAdAuthentication(azureAdConfig)
-        handleHealth(dataSource, migrateResult)
+        handleHealth(dataSource, migrateResult, kafkaRapid)
         handleVarsler(dataSource, kandidatsokApiKlient)
         handleMeldingsmal()
 

src/main/kotlin/no/nav/toi/kandidatvarsel/KubernetesHealthApi.kt

@@ -1,5 +1,6 @@
 package no.nav.toi.kandidatvarsel
 
+import com.github.navikt.tbd_libs.rapids_and_rivers.KafkaRapid
 import io.javalin.Javalin
 import io.javalin.http.Handler
 import io.javalin.http.HttpStatus
@@ -8,21 +9,27 @@ import org.flywaydb.core.api.output.MigrateResult
 import java.util.concurrent.atomic.AtomicReference
 import javax.sql.DataSource
 
-fun Javalin.handleHealth(dataSource: DataSource, migrationResult: AtomicReference<MigrateResult>) {
+fun Javalin.handleHealth(
+    dataSource: DataSource,
+    migrationResult: AtomicReference<MigrateResult>,
+    kafkaRapid: KafkaRapid
+) {
     fun checks(checks: Map<String, () -> Boolean>) = Handler { ctx ->
         val checkOutcomes = checks.mapValues { it.value() }
         val httpStatus = if (checkOutcomes.all { it.value }) HttpStatus.OK else HttpStatus.SERVICE_UNAVAILABLE
         ctx.status(httpStatus).json(checkOutcomes)
     }
 
-    val isReadyChecks = mapOf(
-        "database" to { dataSource.isReady() },
-        "migration" to { migrationResult.get()?.success == true }
-    )
+    val isReadyChecks = buildMap {
+        put("database") { dataSource.isReady() }
+        put("migration") { migrationResult.get()?.success == true }
+        put("rapid") { kafkaRapid.isRunning() }
+    }
 
-    val isAliveChecks = mapOf(
-        "migration" to { migrationResult.get()?.success != false }
-    )
+    val isAliveChecks = buildMap {
+        put("migration") { migrationResult.get()?.success != false }
+        put("rapid") { kafkaRapid.isRunning() }
+    }
 
     get("/internal/ready", checks(isReadyChecks), UNPROTECTED)
     get("/internal/alive", checks(isAliveChecks), UNPROTECTED)