From d3d05bb85a7f8213044c6edaf7f703aaae46a6bd Mon Sep 17 00:00:00 2001 From: Andrea Mistrali Date: Thu, 4 Jul 2024 16:52:35 +0200 Subject: [PATCH] Bump hsapi-client version and docker work --- hsapi-client/hsapi_client/nodes.py | 14 +++++++------- hsapi-client/hsapi_client/routes.py | 4 ++-- hsapi-client/pyproject.toml | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/hsapi-client/hsapi_client/nodes.py b/hsapi-client/hsapi_client/nodes.py index 72d6390..55cb772 100644 --- a/hsapi-client/hsapi_client/nodes.py +++ b/hsapi-client/hsapi_client/nodes.py @@ -45,7 +45,7 @@ class Node(HSAPICall): response = self.call('get') return v1ListNodesResponse(**response.json()) - def get(self, nodeId: str) -> v1Node: + def get(self, nodeId: int) -> v1Node: # There is a bug in headscale API # retrieving a specific node does not return the tags # so we get the full list of nodes and extract the node with the @@ -65,25 +65,25 @@ class Node(HSAPICall): return v1ListNodesResponse(nodes=byUser) - def delete(self, nodeId: str) -> None: + def delete(self, nodeId: int) -> None: self.call('delete', call_path=nodeId) - def expire(self, nodeId: str) -> None: + def expire(self, nodeId: int) -> None: self.call('post', f'{nodeId}/expire') - def rename(self, nodeId: str, newName: str) -> v1NodeResponse: + def rename(self, nodeId: int, newName: str) -> v1NodeResponse: response = self.call('post', f'{nodeId}/rename/{newName}') return v1NodeResponse(**response.json()) - def move(self, nodeId: str, data: v1MoveNodeRequest) -> v1NodeResponse: + def move(self, nodeId: int, data: v1MoveNodeRequest) -> v1NodeResponse: response = self.call('post', f'{nodeId}/user', data) return v1NodeResponse(**response.json()) - def routes(self, nodeId: str) -> v1GetNodeRoutesResponse: + def routes(self, nodeId: int) -> v1GetNodeRoutesResponse: response = self.call('get', f'{nodeId}/routes') return v1GetNodeRoutesResponse(**response.json()) - def setTags(self, nodeId: str, data: v1SetTagsNodeRequest) -> v1NodeResponse: + def setTags(self, nodeId: int, data: v1SetTagsNodeRequest) -> v1NodeResponse: response = self.call('post', f'{nodeId}/tags', data) return v1NodeResponse(**response.json()) diff --git a/hsapi-client/hsapi_client/routes.py b/hsapi-client/hsapi_client/routes.py index 145468f..a248c69 100644 --- a/hsapi-client/hsapi_client/routes.py +++ b/hsapi-client/hsapi_client/routes.py @@ -20,8 +20,8 @@ class Route(HSAPICall): def delete(self, routeId: str) -> None: self.call('delete', call_path=routeId) - def enable(self, routeId: str) -> None: + def enable(self, routeId: int) -> None: self.call('post', f'{routeId}/enable') - def disable(self, routeId: str) -> None: + def disable(self, routeId: int) -> None: self.call('post', f'{routeId}/disable') diff --git a/hsapi-client/pyproject.toml b/hsapi-client/pyproject.toml index 9b361f5..7e74f7a 100644 --- a/hsapi-client/pyproject.toml +++ b/hsapi-client/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "hsapi-client" -version = "0.9.0" +version = "0.9.2" description = "Headscale API client" authors = ["Andrea Mistrali "] license = "BSD"