Repository navigation
Conversation
Hello dvasilas,My role is to assist you with the merge of this Available options
Available commands
Status report is not available. |
Incorrect fix versionThe
Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:
Please check the |
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
Request integration branchesWaiting for integration branch creation to be requested by the user. To request integration branches, please comment on this pull request with the following command: Alternatively, the |
|
/create_integration_branches |
Waiting for approvalThe following approvals are needed before I can proceed with the merge:
The following options are set: create_integration_branches |
Codecov Report❌ Patch coverage is
Additional details and impacted files
@@ Coverage Diff @@
## development/9.3 #6346 +/- ##
===================================================
+ Coverage 85.34% 85.39% +0.05%
===================================================
Files 207 207
Lines 13466 13485 +19
===================================================
+ Hits 11492 11516 +24
+ Misses 1974 1969 -5
Flags with carried forward coverage won't be shown. Click here to find out more. 🚀 New features to boost your workflow:
|
![claude[bot]](https://avatars.githubusercontent.com/in/1236702?s=60&v=4){kind=small}
Only when the destination is encrypted and the data is unencrypted or under another master key; a same-key self-copy stays metadata-only.
19797ca to
f454274
Compare
History mismatchMerge commit #b754602cdec1f8112d03bb5a3d69865f654808ce on the integration branch It is likely due to a rebase of the branch Please use the The following options are set: create_integration_branches |
|
/force_reset |
Reset completeI have successfully deleted this pull request's integration branches. The following options are set: create_integration_branches |
ConflictA conflict has been raised during the creation of I have not created the integration branch. Here are the steps to resolve this conflict: git fetch
git checkout -B w/9.4/bugfix/CLDSRV-910-reencrypt-data-on-self-copy origin/development/9.4
git merge origin/bugfix/CLDSRV-910-reencrypt-data-on-self-copy
# <intense conflict resolution>
git commit
git push -u origin w/9.4/bugfix/CLDSRV-910-reencrypt-data-on-self-copyThe following options are set: create_integration_branches |
ConflictA conflict has been raised during the creation of I have not created the integration branch. Here are the steps to resolve this conflict: git fetch
git checkout -B w/9.5/bugfix/CLDSRV-910-reencrypt-data-on-self-copy origin/development/9.5
git merge origin/w/9.4/bugfix/CLDSRV-910-reencrypt-data-on-self-copy
# <intense conflict resolution>
git commit
git push -u origin w/9.5/bugfix/CLDSRV-910-reencrypt-data-on-self-copyThe following options are set: create_integration_branches |
Integration data createdI have created the integration data for the additional destination branches.
The following branches will NOT be impacted:
You can set option The following options are set: create_integration_branches |
Waiting for approvalThe following approvals are needed before I can proceed with the merge:
The following options are set: create_integration_branches |
A
CopyObjectof an object onto itself (same bucket and key, same location, versioning disabled) didn't rewrite the data, even when the copy changed the encryption.This is the recommended way to encrypt an unencrypted object or to re-encrypt under another master key
With this PR, a self-copy rewrites the data when the destination is encrypted, and the source data is either unencrypted or encrypted under another master key. A self-copy under the same master key stays metadata-only.
The PR cherry-picks CLDSRV-908, so that a self-copy that rewrites the data deletes the old data.
Note:
lib/kms/wrapper.jsis reformatted with prettier in a separate commit.