From c86b07296adf02684700ce33fcd126fc45b09ac0 Mon Sep 17 00:00:00 2001
From: tellierd <david.tellier@gmail.com>
Date: Thu, 23 Jun 2022 11:43:03 -0400
Subject: [PATCH 1/2] Add tool name for Jira description

---
 ghlib.py   |  3 +++
 jiralib.py | 12 ++++++++++--
 sync.py    |  1 +
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/ghlib.py b/ghlib.py
index 2133fa2..b9a1ccc 100644
--- a/ghlib.py
+++ b/ghlib.py
@@ -296,6 +296,9 @@ def long_desc(self):
     def short_desc(self):
         return self.json["rule"]["id"]
 
+    def tool_name(self):
+        return self.json["tool"]["name"]
+
     def get_key(self):
         return util.make_key(self.github_repo.repo_id + "/" + str(self.number()))
 
diff --git a/jiralib.py b/jiralib.py
index 589a156..37fa57b 100644
--- a/jiralib.py
+++ b/jiralib.py
@@ -29,6 +29,7 @@
 ALERT_NUMBER={alert_num}
 REPOSITORY_KEY={repo_key}
 ALERT_KEY={alert_key}
+TOOL_NAME={tool_name}
 """
 
 
@@ -175,6 +176,7 @@ def create_issue(
         alert_num,
         repo_key,
         alert_key,
+        tool_name,
     ):
         raw = self.j.create_issue(
             project=self.projectkey,
@@ -189,6 +191,7 @@ def create_issue(
                 alert_num=alert_num,
                 repo_key=repo_key,
                 alert_key=alert_key,
+                tool_name=tool_name,
             ),
             issuetype={"name": "Bug"},
             labels=self.labels,
@@ -204,6 +207,7 @@ def create_issue(
                 alert_type=alert_type,
                 alert_num=alert_num,
                 repo_id=repo_id,
+                tool_name=tool_name
             )
         )
 
@@ -314,7 +318,7 @@ def parse_alert_info(desc):
     them as a tuple. If parsing fails for one of the fields,
     return a tuple of None's.
     """
-    failed = None, None, None, None
+    failed = None, None, None, None, None
     m = re.search("REPOSITORY_NAME=(.*)$", desc, re.MULTILINE)
     if m is None:
         return failed
@@ -338,8 +342,12 @@ def parse_alert_info(desc):
     if m is None:
         return failed
     alert_key = m.group(1)
+    if m is None:
+        return failed
+    tool_name = m.group(1)
+    m = re.search("TOOL_NAME=(.*)$", desc, re.MULTILINE)
 
-    return repo_id, alert_num, repo_key, alert_key, alert_type
+    return repo_id, alert_num, repo_key, alert_key, alert_type, tool_name
 
 
 def repo_id_to_fname(repo_id):
diff --git a/sync.py b/sync.py
index 65cc172..249f6f1 100644
--- a/sync.py
+++ b/sync.py
@@ -63,6 +63,7 @@ def sync(self, alert, issues, in_direction):
                 alert.number(),
                 alert.github_repo.get_key(),
                 alert.get_key(),
+                alert.tool_name(),
             )
             newissue.adjust_state(alert.get_state())
             return alert.get_state()

From 42a8080cfcb68a2f2f9f2f76959c41c646b7b990 Mon Sep 17 00:00:00 2001
From: tellierd <david.tellier@gmail.com>
Date: Thu, 23 Jun 2022 15:52:54 -0400
Subject: [PATCH 2/2] fix tuple issue "too many values to unpack"

---
 jiralib.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/jiralib.py b/jiralib.py
index 37fa57b..667f855 100644
--- a/jiralib.py
+++ b/jiralib.py
@@ -176,7 +176,7 @@ def create_issue(
         alert_num,
         repo_key,
         alert_key,
-        tool_name,
+        tool_name
     ):
         raw = self.j.create_issue(
             project=self.projectkey,
@@ -339,13 +339,14 @@ def parse_alert_info(desc):
         return failed
     repo_key = m.group(1)
     m = re.search("ALERT_KEY=(.*)$", desc, re.MULTILINE)
-    if m is None:
-        return failed
-    alert_key = m.group(1)
     if m is None:
         return failed
     tool_name = m.group(1)
     m = re.search("TOOL_NAME=(.*)$", desc, re.MULTILINE)
+    if m is None:
+        return failed
+    alert_key = m.group(1)
+
 
     return repo_id, alert_num, repo_key, alert_key, alert_type, tool_name