NSFS | NC | add versioning to object tagging

Signed-off-by: nadav mizrahi <[email protected]>
(cherry picked from commit 4898af4)

Author: nadavMiz

src/api/object_api.js

@@ -1326,6 +1326,9 @@ module.exports = {
                     },
                     tagging: {
                         $ref: 'common_api#/definitions/tagging'
+                    },
+                    version_id: {
+                        type: 'string'
                     }
                 }
             },

src/endpoint/s3/ops/s3_put_object_tagging.js

@@ -8,10 +8,12 @@ const s3_utils = require('../s3_utils');
  */
 async function put_object_tagging(req, res) {
     const tag_set = s3_utils.parse_body_tagging_xml(req);
+    const version_id = s3_utils.parse_version_id(req.query.versionId);
     const reply = await req.object_sdk.put_object_tagging({
         bucket: req.params.bucket,
         key: req.params.key,
-        tagging: tag_set
+        tagging: tag_set,
+        version_id
     });
     if (reply.version_id) res.setHeader('x-amz-version-id', reply.version_id);
 }

src/sdk/namespace_fs.js

@@ -1983,7 +1983,12 @@ class NamespaceFS {
         for (const [xattr_key, xattr_value] of Object.entries(tagging)) {
               fs_xattr[XATTR_NOOBAA_CUSTOM_PREFIX + xattr_key] = xattr_value;
         }
-        const file_path = this._get_file_path(params);
+        let file_path;
+        if (params.version_id && this._is_versioning_enabled()) {
+            file_path = this._get_version_path(params.key, params.version_id);
+        } else {
+            file_path = this._get_file_path(params);
+        }
         const fs_context = this.prepare_fs_context(object_sdk);
         dbg.log0('NamespaceFS.put_object_tagging: fs_xattr ', fs_xattr, 'file_path :', file_path);
         try {

src/test/unit_tests/test_bucketspace_versioning.js

@@ -800,6 +800,47 @@ mocha.describe('bucketspace namespace_fs - versioning', function() {
         });
     });
 
+    mocha.describe('object tagging', function() {
+
+        const tagging_key = "key_tagging";
+        const tag_set1 = {TagSet: [{Key: "key1", Value: "Value1"}]};
+        const tag_set2 = {TagSet: [{Key: "key2", Value: "Value2"}]};
+        let version_id;
+
+        mocha.before(async function() {
+            await s3_uid6.putBucketVersioning({ Bucket: suspended_bucket_name, VersioningConfiguration: { MFADelete: 'Disabled', Status: 'Enabled' } });
+            const res_put = await s3_uid6.putObject({ Bucket: suspended_bucket_name, Key: tagging_key, Body: body1 });
+            await s3_uid6.putObject({ Bucket: suspended_bucket_name, Key: tagging_key, Body: body1 });
+            version_id = res_put.VersionId;
+        });
+
+        mocha.it("put object tagging - no versionId", async function() {
+            await s3_uid6.putObjectTagging({ Bucket: suspended_bucket_name, Key: tagging_key, Tagging: tag_set1});
+            const res = await s3_uid6.getObjectTagging({Bucket: suspended_bucket_name, Key: tagging_key});
+            assert.deepEqual(res.TagSet, tag_set1.TagSet);
+        });
+
+        mocha.it("put object tagging - specific versionId", async function() {
+            await s3_uid6.putObjectTagging({ Bucket: suspended_bucket_name, Key: tagging_key, Tagging: tag_set2, versionId: version_id});
+            const res = await s3_uid6.getObjectTagging({Bucket: suspended_bucket_name, Key: tagging_key});
+            assert.notDeepEqual(res.TagSet, tag_set2);
+            const version_res = await s3_uid6.getObjectTagging({Bucket: suspended_bucket_name, Key: tagging_key});
+            assert.deepEqual(version_res.TagSet, tag_set2.TagSet);
+        });
+
+        mocha.it("delete object tagging - no versionId", async function() {
+            await s3_uid6.deleteObjectTagging({ Bucket: suspended_bucket_name, Key: tagging_key});
+            const res = await s3_uid6.getObjectTagging({Bucket: suspended_bucket_name, Key: tagging_key});
+            assert.equal(res.TagSet.length, 0);
+        });
+
+        mocha.it("delete object tagging - specific versionId", async function() {
+            await s3_uid6.deleteObjectTagging({ Bucket: suspended_bucket_name, Key: tagging_key, versionId: version_id});
+            const res = await s3_uid6.getObjectTagging({Bucket: suspended_bucket_name, Key: tagging_key, versionId: version_id});
+            assert.equal(res.TagSet.length, 0);
+        });
+    });
+
     // dm = delete marker
     mocha.describe('delete object latest - versioning suspended', function() {
         const key_to_delete = 'mango.txt';