:recycle: fixing bugs in how manifest sets production vs local db vars

backend/server/manifest.js

@@ -7,46 +7,47 @@ const HapiSwagger = require('hapi-swagger')
 
 const confs = {
     local: {
+        db: process.env.DB_NAME,
         host: process.env.DB_HOST,
         port: process.env.DB_PORT,
-        dbname: process.env.DB_NAME,
+        ssl: false,
         user: process.env.DB_USER,
         pw: process.env.DB_ROOT_PASSWORD,
-        ssl: false,
     },
     prod: {
+        db: process.env.PSCALE_DB_NAME,
         host: process.env.PSCALE_DB_HOST,
         port: process.env.PSCALE_DB_PORT,
-        dbname: process.env.PSCALE_DB_NAME,
         branch: process.env.PSCALE_DB_BRANCH,
+        ssl: true,
         user: process.env.PSCALE_DB_USER,
         pw: process.env.PSCALE_DB_PASSWORD,
-        ssl: true,
+    },
+    dbFlavor: process.env.DB_TYPE,
+    useLocalDb: () => {
+        return process.env.USE_LOCAL_DB == 'true'
     },
 }
 
-const current = {
-    ssl: process.env.USE_LOCAL_DB == true ? confs.local.ssl : confs.prod.ssl,
-    host: process.env.USE_LOCAL_DB == true ? confs.local.host : confs.prod.host,
-    port: process.env.USE_LOCAL_DB == true ? confs.local.port : confs.prod.port,
-    dbname:
-        process.env.USE_LOCAL_DB == true
-            ? confs.local.dbname
-            : confs.prod.dbname,
-    user: process.env.USE_LOCAL_DB == true ? confs.local.user : confs.prod.user,
-    pw: process.env.USE_LOCAL_DB == true ? confs.local.pw : confs.prod.pw,
+const _current = {
+    ssl: confs.useLocalDb() ? confs.local.ssl : confs.prod.ssl,
+    host: confs.useLocalDb() ? confs.local.host : confs.prod.host,
+    port: confs.useLocalDb() ? confs.local.port : confs.prod.port,
+    database: confs.useLocalDb() ? confs.local.db : confs.prod.db,
+    user: confs.useLocalDb() ? confs.local.user : confs.prod.user,
+    password: confs.useLocalDb() ? confs.local.pw : confs.prod.pw,
 }
 
 /** Glue manifest as a confidence store */
 module.exports = new Confidence.Store({
     server: {
-        host: process.env.API_HOST,
+        host: _current.host,
         port: {
             $filter: 'NODE_ENV',
             $default: {
                 $param: 'API_PORT',
                 $coerce: 'number',
-                $default: process.env.API_PORT,
+                $default: _current.port,
             },
             test: { $value: undefined }, // Let the server find an open port
         },
@@ -102,16 +103,9 @@ module.exports = new Confidence.Store({
                     $base: {
                         migrateOnStart: true,
                         knex: {
-                            client: process.env.DB_TYPE,
+                            client: confs.dbFlavor,
                             useNullAsDefault: true,
-                            connection: {
-                                host: current.host,
-                                user: current.user,
-                                password: current.pw,
-                                database: current.dbname,
-                                port: current.port,
-                                ssl: current.ssl,
-                            },
+                            connection: _current,
                         },
                     },
                     production: {