fix: config upgrade

nearform · Feb 13, 2020 · f53e34c · f53e34c
1 parent ea71b09
commit f53e34c
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 21 deletions.
diff --git a/packages/trail-core/package.json b/packages/trail-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nearform/trail-core",
-  "version": "2.0.0",
+  "version": "3.0.0",
   "description": "Audit trail logging service",
   "license": "MIT",
   "author": "nearForm Ltd",
@@ -40,7 +40,7 @@
   },
   "dependencies": {
     "@nearform/sql": "^1.0.1",
-    "config": "^1.30.0",
+    "config": "^3.2.5",
     "luxon": "^1.2.0",
     "minimist": "^1.2.0",
     "pg": "^7.4.1",

diff --git a/packages/trail-hapi-plugin/lib/index.js b/packages/trail-hapi-plugin/lib/index.js
@@ -18,7 +18,7 @@ const formatReasons = function (error) {
     let message
     // Check for nested reason from alternatives.
     if (reason.type === 'alternatives.match') {
-      const type = get(reason,'context.details.1.context.error.type')
+      const type = get(reason, 'context.details.1.context.error.type')
       message = errorsMessages[type]
     }
     else {

diff --git a/packages/trail-hapi-plugin/package-lock.json b/packages/trail-hapi-plugin/package-lock.json
diff --git a/packages/trail-hapi-plugin/package.json b/packages/trail-hapi-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nearform/trail-hapi-plugin",
-  "version": "2.0.0",
+  "version": "3.0.0",
   "description": "Hapi plugin for the audit trail logging service",
   "license": "MIT",
   "author": "nearForm Ltd",
@@ -39,9 +39,9 @@
   "dependencies": {
     "@hapi/hapi": "^19.1.0",
     "@hapi/joi": "^17.1.0",
-    "@nearform/trail-core": "^2.0.0",
+    "@nearform/trail-core": "^3.0.0",
     "boom": "^7.2.0",
-    "config": "^1.30.0",
+    "config": "^3.2.5",
     "lodash": "^4.17.10",
     "luxon": "^1.2.0"
   },

diff --git a/packages/trail-hapi-server/lib/index.js b/packages/trail-hapi-server/lib/index.js
@@ -18,6 +18,7 @@ module.exports = async function () {
       }
     }
   })
+  server.validator(Joi)
 
   try {
     const startTime = process.hrtime()
@@ -54,10 +55,9 @@ module.exports = async function () {
         response: {
           status: {
             200: Joi.object({
-              uptime: Joi.string().description('uptime in seconds').regex(/^(\d+\.\d{3} s)$/)
-            })
+                uptime: Joi.string().description('uptime in seconds').regex(/^(\d+\.\d{3} s)$/).required()
+              })
               .description('Successful uptime reply.')
-              .requiredKeys('uptime')
               .unknown(false),
             500: errorsSchemas['500']
           }

diff --git a/packages/trail-hapi-server/package-lock.json b/packages/trail-hapi-server/package-lock.json
diff --git a/packages/trail-hapi-server/package.json b/packages/trail-hapi-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nearform/trail-hapi-server",
-  "version": "2.0.0",
+  "version": "3.0.0",
   "description": "Server running Hapi plugin for the audit trail logging service",
   "license": "MIT",
   "author": "nearForm Ltd",
@@ -43,9 +43,9 @@
   "dependencies": {
     "@hapi/hapi": "^19.1.0",
     "@hapi/joi": "^17.1.0",
-    "@nearform/trail-core": "^2.0.0",
-    "@nearform/trail-hapi-plugin": "^2.0.0",
-    "config": "^1.30.0",
+    "@nearform/trail-core": "^3.0.0",
+    "@nearform/trail-hapi-plugin": "^3.0.0",
+    "config": "^3.2.5",
     "hapi-pino": "^6.5.0",
     "inert": "^5.1.0",
     "swagger-ui-dist": "^3.13.6"