ZENKO-36446 - use bucket name in delete object tagging

This reverts commit 1f8cfecf43.

lib/storage/data/DataWrapper.js

@@ -685,10 +685,10 @@ class DataWrapper {
         return callback();
     }
 
-    objectTagging(method, objectKey, bucket, objectMD, log, callback) {
+    objectTagging(method, objectKey, bucketName, objectMD, log, callback) {
         if (this.config.backends.data === 'multiple') {
             return this.client.objectTagging(method, objectKey,
-            bucket, objectMD, log, err => callback(err));
+            bucketName, objectMD, log, err => callback(err));
         }
         return callback();
     }

lib/storage/data/MultipleBackendGateway.js

@@ -278,11 +278,11 @@ class MultipleBackendGateway {
         return cb();
     }
 
-    objectTagging(method, key, bucket, objectMD, log, cb) {
+    objectTagging(method, key, bucketName, objectMD, log, cb) {
         // if legacy, objectMD will not contain dataStoreName, so just return
         const client = this.clients[objectMD.dataStoreName];
         if (client && client[`object${method}Tagging`]) {
-            return client[`object${method}Tagging`](key, bucket, objectMD, log,
+            return client[`object${method}Tagging`](key, bucketName, objectMD, log,
                 cb);
         }
         return cb();

lib/storage/data/external/AwsClient.js

@@ -483,9 +483,9 @@ class AwsClient {
         });
     }
 
-    objectPutTagging(key, bucket, objectMD, log, callback) {
+    objectPutTagging(key, bucketName, objectMD, log, callback) {
         const awsBucket = this._awsBucketName;
-        const awsKey = this._createAwsKey(bucket, key, this._bucketMatch);
+        const awsKey = this._createAwsKey(bucketName, key, this._bucketMatch);
         const dataStoreVersionId = objectMD.location[0].dataStoreVersionId;
         const tagParams = {
             Bucket: awsBucket,
@@ -512,9 +512,9 @@ class AwsClient {
         });
     }
 
-    objectDeleteTagging(key, bucket, objectMD, log, callback) {
+    objectDeleteTagging(key, bucketName, objectMD, log, callback) {
         const awsBucket = this._awsBucketName;
-        const awsKey = this._createAwsKey(bucket, key, this._bucketMatch);
+        const awsKey = this._createAwsKey(bucketName, key, this._bucketMatch);
         const dataStoreVersionId = objectMD.location[0].dataStoreVersionId;
         const tagParams = {
             Bucket: awsBucket,

lib/storage/data/external/AzureClient.js

@@ -361,8 +361,8 @@ class AzureClient {
             }], log, callback);
     }
 
-    objectPutTagging(key, bucket, objectMD, log, callback) {
-        const azureKey = this._createAzureKey(bucket, key, this._bucketMatch);
+    objectPutTagging(key, bucketName, objectMD, log, callback) {
+        const azureKey = this._createAzureKey(bucketName, key, this._bucketMatch);
         const azureMD = this._getMetaHeaders(objectMD);
         azureMD.tags = JSON.stringify(objectMD.tags);
         this._errorWrapper('objectPutTagging', 'setBlobMetadata',
@@ -377,8 +377,8 @@ class AzureClient {
             }], log, callback);
     }
 
-    objectDeleteTagging(key, bucket, objectMD, log, callback) {
-        const azureKey = this._createAzureKey(bucket, key, this._bucketMatch);
+    objectDeleteTagging(key, bucketName, objectMD, log, callback) {
+        const azureKey = this._createAzureKey(bucketName, key, this._bucketMatch);
         const azureMD = this._getMetaHeaders(objectMD);
         this._errorWrapper('objectDeleteTagging', 'setBlobMetadata',
             [this._azureContainerName, azureKey, azureMD,

lib/storage/data/external/PfsClient.js

@@ -118,13 +118,13 @@ class PfsClient {
         return callback(errors.NotImplemented);
     }
 
-    objectPutTagging(key, bucket, objectMD, log, callback) {
+    objectPutTagging(key, bucketName, objectMD, log, callback) {
         logHelper(log, 'error', 'Not implemented', errors.NotImplemented,
                 this._dataStoreName, this.clientType);
         return callback(errors.NotImplemented);
     }
 
-    objectDeleteTagging(key, bucket, objectMD, log, callback) {
+    objectDeleteTagging(key, bucketName, objectMD, log, callback) {
         logHelper(log, 'error', 'Not implemented', errors.NotImplemented,
                 this._dataStoreName, this.clientType);
         return callback(errors.NotImplemented);

tests/unit/storage/data/DummyService.js

@@ -3,6 +3,8 @@ const { EventEmitter } = require('events');
 
 const DummyObjectStream = require('./DummyObjectStream');
 const { parseRange } = require('../../../../lib/network/http/utils');
+const assert = require('assert');
+const errors = require('../../../../lib/errors');
 
 const OBJECT_SIZE = 1024 * 1024 * 1024;
 
@@ -133,6 +135,38 @@ class DummyService {
         objStream.pipe(writeStream);
         return callback();
     }
+    putObjectTagging(tagParams, callback) {
+        if (tagParams.Key === 'externalBackendTestBucket/externalBackendMissingKey') {
+            const err = errors.NoSuchKey;
+            return callback(err);
+        }
+
+        const keys = Object.keys(tagParams);
+        assert(keys.length > 0);
+        assert(tagParams.Tagging.TagSet.length > 0);
+        tagParams.Tagging.TagSet.forEach(tag => {
+            assert(tag.Key.length > 0);
+            assert(tag.Value.length > 0);
+        });
+
+        if (tagParams.VersionId) {
+            assert.strictEqual(tagParams.VersionId, 'latestversion');
+        }
+
+        return callback();
+    }
+    deleteObjectTagging(tagParams, callback) {
+        if (tagParams.Key === 'externalBackendTestBucket/externalBackendMissingKey') {
+            const err = errors.NoSuchKey;
+            return callback(err);
+        }
+
+        if (tagParams.VersionId) {
+            assert.strictEqual(tagParams.VersionId, 'latestversion');
+        }
+
+        return callback();
+    }
     // To-Do: add tests for other methods
 }
 

tests/unit/storage/data/external/ExternalClients.js

@@ -1,4 +1,5 @@
 const assert = require('assert');
+const async = require('async');
 const stream = require('stream');
 
 const AwsClient = require('../../../../../lib/storage/data/external/AwsClient');
@@ -7,6 +8,7 @@ const AzureClient =
     require('../../../../../lib/storage/data/external/AzureClient');
 const DummyService = require('../DummyService');
 const { DummyRequestLogger } = require('../../../helpers');
+const BucketInfo = require('../../../../../lib/models/BucketInfo');
 
 const backendClients = [
     {
@@ -154,6 +156,68 @@ describe('external backend clients', () => {
                     });
             });
         });
+
+        if (backend.config.type !== 'azure') {
+            it(`${backend.name} should set tags and then delete it`, done => {
+                const key = 'externalBackendTestKey';
+                const bucketData = {
+                    _name: 'externalBackendTestBucket',
+                    _owner: 'abcdef0123456789',
+                    _ownerDisplayName: 'UnitTestOwner',
+                    _creationDate: '2021-10-05T08:59:12.546Z',
+                };
+                const bucket = BucketInfo.fromObj(bucketData);
+                const objectMd = {
+                    tags: {
+                        Key1: 'value_1',
+                        Key2: 'value_2',
+                    },
+                    location: [
+                        {
+                            dataStoreVersionId: 'latestversion',
+                        },
+                    ],
+                };
+                async.series([
+                    next => testClient.objectPutTagging(key.key, bucket.getName(), objectMd, log, next),
+                    next => testClient.objectDeleteTagging(key.Key, bucket.getName(), objectMd, log, next),
+                ], done);
+            });
+
+            it(`${backend.name} should fail to set tag on missing key`, done => {
+                const key = 'externalBackendMissingKey';
+                const bucketData = {
+                    _name: 'externalBackendTestBucket',
+                    _owner: 'abcdef0123456789',
+                    _ownerDisplayName: 'UnitTestOwner',
+                    _creationDate: '2021-10-05T08:59:12.546Z',
+                };
+                const bucket = BucketInfo.fromObj(bucketData);
+                const objectMD = {
+                    tags: {
+                        Key1: 'value_1',
+                    },
+                    location: [
+                        {
+                            dataStoreVersionId: 'latestversion',
+                        },
+                    ],
+                };
+                async.series(
+                    [
+                        next => testClient.objectPutTagging(key, bucket.getName(), objectMD, log, (err) => {
+                            assert(err.ServiceUnavailable);
+                            next();
+                        }),
+                        next => testClient.objectDeleteTagging(key, bucket.getName(), objectMD, log, (err) => {
+                            assert(err.ServiceUnavailable);
+                            next();
+                        }),
+                    ],
+                    done,
+                );
+            });
+        }
         // To-Do: test the other external client methods (delete, createMPU ...)
     });
 });