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

CLDSRV-552: Set originOp for putObjectRetention and putObjectLegalHold #5725

Merged
merged 1 commit into from
Jan 8, 2025

Conversation

dvasilas
Copy link
Contributor

@dvasilas dvasilas commented Jan 7, 2025

putObjectRetention and putObjectLegalHold operations do not set the originOp metadata field and as a result copy the originOp of the previous operation on the object (e.g. s3:ObjectCreated).

Issue: CLDSRV-552

@bert-e
Copy link
Contributor

bert-e commented Jan 7, 2025

Hello dvasilas,

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.

@bert-e
Copy link
Contributor

bert-e commented Jan 7, 2025

Incorrect fix version

The Fix Version/s in issue CLDSRV-552 contains:

  • None

Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:

  • 7.70.60

  • 8.8.41

  • 9.0.0

Please check the Fix Version/s of CLDSRV-552, or the target
branch of this pull request.

@bert-e
Copy link
Contributor

bert-e commented Jan 7, 2025

Request integration branches

Waiting for integration branch creation to be requested by the user.

To request integration branches, please comment on this pull request with the following command:

/create_integration_branches

Alternatively, the /approve and /create_pull_requests commands will automatically
create the integration branches.

Copy link
Contributor

@anurag4DSB anurag4DSB left a comment

Choose a reason for hiding this comment

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

LGTM

@@ -94,6 +94,8 @@ function objectPutLegalHold(authInfo, request, log, callback) {
objectMD.replicationInfo = Object.assign({},
objectMD.replicationInfo, replicationInfo);
}
// eslint-disable-next-line no-param-reassign
objectMD.originOp = 's3:ObjectLegalHold:Put';
Copy link
Contributor

Choose a reason for hiding this comment

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

I don't know if we want to reflect this event back to the client through bucket notifications but in Arsenal we have the supportedNotificationEvents variable in the lib/constants.ts file, that might require updates with these new events (if we want to return them).
If we edit arsenal, it should ideally be done before this PR.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We discussed about this with @francoisferrand, and we don't want to add event types in that list that are not in AWSs' list of supported event types: https://docs.aws.amazon.com/AmazonS3/latest/userguide/notification-how-to-event-types-and-destinations.html .

Basically, if AWS does not send notifications for those operations (I checked that), we should not either.

@dvasilas
Copy link
Contributor Author

dvasilas commented Jan 7, 2025

/create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented Jan 7, 2025

Integration data created

I have created the integration data for the additional destination branches.

The following branches will NOT be impacted:

  • development/7.10
  • development/7.4

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

The following options are set: create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented Jan 7, 2025

Waiting for approval

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

  • the author

  • 2 peers

The following options are set: create_integration_branches

@dvasilas
Copy link
Contributor Author

dvasilas commented Jan 8, 2025

/approve

@bert-e
Copy link
Contributor

bert-e commented Jan 8, 2025

I have successfully merged the changeset of this pull request
into targetted development branches:

  • ✔️ development/7.70

  • ✔️ development/8.8

  • ✔️ development/9.0

The following branches have NOT changed:

  • development/7.10
  • development/7.4

Please check the status of the associated issue CLDSRV-552.

Goodbye dvasilas.

The following options are set: approve, create_integration_branches

@bert-e bert-e merged commit 830ba20 into development/7.70 Jan 8, 2025
11 checks passed
@bert-e bert-e deleted the bugfix/CLDSRV-552 branch January 8, 2025 08:35
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.

7 participants