lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

config-validator to consider default values from schema (#139)

Browse source 
* config-validator to consider default values from schema

* fix with relative json schema path

* remove lamassuServerPath config on lamassu-migrate-options
This commit is contained in:
Fabio Cigliano 2018-08-14 17:46:09 +02:00 • committed by Josh Harvey
parent d28c6ae691
commit 6fdb3e8834
7 changed files with 13 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/config-validate.js
View file

@ -52,8 +52,9 @@ function satisfiesRequire (config, cryptos, machineList, field, anyFields, allFi
const isBlank = _.isNil(configManager.scopedValue(scope[0], scope[1], fieldCode, config))
const isRequired = (_.isEmpty(anyFields) || isAnyEnabled()) &&
(_.isEmpty(allFields) || areAllEnabled())
const hasDefault = !_.isNil(_.get('default', field))
const isValid = isRequired ? !isBlank : true
const isValid = !isRequired || !isBlank || hasDefault
return isValid
})