Merge branch 'feature/ARSN-2_support_per_object_sse_in_data_wrapper' …

…into q/8.1
scality · Jul 20, 2021 · 4665f3d · 4665f3d
2 parents 0df0d95 + 93503cf
commit 4665f3d
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/lib/storage/data/DataWrapper.js b/lib/storage/data/DataWrapper.js
@@ -285,18 +285,19 @@ class DataWrapper {
      * on a data put call.
      * @param {object} sourceBucketMD - metadata of the source bucket
      * @param {object} destBucketMD - metadata of the destination bucket
+     * @param {object} serverSideEncryption - server side encryption configuration
      * @param {object} log - Werelogs request logger
      * @param {function} cb - callback
      * @returns {function} cb - callback
      */
     copyObject(request, sourceLocationConstraintName, storeMetadataParams,
     dataLocator, dataStoreContext, destBackendInfo, sourceBucketMD,
-    destBucketMD, log, cb) {
-        const serverSideEncryption = destBucketMD.getServerSideEncryption();
+    destBucketMD, serverSideEncryption, log, cb) {
         if (this.config.backends.data === 'multiple' &&
         backendUtils.externalBackendCopy(this.config,
         sourceLocationConstraintName, storeMetadataParams.dataStoreName,
-        sourceBucketMD, destBucketMD)) {
+        sourceBucketMD, destBucketMD)
+        && serverSideEncryption === null) {
             const destLocationConstraintName =
                 storeMetadataParams.dataStoreName;
             const objectGetInfo = dataLocator[0];