@@ -101,7 +101,7 @@ function checkObjMdAndUpdate(objMDBefore, objMDAfter, props) {
101101 } ) ;
102102}
103103
104- function clearUploadIdFromVersionsAndRestoreStatus ( versions ) {
104+ function clearUploadIdAndRestoreStatusFromVersions ( versions ) {
105105 if ( ! versions || versions . length === 0 ) {
106106 return versions ;
107107 }
@@ -264,7 +264,7 @@ describe('MPU with x-scal-s3-version-id header', () => {
264264 return next ( err ) ;
265265 } ) ,
266266 next => metadata . listObject ( bucketName , mdListingParams , log , ( err , res ) => {
267- versionsBefore = clearUploadIdFromVersionsAndRestoreStatus ( res . Versions ) ;
267+ versionsBefore = clearUploadIdAndRestoreStatusFromVersions ( res . Versions ) ;
268268 return next ( err ) ;
269269 } ) ,
270270 next => putMPUVersion ( s3 , bucketName , objectName , '' , next ) ,
@@ -273,7 +273,7 @@ describe('MPU with x-scal-s3-version-id header', () => {
273273 return next ( err ) ;
274274 } ) ,
275275 next => metadata . listObject ( bucketName , mdListingParams , log , ( err , res ) => {
276- versionsAfter = clearUploadIdFromVersionsAndRestoreStatus ( res . Versions ) ;
276+ versionsAfter = clearUploadIdAndRestoreStatusFromVersions ( res . Versions ) ;
277277 return next ( err ) ;
278278 } ) ,
279279 ] , err => {
@@ -305,7 +305,7 @@ describe('MPU with x-scal-s3-version-id header', () => {
305305 return next ( err ) ;
306306 } ) ,
307307 next => metadata . listObject ( bucketName , mdListingParams , log , ( err , res ) => {
308- versionsBefore = clearUploadIdFromVersionsAndRestoreStatus ( res . Versions ) ;
308+ versionsBefore = clearUploadIdAndRestoreStatusFromVersions ( res . Versions ) ;
309309 return next ( err ) ;
310310 } ) ,
311311 next => putMPUVersion ( s3 , bucketName , objectName , '' , next ) ,
@@ -314,7 +314,7 @@ describe('MPU with x-scal-s3-version-id header', () => {
314314 return next ( err ) ;
315315 } ) ,
316316 next => metadata . listObject ( bucketName , mdListingParams , log , ( err , res ) => {
317- versionsAfter = clearUploadIdFromVersionsAndRestoreStatus ( res . Versions ) ;
317+ versionsAfter = clearUploadIdAndRestoreStatusFromVersions ( res . Versions ) ;
318318 return next ( err ) ;
319319 } ) ,
320320 ] , err => {
@@ -354,7 +354,7 @@ describe('MPU with x-scal-s3-version-id header', () => {
354354 } ) ,
355355 next => fakeMetadataArchive ( bucketName , objectName , vId , archive , next ) ,
356356 next => metadata . listObject ( bucketName , mdListingParams , log , ( err , res ) => {
357- versionsBefore = clearUploadIdFromVersionsAndRestoreStatus ( res . Versions ) ;
357+ versionsBefore = clearUploadIdAndRestoreStatusFromVersions ( res . Versions ) ;
358358 return next ( err ) ;
359359 } ) ,
360360 next => getMetadata ( bucketName , objectName , vId , ( err , objMD ) => {
@@ -367,7 +367,7 @@ describe('MPU with x-scal-s3-version-id header', () => {
367367 return next ( err ) ;
368368 } ) ,
369369 next => metadata . listObject ( bucketName , mdListingParams , log , ( err , res ) => {
370- versionsAfter = clearUploadIdFromVersionsAndRestoreStatus ( res . Versions ) ;
370+ versionsAfter = clearUploadIdAndRestoreStatusFromVersions ( res . Versions ) ;
371371 return next ( err ) ;
372372 } ) ,
373373 ] , err => {
@@ -406,7 +406,7 @@ describe('MPU with x-scal-s3-version-id header', () => {
406406 } ) ,
407407 next => fakeMetadataArchive ( bucketName , objectName , vId , archive , next ) ,
408408 next => metadata . listObject ( bucketName , mdListingParams , log , ( err , res ) => {
409- versionsBefore = clearUploadIdFromVersionsAndRestoreStatus ( res . Versions ) ;
409+ versionsBefore = clearUploadIdAndRestoreStatusFromVersions ( res . Versions ) ;
410410 return next ( err ) ;
411411 } ) ,
412412 next => getMetadata ( bucketName , objectName , vId , ( err , objMD ) => {
@@ -419,7 +419,7 @@ describe('MPU with x-scal-s3-version-id header', () => {
419419 return next ( err ) ;
420420 } ) ,
421421 next => metadata . listObject ( bucketName , mdListingParams , log , ( err , res ) => {
422- versionsAfter = clearUploadIdFromVersionsAndRestoreStatus ( res . Versions ) ;
422+ versionsAfter = clearUploadIdAndRestoreStatusFromVersions ( res . Versions ) ;
423423 return next ( err ) ;
424424 } ) ,
425425 ] , err => {
@@ -459,7 +459,7 @@ describe('MPU with x-scal-s3-version-id header', () => {
459459 return next ( err ) ;
460460 } ) ,
461461 next => metadata . listObject ( bucketName , mdListingParams , log , ( err , res ) => {
462- versionsBefore = clearUploadIdFromVersionsAndRestoreStatus ( res . Versions ) ;
462+ versionsBefore = clearUploadIdAndRestoreStatusFromVersions ( res . Versions ) ;
463463 return next ( err ) ;
464464 } ) ,
465465 next => putMPUVersion ( s3 , bucketName , objectName , 'null' , next ) ,
@@ -468,7 +468,7 @@ describe('MPU with x-scal-s3-version-id header', () => {
468468 return next ( err ) ;
469469 } ) ,
470470 next => metadata . listObject ( bucketName , mdListingParams , log , ( err , res ) => {
471- versionsAfter = clearUploadIdFromVersionsAndRestoreStatus ( res . Versions ) ;
471+ versionsAfter = clearUploadIdAndRestoreStatusFromVersions ( res . Versions ) ;
472472 return next ( err ) ;
473473 } ) ,
474474 ] , err => {
@@ -512,7 +512,7 @@ describe('MPU with x-scal-s3-version-id header', () => {
512512 return next ( err ) ;
513513 } ) ,
514514 next => metadata . listObject ( bucketName , mdListingParams , log , ( err , res ) => {
515- versionsBefore = clearUploadIdFromVersionsAndRestoreStatus ( res . Versions ) ;
515+ versionsBefore = clearUploadIdAndRestoreStatusFromVersions ( res . Versions ) ;
516516 next ( err ) ;
517517 } ) ,
518518 next => putMPUVersion ( s3 , bucketName , objectName , vId , next ) ,
@@ -521,7 +521,7 @@ describe('MPU with x-scal-s3-version-id header', () => {
521521 return next ( err ) ;
522522 } ) ,
523523 next => metadata . listObject ( bucketName , mdListingParams , log , ( err , res ) => {
524- versionsAfter = clearUploadIdFromVersionsAndRestoreStatus ( res . Versions ) ;
524+ versionsAfter = clearUploadIdAndRestoreStatusFromVersions ( res . Versions ) ;
525525 return next ( err ) ;
526526 } ) ,
527527 ] , err => {
@@ -568,7 +568,7 @@ describe('MPU with x-scal-s3-version-id header', () => {
568568 return next ( err ) ;
569569 } ) ,
570570 next => metadata . listObject ( bucketName , mdListingParams , log , ( err , res ) => {
571- versionsBefore = clearUploadIdFromVersionsAndRestoreStatus ( res . Versions ) ;
571+ versionsBefore = clearUploadIdAndRestoreStatusFromVersions ( res . Versions ) ;
572572 next ( err ) ;
573573 } ) ,
574574 next => putMPUVersion ( s3 , bucketName , objectName , '' , next ) ,
@@ -577,7 +577,7 @@ describe('MPU with x-scal-s3-version-id header', () => {
577577 return next ( err ) ;
578578 } ) ,
579579 next => metadata . listObject ( bucketName , mdListingParams , log , ( err , res ) => {
580- versionsAfter = clearUploadIdFromVersionsAndRestoreStatus ( res . Versions ) ;
580+ versionsAfter = clearUploadIdAndRestoreStatusFromVersions ( res . Versions ) ;
581581 return next ( err ) ;
582582 } ) ,
583583 ] , err => {
@@ -622,7 +622,7 @@ describe('MPU with x-scal-s3-version-id header', () => {
622622 return next ( err ) ;
623623 } ) ,
624624 next => metadata . listObject ( bucketName , mdListingParams , log , ( err , res ) => {
625- versionsBefore = clearUploadIdFromVersionsAndRestoreStatus ( res . Versions ) ;
625+ versionsBefore = clearUploadIdAndRestoreStatusFromVersions ( res . Versions ) ;
626626 return next ( err ) ;
627627 } ) ,
628628 next => putMPUVersion ( s3 , bucketName , objectName , vId , next ) ,
@@ -631,7 +631,7 @@ describe('MPU with x-scal-s3-version-id header', () => {
631631 return next ( err ) ;
632632 } ) ,
633633 next => metadata . listObject ( bucketName , mdListingParams , log , ( err , res ) => {
634- versionsAfter = clearUploadIdFromVersionsAndRestoreStatus ( res . Versions ) ;
634+ versionsAfter = clearUploadIdAndRestoreStatusFromVersions ( res . Versions ) ;
635635 return next ( err ) ;
636636 } ) ,
637637 ] , err => {
@@ -671,7 +671,7 @@ describe('MPU with x-scal-s3-version-id header', () => {
671671 } ) ,
672672 next => fakeMetadataArchive ( bucketName , objectName , vId , archive , next ) ,
673673 next => metadata . listObject ( bucketName , mdListingParams , log , ( err , res ) => {
674- versionsBefore = clearUploadIdFromVersionsAndRestoreStatus ( res . Versions ) ;
674+ versionsBefore = clearUploadIdAndRestoreStatusFromVersions ( res . Versions ) ;
675675 return next ( err ) ;
676676 } ) ,
677677 next => getMetadata ( bucketName , objectName , vId , ( err , objMD ) => {
@@ -684,7 +684,7 @@ describe('MPU with x-scal-s3-version-id header', () => {
684684 return next ( err ) ;
685685 } ) ,
686686 next => metadata . listObject ( bucketName , mdListingParams , log , ( err , res ) => {
687- versionsAfter = clearUploadIdFromVersionsAndRestoreStatus ( res . Versions ) ;
687+ versionsAfter = clearUploadIdAndRestoreStatusFromVersions ( res . Versions ) ;
688688 return next ( err ) ;
689689 } ) ,
690690 ] , err => {
@@ -730,7 +730,7 @@ describe('MPU with x-scal-s3-version-id header', () => {
730730 } ) ,
731731 next => fakeMetadataArchive ( bucketName , objectName , vId , archive , next ) ,
732732 next => metadata . listObject ( bucketName , mdListingParams , log , ( err , res ) => {
733- versionsBefore = clearUploadIdFromVersionsAndRestoreStatus ( res . Versions ) ;
733+ versionsBefore = clearUploadIdAndRestoreStatusFromVersions ( res . Versions ) ;
734734 return next ( err ) ;
735735 } ) ,
736736 next => getMetadata ( bucketName , objectName , vId , ( err , objMD ) => {
@@ -744,7 +744,7 @@ describe('MPU with x-scal-s3-version-id header', () => {
744744 return next ( err ) ;
745745 } ) ,
746746 next => metadata . listObject ( bucketName , mdListingParams , log , ( err , res ) => {
747- versionsAfter = clearUploadIdFromVersionsAndRestoreStatus ( res . Versions ) ;
747+ versionsAfter = clearUploadIdAndRestoreStatusFromVersions ( res . Versions ) ;
748748 return next ( err ) ;
749749 } ) ,
750750 ] , err => {
@@ -778,7 +778,7 @@ describe('MPU with x-scal-s3-version-id header', () => {
778778 next => s3 . putObject ( params , next ) ,
779779 next => fakeMetadataArchive ( bucketName , objectName , undefined , archive , next ) ,
780780 next => metadata . listObject ( bucketName , mdListingParams , log , ( err , res ) => {
781- versionsBefore = clearUploadIdFromVersionsAndRestoreStatus ( res . Versions ) ;
781+ versionsBefore = clearUploadIdAndRestoreStatusFromVersions ( res . Versions ) ;
782782 return next ( err ) ;
783783 } ) ,
784784 next => getMetadata ( bucketName , objectName , undefined , ( err , objMD ) => {
@@ -792,7 +792,7 @@ describe('MPU with x-scal-s3-version-id header', () => {
792792 return next ( err ) ;
793793 } ) ,
794794 next => metadata . listObject ( bucketName , mdListingParams , log , ( err , res ) => {
795- versionsAfter = clearUploadIdFromVersionsAndRestoreStatus ( res . Versions ) ;
795+ versionsAfter = clearUploadIdAndRestoreStatusFromVersions ( res . Versions ) ;
796796 return next ( err ) ;
797797 } ) ,
798798 ] , err => {
0 commit comments