Skip to content

Using api_endpoint as the URL Path for Methods in ObjectStorageBucket #421

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zliang-akamai merged 2 commits into from
Jun 18, 2024
Merged

Using api_endpoint as the URL Path for Methods in ObjectStorageBucket #421

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
146dc3a
Using `api_endpoint` as the URL path
zliang-akamai Jun 17, 2024
c4e3ffd
Merge branch 'dev' into zhiwei/obj-bucket-use-endpoint-attr
zliang-akamai Jun 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 12 additions & 18 deletions linode_api4/objects/object_storage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,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:
Expand Down Expand Up @@ -138,10 +137,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:
Expand All @@ -163,9 +161,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:
Expand All @@ -188,9 +185,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:
Expand Down Expand Up @@ -231,10 +227,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:
Expand Down Expand Up @@ -298,10 +293,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:
Expand Down