Oppdatere til ktor 2.3.x (#127)

* Oppdatere til ktor 2.3.x

- Fjernet ktor-moshi og erstattet med Jackson contentnegotation
-- La på @JsonProperty for å mappe json felt til enum for jackson også.
- Sanity test av at jackson gir samme svar som moshi

* Legg på statusmeldinger om deploy i slack

Author: geiralund

.github/workflows/dp-inntekt-api-deploy.yaml

@@ -45,6 +45,7 @@ jobs:
     needs: [build]
     if: github.ref == 'refs/heads/master'
     runs-on: ubuntu-latest
+    environment: dev-fss
     steps:
       - uses: actions/checkout@v3
       - uses: nais/deploy/actions/deploy@v1
@@ -59,6 +60,7 @@ jobs:
     needs: [deploy-dev]
     if: github.ref == 'refs/heads/master'
     runs-on: ubuntu-latest
+    environment: prod-fss
     steps:
       - uses: actions/checkout@v3
 

buildSrc/src/main/kotlin/Constants.kt

@@ -24,7 +24,7 @@ object Cucumber {
 object Dagpenger {
 
     object Biblioteker {
-        const val version = "2022.12.07-09.10.209e073691b5"
+        const val version = "2023.01.16-10.20.e8450fdff15a"
         const val stsKlient = "com.github.navikt.dp-biblioteker:sts-klient:$version"
         const val ktorUtils = "com.github.navikt.dp-biblioteker:ktor-utils:$version"
 
@@ -44,9 +44,9 @@ object Dagpenger {
         }
     }
 
-    const val Grunnbeløp = "com.github.navikt:dp-grunnbelop:2022.05.20-09.36.a361a7eb490e"
-    const val Streams = "com.github.navikt:dagpenger-streams:2022.11.23-13.03.cdf78b1c92f9"
-    const val Events = "com.github.navikt:dagpenger-events:2022.11.23-12.45.96e145a02427"
+    const val Grunnbeløp = "com.github.navikt:dp-grunnbelop:2023.04.11-15.15.dd33088904de"
+    const val Streams = "com.github.navikt:dagpenger-streams:2023.04.26-10.04.3a1a87ddfe2c"
+    const val Events = "com.github.navikt:dagpenger-events:2023.04.26-10.02.4df92899b455"
 }
 
 object Database {
@@ -69,14 +69,14 @@ object GradleWrapper {
 }
 
 object Jackson {
-    const val version = "2.14.1"
+    const val version = "2.15.0"
     const val core = "com.fasterxml.jackson.core:jackson-core:$version"
     const val kotlin = "com.fasterxml.jackson.module:jackson-module-kotlin:$version"
     const val jsr310 = "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$version"
 }
 
 object Junit5 {
-    const val version = "5.9.1"
+    const val version = "5.9.2"
     const val api = "org.junit.jupiter:junit-jupiter-api:$version"
     const val params = "org.junit.jupiter:junit-jupiter-params:$version"
     const val engine = "org.junit.jupiter:junit-jupiter-engine:$version"
@@ -118,7 +118,7 @@ object Konfig {
 }
 
 object Kotlin {
-    const val version = "1.7.21"
+    const val version = "1.8.10"
     const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib:$version"
 
     object Coroutines {
@@ -133,7 +133,7 @@ object Kotlin {
 }
 
 object KoTest {
-    const val version = "5.5.4"
+    const val version = "5.5.5"
 
     // for kotest framework
     const val runner = "io.kotest:kotest-runner-junit5-jvm:$version"
@@ -153,7 +153,7 @@ object Kotlinx {
 }
 
 object Ktor {
-    const val version = "1.6.6"
+    const val version = "1.6.8"
     const val server = "io.ktor:ktor-server:$version"
     const val serverNetty = "io.ktor:ktor-server-netty:$version"
     const val auth = "io.ktor:ktor-auth:$version"
@@ -165,7 +165,7 @@ object Ktor {
 }
 
 object Ktor2 {
-    const val version = "2.1.3"
+    const val version = "2.3.0"
     object Client {
         fun library(name: String) = "io.ktor:ktor-client-$name:$version"
     }
@@ -175,7 +175,7 @@ object Ktor2 {
 }
 
 object Log4j2 {
-    const val version = "2.19.0"
+    const val version = "2.20.0"
     const val api = "org.apache.logging.log4j:log4j-api:$version"
     const val core = "org.apache.logging.log4j:log4j-core:$version"
     const val slf4j = "org.apache.logging.log4j:log4j-slf4j2-impl:$version"
@@ -194,18 +194,18 @@ object Micrometer {
 }
 
 object Moshi {
-    const val version = "1.9.2"
+    const val version = "1.14.0"
     const val moshi = "com.squareup.moshi:moshi:$version"
     const val moshiKotlin = "com.squareup.moshi:moshi-kotlin:$version"
     const val moshiAdapters = "com.squareup.moshi:moshi-adapters:$version"
 
     // waiting for https://github.com/rharter/ktor-moshi/pull/8
-    const val moshiKtor = "com.github.cs125-illinois:ktor-moshi:2b13e43520"
+    const val moshiKtor = "com.github.cs125-illinois:ktor-moshi:2022.9.0"
     fun library(name: String) = "com.squareup.moshi:moshi-$name:$version"
 }
 
 object Mockk {
-    const val version = "1.13.2"
+    const val version = "1.13.4"
     const val mockk = "io.mockk:mockk:$version"
 }
 
@@ -228,7 +228,7 @@ object Prometheus {
 }
 
 const val RapidAndRivers = "com.github.navikt:rapids-and-rivers:2022.03.25-09.17.0628678a7192"
-const val RapidAndRiversKtor2 = "com.github.navikt:rapids-and-rivers:2022111011111668075098.65e508dcde8b"
+const val RapidAndRiversKtor2 = "com.github.navikt:rapids-and-rivers:2023042611061682500003.f24c0756e00a"
 
 object Slf4j {
     const val version = "1.7.25"
@@ -270,7 +270,7 @@ object Wiremock {
 }
 
 object Graphql {
-    const val version = "6.3.3"
+    const val version = "5.2.0"
     const val graphql = "com.expediagroup.graphql"
     val client = library("client")
     fun library(name: String) = "com.expediagroup:graphql-kotlin-$name:$version"

dp-inntekt-api/build.gradle.kts

@@ -1,10 +1,11 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import com.github.jengelman.gradle.plugins.shadow.transformers.Log4j2PluginsCacheFileTransformer
 
+
 plugins {
     application
     id(Shadow.shadow) version Shadow.version
-    id(Graphql.graphql) version Graphql.version
+    id("com.expediagroup.graphql") version "6.4.0"
     id("de.undercouch.download") version "5.3.0"
 }
 
@@ -25,6 +26,7 @@ application {
 }
 
 val grpcVersion = "1.38.1"
+val expediaGraphqlVersion = "6.4.0"
 
 dependencies {
     implementation(project(":dp-inntekt-grpc"))
@@ -39,24 +41,28 @@ dependencies {
     implementation(Ktor2.Server.library("call-logging"))
     implementation(Ktor2.Server.library("default-headers"))
     implementation(Ktor2.Server.library("content-negotiation"))
-    implementation(Ktor2.Server.library("metrics-micrometer"))
+    implementation("io.ktor:ktor-serialization-jackson:${Ktor2.version}")
     implementation(Ktor2.Server.library("metrics-micrometer"))
 
     implementation(Micrometer.prometheusRegistry)
 
-    implementation(Graphql.client)
-    implementation(Graphql.library("ktor-client"))
-    implementation(Graphql.library("client-jackson"))
+    implementation("com.expediagroup:graphql-kotlin-client:$expediaGraphqlVersion")
+    implementation("com.expediagroup:graphql-kotlin-ktor-client:$expediaGraphqlVersion")
+    implementation("com.expediagroup:graphql-kotlin-client-jackson:$expediaGraphqlVersion")
+
     implementation(Ktor2.Client.library("logging-jvm"))
     implementation(Ktor2.Client.library("apache"))
 
+    implementation(Jackson.core)
+    implementation(Jackson.kotlin)
+    implementation(Jackson.jsr310)
+
     // unleash
-    implementation("no.finn.unleash:unleash-client-java:3.3.1")
+    implementation("io.getunleash:unleash-client-java:8.0.0")
 
     implementation(Moshi.moshi)
     implementation(Moshi.moshiAdapters)
     implementation(Moshi.moshiKotlin)
-    implementation("com.github.cs125-illinois:ktor-moshi:2b13e43520")
 
     implementation(Dagpenger.Streams)
     implementation(Kafka.clients)
@@ -82,6 +88,7 @@ dependencies {
     implementation(Database.Postgres)
     implementation(Database.Kotlinquery)
     implementation(Konfig.konfig)
+    implementation("org.slf4j:slf4j-api:2.0.7")
     implementation(Database.VaultJdbc) {
         exclude(module = "slf4j-simple")
         exclude(module = "slf4j-api")
@@ -110,6 +117,7 @@ dependencies {
     testImplementation(Junit5.params)
     testRuntimeOnly(Junit5.engine)
     testImplementation(Wiremock.standalone)
+    testImplementation(KoTest.library("assertions-json"))
     testImplementation(KoTest.assertions)
     testImplementation(KoTest.runner)
     testImplementation(KoTest.property)

dp-inntekt-api/src/main/kotlin/no/nav/dagpenger/inntekt/InntektApi.kt

@@ -1,19 +1,21 @@
 package no.nav.dagpenger.inntekt
 
 import com.natpryce.konfig.Configuration
-import com.ryanharter.ktor.moshi.moshi
 import com.squareup.moshi.JsonDataException
 import com.squareup.moshi.JsonEncodingException
 import de.huxhorn.sulky.ulid.ULID
+import io.ktor.http.ContentType
 import io.ktor.http.HttpHeaders
 import io.ktor.http.HttpStatusCode
 import io.ktor.http.isSuccess
+import io.ktor.serialization.jackson.JacksonConverter
 import io.ktor.server.application.Application
 import io.ktor.server.application.install
 import io.ktor.server.auth.Authentication
 import io.ktor.server.auth.authenticate
 import io.ktor.server.auth.jwt.jwt
 import io.ktor.server.metrics.micrometer.MicrometerMetrics
+import io.ktor.server.plugins.BadRequestException
 import io.ktor.server.plugins.callid.CallId
 import io.ktor.server.plugins.callid.callIdMdc
 import io.ktor.server.plugins.callloging.CallLogging
@@ -39,6 +41,7 @@ import no.nav.dagpenger.inntekt.inntektskomponenten.v1.InntektskomponentenHttpCl
 import no.nav.dagpenger.inntekt.oppslag.PersonNotFoundException
 import no.nav.dagpenger.inntekt.oppslag.PersonOppslag
 import no.nav.dagpenger.inntekt.oppslag.enhetsregister.EnhetsregisterClient
+import no.nav.dagpenger.inntekt.serder.jacksonObjectMapper
 import no.nav.dagpenger.inntekt.v1.enhetsregisteret
 import no.nav.dagpenger.inntekt.v1.inntekt
 import no.nav.dagpenger.inntekt.v1.opptjeningsperiodeApi
@@ -153,6 +156,15 @@ internal fun Application.inntektApi(
             )
             call.respond(HttpStatusCode.BadRequest, error)
         }
+        exception<BadRequestException> { call, cause ->
+            LOGGER.warn("Request does not match expected json", cause)
+            val error = Problem(
+                type = URI("urn:dp:error:inntekt:parameter"),
+                title = "Parameteret er ikke gyldig, mangler obligatorisk felt: '${cause.message}'",
+                status = 400,
+            )
+            call.respond(HttpStatusCode.BadRequest, error)
+        }
         exception<IllegalArgumentException> { call, cause ->
             LOGGER.warn("Request does not match expected json", cause)
             val error = Problem(
@@ -205,7 +217,7 @@ internal fun Application.inntektApi(
     }
 
     install(ContentNegotiation) {
-        moshi(moshiInstance)
+        register(ContentType.Application.Json, JacksonConverter(jacksonObjectMapper))
     }
 
     routing {

dp-inntekt-api/src/main/kotlin/no/nav/dagpenger/inntekt/InntektApiConfig.kt

@@ -8,7 +8,7 @@ import com.natpryce.konfig.Key
 import com.natpryce.konfig.intType
 import com.natpryce.konfig.overriding
 import com.natpryce.konfig.stringType
-import no.finn.unleash.util.UnleashConfig
+import io.getunleash.util.UnleashConfig
 import no.nav.dagpenger.streams.Credential
 import no.nav.dagpenger.streams.KafkaAivenCredentials
 import java.net.InetAddress