Merge remote-tracking branch 'origin/main' into merge_repos

# Conflicts: # gradle/libs.versions.toml
navikt · Sep 10, 2024 · 601f1ed · 601f1ed
2 parents 532397f + 84046bf
commit 601f1ed
Show file tree

Hide file tree

Showing 12 changed files with 34 additions and 161 deletions.
diff --git a/.deploy/topic-prod.yaml b/.deploy/topic-prod.yaml
@@ -13,7 +13,7 @@ spec:
     partitions: 1
     replication: 3  # see min/max requirements
     retentionBytes: -1  # -1 means unlimited
-    retentionHours: 168  # -1 means unlimited
+    retentionHours: 336  # 2 uker
   acl:
     - team: etterlatte
       application: dodsfall-fra-leesah

diff --git a/.deploy/topic.yaml b/.deploy/topic.yaml
@@ -13,7 +13,7 @@ spec:
     partitions: 1
     replication: 3  # see min/max requirements
     retentionBytes: -1  # -1 means unlimited
-    retentionHours: 168  # -1 means unlimited
+    retentionHours: 336  # 2 uker
   acl:
     - team: etterlatte
       application: dodsfall-fra-leesah

diff --git a/README.md b/README.md
@@ -6,6 +6,9 @@ Monorepo med apper som er felles for Team Etterlatte
 Legg inn appen i `.deploy/topic.yaml` for dev, `.deploy/topic-prod.yaml` for prod. Etter at det er lagt inn
 kan du oppdatere topicet ved å kjøre 
 
+## For å oppdatere endringer i topic yamler kjør dette:
+### Obs: Må stå samme path som filen(e)
+https://docs.nais.io/persistence/kafka/how-to/create/?h=kafka+topic#apply-the-topic-resource
 ```
 kubectl apply -f .deploy/topic.yaml
 ```

diff --git a/apps/etterlatte-notifikasjoner/build.gradle.kts b/apps/etterlatte-notifikasjoner/build.gradle.kts
@@ -3,7 +3,6 @@ plugins {
 }
 
 dependencies {
-    implementation(libs.ktor.jackson)
     implementation(libs.rapidAndRivers)
 
     implementation(libs.brukernotifikasjonSchemas) {
@@ -13,7 +12,6 @@ dependencies {
     implementation(libs.kafka.avro.serializer) {
         exclude(group = "org.slf4j", module = "slf4j-log4j12")
     }
-    implementation(libs.kafka.clients)
 
     testImplementation(libs.mockk)
 }
diff --git a/apps/etterlatte-proxy/build.gradle.kts b/apps/etterlatte-proxy/build.gradle.kts
@@ -10,19 +10,14 @@ repositories {
 
 dependencies {
     implementation(libs.ktor.serverAuth)
-    implementation(libs.ktor.clientCore)
     implementation(libs.ktor.callLogging)
     implementation(libs.ktor.clientApache)
-    implementation(libs.ktor.clientAuth)
     implementation(libs.ktor.clientLogging)
     implementation(libs.ktor.jackson)
     implementation(libs.ktor.serverContentNegotiation)
     implementation(libs.ktor.clientContentNegotiation)
-    implementation(libs.ktor.serverCore)
     implementation(libs.ktor.serverNetty)
     implementation(libs.ktor.serverAuthJwt)
-    implementation(libs.ktor.okHttp)
-    implementation(libs.navFellesTokenClientCore)
     implementation(libs.tjenestespesifikasjonerTilbakekreving)
     implementation(libs.tjenestespesifikasjonerOppdragSimulering)
     implementation(libs.cxf.logging)
@@ -36,7 +31,6 @@ dependencies {
         exclude("org.eclipse.angus:angus-mail")
     }
     implementation(libs.micrometer.prometheus)
-    implementation(libs.jacksonDatatypejsr310)
 
     testImplementation(libs.mockOauth2Server)
     testImplementation(libs.ktor.serverTests)

diff --git a/apps/etterlatte-proxy/src/main/kotlin/auth/ClientCredentialAuthProvider.kt b/apps/etterlatte-proxy/src/main/kotlin/auth/ClientCredentialAuthProvider.kt
diff --git a/apps/etterlatte-proxy/src/main/kotlin/auth/DefaultOAuth2HttpClient.kt b/apps/etterlatte-proxy/src/main/kotlin/auth/DefaultOAuth2HttpClient.kt
diff --git a/apps/etterlatte-proxy/src/main/kotlin/routes/InternalRoute.kt b/apps/etterlatte-proxy/src/main/kotlin/routes/InternalRoute.kt
@@ -1,31 +1,37 @@
 package no.nav.etterlatte.routes
 
-import io.ktor.http.ContentType
+import io.ktor.http.HttpStatusCode
 import io.ktor.server.application.call
-import io.ktor.server.response.respondText
-import io.ktor.server.response.respondTextWriter
+import io.ktor.server.response.respond
 import io.ktor.server.routing.Route
 import io.ktor.server.routing.get
 import io.ktor.server.routing.route
-import io.prometheus.client.CollectorRegistry
-import io.prometheus.client.exporter.common.TextFormat
+import io.micrometer.core.instrument.Clock
+import io.micrometer.prometheusmetrics.PrometheusConfig
+import io.micrometer.prometheusmetrics.PrometheusMeterRegistry
+import io.prometheus.metrics.model.registry.PrometheusRegistry
+
+object Metrikker {
+    private val collectorRegistry = PrometheusRegistry.defaultRegistry
+
+    val registry =
+        PrometheusMeterRegistry(
+            PrometheusConfig.DEFAULT,
+            collectorRegistry,
+            Clock.SYSTEM,
+        )
+}
 
 fun Route.internalRoute() {
     route("/internal") {
         get("/is_alive") {
-            call.respondText { "Alive" }
+            call.respond(HttpStatusCode.OK)
         }
         get("/is_ready") {
-            call.respondText { "Ready" }
+            call.respond(HttpStatusCode.OK)
         }
         get("/metrics") {
-            val names =
-                call.request.queryParameters
-                    .getAll("name[]")
-                    ?.toSet() ?: emptySet()
-            call.respondTextWriter(ContentType.parse(TextFormat.CONTENT_TYPE_004)) {
-                TextFormat.write004(this, CollectorRegistry.defaultRegistry.filteredMetricFamilySamples(names))
-            }
+            call.respond(Metrikker.registry)
         }
     }
 }
diff --git a/apps/etterlatte-proxy/src/main/kotlin/routes/TilbakekrevingRoute.kt b/apps/etterlatte-proxy/src/main/kotlin/routes/TilbakekrevingRoute.kt
@@ -5,10 +5,8 @@ import io.ktor.server.application.call
 import io.ktor.server.application.log
 import io.ktor.server.request.receive
 import io.ktor.server.response.respond
-import io.ktor.server.response.respondText
 import io.ktor.server.routing.Route
 import io.ktor.server.routing.application
-import io.ktor.server.routing.get
 import io.ktor.server.routing.post
 import no.nav.okonomi.tilbakekrevingservice.KravgrunnlagHentDetaljRequest
 import no.nav.okonomi.tilbakekrevingservice.TilbakekrevingPortType

diff --git a/apps/etterlatte-proxy/src/test/kotlin/ApplicationTest.kt b/apps/etterlatte-proxy/src/test/kotlin/ApplicationTest.kt
@@ -48,7 +48,6 @@ internal class ApplicationTest {
 
             client.get("internal/is_alive").also {
                 assertEquals(HttpStatusCode.OK, it.status)
-                assertEquals("Alive", it.body<String>())
             }
         }
     }

diff --git a/buildSrc/src/main/kotlin/etterlatte.common.gradle.kts b/buildSrc/src/main/kotlin/etterlatte.common.gradle.kts
@@ -12,6 +12,13 @@ repositories {
     mavenCentral()
     maven("https://packages.confluent.io/maven/")
     maven("https://jitpack.io")
+    maven {
+        url = uri("https://maven.pkg.github.com/navikt/rapids-and-rivers")
+        credentials {
+            username = "token"
+            password = System.getenv("GITHUB_TOKEN")
+        }
+    }
 }
 
 dependencies {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -3,7 +3,6 @@ cutterslade-analyze = { id = "ca.cutterslade.analyze", version = "1.10.0" }
 
 
 [versions]
-navfelles-token-version = "5.0.5"
 ktor-version = "2.3.12"
 jupiter-version = "5.11.0"
 cxf-version = "4.0.5" # Obs: Når vi oppgraderer denne, bør vi også kunne rydde bort guava og guava-workarounden
@@ -14,27 +13,22 @@ jackson-version = "2.17.2"
 [libraries]
 
 #NavFelles
-rapidAndRivers = { module = "com.github.navikt:rapids-and-rivers", version = "2024010209171704183456.6d035b91ffb4" }
+rapidAndRivers = { module = "com.github.navikt:rapids-and-rivers", version = "2024082313161724411773.1db923f4402d" }
 brukernotifikasjonSchemas = { module = "com.github.navikt:brukernotifikasjon-schemas", version = "2.5.2"}
 mockOauth2Server = { module = "no.nav.security:mock-oauth2-server", version = "2.1.9"}
-navFellesTokenClientCore = { module = "no.nav.security:token-client-core", version.ref = "navfelles-token-version"}
 tjenestespesifikasjonerTilbakekreving = { module = "com.github.navikt.pensjon-etterlatte-tjenestespesifikasjoner:tilbakekreving-v1-tjenestespesifikasjon", version = "1.d27898d"}
 tjenestespesifikasjonerOppdragSimulering = { module = "com.github.navikt.pensjon-etterlatte-tjenestespesifikasjoner:nav-system-os-simuler-fp-service-tjenestespesifikasjon", version = "1.d27898d"}
 
 #Ktor
 ktor-callLogging = { module = "io.ktor:ktor-server-call-logging", version.ref = "ktor-version"}
-ktor-clientCore = { module = "io.ktor:ktor-client-core", version.ref = "ktor-version"}
 ktor-clientApache = { module = "io.ktor:ktor-client-apache", version.ref = "ktor-version"}
-ktor-clientAuth = { module = "io.ktor:ktor-client-auth", version.ref = "ktor-version"}
 ktor-clientContentNegotiation = { module = "io.ktor:ktor-client-content-negotiation", version.ref = "ktor-version"}
 ktor-clientLogging = { module = "io.ktor:ktor-client-logging", version.ref = "ktor-version" }
 ktor-jackson = { module = "io.ktor:ktor-serialization-jackson", version.ref = "ktor-version" }
 ktor-serverAuth = { module = "io.ktor:ktor-server-auth", version.ref = "ktor-version" }
 ktor-serverAuthJwt = { module = "io.ktor:ktor-server-auth-jwt", version.ref = "ktor-version" }
-ktor-serverCore = { module = "io.ktor:ktor-server-core", version.ref = "ktor-version" }
 ktor-serverContentNegotiation = { module = "io.ktor:ktor-server-content-negotiation", version.ref = "ktor-version" }
 ktor-serverNetty = { module = "io.ktor:ktor-server-netty", version.ref = "ktor-version" }
-ktor-okHttp = { module = "io.ktor:ktor-client-okhttp", version.ref = "ktor-version" }
 ktor-serverTests = { module = "io.ktor:ktor-server-tests", version.ref = "ktor-version" }
 
 #Jackson
@@ -43,7 +37,6 @@ jackson-datatypejdk8 = { module = "com.fasterxml.jackson.datatype:jackson-dataty
 jackson-modulekotlin = { module = "com.fasterxml.jackson.module:jackson-module-kotlin", version.ref = "jackson-version" }
 
 #Kafka
-kafka-clients = { module = "org.apache.kafka:kafka-clients", version = "3.8.0"}
 kafka-avro-serializer = { module = "io.confluent:kafka-avro-serializer", version = "7.6.0"}
 commons-compress = { module = "org.apache.commons:commons-compress", version = "1.27.1" }
 
@@ -58,7 +51,7 @@ logging-logbackClassic = { module = "ch.qos.logback:logback-classic", version =
 logging-logstashLogbackEncoder = { module = "net.logstash.logback:logstash-logback-encoder", version = "8.0"}
 
 #Micrometer
-micrometer-prometheus = { module = "io.micrometer:micrometer-registry-prometheus", version = "1.12.5"}
+micrometer-prometheus = { module = "io.micrometer:micrometer-registry-prometheus", version = "1.13.3"}
 
 #MockK
 mockk = { module = "io.mockk:mockk", version = "1.13.12" }