Marmelator/pyinfra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 36 Wiki Activity

renaming

Browse Source
This commit is contained in:
Matthias Bisping 2022-02-25 12:45:32 +01:00
parent 4b26acca97
commit 3d86500b4b
8 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pyinfra/storage/adapters/adapter.py
View File

@ -14,7 +14,7 @@ class StorageAdapter(ABC):
pass
@abstractmethod
def put(self, bucket_name, object_name, data):
def put_object(self, bucket_name, object_name, data):
pass
@abstractmethod

2
pyinfra/storage/adapters/azure.py
View File

@ -43,7 +43,7 @@ class AzureStorageAdapter(StorageAdapter):
container_client = self.__client.get_container_client(bucket_name)
return container_client
def put(self, bucket_name, object_name, data):
def put_object(self, bucket_name, object_name, data):
logger.debug(f"Uploading '{object_name}'...")
container_client = self.__provide_container_client(bucket_name)
blob_client = container_client.get_blob_client(object_name)

2
pyinfra/storage/adapters/s3.py
View File

@ -22,7 +22,7 @@ class S3StorageAdapter(StorageAdapter):
def bucket_exists(self, bucket_name):
return self.__client.bucket_exists(bucket_name)
def put(self, bucket_name, object_name, data):
def put_object(self, bucket_name, object_name, data):
logger.debug(f"Uploading '{object_name}'...")
data = io.BytesIO(data)
self.__client.put_object(bucket_name, object_name, data, length=data.getbuffer().nbytes)

4
pyinfra/storage/storage.py
View File

@ -11,8 +11,8 @@ class Storage:
def bucket_exists(self, bucket_name):
return self.__adapter.bucket_exists(bucket_name)
def put(self, bucket_name, object_name, data):
self.__adapter.put(bucket_name, object_name, data)
def put_object(self, bucket_name, object_name, data):
self.__adapter.put_object(bucket_name, object_name, data)
def get_object(self, bucket_name, object_name):
return self.__adapter.get_object(bucket_name, object_name)

4
pyinfra/test/storage/adapter_mock.py
View File

@ -14,8 +14,8 @@ class StorageAdapterMock(StorageAdapter):
def bucket_exists(self, bucket_name):
return self.__client.bucket_exists(bucket_name)
def put(self, bucket_name, object_name, data):
return self.__client.put(bucket_name, object_name, data)
def put_object(self, bucket_name, object_name, data):
return self.__client.put_object(bucket_name, object_name, data)
def get_object(self, bucket_name, object_name):
return self.__client.get_object(bucket_name, object_name)

2
pyinfra/test/storage/client_mock.py
View File

@ -11,7 +11,7 @@ class StorageClientMock:
def bucket_exists(self, bucket_name):
return bucket_name in self.__data
def put(self, bucket_name, object_name, data):
def put_object(self, bucket_name, object_name, data):
self.__data[bucket_name][object_name] = data
def get_object(self, bucket_name, object_name):

12
pyinfra/test/unit_tests/storage_test.py
View File

@ -26,18 +26,18 @@ class TestStorage:
assert not {*data_received}
def test_getting_object_put_in_bucket_is_object(self, storage, bucket_name):
storage.put(bucket_name, "file", b"content")
storage.put_object(bucket_name, "file", b"content")
data_received = storage.get_object(bucket_name, "file")
assert b"content" == data_received
def test_getting_nested_object_put_in_bucket_is_nested_object(self, storage, bucket_name):
storage.put(bucket_name, "folder/file", b"content")
storage.put_object(bucket_name, "folder/file", b"content")
data_received = storage.get_object(bucket_name, "folder/file")
assert b"content" == data_received
def test_getting_objects_put_in_bucket_are_objects(self, storage, bucket_name):
storage.put(bucket_name, "file1", b"content 1")
storage.put(bucket_name, "folder/file2", b"content 2")
storage.put_object(bucket_name, "file1", b"content 1")
storage.put_object(bucket_name, "folder/file2", b"content 2")
data_received = storage.get_all(bucket_name)
assert {b"content 1", b"content 2"} == {*data_received}
@ -46,8 +46,8 @@ class TestStorage:
assert storage.bucket_exists(bucket_name)
def test_listing_bucket_files_yields_all_files_in_bucket(self, storage, bucket_name):
storage.put(bucket_name, "file1", b"content 1")
storage.put(bucket_name, "file2", b"content 2")
storage.put_object(bucket_name, "file1", b"content 1")
storage.put_object(bucket_name, "file2", b"content 2")
full_names_received = storage.get_all_object_names(bucket_name)
assert {(bucket_name, "file1"), (bucket_name, "file2")} == {*full_names_received}

2
scripts/manage_minio.py
View File

@ -34,7 +34,7 @@ def add_file_compressed(storage, bucket_name, dossier_id, path) -> None:
with open(path, "rb") as f:
data = gzip.compress(f.read())
storage.put(bucket_name, path_gz, data)
storage.put_object(bucket_name, path_gz, data)
if __name__ == "__main__":