Skip to content

Fix execute_graphql method not respecting clien's default_branch property #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 30, 2024
Merged

Fix execute_graphql method not respecting clien's default_branch property #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions changelog/46.fixed.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
`execute_graphql` method for InfrahubClient(Sync) now properly considers the `default_branch` setting
2 changes: 2 additions & 0 deletions infrahub_sdk/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -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}
Expand Down
8 changes: 4 additions & 4 deletions tests/unit/sdk/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/sdk/test_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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!) {
Expand Down