Fix PG user used in CI (#1440)

* Fix PG user used in CI * Fix PG user used in CI
betagouv · Sep 11, 2023 · d765db8 · d765db8
1 parent 140812e
commit d765db8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -2,11 +2,7 @@ name: Build, format & test workflow
 
 on: [push]
 env:
-  POSTGRESQL_ADDON_USER: signalconso
-  POSTGRESQL_ADDON_HOST: localhost
-  POSTGRESQL_ADDON_PORT: 5432
-  POSTGRESQL_ADDON_DB: test_signalconso
-  POSTGRESQL_ADDON_PASSWORD :
+  USER: signalconso
   USE_TEXT_LOGS: true
 
 jobs:

diff --git a/conf/common/database.conf b/conf/common/database.conf
@@ -10,11 +10,11 @@ slick.dbs.default.db {
 // Used for flyway
 
 flyway {
-  host = ${POSTGRESQL_ADDON_HOST}
-  port = ${POSTGRESQL_ADDON_PORT}
-  database = ${POSTGRESQL_ADDON_DB},
-  user = ${POSTGRESQL_ADDON_USER}
-  password = ${POSTGRESQL_ADDON_PASSWORD}
+  host = ${?POSTGRESQL_ADDON_HOST}
+  port = ${?POSTGRESQL_ADDON_PORT}
+  database = ${?POSTGRESQL_ADDON_DB},
+  user = ${?POSTGRESQL_ADDON_USER}
+  password = ${?POSTGRESQL_ADDON_PASSWORD}
   // DATA_LOSS / DESTRUCTIVE / BE AWARE ---- Keep to "false"
   //Be careful when enabling this as it removes the safety net that ensures Flyway does not migrate the wrong database in case of a configuration mistake!
   //This is useful for initial Flyway production deployments on projects with an existing DB.