Merge pull request #39 from navikt/tms-dependency-admin_4591a10

Dependencies - manuelle endringer kreves

Author: chris-santa

buildSrc/src/main/kotlin/default/dependencies.kt

@@ -109,7 +109,7 @@ interface KotliQueryDefaults: DependencyGroup {
 }
 
 object KtorDefaults {
-    val version get() = "2.3.12"
+    val version get() = "3.0.1"
     val groupId get() = "io.ktor"
 
     interface ServerDefaults: DependencyGroup {
@@ -183,14 +183,11 @@ interface PostgresqlDefaults: DependencyGroup {
 }
 
 interface PrometheusDefaults: DependencyGroup {
-    override val version get() = "0.16.0"
+    override val version get() = "1.3.4"
     override val groupId get() = "io.prometheus"
 
-    val common get() = dependency("simpleclient_common")
-    val hotspot get() = dependency("simpleclient_hotspot")
-    val httpServer get() = dependency("simpleclient_httpserver")
-    val logback get() = dependency("simpleclient_logback")
-    val simpleClient get() = dependency("simpleclient")
+    val metricsCore get() = dependency("prometheus-metrics-core")
+    val exporterCommon get() = dependency("prometheus-metrics-exporter-common")
 }
 
 interface ShadowDefaults: DependencyGroup {
@@ -210,7 +207,7 @@ interface TestContainersDefaults: DependencyGroup {
 
 interface TmsCommonLibDefaults: DependencyGroup {
     override val groupId get() = "no.nav.tms.common"
-    override val version get() = "4.0.2"
+    override val version get() = "5.0.1"
 
     val metrics get() = dependency("metrics")
     val observability get() = dependency("observability")
@@ -221,14 +218,14 @@ interface TmsCommonLibDefaults: DependencyGroup {
 
 interface TmsKafkaToolsDefaults: DependencyGroup {
     override val groupId get() = "no.nav.tms.kafka"
-    override val version get() = "1.6.0"
+    override val version get() = "2.0.0"
 
     val kafkaApplication get() = dependency("kafka-application")
 }
 
 interface TmsKtorTokenSupportDefaults: DependencyGroup {
     override val groupId get() = "no.nav.tms.token.support"
-    override val version get() = "4.1.2"
+    override val version get() = "5.0.1"
 
     val azureExchange get() = dependency("azure-exchange")
     val azureValidation get() = dependency("azure-validation")

src/main/kotlin/no/nav/tms/event/api/App.kt

@@ -41,20 +41,20 @@ fun main() {
 
     embeddedServer(
         factory = Netty,
-        environment =
-            applicationEngineEnvironment {
-                rootPath = "tms-event-api"
-                module {
-                    api(
-                        authConfig = authConfigBuilder(),
-                        httpClient = httpClient,
-                        varselReader = varselReader,
-                    )
-                }
-                connector {
-                    port = 8080
-                }
-            },
+        configure = {
+            connector {
+                port = 8080
+            }
+        },
+        module = {
+            rootPath = "tms-event-api"
+
+            api(
+                authConfig = authConfigBuilder(),
+                httpClient = httpClient,
+                varselReader = varselReader,
+            )
+        },
     ).start(wait = true)
 }
 

src/main/kotlin/no/nav/tms/event/api/config/requestValidation.kt

@@ -1,9 +1,8 @@
 package no.nav.tms.event.api.config
 
-import io.ktor.server.application.*
-import io.ktor.util.pipeline.*
+import io.ktor.server.routing.*
 
-inline fun PipelineContext<Unit, ApplicationCall>.doIfValidRequest(handler: (fnr: String) -> Unit) {
+inline fun RoutingContext.doIfValidRequest(handler: (fnr: String) -> Unit) {
     val headerName = "fodselsnummer"
     val fnrHeader = call.request.headers[headerName]
     when {