Merge pull request #47 from opsmill/wvd-20240930-fix-execute-graphql

Fix `execute_graphql` method not respecting clien's `default_branch` property

Author: wvandeun

changelog/46.fixed.md

@@ -0,0 +1 @@
+`execute_graphql` method for InfrahubClient(Sync) now properly considers the `default_branch` setting

infrahub_sdk/client.py

@@ -575,6 +575,7 @@ async def execute_graphql(
             _type_: _description_
         """
 
+        branch_name = branch_name or self.default_branch
         url = self._graphql_url(branch_name=branch_name, at=at)
 
         payload: dict[str, Union[str, dict]] = {"query": query}
@@ -1112,6 +1113,7 @@ def execute_graphql(
             dict: The result of the GraphQL query or mutation.
         """
 
+        branch_name = branch_name or self.default_branch
         url = self._graphql_url(branch_name=branch_name, at=at)
 
         payload: dict[str, Union[str, dict]] = {"query": query}

tests/unit/sdk/conftest.py

@@ -1958,25 +1958,25 @@ async def mock_rest_api_artifact_generate(httpx_mock: HTTPXMock) -> HTTPXMock:
 @pytest.fixture
 async def mock_query_mutation_schema_dropdown_add(httpx_mock: HTTPXMock) -> None:
     response = {"data": {"SchemaDropdownAdd": {"ok": True}}}
-    httpx_mock.add_response(method="POST", url="http://mock/graphql", json=response)
+    httpx_mock.add_response(method="POST", url="http://mock/graphql/main", json=response)
 
 
 @pytest.fixture
 async def mock_query_mutation_schema_dropdown_remove(httpx_mock: HTTPXMock) -> None:
     response = {"data": {"SchemaDropdownRemove": {"ok": True}}}
-    httpx_mock.add_response(method="POST", url="http://mock/graphql", json=response)
+    httpx_mock.add_response(method="POST", url="http://mock/graphql/main", json=response)
 
 
 @pytest.fixture
 async def mock_query_mutation_schema_enum_add(httpx_mock: HTTPXMock) -> None:
     response = {"data": {"SchemaEnumAdd": {"ok": True}}}
-    httpx_mock.add_response(method="POST", url="http://mock/graphql", json=response)
+    httpx_mock.add_response(method="POST", url="http://mock/graphql/main", json=response)
 
 
 @pytest.fixture
 async def mock_query_mutation_schema_enum_remove(httpx_mock: HTTPXMock) -> None:
     response = {"data": {"SchemaEnumRemove": {"ok": True}}}
-    httpx_mock.add_response(method="POST", url="http://mock/graphql", json=response)
+    httpx_mock.add_response(method="POST", url="http://mock/graphql/main", json=response)
 
 
 @pytest.fixture

tests/unit/sdk/test_client.py

@@ -607,7 +607,7 @@ async def test_allocate_next_ip_prefix(
     assert ip_prefix.description.value == "test"
 
 
-EXPECTED_ECHO = """URL: http://mock/graphql
+EXPECTED_ECHO = """URL: http://mock/graphql/main
 QUERY:
 
     query GetTags($name: String!) {