scality / Arsenal

Common utilities for the open-source Scality S3 project components
Apache License 2.0
14 stars 19 forks source link

ARSN-412: add support for `exists` condition for transactions #2235

Closed anurag4DSB closed 4 months ago

anurag4DSB commented 5 months ago

Motivation: We arte using the improvement for this Vault PR and specifically here We're enhancing data integrity in our IAM systems to prevent accidental deletions of mutable yet key-constrained entities. Introducing key existence checks before batch operations will help avoid conflicts and ensure data accuracy.

Details of the Code Being Merged:

bert-e commented 5 months ago

Hello anurag4dsb,

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 | :star: | `/bypass_build_status` | Bypass the build and test status | :star: | `/bypass_commit_size` | Bypass the check on the size of the changeset ```TBA``` | :star: | `/bypass_incompatible_branch` | Bypass the check on the source branch prefix | :star: | `/bypass_jira_check` | Bypass the Jira issue check | :star: | `/bypass_peer_approval` | Bypass the pull request peers' approval | :star: | `/bypass_leader_approval` | Bypass the pull request leaders' approval | :star: | `/approve` | Instruct Bert-E that the author has approved the pull request. | | :writing_hand: `/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 commented 5 months ago

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.

anurag4DSB commented 5 months ago

/create_integration_branches

bert-e commented 5 months ago

Conflict

A conflict has been raised during the creation of integration branch w/8.1/bugfix/ARSN-412-add-support-for-exists-condition with contents from bugfix/ARSN-412-add-support-for-exists-condition and development/8.1.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.1/bugfix/ARSN-412-add-support-for-exists-condition origin/development/8.1
 $ git merge origin/bugfix/ARSN-412-add-support-for-exists-condition
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.1/bugfix/ARSN-412-add-support-for-exists-condition

The following options are set: create_integration_branches

anurag4DSB commented 5 months ago

/create_pull_requests

bert-e commented 5 months ago

Conflict

A conflict has been raised during the creation of integration branch w/8.1/bugfix/ARSN-412-add-support-for-exists-condition with contents from bugfix/ARSN-412-add-support-for-exists-condition and development/8.1.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.1/bugfix/ARSN-412-add-support-for-exists-condition origin/development/8.1
 $ git merge origin/bugfix/ARSN-412-add-support-for-exists-condition
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.1/bugfix/ARSN-412-add-support-for-exists-condition

The following options are set: create_pull_requests, create_integration_branches

anurag4DSB commented 5 months ago

ping

bert-e commented 5 months ago

Integration data created

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

The following branches will NOT be impacted:

Follow integration pull requests if you would like to be notified of build statuses by email.

The following options are set: create_pull_requests, create_integration_branches

bert-e commented 5 months ago

Waiting for approval

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

The following options are set: create_pull_requests, create_integration_branches

bert-e commented 5 months ago

History mismatch

Merge commit #670c2a9b04953f7e6ea46e20552ebf96feb86c00 on the integration branch w/8.1/bugfix/ARSN-412-add-support-for-exists-condition is merging a branch which is neither the current branch bugfix/ARSN-412-add-support-for-exists-condition nor the development branch development/8.1.

It is likely due to a rebase of the branch bugfix/ARSN-412-add-support-for-exists-condition and the merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

The following options are set: create_pull_requests, create_integration_branches

anurag4DSB commented 5 months ago

/force_reset

bert-e commented 5 months ago

Reset complete

I have successfully deleted this pull request's integration branches.

The following options are set: create_pull_requests, create_integration_branches

anurag4DSB commented 5 months ago

ping

bert-e commented 5 months ago

Integration data created

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

The following branches will NOT be impacted:

Follow integration pull requests if you would like to be notified of build statuses by email.

The following options are set: create_pull_requests, create_integration_branches

bert-e commented 5 months ago

Waiting for approval

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

The following options are set: create_pull_requests, create_integration_branches

bert-e commented 4 months ago

Incorrect fix version

The Fix Version/s in issue ARSN-412 contains:

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

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

The following options are set: create_pull_requests, create_integration_branches

bert-e commented 4 months ago

History mismatch

Merge commit #a0bb19429b698f02db93956c5c0c3e2d284241cf on the integration branch w/8.1/bugfix/ARSN-412-add-support-for-exists-condition is merging a branch which is neither the current branch bugfix/ARSN-412-add-support-for-exists-condition nor the development branch development/8.1.

It is likely due to a rebase of the branch bugfix/ARSN-412-add-support-for-exists-condition and the merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

The following options are set: create_pull_requests, create_integration_branches

anurag4DSB commented 4 months ago

/force_reset

bert-e commented 4 months ago

Reset complete

I have successfully deleted this pull request's integration branches.

The following options are set: create_pull_requests, create_integration_branches

bert-e commented 4 months ago

Conflict

There is a conflict between your branch bugfix/ARSN-412-add-support-for-exists-condition and the destination branch development/7.70.

Please resolve the conflict on the feature branch (bugfix/ARSN-412-add-support-for-exists-condition).

git fetch && \
git checkout origin/bugfix/ARSN-412-add-support-for-exists-condition && \
git merge origin/development/7.70

Resolve merge conflicts and commit

git push origin HEAD:bugfix/ARSN-412-add-support-for-exists-condition

The following options are set: create_pull_requests, create_integration_branches

bert-e commented 4 months ago

Conflict

A conflict has been raised during the creation of integration branch w/8.1/bugfix/ARSN-412-add-support-for-exists-condition with contents from bugfix/ARSN-412-add-support-for-exists-condition and development/8.1.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.1/bugfix/ARSN-412-add-support-for-exists-condition origin/development/8.1
 $ git merge origin/bugfix/ARSN-412-add-support-for-exists-condition
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.1/bugfix/ARSN-412-add-support-for-exists-condition

The following options are set: create_pull_requests, create_integration_branches

anurag4DSB commented 4 months ago

/force_reset

bert-e commented 4 months ago

Reset complete

I have successfully deleted this pull request's integration branches.

The following options are set: create_pull_requests, create_integration_branches

bert-e commented 4 months ago

Conflict

A conflict has been raised during the creation of integration branch w/8.1/bugfix/ARSN-412-add-support-for-exists-condition with contents from bugfix/ARSN-412-add-support-for-exists-condition and development/8.1.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.1/bugfix/ARSN-412-add-support-for-exists-condition origin/development/8.1
 $ git merge origin/bugfix/ARSN-412-add-support-for-exists-condition
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.1/bugfix/ARSN-412-add-support-for-exists-condition

The following options are set: create_pull_requests, create_integration_branches

anurag4DSB commented 4 months ago

ping

bert-e commented 4 months ago

Integration data created

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

The following branches will NOT be impacted:

Follow integration pull requests if you would like to be notified of build statuses by email.

The following options are set: create_pull_requests, create_integration_branches

bert-e commented 4 months ago

Waiting for approval

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

The following options are set: create_pull_requests, create_integration_branches

anurag4DSB commented 4 months ago

/approve

bert-e commented 4 months ago

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

The following branches have NOT changed:

Please check the status of the associated issue ARSN-412.

Goodbye anurag4dsb.

The following options are set: approve, create_pull_requests, create_integration_branches