From 4189ebb0481c85b5984adb8c6008bbc9bae6d71b Mon Sep 17 00:00:00 2001 From: Matthias Bisping Date: Fri, 25 Feb 2022 12:51:11 +0100 Subject: [PATCH] renaming --- pyinfra/storage/adapters/adapter.py | 2 +- pyinfra/storage/adapters/azure.py | 2 +- pyinfra/storage/adapters/s3.py | 2 +- pyinfra/storage/storage.py | 2 +- pyinfra/test/storage/adapter_mock.py | 4 ++-- pyinfra/test/storage/client_mock.py | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pyinfra/storage/adapters/adapter.py b/pyinfra/storage/adapters/adapter.py index c2f89ce..4c27026 100644 --- a/pyinfra/storage/adapters/adapter.py +++ b/pyinfra/storage/adapters/adapter.py @@ -22,7 +22,7 @@ class StorageAdapter(ABC): pass @abstractmethod - def get_all(self, bucket_name): + def get_all_objects(self, bucket_name): pass @abstractmethod diff --git a/pyinfra/storage/adapters/azure.py b/pyinfra/storage/adapters/azure.py index 7bf49ff..532da38 100644 --- a/pyinfra/storage/adapters/azure.py +++ b/pyinfra/storage/adapters/azure.py @@ -56,7 +56,7 @@ class AzureStorageAdapter(StorageAdapter): blob_data = blob_client.download_blob() return blob_data.readall() - def get_all(self, bucket_name): + def get_all_objects(self, bucket_name): container_client = self.__provide_container_client(bucket_name) blobs = container_client.list_blobs() diff --git a/pyinfra/storage/adapters/s3.py b/pyinfra/storage/adapters/s3.py index 3ca05b0..04ecbb4 100644 --- a/pyinfra/storage/adapters/s3.py +++ b/pyinfra/storage/adapters/s3.py @@ -39,7 +39,7 @@ class S3StorageAdapter(StorageAdapter): response.close() response.release_conn() - def get_all(self, bucket_name): + def get_all_objects(self, bucket_name): for obj in self.__client.list_objects(bucket_name, recursive=True): logger.debug(f"Downloading '{obj.object_name}'...") yield self.get_object(bucket_name, obj.object_name) diff --git a/pyinfra/storage/storage.py b/pyinfra/storage/storage.py index 0087ca1..7a86202 100644 --- a/pyinfra/storage/storage.py +++ b/pyinfra/storage/storage.py @@ -18,7 +18,7 @@ class Storage: return self.__adapter.get_object(bucket_name, object_name) def get_all(self, bucket_name): - return self.__adapter.get_all(bucket_name) + return self.__adapter.get_all_objects(bucket_name) def clear_bucket(self, bucket_name): return self.__adapter.clear_bucket(bucket_name) diff --git a/pyinfra/test/storage/adapter_mock.py b/pyinfra/test/storage/adapter_mock.py index 07d9aed..98f3d81 100644 --- a/pyinfra/test/storage/adapter_mock.py +++ b/pyinfra/test/storage/adapter_mock.py @@ -20,8 +20,8 @@ class StorageAdapterMock(StorageAdapter): 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) + def get_all_objects(self, bucket_name): + return self.__client.get_all_objects(bucket_name) def clear_bucket(self, bucket_name): return self.__client.clear_bucket(bucket_name) diff --git a/pyinfra/test/storage/client_mock.py b/pyinfra/test/storage/client_mock.py index cc1a29f..c81b02b 100644 --- a/pyinfra/test/storage/client_mock.py +++ b/pyinfra/test/storage/client_mock.py @@ -17,7 +17,7 @@ class StorageClientMock: def get_object(self, bucket_name, object_name): return self.__data[bucket_name][object_name] - def get_all(self, bucket_name): + def get_all_objects(self, bucket_name): return self.__data[bucket_name].values() def clear_bucket(self, bucket_name):