Merge branch 'bugfix/CLDSRV-552' into tmp/octopus/w/8.8/bugfix/CLDSRV…

…-552
scality · Jan 7, 2025 · 02666d6 · 02666d6
2 parents 45c0c6f + 830ba20
commit 02666d6
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 0 deletions.
diff --git a/lib/api/objectPutLegalHold.js b/lib/api/objectPutLegalHold.js
@@ -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';
             metadata.putObjectMD(bucket.getName(), objectKey, objectMD, params,
                 log, err => next(err, bucket, objectMD));
         },

diff --git a/lib/api/objectPutRetention.js b/lib/api/objectPutRetention.js
@@ -118,6 +118,7 @@ function objectPutRetention(authInfo, request, log, callback) {
                 objectMD.replicationInfo = Object.assign({},
                     objectMD.replicationInfo, replicationInfo);
             }
+            objectMD.originOp = 's3:ObjectRetention:Put';
             /* eslint-enable no-param-reassign */
             metadata.putObjectMD(bucket.getName(), objectKey, objectMD, params,
                 log, err => next(err, bucket, objectMD));

diff --git a/tests/unit/api/objectPutLegalHold.js b/tests/unit/api/objectPutLegalHold.js
@@ -98,5 +98,17 @@ describe('putObjectLegalHold API', () => {
                 });
             });
         });
+
+        it('should set originOp in object\'s metadata to s3:ObjectLegalHold:Put', done => {
+            objectPutLegalHold(authInfo, putLegalHoldReq('ON'), log, err => {
+                assert.ifError(err);
+                return metadata.getObjectMD(bucketName, objectName, {}, log,
+                (err, objMD) => {
+                    assert.ifError(err);
+                    assert.strictEqual(objMD.originOp, 's3:ObjectLegalHold:Put');
+                    return done();
+                });
+            });
+        });
     });
 });
diff --git a/tests/unit/api/objectPutRetention.js b/tests/unit/api/objectPutRetention.js
@@ -159,6 +159,18 @@ describe('putObjectRetention API', () => {
             });
         });
 
+        it('should set originOp in object\'s metadata to s3:ObjectRetention:Put', done => {
+            objectPutRetention(authInfo, putObjRetRequestGovernance, log, err => {
+                assert.ifError(err);
+                return metadata.getObjectMD(bucketName, objectName, {}, log,
+                (err, objMD) => {
+                    assert.ifError(err);
+                    assert.strictEqual(objMD.originOp, 's3:ObjectRetention:Put');
+                    return done();
+                });
+            });
+        });
+
         it('should disallow COMPLIANCE => GOVERNANCE', done => {
             objectPutRetention(authInfo, putObjRetRequestCompliance, log, err => {
                 assert.ifError(err);