From e3707bed7af758494086aae3a1dbb1d9b86c2224 Mon Sep 17 00:00:00 2001 From: Mike McLean Date: Mon, 24 Jun 2024 11:13:49 -0400 Subject: [PATCH] use requests in sidetag plugin --- plugins/hub/sidetag_hub.py | 12 +++++++----- tests/test_plugins/test_sidetag_hub.py | 4 ++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/plugins/hub/sidetag_hub.py b/plugins/hub/sidetag_hub.py index 3cd76ce1..4f7862df 100644 --- a/plugins/hub/sidetag_hub.py +++ b/plugins/hub/sidetag_hub.py @@ -23,6 +23,7 @@ from kojihub import ( readInheritanceData, ) from kojihub.db import QueryProcessor, nextval +from kojihub.repos import request_repo CONFIG_FILE = "/etc/koji-hub/plugins/sidetag.conf" CONFIG = None @@ -156,13 +157,14 @@ def createSideTag(basetag, debuginfo=False, suffix=None): _create_build_target(sidetag_name, sidetag_id, sidetag_id) if TRIGGER_NEW_REPO: - # little higher priority than other newRepo tasks - args = koji.encode_args(sidetag_name, debuginfo=debuginfo) - task_id = make_task('newRepo', args, priority=14, channel='createrepo') + check = request_repo(sidetag_id) + request = check['request'] else: - task_id = None + request = None + # in our case, the request will not have a task yet + task_id = None - return {"name": sidetag_name, "id": sidetag_id, 'task_id': task_id} + return {"name": sidetag_name, "id": sidetag_id, 'task_id': task_id, 'request': request} @export diff --git a/tests/test_plugins/test_sidetag_hub.py b/tests/test_plugins/test_sidetag_hub.py index 8ef301d3..255c9437 100644 --- a/tests/test_plugins/test_sidetag_hub.py +++ b/tests/test_plugins/test_sidetag_hub.py @@ -51,7 +51,7 @@ class TestCreateSideTagHub(unittest.TestCase): self._create_tag.return_value = 12346 ret = sidetag_hub.createSideTag('base_tag') - self.assertEqual(ret, {'name': sidetag_name, 'id': 12346, 'task_id': None}) + self.assertEqual(ret, {'name': sidetag_name, 'id': 12346, 'task_id': None, 'request': None}) self.get_user.assert_called_once_with(23, strict=True) self.get_tag.assert_called_once_with(self.basetag['name'], strict=True) @@ -83,7 +83,7 @@ class TestCreateSideTagHub(unittest.TestCase): sidetag_hub.NAME_TEMPLATE = '{basetag}-sidetag-{tag_id}' ret = sidetag_hub.createSideTag('base_tag', debuginfo=True, suffix='suffix') - self.assertEqual(ret, {'name': sidetag_name, 'id': 12346, 'task_id': None}) + self.assertEqual(ret, {'name': sidetag_name, 'id': 12346, 'task_id': None, 'request': None}) def test_createsidetag_template_forbidden_suffix(self): sidetag_hub.ALLOWED_SUFFIXES = ['suffix', 'another']