diff --git a/pyinfra/storage/adapters/adapter.py b/pyinfra/storage/adapters/adapter.py index 7afc0b3..18b476f 100644 --- a/pyinfra/storage/adapters/adapter.py +++ b/pyinfra/storage/adapters/adapter.py @@ -18,7 +18,7 @@ class StorageAdapter(ABC): pass @abstractmethod - def get(self, bucket_name, object_name): + def get_object(self, bucket_name, object_name): pass @abstractmethod diff --git a/pyinfra/storage/adapters/azure.py b/pyinfra/storage/adapters/azure.py index 92e96e4..4a0221b 100644 --- a/pyinfra/storage/adapters/azure.py +++ b/pyinfra/storage/adapters/azure.py @@ -49,7 +49,7 @@ class AzureStorageAdapter(StorageAdapter): blob_client = container_client.get_blob_client(object_name) blob_client.upload_blob(data, overwrite=True) - def get(self, bucket_name, object_name): + def get_object(self, bucket_name, object_name): logger.debug(f"Downloading '{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 14766c7..c12a7d5 100644 --- a/pyinfra/storage/adapters/s3.py +++ b/pyinfra/storage/adapters/s3.py @@ -27,7 +27,7 @@ class S3StorageAdapter(StorageAdapter): data = io.BytesIO(data) self.__client.put_object(bucket_name, object_name, data, length=data.getbuffer().nbytes) - def get(self, bucket_name, object_name): + def get_object(self, bucket_name, object_name): logger.debug(f"Downloading '{object_name}'...") response = None @@ -42,7 +42,7 @@ class S3StorageAdapter(StorageAdapter): def get_all(self, bucket_name): for obj in self.__client.list_objects(bucket_name, recursive=True): logger.debug(f"Downloading '{obj.object_name}'...") - yield self.get(bucket_name, obj.object_name) + yield self.get_object(bucket_name, obj.object_name) def clear_bucket(self, bucket_name): logger.debug(f"Clearing S3 bucket '{bucket_name}'...") diff --git a/pyinfra/storage/storage.py b/pyinfra/storage/storage.py index 89a41b7..ca3ea71 100644 --- a/pyinfra/storage/storage.py +++ b/pyinfra/storage/storage.py @@ -14,8 +14,8 @@ class Storage: def put(self, bucket_name, object_name, data): self.__adapter.put(bucket_name, object_name, data) - def get(self, bucket_name, object_name): - return self.__adapter.get(bucket_name, object_name) + def get_object(self, bucket_name, object_name): + return self.__adapter.get_object(bucket_name, object_name) def get_all(self, bucket_name): return self.__adapter.get_all(bucket_name) diff --git a/pyinfra/test/storage/adapter_mock.py b/pyinfra/test/storage/adapter_mock.py index f4a43e5..721bb52 100644 --- a/pyinfra/test/storage/adapter_mock.py +++ b/pyinfra/test/storage/adapter_mock.py @@ -17,8 +17,8 @@ class StorageAdapterMock(StorageAdapter): def put(self, bucket_name, object_name, data): return self.__client.put(bucket_name, object_name, data) - def get(self, bucket_name, object_name): - return self.__client.get(bucket_name, object_name) + def get_object(self, bucket_name, object_name): + return self.__client.get_object(bucket_name, object_name) def get_all(self, bucket_name): return self.__client.get_all(bucket_name) diff --git a/pyinfra/test/storage/client_mock.py b/pyinfra/test/storage/client_mock.py index 55a37f4..f750c1e 100644 --- a/pyinfra/test/storage/client_mock.py +++ b/pyinfra/test/storage/client_mock.py @@ -14,7 +14,7 @@ class StorageClientMock: def put(self, bucket_name, object_name, data): self.__data[bucket_name][object_name] = data - def get(self, bucket_name, object_name): + def get_object(self, bucket_name, object_name): return self.__data[bucket_name][object_name] def get_all(self, bucket_name): diff --git a/pyinfra/test/unit_tests/storage_test.py b/pyinfra/test/unit_tests/storage_test.py index 5155722..8287c59 100644 --- a/pyinfra/test/unit_tests/storage_test.py +++ b/pyinfra/test/unit_tests/storage_test.py @@ -27,12 +27,12 @@ class TestStorage: def test_getting_object_put_in_bucket_is_object(self, storage, bucket_name): storage.put(bucket_name, "file", b"content") - data_received = storage.get(bucket_name, "file") + 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") - data_received = storage.get(bucket_name, "folder/file") + 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):