From 9814e36995ded9b2539ab4ef84cc6d7878a33045 Mon Sep 17 00:00:00 2001 From: sylvain senechal Date: Mon, 14 Sep 2026 15:15:06 +0200 Subject: [PATCH 1/2] Server side encryption migrations should not be reported as an object creation Issue: CLDSRV-990 --- lib/api/apiUtils/bucket/updateEncryption.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/api/apiUtils/bucket/updateEncryption.js b/lib/api/apiUtils/bucket/updateEncryption.js index 5db3152423..b979c9905b 100644 --- a/lib/api/apiUtils/bucket/updateEncryption.js +++ b/lib/api/apiUtils/bucket/updateEncryption.js @@ -77,10 +77,10 @@ function updateObjectEncryption(bucket, objMD, objectKey, log, keyArnPrefix, opt dataLocator.masterKeyId = `${keyArnPrefix}${dataLocator.masterKeyId}`; } } + // Reformating the key arn is not an operation that should trigger any + // oplog driven logic (CRR, bucket notifications). // eslint-disable-next-line no-param-reassign - objMD.originOp = 's3:ObjectCreated:Copy'; - // Copy should be tested for 9.5 in INTGR-1038 - // to make sure it does not impact backbeat CRR / bucket notif + objMD.originOp = 's3:UpdateObjectEncryption'; const params = getVersionSpecificMetadataOptions(objMD, config.nullVersionCompatMode); log.info('reformating object encryption key', { oldKey: key, newKey, skipUpdate: opts.skipObjectUpdate }); From 1f36e5bf81d501e02c3354e398ed68ab28d79e27 Mon Sep 17 00:00:00 2001 From: sylvain senechal Date: Mon, 14 Sep 2026 16:42:59 +0200 Subject: [PATCH 2/2] Reformat with prettier Issue: CLDSRV-990 --- lib/api/apiUtils/bucket/updateEncryption.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/api/apiUtils/bucket/updateEncryption.js b/lib/api/apiUtils/bucket/updateEncryption.js index b979c9905b..ecae33317b 100644 --- a/lib/api/apiUtils/bucket/updateEncryption.js +++ b/lib/api/apiUtils/bucket/updateEncryption.js @@ -87,8 +87,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)); } /**