Oppdatert tolking av miljøvariabler for JDBC URL

Author: naviktthomas

Diff for: apps/bekreftelse-api/src/main/resources/nais/database_config.toml

@@ -1,5 +1 @@
-host = "${NAIS_DATABASE_PAW_ARBEIDSSOEKERREGISTERET_API_BEKREFTELSE_BEKREFTELSER_HOST}"
-port = "${NAIS_DATABASE_PAW_ARBEIDSSOEKERREGISTERET_API_BEKREFTELSE_BEKREFTELSER_PORT}"
-username = "${NAIS_DATABASE_PAW_ARBEIDSSOEKERREGISTERET_API_BEKREFTELSE_BEKREFTELSER_USERNAME}"
-password = "${NAIS_DATABASE_PAW_ARBEIDSSOEKERREGISTERET_API_BEKREFTELSE_BEKREFTELSER_PASSWORD}"
-database = "${NAIS_DATABASE_PAW_ARBEIDSSOEKERREGISTERET_API_BEKREFTELSE_BEKREFTELSER_DATABASE}"
+jdbcUrl = "${NAIS_DATABASE_PAW_ARBEIDSSOEKERREGISTERET_API_BEKREFTELSE_BEKREFTELSER_JDBC_URL}"

Diff for: lib/database/src/main/kotlin/no/nav/paw/database/config/DatabaseConfig.kt

@@ -5,16 +5,33 @@ import java.time.Duration
 const val DATABASE_CONFIG = "database_config.toml"
 
 data class DatabaseConfig(
-    val host: String,
-    val port: Int,
-    val username: String,
-    val password: String,
-    val database: String,
+    val jdbcUrl: String?,
+    val url: String?,
+    val host: String?,
+    val port: Int?,
+    val username: String?,
+    val password: String?,
+    val database: String?,
     val autoCommit: Boolean = true,
     val maximumPoolSize: Int = 3,
     val connectionTimeout: Duration = Duration.ofSeconds(30),
     val idleTimeout: Duration = Duration.ofMinutes(10),
     val maxLifetime: Duration = Duration.ofMinutes(30)
 ) {
-    val url get() = "jdbc:postgresql://$host:$port/$database?user=$username&password=$password"
+    fun buildJdbcUrl(): String {
+        return if (jdbcUrl != null) {
+            require(jdbcUrl.isBlank()) { "JDBC URL er tom" }
+            jdbcUrl
+        } else if (url != null) {
+            require(url.isBlank()) { "URL er tom" }
+            "jdbc:$url"
+        } else {
+            require(!host.isNullOrBlank()) { "Host er ikke satt" }
+            requireNotNull(port) { "Port er ikke satt" }
+            require(!username.isNullOrBlank()) { "Username er ikke satt" }
+            require(!password.isNullOrBlank()) { "Password er ikke satt" }
+            require(!database.isNullOrBlank()) { "Database er ikke satt" }
+            "jdbc:postgresql://$host:$port/$database?user=$username&password=$password"
+        }
+    }
 }

Diff for: lib/database/src/main/kotlin/no/nav/paw/database/factory/DataSourceFactory.kt

@@ -7,7 +7,7 @@ import no.nav.paw.database.config.DatabaseConfig
 fun createHikariDataSource(databaseConfig: DatabaseConfig): HikariDataSource =
     HikariDataSource(
         HikariConfig().apply {
-            jdbcUrl = databaseConfig.url
+            jdbcUrl = databaseConfig.buildJdbcUrl()
             maximumPoolSize = databaseConfig.maximumPoolSize
             isAutoCommit = databaseConfig.autoCommit
             connectionTimeout = databaseConfig.connectionTimeout.toMillis()