Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion hcloud/actions/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def wait_until_finished(self, max_retries: int | None = None) -> None:

class ActionsPageResult(NamedTuple):
actions: list[BoundAction]
meta: Meta | None
meta: Meta


class ResourceActionsClient(ClientEntityBase):
Expand Down
2 changes: 1 addition & 1 deletion hcloud/certificates/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ def retry_issuance(self) -> BoundAction:

class CertificatesPageResult(NamedTuple):
certificates: list[BoundCertificate]
meta: Meta | None
meta: Meta


class CertificatesClient(ClientEntityBase):
Expand Down
5 changes: 2 additions & 3 deletions hcloud/core/domain.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,12 @@ def __init__(self, pagination: Pagination | None = None):
self.pagination = pagination

@classmethod
def parse_meta(cls, response: dict) -> Meta | None:
def parse_meta(cls, response: dict) -> Meta:
"""
If present, extract the meta details from the response and return a meta object.
"""
meta = None
meta = cls()
if response and "meta" in response:
meta = cls()
try:
meta.pagination = Pagination(**response["meta"]["pagination"])
except KeyError:
Expand Down
2 changes: 1 addition & 1 deletion hcloud/datacenters/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def __init__(self, client: DatacentersClient, data: dict):

class DatacentersPageResult(NamedTuple):
datacenters: list[BoundDatacenter]
meta: Meta | None
meta: Meta


class DatacentersClient(ClientEntityBase):
Expand Down
2 changes: 1 addition & 1 deletion hcloud/firewalls/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ def remove_from_resources(

class FirewallsPageResult(NamedTuple):
firewalls: list[BoundFirewall]
meta: Meta | None
meta: Meta


class FirewallsClient(ClientEntityBase):
Expand Down
2 changes: 1 addition & 1 deletion hcloud/floating_ips/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ def change_dns_ptr(self, ip: str, dns_ptr: str) -> BoundAction:

class FloatingIPsPageResult(NamedTuple):
floating_ips: list[BoundFloatingIP]
meta: Meta | None
meta: Meta


class FloatingIPsClient(ClientEntityBase):
Expand Down
2 changes: 1 addition & 1 deletion hcloud/images/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ def change_protection(self, delete: bool | None = None) -> BoundAction:

class ImagesPageResult(NamedTuple):
images: list[BoundImage]
meta: Meta | None
meta: Meta


class ImagesClient(ClientEntityBase):
Expand Down
2 changes: 1 addition & 1 deletion hcloud/isos/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class BoundIso(BoundModelBase, Iso):

class IsosPageResult(NamedTuple):
isos: list[BoundIso]
meta: Meta | None
meta: Meta


class IsosClient(ClientEntityBase):
Expand Down
2 changes: 1 addition & 1 deletion hcloud/load_balancer_types/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class BoundLoadBalancerType(BoundModelBase, LoadBalancerType):

class LoadBalancerTypesPageResult(NamedTuple):
load_balancer_types: list[BoundLoadBalancerType]
meta: Meta | None
meta: Meta


class LoadBalancerTypesClient(ClientEntityBase):
Expand Down
2 changes: 1 addition & 1 deletion hcloud/load_balancers/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ def change_type(

class LoadBalancersPageResult(NamedTuple):
load_balancers: list[BoundLoadBalancer]
meta: Meta | None
meta: Meta


class LoadBalancersClient(ClientEntityBase):
Expand Down
2 changes: 1 addition & 1 deletion hcloud/locations/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class BoundLocation(BoundModelBase, Location):

class LocationsPageResult(NamedTuple):
locations: list[BoundLocation]
meta: Meta | None
meta: Meta


class LocationsClient(ClientEntityBase):
Expand Down
2 changes: 1 addition & 1 deletion hcloud/networks/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ def change_protection(self, delete: bool | None = None) -> BoundAction:

class NetworksPageResult(NamedTuple):
networks: list[BoundNetwork]
meta: Meta | None
meta: Meta


class NetworksClient(ClientEntityBase):
Expand Down
2 changes: 1 addition & 1 deletion hcloud/placement_groups/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def delete(self) -> bool:

class PlacementGroupsPageResult(NamedTuple):
placement_groups: list[BoundPlacementGroup]
meta: Meta | None
meta: Meta


class PlacementGroupsClient(ClientEntityBase):
Expand Down
2 changes: 1 addition & 1 deletion hcloud/primary_ips/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ def change_dns_ptr(self, ip: str, dns_ptr: str) -> BoundAction:

class PrimaryIPsPageResult(NamedTuple):
primary_ips: list[BoundPrimaryIP]
meta: Meta | None
meta: Meta


class PrimaryIPsClient(ClientEntityBase):
Expand Down
2 changes: 1 addition & 1 deletion hcloud/server_types/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class BoundServerType(BoundModelBase, ServerType):

class ServerTypesPageResult(NamedTuple):
server_types: list[BoundServerType]
meta: Meta | None
meta: Meta


class ServerTypesClient(ClientEntityBase):
Expand Down
2 changes: 1 addition & 1 deletion hcloud/servers/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -479,7 +479,7 @@ def remove_from_placement_group(self) -> BoundAction:

class ServersPageResult(NamedTuple):
servers: list[BoundServer]
meta: Meta | None
meta: Meta


class ServersClient(ClientEntityBase):
Expand Down
2 changes: 1 addition & 1 deletion hcloud/ssh_keys/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def delete(self) -> bool:

class SSHKeysPageResult(NamedTuple):
ssh_keys: list[BoundSSHKey]
meta: Meta | None
meta: Meta


class SSHKeysClient(ClientEntityBase):
Expand Down
2 changes: 1 addition & 1 deletion hcloud/volumes/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ def change_protection(self, delete: bool | None = None) -> BoundAction:

class VolumesPageResult(NamedTuple):
volumes: list[BoundVolume]
meta: Meta | None
meta: Meta


class VolumesClient(ClientEntityBase):
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/actions/test_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ def test_get_list(self, actions_client, generic_action_list, params):
url="/resource/actions", method="GET", params=params
)

assert result.meta is None
assert result.meta is not None

actions = result.actions
assert len(actions) == 2
Expand Down Expand Up @@ -157,7 +157,7 @@ def test_get_list(self, actions_client, generic_action_list, params):
url="/actions", method="GET", params=params
)

assert result.meta is None
assert result.meta is not None

actions = result.actions
assert len(actions) == 2
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/certificates/test_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def test_get_actions_list(
)

actions = result.actions
assert result.meta is None
assert result.meta is not None

assert len(actions) == 1
assert isinstance(actions[0], BoundAction)
Expand Down Expand Up @@ -315,7 +315,7 @@ def test_actions_get_list(self, certificates_client, response_get_actions):
)

actions = result.actions
assert result.meta is None
assert result.meta is not None

assert len(actions) == 1
assert isinstance(actions[0], BoundAction)
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/core/test_domain.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class TestMeta:
@pytest.mark.parametrize("json_content", [None, "", {}])
def test_parse_meta_empty_json(self, json_content):
result = Meta.parse_meta(json_content)
assert result is None
assert result is not None

def test_parse_meta_json_no_paginaton(self):
json_content = {"meta": {}}
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/datacenters/test_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ def test_get_list(self, datacenters_client, two_datacenters_response, params):
)

datacenters = result.datacenters
assert result.meta is None
assert result.meta is not None

assert len(datacenters) == 2

Expand Down
8 changes: 4 additions & 4 deletions tests/unit/firewalls/test_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ def test_get_actions_list(
)

actions = result.actions
assert result.meta is None
assert result.meta is not None

assert len(actions) == 1
assert isinstance(actions[0], BoundAction)
Expand Down Expand Up @@ -231,7 +231,7 @@ def test_get_list(self, firewalls_client, two_firewalls_response, params):
)

firewalls = result.firewalls
assert result.meta is None
assert result.meta is not None

assert len(firewalls) == 2

Expand Down Expand Up @@ -305,7 +305,7 @@ def test_get_actions_list(self, firewalls_client, firewall, response_get_actions
)

actions = result.actions
assert result.meta is None
assert result.meta is not None

assert len(actions) == 1
assert isinstance(actions[0], BoundAction)
Expand Down Expand Up @@ -489,7 +489,7 @@ def test_actions_get_list(self, firewalls_client, response_get_actions):
)

actions = result.actions
assert result.meta is None
assert result.meta is not None

assert len(actions) == 1
assert isinstance(actions[0], BoundAction)
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/floating_ips/test_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ def test_get_list(self, floating_ips_client, two_floating_ips_response, params):
)

bound_floating_ips = result.floating_ips
assert result.meta is None
assert result.meta is not None

assert len(bound_floating_ips) == 2

Expand Down Expand Up @@ -419,7 +419,7 @@ def test_actions_get_list(self, floating_ips_client, response_get_actions):
)

actions = result.actions
assert result.meta is None
assert result.meta is not None

assert len(actions) == 1
assert isinstance(actions[0], BoundAction)
Expand Down
8 changes: 4 additions & 4 deletions tests/unit/images/test_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ def test_get_actions_list(
)

actions = result.actions
assert result.meta is None
assert result.meta is not None

assert len(actions) == 1
assert isinstance(actions[0], BoundAction)
Expand Down Expand Up @@ -162,7 +162,7 @@ def test_get_list(self, images_client, two_images_response, params):
)

images = result.images
assert result.meta is None
assert result.meta is not None

assert len(images) == 2

Expand Down Expand Up @@ -254,7 +254,7 @@ def test_get_actions_list(self, images_client, image, response_get_actions):
)

actions = result.actions
assert result.meta is None
assert result.meta is not None

assert len(actions) == 1
assert isinstance(actions[0], BoundAction)
Expand Down Expand Up @@ -337,7 +337,7 @@ def test_actions_get_list(self, images_client, response_get_actions):
)

actions = result.actions
assert result.meta is None
assert result.meta is not None

assert len(actions) == 1
assert isinstance(actions[0], BoundAction)
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/isos/test_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ def test_get_list(self, isos_client, two_isos_response, params):
)

isos = result.isos
assert result.meta is None
assert result.meta is not None

assert len(isos) == 2

Expand Down
2 changes: 1 addition & 1 deletion tests/unit/load_balancer_types/test_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def test_get_list(
)

load_balancer_types = result.load_balancer_types
assert result.meta is None
assert result.meta is not None

assert len(load_balancer_types) == 2

Expand Down
6 changes: 3 additions & 3 deletions tests/unit/load_balancers/test_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ def test_get_actions_list(
)

actions = result.actions
assert result.meta is None
assert result.meta is not None

assert len(actions) == 1
assert isinstance(actions[0], BoundAction)
Expand Down Expand Up @@ -421,7 +421,7 @@ def test_get_list(
)

bound_load_balancers = result.load_balancers
assert result.meta is None
assert result.meta is not None

assert len(bound_load_balancers) == 2

Expand Down Expand Up @@ -569,7 +569,7 @@ def test_actions_get_list(self, load_balancers_client, response_get_actions):
)

actions = result.actions
assert result.meta is None
assert result.meta is not None

assert len(actions) == 1
assert isinstance(actions[0], BoundAction)
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/locations/test_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def test_get_list(self, locations_client, two_locations_response, params):
)

locations = result.locations
assert result.meta is None
assert result.meta is not None

assert len(locations) == 2

Expand Down
4 changes: 2 additions & 2 deletions tests/unit/networks/test_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ def test_get_list(self, networks_client, two_networks_response, params):
)

bound_networks = result.networks
assert result.meta is None
assert result.meta is not None

assert len(bound_networks) == 2

Expand Down Expand Up @@ -613,7 +613,7 @@ def test_actions_get_list(self, networks_client, response_get_actions):
)

actions = result.actions
assert result.meta is None
assert result.meta is not None

assert len(actions) == 1
assert isinstance(actions[0], BoundAction)
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/placement_groups/test_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ def test_get_list(
)

placement_groups = result.placement_groups
assert result.meta is None
assert result.meta is not None

assert len(placement_groups) == len(
two_placement_groups_response["placement_groups"]
Expand Down
Loading