Skip to content

Commit af40990

Browse files
committed
fix(bitrisescript): only log Bitrise response content on error
This is actually very verbose and makes the Taskcluster logs very difficult to read, so only log it on error.
1 parent 31fd15c commit af40990

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

bitrisescript/src/bitrisescript/bitrise.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,10 @@ async def request(self, endpoint: str, method: str = "get", **kwargs: Any) -> An
8787
while True:
8888
r = await self._client.request(method, url, **kwargs)
8989
log.debug(f"{method_and_url} returned HTTP code {r.status}")
90+
if r.status >= 400:
91+
log.debug(f"{method_and_url} returned JSON:\n{pformat(data)}")
92+
r.raise_for_status()
93+
9094
response = await r.json()
9195

9296
if "data" not in response:
@@ -104,8 +108,6 @@ async def request(self, endpoint: str, method: str = "get", **kwargs: Any) -> An
104108
break
105109
kwargs.setdefault("params", {})["next"] = next
106110

107-
log.debug(f"{method_and_url} returned JSON {pformat(data)}")
108-
109111
return data
110112

111113

bitrisescript/tests/test_bitrise.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,10 @@ async def test_bitrise_client_request(config, mocker, client, prefix, endpoint,
102102
{"Authorization": config["bitrise"]["access_token"]},
103103
)
104104

105+
response = mocker.AsyncMock()
106+
response.status = 200
105107
m = mocker.patch.object(client._client, "request", return_value=Future())
106-
m.return_value.set_result(mocker.AsyncMock())
108+
m.return_value.set_result(response)
107109

108110
if prefix:
109111
client.prefix = prefix

0 commit comments

Comments
 (0)