Merge pull request #272 from pelias/greenkeeper/@hapi/joi-16.0.1

Update @hapi/joi to the latest version 🚀
pelias · Nov 25, 2019 · 915a12d · 915a12d
2 parents 2edc310 + 1dd7718
commit 915a12d
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 41 deletions.
diff --git a/package.json b/package.json
@@ -24,9 +24,9 @@
     "who's on first"
   ],
   "dependencies": {
+    "@hapi/joi": "^16.1.8",
     "async": "^3.0.1",
     "csv-parse": "^4.0.0",
-    "@hapi/joi": "^15.0.0",
     "lodash": "^4.17.4",
     "parallel-transform": "^1.1.0",
     "pelias-config": "^4.0.0",

diff --git a/schema.js b/schema.js
@@ -2,7 +2,7 @@ const Joi = require('@hapi/joi');
 const cpus = require('os').cpus;
 
 module.exports = Joi.object().keys({
-  imports: Joi.object().keys({
+  imports: Joi.object().required().keys({
     adminLookup: Joi.object().keys({
       // default maxConcurrentReqs to # of cpus/cores * 10
       maxConcurrentReqs: Joi.number().integer().default(cpus().length*10),
@@ -11,17 +11,17 @@ module.exports = Joi.object().keys({
       usePostalCities: Joi.boolean().default(false)
     }).unknown(true),
     whosonfirst: Joi.object().keys({
-      datapath: Joi.string(),
+      datapath: Joi.string().required(),
       importPlace: [
         Joi.number().integer(),
         Joi.array().items(Joi.number().integer())
       ],
-      sqlite: Joi.boolean().default(false).truthy('yes').falsy('no').insensitive(true)
-    }).requiredKeys('datapath').unknown(true),
+      sqlite: Joi.boolean().default(false).truthy('yes').falsy('no')
+    }).unknown(true),
     services: Joi.object().keys({
       pip: Joi.object().keys({
-        url: Joi.string()
-      }).requiredKeys('url').unknown(true)
+        url: Joi.string().required()
+      }).unknown(true)
     }).unknown(true)
   }).or('whosonfirst', 'services.pip').unknown(true)
-}).requiredKeys('imports').unknown(true);
+}).unknown(true);
diff --git a/test/schema.js b/test/schema.js
@@ -7,7 +7,7 @@ tape('test configuration scenarios', (test) =>  {
   test.test('missing imports should throw error', (t) =>  {
     const config = {};
 
-    const result = Joi.validate(config, schema);
+    const result = schema.validate(config);
 
     t.equals(result.error.details.length, 1);
     t.equals(result.error.details[0].message, '"imports" is required');
@@ -19,10 +19,10 @@ tape('test configuration scenarios', (test) =>  {
     [null, 17, 'string', [], true].forEach((value) => {
       const config = { imports: value };
 
-      const result = Joi.validate(config, schema);
+      const result = schema.validate(config);
 
       t.equals(result.error.details.length, 1);
-      t.equals(result.error.details[0].message, '"imports" must be an object');
+      t.equals(result.error.details[0].message, '"imports" must be of type object');
     });
 
     t.end();
@@ -34,10 +34,10 @@ tape('test configuration scenarios', (test) =>  {
       imports: {}
     };
 
-    const result = Joi.validate(config, schema);
+    const result = schema.validate(config);
 
     t.equals(result.error.details.length, 1);
-    t.equals(result.error.details[0].message, '"value" must contain at least one of [whosonfirst, services.pip]');
+    t.equals(result.error.details[0].message, '"imports" must contain at least one of [whosonfirst, services.pip]');
     t.end();
 
   });
@@ -49,10 +49,10 @@ tape('test configuration scenarios', (test) =>  {
       }
     };
 
-    const result = Joi.validate(config, schema);
+    const result = schema.validate(config);
 
     t.equals(result.error.details.length, 1);
-    t.equals(result.error.details[0].message, '"datapath" is required');
+    t.equals(result.error.details[0].message, '"imports.whosonfirst.datapath" is required');
     t.end();
 
   });
@@ -66,7 +66,7 @@ tape('test configuration scenarios', (test) =>  {
       }
     };
 
-    const result = Joi.validate(config, schema);
+    const result = schema.validate(config);
 
     t.notOk(result.error);
     t.end();
@@ -84,10 +84,10 @@ tape('test configuration scenarios', (test) =>  {
         }
       };
 
-      const result = Joi.validate(config, schema);
+      const result = schema.validate(config);
 
       t.equals(result.error.details.length, 1);
-      t.equals(result.error.details[0].message, '"adminLookup" must be an object');
+      t.equals(result.error.details[0].message, '"imports.adminLookup" must be of type object');
     });
 
     t.end();
@@ -107,10 +107,10 @@ tape('test configuration scenarios', (test) =>  {
         }
       };
 
-      const result = Joi.validate(config, schema);
+      const result = schema.validate(config);
 
       t.equals(result.error.details.length, 1);
-      t.equals(result.error.details[0].message, '"maxConcurrentReqs" must be a number');
+      t.equals(result.error.details[0].message, '"imports.adminLookup.maxConcurrentReqs" must be a number');
 
     });
 
@@ -130,10 +130,10 @@ tape('test configuration scenarios', (test) =>  {
       }
     };
 
-    const result = Joi.validate(config, schema);
+    const result = schema.validate(config);
 
     t.equals(result.error.details.length, 1);
-    t.equals(result.error.details[0].message, '"maxConcurrentReqs" must be an integer');
+    t.equals(result.error.details[0].message, '"imports.adminLookup.maxConcurrentReqs" must be an integer');
     t.end();
 
   });
@@ -149,7 +149,7 @@ tape('test configuration scenarios', (test) =>  {
       }
     };
 
-    const result = Joi.validate(config, schema);
+    const result = schema.validate(config);
 
     t.equals(result.value.imports.adminLookup.maxConcurrentReqs, os.cpus().length*10);
     t.notOk(result.error);
@@ -171,10 +171,10 @@ tape('test configuration scenarios', (test) =>  {
         }
       };
 
-      const result = Joi.validate(config, schema);
+      const result = schema.validate(config);
 
       t.equals(result.error.details.length, 1);
-      t.equals(result.error.details[0].message, '"enabled" must be a boolean');
+      t.equals(result.error.details[0].message, '"imports.adminLookup.enabled" must be a boolean');
 
     });
 
@@ -196,7 +196,7 @@ tape('test configuration scenarios', (test) =>  {
         }
       };
 
-      const result = Joi.validate(config, schema);
+      const result = schema.validate(config);
 
       t.notOk(result.error);
 
@@ -218,7 +218,7 @@ tape('test configuration scenarios', (test) =>  {
       }
     };
 
-    const result = Joi.validate(config, schema);
+    const result = schema.validate(config);
 
     t.notOk(result.error);
     t.equals(result.value.imports.adminLookup.enabled, true);
@@ -240,10 +240,10 @@ tape('test configuration scenarios', (test) =>  {
         }
       };
 
-      const result = Joi.validate(config, schema);
+      const result = schema.validate(config);
 
       t.equals(result.error.details.length, 1);
-      t.equals(result.error.details[0].message, '"missingMetafilesAreFatal" must be a boolean');
+      t.equals(result.error.details[0].message, '"imports.adminLookup.missingMetafilesAreFatal" must be a boolean');
 
     });
 
@@ -265,7 +265,7 @@ tape('test configuration scenarios', (test) =>  {
         }
       };
 
-      const result = Joi.validate(config, schema);
+      const result = schema.validate(config);
 
       t.notOk(result.error);
 
@@ -287,7 +287,7 @@ tape('test configuration scenarios', (test) =>  {
       }
     };
 
-    const result = Joi.validate(config, schema);
+    const result = schema.validate(config);
 
     t.notOk(result.error);
     t.equals(result.value.imports.adminLookup.missingMetafilesAreFatal, false);
@@ -307,7 +307,7 @@ tape('test configuration scenarios', (test) =>  {
       }
     };
 
-    const result = Joi.validate(config, schema);
+    const result = schema.validate(config);
 
     t.notOk(result.error);
     t.end();
@@ -324,10 +324,10 @@ tape('test configuration scenarios', (test) =>  {
         }
       };
 
-      const result = Joi.validate(config, schema);
+      const result = schema.validate(config);
 
       t.equals(result.error.details.length, 1);
-      t.equals(result.error.details[0].message, '"datapath" must be a string');
+      t.equals(result.error.details[0].message, '"imports.whosonfirst.datapath" must be a string');
     });
 
     t.end();
@@ -350,7 +350,7 @@ tape('test configuration scenarios', (test) =>  {
       unknown_property: 'property value'
     };
 
-    const result = Joi.validate(config, schema);
+    const result = schema.validate(config);
 
     t.notOk(result.error);
     t.end();
@@ -364,10 +364,10 @@ tape('test configuration scenarios', (test) =>  {
       },
     };
 
-    const result = Joi.validate(config, schema);
+    const result = schema.validate(config);
 
     t.equals(result.error.details.length, 1);
-    t.equals(result.error.details[0].message, '"value" must contain at least one of [whosonfirst, services.pip]');
+    t.equals(result.error.details[0].message, '"imports" must contain at least one of [whosonfirst, services.pip]');
     t.end();
 
   });
@@ -379,10 +379,10 @@ tape('test configuration scenarios', (test) =>  {
       },
     };
 
-    const result = Joi.validate(config, schema);
+    const result = schema.validate(config);
 
     t.equals(result.error.details.length, 1);
-    t.equals(result.error.details[0].message, '"url" is required');
+    t.equals(result.error.details[0].message, '"imports.services.pip.url" is required');
     t.end();
 
   });
@@ -397,10 +397,10 @@ tape('test configuration scenarios', (test) =>  {
         },
       };
 
-      const result = Joi.validate(config, schema);
+      const result = schema.validate(config);
 
       t.equals(result.error.details.length, 1);
-      t.equals(result.error.details[0].message, '"url" must be a string');
+      t.equals(result.error.details[0].message, '"imports.services.pip.url" must be a string');
     });
 
     t.end();