ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-01-19 19:28:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #900 from balena-io/fix-config-change-events

Browse Source 
Make sure to correctly convert config emit events after validation
This commit is contained in:
CameronDiver 2019-02-11 13:17:30 +00:00 committed by GitHub
commit 3e98222064
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/config/index.ts
View File

@ -174,8 +174,8 @@ export class Config extends (EventEmitter as {
};
return Bluebird.try(() => {
// Firstly validate all of the types as they are being set
this.validateConfigMap(keyValues);
// Firstly validate and coerce all of the types as they are being set
keyValues = this.validateConfigMap(keyValues);
if (trx != null) {
return setValuesInTransaction(trx).return();
@ -251,10 +251,12 @@ export class Config extends (EventEmitter as {
return schemaTypes[key].type.decode(value);
}
private validateConfigMap<T extends SchemaTypeKey>(configMap: ConfigMap<T>) {
private validateConfigMap<T extends SchemaTypeKey>(
configMap: ConfigMap<T>,
): ConfigMap<T> {
// Just loop over every value, run the decode function, and
// throw if any value fails verification
_.map(configMap, (value, key) => {
return _.mapValues(configMap, (value, key) => {
if (
!Schema.schema.hasOwnProperty(key) ||
!Schema.schema[key as Schema.SchemaKey].mutable
@ -276,13 +278,14 @@ export class Config extends (EventEmitter as {
const decoded = type.decode(value);
if (decoded.isLeft()) {
throw new Error(
throw new TypeError(
`Cannot set value for ${key}, as value failed validation: ${
decoded.value
}`,
);
}
});
return decoded.value;
}) as ConfigMap<T>;
}
private generateRequiredFields() {