feat(cluster): add option to pass in path to custom dhis.conf (#236)

* fix: spelling mistake in help text * feat(cluster): add option to pass in path to custom dhis.conf * test(cluster): update env in tests * chore: run tests pre-push
dhis2 · Jan 9, 2020 · 80f4cd5 · 80f4cd5
1 parent 4b869df
commit 80f4cd5
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/.huskyrc.js b/.huskyrc.js
@@ -9,5 +9,6 @@ module.exports = {
             'd2-style js check --staged',
             'd2-style text check --staged',
         ]),
+        'pre-push': 'yarn test',
     },
 }
diff --git a/packages/cluster/src/commands/up.js b/packages/cluster/src/commands/up.js
@@ -104,7 +104,7 @@ module.exports = {
         },
         seed: {
             alias: 's',
-            desc: 'Seed the detabase from a sql dump',
+            desc: 'Seed the database from a sql dump',
             type: 'boolean',
         },
         seedFile: {
@@ -126,6 +126,11 @@ module.exports = {
             desc: 'Set the DHIS2 version',
             type: 'string',
         },
+        dhis2Config: {
+            desc:
+                'Path to a custom DHIS2 configuration file to use (dhis.conf)',
+            type: 'string',
+        },
         dbVersion: {
             desc: 'Set the database version',
             type: 'string',

diff --git a/packages/cluster/src/common.js b/packages/cluster/src/common.js
@@ -1,5 +1,4 @@
 const path = require('path')
-const fs = require('fs')
 
 const { reporter } = require('@dhis2/cli-helpers-engine')
 
@@ -132,6 +131,7 @@ async function resolveConfiguration(argv = {}) {
                 channel: resolved.channel,
                 dbVersion: resolved.dbVersion,
                 dhis2Version: resolved.dhis2Version,
+                dhis2Config: resolved.dhis2Config,
                 customContext: resolved.customContext,
                 image: resolved.image,
                 port: resolved.port,
@@ -155,6 +155,7 @@ module.exports.makeEnvironment = cfg => {
         DHIS2_CORE_VERSION: cfg.dhis2Version,
         DHIS2_CORE_DB_VERSION: cfg.dbVersion,
         DHIS2_CORE_PORT: cfg.port,
+        DHIS2_CORE_CONFIG: cfg.dhis2Config,
     }
 
     reporter.debug('Runtime environment\n', env)

diff --git a/packages/cluster/tests/setup-environment.js b/packages/cluster/tests/setup-environment.js
@@ -27,6 +27,7 @@ test('build runtime environment based on defaults', async function(t) {
         DHIS2_CORE_VERSION: 'dev',
         DHIS2_CORE_DB_VERSION: 'dev',
         DHIS2_CORE_PORT: defaults.port,
+        DHIS2_CORE_CONFIG: undefined,
     }
 
     t.deepEqual(actual, expected, 'default environment')
@@ -56,6 +57,7 @@ test('build runtime environment based on args', async function(t) {
         DHIS2_CORE_VERSION: '2.33',
         DHIS2_CORE_DB_VERSION: '2.32',
         DHIS2_CORE_PORT: 8233,
+        DHIS2_CORE_CONFIG: undefined,
     }
 
     t.deepEqual(actual, expected, 'args environment')
@@ -88,6 +90,7 @@ test('build runtime environment based on mixed args and config', async function(
         DHIS2_CORE_VERSION: 'master',
         DHIS2_CORE_DB_VERSION: 'dev',
         DHIS2_CORE_PORT: 8233,
+        DHIS2_CORE_CONFIG: undefined,
     }
 
     t.deepEqual(actual, expected, 'args and config environment')
@@ -121,6 +124,7 @@ test('build runtime environment based on mixed args, cache, config and defaults'
         DHIS2_CORE_VERSION: 'dev',
         DHIS2_CORE_DB_VERSION: 'dev',
         DHIS2_CORE_PORT: 8233,
+        DHIS2_CORE_CONFIG: undefined,
     }
 
     t.deepEqual(actual, expected, 'merged environment')
@@ -161,6 +165,7 @@ test('build runtime environment based on mixed args, cache, config, custom per-c
         DHIS2_CORE_VERSION: 'apa',
         DHIS2_CORE_DB_VERSION: 'dev',
         DHIS2_CORE_PORT: 9999,
+        DHIS2_CORE_CONFIG: undefined,
     }
 
     t.deepEqual(actual, expected, 'merged environment')