wip

Author: luantr

.github/workflows/build-and-deploy.yaml

@@ -0,0 +1,17 @@
+name: Build & Deploy
+on:
+  push:
+  workflow_dispatch:
+
+jobs:
+  jar-app:
+    uses: navikt/teamesyfo-github-actions-workflows/.github/workflows/jar-app.yaml@main
+    permissions:
+      actions: read
+      contents: write
+      security-events: write
+      packages: write
+      id-token: write
+    secrets: inherit
+    with:
+      app: esyfovarsel

.github/workflows/deploy-app.yml

@@ -2,9 +2,9 @@ apiVersion: "nais.io/v1alpha1"
 kind: "Application"
 metadata:
   name: dinesykmeldte-backend
-  namespace: teamsykmelding
+  namespace: team-esyfo
   labels:
-    team: teamsykmelding
+    team: team-esyfo
 spec:
   image: {{ image }}
   gcp:
@@ -62,9 +62,6 @@ spec:
       enabled: true
       tenant: trygdeetaten.no
   accessPolicy:
-    inbound:
-      rules:
-        - application: dinesykmeldte
     outbound:
       rules:
         - application: flex-syketilfelle

naiserator-dev.yaml nais/nais-dev.yaml

@@ -3,10 +3,14 @@ package no.nav.syfo
 import io.ktor.server.application.Application
 import io.ktor.server.engine.embeddedServer
 import io.ktor.server.netty.Netty
+import no.nav.syfo.plugins.configureContentNegotiation
 import no.nav.syfo.plugins.configureDependencies
 import no.nav.syfo.plugins.configureLifecycleHooks
 import no.nav.syfo.plugins.configureNaisResources
 import no.nav.syfo.plugins.configurePrometheus
+import no.nav.syfo.plugins.configureRouting
+import no.nav.syfo.plugins.configureRunningTasks
+import no.nav.syfo.plugins.setupAuth
 import org.koin.ktor.ext.get
 
 fun main() {
@@ -16,10 +20,10 @@ fun main() {
 fun Application.module() {
     configureDependencies()
     configurePrometheus()
-    // configureContentNegotiation()
-    // setupAuth(get())
+    configureContentNegotiation()
+    setupAuth(get())
     configureNaisResources(get())
     configureLifecycleHooks(get())
-    // configureRouting()
-    // configureRunningTasks(get(), get())
+    configureRouting()
+    configureRunningTasks(get(), get())
 }

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

@@ -5,11 +5,6 @@ data class Environment(
     val applicationName: String = getEnvVar("NAIS_APP_NAME", "dinesykmeldte-backend"),
     val tokenXWellKnownUrl: String = getEnvVar("TOKEN_X_WELL_KNOWN_URL"),
     val dineSykmeldteBackendTokenXClientId: String = getEnvVar("TOKEN_X_CLIENT_ID"),
-    val databaseUsername: String = getEnvVar("NAIS_DATABASE_USERNAME"),
-    val databasePassword: String = getEnvVar("NAIS_DATABASE_PASSWORD"),
-    val dbHost: String = getEnvVar("NAIS_DATABASE_HOST"),
-    val dbPort: String = getEnvVar("NAIS_DATABASE_PORT"),
-    val dbName: String = getEnvVar("NAIS_DATABASE_DATABASE"),
     val cluster: String = getEnvVar("NAIS_CLUSTER_NAME"),
     val nlResponseTopic: String = "teamsykmelding.syfo-narmesteleder",
     val pdlGraphqlPath: String = getEnvVar("PDL_GRAPHQL_PATH"),
@@ -25,11 +20,8 @@ data class Environment(
         getEnvVar("SYKETILLFELLE_ENDPOINT_URL", "http://flex-syketilfelle.flex"),
     val syketilfelleScope: String = getEnvVar("SYKETILLFELLE_SCOPE"),
     val electorPath: String = getEnvVar("ELECTOR_PATH"),
-) {
-    fun jdbcUrl(): String {
-        return "jdbc:postgresql://$dbHost:$dbPort/$dbName"
-    }
-}
+    val dbUrl: String = getEnvVar("NAIS_DATABASE_JDBC_URL"),
+)
 
 fun getEnvVar(varName: String, defaultValue: String? = null) =
     System.getenv(varName)

src/main/kotlin/no/nav/syfo/Environment.kt

@@ -7,6 +7,7 @@ import java.net.ConnectException
 import java.net.SocketException
 import java.sql.Connection
 import java.sql.ResultSet
+import javax.sql.DataSource
 import no.nav.syfo.Environment
 import no.nav.syfo.util.logger
 import org.flywaydb.core.Flyway
@@ -29,9 +30,7 @@ class Database(private val env: Environment, retries: Long = 30, sleepTime: Long
                 tempDatasource =
                     HikariDataSource(
                         HikariConfig().apply {
-                            jdbcUrl = env.jdbcUrl()
-                            username = env.databaseUsername
-                            password = env.databasePassword
+                            jdbcUrl = env.dbUrl
                             maximumPoolSize = 5
                             minimumIdle = 3
                             isAutoCommit = false
@@ -54,13 +53,13 @@ class Database(private val env: Environment, retries: Long = 30, sleepTime: Long
             throw RuntimeException("Could not connect to DB")
         }
         dataSource = tempDatasource
-        runFlywayMigrations()
+        runFlywayMigrations(dataSource)
     }
 
-    private fun runFlywayMigrations() =
+    private fun runFlywayMigrations(dataSource: DataSource) =
         Flyway.configure().run {
             locations("db")
-            dataSource(env.jdbcUrl(), env.databaseUsername, env.databasePassword)
+            dataSource(dataSource)
             load().migrate()
         }
 }

src/main/kotlin/no/nav/syfo/application/database/Database.kt

@@ -60,12 +60,12 @@ fun Application.configureDependencies() {
 
         modules(
             applicationStateModule(),
-            /*environmentModule(),
+            environmentModule(),
             httpClient(),
             authModule(),
             databaseModule(),
             servicesModule(),
-            commonKafkaConsumer(),*/
+            commonKafkaConsumer(),
         )
     }
 }
@@ -102,10 +102,10 @@ private fun commonKafkaConsumer() = module {
             KafkaConsumer(
                 KafkaUtils.getKafkaConfig("dinesykmeldte-backend-consumer")
                     .also {
-                        it[ConsumerConfig.AUTO_OFFSET_RESET_CONFIG] = "none"
+                        it[ConsumerConfig.AUTO_OFFSET_RESET_CONFIG] = "earliest"
                         it[ConsumerConfig.MAX_POLL_RECORDS_CONFIG] = 100
                     }
-                    .toConsumerConfig("dinesykmeldte-backend", StringDeserializer::class),
+                    .toConsumerConfig("esyfo-dinesykmeldte-backend", StringDeserializer::class),
                 StringDeserializer(),
                 StringDeserializer(),
             )

src/main/kotlin/no/nav/syfo/plugins/DependencyInjection.kt

@@ -38,16 +38,15 @@ class TestDb private constructor() {
                 psqlContainer =
                     PsqlContainer()
                         .withExposedPorts(5432)
-                        .withUsername("username")
+                        .withUsername("user")
                         .withPassword("password")
                         .withDatabaseName("dinesykmeldte-backend")
                         .withInitScript("db/testdb-init.sql")
 
                 psqlContainer.start()
                 val mockEnv = mockk<Environment>(relaxed = true)
-                every { mockEnv.databaseUsername } returns "username"
-                every { mockEnv.databasePassword } returns "password"
-                every { mockEnv.jdbcUrl() } returns psqlContainer.jdbcUrl
+                every { mockEnv.dbUrl } returns
+                    "${psqlContainer.jdbcUrl}&user=${psqlContainer.username}&password=${psqlContainer.password}"
                 database = Database(mockEnv)
             } catch (ex: Exception) {
                 throw ex
@@ -265,16 +264,16 @@ fun DatabaseInterface.insertHendelse(hendelseDbModel: HendelseDbModel) {
                 preparedStatement.setString(6, hendelseDbModel.tekst)
                 preparedStatement.setTimestamp(
                     7,
-                    Timestamp.from(hendelseDbModel.timestamp.toInstant())
+                    Timestamp.from(hendelseDbModel.timestamp.toInstant()),
                 )
                 preparedStatement.setTimestamp(
                     8,
-                    hendelseDbModel.utlopstidspunkt?.let { Timestamp.from(it.toInstant()) }
+                    hendelseDbModel.utlopstidspunkt?.let { Timestamp.from(it.toInstant()) },
                 )
                 preparedStatement.setBoolean(9, hendelseDbModel.ferdigstilt)
                 preparedStatement.setTimestamp(
                     10,
-                    hendelseDbModel.ferdigstiltTimestamp?.let { Timestamp.from(it.toInstant()) }
+                    hendelseDbModel.ferdigstiltTimestamp?.let { Timestamp.from(it.toInstant()) },
                 )
                 preparedStatement.setObject(11, hendelseDbModel.hendelseId)
                 preparedStatement.executeUpdate()
@@ -320,7 +319,7 @@ fun DatabaseInterface.insertOrUpdate(soknadDbModel: SoknadDbModel) {
                 preparedStatement.setBoolean(7, soknadDbModel.lest)
                 preparedStatement.setTimestamp(
                     8,
-                    Timestamp.from(soknadDbModel.timestamp.toInstant())
+                    Timestamp.from(soknadDbModel.timestamp.toInstant()),
                 )
                 preparedStatement.setObject(9, soknadDbModel.tom)
                 preparedStatement.executeUpdate()
@@ -374,7 +373,7 @@ fun DatabaseInterface.insertOrUpdate(
                 preparedStatement.setBoolean(6, sykmeldingDbModel.lest)
                 preparedStatement.setTimestamp(
                     7,
-                    Timestamp.from(sykmeldingDbModel.timestamp.toInstant())
+                    Timestamp.from(sykmeldingDbModel.timestamp.toInstant()),
                 )
                 preparedStatement.setObject(8, sykmeldingDbModel.latestTom)
                 preparedStatement.setTimestamp(9, sendtTilArbeidsgiverDato)
@@ -386,7 +385,7 @@ fun DatabaseInterface.insertOrUpdate(
                 preparedStatement.setBoolean(14, sykmeldingDbModel.lest)
                 preparedStatement.setTimestamp(
                     15,
-                    Timestamp.from(sykmeldingDbModel.timestamp.toInstant())
+                    Timestamp.from(sykmeldingDbModel.timestamp.toInstant()),
                 )
                 preparedStatement.setObject(16, sykmeldingDbModel.latestTom)
                 preparedStatement.setTimestamp(17, sendtTilArbeidsgiverDato)

src/main/resources/db/V17__grant_privileges_dinesykmeldte_write_user.sql

@@ -1,3 +1 @@
 create role cloudsqliamuser;
-create role "dinesykmeldte-write-user";
-create role "dinesykmeldte-kafka-user";