scriptworker 63.6.1__tar.gz → 63.7.1__tar.gz

{scriptworker-63.6.1 → scriptworker-63.7.1}/HISTORY.rst

@@ -4,6 +4,22 @@ Change Log
 All notable changes to this project will be documented in this file.
 This project adheres to `Semantic Versioning <http://semver.org/>`__.
 
+63.7.1 - 2026-10-27
+-------------------
+
+Fixed
+~~~~~
+
+- CoT verification crash due to long github CSP response header (bug 2085468)
+
+63.7.0 - 2026-10-13
+-------------------
+
+Added
+~~~~~
+
+- take a git project's scm level from the task branch (#839)
+
 63.6.1 - 2026-10-08
 -------------------
 

{scriptworker-63.6.1 → scriptworker-63.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: scriptworker
-Version: 63.6.1
+Version: 63.7.1
 Summary: Taskcluster scriptworker
 Author-email: Mozilla Release Engineering <releng@mozilla.com>
 License-File: LICENSE

{scriptworker-63.6.1 → scriptworker-63.7.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "scriptworker"
-version = "63.6.1"
+version = "63.7.1"
 description = "Taskcluster scriptworker"
 authors = [
     { name = "Mozilla Release Engineering", email = "releng@mozilla.com" },

{scriptworker-63.6.1 → scriptworker-63.7.1}/src/scriptworker/cot/verify.py

@@ -1031,7 +1031,16 @@ async def get_pushlog_info(decision_link):
 
 
 # get_scm_level {{{1
-async def get_scm_level(context, project):
+def _branch_matches(pattern, branch):
+    """Whether ``branch`` matches a ``projects.yml`` branch name, which may end in ``*``."""
+    if pattern == "*":
+        return True
+    if pattern.endswith("*"):
+        return branch.startswith(pattern[:-1])
+    return branch == pattern
+
+
+async def get_scm_level(context, project, branch=None):
     """Get the scm level for a project from ``projects.yml``.
 
     We define all known projects in ``projects.yml``. Let's make sure we have
@@ -1043,6 +1052,8 @@ async def get_scm_level(context, project):
     Args:
         context (scriptworker.context.Context): the scriptworker context
         project (str): the project to get the scm level for.
+        branch (str, optional): the branch the task runs on. Required for git
+            projects, where each branch has its own level. Ignored for hg.
 
     Returns:
         str: the level of the project, as a string.
@@ -1053,14 +1064,16 @@ async def get_scm_level(context, project):
     if config["repo_type"] == "hg":
         return config["access"].replace("scm_level_", "")
     elif config["repo_type"] == "git":
-        # TODO: we should be using the branch that the task is actually
-        # being run on
-        default_branch = config.get("default_branch", "main")
-        for branch in config["branches"]:
-            if branch["name"] == default_branch:
-                return str(branch["level"])
+        if branch is None:
+            raise ValueError("{} is a git project, so a branch is required to find its level".format(project))
+        if branch.startswith("refs/heads/"):
+            branch = branch[len("refs/heads/") :]
+        # the first matching entry wins, like fxci-config's Project.get_branch()
+        for branch_config in config["branches"]:
+            if _branch_matches(branch_config["name"], branch):
+                return str(branch_config["level"])
 
-    raise ValueError("Can't find level for project {}".format(project))
+    raise ValueError("Can't find level for project {} on branch {}".format(project, branch))
 
 
 async def _get_additional_hg_action_jsone_context(parent_link, decision_link):
@@ -1190,7 +1203,7 @@ async def _get_additional_git_cron_jsone_context(decision_link):
             "sender": {"login": user},
         },
         # Taskgraph cron contexts mirror hg-push contexts
-        "repository": {"url": repo, "project": repo_name, "level": await get_scm_level(decision_link.context, repo_name), "type": "git"},
+        "repository": {"url": repo, "project": repo_name, "level": await get_scm_level(decision_link.context, repo_name, branch), "type": "git"},
         "push": {"revision": revision, "branch": branch},
     }
 

{scriptworker-63.6.1 → scriptworker-63.7.1}/src/scriptworker/utils.py

@@ -44,6 +44,8 @@ log = logging.getLogger(__name__)
 def scriptworker_session(*args, **kwargs):
     """Return an ``aiohttp.ClientSession`` with the scriptworker User-Agent header set."""
     kwargs.setdefault("headers", {}).setdefault("User-Agent", f"scriptworker {scriptworker.__version__}")
+    kwargs.setdefault("max_line_size", 8190 * 2)
+    kwargs.setdefault("max_field_size", 8190 * 2)
     return aiohttp.ClientSession(*args, **kwargs)