Skip to content

CLDSRV-1058: Replace internal bucket keys that carry an ARN prefix during SSE migration (hotfix/9.3.13) #6372

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.

Sign up for GitHub

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

Merged
bert-e merged 4 commits into from
Nov 12, 2026
Merged

CLDSRV-1058: Replace internal bucket keys that carry an ARN prefix during SSE migration (hotfix/9.3.13) #6372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ca56abd
CLDSRV-1058: Format the bucket encryption update with Prettier
dvasilas Nov 5, 2026
a5609a6
CLDSRV-1058: Format the KMS wrapper with Prettier
dvasilas Nov 12, 2026
c73c7d2
CLDSRV-1058: Replace internal bucket keys that carry an ARN prefix du…
dvasilas Nov 5, 2026
586e80b
CLDSRV-1058: Bump version
dvasilas Nov 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions lib/api/apiUtils/bucket/updateEncryption.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,9 @@ function updateBucketEncryption(bucket, log, cb) {
const masterKey = sse.masterKeyId;
const configuredKey = sse.configuredMasterKeyId;

// Note: if migration is from an external to an external, absence of arn is not enough
// a comparison of arn will be necessary but config validation blocks this for now
const updateMaster = masterKey && !isScalityKmsArn(masterKey);
const updateConfigured = configuredKey && !isScalityKmsArn(configuredKey);
// Replace keys of the KMS that SSE migration moves away from
const updateMaster = masterKey && kms.isMigrationSourceKey(masterKey);
const updateConfigured = configuredKey && kms.isMigrationSourceKey(configuredKey);

if (!updateMaster && !updateConfigured) {
return cb(null, bucket);
Expand Down Expand Up @@ -87,8 +86,7 @@ function updateObjectEncryption(bucket, objMD, objectKey, log, keyArnPrefix, opt
if (opts.skipObjectUpdate) {
return cb(null, bucket, objMD);
}
return metadata.putObjectMD(bucket.getName(), objectKey, objMD, params,
log, err => cb(err, bucket, objMD));
return metadata.putObjectMD(bucket.getName(), objectKey, objMD, params, log, err => cb(err, bucket, objMD));
}

/**
Expand Down
Loading
Loading