-
Notifications
You must be signed in to change notification settings - Fork 19
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.28% 66.42% +0.14%
===================================================
Files 215 215
Lines 17327 17342 +15
Branches 3526 3584 +58
===================================================
+ Hits 11485 11520 +35
+ Misses 5827 5816 -11
+ Partials 15 6 -9 ☔ 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
e4931a8
to
7e142a1
Compare
{ error: err }); | ||
return done(err); | ||
} | ||
useUnifiedTopology: 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.
This shouldn't be needed, I guess this one is deprecated and at least enabled by default, can we check?
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.
reopening because it's still there
`<Code>${error.message}</Code>`, | ||
`<Message>${error.description}</Message>`, | ||
); |
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 believe this was changed already in 8.1, you can rebase your branch
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 branch has been rebased
7e142a1
to
e293f89
Compare
README.md
Outdated
![Public Build Status][badgepub] | ||
![Private Build Status][badgepriv] | ||
|
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.
+1 for adding badges, but these badges do not seem relevant:
[badgepub]: https://circleci.com/gh/scality/Arsenal.svg?style=svg
[badgepriv]: http://ci.ironmann.io/gh/scality/Arsenal.svg?style=svg&circle-token=c3d2570682cba6763a97ea0bc87521941413d75c
Either do not add the badges, or actually fix them, based on gha and codecov.
Not sure what the "private build status" is.
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
ad32261
to
552b601
Compare
3096ffe
to
44ed300
Compare
{ error: err }); | ||
return done(err); | ||
} | ||
useUnifiedTopology: 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.
reopening because it's still there
@@ -477,6 +479,8 @@ class MongoClientInterface { | |||
const m = this.getCollection(METASTORE); | |||
m.findOneAndDelete({ | |||
_id: bucketName, | |||
} , { | |||
includeResultMetadata: 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.
(same for others)
includeResultMetadata: true | |
includeResultMetadata: true, |
upsert: true, | ||
}).then(res => { | ||
},).then(res => { |
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.
Not sure the comma is expected here
@@ -18,8 +18,7 @@ export function getClientIp(request: IncomingMessage, s3config?: S3Config): stri | |||
const requestConfig = s3config?.requests; | |||
const remoteAddress = request.socket.remoteAddress; | |||
// TODO What to do if clientIp === undefined ? | |||
const clientIp = (requestConfig ? remoteAddress : request.headers['x-forwarded-for'] || | |||
remoteAddress)?.toString() ?? ''; | |||
const clientIp = remoteAddress?.toString() ?? ''; |
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.
Should be already in 8.1 and 8.2, maybe the PR branch is not up to date
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.
"lint_md": "mdlint $(git ls-files '*.md')", | ||
"lint_yml": "yamllint $(git ls-files '*.yml')", | ||
"test": "jest tests/unit", | ||
"test": "export NODE_OPTIONS=\"--tls-max-v1.2\" && jest tests/unit --detectOpenHandles", |
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.
Re-opening because I see it's still there as well, and we should support TLS 1.3 today... if we don't support it then we should create a ticket to work on before merging this PR
Issue : ARSN-423