Merge pull request #76 from navikt/dev

[PROD][KAIZEN-0] release

Author: Jesperpaulsen

.editorconfig

@@ -1,3 +1,10 @@
-[*.kt]
-ktlint_disabled_rules=no-wildcard-imports,filename
-ij_kotlin_allow_trailing_comma=true
+[/src/**.kt]
+ktlint_standard_no-wildcard-imports = disabled
+ktlint_standard_filename=disabled
+ij_kotlin_allow_trailing_comma=true
+
+[/build/**.kt]
+ktlint_standard=disabled
+
+[*.kts]
+ktlint_standard_property-naming=disabled

.github/workflows/main.yml

@@ -13,16 +13,16 @@ jobs:
     if: github.ref != 'refs/heads/dev' && github.ref != 'refs/heads/master'
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: 11
+          java-version: 17
           cache: 'gradle'
       - name: Install ktlint
         uses: nbadal/action-ktlint-setup@v1
         with:
-          ktlint_version: '0.47.1'
+          ktlint_version: '1.0.0'
       - name: Ktlint
         run: ktlint src/**/*.kt
         shell: bash
@@ -33,13 +33,15 @@ jobs:
     name: Build and push Docker container
     if: github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/master'
     runs-on: ubuntu-latest
+    permissions:
+      packages: write
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: 11
+          java-version: 17
           cache: 'gradle'
         continue-on-error: true
       - name: Build

Dockerfile

@@ -1,4 +1,4 @@
-FROM navikt/java:11-appdynamics
+FROM navikt/java:17-appdynamics
 ENV APPD_ENABLED=true
 
 COPY java-debug.sh /init-scripts/08-java-debug.sh

build.gradle.kts

@@ -20,14 +20,15 @@ val graphql_kotlin_version: String by project
 
 plugins {
     application
-    kotlin("jvm") version "1.7.0"
-    id("org.jetbrains.kotlin.plugin.serialization") version "1.7.0"
+    kotlin("jvm") version "1.8.0"
+    id("org.jetbrains.kotlin.plugin.serialization") version "1.8.0"
     id("com.github.johnrengelman.shadow") version "7.1.2"
-    id("com.expediagroup.graphql") version "5.5.0"
+    id("com.expediagroup.graphql") version "6.4.0"
 }
 
 group = "no.nav"
 version = "0.0.1"
+
 application {
     mainClass.set("no.nav.ApplicationKt")
 
@@ -57,24 +58,21 @@ repositories {
 }
 
 dependencies {
+    implementation("io.ktor:ktor-server:$ktor_version")
     implementation("io.ktor:ktor-server-core:$ktor_version")
-    implementation("io.ktor:ktor-auth:$ktor_version")
-    implementation("io.ktor:ktor-auth-jwt:$ktor_version")
-    implementation("io.ktor:ktor-metrics-micrometer:$ktor_version")
+    implementation("io.ktor:ktor-server-auth:$ktor_version")
+    implementation("io.ktor:ktor-server-auth-jwt:$ktor_version")
     implementation("io.ktor:ktor-serialization:$ktor_version")
     implementation("io.ktor:ktor-server-netty:$ktor_version")
     implementation("io.ktor:ktor-client-core:$ktor_version")
     implementation("io.ktor:ktor-client-okhttp:$ktor_version")
-    implementation("io.ktor:ktor-client-serialization:$ktor_version")
+    implementation("io.ktor:ktor-serialization-kotlinx-json:$ktor_version")
     implementation("org.jetbrains.kotlinx:kotlinx-datetime:$kotlinx_datetime_version")
     implementation("io.bkbn:kompendium-core:$kompendium_version")
-    implementation("io.bkbn:kompendium-auth:$kompendium_version")
-    implementation("io.bkbn:kompendium-swagger-ui:$kompendium_version")
-    implementation("org.webjars:webjars-locator-core:0.50")
     implementation("no.nav.tjenestespesifikasjoner:person-v3-tjenestespesifikasjon:$tjenestespec_version")
     implementation("no.nav.tjenestespesifikasjoner:utbetaling-tjenestespesifikasjon:$tjenestespec_version")
-    implementation("no.nav.personoversikt:kotlin-utils:$modia_common_utils_version")
-
+    implementation("com.github.navikt.modia-common-utils:kotlin-utils:$modia_common_utils_version")
+    implementation("com.github.navikt.modia-common-utils:ktor-utils:$modia_common_utils_version")
     implementation("no.nav.common:token-client:$nav_common_version")
     implementation("no.nav.common:cxf:$nav_common_version")
     implementation("no.nav.common:client:$nav_common_version")
@@ -85,18 +83,20 @@ dependencies {
     implementation("ch.qos.logback:logback-classic:$logback_version")
     implementation("net.logstash.logback:logstash-logback-encoder:$logstash_version")
     implementation("com.expediagroup:graphql-kotlin-ktor-client:$graphql_kotlin_version")
-
+    implementation("io.ktor:ktor-client-okhttp-jvm:2.3.0")
+    implementation("io.ktor:ktor-server-core-jvm:2.3.0")
+    implementation("io.ktor:ktor-server-swagger-jvm:2.3.0")
 
     testImplementation("io.mockk:mockk:1.12.4")
-    testImplementation("io.ktor:ktor-server-tests:$ktor_version")
+    testImplementation("io.ktor:ktor-server-tests:2.3.0")
     testImplementation("io.ktor:ktor-client-mock:$ktor_version")
     testImplementation("org.junit.jupiter:junit-jupiter:$junit_version")
 }
 
 tasks.withType<Test> {
     useJUnitPlatform()
 
-    testLogging {     // This is for logging and can be removed.
+    testLogging { // This is for logging and can be removed.
         events("passed", "skipped", "failed")
     }
 }
@@ -137,22 +137,22 @@ val generatePDLClient by tasks.creating(GraphQLGenerateClientTask::class) {
         GraphQLScalar(
             "Long",
             "no.nav.api.pdl.converters.PdlLong",
-            "no.nav.api.pdl.converters.LongScalarConverter"
-        )
+            "no.nav.api.pdl.converters.LongScalarConverter",
+        ),
     )
     customScalars.add(
         GraphQLScalar(
             "Date",
             "kotlinx.datetime.LocalDate",
-            "no.nav.api.pdl.converters.DateScalarConverter"
-        )
+            "no.nav.api.pdl.converters.DateScalarConverter",
+        ),
     )
     customScalars.add(
         GraphQLScalar(
             "DateTime",
             "kotlinx.datetime.LocalDateTime",
-            "no.nav.api.pdl.converters.DateTimeScalarConverter"
-        )
+            "no.nav.api.pdl.converters.DateTimeScalarConverter",
+        ),
     )
     dependsOn("downloadPDLSchema")
-}
+}

gradle.properties

@@ -1,13 +1,13 @@
-ktor_version=1.6.8
+ktor_version=2.3.0
 kotlin_version=1.7.0
 kotlinx_datetime_version=0.4.0
-kompendium_version=2.3.5
+kompendium_version=3.14.4
 logback_version=1.2.11
 logstash_version=7.2
 kotlin.code.style=official
 prometeus_version=1.6.3
-nav_common_version=2.2022.06.20_04.34-44e077dc9a78
+nav_common_version=2.2023.01.10_13.49-81ddc732df3a
 tjenestespec_version=1.2020.06.16-14.51-3b45df54f90a
-modia_common_utils_version=1.2022.08.01-11.26-97308e41bb8d
+modia_common_utils_version=1.2023.07.20-13.43-64707e48b53b
 junit_version=5.8.2
-graphql_kotlin_version=5.5.0
+graphql_kotlin_version=6.4.0

src/main/kotlin/no/nav/Application.kt

@@ -1,17 +1,23 @@
 package no.nav
 
-import io.bkbn.kompendium.auth.Notarized.notarizedAuthenticate
-import io.ktor.routing.*
+import io.ktor.server.auth.*
 import io.ktor.server.engine.*
 import io.ktor.server.netty.*
+import io.ktor.server.routing.*
 import no.nav.api.debug.configureDebugRoutes
 import no.nav.api.dialog.configureDialogRoutes
+import no.nav.api.dialog.configureDialogRoutesV2
 import no.nav.api.digdir.configureDigdirRoutes
+import no.nav.api.digdir.configureDigdirRoutesV2
 import no.nav.api.oppfolging.configureOppfolgingRoutes
+import no.nav.api.oppfolging.configureOppfolgingRoutesV2
 import no.nav.api.pdl.configurePdlRoutes
+import no.nav.api.pdl.configurePdlRoutesV2
 import no.nav.api.skrivestotte.configureSkrivestotteRoutes
 import no.nav.api.tps.configureTpsRoutes
+import no.nav.api.tps.configureTpsRoutesV2
 import no.nav.api.utbetalinger.configureUtbetalingerRoutes
+import no.nav.api.utbetalinger.configureUtbetalingerRoutesV2
 import no.nav.plugins.*
 
 fun startApplication(
@@ -29,16 +35,22 @@ fun startApplication(
         configureExceptionHandling()
 
         routing {
-            notarizedAuthenticate(securityScheme) {
+            authenticate(SECURITY_SCHEME_NAME) {
                 route("api") {
                     configureDebugRoutes(consumers.tokenclient)
                     configureOppfolgingRoutes(services.oppfolgingService)
+                    configureOppfolgingRoutesV2(services.oppfolgingService)
                     configurePdlRoutes(services.pdlService)
+                    configurePdlRoutesV2(services.pdlService)
                     configureTpsRoutes(services.tpsService)
+                    configureTpsRoutesV2(services.tpsService)
                     configureDialogRoutes(services.dialogService)
+                    configureDialogRoutesV2(services.dialogService)
                     configureDigdirRoutes(services.digdirService)
+                    configureDigdirRoutesV2(services.digdirService)
                     configureSkrivestotteRoutes(services.skrivestotteService)
                     configureUtbetalingerRoutes(services.utbetalingerService)
+                    configureUtbetalingerRoutesV2(services.utbetalingerService)
                 }
             }
         }

src/main/kotlin/no/nav/Consumers.kt

@@ -34,33 +34,39 @@ interface Consumers {
 
 class ConsumersImpl(env: Env) : Consumers {
     private val modiaUser = NaisUtils.getCredentials("service_user")
-    private val stsConfig: StsConfig = StsConfig
-        .builder()
-        .url(env.soapStsUrl)
-        .username(modiaUser.username)
-        .password(modiaUser.password)
-        .build()
+    private val stsConfig: StsConfig =
+        StsConfig
+            .builder()
+            .url(env.soapStsUrl)
+            .username(modiaUser.username)
+            .password(modiaUser.password)
+            .build()
 
-    override val oboTokenClient: OnBehalfOfTokenClient = AzureAdTokenClientBuilder
-        .builder()
-        .withNaisDefaults()
-        .buildOnBehalfOfTokenClient()
+    override val oboTokenClient: OnBehalfOfTokenClient =
+        AzureAdTokenClientBuilder
+            .builder()
+            .withNaisDefaults()
+            .buildOnBehalfOfTokenClient()
 
-    override val tokenclient: MachineToMachineTokenClient = AzureAdTokenClientBuilder
-        .builder()
-        .withNaisDefaults()
-        .buildMachineToMachineTokenClient()
+    override val tokenclient: MachineToMachineTokenClient =
+        AzureAdTokenClientBuilder
+            .builder()
+            .withNaisDefaults()
+            .buildMachineToMachineTokenClient()
 
     override val oppfolgingClient: OppfolgingClient = OppfolgingClient(env.oppfolgingUrl, oboTokenClient.bindTo(env.oppfolgingScope))
-    override val tps: PersonV3 = CXFClient<PersonV3>()
-        .address(env.tpsPersonV3Url)
-        .configureStsForSystemUser(stsConfig)
-        .build()
+    override val tps: PersonV3 =
+        CXFClient<PersonV3>()
+            .address(env.tpsPersonV3Url)
+            .configureStsForSystemUser(stsConfig)
+            .build()
     override val nom: NomClient = Nom(env.nomUrl, tokenclient.bindTo(env.nomScope)).client
     override val skrivestotteClient: SkrivestotteClient = SkrivestotteClient(env.skrivestotteUrl)
     override val pdlClient: PdlClient = PdlClient(env.pdlUrl, oboTokenClient.bindTo(env.pdlScope))
     override val safClient: SafClient = SafClient(env.safUrl, oboTokenClient.bindTo(env.safScope))
-    override val digdirClient: DigdirClient = DigdirClient(env.digdirUrl, tokenclient.bindTo(env.digdirScope), oboTokenClient.bindTo(env.digdirScope))
-    override val utbetalingerClient: UtbetalingerClient = UtbetalingerClient(env.utbetalingSokosUrl, oboTokenClient.bindTo(env.utbetalingSokosScope))
+    override val digdirClient: DigdirClient =
+        DigdirClient(env.digdirUrl, tokenclient.bindTo(env.digdirScope), oboTokenClient.bindTo(env.digdirScope))
+    override val utbetalingerClient: UtbetalingerClient =
+        UtbetalingerClient(env.utbetalingSokosUrl, oboTokenClient.bindTo(env.utbetalingSokosScope))
     override val sfClient: SFClient = SFClient(env.sfUrl, oboTokenClient.bindTo(env.sfScope))
 }

src/main/kotlin/no/nav/Env.kt

@@ -1,13 +1,14 @@
 package no.nav
 
-import no.nav.personoversikt.utils.EnvUtils.getRequiredConfig
+import no.nav.personoversikt.common.utils.EnvUtils.getRequiredConfig
 import no.nav.utils.DownstreamApi
 import no.nav.utils.parse
 
 interface Env {
     companion object {
         operator fun invoke(): Env = EnvImpl()
     }
+
     val soapStsUrl: String
     val jwksUrl: String
     val tpsPersonV3Url: String

src/main/kotlin/no/nav/Services.kt

@@ -21,11 +21,13 @@ interface Services {
     val dialogService: DialogService
     val utbetalingerService: UtbetalingerService
 }
+
 class ServicesImpl(consumers: Consumers) : Services {
-    override val oppfolgingService = OppfolgingService(
-        consumers.oppfolgingClient,
-        consumers.nom
-    )
+    override val oppfolgingService =
+        OppfolgingService(
+            consumers.oppfolgingClient,
+            consumers.nom,
+        )
     override val tpsService = TpsService(consumers.tps)
     override val skrivestotteService = SkrivestotteService(consumers.skrivestotteClient)
     override val digdirService = DigdirService(consumers.digdirClient)

src/main/kotlin/no/nav/Vault.kt

@@ -17,5 +17,9 @@ object Vault {
     }
 
     fun readVaultfile(file: Path): String = file.readText()
-    fun fromVaultfile(file: Path, block: (String) -> Unit) = block(readVaultfile(file))
+
+    fun fromVaultfile(
+        file: Path,
+        block: (String) -> Unit,
+    ) = block(readVaultfile(file))
 }