Don't hardcode psql connection string

Author: duncte123

build.gradle.kts

@@ -264,10 +264,11 @@ kotlinter {
     reporters = arrayOf("checkstyle", "plain")
     experimentalRules = true
     disabledRules = arrayOf(
-        "no-wildcard-imports", "experimental:indent",
-        "experimental:argument-list-wrapping",
+        "filename", "no-wildcard-imports", "experimental:indent",
+        "argument-list-wrapping",
         "experimental:spacing-between-declarations-with-annotations",
-        "experimental:spacing-between-declarations-with-comments"
+        "experimental:spacing-between-declarations-with-comments",
+        "experimental:comment-wrapping"
     )
 }
 

src/main/java/ml/duncte123/skybot/Variables.java

@@ -178,7 +178,7 @@ public DuncteApis getApis() {
     public AbstractDatabase getDatabase() {
         if (this.database == null) {
             if ("psql".equals(this.config.useDatabase)) {
-                this.database = new PostgreDatabase();
+                this.database = new PostgreDatabase(this.config.jdbcURI);
             } else if ("web".equals(this.config.useDatabase)) {
                 this.database = new WebDatabase(this.getApis(), this.getJackson());
             } else {

src/main/java/ml/duncte123/skybot/objects/config/DunctebotConfig.java

@@ -29,14 +29,16 @@ public class DunctebotConfig {
     public final Sentry sentry;
     public final Websocket websocket;
     public final String useDatabase;
+    public final String jdbcURI;
 
-    public DunctebotConfig(Discord discord, Apis apis, Lavalink lavalink, Sentry sentry, Websocket websocket, String useDatabase) {
+    public DunctebotConfig(Discord discord, Apis apis, Lavalink lavalink, Sentry sentry, Websocket websocket, String useDatabase, String jdbcURI) {
         this.discord = discord;
         this.apis = apis;
         this.lavalink = lavalink;
         this.sentry = sentry;
         this.websocket = websocket;
         this.useDatabase = useDatabase;
+        this.jdbcURI = jdbcURI;
     }
 
     public static class Discord {
@@ -223,7 +225,8 @@ public static DunctebotConfig fromEnv() {
             lavalink,
             sentry,
             websocket,
-            System.getenv("USE_DATABASE")
+            System.getenv("USE_DATABASE"),
+            System.getenv("JDBC_URI")
         );
     }
 }

src/main/kotlin/ml/duncte123/skybot/database/PostgreDatabase.kt

@@ -41,7 +41,7 @@ import java.sql.SQLException
 import java.sql.Types
 import java.time.OffsetDateTime
 
-class PostgreDatabase : AbstractDatabase() {
+class PostgreDatabase(jdbcURI: String) : AbstractDatabase() {
     private val ds: HikariDataSource
     private val connection: Connection
         get() {
@@ -50,11 +50,10 @@ class PostgreDatabase : AbstractDatabase() {
 
     init {
         val config = HikariConfig()
-        // TODO: unhardcode
-        config.jdbcUrl = "jdbc:pgsql://localhost:5432/skybot?user=skybot&password=password" // &ssl=true
 
-        this.ds = HikariDataSource(config)
+        config.jdbcUrl = jdbcURI // &ssl=true
 
+        this.ds = HikariDataSource(config)
         this.connection.use { con ->
             Liquibase(
                 "/dbchangelog.xml",