Browse Source

Minor modifications to signed url method params

Nuwan Goonasekera 4 năm trước cách đây
mục cha
commit
71c6e807ea

+ 1 - 1
cloudbridge/providers/aws/resources.py

@@ -871,7 +871,7 @@ class AWSBucketObject(BaseBucketObject):
     def delete(self):
         self._obj.delete()
 
-    def generate_url(self, expires_in, writable):
+    def generate_url(self, expires_in, writable=False):
         if writable:
             return self._provider.s3_conn.meta.client.generate_presigned_post(
                 self._obj.bucket_name, self.id, ExpiresIn=expires_in

+ 1 - 1
cloudbridge/providers/azure/resources.py

@@ -258,7 +258,7 @@ class AzureBucketObject(BaseBucketObject):
         """
         self._blob_client.delete_blob()
 
-    def generate_url(self, expires_in, writable):
+    def generate_url(self, expires_in, writable=False):
         """
         Generate a URL to this object.
         """

+ 1 - 1
cloudbridge/providers/gcp/resources.py

@@ -1975,7 +1975,7 @@ class GCPBucketObject(BaseBucketObject):
              .delete(bucket=self._obj['bucket'], object=self.name)
              .execute())
 
-    def generate_url(self, expires_in, writable):
+    def generate_url(self, expires_in, writable=False):
         """
         Generates a signed URL accessible to everyone.
 

+ 1 - 1
cloudbridge/providers/openstack/resources.py

@@ -1316,7 +1316,7 @@ class OpenStackBucketObject(BaseBucketObject):
                 result = result and del_res['success']
         return result
 
-    def generate_url(self, expires_in, writable):
+    def generate_url(self, expires_in, writable=False):
         http_method = "POST" if writable else "GET"
         # Set a temp url key on the object (http://bit.ly/2NBiXGD)
         temp_url_key = "cloudbridge-tmp-url-key"

+ 1 - 7
tests/test_object_store_service.py

@@ -12,8 +12,6 @@ from cloudbridge.interfaces.exceptions import DuplicateResourceException
 from cloudbridge.interfaces.provider import TestMockHelperMixin
 from cloudbridge.interfaces.resources import Bucket
 from cloudbridge.interfaces.resources import BucketObject
-from cloudbridge.providers.aws.provider import AWSCloudProvider
-from cloudbridge.providers.gcp import GCPCloudProvider
 
 from tests import helpers
 from tests.helpers import ProviderTestBase
@@ -212,12 +210,8 @@ class CloudObjectStoreServiceTestCase(ProviderTestBase):
                     raise self.skipTest(
                         "Skipping rest of test - mock providers can't"
                         " access generated url")
-                elif isinstance(self.provider, GCPCloudProvider):
-                    requests.put(url, data=content)
-                elif isinstance(self.provider, AWSCloudProvider):
-                    requests.put(url['url'], data=url['fields'], files={"file": (obj_name, content)})
                 else:
-                    requests.post(url, data=content)
+                    requests.put(url, data=content)
                 
                 obj = test_bucket.objects.get(obj_name)
                 obj_content = [content for content in obj.iter_content()]