This repository has been archived by the owner on Feb 12, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 1.2k
feat: add config validation #1239
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
'use strict' | ||
|
||
const Joi = require('joi').extend(require('joi-multiaddr')) | ||
|
||
const schema = Joi.object().keys({ | ||
repo: Joi.alternatives().try( | ||
Joi.object(), // TODO: schema for IPFS repo | ||
Joi.string() | ||
).allow(null), | ||
init: Joi.alternatives().try( | ||
Joi.boolean(), | ||
Joi.object().keys({ bits: Joi.number().integer() }) | ||
).allow(null), | ||
start: Joi.boolean(), | ||
pass: Joi.string().allow(''), | ||
EXPERIMENTAL: Joi.object().keys({ | ||
pubsub: Joi.boolean(), | ||
sharding: Joi.boolean(), | ||
dht: Joi.boolean() | ||
}).allow(null), | ||
config: Joi.object().keys({ | ||
Addresses: Joi.object().keys({ | ||
Swarm: Joi.array().items(Joi.multiaddr().options({ convert: false })), | ||
API: Joi.multiaddr().options({ convert: false }), | ||
Gateway: Joi.multiaddr().options({ convert: false }) | ||
}).allow(null), | ||
Discovery: Joi.object().keys({ | ||
MDNS: Joi.object().keys({ | ||
Enabled: Joi.boolean(), | ||
Interval: Joi.number().integer() | ||
}).allow(null), | ||
webRTCStar: Joi.object().keys({ | ||
Enabled: Joi.boolean() | ||
}).allow(null) | ||
}).allow(null), | ||
Bootstrap: Joi.array().items(Joi.multiaddr().IPFS().options({ convert: false })) | ||
}).allow(null), | ||
libp2p: Joi.object().keys({ | ||
modules: Joi.object().allow(null) // TODO: schemas for libp2p modules? | ||
}).allow(null) | ||
}).options({ allowUnknown: true }) | ||
|
||
module.exports.validate = (config) => Joi.attempt(config, schema) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,220 @@ | ||
/* eslint-env mocha */ | ||
'use strict' | ||
|
||
const chai = require('chai') | ||
const dirtyChai = require('dirty-chai') | ||
const expect = chai.expect | ||
chai.use(dirtyChai) | ||
|
||
const config = require('../../src/core/config') | ||
|
||
describe('config', () => { | ||
it('should allow empty config', () => { | ||
const cfg = {} | ||
expect(() => config.validate(cfg)).to.not.throw() | ||
}) | ||
|
||
it('should allow undefined config', () => { | ||
const cfg = undefined | ||
expect(() => config.validate(cfg)).to.not.throw() | ||
}) | ||
|
||
it('should allow unknown key at root', () => { | ||
const cfg = { [`${Date.now()}`]: 'test' } | ||
expect(() => config.validate(cfg)).to.not.throw() | ||
}) | ||
|
||
it('should validate valid repo', () => { | ||
const cfgs = [ | ||
{ repo: { unknown: 'value' } }, | ||
{ repo: '/path/to-repo' }, | ||
{ repo: null }, | ||
{ repo: undefined } | ||
] | ||
|
||
cfgs.forEach(cfg => expect(() => config.validate(cfg)).to.not.throw()) | ||
}) | ||
|
||
it('should validate invalid repo', () => { | ||
const cfgs = [ | ||
{ repo: 138 } | ||
] | ||
|
||
cfgs.forEach(cfg => expect(() => config.validate(cfg)).to.throw()) | ||
}) | ||
|
||
it('should validate valid init', () => { | ||
const cfgs = [ | ||
{ init: { bits: 138 } }, | ||
{ init: { bits: 138, unknown: 'value' } }, | ||
{ init: true }, | ||
{ init: false }, | ||
{ init: null }, | ||
{ init: undefined } | ||
] | ||
|
||
cfgs.forEach(cfg => expect(() => config.validate(cfg)).to.not.throw()) | ||
}) | ||
|
||
it('should validate invalid init', () => { | ||
const cfgs = [ | ||
{ init: 138 }, | ||
{ init: { bits: 'not an int' } } | ||
] | ||
|
||
cfgs.forEach(cfg => expect(() => config.validate(cfg)).to.throw()) | ||
}) | ||
|
||
it('should validate valid start', () => { | ||
const cfgs = [ | ||
{ start: true }, | ||
{ start: false }, | ||
{ start: undefined } | ||
] | ||
|
||
cfgs.forEach(cfg => expect(() => config.validate(cfg)).to.not.throw()) | ||
}) | ||
|
||
it('should validate invalid start', () => { | ||
const cfgs = [ | ||
{ start: 138 }, | ||
{ start: 'make it so number 1' }, | ||
{ start: null } | ||
] | ||
|
||
cfgs.forEach(cfg => expect(() => config.validate(cfg)).to.throw()) | ||
}) | ||
|
||
it('should validate valid pass', () => { | ||
const cfgs = [ | ||
{ pass: 'correctbatteryhorsestaple' }, | ||
{ pass: '' }, | ||
{ pass: undefined } | ||
] | ||
|
||
cfgs.forEach(cfg => expect(() => config.validate(cfg)).to.not.throw()) | ||
}) | ||
|
||
it('should validate invalid pass', () => { | ||
const cfgs = [ | ||
{ pass: 138 }, | ||
{ pass: null } | ||
] | ||
|
||
cfgs.forEach(cfg => expect(() => config.validate(cfg)).to.throw()) | ||
}) | ||
|
||
it('should validate valid EXPERIMENTAL', () => { | ||
const cfgs = [ | ||
{ EXPERIMENTAL: { pubsub: true, dht: true, sharding: true } }, | ||
{ EXPERIMENTAL: { pubsub: false, dht: false, sharding: false } }, | ||
{ EXPERIMENTAL: { unknown: 'value' } }, | ||
{ EXPERIMENTAL: null }, | ||
{ EXPERIMENTAL: undefined } | ||
] | ||
|
||
cfgs.forEach(cfg => expect(() => config.validate(cfg)).to.not.throw()) | ||
}) | ||
|
||
it('should validate invalid EXPERIMENTAL', () => { | ||
const cfgs = [ | ||
{ EXPERIMENTAL: { pubsub: 138 } }, | ||
{ EXPERIMENTAL: { dht: 138 } }, | ||
{ EXPERIMENTAL: { sharding: 138 } } | ||
] | ||
|
||
cfgs.forEach(cfg => expect(() => config.validate(cfg)).to.throw()) | ||
}) | ||
|
||
it('should validate valid config', () => { | ||
const cfgs = [ | ||
{ config: { Addresses: { Swarm: ['/ip4/0.0.0.0/tcp/4002'] } } }, | ||
{ config: { Addresses: { Swarm: [] } } }, | ||
{ config: { Addresses: { Swarm: undefined } } }, | ||
|
||
{ config: { Addresses: { API: '/ip4/127.0.0.1/tcp/5002' } } }, | ||
{ config: { Addresses: { API: undefined } } }, | ||
|
||
{ config: { Addresses: { Gateway: '/ip4/127.0.0.1/tcp/9090' } } }, | ||
{ config: { Addresses: { Gateway: undefined } } }, | ||
|
||
{ config: { Addresses: { unknown: 'value' } } }, | ||
{ config: { Addresses: null } }, | ||
{ config: { Addresses: undefined } }, | ||
|
||
{ config: { Discovery: { MDNS: { Enabled: true } } } }, | ||
{ config: { Discovery: { MDNS: { Enabled: false } } } }, | ||
{ config: { Discovery: { MDNS: { Interval: 138 } } } }, | ||
{ config: { Discovery: { MDNS: { unknown: 'value' } } } }, | ||
{ config: { Discovery: { MDNS: null } } }, | ||
{ config: { Discovery: { MDNS: undefined } } }, | ||
|
||
{ config: { Discovery: { webRTCStar: { Enabled: true } } } }, | ||
{ config: { Discovery: { webRTCStar: { Enabled: false } } } }, | ||
{ config: { Discovery: { webRTCStar: { unknown: 'value' } } } }, | ||
{ config: { Discovery: { webRTCStar: null } } }, | ||
{ config: { Discovery: { webRTCStar: undefined } } }, | ||
|
||
{ config: { Discovery: { unknown: 'value' } } }, | ||
{ config: { Discovery: null } }, | ||
{ config: { Discovery: undefined } }, | ||
|
||
{ config: { Bootstrap: ['/ip4/104.236.176.52/tcp/4001/ipfs/QmSoLnSGccFuZQJzRadHn95W2CrSFmZuTdDWP8HXaHca9z'] } }, | ||
{ config: { Bootstrap: [] } }, | ||
|
||
{ config: { unknown: 'value' } }, | ||
{ config: null }, | ||
{ config: undefined } | ||
] | ||
|
||
cfgs.forEach(cfg => expect(() => config.validate(cfg)).to.not.throw()) | ||
}) | ||
|
||
it('should validate invalid config', () => { | ||
const cfgs = [ | ||
{ config: { Addresses: { Swarm: 138 } } }, | ||
{ config: { Addresses: { Swarm: null } } }, | ||
|
||
{ config: { Addresses: { API: 138 } } }, | ||
{ config: { Addresses: { API: null } } }, | ||
|
||
{ config: { Addresses: { Gateway: 138 } } }, | ||
{ config: { Addresses: { Gateway: null } } }, | ||
|
||
{ config: { Discovery: { MDNS: { Enabled: 138 } } } }, | ||
{ config: { Discovery: { MDNS: { Interval: true } } } }, | ||
|
||
{ config: { Discovery: { webRTCStar: { Enabled: 138 } } } }, | ||
|
||
{ config: { Bootstrap: ['/ip4/0.0.0.0/tcp/4002'] } }, | ||
{ config: { Bootstrap: 138 } }, | ||
|
||
{ config: 138 } | ||
] | ||
|
||
cfgs.forEach(cfg => expect(() => config.validate(cfg)).to.throw()) | ||
}) | ||
|
||
it('should validate valid libp2p', () => { | ||
const cfgs = [ | ||
{ libp2p: { modules: {} } }, | ||
{ libp2p: { modules: { unknown: 'value' } } }, | ||
{ libp2p: { modules: null } }, | ||
{ libp2p: { modules: undefined } }, | ||
{ libp2p: { unknown: 'value' } }, | ||
{ libp2p: null }, | ||
{ libp2p: undefined } | ||
] | ||
|
||
cfgs.forEach(cfg => expect(() => config.validate(cfg)).to.not.throw()) | ||
}) | ||
|
||
it('should validate invalid libp2p', () => { | ||
const cfgs = [ | ||
{ libp2p: { modules: 138 } }, | ||
{ libp2p: 138 } | ||
] | ||
|
||
cfgs.forEach(cfg => expect(() => config.validate(cfg)).to.throw()) | ||
}) | ||
}) |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hey @alanshaw. Love this. Can you explain why we allow unknown options? Are we trying to be helpful for
developers or open to external config options?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't really have a strong opinion either way on this one, I guess it's just to be flexible...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
oh look, I forgot I already wrote a reason in the description!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍