CLDSRV-636: Allow previous KMS for MPU parts

Author: BourgoisMickael

lib/api/objectPutPart.js

@@ -209,7 +209,9 @@ function objectPutPart(authInfo, request, streamingV4Params, log,
                         return next(err, destinationBucket);
                     }
                     return next(null, destinationBucket, objectLocationConstraint, res, splitter);
-                });
+                // Allow KMS to use a key from previous provider (if sseMigration configured)
+                // Because ongoing MPU started before sseMigration is no migrated
+                }, { previousOk: true });
             }
             // The MPU does not have server-side encryption, so pass `null`
             return next(null, destinationBucket, objectLocationConstraint, null, splitter);

lib/kms/wrapper.js

@@ -319,11 +319,13 @@ class KMS {
       * true for mandatory encryption
       * @param {object} log - logger object
       * @param {function} cb - cb from external call
+      * @param {object} [opts] - additional options
+      * @param {boolean} [opts.previousOk] - allow usage of previous KMS (for ongoing MPU not migrated)
       * @returns {undefined}
       * @callback called with (err, cipherBundle)
       */
     static createCipherBundle(serverSideEncryptionInfo,
-                              log, cb) {
+                              log, cb, opts) {
         const { algorithm, configuredMasterKeyId, masterKeyId: bucketMasterKeyId } = serverSideEncryptionInfo;
 
         let masterKeyId = bucketMasterKeyId;
@@ -341,6 +343,7 @@ class KMS {
         if (previousIdentifier
             && clientIdentifier === previousIdentifier
             && clientIdentifier !== currentIdentifier
+            && (opts && !opts.previousOk)
         ) {
             return cb(errors.InvalidArgument
                 .customizeDescription(