Use underlying datastore versionId in OOB buckets

When writing to OOB bucket/location, use the versionId of the ingested
location (i.e. the dataStore versionId) as the versionId of the object,
like what is done by OOB/ingestion.

This is needed to ensure the object can consistently be accessed from
either Zenko or the data location, with the same versionId; and prevents
the creation of another revision of the
object (basically duplicating it) when the object is ingested.

Issue: CLDSRV-563

lib/api/apiUtils/object/createAndStoreObject.js

@@ -288,7 +288,14 @@ function createAndStoreObject(bucketName, bucketMD, objectKey, objMD, authInfo,
                 });
         },
         function storeMDAndDeleteData(options, infoArr, next) {
-            metadataStoreParams.versionId = options.versionId;
+            if (location === bucketMD.getLocationConstraint() && bucketMD.isIngestionBucket()) {
+                // If the object is being written to the "ingested" storage location, keep the same
+                // versionId for consistency and to avoid creating an extra version when it gets
+                // ingested
+                metadataStoreParams.versionId = infoArr[0].dataStoreVersionId;
+            } else {
+                metadataStoreParams.versionId = options.versionId;
+            }
             metadataStoreParams.versioning = options.versioning;
             metadataStoreParams.isNull = options.isNull;
             metadataStoreParams.deleteNullKey = options.deleteNullKey;

lib/api/completeMultipartUpload.js

@@ -395,8 +395,15 @@ function completeMultipartUpload(authInfo, request, log, callback) {
             extraPartLocations, pseudoCipherBundle,
             completeObjData, options, next) {
             const dataToDelete = options.dataToDelete;
-            /* eslint-disable no-param-reassign */
-            metaStoreParams.versionId = options.versionId;
+            const location = dataLocations[0].dataStoreName;
+            if (location === destinationBucket.getLocationConstraint() && destinationBucket.isIngestionBucket()) {
+                // If the object is being written to the "ingested" storage location, keep the same
+                // versionId for consistency and to avoid creating an extra version when it gets
+                // ingested
+                metaStoreParams.versionId = dataLocations[0].dataStoreVersionId;
+            } else {
+                metaStoreParams.versionId = options.versionId;
+            }
             metaStoreParams.versioning = options.versioning;
             metaStoreParams.isNull = options.isNull;
             metaStoreParams.deleteNullKey = options.deleteNullKey;