scriptworker 60.1.0__tar.gz → 60.2.0__tar.gz

{scriptworker-60.1.0 → scriptworker-60.2.0}/HISTORY.rst

@@ -4,6 +4,18 @@ Change Log
 All notable changes to this project will be documented in this file.
 This project adheres to `Semantic Versioning <http://semver.org/>`__.
 
+60.2.0 - 2024-07-12
+-------------------
+
+Added
+~~~~~
+- Set User-Agent in http requests (#661)
+- Support github-pull-request-untrusted in CoT verification (https://bugzilla.mozilla.org/show_bug.cgi?id=1906748)
+
+Fixed
+~~~~~
+- Pull project from the default branch in projects.yml (#665)
+
 60.1.0 - 2024-06-24
 -------------------
 

{scriptworker-60.1.0 → scriptworker-60.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: scriptworker
-Version: 60.1.0
+Version: 60.2.0
 Summary: TaskCluster Script Worker
 Home-page: https://github.com/mozilla-releng/scriptworker
 Author: Mozilla Release Engineering

{scriptworker-60.1.0 → scriptworker-60.2.0}/src/scriptworker/client.py

@@ -17,13 +17,12 @@ from asyncio import AbstractEventLoop
 from typing import Any, Awaitable, Callable, Dict, List, Match, NoReturn, Optional, Tuple
 from urllib.parse import unquote
 
-import aiohttp
 import jsonschema
 
 from scriptworker.constants import STATUSES
 from scriptworker.context import Context
 from scriptworker.exceptions import ScriptWorkerException, ScriptWorkerTaskException, TaskVerificationError
-from scriptworker.utils import load_json_or_yaml, match_url_regex
+from scriptworker.utils import load_json_or_yaml, match_url_regex, scriptworker_session
 
 log = logging.getLogger(__name__)
 
@@ -199,7 +198,7 @@ def _init_logging(context: Any) -> None:
 
 
 async def _handle_asyncio_loop(async_main: Callable[[Any], Awaitable[None]], context: Any) -> None:
-    async with aiohttp.ClientSession() as session:
+    async with scriptworker_session() as session:
         context.session = session
         try:
             await async_main(context)

{scriptworker-60.1.0 → scriptworker-60.2.0}/src/scriptworker/constants.py

@@ -300,10 +300,8 @@ DEFAULT_CONFIG: immutabledict[str, Any] = immutabledict(
                     "mobile": (
                         "action",
                         "cron",
-                        # On staging releases, level 1 docker images may be built in the pull-request graph
                         "github-pull-request",
-                        # Similarly, docker images can be built on regular push. This is usually the case
-                        # for level 3 images
+                        "github-pull-request-untrusted",
                         "github-push",
                         "github-release",
                     ),
@@ -311,20 +309,14 @@ DEFAULT_CONFIG: immutabledict[str, Any] = immutabledict(
                     "app-services": (
                         "action",
                         "cron",
-                        # On staging releases, level 1 docker images may be built in the pull-request graph
                         "github-pull-request",
-                        # Similarly, docker images can be built on regular push. This is usually the case
-                        # for level 3 images
                         "github-push",
                         "github-release",
                     ),
                     "glean": (
                         "action",
                         "cron",
-                        # On staging releases, level 1 docker images may be built in the pull-request graph
                         "github-pull-request",
-                        # Similarly, docker images can be built on regular push. This is usually the case
-                        # for level 3 images
                         "github-push",
                         "github-release",
                     ),

{scriptworker-60.1.0 → scriptworker-60.2.0}/src/scriptworker/context.py

@@ -24,7 +24,7 @@ from taskcluster.aio import Queue
 
 from scriptworker import task_process
 from scriptworker.exceptions import CoTError
-from scriptworker.utils import load_json_or_yaml_from_url, makedirs
+from scriptworker.utils import load_json_or_yaml_from_url, makedirs, scriptworker_session
 
 log = logging.getLogger(__name__)
 
@@ -148,7 +148,7 @@ class Context(object):
         """
         assert self.config
         if credentials:
-            session = self.session or aiohttp.ClientSession(loop=self.event_loop)
+            session = self.session or scriptworker_session(loop=self.event_loop)
             return Queue(options={"credentials": credentials, "rootUrl": self.config["taskcluster_root_url"]}, session=session)
         return None
 

{scriptworker-60.1.0 → scriptworker-60.2.0}/src/scriptworker/cot/verify.py

@@ -78,6 +78,7 @@ from scriptworker.utils import (
     read_from_file,
     remove_empty_keys,
     rm,
+    scriptworker_session,
     write_to_file,
 )
 from scriptworker.version import __version_string__
@@ -1042,12 +1043,17 @@ async def get_scm_level(context, project):
     """
     await context.populate_projects()
     config = context.projects[project]
-    if "access" in config:
+    if config["repo_type"] == "hg":
         return config["access"].replace("scm_level_", "")
-    elif "level" in config:
-        return str(config["level"])
-    else:
-        raise ValueError("Can't find level for project {}".format(project))
+    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"])
+
+    raise ValueError("Can't find level for project {}".format(project))
 
 
 async def _get_additional_hg_action_jsone_context(parent_link, decision_link):
@@ -1345,7 +1351,7 @@ async def populate_jsone_context(chain, parent_link, decision_link, tasks_for):
             jsone_context.update(await _get_additional_git_cron_jsone_context(decision_link))
         elif tasks_for == "action":
             jsone_context.update(await _get_additional_git_action_jsone_context(decision_link, parent_link))
-        elif tasks_for == "github-pull-request":
+        elif tasks_for in ("github-pull-request", "github-pull-request-untrusted"):
             jsone_context.update(await _get_additional_github_pull_request_jsone_context(decision_link))
         elif tasks_for == "github-push":
             jsone_context.update(await _get_additional_github_push_jsone_context(decision_link))
@@ -2070,7 +2076,7 @@ async def verify_chain_of_trust(chain, *, check_task=False):
 
 # verify_cot_cmdln {{{1
 async def _async_verify_cot_cmdln(opts, tmp):
-    async with aiohttp.ClientSession() as session:
+    async with scriptworker_session() as session:
         context = Context()
         context.session = session
         context.config = dict(deepcopy(DEFAULT_CONFIG))
@@ -2146,7 +2152,7 @@ SCRIPTWORKER_GITHUB_OAUTH_TOKEN to an OAUTH token with read permissions to the r
 
 # create_test_workdir {{{1
 async def _async_create_test_workdir(task_id, path, queue=None):
-    async with aiohttp.ClientSession() as session:
+    async with scriptworker_session() as session:
         context = Context()
         context.session = session
         context.config = dict(deepcopy(DEFAULT_CONFIG))

{scriptworker-60.1.0 → scriptworker-60.2.0}/src/scriptworker/task.py

@@ -503,7 +503,7 @@ async def is_pull_request(context, task):
 
     This checks for the following things::
 
-        * ``task.extra.env.tasks_for`` == "github-pull-request"
+        * ``task.extra.env.tasks_for`` is "github-pull-request" or "github-pull-request-untrusted"
         * ``task.payload.env.MOBILE_HEAD_REPOSITORY`` doesn't come from an official repo
         * ``task.metadata.source`` doesn't come from an official repo, either
         * The last 2 items are landed on the official repo
@@ -525,7 +525,7 @@ async def is_pull_request(context, task):
     metadata_source_url = task["metadata"].get("source", "")
     repo_from_source_url, revision_from_source_url = extract_github_repo_and_revision_from_source_url(metadata_source_url)
 
-    conditions = [tasks_for == "github-pull-request"]
+    conditions = [tasks_for in ("github-pull-request", "github-pull-request-untrusted")]
     urls_revisions_and_can_skip = ((repo_url_from_payload, revision_from_payload, True), (repo_from_source_url, revision_from_source_url, False))
     for repo_url, revision, can_skip in urls_revisions_and_can_skip:
         # XXX In the case of scriptworker tasks, neither the repo nor the revision is defined

{scriptworker-60.1.0 → scriptworker-60.2.0}/src/scriptworker/utils.py

@@ -25,6 +25,7 @@ import async_timeout
 import yaml
 from taskcluster.client import createTemporaryCredentials
 
+import scriptworker.version
 from scriptworker.exceptions import Download404, DownloadError, ScriptWorkerException, ScriptWorkerRetryException, ScriptWorkerTaskException
 
 if TYPE_CHECKING:
@@ -37,6 +38,12 @@ else:
 log = logging.getLogger(__name__)
 
 
+# scriptworker_session {{{1
+def scriptworker_session(*args, **kwargs):
+    kwargs.setdefault("headers", {}).setdefault("User-Agent", f"scriptworker {scriptworker.version.__version_string__}")
+    return aiohttp.ClientSession(*args, **kwargs)
+
+
 # request {{{1
 async def request(context, url, timeout=60, method="get", good=(200,), retry=tuple(range(500, 512)), return_type="text", **kwargs):
     """Async aiohttp request wrapper.

{scriptworker-60.1.0 → scriptworker-60.2.0}/src/scriptworker/version.py

@@ -54,7 +54,7 @@ def get_version_string(version: Union[ShortVerType, LongVerType]) -> str:
 
 # 1}}}
 # Semantic versioning 2.0.0  http://semver.org/
-__version__ = (60, 1, 0)
+__version__ = (60, 2, 0)
 __version_string__ = get_version_string(__version__)
 
 

{scriptworker-60.1.0 → scriptworker-60.2.0}/src/scriptworker/worker.py

@@ -25,7 +25,7 @@ from scriptworker.cot.verify import ChainOfTrust, verify_chain_of_trust
 from scriptworker.exceptions import ScriptWorkerException, WorkerShutdownDuringTask
 from scriptworker.task import claim_work, complete_task, prepare_to_run_task, reclaim_task, run_task, worst_level
 from scriptworker.task_process import TaskProcess
-from scriptworker.utils import cleanup, filepaths_in_dir
+from scriptworker.utils import cleanup, filepaths_in_dir, scriptworker_session
 
 log = logging.getLogger(__name__)
 
@@ -210,7 +210,7 @@ async def async_main(context, credentials):
     Args:
         context (scriptworker.context.Context): the scriptworker context.
     """
-    async with aiohttp.ClientSession() as session:
+    async with scriptworker_session() as session:
         context.session = session
         context.credentials = credentials
         await run_tasks(context)

{scriptworker-60.1.0 → scriptworker-60.2.0}/src/scriptworker.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: scriptworker
-Version: 60.1.0
+Version: 60.2.0
 Summary: TaskCluster Script Worker
 Home-page: https://github.com/mozilla-releng/scriptworker
 Author: Mozilla Release Engineering

{scriptworker-60.1.0 → scriptworker-60.2.0}/version.json

@@ -1,8 +1,8 @@
 {
     "version":[
         60,
-        1,
+        2,
         0
     ],
-    "version_string":"60.1.0"
+    "version_string":"60.2.0"
 }