fixup! Implement mirror_file, mirror_part & finalize_file (#6862)

Author: nadove-ucsc

src/azul/azulclient.py

@@ -226,7 +226,7 @@ def mirror_part_message(self,
                             file: File,
                             part: FilePart,
                             upload_id: str,
-                            etags: Sequence[str] = ()
+                            etags: Sequence[str]
                             ) -> SQSFifoMessage:
         return SQSFifoMessage(
             body={
@@ -703,13 +703,17 @@ def mirror_file(self,
         assert file.size is not None, R('File size unknown', file)
         part_size = FilePart.default_size
         if file.size <= part_size:
-            log.info('Mirroring file %r via single-part upload', file.uuid)
+            log.info('Mirroring file %r via standard upload', file.uuid)
             self.mirror_service.mirror_file(catalog, file)
+            log.info('Successfully mirrored file %r via standard upload', file.uuid)
         else:
             log.info('Mirroring file %r via multi-part upload', file.uuid)
             upload_id = self.mirror_service.begin_mirroring_file(file)
-            part = FilePart.head(file, part_size)
-            messages = [self.mirror_part_message(catalog, file, part, upload_id)]
+            first_part = FilePart.first(file, part_size)
+            etag = self.mirror_service.mirror_file_part(catalog, file, upload_id, first_part)
+            next_part = first_part.next(file)
+            assert next_part is not None
+            messages = [self.mirror_part_message(catalog, file, next_part, upload_id, [etag])]
             self.queue_mirror_messages(messages)
 
     def mirror_file_part(self,
@@ -745,7 +749,9 @@ def finalize_file(self,
                       etags: Sequence[str]
                       ):
         file = self.load_file(catalog, file_json)
+        assert etags
         self.mirror_service.finish_mirroring_file(file, upload_id, etags)
+        log.info('Successfully mirrored file %r via multi-part upload', file.uuid)
 
     def load_file(self, catalog: CatalogName, file: JSON) -> File:
         return self.metadata_plugin(catalog).file_class.from_json(file)