From 5ee9c7396a654389f7214fcbe36f585f0ff96d19 Mon Sep 17 00:00:00 2001
From: Mike McLean <mikem@redhat.com>
Date: Dec 21 2021 13:46:15 +0000
Subject: use name_or_id_clause in get_tag


---

diff --git a/hub/kojihub.py b/hub/kojihub.py
index 10dc1b7..237a923 100644
--- a/hub/kojihub.py
+++ b/hub/kojihub.py
@@ -3465,21 +3465,15 @@ def get_tag(tagInfo, strict=False, event=None, blocked=False):
               'tag_config.maven_support': 'maven_support',
               'tag_config.maven_include_all': 'maven_include_all',
               }
-    data = {'tagInfo': tagInfo}
 
-    clauses = []
-    if isinstance(tagInfo, int):
-        clauses.append("tag.id = %(tagInfo)i")
-    elif isinstance(tagInfo, str):
-        clauses.append("tag.name = %(tagInfo)s")
-    else:
-        raise koji.GenericError('Invalid type for tagInfo: %s' % type(tagInfo))
+    clause, values = name_or_id_clause(tagInfo, table='tag')
+    clauses = [clause]
     if event == "auto":
         # find active event or latest create_event
         opts = {'order': '-create_event', 'limit': 1}
         query = QueryProcessor(tables=['tag_config'], columns=['create_event', 'revoke_event'],
                                joins=['tag on tag.id = tag_config.tag_id'],
-                               clauses=clauses, values=data, opts=opts)
+                               clauses=clauses, values=values, opts=opts)
         try:
             event = query.executeOne(strict=True)['revoke_event']
         except koji.GenericError:
@@ -3496,7 +3490,7 @@ def get_tag(tagInfo, strict=False, event=None, blocked=False):
 
     fields, aliases = zip(*fields.items())
     query = QueryProcessor(columns=fields, aliases=aliases, tables=tables,
-                           joins=joins, clauses=clauses, values=data)
+                           joins=joins, clauses=clauses, values=values)
     result = query.executeOne()
     if not result:
         if strict:
diff --git a/tests/test_hub/test_tag_operations.py b/tests/test_hub/test_tag_operations.py
index 7019e71..d15de00 100644
--- a/tests/test_hub/test_tag_operations.py
+++ b/tests/test_hub/test_tag_operations.py
@@ -257,7 +257,7 @@ class TestGetTag(unittest.TestCase):
         taginfo = {'test-tag': 'value'}
         with self.assertRaises(koji.GenericError) as ex:
             kojihub.get_tag(taginfo, strict=True)
-        self.assertEqual("Invalid type for tagInfo: %s" % type(taginfo), str(ex.exception))
+        self.assertEqual("Invalid name or id value: %s" % taginfo, str(ex.exception))
 
     def test_get_tag_non_exist_tag(self):
         taginfo = 'test-tag'