Skip to content

Fix get_artifact returning the TC API response instead of the artifact #814

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix get_artifact returning the TC API response instead of the artifact #814

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
3 changes: 2 additions & 1 deletion src/taskgraph/util/taskcluster.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,8 @@ def get_artifact(task_id, path):
"""
queue = get_taskcluster_client("queue")
response = queue.getLatestArtifact(task_id, path)
return _handle_artifact(path, response)
artifact_response = requests.get(response["url"])
return _handle_artifact(path, artifact_response)


def list_artifacts(task_id):
Expand Down
21 changes: 18 additions & 3 deletions test/test_util_taskcluster.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,26 +110,41 @@ def test_get_artifact(responses, root_url):

# Test text artifact
responses.get(
f"{root_url}/api/queue/v1/task/{tid}/artifacts/artifact.txt",
"http://foo.bar/artifact.txt",
body=b"foobar",
)
responses.get(
f"{root_url}/api/queue/v1/task/{tid}/artifacts/artifact.txt",
body=b'{"type": "s3", "url": "http://foo.bar/artifact.txt"}',
status=303,
headers={"Location": "http://foo.bar/artifact.txt"},
)
raw = tc.get_artifact(tid, "artifact.txt")
assert raw.read() == b"foobar"

# Test JSON artifact
responses.get("http://foo.bar/artifact.json", json={"foo": "bar"})
responses.get(
f"{root_url}/api/queue/v1/task/{tid}/artifacts/artifact.json",
json={"foo": "bar"},
body=b'{"type": "s3", "url": "http://foo.bar/artifact.json"}',
status=303,
headers={"Location": "http://foo.bar/artifact.json"},
)
result = tc.get_artifact(tid, "artifact.json")
assert result == {"foo": "bar"}

# Test YAML artifact
expected_result = {"foo": b"\xe2\x81\x83".decode()}
responses.get(
f"{root_url}/api/queue/v1/task/{tid}/artifacts/artifact.yml",
"http://foo.bar/artifact.yml",
body=b'foo: "\xe2\x81\x83"',
)
responses.get(
f"{root_url}/api/queue/v1/task/{tid}/artifacts/artifact.yml",
body=b'{"type": "s3", "url": "http://foo.bar/artifact.yml"}',
status=303,
headers={"Location": "http://foo.bar/artifact.yml"},
)
result = tc.get_artifact(tid, "artifact.yml")
assert result == expected_result

Expand Down
Loading