refactor: simplify get_artifact_url

get_root_url already normalizes the url, so no need for the if/else
here.

Author: ahal

src/taskgraph/util/taskcluster.py

@@ -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)
 

test/test_util_taskcluster.py

@@ -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)
@@ -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):