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:39:08 +01:00
parent 81be5e55b6
commit 4b26acca97
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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

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

@ -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)

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

@ -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}'...")

4
pyinfra/storage/storage.py
View File

@ -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)

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

@ -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)

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

@ -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):

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

@ -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):