Compare commits
3 Commits
developmen
...
improvemen
Author | SHA1 | Date |
---|---|---|
williamlardier | e3bf23ade3 | |
williamlardier | 1e1043c6f9 | |
williamlardier | c7eb17d54b |
|
@ -60,7 +60,7 @@
|
||||||
},
|
},
|
||||||
"clusters": 1,
|
"clusters": 1,
|
||||||
"log": {
|
"log": {
|
||||||
"logLevel": "info",
|
"logLevel": "trace",
|
||||||
"dumpLevel": "error"
|
"dumpLevel": "error"
|
||||||
},
|
},
|
||||||
"healthChecks": {
|
"healthChecks": {
|
||||||
|
|
|
@ -537,7 +537,7 @@ stages:
|
||||||
name: docker build
|
name: docker build
|
||||||
command: >-
|
command: >-
|
||||||
docker build .
|
docker build .
|
||||||
--tag=${DEVELOPMENT_DOCKER_IMAGE_NAME}:%(prop:commit_short_revision)s
|
--tag=${DEVELOPMENT_DOCKER_IMAGE_NAME}:8.5.501
|
||||||
env: *docker_env
|
env: *docker_env
|
||||||
haltOnFailure: true
|
haltOnFailure: true
|
||||||
- ShellCommand:
|
- ShellCommand:
|
||||||
|
@ -557,7 +557,7 @@ stages:
|
||||||
name: push dashboards to the development namespace
|
name: push dashboards to the development namespace
|
||||||
command: |
|
command: |
|
||||||
for revision in %(prop:commit_short_revision)s latest ; do
|
for revision in %(prop:commit_short_revision)s latest ; do
|
||||||
oras push ${REGISTRY}/${PROJECT}-dev/${PROJECT}-dashboards:$revision ${LAYERS}
|
oras push ${REGISTRY}/${PROJECT}-dev/${PROJECT}-dashboards:8.5.501 ${LAYERS}
|
||||||
done
|
done
|
||||||
env: *oras
|
env: *oras
|
||||||
workdir: build/monitoring/
|
workdir: build/monitoring/
|
||||||
|
|
|
@ -135,13 +135,18 @@ function _buildConstantParams({ request, bucketName, authInfo, authParams, ip, l
|
||||||
|
|
||||||
function _handleAuthResults(locationConstraint, log, cb) {
|
function _handleAuthResults(locationConstraint, log, cb) {
|
||||||
return (err, authorizationResults) => {
|
return (err, authorizationResults) => {
|
||||||
|
console.log('TESTING', err, JSON.stringify(authorizationResults));
|
||||||
|
console.log('TESTING', err, authorizationResults);
|
||||||
if (err) {
|
if (err) {
|
||||||
return cb(err);
|
return cb(err);
|
||||||
}
|
}
|
||||||
if (!authorizationResults.every(res => {
|
if (!authorizationResults.every(res => {
|
||||||
|
console.log('TESTING >>', res);
|
||||||
if (Array.isArray(res)) {
|
if (Array.isArray(res)) {
|
||||||
|
console.log('TESTING >>>', res.every(subRes => subRes.isAllowed));
|
||||||
return res.every(subRes => subRes.isAllowed);
|
return res.every(subRes => subRes.isAllowed);
|
||||||
}
|
}
|
||||||
|
console.log('TESTING >>>', res.isAllowed);
|
||||||
return res.isAllowed;
|
return res.isAllowed;
|
||||||
})) {
|
})) {
|
||||||
log.trace(
|
log.trace(
|
||||||
|
@ -242,6 +247,7 @@ function bucketPut(authInfo, request, log, callback) {
|
||||||
return waterfall([
|
return waterfall([
|
||||||
next => _parseXML(request, log, next),
|
next => _parseXML(request, log, next),
|
||||||
(locationConstraint, next) => {
|
(locationConstraint, next) => {
|
||||||
|
console.log('!!!!', isRequesterNonAccountUser(authInfo));
|
||||||
if (!isRequesterNonAccountUser(authInfo)) {
|
if (!isRequesterNonAccountUser(authInfo)) {
|
||||||
return next(null, locationConstraint);
|
return next(null, locationConstraint);
|
||||||
}
|
}
|
||||||
|
|
|
@ -46,7 +46,7 @@
|
||||||
"utf-8-validate": "^5.0.8",
|
"utf-8-validate": "^5.0.8",
|
||||||
"utf8": "~2.1.1",
|
"utf8": "~2.1.1",
|
||||||
"uuid": "^8.3.2",
|
"uuid": "^8.3.2",
|
||||||
"vaultclient": "scality/vaultclient#8.3.8",
|
"vaultclient": "scality/vaultclient#9beee50d0ae1c0552387fd18a9f76df2eac20511",
|
||||||
"werelogs": "scality/werelogs#8.1.0",
|
"werelogs": "scality/werelogs#8.1.0",
|
||||||
"ws": "^5.1.0",
|
"ws": "^5.1.0",
|
||||||
"xml2js": "~0.4.16"
|
"xml2js": "~0.4.16"
|
||||||
|
|
44
yarn.lock
44
yarn.lock
|
@ -534,46 +534,6 @@ arraybuffer.slice@~0.0.7:
|
||||||
optionalDependencies:
|
optionalDependencies:
|
||||||
ioctl "^2.0.2"
|
ioctl "^2.0.2"
|
||||||
|
|
||||||
"arsenal@git+https://github.com/scality/Arsenal.git#8.1.65":
|
|
||||||
version "8.1.65"
|
|
||||||
resolved "git+https://github.com/scality/Arsenal.git#390fd97edf3597762ce632c9476973b79e791d44"
|
|
||||||
dependencies:
|
|
||||||
"@types/async" "^3.2.12"
|
|
||||||
"@types/utf8" "^3.0.1"
|
|
||||||
JSONStream "^1.0.0"
|
|
||||||
agentkeepalive "^4.1.3"
|
|
||||||
ajv "6.12.3"
|
|
||||||
async "~2.6.4"
|
|
||||||
aws-sdk "^2.1005.0"
|
|
||||||
azure-storage "~2.10.7"
|
|
||||||
backo "^1.1.0"
|
|
||||||
base-x "3.0.8"
|
|
||||||
base62 "2.0.1"
|
|
||||||
bson "4.0.0"
|
|
||||||
debug "~4.1.0"
|
|
||||||
diskusage "^1.1.1"
|
|
||||||
fcntl "github:scality/node-fcntl#0.2.0"
|
|
||||||
hdclient scality/hdclient#1.1.0
|
|
||||||
https-proxy-agent "^2.2.0"
|
|
||||||
ioredis "^4.28.5"
|
|
||||||
ipaddr.js "1.9.1"
|
|
||||||
joi "^17.6.0"
|
|
||||||
level "~5.0.1"
|
|
||||||
level-sublevel "~6.6.5"
|
|
||||||
mongodb "^3.0.1"
|
|
||||||
node-forge "^1.3.0"
|
|
||||||
prom-client "10.2.3"
|
|
||||||
simple-glob "^0.2.0"
|
|
||||||
socket.io "2.4.1"
|
|
||||||
socket.io-client "2.4.0"
|
|
||||||
sproxydclient "github:scality/sproxydclient#8.0.4"
|
|
||||||
utf8 "3.0.0"
|
|
||||||
uuid "^3.0.1"
|
|
||||||
werelogs scality/werelogs#8.1.0
|
|
||||||
xml2js "~0.4.23"
|
|
||||||
optionalDependencies:
|
|
||||||
ioctl "^2.0.2"
|
|
||||||
|
|
||||||
"arsenal@git+https://github.com/scality/Arsenal.git#8.1.68":
|
"arsenal@git+https://github.com/scality/Arsenal.git#8.1.68":
|
||||||
version "8.1.68"
|
version "8.1.68"
|
||||||
resolved "git+https://github.com/scality/Arsenal.git#8618d77de99025f6ae6371653de3d9b285c7ddaf"
|
resolved "git+https://github.com/scality/Arsenal.git#8618d77de99025f6ae6371653de3d9b285c7ddaf"
|
||||||
|
@ -5583,9 +5543,9 @@ vaultclient@scality/vaultclient#8.2.6:
|
||||||
werelogs "git+https://github.com/scality/werelogs#8.1.0"
|
werelogs "git+https://github.com/scality/werelogs#8.1.0"
|
||||||
xml2js "0.4.19"
|
xml2js "0.4.19"
|
||||||
|
|
||||||
vaultclient@scality/vaultclient#8.3.8:
|
vaultclient@scality/vaultclient#9beee50d0ae1c0552387fd18a9f76df2eac20511:
|
||||||
version "8.3.8"
|
version "8.3.8"
|
||||||
resolved "https://codeload.github.com/scality/vaultclient/tar.gz/c77ec545ce421072d5f860fd588cb4b265e4a290"
|
resolved "https://codeload.github.com/scality/vaultclient/tar.gz/9beee50d0ae1c0552387fd18a9f76df2eac20511"
|
||||||
dependencies:
|
dependencies:
|
||||||
agentkeepalive "^4.1.3"
|
agentkeepalive "^4.1.3"
|
||||||
arsenal "git+https://github.com/scality/Arsenal#8.1.62"
|
arsenal "git+https://github.com/scality/Arsenal#8.1.62"
|
||||||
|
|
Loading…
Reference in New Issue