Skip to content

Implement resource_id could also be an href #6

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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
resmo wants to merge 1 commit into from
Closed

Implement resource_id could also be an href #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 19 additions & 5 deletions cloudscale/http.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,17 @@ def _handle_payload(self, payload: dict) -> dict:
logger.info(f"HTTP payload: {data}")
return data

def _is_href(self, resource: str, resource_id: str) -> bool:
# If resource_id looks like an href
return resource_id and resource_id.startswith(f"{self.endpoint}/{resource}")

def get_resources(self, resource: str, payload: dict = None, resource_id: str = None) -> dict:
query_url = f"{self.endpoint}/{resource}"
if resource_id:
query_url = f"{query_url}/{resource_id}"
if self._is_href(resource, resource_id):
query_url = resource_id
else:
query_url = f"{self.endpoint}/{resource}"
if resource_id:
query_url = f"{query_url}/{resource_id}"

if payload:
for k, v in payload.items():
Expand All @@ -93,7 +100,11 @@ def post_patch_resource(self, resource: str, payload: dict = None, resource_id:
r = requests.post(query_url, json=data, headers=self.headers, timeout=self.timeout)
return self._return_result(r)

query_url += f"/{resource_id}"
if self._is_href(resource, resource_id):
query_url = resource_id
else:
query_url += f"/{resource_id}"

if action:
query_url += f"/{action}"
logger.info(f"HTTP POST to {query_url}")
Expand All @@ -105,7 +116,10 @@ def post_patch_resource(self, resource: str, payload: dict = None, resource_id:
return self._return_result(r)

def delete_resource(self, resource: str, resource_id: str) -> dict:
query_url = f"{self.endpoint}/{resource}/{resource_id}"
if self._is_href(resource, resource_id):
query_url = resource_id
else:
query_url = f"{self.endpoint}/{resource}/{resource_id}"
logger.info(f"HTTP DELETE to {query_url}")
r = requests.delete(query_url, headers=self.headers, timeout=self.timeout)
return self._return_result(r)