Update database versions, add required passwords for sequelize

docker-compose.ci.yml

@@ -123,6 +123,7 @@ services:
       SIS_IMPORTER_HOST: sis-importer-db
       SIS_IMPORTER_PASSWORD: postgres
       SIS_IMPORTER_USER: postgres
+      SIS_PASSWORD: postgres
       SIS_NATS_TOKEN: dev
       SIS_NATS_URI: sis-updater-nats://sis-updater-nats:4222
     profiles:

docker-compose.yml

@@ -153,6 +153,7 @@ services:
       SIS_IMPORTER_HOST: sis-importer-db
       SIS_IMPORTER_PASSWORD: postgres
       SIS_IMPORTER_USER: postgres
+      SIS_PASSWORD: postgres
       SIS_NATS_TOKEN: dev
       SIS_NATS_URI: sis-updater-nats://sis-updater-nats:4222
     profiles:

services/backend/src/conf-backend.js

@@ -46,6 +46,10 @@ const SECRET_TOKEN = process.env.SECRET_TOKEN
 const DB_SCHEMA_KONE = process.env.DB_SCHEMA_KONE || 'public'
 const SIS_UPDATER_URL = process.env.SIS_UPDATER_URL
 
+const KONE_PASSWORD = process.env.KONE_PASSWORD || 'postgres'
+const USER_PASSWORD = process.env.USER_PASSWORD || 'postgres'
+const SIS_PASSWORD = process.env.SIS_PASSWORD || 'postgres'
+
 module.exports = {
   DB_URL_USER,
   DB_URL_KONE,
@@ -54,6 +58,9 @@ module.exports = {
   redis,
   SECRET_TOKEN,
   DB_SCHEMA_KONE,
+  KONE_PASSWORD,
+  USER_PASSWORD,
+  SIS_PASSWORD,
   requiredGroup,
   SIS_UPDATER_URL,
   runningInCI,

services/backend/src/database/connection.js

@@ -20,6 +20,7 @@ class DbConnection extends EventEmitter {
         idle: 300000000,
       },
       logging: false,
+      password: conf.SIS_PASSWORD,
     })
   }
 
@@ -44,12 +45,14 @@ const sequelizeKone = new Sequelize(conf.DB_URL_KONE, {
   schema: conf.DB_SCHEMA_KONE,
   searchPath: conf.DB_SCHEMA_KONE,
   logging: false,
+  password: conf.KONE_PASSWORD,
 })
 
 sequelizeKone.query(`SET SESSION search_path to ${conf.DB_SCHEMA_KONE}`)
 
 const sequelizeUser = new Sequelize(conf.DB_URL_USER, {
   logging: false,
+  password: conf.USER_PASSWORD,
 })
 
 const initializeDatabaseConnection = async () => {

updater/sis-updater-worker/src/db/connection.js

@@ -4,7 +4,8 @@ const EventEmitter = require('events')
 const Umzug = require('umzug')
 const { lock } = require('../utils/redis')
 const { MIGRATIONS_LOCK, isDev, runningInCI } = require('../config')
-const { DB_URL, SIS_IMPORTER_HOST, SIS_IMPORTER_USER, SIS_IMPORTER_PASSWORD, SIS_IMPORTER_DATABASE } = process.env
+const { DB_URL, SIS_IMPORTER_HOST, SIS_IMPORTER_USER, SIS_IMPORTER_PASSWORD, SIS_IMPORTER_DATABASE, SIS_PASSWORD } =
+  process.env
 const { logger } = require('../utils/logger')
 
 class DbConnections extends EventEmitter {
@@ -22,6 +23,7 @@ class DbConnections extends EventEmitter {
         acquire: 10000,
         idle: 300000000,
       },
+      password: SIS_PASSWORD,
       logging: false,
     })
   }