Storage upload: support paths and strings in filepaths, allow changing content type

Author: Antti Myyrä

docs/Storage.md

@@ -88,6 +88,10 @@ storage.destroy()
 Storages can be imported either by passing a URL or by uploading the file. Currently .iso, .raw and .img formats
 are supported. Other formats like qcow2 or vmdk should be converted before uploading.
 
+Uploaded storage is expected to be uncompressed. It is possible to upload zip (`application/gzip`)
+or gzip (`application/x-xz`) compressed files, but you need to specify a separate `content_type`
+when calling the `upload_file_for_storage_import` function.
+
 Warning: size of the import cannot exceed the size of the storage. The data will be written starting from
 the beginning of the storage, and the storage will not be truncated before starting to write.
 
@@ -109,14 +113,12 @@ Other way is to upload a storage directly. Note that unlike with URLs, file uplo
 fully uploaded.
 ```python
 
-from pathlib import Path
-
 new_storage = manager.create_storage(size=20, zone='de-fra1', title='New imported storage')
 storage_import = manager.create_storage_import(storage=new_storage.uuid, source='direct_upload')
 
 manager.upload_file_for_storage_import(
     storage_import=storage_import,
-    file=Path('/path/to/your/storage.img'),
+    file='/path/to/your/storage.img',
 )
 
 import_details = manager.get_storage_import_details(new_storage.uuid)

test/test_storage.py

@@ -30,7 +30,9 @@ def test_get_templates(self, manager):
     @responses.activate
     def test_storage_create(self, manager):
         Mock.mock_post("storage")
-        storage = manager.create_storage(zone="fi-hel1", size=666, tier="maxiops", title="My data collection")
+        storage = manager.create_storage(
+            zone="fi-hel1", size=666, tier="maxiops", title="My data collection"
+        )
         assert type(storage).__name__ == "Storage"
         assert storage.size == 666
         assert storage.tier == "maxiops"

upcloud_api/cloud_manager/storage_mixin.py

@@ -1,5 +1,5 @@
+from os import PathLike
 from typing import Optional, Union
-from pathlib import Path
 
 from upcloud_api.api import API
 from upcloud_api.storage import Storage
@@ -194,7 +194,13 @@ def create_storage_import(
         res = self.api.post_request(url, body)
         return StorageImport(**res['storage_import'])
 
-    def upload_file_for_storage_import(self, storage_import: StorageImport, file: Path, timeout: int = 600):
+    def upload_file_for_storage_import(
+        self,
+        storage_import: StorageImport,
+        file: 'PathLike[str]',
+        timeout: int = 600,
+        content_type: str = 'application/octet-stream',
+    ):
         """
         Uploads a file directly to UpCloud's uploader session.
         """
@@ -209,7 +215,7 @@ def upload_file_for_storage_import(self, storage_import: StorageImport, file: Pa
             resp = requests.put(
                 url=storage_import.direct_upload_url,
                 data=f,
-                headers={'Content-type': 'application/octet-stream'},
+                headers={'Content-type': content_type},
                 timeout=timeout,
             )
 

upcloud_api/utils.py

@@ -22,4 +22,3 @@ def try_it_n_times(operation, expected_error_codes, custom_error='operation fail
             sleep(3)
         if i >= n - 1:
             raise UpCloudClientError(custom_error)
-