Merge pull request #324 from rajulkumar/use_pushitem_content

Use pushitem content to upload

Author: rajulkumar

requirements.in

@@ -2,5 +2,5 @@ pubtools>=0.3.0
 pubtools-pulplib>=2.36.0
 more_executors>=2.7.0
 pushcollector>=1.2.0
-pushsource>=2.45.0
+pushsource>=2.51.0
 monotonic; python_version < '3.3'

src/pubtools/_pulp/tasks/push/items/comps.py

@@ -11,4 +11,4 @@ class PulpCompsXmlPushItem(PulpDirectUploadPushItem):
     """Handler for comps.xml files which are uploaded directly to each dest repo."""
 
     def upload_to_repo(self, repo):
-        return repo.upload_comps_xml(self.pushsource_item.src)
+        return repo.upload_comps_xml(self.pushsource_item.content())

src/pubtools/_pulp/tasks/push/items/file.py

@@ -72,7 +72,7 @@ def upload_key(self):
 
     def upload_to_repo(self, repo):
         return repo.upload_file(
-            self.pushsource_item.src,
+            self.pushsource_item.content(),
             relative_url=self.pushsource_item.name,
             description=self.pushsource_item.description,
             version=self.pushsource_item.version,

src/pubtools/_pulp/tasks/push/items/modulemd.py

@@ -11,4 +11,4 @@ class PulpModuleMdPushItem(PulpDirectUploadPushItem):
     """Handler for modulemd YAML files which are uploaded directly to each dest repo."""
 
     def upload_to_repo(self, repo):
-        return repo.upload_modules(self.pushsource_item.src)
+        return repo.upload_modules(self.pushsource_item.content())

src/pubtools/_pulp/tasks/push/items/productid.py

@@ -84,7 +84,9 @@ def _product_versions_from_cert(self):
         return []
 
     def upload_to_repo(self, repo):
-        return repo.upload_metadata(self.pushsource_item.src, metadata_type="productid")
+        return repo.upload_metadata(
+            self.pushsource_item.content(), metadata_type="productid"
+        )
 
     def ensure_uploaded(self, ctx, repo_f=None):
         # Overridden to add the post-upload step of product_versions update.

src/pubtools/_pulp/tasks/push/items/rpm.py

@@ -143,4 +143,4 @@ def ensure_uploaded(self, ctx, repo_f=None):
         return super(PulpRpmPushItem, self).ensure_uploaded(ctx, ctx.upload_repo)
 
     def upload_to_repo(self, repo):
-        return repo.upload_rpm(self.pushsource_item.src, cdn_path=self.cdn_path)
+        return repo.upload_rpm(self.pushsource_item.content(), cdn_path=self.cdn_path)

tests/push/test_upload_sharing.py

@@ -19,9 +19,12 @@ def __init__(self, delegate, uploads):
         self.delegate = delegate
         self.uploads = uploads
 
-    def upload_rpm(self, path, *args, **kwargs):
-        self.uploads.append(("rpm", path))
-        return self.delegate.upload_rpm(path, *args, **kwargs)
+    def upload_rpm(self, rpm, *args, **kwargs):
+        # get the path/name if it's the file object as rpm
+        # instead of rpm path
+        rpm = rpm if isinstance(rpm, str) else rpm.name
+        self.uploads.append(("rpm", rpm))
+        return self.delegate.upload_rpm(rpm, *args, **kwargs)
 
 
 class ClientWrapper(object):