Forenkle ytterligere

Author: magnusae

src/main/kotlin/Database.kt

@@ -22,7 +22,6 @@ class Database(
                 Flyway
                     .configure()
                     .dataSource(dataSource)
-                    .lockRetryCount(50)
                     .load()
                     .migrate()
             }.close()

src/main/kotlin/Env.kt

@@ -21,10 +21,11 @@ object Env {
     }
 
     object Database {
-        val url = "NAIS_DATABASE_DIALOG_DIALOG_JDBC_URL".fromEnv()
-        val username = "NAIS_DATABASE_DIALOG_DIALOG_USERNAME".fromEnv()
-        val password = "NAIS_DATABASE_DIALOG_DIALOG_PASSWORD".fromEnv()
-        val name = "NAIS_DATABASE_DIALOG_DIALOG_DATABASE".fromEnv()
+        private val databasePrefix = "NAIS_DATABASE_DIALOG_DIALOG"
+        val url = "${databasePrefix}_JDBC_URL".fromEnv()
+        val username = "${databasePrefix}_USERNAME".fromEnv()
+        val password = "${databasePrefix}_PASSWORD".fromEnv()
+        val name = "${databasePrefix}_DATABASE".fromEnv()
     }
 
     val navArbeidsgiverApiBaseUrl = "NAV_ARBEIDSGIVER_API_BASEURL".fromEnv()

src/test/kotlin/FunSpecWithDb.kt

@@ -25,11 +25,6 @@ abstract class FunSpecWithDb(
         body(db.db)
     })
 
-fun postgresContainer(): PostgreSQLContainer<Nothing> =
-    PostgreSQLContainer<Nothing>("postgres:17").apply {
-        setCommand("postgres", "-c", "fsync=off", "-c", "log_statement=all", "-c", "wal_level=logical")
-    }
-
 private fun PostgreSQLContainer<Nothing>.setupAndStart(): PostgreSQLContainer<Nothing> =
     apply {
         withReuse(true)
@@ -41,7 +36,7 @@ private fun PostgreSQLContainer<Nothing>.setupAndStart(): PostgreSQLContainer<No
     }
 
 private fun dbConfig(): HikariConfig {
-    val postgres = postgresContainer().setupAndStart()
+    val postgres = PostgreSQLContainer<Nothing>("postgres:17").setupAndStart()
     return HikariConfig().apply {
         jdbcUrl = postgres.jdbcUrl
         username = postgres.username