Move method

Author: nadove-ucsc

src/azul/azulclient.py

@@ -66,6 +66,7 @@
     IndexService,
 )
 from azul.plugins import (
+    File,
     MetadataPlugin,
     RepositoryPlugin,
 )
@@ -130,6 +131,21 @@ def mirror_source_message(self,
             group_id=source.id
         )
 
+    def mirror_file_message(self,
+                            catalog: CatalogName,
+                            source: SourceRef,
+                            file: File,
+                            ) -> SQSFifoMessage:
+        return SQSFifoMessage(
+            body={
+                'action': MirrorAction.mirror_file.to_json(),
+                'catalog': catalog,
+                'source': source.to_json(),
+                'file': file.to_json()
+            },
+            group_id=file.digest.value
+        )
+
     def local_reindex(self, catalog: CatalogName, prefix: str) -> int:
         service = self.index_repository_service
         plugin = self.repository_plugin(catalog)

src/azul/indexer/mirror_controller.py

@@ -182,7 +182,7 @@ def messages() -> Iterable[SQSMessage]:
                     log.info('Not mirroring file to save cost: %r', file)
                 else:
                     log.debug('Queueing file %r', file)
-                    yield self.mirror_file_message(catalog, source, file)
+                    yield self.client.mirror_file_message(catalog, source, file)
 
         self.client.queue_mirror_messages(messages())
         log.info('Queued %d files in partition %r of source %r in catalog %r',
@@ -294,21 +294,6 @@ def mirror_partition_message(self,
             group_id=f'{source.id}:{prefix}'
         )
 
-    def mirror_file_message(self,
-                            catalog: CatalogName,
-                            source: SourceRef,
-                            file: File,
-                            ) -> SQSFifoMessage:
-        return SQSFifoMessage(
-            body={
-                'action': MirrorAction.mirror_file.to_json(),
-                'catalog': catalog,
-                'source': source.to_json(),
-                'file': file.to_json()
-            },
-            group_id=file.digest.value
-        )
-
     def mirror_part_message(self,
                             catalog: CatalogName,
                             file: File,