Skip to content

Don't decode YAML responses before parsing them in get_artifact #700

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
Eijebong merged 1 commit into from
Jun 2, 2025
Merged

Don't decode YAML responses before parsing them in get_artifact #700

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
2 changes: 1 addition & 1 deletion src/taskgraph/util/taskcluster.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ def _handle_artifact(path, response):
if path.endswith(".json"):
return response.json()
if path.endswith(".yml"):
return yaml.load_stream(response.text)
return yaml.load_stream(response.content)
response.raw.read = functools.partial(response.raw.read, decode_content=True)
return response.raw

Expand Down
15 changes: 15 additions & 0 deletions test/test_util_taskcluster.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,21 @@ def test_get_artifact(responses, root_url):
)
assert tc.get_artifact(tid, "artifact.yml") == {"foo": "bar"}

responses.add(
responses.GET,
f"{root_url}/api/queue/v1/task/{tid}/artifacts/artifact.yml",
body=b"foo: \xe2\x81\x83",
)
assert tc.get_artifact(tid, "artifact.yml") == {"foo": b"\xe2\x81\x83".decode()}

responses.add(
responses.GET,
f"{root_url}/api/queue/v1/task/{tid}/artifacts/artifact.yml",
body=b"foo: \xe2\x81\x83".decode().encode("utf-16"),
headers={"Content-Type": "text/yaml; charset=utf-16"},
)
assert tc.get_artifact(tid, "artifact.yml") == {"foo": b"\xe2\x81\x83".decode()}


def test_list_artifact(responses, root_url):
tid = 123
Expand Down
Loading