ARSN-345: fixups

lib/storage/metadata/mongoclient/MongoClientInterface.js

@@ -1045,9 +1045,13 @@ class MongoClientInterface {
         const c = this.getCollection(bucketName);
         let vFormat = null;
         // Function to process each document
-        const processDoc = (doc, objName, params, cb) => {
+        const processDoc = (doc, objName, params, key, cb) => {
             if (!doc && params && params.versionId) {
-                return cb(errors.NoSuchKey);
+                return cb(null, {
+                    doc: null,
+                    versionId: params.versionId,
+                    key,
+                });
             }
             // If no master found then object is either non existent
             // or last version is delete marker
@@ -1056,11 +1060,19 @@ class MongoClientInterface {
                     if (err && !err.is.NoSuchKey) {
                         return cb(err);
                     }
-                    return cb(null, doc || null);
+                    return cb(null, {
+                        doc: doc || null,
+                        versionId: params.versionId,
+                        key,
+                    });
                 });
             }
             MongoUtils.unserialize(doc.value);
-            return cb(null, doc.value);
+            return cb(null, {
+                doc: doc.value,
+                versionId: params.versionId,
+                key,
+            });
         };
         this.getBucketVFormat(bucketName, log, (err, _vFormat) => {
             if (err) {
@@ -1088,7 +1100,7 @@ class MongoClientInterface {
                 // Process each document using associated context (objName, params)
                 async.mapLimit(keysAndObjects, 5, ({ key, objName, params }, cb) => {
                     const doc = docByKey.get(key);
-                    processDoc(doc, objName, params, cb);
+                    processDoc(doc, objName, params, key, cb);
                 }, callback);
             }).catch(err => {
                 callback(err);
@@ -1483,7 +1495,8 @@ class MongoClientInterface {
      * @param {object} [params] request params
      * @return {undefined}
      */
-    internalDeleteObject(collection, bucketName, key, filter, log, cb, originOp = 's3:ObjectRemoved:Delete', params = null) {
+    internalDeleteObject(collection, bucketName, key, filter, log, cb, originOp = 's3:ObjectRemoved:Delete',
+        params = null) {
         // filter used when deleting object
         const deleteFilter = Object.assign({
             _id: key,