-
Notifications
You must be signed in to change notification settings - Fork 20
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Improvement/arsn 423 bump dependencies #2266
base: development/8.2
Are you sure you want to change the base?
Improvement/arsn 423 bump dependencies #2266
Conversation
Hello benzekrimaha,My role is to assist you with the merge of this Available options
Available commands
Status report is not available. |
ConflictThere is a conflict between your branch Please resolve the conflict on the feature branch ( git fetch && \
git checkout origin/improvement/ARSN-423-bump-dependencies && \
git merge origin/development/8.2 Resolve merge conflicts and commit git push origin HEAD:improvement/ARSN-423-bump-dependencies |
57632be
to
7cfe8b2
Compare
Waiting for approvalThe following approvals are needed before I can proceed with the merge:
|
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## development/8.2 #2266 +/- ##
===================================================
+ Coverage 66.45% 66.58% +0.13%
===================================================
Files 216 216
Lines 17443 17452 +9
Branches 3570 3619 +49
===================================================
+ Hits 11591 11620 +29
+ Misses 5836 5828 -8
+ Partials 16 4 -12 ☔ View full report in Codecov by Sentry. |
75aab28
to
751140a
Compare
@@ -279,9 +277,9 @@ export function convertConditionOperator(operator: string): boolean { | |||
} else { | |||
return policyValRegex(key); | |||
} | |||
return true; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we should return undefined here, because if we reach this stage, it means the "key" was an array and a prefix that is unknown...
07d79a7
to
cb09de6
Compare
50b1389
to
c175969
Compare
b67e160
to
9cc8a28
Compare
Waiting for approvalThe following approvals are needed before I can proceed with the merge:
|
/approve |
/wait |
Waiting for approvalThe following approvals are needed before I can proceed with the merge:
The following options are set: approve |
19e6264
to
9eafa33
Compare
9eafa33
to
ba7ade2
Compare
|
||
const { email, ...userInfoWithoutEmail } = authInfo.message.body.userInfo; | ||
const { ...userInfoWithoutEmail } = authInfo.message.body.userInfo; | ||
|
||
log.debug('received info from Vault', { | ||
...authInfo, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The goal of this was to exclude the email from the info we set in userInfo
below, with the new change it's included again.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No the goal was not to exclude it , the value was declared but never used thus causing a lint error
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm pretty sure the email was removed from the log for security reasons, you check this commit 6374fc8 (the name of the variable also suggests it)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We can try another approach if we want to avoid the linting issue but yes, we should not print PII in the logs, and the auth info has some (the email)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this should do it ?
const { email, ...userInfoWithoutEmail } = authInfo.message.body.userInfo; | |
const { ...userInfoWithoutEmail } = authInfo.message.body.userInfo; | |
log.debug('received info from Vault', { | |
...authInfo, | |
const { email: _, ...userInfoWithoutEmail } = authInfo.message.body.userInfo; | |
log.debug('received info from Vault', { | |
...authInfo, |
5722c3a
to
33e77f0
Compare
Issue: ARSN-423
In this commit the code has been updated to match the new uuid require based on the documentation here : https://www.npmjs.com/package/uuid timestamp format has been updated as well from new Timestamp(1, 1651144629) to new Timestamp({ t: 1651144629 , i: 1 }), the remaining changes are lint fixups ( please note that the indentation has been fixed as well automatically using lint --fix) Issue: ARSN-423
In this commit we fix the tests that were failing after the dependencies bumps. Issue: ARSN-423
Issue: ARSN-423
33e77f0
to
59f54bb
Compare
8a3abe6
to
a3343a4
Compare
|
||
## Build Status | ||
|
||
![badgepub] | ||
|
||
## Codecov Status | ||
|
||
![codecov] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i think it's the usual practice to keep the badges "displayed" on top of the README file, so they are visible when we open the github repository's page
[badgepub]: https://circleci.com/gh/scality/Arsenal.svg?style=svg | ||
[badgepriv]: http://ci.ironmann.io/gh/scality/Arsenal.svg?style=svg&circle-token=c3d2570682cba6763a97ea0bc87521941413d75c | ||
[badgepub]: https://github.com/scality/Arsenal/actions/workflows/tests.yaml/badge.svg | ||
[codecov]: https://codecov.io/gh/scality/Arsenal/branch/development/8.1/graph/badge.svg?token=X0esXhJSwb |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
is this token "safe" to share here: where does it come from/what does it give access to?
Just tried without the token, and it seems to work jsut fine: even in a new "private browsing" window, so i guess we can just remove it...
[codecov]: https://codecov.io/gh/scality/Arsenal/branch/development/8.1/graph/badge.svg?token=X0esXhJSwb | |
[codecov]: https://codecov.io/gh/scality/Arsenal/branch/development/8.1/graph/badge.svg |
@@ -1682,7 +1686,7 @@ class MongoClientInterface { | |||
// a master or re-delete it in between so place an | |||
// atomic condition on the PHD flag and the mst | |||
// version: | |||
// eslint-disable-next-line | |||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
uneeded empty line (between a comment and the code it refers to) + space at end of line
log.error('could not get list of collections', { | ||
method: 'getBucketInfos', | ||
error: err, | ||
}); | ||
if (err && err instanceof ArsenalError) { | ||
return cb(err); | ||
} | ||
return cb(errors.InternalError); | ||
}); | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
bad indent
log.error('could not get list of collections', { | |
method: 'getBucketInfos', | |
error: err, | |
}); | |
if (err && err instanceof ArsenalError) { | |
return cb(err); | |
} | |
return cb(errors.InternalError); | |
}); | |
} | |
log.error('could not get list of collections', { | |
method: 'getBucketInfos', | |
error: err, | |
}); | |
if (err && err instanceof ArsenalError) { | |
return cb(err); | |
} | |
return cb(errors.InternalError); | |
}); | |
} |
or wrap ).catch(err => {
to better show that there are 2 "nested" promises (catch relates to toArray().then
, not to async.eachLimit
)
log.error('could not get list of collections', { | |
method: 'getBucketInfos', | |
error: err, | |
}); | |
if (err && err instanceof ArsenalError) { | |
return cb(err); | |
} | |
return cb(errors.InternalError); | |
}); | |
} | |
}) | |
).catch(err => { | |
log.error('could not get list of collections', { | |
method: 'getBucketInfos', | |
error: err, | |
}); | |
if (err && err instanceof ArsenalError) { | |
return cb(err); | |
} | |
return cb(errors.InternalError); | |
}); |
return cb(null, results); | ||
}); | ||
}); | ||
} | ||
|
||
consolidateData(store, dataManaged) { | ||
/* eslint-disable */ | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
extra empty line + space at end of line
@@ -2977,20 +2977,20 @@ class MongoClientInterface { | |||
} | |||
}); | |||
}).then(() => { | |||
const bucketStatus = bucketInfo.getVersioningConfiguration(); | |||
const isVer = (bucketStatus && | |||
const bucketStatus = bucketInfo.getVersioningConfiguration(); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
same here, weird indent : should wrap then
?
Issue : ARSN-423