post review fixups

Author: benzekrimaha

tests/functional/aws-node-sdk/test/object/objectOverwrite.js

@@ -92,7 +92,7 @@ describe('Put object with same key as prior object', () => {
             assert.strictEqual(currentMD.archive, undefined);
         });
 
-        it('should overwrite archived current object in versioned bucket', async () => {
+        it('should create a new version when replacing archived current object in versioned bucket', async () => {
             await bucketUtil.empty(bucketName);
 
             await s3.send(new PutBucketVersioningCommand({
@@ -121,9 +121,17 @@ describe('Put object with same key as prior object', () => {
                 Metadata: secondPutMetadata,
             }));
             assert(secondPutRes.VersionId);
+            assert.notStrictEqual(secondPutRes.VersionId, firstPutRes.VersionId);
 
-            const currentVersionMD = await getMetadataPromise(bucketName, objectName, undefined);
-            assert.strictEqual(currentVersionMD.archive, undefined);
+            const headRes = await s3.send(new HeadObjectCommand({
+                Bucket: bucketName,
+                Key: objectName,
+            }));
+            assert.deepStrictEqual(headRes.Metadata, secondPutMetadata);
+
+            const currentMD = await getMetadataPromise(bucketName, objectName, undefined);
+            assert.strictEqual(currentMD.archive, undefined);
         });
+
     });
 });

tests/unit/api/createAndStoreObject.js

@@ -206,6 +206,66 @@ describe('createAndStoreObject', () => {
                     done();
                 });
         });
+
+        it('should trigger oplog event for archived object in version-suspended bucket', done => {
+            const archivedObjMD = {
+                'content-md5': 'abc123',
+                'content-length': 100,
+                archive: {
+                    archiveInfo: { archiveID: 'archive-123' },
+                },
+            };
+
+            sinon.stub(testBucket, 'isVersioningEnabled').returns(false);
+            sinon.spy(metadata, 'putObjectMD');
+
+            const request = new DummyRequest({
+                bucketName,
+                namespace: 'default',
+                objectKey,
+                headers: {},
+                url: `/${bucketName}/${objectKey}`,
+            }, Buffer.from('new data', 'utf8'));
+
+            createAndStoreObject(bucketName, testBucket, objectKey, archivedObjMD,
+                authInfo, canonicalID, null, request, false, null,
+                ['overhead'], log, 's3:ObjectCreated:Put', err => {
+                    assert.ifError(err);
+                    const options = getStoredOptions();
+                    assert.strictEqual(options.needOplogUpdate, true);
+                    assert.strictEqual(options.originOp, 's3:ReplaceArchivedObject');
+                    done();
+                });
+        });
+
+        it('should not trigger oplog event when archiveInfo is absent', done => {
+            const archivedObjMD = {
+                'content-md5': 'abc123',
+                'content-length': 100,
+                archive: {
+                    restoreRequestedAt: new Date().toISOString(),
+                },
+            };
+            sinon.spy(metadata, 'putObjectMD');
+
+            const request = new DummyRequest({
+                bucketName,
+                namespace: 'default',
+                objectKey,
+                headers: {},
+                url: `/${bucketName}/${objectKey}`,
+            }, Buffer.from('new data', 'utf8'));
+
+            createAndStoreObject(bucketName, testBucket, objectKey, archivedObjMD,
+                authInfo, canonicalID, null, request, false, null,
+                ['overhead'], log, 's3:ObjectCreated:Put', err => {
+                    assert.ifError(err);
+                    const options = getStoredOptions();
+                    assert.strictEqual(options.needOplogUpdate, undefined);
+                    assert.strictEqual(options.originOp, undefined);
+                    done();
+                });
+        });
     });
 
     describe('Cold storage restoration (putObjectVersion)', () => {