Added gRpc as an alternativ to getting inntekt [WIP] (#94)

* Added gRpc as an alternativ to getting inntekt [WIP]
* Added method `getSpesifisertInntekt` to inntekt store
- Retrieves inntekt and beregningsdato from db and converts it to Spesifisert inntekt as defined in dagpenger-events

Todos
- [ x ] Naiserator doesn't support more than one port binding from a pod. We may need two deploys
- [ ] Create a small client wrapper which can serialize JSON to Inntekt as defined in dagpenger-events
- [ ] Authentication

navikt/dagpenger#406

Co-authored-by: Giao The Cung <[email protected]>

Author: geiralund

.dockerignore

@@ -2,4 +2,4 @@
 **
 
 # Except shadow jar
-!build/libs/*.jar
+!dp-inntekt-api/build/libs/dp-inntekt-api-all.jar

Dockerfile

@@ -1,3 +1,5 @@
-FROM navikt/java:11
+FROM navikt/java:13
 
-COPY build/libs/*-all.jar app.jar
+EXPOSE 50051
+
+COPY dp-inntekt-api/build/libs/dp-inntekt-api-all.jar /app/app.jar

Jenkinsfile

@@ -56,7 +56,7 @@ pipeline {
             reportName: 'Test coverage'
           ]
 
-          junit 'build/test-results/test/*.xml'
+          junit '**/build/test-results/test/*.xml'
         }
       }
     }

build.gradle.kts

@@ -2,148 +2,93 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
 
 plugins {
-    application
     kotlin("jvm") version Kotlin.version
     id(Spotless.spotless) version Spotless.version
-    id(Shadow.shadow) version Shadow.version
 }
 
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-}
-
-apply {
-    plugin(Spotless.spotless)
-}
+val grpcVersion = "1.27.2"
 
 repositories {
-    mavenCentral()
     jcenter()
-    maven("https://packages.confluent.io/maven/")
     maven("https://jitpack.io")
 }
 
-application {
-    applicationName = "dp-inntekt-api"
-    mainClassName = "no.nav.dagpenger.inntekt.InntektApiKt"
-}
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
-}
-
-dependencyLocking {
-    lockAllConfigurations()
-}
-
-configurations.all {
-    resolutionStrategy.activateDependencyLocking()
-    resolutionStrategy.preferProjectModules()
-    resolutionStrategy.eachDependency { DependencyResolver.execute(this) }
-}
-
-dependencies {
-    implementation(kotlin("stdlib-jdk8"))
-
-    implementation(Dagpenger.Events)
+allprojects {
+    group = "no.nav.dagpenger"
 
-    implementation(Ktor.server)
-    implementation(Ktor.serverNetty)
-    implementation(Ktor.auth)
-    implementation(Ktor.authJwt)
-    implementation(Ktor.micrometerMetrics)
-    implementation(Dagpenger.Biblioteker.ktorUtils)
-    implementation(Micrometer.prometheusRegistry)
+    apply(plugin = "org.jetbrains.kotlin.jvm")
+    apply(plugin = Spotless.spotless)
 
-    implementation(Moshi.moshi)
-    implementation(Moshi.moshiAdapters)
-    implementation(Moshi.moshiKotlin)
-    implementation(Moshi.moshiKtor)
+    dependencies {
+        implementation(kotlin("stdlib-jdk8"))
 
-    implementation(Dagpenger.Streams)
-    implementation(Kafka.clients)
+        // ulid
+        implementation(Ulid.ulid)
 
-    implementation(Kotlin.Logging.kotlinLogging)
-
-    implementation(Fuel.fuel)
-    implementation(Fuel.fuelMoshi)
-    implementation(Fuel.library("coroutines"))
+        testImplementation(kotlin("test"))
+        testImplementation(Junit5.api)
+        testRuntimeOnly(Junit5.engine)
+        testImplementation(KoTest.assertions)
+        testImplementation(KoTest.runner)
+    }
 
-    implementation(Log4j2.api)
-    implementation(Log4j2.core)
-    implementation(Log4j2.slf4j)
-    implementation(Log4j2.Logstash.logstashLayout)
+    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+        kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString()
+    }
 
-    implementation(Ulid.ulid)
+    java {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
 
-    implementation(Dagpenger.Biblioteker.stsKlient)
+    tasks.withType<Wrapper> {
+        gradleVersion = "6.3"
+    }
 
-    implementation(Database.Flyway)
-    implementation(Database.HikariCP)
-    implementation(Database.Postgres)
-    implementation(Database.Kotlinquery)
-    implementation(Konfig.konfig)
-    implementation(Database.VaultJdbc) {
-        exclude(module = "slf4j-simple")
-        exclude(module = "slf4j-api")
+    spotless {
+        kotlin {
+            targetExclude("**/generated/**") // ignore generated gRpc stuff
+            ktlint()
+        }
+        kotlinGradle {
+            target("*.gradle.kts", "buildSrc/**/*.kt*")
+            ktlint()
+        }
     }
 
-    implementation(Prometheus.common)
-    implementation(Prometheus.hotspot)
-    implementation(Prometheus.log4j2)
-
-    implementation(Bekk.nocommons)
-
-    implementation(Kotlinx.bimap)
-
-    testImplementation(kotlin("test"))
-    testImplementation(Ktor.ktorTest)
-    testImplementation(Junit5.api)
-    testImplementation(Junit5.params)
-    testRuntimeOnly(Junit5.engine)
-    testImplementation(Wiremock.standalone)
-    testImplementation(KoTest.assertions)
-    testImplementation(KoTest.runner)
-    testImplementation(KoTest.property)
-    testImplementation(TestContainers.postgresql)
-    testImplementation(TestContainers.kafka)
-    testImplementation(Mockk.mockk)
-    testImplementation(JsonAssert.jsonassert)
-}
+    tasks.withType<Test> {
+        useJUnitPlatform()
+        testLogging {
+            showExceptions = true
+            showStackTraces = true
+            exceptionFormat = TestExceptionFormat.FULL
+            events = setOf(TestLogEvent.PASSED, TestLogEvent.SKIPPED, TestLogEvent.FAILED)
+        }
+    }
 
-spotless {
-    kotlin {
-        ktlint()
+    tasks.named("compileKotlin") {
+        dependsOn("spotlessApply", "spotlessKotlinCheck")
     }
-    kotlinGradle {
-        target("*.gradle.kts", "buildSrc/**/*.kt*")
-        ktlint()
+
+    tasks.named("jar") {
+        dependsOn("test")
     }
 }
 
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> { kotlinOptions.jvmTarget = "1.8" }
+subprojects {
+    apply(plugin = "org.jetbrains.kotlin.jvm")
 
-tasks.withType<Test> {
-    useJUnitPlatform()
-    testLogging {
-        showExceptions = true
-        showStackTraces = true
-        exceptionFormat = TestExceptionFormat.FULL
-        events = setOf(TestLogEvent.PASSED, TestLogEvent.SKIPPED, TestLogEvent.FAILED)
+    repositories {
+        jcenter()
+        maven("https://jitpack.io")
     }
-}
 
-tasks.withType<Wrapper> {
-    gradleVersion = "6.0.1"
-}
+    dependencies {
+        implementation(kotlin("stdlib-jdk8"))
 
-tasks.named("shadowJar") {
-    dependsOn("test")
-}
-
-tasks.named("compileKotlin") {
-    dependsOn("spotlessKotlinCheck")
+        testImplementation(kotlin("test"))
+        testImplementation(Junit5.api)
+        testRuntimeOnly(Junit5.engine)
+        testImplementation(Mockk.mockk)
+    }
 }

dp-inntekt-api/build.gradle.kts

@@ -0,0 +1,99 @@
+plugins {
+    application
+    id(Shadow.shadow).version("5.2.0")
+}
+
+repositories {
+    maven("https://packages.confluent.io/maven/")
+}
+
+application {
+    applicationName = "dp-inntekt-api"
+    mainClassName = "no.nav.dagpenger.inntekt.InntektApiKt"
+}
+
+val grpcVersion = "1.29.0"
+
+dependencies {
+    implementation(project(":dp-inntekt-grpc"))
+
+    implementation(Dagpenger.Events)
+
+    implementation(Ktor.server)
+    implementation(Ktor.serverNetty)
+    implementation(Ktor.auth)
+    implementation(Ktor.authJwt)
+    implementation(Ktor.micrometerMetrics)
+    implementation(Dagpenger.Biblioteker.ktorUtils)
+    implementation(Micrometer.prometheusRegistry)
+
+    implementation(Moshi.moshi)
+    implementation(Moshi.moshiAdapters)
+    implementation(Moshi.moshiKotlin)
+    implementation(Moshi.moshiKtor)
+
+    implementation(Dagpenger.Streams)
+    implementation(Kafka.clients)
+
+    implementation(Kotlin.Logging.kotlinLogging)
+
+    implementation(Fuel.fuel)
+    implementation(Fuel.fuelMoshi)
+    implementation(Fuel.library("coroutines"))
+
+    implementation(Log4j2.api)
+    implementation(Log4j2.core)
+    implementation(Log4j2.slf4j)
+    implementation(Log4j2.Logstash.logstashLayout)
+
+    implementation(Ulid.ulid)
+
+    implementation(Dagpenger.Biblioteker.stsKlient)
+
+    implementation(Database.Flyway)
+    implementation(Database.HikariCP)
+    implementation(Database.Postgres)
+    implementation(Database.Kotlinquery)
+    implementation(Konfig.konfig)
+    implementation(Database.VaultJdbc) {
+        exclude(module = "slf4j-simple")
+        exclude(module = "slf4j-api")
+    }
+
+    implementation(Prometheus.common)
+    implementation(Prometheus.hotspot)
+    implementation(Prometheus.log4j2)
+
+    implementation(Bekk.nocommons)
+
+    implementation(Kotlinx.bimap)
+
+    // grpc
+    testImplementation("io.grpc:grpc-testing:$grpcVersion")
+    runtimeOnly("io.grpc:grpc-netty-shaded:$grpcVersion")
+
+    testImplementation(kotlin("test"))
+    testImplementation(Ktor.ktorTest)
+    testImplementation(Junit5.api)
+    testImplementation(Junit5.params)
+    testRuntimeOnly(Junit5.engine)
+    testRuntimeOnly(Junit5.vintageEngine)
+    testImplementation(Wiremock.standalone)
+    testImplementation(KoTest.assertions)
+    testImplementation(KoTest.runner)
+    testImplementation(KoTest.property)
+    testImplementation(TestContainers.postgresql)
+    testImplementation(TestContainers.kafka)
+    testImplementation(Mockk.mockk)
+    testImplementation(JsonAssert.jsonassert)
+}
+
+dependencyLocking {
+    lockAllConfigurations()
+}
+
+configurations.all {
+    resolutionStrategy.activateDependencyLocking()
+    resolutionStrategy.preferProjectModules()
+    resolutionStrategy.eachDependency { DependencyResolver.execute(this) }
+}

src/main/kotlin/no/nav/dagpenger/inntekt/BehandlingsInntektsGetter.kt renamed to dp-inntekt-api/src/main/kotlin/no/nav/dagpenger/inntekt/BehandlingsInntektsGetter.kt

@@ -34,6 +34,7 @@ import java.net.URI
 import java.net.URL
 import java.util.concurrent.TimeUnit
 import kotlin.concurrent.fixedRateTimer
+import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import mu.KotlinLogging
 import no.nav.dagpenger.inntekt.db.IllegalInntektIdException
@@ -46,6 +47,7 @@ import no.nav.dagpenger.inntekt.inntektskomponenten.v1.InntektskomponentClient
 import no.nav.dagpenger.inntekt.inntektskomponenten.v1.InntektskomponentHttpClient
 import no.nav.dagpenger.inntekt.inntektskomponenten.v1.InntektskomponentenHttpClientException
 import no.nav.dagpenger.inntekt.oppslag.OppslagClient
+import no.nav.dagpenger.inntekt.rpc.InntektGrpcServer
 import no.nav.dagpenger.inntekt.subsumsjonbrukt.KafkaSubsumsjonBruktDataConsumer
 import no.nav.dagpenger.inntekt.subsumsjonbrukt.Vaktmester
 import no.nav.dagpenger.inntekt.v1.InntektNotAuthorizedException
@@ -84,6 +86,13 @@ fun main() = runBlocking {
         listen()
     }
 
+    val gRpcServer = InntektGrpcServer(port = 50051, inntektStore = postgresInntektStore)
+
+    launch {
+        gRpcServer.start()
+        gRpcServer.blockUntilShutdown()
+    }
+
     val vaktmester = Vaktmester(dataSource)
 
     fixedRateTimer(