diff --git a/pyinfra/storage/adapters/adapter.py b/pyinfra/storage/adapters/adapter.py index 18b476f..dfc0309 100644 --- a/pyinfra/storage/adapters/adapter.py +++ b/pyinfra/storage/adapters/adapter.py @@ -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 diff --git a/pyinfra/storage/adapters/azure.py b/pyinfra/storage/adapters/azure.py index 4a0221b..d14dc04 100644 --- a/pyinfra/storage/adapters/azure.py +++ b/pyinfra/storage/adapters/azure.py @@ -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) diff --git a/pyinfra/storage/adapters/s3.py b/pyinfra/storage/adapters/s3.py index c12a7d5..3e24665 100644 --- a/pyinfra/storage/adapters/s3.py +++ b/pyinfra/storage/adapters/s3.py @@ -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) diff --git a/pyinfra/storage/storage.py b/pyinfra/storage/storage.py index ca3ea71..5021b0f 100644 --- a/pyinfra/storage/storage.py +++ b/pyinfra/storage/storage.py @@ -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) diff --git a/pyinfra/test/storage/adapter_mock.py b/pyinfra/test/storage/adapter_mock.py index 721bb52..1039865 100644 --- a/pyinfra/test/storage/adapter_mock.py +++ b/pyinfra/test/storage/adapter_mock.py @@ -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) diff --git a/pyinfra/test/storage/client_mock.py b/pyinfra/test/storage/client_mock.py index f750c1e..1e42c35 100644 --- a/pyinfra/test/storage/client_mock.py +++ b/pyinfra/test/storage/client_mock.py @@ -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): diff --git a/pyinfra/test/unit_tests/storage_test.py b/pyinfra/test/unit_tests/storage_test.py index 8287c59..f0fa9ff 100644 --- a/pyinfra/test/unit_tests/storage_test.py +++ b/pyinfra/test/unit_tests/storage_test.py @@ -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} diff --git a/scripts/manage_minio.py b/scripts/manage_minio.py index 8c7bf4a..7058c74 100644 --- a/scripts/manage_minio.py +++ b/scripts/manage_minio.py @@ -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__":