test: refactor sync and async tests to use Pydantic models and improve response validation

- Updated network tests to utilize Network and NetworkList models, enhancing response validation.
- Refactored organization tests to use Organization model for better structure and clarity.
- Modified package tests to implement Package and PackageList models, ensuring accurate response checks.
- Revised project tests to leverage Project and ProjectList models for improved data handling.
- Enhanced secret tests to utilize Secret and SecretList models, streamlining response validation.
- Updated static route tests to incorporate StaticRoute and StaticRouteList models for better consistency.
- Refactored user tests to use appropriate Pydantic models, improving clarity and response validation.

Author: guptadev21

tests/async_tests/test_configtree_async.py

@@ -1,15 +1,15 @@
 import httpx
 import pytest
-import pytest_asyncio  # noqa: F401
-from munch import Munch
+import pytest_asyncio
 from asyncmock import AsyncMock
 
-from tests.data.mock_data import configtree_body  # noqa: F401
-from tests.utils.fixtures import async_client as client  # noqa: F401
+# ruff: noqa: F811, F401
+from tests.data.mock_data import configtree_body
+from tests.utils.fixtures import async_client
 
 
 @pytest.mark.asyncio
-async def test_list_configtrees_success(client, mocker: AsyncMock):  # noqa: F811
+async def test_list_configtrees_success(async_client, mocker: AsyncMock):
     # Mock the httpx.AsyncClient.get method
     mock_get = mocker.patch("httpx.AsyncClient.get")
 
@@ -23,17 +23,16 @@ async def test_list_configtrees_success(client, mocker: AsyncMock):  # noqa: F81
     )
 
     # Call the list_configtrees method
-    response = await client.list_configtrees()
+    response = await async_client.list_configtrees()
 
     # Validate the response
-    assert isinstance(response, Munch)
     assert response["items"] == [
         {"name": "test-configtree", "guid": "mock_configtree_guid"}
     ]
 
 
 @pytest.mark.asyncio
-async def test_list_configtrees_bad_gateway(client, mocker: AsyncMock):  # noqa: F811
+async def test_list_configtrees_bad_gateway(async_client, mocker: AsyncMock):
     # Mock the httpx.AsyncClient.get method
     mock_get = mocker.patch("httpx.AsyncClient.get")
 
@@ -45,13 +44,13 @@ async def test_list_configtrees_bad_gateway(client, mocker: AsyncMock):  # noqa:
 
     # Call the list_configtrees method
     with pytest.raises(Exception) as exc:
-        await client.list_configtrees()
+        await async_client.list_configtrees()
 
     assert str(exc.value) == "bad gateway"
 
 
 @pytest.mark.asyncio
-async def test_create_configtree_success(client, mocker: AsyncMock):  # noqa: F811
+async def test_create_configtree_success(async_client, mocker: AsyncMock):
     # Mock the httpx.AsyncClient.post method
     mock_post = mocker.patch("httpx.AsyncClient.post")
 
@@ -64,15 +63,14 @@ async def test_create_configtree_success(client, mocker: AsyncMock):  # noqa: F8
     )
 
     # Call the create_configtree method
-    response = await client.create_configtree(configtree_body)
+    response = await async_client.create_configtree(configtree_body)
 
     # Validate the response
-    assert isinstance(response, Munch)
     assert response["metadata"]["guid"] == "test_configtree_guid"
 
 
 @pytest.mark.asyncio
-async def test_create_configtree_service_unavailable(client, mocker: AsyncMock):  # noqa: F811
+async def test_create_configtree_service_unavailable(async_client, mocker: AsyncMock):
     # Mock the httpx.AsyncClient.post method
     mock_post = mocker.patch("httpx.AsyncClient.post")
 
@@ -84,13 +82,13 @@ async def test_create_configtree_service_unavailable(client, mocker: AsyncMock):
 
     # Call the create_configtree method
     with pytest.raises(Exception) as exc:
-        await client.create_configtree(configtree_body)
+        await async_client.create_configtree(configtree_body)
 
     assert str(exc.value) == "service unavailable"
 
 
 @pytest.mark.asyncio
-async def test_get_configtree_success(client, mocker: AsyncMock):  # noqa: F811
+async def test_get_configtree_success(async_client, mocker: AsyncMock):
     # Mock the httpx.AsyncClient.get method
     mock_get = mocker.patch("httpx.AsyncClient.get")
 
@@ -103,16 +101,15 @@ async def test_get_configtree_success(client, mocker: AsyncMock):  # noqa: F811
     )
 
     # Call the get_configtree method
-    response = await client.get_configtree(name="mock_configtree_name")
+    response = await async_client.get_configtree(name="mock_configtree_name")
 
     # Validate the response
-    assert isinstance(response, Munch)
-    assert response.metadata.guid == "test_configtree_guid"
-    assert response.metadata.name == "test_configtree"
+    assert response["metadata"]["guid"] == "test_configtree_guid"
+    assert response["metadata"]["name"] == "test_configtree"
 
 
 @pytest.mark.asyncio
-async def test_set_configtree_revision_success(client, mocker: AsyncMock):  # noqa: F811
+async def test_set_configtree_revision_success(async_client, mocker: AsyncMock):
     # Mock the httpx.AsyncClient.put method
     mock_put = mocker.patch("httpx.AsyncClient.put")
 
@@ -125,42 +122,34 @@ async def test_set_configtree_revision_success(client, mocker: AsyncMock):  # no
     )
 
     # Call the set_configtree_revision method
-    response = await client.set_configtree_revision(
+    response = await async_client.set_configtree_revision(
         name="mock_configtree_name", configtree=configtree_body
     )
 
     # Validate the response
-    assert isinstance(response, Munch)
-    assert response.metadata.guid == "test_configtree_guid"
-    assert response.metadata.name == "test_configtree"
+    assert response["metadata"]["guid"] == "test_configtree_guid"
+    assert response["metadata"]["name"] == "test_configtree"
 
 
 @pytest.mark.asyncio
-async def test_update_configtree_success(client, mocker: AsyncMock):  # noqa: F811
+async def test_update_configtree_success(async_client, mocker: AsyncMock):
     # Mock the httpx.AsyncClient.put method
     mock_put = mocker.patch("httpx.AsyncClient.put")
-
-    # Set up the mock response
     mock_put.return_value = httpx.Response(
         status_code=200,
         json={
             "metadata": {"guid": "test_configtree_guid", "name": "test_configtree"},
         },
     )
-
-    # Call the update_configtree method
-    response = await client.update_configtree(
+    response = await async_client.update_configtree(
         name="mock_configtree_name", body=configtree_body
     )
-
-    # Validate the response
-    assert isinstance(response, Munch)
-    assert response.metadata.guid == "test_configtree_guid"
-    assert response.metadata.name == "test_configtree"
+    assert response["metadata"]["guid"] == "test_configtree_guid"
+    assert response["metadata"]["name"] == "test_configtree"
 
 
 @pytest.mark.asyncio
-async def test_delete_configtree_success(client, mocker: AsyncMock):  # noqa: F811
+async def test_delete_configtree_success(async_client, mocker: AsyncMock):
     # Mock the httpx.AsyncClient.delete method
     mock_delete = mocker.patch("httpx.AsyncClient.delete")
 
@@ -171,14 +160,14 @@ async def test_delete_configtree_success(client, mocker: AsyncMock):  # noqa: F8
     )
 
     # Call the delete_configtree method
-    response = await client.delete_configtree(name="mock_configtree_name")
+    response = await async_client.delete_configtree(name="mock_configtree_name")
 
     # Validate the response
-    assert response["success"] is True
+    assert response is None
 
 
 @pytest.mark.asyncio
-async def test_list_revisions_success(client, mocker: AsyncMock):  # noqa: F811
+async def test_list_revisions_success(async_client, mocker: AsyncMock):
     # Mock the httpx.AsyncClient.get method
     mock_get = mocker.patch("httpx.AsyncClient.get")
 
@@ -192,17 +181,16 @@ async def test_list_revisions_success(client, mocker: AsyncMock):  # noqa: F811
     )
 
     # Call the list_revisions method
-    response = await client.list_revisions(tree_name="mock_configtree_name")
+    response = await async_client.list_revisions(tree_name="mock_configtree_name")
 
     # Validate the response
-    assert isinstance(response, Munch)
     assert response["items"] == [
         {"name": "test-configtree", "guid": "mock_configtree_guid"}
     ]
 
 
 @pytest.mark.asyncio
-async def test_create_revision_success(client, mocker: AsyncMock):  # noqa: F811
+async def test_create_revision_success(async_client, mocker: AsyncMock):
     # Mock the httpx.AsyncClient.post method
     mock_post = mocker.patch("httpx.AsyncClient.post")
 
@@ -215,17 +203,16 @@ async def test_create_revision_success(client, mocker: AsyncMock):  # noqa: F811
     )
 
     # Call the create_revision method
-    response = await client.create_revision(
+    response = await async_client.create_revision(
         name="mock_configtree_name", body=configtree_body
     )
 
     # Validate the response
-    assert isinstance(response, Munch)
     assert response["metadata"]["guid"] == "test_revision_guid"
 
 
 @pytest.mark.asyncio
-async def test_put_keys_in_revision_success(client, mocker: AsyncMock):  # noqa: F811
+async def test_put_keys_in_revision_success(async_client, mocker: AsyncMock):
     # Mock the httpx.AsyncClient.put method
     mock_put = mocker.patch("httpx.AsyncClient.put")
 
@@ -238,20 +225,19 @@ async def test_put_keys_in_revision_success(client, mocker: AsyncMock):  # noqa:
     )
 
     # Call the put_keys_in_revision method
-    response = await client.put_keys_in_revision(
+    response = await async_client.put_keys_in_revision(
         name="mock_configtree_name",
         revision_id="mock_revision_id",
         config_values=["mock_value1", "mock_value2"],
     )
 
     # Validate the response
-    assert isinstance(response, Munch)
-    assert response.metadata.guid == "test_revision_guid"
-    assert response.metadata.name == "test_revision"
+    assert response["metadata"]["guid"] == "test_revision_guid"
+    assert response["metadata"]["name"] == "test_revision"
 
 
 @pytest.mark.asyncio
-async def test_commit_revision_success(client, mocker: AsyncMock):  # noqa: F811
+async def test_commit_revision_success(async_client, mocker: AsyncMock):
     # Mock the httpx.AsyncClient.put method
     mock_patch = mocker.patch("httpx.AsyncClient.patch")
 
@@ -264,19 +250,18 @@ async def test_commit_revision_success(client, mocker: AsyncMock):  # noqa: F811
     )
 
     # Call the commit_revision method
-    response = await client.commit_revision(
+    response = await async_client.commit_revision(
         tree_name="mock_configtree_name",
         revision_id="mock_revision_id",
     )
 
     # Validate the response
-    assert isinstance(response, Munch)
-    assert response.metadata.guid == "test_revision_guid"
-    assert response.metadata.name == "test_revision"
+    assert response["metadata"]["guid"] == "test_revision_guid"
+    assert response["metadata"]["name"] == "test_revision"
 
 
 @pytest.mark.asyncio
-async def test_get_key_in_revision(client, mocker: AsyncMock):  # noqa: F811
+async def test_get_key_in_revision(async_client, mocker: AsyncMock):
     # Mock the httpx.AsyncClient.get method
     mock_get = mocker.patch("httpx.AsyncClient.get")
 
@@ -289,18 +274,17 @@ async def test_get_key_in_revision(client, mocker: AsyncMock):  # noqa: F811
     )
 
     # Call the get_key_in_revision method
-    response = await client.get_key_in_revision(
+    response = await async_client.get_key_in_revision(
         tree_name="mock_configtree_name", revision_id="mock_revision_id", key="mock_key"
     )
 
     # Validate the response
-    assert isinstance(response, Munch)
-    assert response.metadata.guid == "test_revision_guid"
-    assert response.metadata.name == "test_revision"
+    assert response["metadata"]["guid"] == "test_revision_guid"
+    assert response["metadata"]["name"] == "test_revision"
 
 
 @pytest.mark.asyncio
-async def test_put_key_in_revision_success(client, mocker: AsyncMock):  # noqa: F811
+async def test_put_key_in_revision_success(async_client, mocker: AsyncMock):
     # Mock the httpx.AsyncClient.put method
     mock_put = mocker.patch("httpx.AsyncClient.put")
 
@@ -313,34 +297,33 @@ async def test_put_key_in_revision_success(client, mocker: AsyncMock):  # noqa:
     )
 
     # Call the put_key_in_revision method
-    response = await client.put_key_in_revision(
+    response = await async_client.put_key_in_revision(
         tree_name="mock_configtree_name", revision_id="mock_revision_id", key="mock_key"
     )
 
     # Validate the response
-    assert isinstance(response, Munch)
-    assert response.metadata.guid == "test_revision_guid"
-    assert response.metadata.name == "test_revision"
+    assert response["metadata"]["guid"] == "test_revision_guid"
+    assert response["metadata"]["name"] == "test_revision"
 
 
 @pytest.mark.asyncio
-async def test_delete_key_in_revision_success(client, mocker: AsyncMock):  # noqa: F811
+async def test_delete_key_in_revision_success(async_client, mocker: AsyncMock):
     mock_delete = mocker.patch("httpx.AsyncClient.delete")
 
     mock_delete.return_value = httpx.Response(
         status_code=204,
         json={"success": True},
     )
 
-    response = await client.delete_key_in_revision(
+    response = await async_client.delete_key_in_revision(
         tree_name="mock_configtree_name", revision_id="mock_revision_id", key="mock_key"
     )
 
-    assert response["success"] is True
+    assert response is None
 
 
 @pytest.mark.asyncio
-async def test_rename_key_in_revision_success(client, mocker: AsyncMock):  # noqa: F811
+async def test_rename_key_in_revision_success(async_client, mocker: AsyncMock):
     mock_patch = mocker.patch("httpx.AsyncClient.patch")
 
     mock_patch.return_value = httpx.Response(
@@ -350,13 +333,13 @@ async def test_rename_key_in_revision_success(client, mocker: AsyncMock):  # noq
         },
     )
 
-    response = await client.rename_key_in_revision(
+    response = await async_client.rename_key_in_revision(
         tree_name="mock_configtree_name",
         revision_id="mock_revision_id",
         key="mock_key",
         config_key_rename={"metadata": {"name": "test_key"}},
     )
 
-    assert isinstance(response, Munch)
-    assert response.metadata.guid == "test_revision_guid"
-    assert response.metadata.name == "test_revision"
+    assert isinstance(response, dict)
+    assert response["metadata"]["guid"] == "test_revision_guid"
+    assert response["metadata"]["name"] == "test_revision"