lib/versioning/VersioningRequestProcessor.ts

@@ -402,7 +402,10 @@ export default class VersioningRequestProcessor {
                     if (masterVersionId) {
                         // => create a new version key from the master version
                         const masterVersionKey = formatVersionKey(key, masterVersionId);
-                        value = Version.updateOrAppendNullVersionId(request.value, masterVersionId);
+                        // => set the nullVersionId to the master version if put version on top of null version.
+                        if (versionIdFromMaster !== versionId) {
+                            value = Version.updateOrAppendNullVersionId(request.value, masterVersionId);
+                        }
                         masterVersion.setNullVersion();
                         ops.push({ key: masterVersionKey,
                                    value: masterVersion.toString() });

package.json

@@ -3,7 +3,7 @@
   "engines": {
     "node": ">=16"
   },
-  "version": "7.10.59",
+  "version": "7.10.61",
   "description": "Common utilities for the S3 project components",
   "main": "build/index.js",
   "repository": {

tests/unit/versioning/VersioningRequestProcessor.spec.js

@@ -323,6 +323,7 @@ describe('test VSP', () => {
         (res, next) => {
             const expectedListing = [
                 // master version should have the provided version id and a reference of the null version id.
+                // NOTE: should set nullVersionId to the master version if putting a version on top of a null version.
                 {
                     key: 'bar',
                     value: `{"qux":"quz2","versionId":"${versionId}","nullVersionId":"${nullVersionId}"}`,
@@ -357,4 +358,68 @@ describe('test VSP', () => {
         }],
         done);
     });
+
+    it('should be able to update a null suspended version', done => {
+        let nullVersionId;
+
+        async.waterfall([next => {
+            // simulate the creation of a null suspended version.
+            const request = {
+                db: 'foo',
+                key: 'bar',
+                value: '{"qux":"quz","isNull":true}',
+                options: {
+                    versionId: '',
+                },
+            };
+            vsp.put(request, logger, next);
+        },
+        (res, next) => {
+            nullVersionId = JSON.parse(res).versionId;
+            // simulate update null version with BackbeatClient.putMetadata
+            const request = {
+                db: 'foo',
+                key: 'bar',
+                value: `{"qux":"quz2","isNull":true,"versionId":"${nullVersionId}"}`,
+                options: {
+                    versioning: true,
+                    versionId: nullVersionId,
+                },
+            };
+            vsp.put(request, logger, next);
+        },
+        (res, next) => {
+            wgm.list({}, logger, next);
+        },
+        (res, next) => {
+            const expectedListing = [
+                // NOTE: should not set nullVersionId to the master version if updating a null version.
+                {
+                    key: 'bar',
+                    value: `{"qux":"quz2","isNull":true,"versionId":"${nullVersionId}"}`,
+                },
+                {
+                    key: `bar\x00${nullVersionId}`,
+                    value: `{"qux":"quz","isNull":true,"versionId":"${nullVersionId}"}`,
+                },
+            ];
+            assert.deepStrictEqual(res, expectedListing);
+
+            const request = {
+                db: 'foo',
+                key: 'bar',
+            };
+            vsp.get(request, logger, next);
+        },
+        (res, next) => {
+            const expectedGet = {
+                qux: 'quz2',
+                isNull: true,
+                versionId: nullVersionId,
+            };
+            assert.deepStrictEqual(JSON.parse(res), expectedGet);
+            next();
+        }],
+        done);
+    });
 });