Merge branch 'dev' into proj/multicluster-obj

linode · Jun 18, 2024 · 4889f50 · 4889f50
2 parents 8d47be4 + 77e3a84
commit 4889f50
Showing 1 changed file with 12 additions and 18 deletions.
diff --git a/linode_api4/objects/object_storage.py b/linode_api4/objects/object_storage.py
@@ -98,10 +98,9 @@ def access_modify(
         }
 
         resp = self._client.post(
-            "/object-storage/buckets/{}/{}/access".format(
-                parse.quote(str(self.cluster)), parse.quote(str(self.id))
-            ),
+            f"{self.api_endpoint}/access",
             data=drop_null_keys(params),
+            model=self,
         )
 
         if "errors" in resp:
@@ -140,10 +139,9 @@ def access_update(
         }
 
         resp = self._client.put(
-            "/object-storage/buckets/{}/{}/access".format(
-                parse.quote(str(self.cluster)), parse.quote(str(self.id))
-            ),
+            f"{self.api_endpoint}/access",
             data=drop_null_keys(params),
+            model=self,
         )
 
         if "errors" in resp:
@@ -165,9 +163,8 @@ def ssl_cert_delete(self):
         """
 
         resp = self._client.delete(
-            "/object-storage/buckets/{}/{}/ssl".format(
-                parse.quote(str(self.cluster)), parse.quote(str(self.id))
-            )
+            f"{self.api_endpoint}/ssl",
+            model=self,
         )
 
         if "error" in resp:
@@ -190,9 +187,8 @@ def ssl_cert(self):
         :rtype: MappedObject
         """
         result = self._client.get(
-            "/object-storage/buckets/{}/{}/ssl".format(
-                parse.quote(str(self.cluster)), parse.quote(str(self.id))
-            )
+            f"{self.api_endpoint}/ssl",
+            model=self,
         )
 
         if not "ssl" in result:
@@ -233,10 +229,9 @@ def ssl_cert_upload(self, certificate, private_key):
             "private_key": private_key,
         }
         result = self._client.post(
-            "/object-storage/buckets/{}/{}/ssl".format(
-                parse.quote(str(self.cluster)), parse.quote(str(self.id))
-            ),
+            f"{self.api_endpoint}/ssl",
             data=params,
+            model=self,
         )
 
         if not "ssl" in result:
@@ -300,10 +295,9 @@ def contents(
             "page_size": page_size,
         }
         result = self._client.get(
-            "/object-storage/buckets/{}/{}/object-list".format(
-                parse.quote(str(self.cluster)), parse.quote(str(self.id))
-            ),
+            f"{self.api_endpoint}/object-list",
             data=drop_null_keys(params),
+            model=self,
         )
 
         if not "data" in result: