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:51:11 +01:00
parent 945f2397c5
commit 4189ebb048
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,7 +22,7 @@ class StorageAdapter(ABC):
pass pass
@abstractmethod @abstractmethod
def get_all(self, bucket_name): def get_all_objects(self, bucket_name):
pass pass
@abstractmethod @abstractmethod

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

@ -56,7 +56,7 @@ class AzureStorageAdapter(StorageAdapter):
blob_data = blob_client.download_blob() blob_data = blob_client.download_blob()
return blob_data.readall() 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) container_client = self.__provide_container_client(bucket_name)
blobs = container_client.list_blobs() blobs = container_client.list_blobs()

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

@ -39,7 +39,7 @@ class S3StorageAdapter(StorageAdapter):
response.close() response.close()
response.release_conn() 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): for obj in self.__client.list_objects(bucket_name, recursive=True):
logger.debug(f"Downloading '{obj.object_name}'...") logger.debug(f"Downloading '{obj.object_name}'...")
yield self.get_object(bucket_name, obj.object_name) yield self.get_object(bucket_name, obj.object_name)

2
pyinfra/storage/storage.py
View File

@ -18,7 +18,7 @@ class Storage:
return self.__adapter.get_object(bucket_name, object_name) return self.__adapter.get_object(bucket_name, object_name)
def get_all(self, bucket_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): def clear_bucket(self, bucket_name):
return self.__adapter.clear_bucket(bucket_name) return self.__adapter.clear_bucket(bucket_name)

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

@ -20,8 +20,8 @@ class StorageAdapterMock(StorageAdapter):
def get_object(self, bucket_name, object_name): def get_object(self, bucket_name, object_name):
return self.__client.get_object(bucket_name, object_name) return self.__client.get_object(bucket_name, object_name)
def get_all(self, bucket_name): def get_all_objects(self, bucket_name):
return self.__client.get_all(bucket_name) return self.__client.get_all_objects(bucket_name)
def clear_bucket(self, bucket_name): def clear_bucket(self, bucket_name):
return self.__client.clear_bucket(bucket_name) return self.__client.clear_bucket(bucket_name)

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

@ -17,7 +17,7 @@ class StorageClientMock:
def get_object(self, bucket_name, object_name): def get_object(self, bucket_name, object_name):
return self.__data[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() return self.__data[bucket_name].values()
def clear_bucket(self, bucket_name): def clear_bucket(self, bucket_name):