taskcluster-taskgraph 7.4.0__tar.gz → 8.0.0__tar.gz

{taskcluster-taskgraph-7.4.0/src/taskcluster_taskgraph.egg-info → taskcluster-taskgraph-8.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: taskcluster-taskgraph
-Version: 7.4.0
+Version: 8.0.0
 Summary: Build taskcluster taskgraphs
 Home-page: https://github.com/taskcluster/taskgraph
 Classifier: Development Status :: 5 - Production/Stable

{taskcluster-taskgraph-7.4.0 → taskcluster-taskgraph-8.0.0/src/taskcluster_taskgraph.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: taskcluster-taskgraph
-Version: 7.4.0
+Version: 8.0.0
 Summary: Build taskcluster taskgraphs
 Home-page: https://github.com/taskcluster/taskgraph
 Classifier: Development Status :: 5 - Production/Stable

{taskcluster-taskgraph-7.4.0 → taskcluster-taskgraph-8.0.0}/src/taskcluster_taskgraph.egg-info/SOURCES.txt

@@ -20,7 +20,6 @@ src/taskgraph/config.py
 src/taskgraph/create.py
 src/taskgraph/decision.py
 src/taskgraph/docker.py
-src/taskgraph/files_changed.py
 src/taskgraph/filter_tasks.py
 src/taskgraph/generator.py
 src/taskgraph/graph.py
@@ -78,6 +77,7 @@ src/taskgraph/util/path.py
 src/taskgraph/util/python_path.py
 src/taskgraph/util/readonlydict.py
 src/taskgraph/util/schema.py
+src/taskgraph/util/set_name.py
 src/taskgraph/util/shell.py
 src/taskgraph/util/taskcluster.py
 src/taskgraph/util/taskgraph.py
@@ -92,7 +92,6 @@ test/test_actions_rebuild_cached_tasks.py
 test/test_actions_registry.py
 test/test_create.py
 test/test_decision.py
-test/test_files_changed.py
 test/test_generator.py
 test/test_graph.py
 test/test_main.py

{taskcluster-taskgraph-7.4.0 → taskcluster-taskgraph-8.0.0}/src/taskgraph/__init__.py

@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-__version__ = "7.4.0"
+__version__ = "8.0.0"
 
 # Maximum number of dependencies a single task can have
 # https://docs.taskcluster.net/reference/platform/taskcluster-queue/references/api#createTask

{taskcluster-taskgraph-7.4.0 → taskcluster-taskgraph-8.0.0}/src/taskgraph/decision.py

@@ -185,6 +185,7 @@ def get_decision_parameters(graph_config, options):
 
     # Define default filter list, as most configurations shouldn't need
     # custom filters.
+    parameters["files_changed"] = repo.get_changed_files("AM")
     parameters["filters"] = [
         "target_tasks_method",
     ]

{taskcluster-taskgraph-7.4.0 → taskcluster-taskgraph-8.0.0}/src/taskgraph/main.py

@@ -121,7 +121,7 @@ def get_taskgraph_generator(root, parameters):
     return TaskGraphGenerator(root_dir=root, parameters=parameters)
 
 
-def format_taskgraph(options, parameters, logfile=None):
+def format_taskgraph(options, parameters, overrides, logfile=None):
     import taskgraph
     from taskgraph.parameters import parameters_loader
 
@@ -139,7 +139,7 @@ def format_taskgraph(options, parameters, logfile=None):
     if isinstance(parameters, str):
         parameters = parameters_loader(
             parameters,
-            overrides={"target-kinds": options.get("target_kinds")},
+            overrides=overrides,
             strict=False,
         )
 
@@ -173,7 +173,7 @@ def dump_output(out, path=None, params_spec=None):
     print(out + "\n", file=fh)
 
 
-def generate_taskgraph(options, parameters, logdir):
+def generate_taskgraph(options, parameters, overrides, logdir):
     from taskgraph.parameters import Parameters
 
     def logfile(spec):
@@ -189,14 +189,16 @@ def generate_taskgraph(options, parameters, logdir):
     # tracebacks a little more readable and avoids additional process overhead.
     if len(parameters) == 1:
         spec = parameters[0]
-        out = format_taskgraph(options, spec, logfile(spec))
+        out = format_taskgraph(options, spec, overrides, logfile(spec))
         dump_output(out, options["output_file"])
         return 0
 
     futures = {}
     with ProcessPoolExecutor(max_workers=options["max_workers"]) as executor:
         for spec in parameters:
-            f = executor.submit(format_taskgraph, options, spec, logfile(spec))
+            f = executor.submit(
+                format_taskgraph, options, spec, overrides, logfile(spec)
+            )
             futures[f] = spec
 
     returncode = 0
@@ -293,6 +295,15 @@ def generate_taskgraph(options, parameters, logdir):
     "generations will happen from the same invocation (one per parameters "
     "specified).",
 )
+@argument(
+    "--force-local-files-changed",
+    default=False,
+    action="store_true",
+    help="Compute the 'files-changed' parameter from local version control, "
+    "even when explicitly using a parameter set that already has it defined. "
+    "Note that this is already the default behaviour when no parameters are "
+    "specified.",
+)
 @argument(
     "--no-optimize",
     dest="optimize",
@@ -367,9 +378,11 @@ def show_taskgraph(options):
     diffdir = None
     output_file = options["output_file"]
 
-    if options["diff"]:
+    if options["diff"] or options["force_local_files_changed"]:
         repo = get_repository(os.getcwd())
 
+    if options["diff"]:
+        assert repo is not None
         if not repo.working_directory_clean():
             print(
                 "abort: can't diff taskgraph with dirty working directory",
@@ -393,15 +406,22 @@ def show_taskgraph(options):
         )
         print(f"Generating {options['graph_attr']} @ {cur_rev}", file=sys.stderr)
 
+    overrides = {
+        "target-kinds": options.get("target_kinds"),
+    }
     parameters: List[Any[str, Parameters]] = options.pop("parameters")
     if not parameters:
-        overrides = {
-            "target-kinds": options.get("target_kinds"),
-        }
         parameters = [
             parameters_loader(None, strict=False, overrides=overrides)
         ]  # will use default values
 
+        # This is the default behaviour anyway, so no need to re-compute.
+        options["force_local_files_changed"] = False
+
+    elif options["force_local_files_changed"]:
+        assert repo is not None
+        overrides["files-changed"] = sorted(repo.get_changed_files("AM"))
+
     for param in parameters[:]:
         if isinstance(param, str) and os.path.isdir(param):
             parameters.remove(param)
@@ -427,7 +447,7 @@ def show_taskgraph(options):
         # to setup its `mach` based logging.
         setup_logging()
 
-    ret = generate_taskgraph(options, parameters, logdir)
+    ret = generate_taskgraph(options, parameters, overrides, logdir)
 
     if options["diff"]:
         assert diffdir is not None
@@ -451,7 +471,7 @@ def show_taskgraph(options):
                 diffdir, f"{options['graph_attr']}_{base_rev_file}"
             )
             print(f"Generating {options['graph_attr']} @ {base_rev}", file=sys.stderr)
-            ret |= generate_taskgraph(options, parameters, logdir)
+            ret |= generate_taskgraph(options, parameters, overrides, logdir)
         finally:
             repo.update(cur_rev)
 

{taskcluster-taskgraph-7.4.0 → taskcluster-taskgraph-8.0.0}/src/taskgraph/optimize/strategies.py

@@ -1,8 +1,8 @@
 import logging
 from datetime import datetime
 
-from taskgraph import files_changed
 from taskgraph.optimize.base import OptimizationStrategy, register_strategy
+from taskgraph.util.path import match as match_path
 from taskgraph.util.taskcluster import find_task_id, status_task
 
 logger = logging.getLogger(__name__)
@@ -48,12 +48,20 @@ class IndexSearch(OptimizationStrategy):
 
 @register_strategy("skip-unless-changed")
 class SkipUnlessChanged(OptimizationStrategy):
+
+    def check(self, files_changed, patterns):
+        for pattern in patterns:
+            for path in files_changed:
+                if match_path(path, pattern):
+                    return True
+        return False
+
     def should_remove_task(self, task, params, file_patterns):
         # pushlog_id == -1 - this is the case when run from a cron.yml job or on a git repository
         if params.get("repository_type") == "hg" and params.get("pushlog_id") == -1:
             return False
 
-        changed = files_changed.check(params, file_patterns)
+        changed = self.check(params["files_changed"], file_patterns)
         if not changed:
             logger.debug(
                 f'no files found matching a pattern in `skip-unless-changed` for "{task.label}"'

{taskcluster-taskgraph-7.4.0 → taskcluster-taskgraph-8.0.0}/src/taskgraph/parameters.py

@@ -40,6 +40,7 @@ base_schema = Schema(
         Required("do_not_optimize"): [str],
         Required("enable_always_target"): Any(bool, [str]),
         Required("existing_tasks"): {str: str},
+        Required("files_changed"): [str],
         Required("filters"): [str],
         Required("head_ref"): str,
         Required("head_repository"): str,
@@ -86,6 +87,7 @@ def _get_defaults(repo_root=None):
         # Use fake values if no repo is detected.
         repo = Mock(branch="", head_rev="", tool="git")
         repo.get_url.return_value = ""
+        repo.get_changed_files.return_value = []
 
     try:
         repo_url = repo.get_url()
@@ -108,6 +110,7 @@ def _get_defaults(repo_root=None):
         "do_not_optimize": [],
         "enable_always_target": True,
         "existing_tasks": {},
+        "files_changed": repo.get_changed_files("AM"),
         "filters": ["target_tasks_method"],
         "head_ref": repo.branch or repo.head_rev,
         "head_repository": repo_url,

{taskcluster-taskgraph-7.4.0 → taskcluster-taskgraph-8.0.0}/src/taskgraph/transforms/from_deps.py

@@ -20,6 +20,7 @@ from taskgraph.transforms.run import fetches_schema
 from taskgraph.util.attributes import attrmatch
 from taskgraph.util.dependencies import GROUP_BY_MAP, get_dependencies
 from taskgraph.util.schema import Schema, validate_schema
+from taskgraph.util.set_name import SET_NAME_MAP
 
 FROM_DEPS_SCHEMA = Schema(
     {
@@ -41,12 +42,14 @@ FROM_DEPS_SCHEMA = Schema(
                 "set-name",
                 description=dedent(
                     """
-                When True, `from_deps` will derive a name for the generated
-                tasks from the name of the primary dependency. Defaults to
-                True.
+                UPDATE ME AND DOCS
                 """.lstrip()
                 ),
-            ): bool,
+            ): Any(
+                None,
+                *SET_NAME_MAP,
+                {Any(*SET_NAME_MAP): object},
+            ),
             Optional(
                 "with-attributes",
                 description=dedent(
@@ -170,7 +173,7 @@ def from_deps(config, tasks):
             groups = func(config, deps)
 
         # Split the task, one per group.
-        set_name = from_deps.get("set-name", True)
+        set_name = from_deps.get("set-name", "strip-kind")
         copy_attributes = from_deps.get("copy-attributes", False)
         unique_kinds = from_deps.get("unique-kinds", True)
         fetches = from_deps.get("fetches", [])
@@ -203,10 +206,8 @@ def from_deps(config, tasks):
             primary_dep = [dep for dep in group if dep.kind == primary_kind][0]
 
             if set_name:
-                if primary_dep.label.startswith(primary_kind):
-                    new_task["name"] = primary_dep.label[len(primary_kind) + 1 :]
-                else:
-                    new_task["name"] = primary_dep.label
+                func = SET_NAME_MAP[set_name]
+                new_task["name"] = func(config, deps, primary_dep, primary_kind)
 
             if copy_attributes:
                 attrs = new_task.setdefault("attributes", {})

{taskcluster-taskgraph-7.4.0 → taskcluster-taskgraph-8.0.0}/src/taskgraph/util/cached_tasks.py

@@ -7,9 +7,7 @@ import hashlib
 import time
 
 TARGET_CACHE_INDEX = "{cache_prefix}.cache.level-{level}.{type}.{name}.hash.{digest}"
-TARGET_PR_CACHE_INDEX = (
-    "{cache_prefix}.cache.head.{head_ref}.{type}.{name}.hash.{digest}"
-)
+TARGET_PR_CACHE_INDEX = "{cache_prefix}.cache.pr.{type}.{name}.hash.{digest}"
 EXTRA_CACHE_INDEXES = [
     "{cache_prefix}.cache.level-{level}.{type}.{name}.latest",
     "{cache_prefix}.cache.level-{level}.{type}.{name}.pushdate.{build_date_long}",

{taskcluster-taskgraph-7.4.0 → taskcluster-taskgraph-8.0.0}/src/taskgraph/util/parameterization.py

@@ -83,10 +83,11 @@ def resolve_task_references(label, task_def, task_id, decision_task_id, dependen
                         f"task '{label}' has no dependency named '{dependency}'"
                     )
 
-            assert artifact_name.startswith(
-                "public/"
-            ), f"artifact-reference only supports public artifacts, not `{artifact_name}`"
-            return get_artifact_url(task_id, artifact_name)
+            use_proxy = False
+            if not artifact_name.startswith("public/"):
+                use_proxy = True
+
+            return get_artifact_url(task_id, artifact_name, use_proxy=use_proxy)
 
         return ARTIFACT_REFERENCE_PATTERN.sub(repl, val)
 

taskcluster-taskgraph-8.0.0/src/taskgraph/util/set_name.py

@@ -0,0 +1,34 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# Define a collection of set_name functions
+# Note: this is stored here instead of where it is used in the `from_deps`
+# transform to give consumers a chance to register their own `set_name`
+# handlers before the `from_deps` schema is created.
+SET_NAME_MAP = {}
+
+
+def set_name(name, schema=None):
+    def wrapper(func):
+        assert (
+            name not in SET_NAME_MAP
+        ), f"duplicate set_name function name {name} ({func} and {SET_NAME_MAP[name]})"
+        SET_NAME_MAP[name] = func
+        func.schema = schema
+        return func
+
+    return wrapper
+
+
+@set_name("strip-kind")
+def set_name_strip_kind(config, tasks, primary_dep, primary_kind):
+    if primary_dep.label.startswith(primary_kind):
+        return primary_dep.label[len(primary_kind) + 1 :]
+    else:
+        return primary_dep.label
+
+
+@set_name("retain-kind")
+def set_name_retain_kind(config, tasks, primary_dep, primary_kind):
+    return primary_dep.label

{taskcluster-taskgraph-7.4.0 → taskcluster-taskgraph-8.0.0}/src/taskgraph/util/taskcluster.py

@@ -140,22 +140,9 @@ def _handle_artifact(path, response):
 
 def get_artifact_url(task_id, path, use_proxy=False):
     artifact_tmpl = liburls.api(
-        get_root_url(False), "queue", "v1", "task/{}/artifacts/{}"
+        get_root_url(use_proxy), "queue", "v1", "task/{}/artifacts/{}"
     )
-    data = artifact_tmpl.format(task_id, path)
-    if use_proxy:
-        # Until Bug 1405889 is deployed, we can't download directly
-        # from the taskcluster-proxy.  Work around by using the /bewit
-        # endpoint instead.
-        # The bewit URL is the body of a 303 redirect, which we don't
-        # want to follow (which fetches a potentially large resource).
-        response = _do_request(
-            os.environ["TASKCLUSTER_PROXY_URL"] + "/bewit",
-            data=data,
-            allow_redirects=False,
-        )
-        return response.text
-    return data
+    return artifact_tmpl.format(task_id, path)
 
 
 def get_artifact(task_id, path, use_proxy=False):

{taskcluster-taskgraph-7.4.0 → taskcluster-taskgraph-8.0.0}/test/test_main.py

@@ -2,6 +2,7 @@
 # http://creativecommons.org/publicdomain/zero/1.0/
 
 import os
+import sys
 from pathlib import Path
 from textwrap import dedent
 
@@ -48,7 +49,7 @@ def run_taskgraph(maketgg, monkeypatch):
         ("morphed", ["_fake-t-0", "_fake-t-1"]),
     ),
 )
-def test_show_taskgraph(run_taskgraph, capsys, attr, expected):
+def test_show_taskgraph_attr(run_taskgraph, capsys, attr, expected):
     res = run_taskgraph([attr])
     assert res == 0
 
@@ -72,6 +73,34 @@ def test_show_taskgraph_parallel(run_taskgraph):
     assert res == 1
 
 
+def test_show_taskgraph_force_local_files_changed(mocker, run_taskgraph):
+    repo = mocker.MagicMock()
+    repo.get_changed_files.return_value = ["foo.txt"]
+
+    m = mocker.MagicMock()
+    m.get_repository.return_value = repo
+    mocker.patch.dict(sys.modules, {"taskgraph.util.vcs": m})
+
+    res = run_taskgraph(["full"])
+    assert res == 0
+    assert not repo.get_changed_files.called
+
+    res = run_taskgraph(["full", "--force-local-files-changed"])
+    assert res == 0
+    assert not repo.get_changed_files.called
+
+    res = run_taskgraph(
+        [
+            "full",
+            "--force-local-files-changed",
+            "-p",
+            "taskcluster/test/params/mc-onpush.yml",
+        ]
+    )
+    assert res == 0
+    assert repo.get_changed_files.call_count == 1
+
+
 def test_tasks_regex(run_taskgraph, capsys):
     run_taskgraph(["full", "--tasks=_.*-t-1"])
     out, _ = capsys.readouterr()

{taskcluster-taskgraph-7.4.0 → taskcluster-taskgraph-8.0.0}/test/test_optimize_strategies.py

@@ -3,11 +3,12 @@
 
 import os
 from datetime import datetime
+from test.fixtures.gen import make_task
 from time import mktime
 
 import pytest
 
-from taskgraph.optimize.strategies import IndexSearch
+from taskgraph.optimize.strategies import IndexSearch, SkipUnlessChanged
 
 
 @pytest.fixture
@@ -68,3 +69,34 @@ def test_index_search(responses, params, state, expires, expected):
     opt = IndexSearch()
     deadline = "2021-06-07T19:03:20.482Z"
     assert opt.should_replace_task({}, params, deadline, (index_path,)) == expected
+
+
+@pytest.mark.parametrize(
+    "params,file_patterns,should_optimize",
+    (
+        pytest.param({"files_changed": []}, ["foo.txt"], True, id="no files changed"),
+        pytest.param(
+            {"files_changed": ["foo.txt"]}, ["foo.txt"], False, id="files match"
+        ),
+        pytest.param(
+            {"files_changed": ["foo.txt"]},
+            ["bar.tx", "foo.txt"],
+            False,
+            id="files match multiple",
+        ),
+        pytest.param(
+            {"files_changed": ["bar.txt"]}, ["foo.txt"], True, id="files don't match"
+        ),
+        pytest.param(
+            {"repository_type": "hg", "pushlog_id": -1, "files_changed": ["bar.txt"]},
+            ["foo.txt"],
+            False,
+            id="cron task",
+        ),
+    ),
+)
+def test_skip_unless_changed(params, file_patterns, should_optimize):
+    task = make_task("task")
+
+    opt = SkipUnlessChanged()
+    assert opt.should_remove_task(task, params, file_patterns) == should_optimize

{taskcluster-taskgraph-7.4.0 → taskcluster-taskgraph-8.0.0}/test/test_parameters.py

@@ -37,6 +37,7 @@ class TestParameters(TestCase):
         "do_not_optimize": [],
         "enable_always_target": True,
         "existing_tasks": {},
+        "files_changed": [],
         "filters": ["target_tasks_method"],
         "head_ref": "ref",
         "head_repository": "repository",
@@ -298,6 +299,7 @@ def test_extend_parameters_schema(monkeypatch):
                 "do_not_optimize": [],
                 "enable_always_target": True,
                 "existing_tasks": {},
+                "files_changed": ["foo.txt"],
                 "filters": ["target_tasks_method"],
                 "head_ref": "some-branch",
                 "head_repository": "https://some.url",
@@ -332,6 +334,7 @@ def test_extend_parameters_schema(monkeypatch):
                 "do_not_optimize": [],
                 "enable_always_target": True,
                 "existing_tasks": {},
+                "files_changed": ["foo.txt"],
                 "filters": ["target_tasks_method"],
                 "head_ref": "some-branch",
                 "head_repository": "https://some.url",
@@ -366,6 +369,7 @@ def test_extend_parameters_schema(monkeypatch):
                 "do_not_optimize": [],
                 "enable_always_target": True,
                 "existing_tasks": {},
+                "files_changed": ["foo.txt"],
                 "filters": ["target_tasks_method"],
                 "head_ref": "some-branch",
                 "head_repository": "",
@@ -400,6 +404,7 @@ def test_extend_parameters_schema(monkeypatch):
                 "do_not_optimize": [],
                 "enable_always_target": True,
                 "existing_tasks": {},
+                "files_changed": [],
                 "filters": ["target_tasks_method"],
                 "head_ref": "",
                 "head_repository": "",
@@ -434,6 +439,7 @@ def test_get_defaults(
                 tool="git",
             )
             repo_mock.get_url.return_value = "https://some.url"
+            repo_mock.get_changed_files.return_value = ["foo.txt"]
             return repo_mock
 
         raise RuntimeError

{taskcluster-taskgraph-7.4.0 → taskcluster-taskgraph-8.0.0}/test/test_transforms_from_deps.py

@@ -92,6 +92,20 @@ def assert_dont_set_name(tasks):
     assert tasks[0]["name"] == "a-special-name"
 
 
+def assert_set_name_strip_kind(tasks):
+    handle_exception(tasks)
+    assert len(tasks) == 2
+    assert tasks[0]["name"] == "a"
+    assert tasks[1]["name"] == "b"
+
+
+def assert_set_name_retain_kind(tasks):
+    handle_exception(tasks)
+    assert len(tasks) == 2
+    assert tasks[0]["name"] == "a"
+    assert tasks[1]["name"] == "bar-b"
+
+
 def assert_group_by_all_with_fetch(tasks):
     handle_exception(tasks)
     assert len(tasks) == 1
@@ -165,7 +179,7 @@ def assert_group_by_all_with_fetch(tasks):
                 "name": "a-special-name",
                 "from-deps": {
                     "group-by": "all",
-                    "set-name": False,
+                    "set-name": None,
                 },
             },
             # kind config
@@ -174,6 +188,32 @@ def assert_group_by_all_with_fetch(tasks):
             None,
             id="dont_set_name",
         ),
+        pytest.param(
+            # task
+            {
+                "from-deps": {
+                    "set-name": "strip-kind",
+                },
+            },
+            # kind config
+            None,
+            # deps
+            None,
+            id="set_name_strip_kind",
+        ),
+        pytest.param(
+            # task
+            {
+                "from-deps": {
+                    "set-name": "retain-kind",
+                },
+            },
+            # kind config
+            None,
+            # deps
+            None,
+            id="set_name_retain_kind",
+        ),
         pytest.param(
             # task
             {"from-deps": {}},

{taskcluster-taskgraph-7.4.0 → taskcluster-taskgraph-8.0.0}/test/test_util_cached_tasks.py

@@ -84,12 +84,10 @@ def assert_pull_request(task):
                 "test-domain.cache.level-3.cache-type.cache-name.hash.abc",
                 "test-domain.cache.level-2.cache-type.cache-name.hash.abc",
                 "test-domain.cache.level-1.cache-type.cache-name.hash.abc",
-                "test-domain.cache.head.default.cache-type.cache-name.hash.abc",
+                "test-domain.cache.pr.cache-type.cache-name.hash.abc",
             ]
         },
-        "routes": [
-            "index.test-domain.cache.head.default.cache-type.cache-name.hash.abc"
-        ],
+        "routes": ["index.test-domain.cache.pr.cache-type.cache-name.hash.abc"],
     }
 
 

{taskcluster-taskgraph-7.4.0 → taskcluster-taskgraph-8.0.0}/test/test_util_parameterization.py

@@ -205,6 +205,17 @@ def test_artifact_refs_in_string(assert_artifact_refs):
     )
 
 
+def test_artifact_refs_private(monkeypatch, assert_artifact_refs):
+    "resolve_task_references resolves private artifact references"
+    tc_proxy_url = "https://taskcluster-proxy.net"
+    monkeypatch.setenv("TASKCLUSTER_PROXY_URL", tc_proxy_url)
+
+    assert_artifact_refs(
+        {"artifact-reference": "<edge1/private/foo>"},
+        f"{tc_proxy_url}/api/queue/v1/task/tid1/artifacts/private/foo",
+    )
+
+
 def test_artifact_refs_self():
     "resolve_task_references raises keyerror on artifact references to `self`"
     with pytest.raises(KeyError):

{taskcluster-taskgraph-7.4.0 → taskcluster-taskgraph-8.0.0}/test/test_util_taskcluster.py

@@ -106,6 +106,30 @@ def test_do_request(responses):
         tc._do_request("https://example.org")
 
 
+@pytest.mark.parametrize(
+    "use_proxy,expected",
+    (
+        pytest.param(
+            False,
+            "https://tc.example.com/api/queue/v1/task/abc/artifacts/public/log.txt",
+            id="use_proxy=False",
+        ),
+        pytest.param(
+            True,
+            "https://taskcluster-proxy.net/api/queue/v1/task/abc/artifacts/public/log.txt",
+            id="use_proxy=True",
+        ),
+    ),
+)
+def test_get_artifact_url(monkeypatch, use_proxy, expected):
+    if use_proxy:
+        monkeypatch.setenv("TASKCLUSTER_PROXY_URL", "https://taskcluster-proxy.net")
+
+    task_id = "abc"
+    path = "public/log.txt"
+    assert tc.get_artifact_url(task_id, path, use_proxy) == expected
+
+
 def test_get_artifact(responses, root_url):
     tid = 123
     responses.add(