renaming

pyinfra/storage/adapters/adapter.py

@@ -10,7 +10,7 @@ class StorageAdapter(ABC):
         pass
 
     @abstractmethod
-    def bucket_exists(self, bucket_name):
+    def has_bucket(self, bucket_name):
         pass
 
     @abstractmethod

pyinfra/storage/adapters/azure.py

@@ -30,7 +30,7 @@ class AzureStorageAdapter(StorageAdapter):
         super().__init__(client=client)
         self.__client: BlobServiceClient = self._StorageAdapter__client
 
-    def bucket_exists(self, bucket_name):
+    def has_bucket(self, bucket_name):
         container_client = self.__client.get_container_client(bucket_name)
         return container_client.exists()
 

pyinfra/storage/adapters/s3.py

@@ -16,10 +16,10 @@ class S3StorageAdapter(StorageAdapter):
         self.__client: Minio = self._StorageAdapter__client
 
     def make_bucket(self, bucket_name):
-        if not self.bucket_exists(bucket_name):
+        if not self.has_bucket(bucket_name):
             self.__client.make_bucket(bucket_name)
 
-    def bucket_exists(self, bucket_name):
+    def has_bucket(self, bucket_name):
         return self.__client.bucket_exists(bucket_name)
 
     def put_object(self, bucket_name, object_name, data):

pyinfra/storage/storage.py

@@ -9,7 +9,7 @@ class Storage:
         self.__adapter.make_bucket(bucket_name)
 
     def bucket_exists(self, bucket_name):
-        return self.__adapter.bucket_exists(bucket_name)
+        return self.__adapter.has_bucket(bucket_name)
 
     def put_object(self, bucket_name, object_name, data):
         self.__adapter.put_object(bucket_name, object_name, data)

pyinfra/test/storage/adapter_mock.py

@@ -11,8 +11,8 @@ class StorageAdapterMock(StorageAdapter):
     def make_bucket(self, bucket_name):
         self.__client.make_bucket(bucket_name)
 
-    def bucket_exists(self, bucket_name):
+    def has_bucket(self, bucket_name):
-        return self.__client.bucket_exists(bucket_name)
+        return self.__client.has_bucket(bucket_name)
 
     def put_object(self, bucket_name, object_name, data):
         return self.__client.put_object(bucket_name, object_name, data)

pyinfra/test/storage/client_mock.py

@@ -8,7 +8,7 @@ class StorageClientMock:
     def make_bucket(self, bucket_name):
         self.__data[bucket_name] = {}
 
-    def bucket_exists(self, bucket_name):
+    def has_bucket(self, bucket_name):
         return bucket_name in self.__data
 
     def put_object(self, bucket_name, object_name, data):

scripts/manage_minio.py

@@ -41,7 +41,7 @@ if __name__ == "__main__":
 
     storage = get_s3_storage()
     bucket_name = CONFIG.test.bucket
-    if not storage.bucket_exists(bucket_name):
+    if not storage.has_bucket(bucket_name):
         storage.make_bucket(bucket_name)
 
     args = parse_args()