fixes after rebase

Author: jooola

hcloud/storage_boxes/client.py

@@ -34,12 +34,12 @@ def __init__(
         raw = data.get("storage_box_type")
         if raw is not None:
             data["storage_box_type"] = BoundStorageBoxType(
-                client._client.storage_box_types, raw
+                client._parent.storage_box_types, raw
             )
 
         raw = data.get("location")
         if raw is not None:
-            data["location"] = BoundLocation(client._client.locations, raw)
+            data["location"] = BoundLocation(client._parent.locations, raw)
 
         raw = data.get("snapshot_plan")
         if raw is not None:
@@ -70,7 +70,9 @@ class StorageBoxesClient(ResourceClientBase):
     See https://docs.hetzner.cloud/reference/hetzner#storage-boxes.
     """
 
-    _client: Client
+    def __init__(self, client: Client):
+        super().__init__(client)
+        self._client = client._client_hetzner
 
     def get_by_id(self, id: int) -> BoundStorageBox:
         """
@@ -80,7 +82,7 @@ def get_by_id(self, id: int) -> BoundStorageBox:
 
         :param id: ID of the Storage Box.
         """
-        response = self._client._request_hetzner(  # pylint: disable=protected-access
+        response = self._client.request(
             method="GET",
             url=f"/storage_boxes/{id}",
         )
@@ -123,7 +125,7 @@ def get_list(
         if per_page is not None:
             params["per_page"] = per_page
 
-        response = self._client._request_hetzner(  # pylint: disable=protected-access
+        response = self._client.request(
             method="GET",
             url="/storage_boxes",
             params=params,
@@ -189,15 +191,15 @@ def create(
         if labels is not None:
             data["labels"] = labels
 
-        response = self._client._request_hetzner(  # pylint: disable=protected-access
+        response = self._client.request(
             method="POST",
             url="/storage_boxes",
             json=data,
         )
 
         return CreateStorageBoxResponse(
             storage_box=BoundStorageBox(self, response["storage_box"]),
-            action=BoundAction(self._client.actions, response["action"]),
+            action=BoundAction(self._parent.actions, response["action"]),
         )
 
     def update(
@@ -222,7 +224,7 @@ def update(
         if labels is not None:
             data["labels"] = labels
 
-        response = self._client._request_hetzner(  # pylint: disable=protected-access
+        response = self._client.request(
             method="PUT",
             url=f"/storage_boxes/{storage_box.id}",
             json=data,
@@ -241,13 +243,13 @@ def delete(
 
         :param storage_box: Storage Box to delete.
         """
-        response = self._client._request_hetzner(  # pylint: disable=protected-access
+        response = self._client.request(
             method="DELETE",
             url=f"/storage_boxes/{storage_box.id}",
         )
 
         return DeleteStorageBoxResponse(
-            action=BoundAction(self._client.actions, response["action"])
+            action=BoundAction(self._parent.actions, response["action"])
         )
 
     def get_folders(
@@ -269,7 +271,7 @@ def get_folders(
         if path is not None:
             params["path"] = path
 
-        response = self._client._request_hetzner(  # pylint: disable=protected-access
+        response = self._client.request(
             method="GET",
             url=f"/storage_boxes/{storage_box.id}/folders",
             params=params,

tests/unit/storage_boxes/test_client.py

@@ -21,10 +21,10 @@
 
 def assert_bound_model(
     o: BoundStorageBox,
-    client: StorageBoxesClient,
+    resource_client: StorageBoxesClient,
 ):
     assert isinstance(o, BoundStorageBox)
-    assert o._client is client
+    assert o._client is resource_client
     assert o.id == 42
     assert o.name == "storage-box1"
 
@@ -38,35 +38,27 @@ def assert_bound_action(
     assert o.id == 22
 
 
-@pytest.fixture(name="request_mock")
-def request_mock_fixture():
-    return mock.MagicMock()
-
-
-@pytest.fixture(name="client")
-def client_fixture(request_mock) -> StorageBoxesClient:
-    client = Client("")
-    client._request_hetzner = request_mock
-    return StorageBoxesClient(client=client)
-
-
 class TestClient:
+    @pytest.fixture()
+    def resource_client(self, client: Client) -> StorageBoxesClient:
+        return StorageBoxesClient(client)
+
     def test_get_by_id(
         self,
         request_mock: mock.MagicMock,
-        client: StorageBoxesClient,
+        resource_client: StorageBoxesClient,
         storage_box1,
     ):
         request_mock.return_value = {"storage_box": storage_box1}
 
-        result = client.get_by_id(42)
+        result = resource_client.get_by_id(42)
 
         request_mock.assert_called_with(
             method="GET",
             url="/storage_boxes/42",
         )
 
-        assert_bound_model(result, client)
+        assert_bound_model(result, resource_client)
         assert result.storage_box_type.id == 42
         assert result.storage_box_type.name == "bx11"
         assert result.location.id == 1
@@ -102,14 +94,14 @@ def test_get_by_id(
     def test_get_list(
         self,
         request_mock: mock.MagicMock,
-        client: StorageBoxesClient,
+        resource_client: StorageBoxesClient,
         storage_box1,
         storage_box2,
         params,
     ):
         request_mock.return_value = {"storage_boxes": [storage_box1, storage_box2]}
 
-        result = client.get_list(**params)
+        result = resource_client.get_list(**params)
 
         request_mock.assert_called_with(
             url="/storage_boxes",
@@ -123,11 +115,11 @@ def test_get_list(
         result1 = result.storage_boxes[0]
         result2 = result.storage_boxes[1]
 
-        assert result1._client is client
+        assert result1._client is resource_client
         assert result1.id == 42
         assert result1.name == "storage-box1"
 
-        assert result2._client is client
+        assert result2._client is resource_client
         assert result2.id == 43
         assert result2.name == "storage-box2"
 
@@ -141,14 +133,14 @@ def test_get_list(
     def test_get_all(
         self,
         request_mock: mock.MagicMock,
-        client: StorageBoxesClient,
+        resource_client: StorageBoxesClient,
         storage_box1,
         storage_box2,
         params,
     ):
         request_mock.return_value = {"storage_boxes": [storage_box1, storage_box2]}
 
-        result = client.get_all(**params)
+        result = resource_client.get_all(**params)
 
         request_mock.assert_called_with(
             url="/storage_boxes",
@@ -161,23 +153,23 @@ def test_get_all(
         result1 = result[0]
         result2 = result[1]
 
-        assert result1._client is client
+        assert result1._client is resource_client
         assert result1.id == 42
         assert result1.name == "storage-box1"
 
-        assert result2._client is client
+        assert result2._client is resource_client
         assert result2.id == 43
         assert result2.name == "storage-box2"
 
     def test_get_by_name(
         self,
         request_mock: mock.MagicMock,
-        client: StorageBoxesClient,
+        resource_client: StorageBoxesClient,
         storage_box1,
     ):
         request_mock.return_value = {"storage_boxes": [storage_box1]}
 
-        result = client.get_by_name("bx11")
+        result = resource_client.get_by_name("bx11")
 
         params = {"name": "bx11"}
 
@@ -187,12 +179,12 @@ def test_get_by_name(
             params=params,
         )
 
-        assert_bound_model(result, client)
+        assert_bound_model(result, resource_client)
 
     def test_create(
         self,
         request_mock: mock.MagicMock,
-        client: StorageBoxesClient,
+        resource_client: StorageBoxesClient,
         storage_box1,
         action_running1,
     ):
@@ -201,7 +193,7 @@ def test_create(
             "action": action_running1,
         }
 
-        result = client.create(
+        result = resource_client.create(
             name="storage-box1",
             password="secret-password",
             location=Location(name="fsn1"),
@@ -233,19 +225,19 @@ def test_create(
             },
         )
 
-        assert_bound_model(result.storage_box, client)
+        assert_bound_model(result.storage_box, resource_client)
 
     def test_update(
         self,
         request_mock: mock.MagicMock,
-        client: StorageBoxesClient,
+        resource_client: StorageBoxesClient,
         storage_box1,
     ):
         request_mock.return_value = {
             "storage_box": storage_box1,
         }
 
-        result = client.update(
+        result = resource_client.update(
             StorageBox(id=42),
             name="name",
             labels={"key": "value"},
@@ -260,26 +252,26 @@ def test_update(
             },
         )
 
-        assert_bound_model(result, client)
+        assert_bound_model(result, resource_client)
 
     def test_delete(
         self,
         request_mock: mock.MagicMock,
-        client: StorageBoxesClient,
+        resource_client: StorageBoxesClient,
         action_running1,
     ):
         request_mock.return_value = {
             "action": action_running1,
         }
 
-        result = client.delete(StorageBox(id=42))
+        result = resource_client.delete(StorageBox(id=42))
 
         request_mock.assert_called_with(
             method="DELETE",
             url="/storage_boxes/42",
         )
 
-        assert_bound_action(result.action, client._client.actions)
+        assert_bound_action(result.action, resource_client._parent.actions)
 
     @pytest.mark.parametrize(
         "params",
@@ -291,14 +283,14 @@ def test_delete(
     def test_get_folders(
         self,
         request_mock: mock.MagicMock,
-        client: StorageBoxesClient,
+        resource_client: StorageBoxesClient,
         params,
     ):
         request_mock.return_value = {
             "folders": ["dir1", "dir2"],
         }
 
-        result = client.get_folders(StorageBox(id=42), **params)
+        result = resource_client.get_folders(StorageBox(id=42), **params)
 
         request_mock.assert_called_with(
             method="GET", url="/storage_boxes/42/folders", params=params