Skip to content
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

Open
wants to merge 17 commits into
base: development/8.2
Choose a base branch
from

Conversation

benzekrimaha
Copy link
Contributor

@benzekrimaha benzekrimaha commented Oct 21, 2024

Issue : ARSN-423

@bert-e
Copy link
Contributor

bert-e commented Oct 21, 2024

Hello benzekrimaha,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Available options
name description privileged authored
/after_pull_request Wait for the given pull request id to be merged before continuing with the current one.
/bypass_author_approval Bypass the pull request author's approval
/bypass_build_status Bypass the build and test status
/bypass_commit_size Bypass the check on the size of the changeset TBA
/bypass_incompatible_branch Bypass the check on the source branch prefix
/bypass_jira_check Bypass the Jira issue check
/bypass_peer_approval Bypass the pull request peers' approval
/bypass_leader_approval Bypass the pull request leaders' approval
/approve Instruct Bert-E that the author has approved the pull request. ✍️
/create_pull_requests Allow the creation of integration pull requests.
/create_integration_branches Allow the creation of integration branches.
/no_octopus Prevent Wall-E from doing any octopus merge and use multiple consecutive merge instead
/unanimity Change review acceptance criteria from one reviewer at least to all reviewers
/wait Instruct Bert-E not to run until further notice.
Available commands
name description privileged
/help Print Bert-E's manual in the pull request.
/status Print Bert-E's current status in the pull request TBA
/clear Remove all comments from Bert-E from the history TBA
/retry Re-start a fresh build TBA
/build Re-start a fresh build TBA
/force_reset Delete integration branches & pull requests, and restart merge process from the beginning.
/reset Try to remove integration branches unless there are commits on them which do not appear on the source branch.

Status report is not available.

@scality scality deleted a comment from bert-e Oct 21, 2024
@bert-e
Copy link
Contributor

bert-e commented Oct 21, 2024

Conflict

There is a conflict between your branch improvement/ARSN-423-bump-dependencies and the
destination branch development/8.2.

Please resolve the conflict on the feature branch (improvement/ARSN-423-bump-dependencies).

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

@benzekrimaha benzekrimaha force-pushed the improvement/ARSN-423-bump-dependencies branch from 57632be to 7cfe8b2 Compare October 21, 2024 15:34
@bert-e
Copy link
Contributor

bert-e commented Oct 21, 2024

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • 2 peers

Copy link

codecov bot commented Oct 21, 2024

Codecov Report

Attention: Patch coverage is 65.07463% with 117 lines in your changes missing coverage. Please review.

Project coverage is 66.58%. Comparing base (233ae61) to head (909eb1a).

Files with missing lines Patch % Lines
...orage/metadata/mongoclient/MongoClientInterface.ts 25.71% 26 Missing ⚠️
lib/policyEvaluator/RequestContext.ts 55.76% 23 Missing ⚠️
lib/patches/locationConstraints.ts 81.81% 10 Missing ⚠️
lib/auth/backends/ChainBackend.ts 27.27% 8 Missing ⚠️
lib/network/kmsAWS/Client.ts 71.42% 8 Missing ⚠️
lib/storage/metadata/mongoclient/LogConsumer.js 12.50% 7 Missing ⚠️
lib/s3routes/routesUtils.ts 0.00% 5 Missing ⚠️
lib/metrics/RedisClient.ts 0.00% 4 Missing ⚠️
lib/s3middleware/azureHelpers/mpuUtils.ts 0.00% 4 Missing ⚠️
lib/auth/auth.ts 57.14% 3 Missing ⚠️
... and 12 more
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.
📢 Have feedback on the report? Share it here.

@benzekrimaha benzekrimaha force-pushed the improvement/ARSN-423-bump-dependencies branch 3 times, most recently from 75aab28 to 751140a Compare October 22, 2024 07:18
@benzekrimaha benzekrimaha marked this pull request as ready for review October 22, 2024 07:18
lib/s3middleware/processMpuParts.ts Outdated Show resolved Hide resolved
lib/policyEvaluator/utils/wildcards.ts Outdated Show resolved Hide resolved
@@ -279,9 +277,9 @@ export function convertConditionOperator(operator: string): boolean {
} else {
return policyValRegex(key);
}
return true;
Copy link
Contributor

@williamlardier williamlardier Oct 22, 2024

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...

tests/unit/algos/list/delimiterMaster.spec.ts Outdated Show resolved Hide resolved
tests/functional/clustering/ClusterRPC.spec.js Outdated Show resolved Hide resolved
lib/models/ObjectMDArchive.ts Outdated Show resolved Hide resolved
lib/models/ObjectMDAmzRestore.ts Outdated Show resolved Hide resolved
lib/models/LifecycleConfiguration.ts Outdated Show resolved Hide resolved
lib/models/LifecycleConfiguration.ts Outdated Show resolved Hide resolved
lib/algos/list/delimiter.ts Outdated Show resolved Hide resolved
@benzekrimaha benzekrimaha force-pushed the improvement/ARSN-423-bump-dependencies branch 2 times, most recently from 07d79a7 to cb09de6 Compare October 22, 2024 08:23
@benzekrimaha benzekrimaha force-pushed the improvement/ARSN-423-bump-dependencies branch from 50b1389 to c175969 Compare November 19, 2024 18:20
@scality scality deleted a comment from bert-e Nov 19, 2024
@benzekrimaha benzekrimaha force-pushed the improvement/ARSN-423-bump-dependencies branch from b67e160 to 9cc8a28 Compare November 19, 2024 19:14
@bert-e
Copy link
Contributor

bert-e commented Nov 19, 2024

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • 2 peers

@scality scality deleted a comment from bert-e Nov 19, 2024
@scality scality deleted a comment from bert-e Nov 19, 2024
@scality scality deleted a comment from bert-e Nov 19, 2024
@scality scality deleted a comment from bert-e Nov 19, 2024
@benzekrimaha
Copy link
Contributor Author

/approve

@benzekrimaha
Copy link
Contributor Author

/wait

@bert-e
Copy link
Contributor

bert-e commented Nov 19, 2024

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • 2 peers

The following options are set: approve

package.json Outdated Show resolved Hide resolved
@benzekrimaha benzekrimaha force-pushed the improvement/ARSN-423-bump-dependencies branch from 19e6264 to 9eafa33 Compare November 28, 2024 15:46
@benzekrimaha benzekrimaha force-pushed the improvement/ARSN-423-bump-dependencies branch from 9eafa33 to ba7ade2 Compare November 28, 2024 16:07
Comment on lines 38 to 44

const { email, ...userInfoWithoutEmail } = authInfo.message.body.userInfo;
const { ...userInfoWithoutEmail } = authInfo.message.body.userInfo;

log.debug('received info from Vault', {
...authInfo,
Copy link
Contributor

@Kerkesni Kerkesni Jan 20, 2025

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.

Copy link
Contributor Author

@benzekrimaha benzekrimaha Jan 27, 2025

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

Copy link
Contributor

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)

Copy link
Contributor

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)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should do it ?

Suggested change
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,

@benzekrimaha benzekrimaha force-pushed the improvement/ARSN-423-bump-dependencies branch 2 times, most recently from 5722c3a to 33e77f0 Compare January 27, 2025 09:57
benzekrimaha and others added 15 commits January 28, 2025 13:06
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
@benzekrimaha benzekrimaha force-pushed the improvement/ARSN-423-bump-dependencies branch from 33e77f0 to 59f54bb Compare January 28, 2025 14:41
@benzekrimaha benzekrimaha force-pushed the improvement/ARSN-423-bump-dependencies branch from 8a3abe6 to a3343a4 Compare January 28, 2025 15:57
Comment on lines 55 to +62

## Build Status

![badgepub]

## Codecov Status

![codecov]
Copy link
Contributor

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
Copy link
Contributor

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...

Suggested change
[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
Copy link
Contributor

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

Suggested change

Comment on lines +2591 to 2600
log.error('could not get list of collections', {
method: 'getBucketInfos',
error: err,
});
if (err && err instanceof ArsenalError) {
return cb(err);
}
return cb(errors.InternalError);
});
}
Copy link
Contributor

@francoisferrand francoisferrand Jan 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bad indent

Suggested change
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)

Suggested change
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 */
Copy link
Contributor

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();
Copy link
Contributor

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 ?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants