Skip to content

Fix get_index_url to avoid proxy by default + refactor get_artifact_url #836

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
ahal merged 2 commits into from
Oct 24, 2025
Merged

Fix get_index_url to avoid proxy by default + refactor get_artifact_url #836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d81c62
fix: avoid proxy by default in get_index_url
ahal Oct 23, 2025
327e97b
refactor: simplify get_artifact_url
ahal Oct 23, 2025
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
21 changes: 5 additions & 16 deletions src/taskgraph/util/taskcluster.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,20 +141,7 @@ def get_session():


def get_artifact_url(task_id, path, use_proxy=False):
if use_proxy:
try:
url = liburls.normalize_root_url(os.environ["TASKCLUSTER_PROXY_URL"])
except KeyError:
if "TASK_ID" not in os.environ:
raise RuntimeError(
"taskcluster-proxy is not available when not executing in a task"
)
else:
raise RuntimeError("taskcluster-proxy is not enabled for this task")

else:
url = get_root_url(block_proxy=True)

url = get_root_url(block_proxy=not use_proxy)
artifact_tmpl = liburls.api(url, "queue", "v1", "task/{}/artifacts/{}")
return artifact_tmpl.format(task_id, path)

Expand Down Expand Up @@ -194,8 +181,10 @@ def get_artifact_path(task, path):
return f"{get_artifact_prefix(task)}/{path}"


def get_index_url(index_path, multiple=False):
index_tmpl = liburls.api(get_root_url(), "index", "v1", "task{}/{}")
def get_index_url(index_path, multiple=False, use_proxy=False):
index_tmpl = liburls.api(
get_root_url(block_proxy=not use_proxy), "index", "v1", "task{}/{}"
)
return index_tmpl.format("s" if multiple else "", index_path)


Expand Down
14 changes: 4 additions & 10 deletions test/test_util_taskcluster.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ def test_get_artifact_url(monkeypatch):
tc.get_root_url.cache_clear()
task_id = "abc"
path = "public/log.txt"
expected = "https://tc.example.com/api/queue/v1/task/abc/artifacts/public/log.txt"
expected = f"https://tc.example.com/api/queue/v1/task/{task_id}/artifacts/{path}"
expected_proxy = (
"https://taskcluster-proxy.net/api/queue/v1/task/abc/artifacts/public/log.txt"
f"https://taskcluster-proxy.net/api/queue/v1/task/{task_id}/artifacts/{path}"
)

# Test with default root URL (no proxy)
Expand All @@ -86,17 +86,11 @@ def test_get_artifact_url(monkeypatch):
monkeypatch.delenv("TASKCLUSTER_PROXY_URL")
monkeypatch.delenv("TASK_ID", raising=False)
tc.get_root_url.cache_clear()
with pytest.raises(RuntimeError) as exc:
tc.get_artifact_url(task_id, path, use_proxy=True)
assert "taskcluster-proxy is not available when not executing in a task" in str(
exc.value
)
assert tc.get_artifact_url(task_id, path, use_proxy=True) == expected

# Test with use_proxy=True but proxy not enabled (in a task without proxy)
monkeypatch.setenv("TASK_ID", "some-task-id")
with pytest.raises(RuntimeError) as exc:
tc.get_artifact_url(task_id, path, use_proxy=True)
assert "taskcluster-proxy is not enabled for this task" in str(exc.value)
assert tc.get_artifact_url(task_id, path, use_proxy=True) == expected


def test_get_artifact(responses, root_url):
Expand Down
Loading