Don't use a connection string to connect to the database

This is because migratus prints out the entire connection string
in case of errors, which can leak sensitive information.

See yogthos/migratus#189

config/config.ci.edn

@@ -1,12 +1,17 @@
-{:db-connection-string "jdbc:postgresql://localhost:5432/chronograph_ci?user=chronograph_ci_user&password=chronograph_ci_pwd"
- :oauth                {:google {:redirect-uri   "http://localhost:8000/google-oauth2-redirect"
-                                 :response-type  "code"
-                                 :login-endpoint "https://accounts.google.com/o/oauth2/v2/auth"
-                                 :token-endpoint "https://oauth2.googleapis.com/token"
-                                 :client-id      "test-client-id"
-                                 :client-secret  "test-client-secret"
-                                 :scope          "test scopes"}}
- :auth                 {:token-signing-key       "your-signing-key-here"
-                        :token-expiry-in-seconds 3600}
- :app-log-level        "debug"
- :port                 8000}
+{:db-spec       {:dbtype   "postgresql"
+                 :dbname   "chronograph_ci"
+                 :host     "localhost"
+                 :port     5432
+                 :user     "chronograph_ci_user"
+                 :password "chronograph_ci_pwd"}
+ :oauth         {:google {:redirect-uri   "http://localhost:8000/google-oauth2-redirect"
+                          :response-type  "code"
+                          :login-endpoint "https://accounts.google.com/o/oauth2/v2/auth"
+                          :token-endpoint "https://oauth2.googleapis.com/token"
+                          :client-id      "test-client-id"
+                          :client-secret  "test-client-secret"
+                          :scope          "test scopes"}}
+ :auth          {:token-signing-key       "your-signing-key-here"
+                 :token-expiry-in-seconds 3600}
+ :app-log-level "debug"
+ :port          8000}

config/config.dev.edn

@@ -1,10 +1,15 @@
-{:db-connection-string "jdbc:postgresql://localhost:19401/chronograph_dev?user=chronograph_dev&password=chronograph_devpwd"
- :oauth                {:google #merge [{:redirect-uri   "http://localhost:8000/google-oauth2-redirect"
-                                         :response-type  "code"
-                                         :login-endpoint "https://accounts.google.com/o/oauth2/v2/auth"
-                                         :token-endpoint "https://oauth2.googleapis.com/token"}
-                                        #include "google.secrets.edn"]}
- :auth                 {:token-signing-key       "your-signing-key-here"
-                        :token-expiry-in-seconds 3600}
- :app-log-level        "debug"
- :port                 8000}
+{:db-spec       {:dbtype   "postgresql"
+                 :dbname   "chronograph_dev"
+                 :host     "localhost"
+                 :port     19401
+                 :user     "chronograph_dev"
+                 :password "chronograph_devpwd"}
+ :oauth         {:google #merge [{:redirect-uri   "http://localhost:8000/google-oauth2-redirect"
+                                  :response-type  "code"
+                                  :login-endpoint "https://accounts.google.com/o/oauth2/v2/auth"
+                                  :token-endpoint "https://oauth2.googleapis.com/token"}
+                                 #include "google.secrets.edn"]}
+ :auth          {:token-signing-key       "your-signing-key-here"
+                 :token-expiry-in-seconds 3600}
+ :app-log-level "debug"
+ :port          8000}

config/config.test.edn

@@ -1,12 +1,17 @@
-{:db-connection-string "jdbc:postgresql://localhost:19401/chronograph_test?user=chronograph_test&password=chronograph_testpwd"
- :oauth                {:google {:redirect-uri   "http://localhost:8000/google-oauth2-redirect"
-                                 :response-type  "code"
-                                 :login-endpoint "https://accounts.google.com/o/oauth2/v2/auth"
-                                 :token-endpoint "https://oauth2.googleapis.com/token"
-                                 :client-id      "test-client-id"
-                                 :client-secret  "test-client-secret"
-                                 :scope          "test scopes"}}
- :auth                 {:token-signing-key       "your-signing-key-here"
-                        :token-expiry-in-seconds 3600}
- :app-log-level        "debug"
- :port                 8000}
+{:db-spec       {:dbtype   "postgresql"
+                 :dbname   "chronograph_test"
+                 :host     "localhost"
+                 :port     19401
+                 :user     "chronograph_test"
+                 :password "chronograph_testpwd"}
+ :oauth         {:google {:redirect-uri   "http://localhost:8000/google-oauth2-redirect"
+                          :response-type  "code"
+                          :login-endpoint "https://accounts.google.com/o/oauth2/v2/auth"
+                          :token-endpoint "https://oauth2.googleapis.com/token"
+                          :client-id      "test-client-id"
+                          :client-secret  "test-client-secret"
+                          :scope          "test scopes"}}
+ :auth          {:token-signing-key       "your-signing-key-here"
+                 :token-expiry-in-seconds 3600}
+ :app-log-level "debug"
+ :port          8000}

src/clj/chronograph/db/core.clj

@@ -9,7 +9,7 @@
 (jdbc-date-time/read-as-instant)
 
 (defstate datasource
-  :start (jdbc/get-datasource {:jdbcUrl (:db-connection-string config/config)})
+  :start (jdbc/get-datasource (:db-spec config/config))
   :stop nil)
 
 (def sql-opts {:builder-fn jdbc-result-set/as-unqualified-kebab-maps

src/clj/chronograph/migrations.clj

@@ -4,7 +4,7 @@
 
 (defn config []
   {:store :database
-   :db    {:connection-uri (:db-connection-string config/config)}})
+   :db    (:db-spec config/config)})
 
 (defn create-migration [migration-name]
   (migratus/create (config) migration-name))