Compare commits

...

5 Commits

Author SHA1 Message Date
Dora Korpar 82736f40e3 [squash] package-lock 2019-03-14 11:47:58 -07:00
Dora Korpar 6ab53c727b [squash] add sproxydclient back 2019-03-14 11:39:30 -07:00
Dora Korpar ccaeadad1f [squash] fixed get lc update 2019-03-14 11:37:24 -07:00
Dora Korpar 1ef6e6a142 [squash] fix lc listener for get codepath and remove sproxydclient 2019-03-13 15:23:42 -07:00
Dora Korpar c6f10eda91 bf: ZENKO 1402 location constraint update event 2019-03-13 15:19:20 -07:00
3 changed files with 106 additions and 146 deletions

View File

@ -20,13 +20,6 @@ try {
let client; let client;
let implName; let implName;
config.on('location-constraints-update', () => {
const clients = parseLC(config, vault);
client = new MultipleBackendGateway(
clients, metadata, locationStorageCheck);
implName = 'multipleBackends';
});
if (config.backends.data === 'mem') { if (config.backends.data === 'mem') {
client = inMemory; client = inMemory;
implName = 'mem'; implName = 'mem';
@ -54,4 +47,14 @@ if (config.backends.data === 'mem') {
const data = new DataWrapper( const data = new DataWrapper(
client, implName, config, kms, metadata, locationStorageCheck, vault); client, implName, config, kms, metadata, locationStorageCheck, vault);
config.on('location-constraints-update', () => {
if (implName === 'multipleBackends') {
const clients = parseLC(config, vault);
client = new MultipleBackendGateway(
clients, metadata, locationStorageCheck);
data.switch(client);
}
});
module.exports = { data, client, implName }; module.exports = { data, client, implName };

View File

@ -3,7 +3,7 @@ const https = require('https');
const cluster = require('cluster'); const cluster = require('cluster');
const { series } = require('async'); const { series } = require('async');
const arsenal = require('arsenal'); const arsenal = require('arsenal');
const { RedisClient, StatsClient } = require('arsenal').metrics; const { RedisClient, StatsClient } = arsenal.metrics;
const monitoringClient = require('./utilities/monitoringHandler'); const monitoringClient = require('./utilities/monitoringHandler');
const logger = require('./utilities/logger'); const logger = require('./utilities/logger');
@ -12,7 +12,7 @@ const { clientCheck } = require('./utilities/healthcheckHandler');
const _config = require('./Config').config; const _config = require('./Config').config;
const { blacklistedPrefixes } = require('../constants'); const { blacklistedPrefixes } = require('../constants');
const api = require('./api/api'); const api = require('./api/api');
const { client, implName } = require('./data/wrapper'); const dataWrapper = require('./data/wrapper');
const kms = require('./kms/wrapper'); const kms = require('./kms/wrapper');
const locationStorageCheck = const locationStorageCheck =
require('./api/apiUtils/object/locationStorageCheck'); require('./api/apiUtils/object/locationStorageCheck');
@ -25,7 +25,10 @@ const {
} = require('./management/agentClient'); } = require('./management/agentClient');
const routes = arsenal.s3routes.routes; const routes = arsenal.s3routes.routes;
const { parseLC, MultipleBackendGateway } = arsenal.storage.data;
const websiteEndpoints = _config.websiteEndpoints; const websiteEndpoints = _config.websiteEndpoints;
let client = dataWrapper.client;
const implName = dataWrapper.implName;
let allEndpoints; let allEndpoints;
function updateAllEndpoints() { function updateAllEndpoints() {
@ -33,6 +36,13 @@ function updateAllEndpoints() {
} }
_config.on('rest-endpoints-update', updateAllEndpoints); _config.on('rest-endpoints-update', updateAllEndpoints);
updateAllEndpoints(); updateAllEndpoints();
_config.on('location-constraints-update', () => {
if (implName === 'multipleBackends') {
const clients = parseLC(_config, vault);
client = new MultipleBackendGateway(
clients, metadata, locationStorageCheck);
}
});
// redis client // redis client
let localCacheClient; let localCacheClient;

221
package-lock.json generated
View File

@ -237,7 +237,7 @@
"bson": "4.0.0", "bson": "4.0.0",
"debug": "~4.1.0", "debug": "~4.1.0",
"diskusage": "^1.0.0", "diskusage": "^1.0.0",
"fcntl": "github:scality/node-fcntl", "fcntl": "github:scality/node-fcntl#9108603d8881d7762dcadfde1db927a1653dfda5",
"https-proxy-agent": "^2.2.0", "https-proxy-agent": "^2.2.0",
"ioctl": "2.0.1", "ioctl": "2.0.1",
"ioredis": "4.2.0", "ioredis": "4.2.0",
@ -250,10 +250,10 @@
"simple-glob": "^0.2.0", "simple-glob": "^0.2.0",
"socket.io": "~2.2.0", "socket.io": "~2.2.0",
"socket.io-client": "~2.2.0", "socket.io-client": "~2.2.0",
"sproxydclient": "github:scality/sproxydclient#45090b7", "sproxydclient": "github:scality/sproxydclient#45090b76b24ca1d05482bf151ba84ff6178423d1",
"utf8": "3.0.0", "utf8": "3.0.0",
"uuid": "^3.0.1", "uuid": "^3.0.1",
"werelogs": "github:scality/werelogs#0ff7ec82", "werelogs": "github:scality/werelogs#0ff7ec82f0deb1e472d8285fb7cc9ebde72c5f61",
"xml2js": "~0.4.16" "xml2js": "~0.4.16"
}, },
"dependencies": { "dependencies": {
@ -813,8 +813,8 @@
"version": "github:scality/bucketclient#5aa99d7b25fdfb5a42b787cce7710cdec8ac78f0", "version": "github:scality/bucketclient#5aa99d7b25fdfb5a42b787cce7710cdec8ac78f0",
"from": "github:scality/bucketclient#5aa99d7", "from": "github:scality/bucketclient#5aa99d7",
"requires": { "requires": {
"arsenal": "github:scality/Arsenal#7.4.0.3", "arsenal": "github:scality/Arsenal#bd1bac6b56e01c65320eb315b26221db5adb4b38",
"werelogs": "github:scality/werelogs#7.4.0.3" "werelogs": "github:scality/werelogs#a5605431dfd5927fe74871a737b14fcdbbe9b0c2"
}, },
"dependencies": { "dependencies": {
"abstract-leveldown": { "abstract-leveldown": {
@ -866,7 +866,7 @@
"dependencies": { "dependencies": {
"werelogs": { "werelogs": {
"version": "github:scality/werelogs#a5605431dfd5927fe74871a737b14fcdbbe9b0c2", "version": "github:scality/werelogs#a5605431dfd5927fe74871a737b14fcdbbe9b0c2",
"from": "github:scality/werelogs#a5605431dfd5927fe74871a737b14fcdbbe9b0c2", "from": "github:scality/werelogs#hotfix/7.4.0",
"requires": { "requires": {
"safe-json-stringify": "^1.0.3" "safe-json-stringify": "^1.0.3"
} }
@ -1368,16 +1368,15 @@
"resolved": "github:scality/cdmiclient#8f0c2e6331dfa905bfe269fb4e1558d65ca0b866", "resolved": "github:scality/cdmiclient#8f0c2e6331dfa905bfe269fb4e1558d65ca0b866",
"optional": true, "optional": true,
"requires": { "requires": {
"arsenal": "github:scality/Arsenal#development/8.0", "arsenal": "github:scality/Arsenal#b9c419dde77deb13ff8eba7411a1b4d5f8943e16",
"async": "~1.4.2", "async": "~1.4.2",
"werelogs": "github:scality/werelogs#development/8.0" "werelogs": "github:scality/werelogs#1a6e052fb2bdfb1c4f6bb9467dc814e79abf6e46"
}, },
"dependencies": { "dependencies": {
"abstract-leveldown": { "abstract-leveldown": {
"version": "2.6.3", "version": "2.6.3",
"resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-2.6.3.tgz", "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-2.6.3.tgz",
"integrity": "sha512-2++wDf/DYqkPR3o5tbfdhF96EfMApo1GpPfzOsR/ZYXdkSmELlvOOEAl9iKkRsktMPHdGjO4rtkBpf2I7TiTeA==", "integrity": "sha512-2++wDf/DYqkPR3o5tbfdhF96EfMApo1GpPfzOsR/ZYXdkSmELlvOOEAl9iKkRsktMPHdGjO4rtkBpf2I7TiTeA==",
"optional": true,
"requires": { "requires": {
"xtend": "~4.0.0" "xtend": "~4.0.0"
} }
@ -1395,8 +1394,7 @@
"arraybuffer.slice": { "arraybuffer.slice": {
"version": "0.0.6", "version": "0.0.6",
"resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz", "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz",
"integrity": "sha1-8zshWfBTKj8xB6JywMz70a0peco=", "integrity": "sha1-8zshWfBTKj8xB6JywMz70a0peco="
"optional": true
}, },
"arsenal": { "arsenal": {
"version": "github:scality/Arsenal#b9c419dde77deb13ff8eba7411a1b4d5f8943e16", "version": "github:scality/Arsenal#b9c419dde77deb13ff8eba7411a1b4d5f8943e16",
@ -1409,7 +1407,7 @@
"bson": "2.0.4", "bson": "2.0.4",
"debug": "~2.3.3", "debug": "~2.3.3",
"diskusage": "^0.2.2", "diskusage": "^0.2.2",
"fcntl": "github:scality/node-fcntl", "fcntl": "github:scality/node-fcntl#9108603d8881d7762dcadfde1db927a1653dfda5",
"ioctl": "2.0.0", "ioctl": "2.0.0",
"ioredis": "2.4.0", "ioredis": "2.4.0",
"ipaddr.js": "1.2.0", "ipaddr.js": "1.2.0",
@ -1423,7 +1421,7 @@
"socket.io-client": "~1.7.3", "socket.io-client": "~1.7.3",
"utf8": "2.1.2", "utf8": "2.1.2",
"uuid": "^3.0.1", "uuid": "^3.0.1",
"werelogs": "github:scality/werelogs#0ff7ec82", "werelogs": "github:scality/werelogs#0ff7ec82f0deb1e472d8285fb7cc9ebde72c5f61",
"xml2js": "~0.4.16" "xml2js": "~0.4.16"
}, },
"dependencies": { "dependencies": {
@ -1455,8 +1453,7 @@
"blob": { "blob": {
"version": "0.0.4", "version": "0.0.4",
"resolved": "https://registry.npmjs.org/blob/-/blob-0.0.4.tgz", "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.4.tgz",
"integrity": "sha1-vPEwUspURj8w+fx+lbmkdjCpSSE=", "integrity": "sha1-vPEwUspURj8w+fx+lbmkdjCpSSE="
"optional": true
}, },
"bson": { "bson": {
"version": "2.0.4", "version": "2.0.4",
@ -1467,8 +1464,7 @@
"component-emitter": { "component-emitter": {
"version": "1.1.2", "version": "1.1.2",
"resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz", "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz",
"integrity": "sha1-KWWU8nU9qmOZbSrwjRWpURbJrsM=", "integrity": "sha1-KWWU8nU9qmOZbSrwjRWpURbJrsM="
"optional": true
}, },
"deferred-leveldown": { "deferred-leveldown": {
"version": "1.2.2", "version": "1.2.2",
@ -1497,7 +1493,6 @@
"version": "1.8.5", "version": "1.8.5",
"resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.5.tgz", "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.5.tgz",
"integrity": "sha512-AYTgHyeVUPitsseqjoedjhYJapNVoSPShbZ+tEUX9/73jgZ/Z3sUlJf9oYgdEBBdVhupUpUqSxH0kBCXlQnmZg==", "integrity": "sha512-AYTgHyeVUPitsseqjoedjhYJapNVoSPShbZ+tEUX9/73jgZ/Z3sUlJf9oYgdEBBdVhupUpUqSxH0kBCXlQnmZg==",
"optional": true,
"requires": { "requires": {
"component-emitter": "1.2.1", "component-emitter": "1.2.1",
"component-inherit": "0.0.3", "component-inherit": "0.0.3",
@ -1516,8 +1511,7 @@
"component-emitter": { "component-emitter": {
"version": "1.2.1", "version": "1.2.1",
"resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
"integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=", "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY="
"optional": true
} }
} }
}, },
@ -1525,7 +1519,6 @@
"version": "1.3.2", "version": "1.3.2",
"resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.2.tgz", "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.2.tgz",
"integrity": "sha1-k3sHnwAH0Ik+xW1GyyILjLQ1Igo=", "integrity": "sha1-k3sHnwAH0Ik+xW1GyyILjLQ1Igo=",
"optional": true,
"requires": { "requires": {
"after": "0.8.2", "after": "0.8.2",
"arraybuffer.slice": "0.0.6", "arraybuffer.slice": "0.0.6",
@ -1538,8 +1531,7 @@
"hoek": { "hoek": {
"version": "4.2.1", "version": "4.2.1",
"resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz", "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz",
"integrity": "sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA==", "integrity": "sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA=="
"optional": true
}, },
"ioctl": { "ioctl": {
"version": "2.0.0", "version": "2.0.0",
@ -1560,8 +1552,7 @@
"isarray": { "isarray": {
"version": "0.0.1", "version": "0.0.1",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
"optional": true
}, },
"isemail": { "isemail": {
"version": "2.2.1", "version": "2.2.1",
@ -1601,7 +1592,6 @@
"version": "1.0.5", "version": "1.0.5",
"resolved": "https://registry.npmjs.org/level-errors/-/level-errors-1.0.5.tgz", "resolved": "https://registry.npmjs.org/level-errors/-/level-errors-1.0.5.tgz",
"integrity": "sha512-/cLUpQduF6bNrWuAC4pwtUKA5t669pCsCi2XbmojG2tFeOr9j6ShtdDCtFFQO1DRt+EVZhx9gPzP9G2bUaG4ig==", "integrity": "sha512-/cLUpQduF6bNrWuAC4pwtUKA5t669pCsCi2XbmojG2tFeOr9j6ShtdDCtFFQO1DRt+EVZhx9gPzP9G2bUaG4ig==",
"optional": true,
"requires": { "requires": {
"errno": "~0.1.1" "errno": "~0.1.1"
} }
@ -1680,19 +1670,19 @@
} }
}, },
"mongodb": { "mongodb": {
"version": "3.1.10", "version": "3.1.13",
"resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.1.10.tgz", "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.1.13.tgz",
"integrity": "sha512-Uml42GeFxhTGQVml1XQ4cD0o/rp7J2ROy0fdYUcVitoE7vFqEhKH4TYVqRDpQr/bXtCJVxJdNQC1ntRxNREkPQ==", "integrity": "sha512-sz2dhvBZQWf3LRNDhbd30KHVzdjZx9IKC0L+kSZ/gzYquCF5zPOgGqRz6sSCqYZtKP2ekB4nfLxhGtzGHnIKxA==",
"optional": true, "optional": true,
"requires": { "requires": {
"mongodb-core": "3.1.9", "mongodb-core": "3.1.11",
"safe-buffer": "^5.1.2" "safe-buffer": "^5.1.2"
} }
}, },
"mongodb-core": { "mongodb-core": {
"version": "3.1.9", "version": "3.1.11",
"resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-3.1.9.tgz", "resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-3.1.11.tgz",
"integrity": "sha512-MJpciDABXMchrZphh3vMcqu8hkNf/Mi+Gk6btOimVg1XMxLXh87j6FAvRm+KmwD1A9fpu3qRQYcbQe4egj23og==", "integrity": "sha512-rD2US2s5qk/ckbiiGFHeu+yKYDXdJ1G87F6CG3YdaZpzdOm5zpoAZd/EKbPmFO6cQZ+XVXBXBJ660sSI0gc6qg==",
"optional": true, "optional": true,
"requires": { "requires": {
"bson": "^1.1.0", "bson": "^1.1.0",
@ -1702,9 +1692,9 @@
}, },
"dependencies": { "dependencies": {
"bson": { "bson": {
"version": "1.1.0", "version": "1.1.1",
"resolved": "https://registry.npmjs.org/bson/-/bson-1.1.0.tgz", "resolved": "https://registry.npmjs.org/bson/-/bson-1.1.1.tgz",
"integrity": "sha512-9Aeai9TacfNtWXOYarkFJRW2CWo+dRon+fuLZYJmvLV3+MiUp0bEI6IAZfXEIg7/Pl/7IWlLaDnhzTsD81etQA==", "integrity": "sha512-jCGVYLoYMHDkOsbwJZBCqwMHyH4c+wzgI9hG7Z6SZJRXWr+x58pdIbm2i9a/jFGCkRJqRUr8eoI7lDWa0hTkxg==",
"optional": true "optional": true
} }
} }
@ -1712,8 +1702,7 @@
"ms": { "ms": {
"version": "0.7.1", "version": "0.7.1",
"resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
"integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=", "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg="
"optional": true
}, },
"object-assign": { "object-assign": {
"version": "4.1.0", "version": "4.1.0",
@ -1804,7 +1793,6 @@
"version": "1.7.4", "version": "1.7.4",
"resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.7.4.tgz", "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.7.4.tgz",
"integrity": "sha1-7J+CA1btme9tNX8HVtZIcXvdQoE=", "integrity": "sha1-7J+CA1btme9tNX8HVtZIcXvdQoE=",
"optional": true,
"requires": { "requires": {
"backo2": "1.0.2", "backo2": "1.0.2",
"component-bind": "1.0.0", "component-bind": "1.0.0",
@ -1822,8 +1810,7 @@
"component-emitter": { "component-emitter": {
"version": "1.2.1", "version": "1.2.1",
"resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
"integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=", "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY="
"optional": true
} }
} }
}, },
@ -1831,7 +1818,6 @@
"version": "2.3.1", "version": "2.3.1",
"resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.3.1.tgz", "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.3.1.tgz",
"integrity": "sha1-3VMgJRA85Clpcya+/WQAX8/ltKA=", "integrity": "sha1-3VMgJRA85Clpcya+/WQAX8/ltKA=",
"optional": true,
"requires": { "requires": {
"component-emitter": "1.1.2", "component-emitter": "1.1.2",
"debug": "2.2.0", "debug": "2.2.0",
@ -1843,7 +1829,6 @@
"version": "2.2.0", "version": "2.2.0",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
"integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
"optional": true,
"requires": { "requires": {
"ms": "0.7.1" "ms": "0.7.1"
} }
@ -1871,7 +1856,6 @@
"version": "1.1.5", "version": "1.1.5",
"resolved": "https://registry.npmjs.org/ws/-/ws-1.1.5.tgz", "resolved": "https://registry.npmjs.org/ws/-/ws-1.1.5.tgz",
"integrity": "sha512-o3KqipXNUdS7wpQzBHSe180lBGO60SoK0yVo3CYJgb2MkobuWuBX6dhkYP5ORCLd55y+SaflMOV5fqAB53ux4w==", "integrity": "sha512-o3KqipXNUdS7wpQzBHSe180lBGO60SoK0yVo3CYJgb2MkobuWuBX6dhkYP5ORCLd55y+SaflMOV5fqAB53ux4w==",
"optional": true,
"requires": { "requires": {
"options": ">=0.0.5", "options": ">=0.0.5",
"ultron": "1.0.x" "ultron": "1.0.x"
@ -1880,8 +1864,7 @@
"xmlhttprequest-ssl": { "xmlhttprequest-ssl": {
"version": "1.5.3", "version": "1.5.3",
"resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz", "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz",
"integrity": "sha1-GFqIjATspGw+QHDZn3tJ3jUomS0=", "integrity": "sha1-GFqIjATspGw+QHDZn3tJ3jUomS0="
"optional": true
} }
} }
}, },
@ -4089,21 +4072,21 @@
} }
}, },
"leveldown": { "leveldown": {
"version": "4.0.1", "version": "4.0.2",
"resolved": "https://registry.npmjs.org/leveldown/-/leveldown-4.0.1.tgz", "resolved": "https://registry.npmjs.org/leveldown/-/leveldown-4.0.2.tgz",
"integrity": "sha512-ZlBKVSsglPIPJnz4ggB8o2R0bxDxbsMzuQohbfgoFMVApyTE118DK5LNRG0cRju6rt3OkGxe0V6UYACGlq/byg==", "integrity": "sha512-SUgSRTWFh3eeiTdIt2a4Fi9TZO5oWzE9uC/Iw8+fVr1sk8x1S2l151UWwSmrMFZB3GxJhZIf4bQ0n+051Cctpw==",
"requires": { "requires": {
"abstract-leveldown": "~5.0.0", "abstract-leveldown": "~5.0.0",
"bindings": "~1.3.0", "bindings": "~1.3.0",
"fast-future": "~1.0.2", "fast-future": "~1.0.2",
"nan": "~2.10.0", "nan": "~2.12.1",
"prebuild-install": "^4.0.0" "prebuild-install": "~5.2.4"
}, },
"dependencies": { "dependencies": {
"nan": { "nan": {
"version": "2.10.0", "version": "2.12.1",
"resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz", "resolved": "https://registry.npmjs.org/nan/-/nan-2.12.1.tgz",
"integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==" "integrity": "sha512-JY7V6lRkStKcKTvHO5NVSQRv+RV+FIL5pvDoLiAtSL9pKlC5x9PKQcZDsq7m4FO4d57mkhC6Z+QhAh3Jdk5JFw=="
} }
} }
}, },
@ -4309,9 +4292,9 @@
"dev": true "dev": true
}, },
"memory-pager": { "memory-pager": {
"version": "1.3.1", "version": "1.5.0",
"resolved": "https://registry.npmjs.org/memory-pager/-/memory-pager-1.3.1.tgz", "resolved": "https://registry.npmjs.org/memory-pager/-/memory-pager-1.5.0.tgz",
"integrity": "sha512-pUf/sGkym2WqFZYTVmdASnSbNfpGc9rwxEHOePx4lT/fD+NHGL1U16Uy4o6PMiVcDv4mp6MI/vaF0c/Kd1QEUQ==", "integrity": "sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==",
"optional": true "optional": true
}, },
"mime": { "mime": {
@ -4505,6 +4488,11 @@
"resolved": "https://registry.npmjs.org/nan/-/nan-2.11.1.tgz", "resolved": "https://registry.npmjs.org/nan/-/nan-2.11.1.tgz",
"integrity": "sha512-iji6k87OSXa0CcrLl9z+ZiYSuR2o+c0bGuNmXdrhTQTakxytAFsC56SArGYoiHlJlFoHSnvmhpceZJaXkVuOtA==" "integrity": "sha512-iji6k87OSXa0CcrLl9z+ZiYSuR2o+c0bGuNmXdrhTQTakxytAFsC56SArGYoiHlJlFoHSnvmhpceZJaXkVuOtA=="
}, },
"napi-build-utils": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.1.tgz",
"integrity": "sha512-boQj1WFgQH3v4clhu3mTNfP+vOBxorDlE8EKiMjUlLG3C4qAESnn9AxIOkFgTR2c9LtzNjPrjS60cT27ZKBhaA=="
},
"natural-compare": { "natural-compare": {
"version": "1.4.0", "version": "1.4.0",
"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
@ -4919,25 +4907,41 @@
"dev": true "dev": true
}, },
"prebuild-install": { "prebuild-install": {
"version": "4.0.0", "version": "5.2.4",
"resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-4.0.0.tgz", "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.2.4.tgz",
"integrity": "sha512-7tayxeYboJX0RbVzdnKyGl2vhQRWr6qfClEXDhOkXjuaOKCw2q8aiuFhONRYVsG/czia7KhpykIlI2S2VaPunA==", "integrity": "sha512-CG3JnpTZXdmr92GW4zbcba4jkDha6uHraJ7hW4Fn8j0mExxwOKK20hqho8ZuBDCKYCHYIkFM1P2jhtG+KpP4fg==",
"requires": { "requires": {
"detect-libc": "^1.0.3", "detect-libc": "^1.0.3",
"expand-template": "^1.0.2", "expand-template": "^2.0.3",
"github-from-package": "0.0.0", "github-from-package": "0.0.0",
"minimist": "^1.2.0", "minimist": "^1.2.0",
"mkdirp": "^0.5.1", "mkdirp": "^0.5.1",
"node-abi": "^2.2.0", "napi-build-utils": "^1.0.1",
"node-abi": "^2.7.0",
"noop-logger": "^0.1.1", "noop-logger": "^0.1.1",
"npmlog": "^4.0.1", "npmlog": "^4.0.1",
"os-homedir": "^1.0.1", "os-homedir": "^1.0.1",
"pump": "^2.0.1", "pump": "^2.0.1",
"rc": "^1.1.6", "rc": "^1.2.7",
"simple-get": "^2.7.0", "simple-get": "^2.7.0",
"tar-fs": "^1.13.0", "tar-fs": "^1.13.0",
"tunnel-agent": "^0.6.0", "tunnel-agent": "^0.6.0",
"which-pm-runs": "^1.0.0" "which-pm-runs": "^1.0.0"
},
"dependencies": {
"expand-template": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
"integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg=="
},
"node-abi": {
"version": "2.7.1",
"resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.7.1.tgz",
"integrity": "sha512-OV8Bq1OrPh6z+Y4dqwo05HqrRL9YNF7QVMRfq1/pguwKLG+q9UB/Lk0x5qXjO23JjJg+/jqCHSTaG1P3tfKfuw==",
"requires": {
"semver": "^5.4.1"
}
}
} }
}, },
"prelude-ls": { "prelude-ls": {
@ -5619,7 +5623,7 @@
"version": "github:scality/sproxydclient#45090b76b24ca1d05482bf151ba84ff6178423d1", "version": "github:scality/sproxydclient#45090b76b24ca1d05482bf151ba84ff6178423d1",
"from": "github:scality/sproxydclient#45090b7", "from": "github:scality/sproxydclient#45090b7",
"requires": { "requires": {
"werelogs": "github:scality/werelogs#7.4.0.3" "werelogs": "github:scality/werelogs#a5605431dfd5927fe74871a737b14fcdbbe9b0c2"
}, },
"dependencies": { "dependencies": {
"werelogs": { "werelogs": {
@ -6099,12 +6103,12 @@
"version": "github:scality/utapi#f2f1d0c7423ffdec2ad175e3c0e8bcd7aa2ba867", "version": "github:scality/utapi#f2f1d0c7423ffdec2ad175e3c0e8bcd7aa2ba867",
"from": "github:scality/utapi#f2f1d0c", "from": "github:scality/utapi#f2f1d0c",
"requires": { "requires": {
"arsenal": "github:scality/Arsenal#67365083", "arsenal": "github:scality/Arsenal#6736508364ed537a8851838ba56cf147234c7bd8",
"async": "^2.0.1", "async": "^2.0.1",
"ioredis": "^2.3.0", "ioredis": "^2.3.0",
"node-schedule": "1.2.0", "node-schedule": "1.2.0",
"vaultclient": "github:scality/vaultclient#fbd9988d", "vaultclient": "github:scality/vaultclient#fbd9988dcc2559ac68d4f1c1aea95e0db57f7d0c",
"werelogs": "github:scality/werelogs#0ff7ec82" "werelogs": "github:scality/werelogs#0ff7ec82f0deb1e472d8285fb7cc9ebde72c5f61"
}, },
"dependencies": { "dependencies": {
"abstract-leveldown": { "abstract-leveldown": {
@ -6161,13 +6165,6 @@
"requires": { "requires": {
"lodash": "^4.14.0" "lodash": "^4.14.0"
} }
},
"werelogs": {
"version": "github:scality/werelogs#0ff7ec82f0deb1e472d8285fb7cc9ebde72c5f61",
"from": "github:scality/werelogs#0ff7ec82f0deb1e472d8285fb7cc9ebde72c5f61",
"requires": {
"safe-json-stringify": "1.0.3"
}
} }
} }
}, },
@ -6525,55 +6522,6 @@
"xml2js": "0.4.17" "xml2js": "0.4.17"
}, },
"dependencies": { "dependencies": {
"arsenal": {
"version": "github:scality/Arsenal#6736508364ed537a8851838ba56cf147234c7bd8",
"from": "github:scality/Arsenal#6736508364ed537a8851838ba56cf147234c7bd8",
"requires": {
"JSONStream": "^1.0.0",
"ajv": "4.10.0",
"async": "~2.1.5",
"debug": "~2.3.3",
"diskusage": "^0.2.2",
"ioctl": "2.0.0",
"ioredis": "2.4.0",
"ipaddr.js": "1.2.0",
"joi": "^10.6",
"level": "~1.6.0",
"level-sublevel": "~6.6.1",
"node-forge": "^0.7.1",
"simple-glob": "^0.1",
"socket.io": "~1.7.3",
"socket.io-client": "~1.7.3",
"utf8": "2.1.2",
"uuid": "^3.0.1",
"werelogs": "github:scality/werelogs#0ff7ec82f0deb1e472d8285fb7cc9ebde72c5f61",
"xml2js": "~0.4.16"
},
"dependencies": {
"werelogs": {
"version": "github:scality/werelogs#0ff7ec82f0deb1e472d8285fb7cc9ebde72c5f61",
"from": "github:scality/werelogs#0ff7ec82f0deb1e472d8285fb7cc9ebde72c5f61",
"requires": {
"safe-json-stringify": "1.0.3"
}
}
}
},
"async": {
"version": "2.1.5",
"resolved": "https://registry.npmjs.org/async/-/async-2.1.5.tgz",
"integrity": "sha1-5YfGhYCZSsZ/xW/4bTrFa9voELw=",
"requires": {
"lodash": "^4.14.0"
}
},
"werelogs": {
"version": "github:scality/werelogs#0ff7ec82f0deb1e472d8285fb7cc9ebde72c5f61",
"from": "github:scality/werelogs#0ff7ec82f0deb1e472d8285fb7cc9ebde72c5f61",
"requires": {
"safe-json-stringify": "1.0.3"
}
},
"xml2js": { "xml2js": {
"version": "0.4.17", "version": "0.4.17",
"resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.17.tgz", "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.17.tgz",
@ -6688,9 +6636,9 @@
"version": "github:scality/vaultclient#2cd6ef88d2e0b84e79c425c573b2bc18ff1592c1", "version": "github:scality/vaultclient#2cd6ef88d2e0b84e79c425c573b2bc18ff1592c1",
"from": "github:scality/vaultclient#2cd6ef8", "from": "github:scality/vaultclient#2cd6ef8",
"requires": { "requires": {
"arsenal": "github:scality/arsenal#84bf7bd", "arsenal": "github:scality/arsenal#84bf7bd511297dca24bcc331f2f59b740de72a23",
"commander": "2.9.0", "commander": "2.9.0",
"werelogs": "github:scality/werelogs#74b121b", "werelogs": "github:scality/werelogs#74b121bef4068645e307da143749e61ef416a4c3",
"xml2js": "0.4.17" "xml2js": "0.4.17"
}, },
"dependencies": { "dependencies": {
@ -6724,7 +6672,7 @@
"dependencies": { "dependencies": {
"werelogs": { "werelogs": {
"version": "github:scality/werelogs#0ff7ec82f0deb1e472d8285fb7cc9ebde72c5f61", "version": "github:scality/werelogs#0ff7ec82f0deb1e472d8285fb7cc9ebde72c5f61",
"from": "github:scality/werelogs#0ff7ec82f0deb1e472d8285fb7cc9ebde72c5f61", "from": "github:scality/werelogs#0ff7ec82",
"requires": { "requires": {
"safe-json-stringify": "1.0.3" "safe-json-stringify": "1.0.3"
} }
@ -6787,14 +6735,6 @@
"resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.6.tgz", "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.6.tgz",
"integrity": "sha512-aRVgGdnmW2OiySVPUC9e6m+plolMAJKjZnQlCwNSuK5yQ0JN61DZSO1X1Ufd1foqWRAlig0rhduTCHe7sVtK5Q==" "integrity": "sha512-aRVgGdnmW2OiySVPUC9e6m+plolMAJKjZnQlCwNSuK5yQ0JN61DZSO1X1Ufd1foqWRAlig0rhduTCHe7sVtK5Q=="
}, },
"fcntl": {
"version": "github:scality/node-fcntl#9108603d8881d7762dcadfde1db927a1653dfda5",
"from": "github:scality/node-fcntl#9108603d8881d7762dcadfde1db927a1653dfda5",
"requires": {
"bindings": "^1.1.1",
"nan": "^2.3.2"
}
},
"ioredis": { "ioredis": {
"version": "4.2.0", "version": "4.2.0",
"resolved": "https://registry.npmjs.org/ioredis/-/ioredis-4.2.0.tgz", "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-4.2.0.tgz",
@ -6843,9 +6783,9 @@
}, },
"dependencies": { "dependencies": {
"bson": { "bson": {
"version": "1.1.0", "version": "1.1.1",
"resolved": "https://registry.npmjs.org/bson/-/bson-1.1.0.tgz", "resolved": "https://registry.npmjs.org/bson/-/bson-1.1.1.tgz",
"integrity": "sha512-9Aeai9TacfNtWXOYarkFJRW2CWo+dRon+fuLZYJmvLV3+MiUp0bEI6IAZfXEIg7/Pl/7IWlLaDnhzTsD81etQA==" "integrity": "sha512-jCGVYLoYMHDkOsbwJZBCqwMHyH4c+wzgI9hG7Z6SZJRXWr+x58pdIbm2i9a/jFGCkRJqRUr8eoI7lDWa0hTkxg=="
} }
} }
}, },
@ -6867,6 +6807,13 @@
"resolved": "https://registry.npmjs.org/utf8/-/utf8-3.0.0.tgz", "resolved": "https://registry.npmjs.org/utf8/-/utf8-3.0.0.tgz",
"integrity": "sha512-E8VjFIQ/TyQgp+TZfS6l8yp/xWppSAHzidGiRrqe4bK4XP9pTRyKFgGJpO3SN7zdX4DeomTrwaseCHovfpFcqQ==" "integrity": "sha512-E8VjFIQ/TyQgp+TZfS6l8yp/xWppSAHzidGiRrqe4bK4XP9pTRyKFgGJpO3SN7zdX4DeomTrwaseCHovfpFcqQ=="
}, },
"werelogs": {
"version": "github:scality/werelogs#74b121bef4068645e307da143749e61ef416a4c3",
"from": "github:scality/werelogs#74b121b",
"requires": {
"safe-json-stringify": "^1.0.3"
}
},
"xml2js": { "xml2js": {
"version": "0.4.17", "version": "0.4.17",
"resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.17.tgz", "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.17.tgz",