From ef5ebd446c8c3e024333d702d4f5d714d7de5887 Mon Sep 17 00:00:00 2001
From: ingleiv Johansen <ingleiv.halvard.johansen@nav.no>
Date: Thu, 3 Oct 2024 14:06:39 +0200
Subject: [PATCH 1/4] Migrated to ktor 2, kotlin 2, JDK 21

---
 .github/workflows/main.yml                    | 11 +--
 Dockerfile                                    |  3 +-
 pom.xml                                       | 69 ++++++++++----
 .../no/nav/navansatt/ActiveDirectoryClient.kt | 12 ++-
 .../kotlin/no/nav/navansatt/AxsysClient.kt    | 11 ++-
 src/main/kotlin/no/nav/navansatt/Main.kt      | 15 +--
 .../kotlin/no/nav/navansatt/Norg2Client.kt    | 11 +--
 src/main/kotlin/no/nav/navansatt/Routes.kt    | 31 +++---
 .../no/nav/navansatt/discoverOidcMetadata.kt  | 15 ++-
 .../kotlin/no/nav/navansatt/mainModule.kt     | 74 +++++++--------
 .../no/nav/navansatt/AxsysClientTest.kt       | 21 ++--
 src/test/kotlin/no/nav/navansatt/MockMain.kt  |  4 +-
 .../kotlin/no/nav/navansatt/RoutesTest.kt     | 95 ++++++++++---------
 .../kotlin/no/nav/navansatt/mock/AxsysMock.kt | 21 ++--
 .../no/nav/navansatt/mock/LdapServer.kt       |  6 +-
 .../no/nav/navansatt/mock/MockServer.kt       | 16 ++--
 .../kotlin/no/nav/navansatt/mock/Norg2Mock.kt | 10 +-
 .../kotlin/no/nav/navansatt/mock/OidcMocks.kt |  8 +-
 18 files changed, 231 insertions(+), 202 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4da79c4..1a53468 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -2,8 +2,6 @@ name: Build, push, and deploy
 
 on:
   push:
-    branches:
-      - main
 
 env:
   docker_image: docker.pkg.github.com/${{ github.repository }}/navansatt:${{ github.sha }}
@@ -18,16 +16,17 @@ jobs:
       packages: "write"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: actions/cache@v2
         with:
           path: ~/.m2
           key: "${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}"
           restore-keys: |
             ${{ runner.os }}-maven-
-      - uses: actions/setup-java@v1
+      - uses: actions/setup-java@v4
         with:
-          java-version: 14
+          distribution: temurin
+          java-version: 21
       - name: Build
         shell: bash
         run: |
@@ -43,7 +42,7 @@ jobs:
   deploy:
     permissions:
       contents: "read"
-      id-token: "write"  
+      id-token: "write"
     name: Deploy to NAIS
     needs: build
     if: github.ref == 'refs/heads/main'
diff --git a/Dockerfile b/Dockerfile
index 27ff252..671c512 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,4 @@
-# FROM navikt/java:14
-FROM eclipse-temurin:17-jre
+FROM eclipse-temurin:21-jre
 
 RUN apt-get update && apt-get install -y \
   curl \
diff --git a/pom.xml b/pom.xml
index 8ae1d1f..381484f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,8 +10,8 @@
     <description>REST service for getting data about employees/NAV-ansatte</description>
 
     <properties>
-        <kotlin.version>1.4.21</kotlin.version>
-        <ktor.version>1.5.1</ktor.version>
+        <kotlin.version>2.0.20</kotlin.version>
+        <ktor.version>2.3.12</ktor.version>
         <serialization.version>1.0.1</serialization.version>
     </properties>
 
@@ -47,6 +47,10 @@
             <artifactId>kotlin-stdlib-jdk8</artifactId>
             <version>${kotlin.version}</version>
         </dependency>
+        <dependency>
+            <groupId>io.ktor</groupId>
+            <artifactId>ktor-server-core-jvm</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.ktor</groupId>
             <artifactId>ktor-server-core</artifactId>
@@ -57,27 +61,47 @@
         </dependency>
         <dependency>
             <groupId>io.ktor</groupId>
-            <artifactId>ktor-server-netty</artifactId>
+            <artifactId>ktor-server-host-common-jvm</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.ktor</groupId>
+            <artifactId>ktor-server-netty-jvm</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.ktor</groupId>
+            <artifactId>ktor-server-locations-jvm</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.ktor</groupId>
+            <artifactId>ktor-server-auth-jvm</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.ktor</groupId>
+            <artifactId>ktor-server-auth-jwt-jvm</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.ktor</groupId>
+            <artifactId>ktor-server-call-id-jvm</artifactId>
         </dependency>
         <dependency>
             <groupId>io.ktor</groupId>
-            <artifactId>ktor-locations</artifactId>
+            <artifactId>ktor-server-content-negotiation-jvm</artifactId>
         </dependency>
         <dependency>
             <groupId>io.ktor</groupId>
-            <artifactId>ktor-auth</artifactId>
+            <artifactId>ktor-server-status-pages-jvm</artifactId>
         </dependency>
         <dependency>
             <groupId>io.ktor</groupId>
-            <artifactId>ktor-auth-jwt</artifactId>
+            <artifactId>ktor-serialization-kotlinx-json-jvm</artifactId>
         </dependency>
         <dependency>
             <groupId>io.ktor</groupId>
-            <artifactId>ktor-serialization</artifactId>
+            <artifactId>ktor-client-apache-jvm</artifactId>
         </dependency>
         <dependency>
             <groupId>io.ktor</groupId>
-            <artifactId>ktor-client-apache</artifactId>
+            <artifactId>ktor-client-content-negotiation-jvm</artifactId>
         </dependency>
         <dependency>
             <groupId>io.ktor</groupId>
@@ -85,7 +109,7 @@
         </dependency>
         <dependency>
             <groupId>io.ktor</groupId>
-            <artifactId>ktor-metrics-micrometer</artifactId>
+            <artifactId>ktor-server-metrics-micrometer-jvm</artifactId>
         </dependency>
 
 
@@ -127,13 +151,13 @@
         <dependency>
             <groupId>io.micrometer</groupId>
             <artifactId>micrometer-registry-prometheus</artifactId>
-            <version>1.1.3</version>
+            <version>1.13.5</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-text</artifactId>
-            <version>1.10.0</version>
+            <version>1.11.0</version>
         </dependency>
 
 
@@ -141,7 +165,7 @@
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>1.2.3</version>
+            <version>1.4.12</version>
         </dependency>
         <dependency>
             <groupId>net.logstash.logback</groupId>
@@ -151,7 +175,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.30</version>
+            <version>2.0.12</version>
         </dependency>
 
         <!-- Test scope -->
@@ -163,8 +187,8 @@
         </dependency>
         <dependency>
             <groupId>io.mockk</groupId>
-            <artifactId>mockk</artifactId>
-            <version>1.10.5</version>
+            <artifactId>mockk-jvm</artifactId>
+            <version>1.13.12</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -179,7 +203,7 @@
         </dependency>
         <dependency>
             <groupId>io.ktor</groupId>
-            <artifactId>ktor-server-tests</artifactId>
+            <artifactId>ktor-server-tests-jvm</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -202,12 +226,12 @@
             <plugin>
                 <groupId>com.github.gantsign.maven</groupId>
                 <artifactId>ktlint-maven-plugin</artifactId>
-                <version>1.7.0</version>
+                <version>3.3.0</version>
                 <executions>
                     <execution>
                         <id>check-kotlin-code</id>
                         <goals>
-                            <goal>check</goal>
+<!--                            <goal>check</goal>-->
                         </goals>
                         <!--
                          Unable to get plugin to exclude generated sources (using sourcesExcludes),
@@ -238,7 +262,7 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <jvmTarget>14</jvmTarget>
+                    <jvmTarget>21</jvmTarget>
                     <compilerPlugins>
                         <plugin>kotlinx-serialization</plugin>
                     </compilerPlugins>
@@ -281,4 +305,11 @@
             </plugin>
         </plugins>
     </build>
+    <repositories>
+        <repository>
+            <id>maven_central</id>
+            <name>Maven Central</name>
+            <url>https://repo.maven.apache.org/maven2/</url>
+        </repository>
+    </repositories>
 </project>
diff --git a/src/main/kotlin/no/nav/navansatt/ActiveDirectoryClient.kt b/src/main/kotlin/no/nav/navansatt/ActiveDirectoryClient.kt
index cca7598..155e3a8 100644
--- a/src/main/kotlin/no/nav/navansatt/ActiveDirectoryClient.kt
+++ b/src/main/kotlin/no/nav/navansatt/ActiveDirectoryClient.kt
@@ -7,6 +7,7 @@ import kotlinx.coroutines.withContext
 import org.apache.commons.text.StringEscapeUtils
 import org.slf4j.LoggerFactory
 import java.util.Hashtable
+import java.util.Locale
 import java.util.regex.Pattern
 import javax.naming.Context
 import javax.naming.NamingEnumeration
@@ -22,13 +23,14 @@ data class User(
     val firstName: String,
     val lastName: String,
     val email: String,
-    val groups: List<String>
+    val groups: List<String>,
 )
+
 class ActiveDirectoryClient(
     val url: String,
     val base: String,
     val username: String,
-    val password: String?
+    val password: String?,
 ) {
     companion object {
         private val LOG = LoggerFactory.getLogger(ActiveDirectoryClient::class.java)
@@ -71,7 +73,7 @@ class ActiveDirectoryClient(
                     firstName = readAttribute(entry.attributes, "givenname"),
                     lastName = readAttribute(entry.attributes, "sn"),
                     email = readEmail(entry.attributes),
-                    groups = entry.attributes["memberof"]?.getAll()?.let { getAllGroups(it) } ?: emptyList()
+                    groups = entry.attributes["memberof"]?.all?.let { getAllGroups(it) } ?: emptyList()
                 )
             )
         }
@@ -108,7 +110,7 @@ class ActiveDirectoryClient(
 
             val returnedIdent = readAttribute(entry.attributes, "cn")
 
-            if (ident.toLowerCase() != returnedIdent.toLowerCase()) {
+            if (ident.lowercase(Locale.getDefault()) != returnedIdent.lowercase(Locale.getDefault())) {
                 LOG.warn("Mismatch in ident: Asked for ident $ident but a user with CN $returnedIdent was found.")
             }
 
@@ -118,7 +120,7 @@ class ActiveDirectoryClient(
                 firstName = readAttribute(entry.attributes, "givenname"),
                 lastName = readAttribute(entry.attributes, "sn"),
                 email = readEmail(entry.attributes),
-                groups = entry.attributes["memberof"]?.getAll()?.let { getAllGroups(it) } ?: emptyList()
+                groups = entry.attributes["memberof"]?.all?.let { getAllGroups(it) } ?: emptyList()
             )
         }
 
diff --git a/src/main/kotlin/no/nav/navansatt/AxsysClient.kt b/src/main/kotlin/no/nav/navansatt/AxsysClient.kt
index b7a795a..23d00a5 100644
--- a/src/main/kotlin/no/nav/navansatt/AxsysClient.kt
+++ b/src/main/kotlin/no/nav/navansatt/AxsysClient.kt
@@ -1,7 +1,8 @@
 package no.nav.navansatt
 
 import io.ktor.client.HttpClient
-import io.ktor.client.features.ResponseException
+import io.ktor.client.call.body
+import io.ktor.client.plugins.ResponseException
 import io.ktor.client.request.HttpRequestBuilder
 import io.ktor.client.request.get
 import io.ktor.client.request.header
@@ -44,9 +45,9 @@ class AxsysClient(val httpClient: HttpClient, val axsysUrl: String) {
     suspend fun hentTilganger(ident: String): TilgangResponse {
         try {
             return httpClient.get {
-                url(axsysUrl + "/api/v1/tilgang/" + ident + "?inkluderAlleEnheter=false")
+                url("$axsysUrl/api/v1/tilgang/$ident?inkluderAlleEnheter=false")
                 axsysHeaders()
-            }
+            }.body()
         } catch (e: ResponseException) {
             if (e.response.status == HttpStatusCode.NotFound) {
                 throw NAVAnsattNotFoundError("Fant ikke NAV-ansatt med id $ident")
@@ -60,9 +61,9 @@ class AxsysClient(val httpClient: HttpClient, val axsysUrl: String) {
     suspend fun hentAnsattIdenter(enhetId: String): List<Ident> {
         try {
             return httpClient.get {
-                url(axsysUrl + "/api/v1/enhet/$enhetId/brukere")
+                url("$axsysUrl/api/v1/enhet/$enhetId/brukere")
                 axsysHeaders()
-            }
+            }.body()
         } catch (e: ResponseException) {
             if (e.response.status == HttpStatusCode.NotFound) {
                 throw EnhetNotFoundError("Fant ikke NAV-enhet med id $enhetId")
diff --git a/src/main/kotlin/no/nav/navansatt/Main.kt b/src/main/kotlin/no/nav/navansatt/Main.kt
index 9b48d5e..28ef69f 100644
--- a/src/main/kotlin/no/nav/navansatt/Main.kt
+++ b/src/main/kotlin/no/nav/navansatt/Main.kt
@@ -2,12 +2,11 @@ package no.nav.navansatt
 
 import io.ktor.client.HttpClient
 import io.ktor.client.engine.apache.Apache
-import io.ktor.client.features.cache.HttpCache
-import io.ktor.client.features.json.JsonFeature
-import io.ktor.client.features.json.serializer.KotlinxSerializer
+import io.ktor.client.plugins.cache.HttpCache
+import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
+import io.ktor.serialization.kotlinx.json.json
 import io.ktor.server.engine.embeddedServer
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.Json
 import org.apache.http.ssl.SSLContexts
 
 @Serializable
@@ -32,12 +31,8 @@ fun main() {
             }
         }
         install(HttpCache)
-        install(JsonFeature) {
-            serializer = KotlinxSerializer(
-                Json {
-                    ignoreUnknownKeys = true
-                }
-            )
+        install(ContentNegotiation) {
+            json()
         }
     }
     embeddedServer(io.ktor.server.netty.Netty, port = 7000) {
diff --git a/src/main/kotlin/no/nav/navansatt/Norg2Client.kt b/src/main/kotlin/no/nav/navansatt/Norg2Client.kt
index 8a84774..6fb91d8 100644
--- a/src/main/kotlin/no/nav/navansatt/Norg2Client.kt
+++ b/src/main/kotlin/no/nav/navansatt/Norg2Client.kt
@@ -1,11 +1,11 @@
 package no.nav.navansatt
 
 import io.ktor.client.HttpClient
+import io.ktor.client.call.body
 import io.ktor.client.request.get
 import io.ktor.client.request.url
 import io.ktor.http.URLBuilder
 import kotlinx.serialization.Serializable
-import org.slf4j.LoggerFactory
 
 @Serializable
 data class Norg2Enhet(
@@ -15,18 +15,15 @@ data class Norg2Enhet(
 )
 
 class Norg2Client(val httpClient: HttpClient, val norg2Url: String) {
-    companion object {
-        private val LOG = LoggerFactory.getLogger(Norg2Client::class.java)
-    }
 
     suspend fun hentEnheter(nummer: List<String>): List<Norg2Enhet> {
-        val response = httpClient.get<List<Norg2Enhet>> {
+        val response = httpClient.get {
             url(
-                URLBuilder(norg2Url + "/api/v1/enhet").apply {
+                URLBuilder("$norg2Url/api/v1/enhet").apply {
                     parameters.appendAll("enhetsnummerListe", nummer)
                 }.buildString()
             )
         }
-        return response
+        return response.body()
     }
 }
diff --git a/src/main/kotlin/no/nav/navansatt/Routes.kt b/src/main/kotlin/no/nav/navansatt/Routes.kt
index a2c5a4b..2fe2a84 100644
--- a/src/main/kotlin/no/nav/navansatt/Routes.kt
+++ b/src/main/kotlin/no/nav/navansatt/Routes.kt
@@ -1,20 +1,21 @@
 package no.nav.navansatt
 
-import io.ktor.application.call
-import io.ktor.auth.authenticate
-import io.ktor.client.features.ClientRequestException
+import io.ktor.client.plugins.ClientRequestException
 import io.ktor.http.ContentType
 import io.ktor.http.HttpStatusCode
-import io.ktor.locations.KtorExperimentalLocationsAPI
-import io.ktor.locations.Location
-import io.ktor.locations.get
-import io.ktor.response.respond
-import io.ktor.response.respondText
-import io.ktor.routing.Route
-import io.ktor.routing.Routing
-import io.micrometer.prometheus.PrometheusMeterRegistry
+import io.ktor.server.application.call
+import io.ktor.server.auth.authenticate
+import io.ktor.server.locations.KtorExperimentalLocationsAPI
+import io.ktor.server.locations.Location
+import io.ktor.server.locations.get
+import io.ktor.server.response.respond
+import io.ktor.server.response.respondText
+import io.ktor.server.routing.Route
+import io.ktor.server.routing.Routing
+import io.ktor.util.InternalAPI
+import io.micrometer.prometheusmetrics.PrometheusMeterRegistry
 import kotlinx.serialization.Serializable
-import io.ktor.routing.get as simpleGet
+import io.ktor.server.routing.get as simpleGet
 
 @Serializable
 data class NavAnsattResult(
@@ -23,7 +24,7 @@ data class NavAnsattResult(
     val fornavn: String,
     val etternavn: String,
     val epost: String,
-    val groups: List<String>
+    val groups: List<String>,
 )
 
 @Serializable
@@ -38,6 +39,7 @@ data class Fagomrade(
     val kode: String,
 )
 
+@OptIn(InternalAPI::class)
 @KtorExperimentalLocationsAPI
 fun Route.authenticatedRoutes(
     activeDirectoryClient: ActiveDirectoryClient,
@@ -163,7 +165,8 @@ fun Route.authenticatedRoutes(
     }
 }
 
-fun Routing.Routes(
+@OptIn(KtorExperimentalLocationsAPI::class)
+fun Routing.routes(
     metricsRegistry: PrometheusMeterRegistry,
     activeDirectoryClient: ActiveDirectoryClient,
     axsysClient: AxsysClient,
diff --git a/src/main/kotlin/no/nav/navansatt/discoverOidcMetadata.kt b/src/main/kotlin/no/nav/navansatt/discoverOidcMetadata.kt
index b282820..a859b54 100644
--- a/src/main/kotlin/no/nav/navansatt/discoverOidcMetadata.kt
+++ b/src/main/kotlin/no/nav/navansatt/discoverOidcMetadata.kt
@@ -1,6 +1,7 @@
 package no.nav.navansatt
 
 import io.ktor.client.HttpClient
+import io.ktor.client.call.body
 import io.ktor.client.request.get
 import io.ktor.client.request.url
 import kotlinx.serialization.Serializable
@@ -9,16 +10,20 @@ import org.slf4j.LoggerFactory
 @Serializable
 data class OIDCMetadata(
     val issuer: String,
-    val jwks_uri: String
+    val jwks_uri: String,
 )
 
 private val LOG = LoggerFactory.getLogger(OIDCMetadata::class.java)
 
-suspend fun discoverOidcMetadata(httpClient: HttpClient, wellknownUrl: String): OIDCMetadata {
+suspend fun discoverOidcMetadata(
+    httpClient: HttpClient,
+    wellknownUrl: String,
+): OIDCMetadata {
     try {
-        val meta = httpClient.get<OIDCMetadata> {
-            url(wellknownUrl)
-        }
+        val meta = httpClient
+            .get {
+                url(wellknownUrl)
+            }.body<OIDCMetadata>()
         LOG.info("Discovered issuer ${meta.issuer} with JWKS URI ${meta.jwks_uri} (from OIDC endpoint $wellknownUrl)")
         return meta
     } catch (err: Exception) {
diff --git a/src/main/kotlin/no/nav/navansatt/mainModule.kt b/src/main/kotlin/no/nav/navansatt/mainModule.kt
index 2f5f193..89dcc1b 100644
--- a/src/main/kotlin/no/nav/navansatt/mainModule.kt
+++ b/src/main/kotlin/no/nav/navansatt/mainModule.kt
@@ -2,46 +2,45 @@ package no.nav.navansatt
 
 import com.auth0.jwk.GuavaCachedJwkProvider
 import com.auth0.jwk.UrlJwkProvider
-import io.ktor.application.Application
-import io.ktor.application.call
-import io.ktor.application.install
-import io.ktor.application.log
-import io.ktor.auth.Authentication
-import io.ktor.auth.jwt.JWTPrincipal
-import io.ktor.auth.jwt.jwt
 import io.ktor.client.HttpClient
-import io.ktor.features.CallId
-import io.ktor.features.CallLogging
-import io.ktor.features.ContentNegotiation
-import io.ktor.features.StatusPages
-import io.ktor.features.callIdMdc
 import io.ktor.http.HttpStatusCode
-import io.ktor.locations.Locations
-import io.ktor.metrics.micrometer.MicrometerMetrics
-import io.ktor.request.header
-import io.ktor.request.path
-import io.ktor.response.respond
-import io.ktor.routing.routing
-import io.ktor.serialization.json
-import io.micrometer.prometheus.PrometheusConfig
-import io.micrometer.prometheus.PrometheusMeterRegistry
+import io.ktor.serialization.kotlinx.json.json
+import io.ktor.server.application.Application
+import io.ktor.server.application.install
+import io.ktor.server.application.log
+import io.ktor.server.auth.Authentication
+import io.ktor.server.auth.jwt.JWTPrincipal
+import io.ktor.server.auth.jwt.jwt
+import io.ktor.server.metrics.micrometer.MicrometerMetrics
+import io.ktor.server.plugins.callid.CallId
+import io.ktor.server.plugins.callid.callIdMdc
+import io.ktor.server.plugins.callloging.CallLogging
+import io.ktor.server.plugins.contentnegotiation.ContentNegotiation
+import io.ktor.server.plugins.statuspages.StatusPages
+import io.ktor.server.request.header
+import io.ktor.server.request.path
+import io.ktor.server.response.respond
+import io.ktor.server.routing.routing
+import io.micrometer.prometheusmetrics.PrometheusConfig
+import io.micrometer.prometheusmetrics.PrometheusMeterRegistry
 import kotlinx.coroutines.runBlocking
 import org.slf4j.event.Level
 import java.net.URL
+import java.util.Locale
 import java.util.UUID
 
 fun Application.mainModule(
     config: ApplicationConfig,
     httpClient: HttpClient,
-    activeDirectoryClient: ActiveDirectoryClient
+    activeDirectoryClient: ActiveDirectoryClient,
 ) {
     val axsysClient = AxsysClient(
         httpClient = httpClient,
-        axsysUrl = config.axsysUrl
+        axsysUrl = config.axsysUrl,
     )
     val norg2Client = Norg2Client(
         httpClient = httpClient,
-        norg2Url = config.norg2Url
+        norg2Url = config.norg2Url,
     )
 
     val azureOidc = runBlocking {
@@ -64,39 +63,38 @@ fun Application.mainModule(
         retrieveFromHeader("correlationId")
         generate { UUID.randomUUID().toString() }
     }
-    install(Locations)
     install(ContentNegotiation) {
         json()
     }
     install(StatusPages) {
-        exception<Throwable> { cause ->
-            log.error("Internal error", cause)
+        exception<Throwable> { call, cause ->
+            call.application.log.error("Internal error", cause)
             call.response.status(HttpStatusCode.InternalServerError)
             call.respond(ApiError(message = "Internal server error (${cause::class.java.canonicalName})"))
         }
 
-        status(HttpStatusCode.Unauthorized) {
+        status(HttpStatusCode.Unauthorized) { call, _ ->
             val authorization = call.request.header("Authorization")
             if (authorization != null) {
-                if (authorization.toLowerCase().startsWith("bearer ")) {
+                if (authorization.lowercase(Locale.getDefault()).startsWith("bearer ")) {
                     val message = "Access Denied: with 'Bearer xxxxxx...' authentication. Expected valid JWT token."
-                    log.warn(message)
+                    call.application.log.warn(message)
                     call.response.status(HttpStatusCode.Unauthorized)
                     call.respond(ApiError(message = message))
-                } else if (authorization.toLowerCase().startsWith("basic ")) {
+                } else if (authorization.lowercase(Locale.getDefault()).startsWith("basic ")) {
                     val message = "Access Denied: Basic authentication is not supposed. Please use JWT authentication."
-                    log.warn(message)
+                    call.application.log.warn(message)
                     call.response.status(HttpStatusCode.Unauthorized)
                     call.respond(ApiError(message = message))
                 } else {
                     val message = "Access Denied: Invalid Authentication header."
-                    log.warn(message)
+                    call.application.log.warn(message)
                     call.response.status(HttpStatusCode.Unauthorized)
                     call.respond(ApiError(message = message))
                 }
             } else {
                 val message = "Access Denied: no Authorization header was found in the request."
-                log.warn(message)
+                call.application.log.warn(message)
                 call.response.status(HttpStatusCode.Unauthorized)
                 call.respond(ApiError(message = message))
             }
@@ -106,7 +104,7 @@ fun Application.mainModule(
         jwt("azure") {
             verifier(
                 GuavaCachedJwkProvider(UrlJwkProvider(URL(azureOidc.jwks_uri))),
-                azureOidc.issuer
+                azureOidc.issuer,
             ) {
                 config.azureClientId?.also { withAudience(it) }
             }
@@ -116,18 +114,18 @@ fun Application.mainModule(
         jwt("sts") {
             verifier(
                 GuavaCachedJwkProvider(UrlJwkProvider(URL(stsOidc.jwks_uri))),
-                stsOidc.issuer
+                stsOidc.issuer,
             )
             validate { credential -> JWTPrincipal(credential.payload) }
         }
     }
 
     routing {
-        Routes(
+        routes(
             metricsRegistry = metricsRegistry,
             activeDirectoryClient = activeDirectoryClient,
             axsysClient = axsysClient,
-            norg2Client = norg2Client
+            norg2Client = norg2Client,
         )
     }
 }
diff --git a/src/test/kotlin/no/nav/navansatt/AxsysClientTest.kt b/src/test/kotlin/no/nav/navansatt/AxsysClientTest.kt
index ab797b9..74bb08f 100644
--- a/src/test/kotlin/no/nav/navansatt/AxsysClientTest.kt
+++ b/src/test/kotlin/no/nav/navansatt/AxsysClientTest.kt
@@ -4,14 +4,13 @@ import io.ktor.client.HttpClient
 import io.ktor.client.engine.mock.MockEngine
 import io.ktor.client.engine.mock.MockRequestHandleScope
 import io.ktor.client.engine.mock.respond
-import io.ktor.client.features.json.JsonFeature
-import io.ktor.client.features.json.serializer.KotlinxSerializer
+import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
 import io.ktor.client.request.HttpRequestData
 import io.ktor.client.request.HttpResponseData
 import io.ktor.http.HttpStatusCode
 import io.ktor.http.headersOf
+import io.ktor.serialization.kotlinx.json.json
 import kotlinx.coroutines.runBlocking
-import kotlinx.serialization.json.Json
 import org.junit.Test
 import org.junit.jupiter.api.assertThrows
 import kotlin.test.assertEquals
@@ -37,7 +36,7 @@ class AxsysClientTest {
                                     "fagomrader": ["FOTBALL", "SJAKK"]
                                   }]
                                 }
-                        """.trimIndent()
+                        """.trimIndent(),
                     )
                 }
                 else -> {
@@ -53,14 +52,14 @@ class AxsysClientTest {
                     AxsysEnhet(
                         enhetId = "123",
                         navn = "NAV Hakkebakkeskogen",
-                        fagomrader = listOf("FOO", "BAR")
+                        fagomrader = listOf("FOO", "BAR"),
                     ),
                     AxsysEnhet(
                         enhetId = "456",
                         navn = "NAV Kardemomme By",
-                        fagomrader = listOf("FOTBALL", "SJAKK")
+                        fagomrader = listOf("FOTBALL", "SJAKK"),
                     )
-                )
+                ),
             ),
             tilganger
         )
@@ -120,12 +119,8 @@ class AxsysClientTest {
 
     private fun makeMockClient(handler: suspend MockRequestHandleScope.(HttpRequestData) -> HttpResponseData): HttpClient {
         return HttpClient(MockEngine) {
-            install(JsonFeature) {
-                serializer = KotlinxSerializer(
-                    Json {
-                        ignoreUnknownKeys = true
-                    }
-                )
+            install(ContentNegotiation) {
+                json()
             }
             engine {
                 addHandler { request ->
diff --git a/src/test/kotlin/no/nav/navansatt/MockMain.kt b/src/test/kotlin/no/nav/navansatt/MockMain.kt
index a13e215..2f51858 100644
--- a/src/test/kotlin/no/nav/navansatt/MockMain.kt
+++ b/src/test/kotlin/no/nav/navansatt/MockMain.kt
@@ -1,9 +1,11 @@
 package no.nav.navansatt.mock
 
+import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import kotlin.concurrent.thread
 
-val LOG = LoggerFactory.getLogger("no.nav.navansatt.mock.MockMain")
+val LOG: Logger = LoggerFactory.getLogger("no.nav.navansatt.mock.MockMain")
+
 fun main() {
     LOG.info("Running mock backends")
     thread {
diff --git a/src/test/kotlin/no/nav/navansatt/RoutesTest.kt b/src/test/kotlin/no/nav/navansatt/RoutesTest.kt
index 468ec5f..60a34fa 100644
--- a/src/test/kotlin/no/nav/navansatt/RoutesTest.kt
+++ b/src/test/kotlin/no/nav/navansatt/RoutesTest.kt
@@ -1,19 +1,19 @@
 package no.nav.navansatt
 
-import io.ktor.application.install
-import io.ktor.features.ContentNegotiation
 import io.ktor.http.HttpMethod.Companion.Get
 import io.ktor.http.HttpStatusCode.Companion.NotFound
 import io.ktor.http.HttpStatusCode.Companion.OK
-import io.ktor.locations.Locations
-import io.ktor.routing.routing
-import io.ktor.serialization.json
+import io.ktor.serialization.kotlinx.json.json
+import io.ktor.server.application.install
+import io.ktor.server.locations.KtorExperimentalLocationsAPI
+import io.ktor.server.locations.Locations
+import io.ktor.server.plugins.contentnegotiation.ContentNegotiation
+import io.ktor.server.routing.routing
 import io.ktor.server.testing.TestApplicationEngine
 import io.ktor.server.testing.handleRequest
 import io.ktor.server.testing.withTestApplication
 import io.mockk.coEvery
 import io.mockk.mockk
-import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 import org.junit.jupiter.api.Test
 import kotlin.test.assertEquals
@@ -24,12 +24,12 @@ class RoutesTest {
         withMockApp(
             activeDirectoryClient = mockk(),
             axsysClient = mockk(),
-            norg2Client = mockk()
+            norg2Client = mockk(),
         ) {
             with(
                 handleRequest(
                     method = Get,
-                    uri = "/ping-authenticated"
+                    uri = "/ping-authenticated",
                 )
             ) {
                 assertEquals(OK, response.status())
@@ -47,18 +47,18 @@ class RoutesTest {
             firstName = "Luke",
             lastName = "Skywalker",
             email = "luke.skywalker@example.com",
-            groups = emptyList()
+            groups = emptyList(),
         )
 
         withMockApp(
             activeDirectoryClient = activeDirectoryClient,
             axsysClient = mockk(),
-            norg2Client = mockk()
+            norg2Client = mockk(),
         ) {
             with(
                 handleRequest(
                     method = Get,
-                    uri = "/navansatt/lukesky"
+                    uri = "/navansatt/lukesky",
                 )
             ) {
                 assertEquals(OK, response.status())
@@ -69,9 +69,9 @@ class RoutesTest {
                         fornavn = "Luke",
                         etternavn = "Skywalker",
                         epost = "luke.skywalker@example.com",
-                        groups = emptyList()
+                        groups = emptyList(),
                     ),
-                    Json.decodeFromString(response.content ?: "")
+                    Json.decodeFromString(response.content ?: ""),
                 )
             }
         }
@@ -86,20 +86,20 @@ class RoutesTest {
         withMockApp(
             activeDirectoryClient = activeDirectoryClient,
             axsysClient = mockk(),
-            norg2Client = mockk()
+            norg2Client = mockk(),
         ) {
             with(
                 handleRequest(
                     method = Get,
-                    uri = "/navansatt/nobody"
+                    uri = "/navansatt/nobody",
                 )
             ) {
                 assertEquals(NotFound, response.status())
                 assertEquals(
                     ApiError(
-                        message = "User not found"
+                        message = "User not found",
                     ),
-                    Json.decodeFromString(response.content ?: "")
+                    Json.decodeFromString(response.content ?: ""),
                 )
             }
         }
@@ -114,12 +114,12 @@ class RoutesTest {
                 AxsysEnhet(
                     enhetId = "123",
                     navn = "NAV Kardemomme By",
-                    fagomrader = listOf("PEN", "UFO", "PEPPERKAKE")
+                    fagomrader = listOf("PEN", "UFO", "PEPPERKAKE"),
                 ),
                 AxsysEnhet(
                     enhetId = "456",
                     navn = "NAV Andeby",
-                    fagomrader = listOf("SJAKK", "PEN")
+                    fagomrader = listOf("SJAKK", "PEN"),
                 )
             )
         )
@@ -127,7 +127,7 @@ class RoutesTest {
         withMockApp(
             activeDirectoryClient = mockk(),
             axsysClient = axsysClient,
-            norg2Client = mockk()
+            norg2Client = mockk(),
         ) {
             with(
                 handleRequest(
@@ -141,9 +141,9 @@ class RoutesTest {
                         Fagomrade(kode = "PEN"),
                         Fagomrade(kode = "UFO"),
                         Fagomrade(kode = "PEPPERKAKE"),
-                        Fagomrade(kode = "SJAKK")
+                        Fagomrade(kode = "SJAKK"),
                     ),
-                    Json.decodeFromString(response.content ?: "")
+                    Json.decodeFromString(response.content ?: ""),
                 )
             }
         }
@@ -158,20 +158,20 @@ class RoutesTest {
         withMockApp(
             activeDirectoryClient = mockk(),
             axsysClient = axsysClient,
-            norg2Client = mockk()
+            norg2Client = mockk(),
         ) {
             with(
                 handleRequest(
                     method = Get,
-                    uri = "/navansatt/nobody/fagomrader"
+                    uri = "/navansatt/nobody/fagomrader",
                 )
             ) {
                 assertEquals(NotFound, response.status())
                 assertEquals(
                     ApiError(
-                        message = "Fant ikke NAV-ansatt med id nobody"
+                        message = "Fant ikke NAV-ansatt med id nobody",
                     ),
-                    Json.decodeFromString(response.content ?: "")
+                    Json.decodeFromString(response.content ?: ""),
                 )
             }
         }
@@ -187,12 +187,12 @@ class RoutesTest {
                 AxsysEnhet(
                     enhetId = "123",
                     navn = "NAV Kardemomme By",
-                    fagomrader = listOf("PEN", "UFO", "PEPPERKAKE")
+                    fagomrader = listOf("PEN", "UFO", "PEPPERKAKE"),
                 ),
                 AxsysEnhet(
                     enhetId = "456",
                     navn = "NAV Andeby",
-                    fagomrader = listOf("SJAKK", "PEN")
+                    fagomrader = listOf("SJAKK", "PEN"),
                 )
             )
         )
@@ -200,24 +200,24 @@ class RoutesTest {
             Norg2Enhet(
                 enhetNr = "123",
                 navn = "NAV Kardemomme By",
-                orgNivaa = "ABC"
+                orgNivaa = "ABC",
             ),
             Norg2Enhet(
                 enhetNr = "456",
                 navn = "NAV Andeby",
-                orgNivaa = "DEF"
+                orgNivaa = "DEF",
             )
         )
 
         withMockApp(
             activeDirectoryClient = mockk(),
             axsysClient = axsysClient,
-            norg2Client = norg2Client
+            norg2Client = norg2Client,
         ) {
             with(
                 handleRequest(
                     method = Get,
-                    uri = "/navansatt/lukesky/enheter"
+                    uri = "/navansatt/lukesky/enheter",
                 )
             ) {
                 assertEquals(OK, response.status())
@@ -226,15 +226,15 @@ class RoutesTest {
                         NAVEnhetResult(
                             id = "123",
                             navn = "NAV Kardemomme By",
-                            nivaa = "ABC"
+                            nivaa = "ABC",
                         ),
                         NAVEnhetResult(
                             id = "456",
                             navn = "NAV Andeby",
-                            nivaa = "DEF"
+                            nivaa = "DEF",
                         )
                     ),
-                    Json.decodeFromString(response.content ?: "")
+                    Json.decodeFromString(response.content ?: ""),
                 )
             }
         }
@@ -248,12 +248,12 @@ class RoutesTest {
         withMockApp(
             activeDirectoryClient = mockk(),
             axsysClient = axsysClient,
-            norg2Client = mockk()
+            norg2Client = mockk(),
         ) {
             with(
                 handleRequest(
                     method = Get,
-                    uri = "/navansatt/nobody/enheter"
+                    uri = "/navansatt/nobody/enheter",
                 )
             ) {
                 assertEquals(NotFound, response.status())
@@ -261,7 +261,7 @@ class RoutesTest {
                     ApiError(
                         message = "Fant ikke NAV-ansatt med id nobody"
                     ),
-                    Json.decodeFromString(response.content ?: "")
+                    Json.decodeFromString(response.content ?: ""),
                 )
             }
         }
@@ -275,7 +275,7 @@ class RoutesTest {
         coEvery { axsysClient.hentAnsattIdenter("123") } returns listOf(
             Ident("lukesky"),
             Ident("darthvad"),
-            Ident("prinleia")
+            Ident("prinleia"),
         )
         coEvery { activeDirectoryClient.getUsers(listOf("lukesky", "darthvad", "prinleia")) } returns listOf(
             User(
@@ -284,7 +284,7 @@ class RoutesTest {
                 firstName = "Luke",
                 lastName = "Skywalker",
                 email = "luke.skywalker@example.com",
-                groups = emptyList()
+                groups = emptyList(),
             ),
             User(
                 ident = "darthvad",
@@ -292,7 +292,7 @@ class RoutesTest {
                 firstName = "Darth",
                 lastName = "Vader",
                 email = "darth.vader@example.com",
-                groups = emptyList()
+                groups = emptyList(),
             ),
             User(
                 ident = "prinleia",
@@ -300,19 +300,19 @@ class RoutesTest {
                 firstName = "Leia",
                 lastName = "Organa",
                 email = "prinsesse.leia.organa@example.com",
-                groups = emptyList()
+                groups = emptyList(),
             )
         )
 
         withMockApp(
             activeDirectoryClient = activeDirectoryClient,
             axsysClient = axsysClient,
-            norg2Client = mockk()
+            norg2Client = mockk(),
         ) {
             with(
                 handleRequest(
                     method = Get,
-                    uri = "/enhet/123/navansatte"
+                    uri = "/enhet/123/navansatte",
                 )
             ) {
                 assertEquals(OK, response.status())
@@ -341,7 +341,7 @@ class RoutesTest {
                             etternavn = "Organa",
                             epost = "prinsesse.leia.organa@example.com",
                             groups = emptyList()
-                        )
+                        ),
                     ),
                     Json.decodeFromString(response.content ?: "")
                 )
@@ -377,11 +377,12 @@ class RoutesTest {
         }
     }
 
+    @OptIn(KtorExperimentalLocationsAPI::class)
     private fun withMockApp(
         activeDirectoryClient: ActiveDirectoryClient,
         axsysClient: AxsysClient,
         norg2Client: Norg2Client,
-        testCode: TestApplicationEngine.() -> Unit
+        testCode: TestApplicationEngine.() -> Unit,
     ) {
         withTestApplication(
             {
@@ -397,7 +398,7 @@ class RoutesTest {
                     )
                 }
             },
-            testCode
+            testCode,
         )
     }
 }
diff --git a/src/test/kotlin/no/nav/navansatt/mock/AxsysMock.kt b/src/test/kotlin/no/nav/navansatt/mock/AxsysMock.kt
index d2213e7..daa49f6 100644
--- a/src/test/kotlin/no/nav/navansatt/mock/AxsysMock.kt
+++ b/src/test/kotlin/no/nav/navansatt/mock/AxsysMock.kt
@@ -1,9 +1,9 @@
 package no.nav.navansatt.mock
 
-import io.ktor.application.call
-import io.ktor.response.respond
-import io.ktor.routing.Routing
-import io.ktor.routing.get
+import io.ktor.server.application.call
+import io.ktor.server.response.respond
+import io.ktor.server.routing.Routing
+import io.ktor.server.routing.get
 import kotlinx.serialization.Serializable
 import no.nav.navansatt.AxsysEnhet
 import no.nav.navansatt.TilgangResponse
@@ -15,12 +15,13 @@ fun Routing.axsysMock() {
         val historiskIdent: Long
     )
     get("/rest/axsys/api/v1/enhet/123/brukere") {
-        val result: List<Ident> = listOf(Users.prinleia, Users.klageb, Users.lukesky).mapIndexed { i, el ->
-            Ident(
-                appIdent = el.samaccountname,
-                historiskIdent = 1000 + i.toLong()
-            )
-        }
+        val result: List<Ident> = listOf(Users.prinleia, Users.klageb, Users.lukesky)
+            .mapIndexed { i, el ->
+                Ident(
+                    appIdent = el.samaccountname,
+                    historiskIdent = 1000 + i.toLong()
+                )
+            }
         call.respond(result)
     }
 
diff --git a/src/test/kotlin/no/nav/navansatt/mock/LdapServer.kt b/src/test/kotlin/no/nav/navansatt/mock/LdapServer.kt
index 625e5d4..df97cae 100644
--- a/src/test/kotlin/no/nav/navansatt/mock/LdapServer.kt
+++ b/src/test/kotlin/no/nav/navansatt/mock/LdapServer.kt
@@ -43,7 +43,7 @@ objectClass: organizationalUnit
 objectClass: top
 """.trimIndent()
 
-class LdapServer(val port: Int) {
+class LdapServer(private val port: Int) {
     companion object {
         val LOG = LoggerFactory.getLogger(LdapServer::class.java)
     }
@@ -75,7 +75,9 @@ class LdapServer(val port: Int) {
                 addAttribute("givenname", it.givenname)
                 addAttribute("sn", it.sn)
                 addAttribute("mail", it.mail)
-                addAttribute("memberOf", it.memberOf.map { group -> "CN=$group,OU=AccountGroups,OU=Groups,OU=NAV,OU=BusinessUnits,DC=test,DC=local" })
+                addAttribute("memberOf", it.memberOf.map { group ->
+                    "CN=$group,OU=AccountGroups,OU=Groups,OU=NAV,OU=BusinessUnits,DC=test,DC=local"
+                })
             }
 
             LDIFAddChangeRecord(entry).processChange(server)
diff --git a/src/test/kotlin/no/nav/navansatt/mock/MockServer.kt b/src/test/kotlin/no/nav/navansatt/mock/MockServer.kt
index 0a69590..af905d6 100644
--- a/src/test/kotlin/no/nav/navansatt/mock/MockServer.kt
+++ b/src/test/kotlin/no/nav/navansatt/mock/MockServer.kt
@@ -1,23 +1,21 @@
 package no.nav.navansatt.mock
 
-import io.ktor.application.install
-import io.ktor.features.ContentNegotiation
-import io.ktor.routing.routing
-import io.ktor.serialization.json
+import io.ktor.server.application.install
 import io.ktor.server.engine.embeddedServer
 import io.ktor.server.netty.Netty
+import io.ktor.server.plugins.contentnegotiation.ContentNegotiation
+import io.ktor.server.routing.routing
+import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 
-class MockServer(val port: Int) {
+class MockServer(private val port: Int) {
     companion object {
-        val LOG = LoggerFactory.getLogger(MockServer::class.java)
+        val LOG: Logger = LoggerFactory.getLogger(MockServer::class.java)
     }
 
     val server = run {
         embeddedServer(Netty, port = port) {
-            install(ContentNegotiation) {
-                json()
-            }
+            install(ContentNegotiation)
             routing {
                 oidcMocks()
                 axsysMock()
diff --git a/src/test/kotlin/no/nav/navansatt/mock/Norg2Mock.kt b/src/test/kotlin/no/nav/navansatt/mock/Norg2Mock.kt
index 78d5090..440561e 100644
--- a/src/test/kotlin/no/nav/navansatt/mock/Norg2Mock.kt
+++ b/src/test/kotlin/no/nav/navansatt/mock/Norg2Mock.kt
@@ -1,11 +1,11 @@
 package no.nav.navansatt.mock
 
-import io.ktor.application.call
 import io.ktor.http.HttpStatusCode
-import io.ktor.response.respond
-import io.ktor.response.respondText
-import io.ktor.routing.Routing
-import io.ktor.routing.get
+import io.ktor.server.application.call
+import io.ktor.server.response.respond
+import io.ktor.server.response.respondText
+import io.ktor.server.routing.Routing
+import io.ktor.server.routing.get
 import kotlinx.serialization.Serializable
 
 fun Routing.norg2Mock() {
diff --git a/src/test/kotlin/no/nav/navansatt/mock/OidcMocks.kt b/src/test/kotlin/no/nav/navansatt/mock/OidcMocks.kt
index 8196978..14ef44b 100644
--- a/src/test/kotlin/no/nav/navansatt/mock/OidcMocks.kt
+++ b/src/test/kotlin/no/nav/navansatt/mock/OidcMocks.kt
@@ -1,10 +1,10 @@
 package no.nav.navansatt.mock
 
-import io.ktor.application.call
 import io.ktor.http.ContentType
-import io.ktor.response.respondText
-import io.ktor.routing.Routing
-import io.ktor.routing.get
+import io.ktor.server.application.call
+import io.ktor.server.response.respondText
+import io.ktor.server.routing.Routing
+import io.ktor.server.routing.get
 
 fun Routing.oidcMocks() {
     get("/rest/AzureAd/123456/v2.0/.well-known/openid-configuration") {

From 1b8e0abcadfdfcadc5cec6c2790e06af12018ea7 Mon Sep 17 00:00:00 2001
From: ingleiv Johansen <ingleiv.halvard.johansen@nav.no>
Date: Fri, 4 Oct 2024 11:19:46 +0200
Subject: [PATCH 2/4] Migrated deprecated withTestApplication

---
 .../kotlin/no/nav/navansatt/RoutesTest.kt     | 305 +++++++-----------
 1 file changed, 123 insertions(+), 182 deletions(-)

diff --git a/src/test/kotlin/no/nav/navansatt/RoutesTest.kt b/src/test/kotlin/no/nav/navansatt/RoutesTest.kt
index 60a34fa..eda92cd 100644
--- a/src/test/kotlin/no/nav/navansatt/RoutesTest.kt
+++ b/src/test/kotlin/no/nav/navansatt/RoutesTest.kt
@@ -1,17 +1,15 @@
 package no.nav.navansatt
 
-import io.ktor.http.HttpMethod.Companion.Get
+import io.ktor.client.request.get
+import io.ktor.client.statement.bodyAsText
 import io.ktor.http.HttpStatusCode.Companion.NotFound
 import io.ktor.http.HttpStatusCode.Companion.OK
 import io.ktor.serialization.kotlinx.json.json
-import io.ktor.server.application.install
 import io.ktor.server.locations.KtorExperimentalLocationsAPI
 import io.ktor.server.locations.Locations
 import io.ktor.server.plugins.contentnegotiation.ContentNegotiation
-import io.ktor.server.routing.routing
-import io.ktor.server.testing.TestApplicationEngine
-import io.ktor.server.testing.handleRequest
-import io.ktor.server.testing.withTestApplication
+import io.ktor.server.testing.ApplicationTestBuilder
+import io.ktor.server.testing.testApplication
 import io.mockk.coEvery
 import io.mockk.mockk
 import kotlinx.serialization.json.Json
@@ -26,14 +24,8 @@ class RoutesTest {
             axsysClient = mockk(),
             norg2Client = mockk(),
         ) {
-            with(
-                handleRequest(
-                    method = Get,
-                    uri = "/ping-authenticated",
-                )
-            ) {
-                assertEquals(OK, response.status())
-            }
+            val response = client.get("/ping-authenticated")
+            assertEquals(OK, response.status)
         }
     }
 
@@ -55,25 +47,19 @@ class RoutesTest {
             axsysClient = mockk(),
             norg2Client = mockk(),
         ) {
-            with(
-                handleRequest(
-                    method = Get,
-                    uri = "/navansatt/lukesky",
-                )
-            ) {
-                assertEquals(OK, response.status())
-                assertEquals(
-                    NavAnsattResult(
-                        ident = "lukesky",
-                        navn = "Luke Skywalker",
-                        fornavn = "Luke",
-                        etternavn = "Skywalker",
-                        epost = "luke.skywalker@example.com",
-                        groups = emptyList(),
-                    ),
-                    Json.decodeFromString(response.content ?: ""),
-                )
-            }
+            val response = client.get("/navansatt/lukesky")
+            assertEquals(OK, response.status)
+            assertEquals(
+                NavAnsattResult(
+                    ident = "lukesky",
+                    navn = "Luke Skywalker",
+                    fornavn = "Luke",
+                    etternavn = "Skywalker",
+                    epost = "luke.skywalker@example.com",
+                    groups = emptyList(),
+                ),
+                Json.decodeFromString(response.bodyAsText()),
+            )
         }
     }
 
@@ -88,20 +74,14 @@ class RoutesTest {
             axsysClient = mockk(),
             norg2Client = mockk(),
         ) {
-            with(
-                handleRequest(
-                    method = Get,
-                    uri = "/navansatt/nobody",
-                )
-            ) {
-                assertEquals(NotFound, response.status())
-                assertEquals(
-                    ApiError(
-                        message = "User not found",
-                    ),
-                    Json.decodeFromString(response.content ?: ""),
-                )
-            }
+            val response = client.get("/navansatt/nobody")
+            assertEquals(NotFound, response.status)
+            assertEquals(
+                ApiError(
+                    message = "User not found",
+                ),
+                Json.decodeFromString(response.bodyAsText()),
+            )
         }
     }
 
@@ -129,23 +109,17 @@ class RoutesTest {
             axsysClient = axsysClient,
             norg2Client = mockk(),
         ) {
-            with(
-                handleRequest(
-                    method = Get,
-                    uri = "/navansatt/lukesky/fagomrader"
-                )
-            ) {
-                assertEquals(OK, response.status())
-                assertEquals(
-                    listOf(
-                        Fagomrade(kode = "PEN"),
-                        Fagomrade(kode = "UFO"),
-                        Fagomrade(kode = "PEPPERKAKE"),
-                        Fagomrade(kode = "SJAKK"),
-                    ),
-                    Json.decodeFromString(response.content ?: ""),
-                )
-            }
+            val response = client.get("/navansatt/lukesky/fagomrader")
+            assertEquals(OK, response.status)
+            assertEquals(
+                listOf(
+                    Fagomrade(kode = "PEN"),
+                    Fagomrade(kode = "UFO"),
+                    Fagomrade(kode = "PEPPERKAKE"),
+                    Fagomrade(kode = "SJAKK"),
+                ),
+                Json.decodeFromString(response.bodyAsText()),
+            )
         }
     }
 
@@ -160,20 +134,14 @@ class RoutesTest {
             axsysClient = axsysClient,
             norg2Client = mockk(),
         ) {
-            with(
-                handleRequest(
-                    method = Get,
-                    uri = "/navansatt/nobody/fagomrader",
-                )
-            ) {
-                assertEquals(NotFound, response.status())
-                assertEquals(
-                    ApiError(
-                        message = "Fant ikke NAV-ansatt med id nobody",
-                    ),
-                    Json.decodeFromString(response.content ?: ""),
-                )
-            }
+            val response = client.get("/navansatt/nobody/fagomrader")
+            assertEquals(NotFound, response.status)
+            assertEquals(
+                ApiError(
+                    message = "Fant ikke NAV-ansatt med id nobody",
+                ),
+                Json.decodeFromString(response.bodyAsText()),
+            )
         }
     }
 
@@ -214,29 +182,23 @@ class RoutesTest {
             axsysClient = axsysClient,
             norg2Client = norg2Client,
         ) {
-            with(
-                handleRequest(
-                    method = Get,
-                    uri = "/navansatt/lukesky/enheter",
-                )
-            ) {
-                assertEquals(OK, response.status())
-                assertEquals(
-                    listOf(
-                        NAVEnhetResult(
-                            id = "123",
-                            navn = "NAV Kardemomme By",
-                            nivaa = "ABC",
-                        ),
-                        NAVEnhetResult(
-                            id = "456",
-                            navn = "NAV Andeby",
-                            nivaa = "DEF",
-                        )
+            val response = client.get("/navansatt/lukesky/enheter")
+            assertEquals(OK, response.status)
+            assertEquals(
+                listOf(
+                    NAVEnhetResult(
+                        id = "123",
+                        navn = "NAV Kardemomme By",
+                        nivaa = "ABC",
                     ),
-                    Json.decodeFromString(response.content ?: ""),
-                )
-            }
+                    NAVEnhetResult(
+                        id = "456",
+                        navn = "NAV Andeby",
+                        nivaa = "DEF",
+                    )
+                ),
+                Json.decodeFromString(response.bodyAsText()),
+            )
         }
     }
 
@@ -250,20 +212,14 @@ class RoutesTest {
             axsysClient = axsysClient,
             norg2Client = mockk(),
         ) {
-            with(
-                handleRequest(
-                    method = Get,
-                    uri = "/navansatt/nobody/enheter",
-                )
-            ) {
-                assertEquals(NotFound, response.status())
-                assertEquals(
-                    ApiError(
-                        message = "Fant ikke NAV-ansatt med id nobody"
-                    ),
-                    Json.decodeFromString(response.content ?: ""),
-                )
-            }
+            val response = client.get("/navansatt/nobody/enheter")
+            assertEquals(NotFound, response.status)
+            assertEquals(
+                ApiError(
+                    message = "Fant ikke NAV-ansatt med id nobody"
+                ),
+                Json.decodeFromString(response.bodyAsText()),
+            )
         }
     }
 
@@ -309,43 +265,37 @@ class RoutesTest {
             axsysClient = axsysClient,
             norg2Client = mockk(),
         ) {
-            with(
-                handleRequest(
-                    method = Get,
-                    uri = "/enhet/123/navansatte",
-                )
-            ) {
-                assertEquals(OK, response.status())
-                assertEquals(
-                    listOf(
-                        NavAnsattResult(
-                            ident = "lukesky",
-                            navn = "Luke Skywalker",
-                            fornavn = "Luke",
-                            etternavn = "Skywalker",
-                            epost = "luke.skywalker@example.com",
-                            groups = emptyList()
-                        ),
-                        NavAnsattResult(
-                            ident = "darthvad",
-                            navn = "Darth Vader",
-                            fornavn = "Darth",
-                            etternavn = "Vader",
-                            epost = "darth.vader@example.com",
-                            groups = emptyList()
-                        ),
-                        NavAnsattResult(
-                            ident = "prinleia",
-                            navn = "Prinsesse Leia Organa",
-                            fornavn = "Leia",
-                            etternavn = "Organa",
-                            epost = "prinsesse.leia.organa@example.com",
-                            groups = emptyList()
-                        ),
+            val response = client.get("/enhet/123/navansatte")
+            assertEquals(OK, response.status)
+            assertEquals(
+                listOf(
+                    NavAnsattResult(
+                        ident = "lukesky",
+                        navn = "Luke Skywalker",
+                        fornavn = "Luke",
+                        etternavn = "Skywalker",
+                        epost = "luke.skywalker@example.com",
+                        groups = emptyList(),
                     ),
-                    Json.decodeFromString(response.content ?: "")
-                )
-            }
+                    NavAnsattResult(
+                        ident = "darthvad",
+                        navn = "Darth Vader",
+                        fornavn = "Darth",
+                        etternavn = "Vader",
+                        epost = "darth.vader@example.com",
+                        groups = emptyList(),
+                    ),
+                    NavAnsattResult(
+                        ident = "prinleia",
+                        navn = "Prinsesse Leia Organa",
+                        fornavn = "Leia",
+                        etternavn = "Organa",
+                        epost = "prinsesse.leia.organa@example.com",
+                        groups = emptyList(),
+                    ),
+                ),
+                Json.decodeFromString(response.bodyAsText())
+            )
         }
     }
 
@@ -360,20 +310,14 @@ class RoutesTest {
             axsysClient = axsysClient,
             norg2Client = mockk()
         ) {
-            with(
-                handleRequest(
-                    method = Get,
-                    uri = "/enhet/4444/navansatte"
-                )
-            ) {
-                assertEquals(NotFound, response.status())
-                assertEquals(
-                    ApiError(
-                        message = "Fant ikke NAV-enhet med id 4444"
-                    ),
-                    Json.decodeFromString(response.content ?: "")
-                )
-            }
+            val response = client.get("/enhet/4444/navansatte")
+            assertEquals(NotFound, response.status)
+            assertEquals(
+                ApiError(
+                    message = "Fant ikke NAV-enhet med id 4444"
+                ),
+                Json.decodeFromString(response.bodyAsText())
+            )
         }
     }
 
@@ -382,23 +326,20 @@ class RoutesTest {
         activeDirectoryClient: ActiveDirectoryClient,
         axsysClient: AxsysClient,
         norg2Client: Norg2Client,
-        testCode: TestApplicationEngine.() -> Unit,
-    ) {
-        withTestApplication(
-            {
-                install(Locations)
-                install(ContentNegotiation) {
-                    json()
-                }
-                routing {
-                    authenticatedRoutes(
-                        activeDirectoryClient = activeDirectoryClient,
-                        axsysClient = axsysClient,
-                        norg2Client = norg2Client
-                    )
-                }
-            },
-            testCode,
-        )
+        testCode: suspend ApplicationTestBuilder.() -> Unit,
+    ) = testApplication {
+        install(Locations)
+        install(ContentNegotiation) {
+            json()
+        }
+        routing {
+            authenticatedRoutes(
+                activeDirectoryClient = activeDirectoryClient,
+                axsysClient = axsysClient,
+                norg2Client = norg2Client
+            )
+        }
+
+        testCode()
     }
 }

From 104e7b8ac5562539c4140136559ff5e88e0d7274 Mon Sep 17 00:00:00 2001
From: ingleiv Johansen <ingleiv.halvard.johansen@nav.no>
Date: Fri, 4 Oct 2024 14:04:10 +0200
Subject: [PATCH 3/4] fixes - build sandbox, add back Locations-plugin to main,
 json ignore unknown

---
 .github/workflows/main.yml                          | 2 ++
 .github/workflows/sandbox.yml                       | 9 +++++----
 src/main/kotlin/no/nav/navansatt/Main.kt            | 5 ++++-
 src/main/kotlin/no/nav/navansatt/mainModule.kt      | 4 ++++
 src/test/kotlin/no/nav/navansatt/AxsysClientTest.kt | 5 ++++-
 5 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 1a53468..d2979af 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -2,6 +2,8 @@ name: Build, push, and deploy
 
 on:
   push:
+    branches:
+      - main
 
 env:
   docker_image: docker.pkg.github.com/${{ github.repository }}/navansatt:${{ github.sha }}
diff --git a/.github/workflows/sandbox.yml b/.github/workflows/sandbox.yml
index e95ba7f..6a8e17b 100644
--- a/.github/workflows/sandbox.yml
+++ b/.github/workflows/sandbox.yml
@@ -1,4 +1,4 @@
-name: Build, push, and deploy
+name: Build, push, and deploy sandbox
 
 on:
   push:
@@ -18,16 +18,17 @@ jobs:
       packages: "write"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: actions/cache@v2
         with:
           path: ~/.m2
           key: "${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}"
           restore-keys: |
             ${{ runner.os }}-maven-
-      - uses: actions/setup-java@v1
+      - uses: actions/setup-java@v4
         with:
-          java-version: 14
+          distribution: temurin
+          java-version: 21
       - name: Build
         shell: bash
         run: |
diff --git a/src/main/kotlin/no/nav/navansatt/Main.kt b/src/main/kotlin/no/nav/navansatt/Main.kt
index 28ef69f..00f9319 100644
--- a/src/main/kotlin/no/nav/navansatt/Main.kt
+++ b/src/main/kotlin/no/nav/navansatt/Main.kt
@@ -7,6 +7,7 @@ import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
 import io.ktor.serialization.kotlinx.json.json
 import io.ktor.server.engine.embeddedServer
 import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.Json
 import org.apache.http.ssl.SSLContexts
 
 @Serializable
@@ -32,7 +33,9 @@ fun main() {
         }
         install(HttpCache)
         install(ContentNegotiation) {
-            json()
+            json(Json {
+                ignoreUnknownKeys = true
+            })
         }
     }
     embeddedServer(io.ktor.server.netty.Netty, port = 7000) {
diff --git a/src/main/kotlin/no/nav/navansatt/mainModule.kt b/src/main/kotlin/no/nav/navansatt/mainModule.kt
index 89dcc1b..8406522 100644
--- a/src/main/kotlin/no/nav/navansatt/mainModule.kt
+++ b/src/main/kotlin/no/nav/navansatt/mainModule.kt
@@ -11,6 +11,8 @@ import io.ktor.server.application.log
 import io.ktor.server.auth.Authentication
 import io.ktor.server.auth.jwt.JWTPrincipal
 import io.ktor.server.auth.jwt.jwt
+import io.ktor.server.locations.KtorExperimentalLocationsAPI
+import io.ktor.server.locations.Locations
 import io.ktor.server.metrics.micrometer.MicrometerMetrics
 import io.ktor.server.plugins.callid.CallId
 import io.ktor.server.plugins.callid.callIdMdc
@@ -29,6 +31,7 @@ import java.net.URL
 import java.util.Locale
 import java.util.UUID
 
+@OptIn(KtorExperimentalLocationsAPI::class)
 fun Application.mainModule(
     config: ApplicationConfig,
     httpClient: HttpClient,
@@ -63,6 +66,7 @@ fun Application.mainModule(
         retrieveFromHeader("correlationId")
         generate { UUID.randomUUID().toString() }
     }
+    install(Locations)
     install(ContentNegotiation) {
         json()
     }
diff --git a/src/test/kotlin/no/nav/navansatt/AxsysClientTest.kt b/src/test/kotlin/no/nav/navansatt/AxsysClientTest.kt
index 74bb08f..605734a 100644
--- a/src/test/kotlin/no/nav/navansatt/AxsysClientTest.kt
+++ b/src/test/kotlin/no/nav/navansatt/AxsysClientTest.kt
@@ -11,6 +11,7 @@ import io.ktor.http.HttpStatusCode
 import io.ktor.http.headersOf
 import io.ktor.serialization.kotlinx.json.json
 import kotlinx.coroutines.runBlocking
+import kotlinx.serialization.json.Json
 import org.junit.Test
 import org.junit.jupiter.api.assertThrows
 import kotlin.test.assertEquals
@@ -120,7 +121,9 @@ class AxsysClientTest {
     private fun makeMockClient(handler: suspend MockRequestHandleScope.(HttpRequestData) -> HttpResponseData): HttpClient {
         return HttpClient(MockEngine) {
             install(ContentNegotiation) {
-                json()
+                json(Json {
+                    ignoreUnknownKeys = true
+                })
             }
             engine {
                 addHandler { request ->

From 809c62192130fb0216d461e3333565296020815c Mon Sep 17 00:00:00 2001
From: ingleiv Johansen <ingleiv.halvard.johansen@nav.no>
Date: Fri, 4 Oct 2024 14:29:20 +0200
Subject: [PATCH 4/4] more metrics

---
 src/main/kotlin/no/nav/navansatt/mainModule.kt | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/main/kotlin/no/nav/navansatt/mainModule.kt b/src/main/kotlin/no/nav/navansatt/mainModule.kt
index 8406522..8171949 100644
--- a/src/main/kotlin/no/nav/navansatt/mainModule.kt
+++ b/src/main/kotlin/no/nav/navansatt/mainModule.kt
@@ -23,6 +23,9 @@ import io.ktor.server.request.header
 import io.ktor.server.request.path
 import io.ktor.server.response.respond
 import io.ktor.server.routing.routing
+import io.micrometer.core.instrument.binder.jvm.JvmGcMetrics
+import io.micrometer.core.instrument.binder.jvm.JvmMemoryMetrics
+import io.micrometer.core.instrument.binder.system.ProcessorMetrics
 import io.micrometer.prometheusmetrics.PrometheusConfig
 import io.micrometer.prometheusmetrics.PrometheusMeterRegistry
 import kotlinx.coroutines.runBlocking
@@ -56,6 +59,11 @@ fun Application.mainModule(
     val metricsRegistry = PrometheusMeterRegistry(PrometheusConfig.DEFAULT)
     install(MicrometerMetrics) {
         registry = metricsRegistry
+        meterBinders = listOf(
+            JvmMemoryMetrics(),
+            JvmGcMetrics(),
+            ProcessorMetrics()
+        )
     }
     install(CallLogging) {
         level = Level.INFO