fix: updating dependencies.

blackflux · Sep 12, 2019 · b4b7771 · b4b7771
1 parent 0d715e7
commit b4b7771
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 8 deletions.
diff --git a/package.json b/package.json
@@ -39,7 +39,6 @@
     "@babel/register": "7.6.0",
     "@blackflux/eslint-plugin-rules": "1.3.8",
     "@blackflux/robo-config-plugin": "2.6.3",
-    "@hapi/joi": "15.1.1",
     "aws-sdk": "2.528.0",
     "babel-eslint": "10.0.3",
     "chai": "4.2.0",
@@ -101,7 +100,7 @@
     "lib"
   ],
   "dependencies": {
-    "joi-strict": "1.0.9",
+    "joi-strict": "1.0.10",
     "lambda-async": "1.0.1",
     "lodash.chunk": "4.2.0",
     "lodash.get": "4.4.2",

diff --git a/src/module/sqs/queue-processor.js b/src/module/sqs/queue-processor.js
@@ -10,7 +10,7 @@ module.exports = ({ sendMessageBatch }) => ({ queueUrl, stepsDir }) => {
     .reduce((p, step) => Object.assign(p, {
       [step.slice(0, -3)]: (() => {
         const { schema, handler, next } = fs.smartRead(path.join(stepsDir, step));
-        assert(schema.isJoi === true, 'Schema not a Joi schema.');
+        assert(Joi.isSchema(schema) === true, 'Schema not a Joi schema.');
         assert(
           typeof handler === 'function' && handler.length === 2,
           'Handler must be a function taking two arguments.'
@@ -58,7 +58,7 @@ module.exports = ({ sendMessageBatch }) => ({ queueUrl, stepsDir }) => {
       );
       Joi.assert(
         messages,
-        Joi.array().items(step.next.map((n) => steps[n].schema)),
+        Joi.array().items(...step.next.map((n) => steps[n].schema)),
         `Unexpected/Invalid next step(s) returned for: ${payload.name}`
       );
       await sendMessageBatch(messages, queueUrl);

diff --git a/test/module/sqs/queue-processor.spec.js b/test/module/sqs/queue-processor.spec.js
@@ -44,7 +44,7 @@ describe('Testing QueueProcessor', {
     expect(result.message).to.equal(
       'Unexpected/Invalid next step(s) returned for: bad-output '
       + '[\n  {\n    "name" \u001b[31m[1]\u001b[0m: "unknown-step"\n  }\n]'
-      + '\n\u001b[31m\n[1] "name" must be one of [step2]\u001b[0m'
+      + '\n\u001b[31m\n[1] "[0].name" must be [step2]\u001b[0m'
     );
   });
 

diff --git a/yarn.lock b/yarn.lock
@@ -194,6 +194,11 @@
   resolved "https://registry.yarnpkg.com/@hapi/bourne/-/bourne-1.3.2.tgz#0a7095adea067243ce3283e1b56b8a8f453b242a"
   integrity sha512-1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA==
 
+"@hapi/formula@1.x.x":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@hapi/formula/-/formula-1.2.0.tgz#994649c7fea1a90b91a0a1e6d983523f680e10cd"
+  integrity sha512-UFbtbGPjstz0eWHb+ga/GM3Z9EzqKXFWIbSOFURU0A/Gku0Bky4bCk9/h//K2Xr3IrCfjFNhMm4jyZ5dbCewGA==
+
 "@hapi/hoek@8.x.x":
   version "8.2.4"
   resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-8.2.4.tgz#684a14f4ca35d46f44abc87dfc696e5e4fe8a020"
@@ -209,6 +214,22 @@
     "@hapi/hoek" "8.x.x"
     "@hapi/topo" "3.x.x"
 
+"@hapi/joi@16.0.0":
+  version "16.0.0"
+  resolved "https://registry.yarnpkg.com/@hapi/joi/-/joi-16.0.0.tgz#b8bc1bc2608f12ad56edecf4bafa695071991555"
+  integrity sha512-OYWoI/uqs40IdRvPmgn5ame35esBnPR4qhzrE03o+Pb8NnlXIBJZWMXgAlwp43781Ybm0R1iEEMDx0H2lP8mJQ==
+  dependencies:
+    "@hapi/address" "2.x.x"
+    "@hapi/formula" "1.x.x"
+    "@hapi/hoek" "8.x.x"
+    "@hapi/pinpoint" "1.x.x"
+    "@hapi/topo" "3.x.x"
+
+"@hapi/pinpoint@1.x.x":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@hapi/pinpoint/-/pinpoint-1.0.2.tgz#025b7a36dbbf4d35bf1acd071c26b20ef41e0d13"
+  integrity sha512-dtXC/WkZBfC5vxscazuiJ6iq4j9oNx1SHknmIr8hofarpKUZKmlUVYVIhNVzIEgK5Wrc4GMHL5lZtt1uS2flmQ==
+
 "@hapi/topo@3.x.x":
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/@hapi/topo/-/topo-3.1.3.tgz#c7a02e0d936596d29f184e6d7fdc07e8b5efce11"
@@ -3607,6 +3628,13 @@ jmespath@0.15.0:
   resolved "https://registry.yarnpkg.com/jmespath/-/jmespath-0.15.0.tgz#a3f222a9aae9f966f5d27c796510e28091764217"
   integrity sha1-o/Iiqarp+Wb10nx5ZRDigJF2Qhc=
 
+joi-strict@1.0.10:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/joi-strict/-/joi-strict-1.0.10.tgz#fe5c83834ba2921dcea8adb903676de46851f880"
+  integrity sha512-PLcFUzmymaaIrGpQ1H5uvpj7jiW8r+QakCTS1/14BBgoBdyj3XqEJXKHyxRuuCf9d9ux1iBj6OfkWb3GNbFZeg==
+  dependencies:
+    "@hapi/joi" "16.0.0"
+
 joi-strict@1.0.9:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/joi-strict/-/joi-strict-1.0.9.tgz#9b05887cbf7160e5bff6bd9a901ce0f6af42f57c"
@@ -4417,9 +4445,9 @@ minipass@^2.2.1, minipass@^2.3.5:
     yallist "^3.0.0"
 
 minizlib@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.2.1.tgz#dd27ea6136243c7c880684e8672bb3a45fd9b614"
-  integrity sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.2.2.tgz#6f0ccc82fa53e1bf2ff145f220d2da9fa6e3a166"
+  integrity sha512-hR3At21uSrsjjDTWrbu0IMLTpnkpv8IIMFDFaoz43Tmu4LkmAXfH44vNNzpTnf+OAQQCHrb91y/wc2J4x5XgSQ==
   dependencies:
     minipass "^2.2.1"