Merge branch 'master' into greenkeeper/hot-shots-5.0.0

Author: hulkoba

lib/env.js

@@ -1,5 +1,5 @@
 const envalid = require('envalid')
-const {str, url, json} = envalid
+const {str, url, json, bool} = envalid
 
 const urlArray = envalid.makeValidator(x => {
   const urls = json()._parse(x)
@@ -15,5 +15,6 @@ module.exports = envalid.cleanEnv(process.env, {
   QUEUE_NAME: str({default: 'events'}),
   NODE_ENV: str({choices: ['development', 'staging', 'production'], devDefault: 'development'}),
   ROLLBAR_TOKEN_CHANGES: str({devDefault: ''}),
-  STATSD_HOST: str({default: '172.17.0.1'})
+  STATSD_HOST: str({default: '172.17.0.1'}),
+  IS_ENTERPRISE: bool({default: false})
 })

lib/rollbar.js

@@ -5,7 +5,7 @@ const Rollbar = require('rollbar')
 const env = require('./env')
 const pkg = require('../package.json')
 
-const enabled = env.NODE_ENV !== 'development'
+const enabled = env.NODE_ENV !== 'development' && !env.IS_ENTERPRISE
 
 if (enabled) {
   module.exports = new Rollbar({

package.json

@@ -4,7 +4,7 @@
   "dependencies": {
     "amqplib": "^0.5.1",
     "changes-stream": "^2.1.0",
-    "envalid": "^3.0.0",
+    "envalid": "^4.0.0",
     "hot-shots": "^5.0.0",
     "lodash": "^4.16.2",
     "normalize-registry-metadata": "^1.1.2",
@@ -15,10 +15,10 @@
   "devDependencies": {
     "nock": "^9.0.13",
     "nyc": "^11.0.2",
-    "proxyquire": "^1.7.10",
-    "redis-mock": "^0.17.0",
+    "proxyquire": "^2.0.0",
+    "redis-mock": "^0.18.0",
     "standard": "^10.0.2",
-    "tap": "^10.3.2"
+    "tap": "^11.0.0"
   },
   "engines": {
     "node": "7"