fixes

Author: Bala-Sakabattula

sync2jira/downstream_issue.py

@@ -1003,7 +1003,7 @@ def update_jira_issue(existing, issue, client, config, updates_key="issue_update
     log.info("Updating information for upstream %s: %s", updates_key, issue.url)
 
     # Get a list of what the user wants to update for the upstream issue
-    updates = issue.downstream.get("issue_updates", [])
+    updates = issue.downstream.get(updates_key, [])
 
     # Update relevant data if needed.
     # If the user has specified nothing, just return.
@@ -1062,8 +1062,8 @@ def update_jira_issue(existing, issue, client, config, updates_key="issue_update
         log.info("Looking for new transition(s)")
         _update_transition(client, existing, issue, updates_key)
 
-    # Only execute 'on_close' events for listings that opt-in
-    # and when the issue is closed.
+    # Execute 'on_close' events when the issue is closed
+    # (opt-in is checked inside _update_on_close).
     if issue.status == "Closed":
         log.info("Attempting to update downstream issue on upstream closed event")
         _update_on_close(existing, updates)
@@ -1417,7 +1417,7 @@ def _update_description(existing, issue, updates_key="issue_updates"):
     Helper function to sync description between upstream issue and downstream JIRA issue.
 
     :param jira.resource.Issue existing: Existing JIRA issue
-    :param issue: Upstream Issue or PR
+    :param sync2jira.intermediary.Issue or sync2jira.intermediary.PR issue: Upstream Issue or PR
     :param str updates_key: Config key for the updates list
     :returns: Nothing
     """

sync2jira/downstream_pr.py

@@ -280,13 +280,9 @@ def _create_jira_issue_from_pr(client, pr, config):
     """
 
     pr_content = pr.content or f"PR: {pr.url}"
-    if pr.downstream.get("issue_updates"):
-        if (
-            pr.source == "github"
-            and pr_content
-            and "github_markdown" in pr.downstream["issue_updates"]
-        ):
-            pr_content = d_issue.convert_content(pr_content)
+    pr_updates = pr.downstream.get(UPDATES_KEY, [])
+    if pr.source == "github" and pr_content and "github_markdown" in pr_updates:
+        pr_content = d_issue.convert_content(pr_content)
 
     # Convert PR to Issue-like object for creation
     # PR and Issue share similar structure, but we need to adapt it
@@ -297,8 +293,8 @@ def _create_jira_issue_from_pr(client, pr, config):
         upstream=pr.upstream,
         comments=pr.comments,
         config=config,
-        tags=[],  # PRs don't have tags in the same way
-        fixVersion=[],
+        tags=pr.tags,
+        fixVersion=pr.fixVersion,
         priority=pr.priority,
         content=pr_content,
         reporter=pr.reporter,

sync2jira/intermediary.py

@@ -147,6 +147,8 @@ def __init__(
         upstream,
         config,
         comments,
+        tags,
+        fixVersion,
         priority,
         content,
         reporter,
@@ -163,8 +165,8 @@ def __init__(
         self.url = url
         self.upstream = upstream
         self.comments = comments
-        # self.tags = tags
-        # self.fixVersion = fixVersion
+        self.tags = tags
+        self.fixVersion = fixVersion
         self.priority = priority
 
         # JIRA treats utf-8 characters in ways we don't totally understand, so scrub content down to
@@ -235,8 +237,8 @@ def from_github(cls, upstream, pr, suffix, config, action=None):
             upstream=upstream,
             config=config,
             comments=comments,
-            # tags=issue['labels'],
-            # fixVersion=[issue['milestone']],
+            tags=pr.get("labels", []),
+            fixVersion=[pr.get("milestone")],
             priority=None,
             content=pr.get("body"),
             reporter=pr["user"]["fullname"],

sync2jira/main.py

@@ -321,10 +321,8 @@ def handle_msg(body, suffix, config):
             if not (pr := handler(body, config, is_pr=True)):
                 log.info("Not handling PR issue update -- not configured")
                 return
-            # PRs require additional handling (Issues do not have suffix, and
-            # reporter needs to be reformatted).
+            # PRs require additional handling (Issues do not have suffix).
             pr.suffix = suffix
-            pr.reporter = pr.reporter.get("fullname")
             setattr(pr, "match", matcher(pr.content, pr.comments))
             d_pr.sync_with_jira(pr, config)
         else:

tests/test_downstream_issue.py

@@ -747,7 +747,7 @@ def test_assign_user_remove_all(self, mock_client):
         mock_client.search_users.assert_not_called()
 
     def common_test_create_jira_issue(
-        self, mock_attach_link, mock_client, mockupdate_jira_issue
+        self, mock_attach_link, mock_client, mock_update_jira_issue
     ):
         """Common code for testing _create_jira_issue"""
 
@@ -782,7 +782,7 @@ def common_test_create_jira_issue(
             self.mock_downstream,
             {"url": "mock_url", "title": "Upstream issue"},
         )
-        mockupdate_jira_issue.assert_called_with(
+        mock_update_jira_issue.assert_called_with(
             self.mock_downstream, self.mock_issue, mock_client, self.mock_config
         )
         self.mock_downstream.update.assert_any_call({"customfield_1": "DUMMY-1234"})
@@ -798,13 +798,13 @@ def common_test_create_jira_issue(
     @mock.patch(PATH + "attach_link")
     @mock.patch("jira.client.JIRA")
     def test_create_jira_issue(
-        self, mock_client, mock_attach_link, mockupdate_jira_issue
+        self, mock_client, mock_attach_link, mock_update_jira_issue
     ):
         """
         Tests '_create_jira_issue' function normal success case
         """
         self.common_test_create_jira_issue(
-            mock_attach_link, mock_client, mockupdate_jira_issue
+            mock_attach_link, mock_client, mock_update_jira_issue
         )
 
         mock_client.add_comment.assert_not_called()
@@ -813,7 +813,7 @@ def test_create_jira_issue(
     @mock.patch(PATH + "attach_link")
     @mock.patch("jira.client.JIRA")
     def test_create_jira_issue_failed_epic_link(
-        self, mock_client, mock_attach_link, mockupdate_jira_issue
+        self, mock_client, mock_attach_link, mock_update_jira_issue
     ):
         """
         Tests '_create_jira_issue' function when we fail while updating the epic link
@@ -822,7 +822,7 @@ def test_create_jira_issue_failed_epic_link(
         self.mock_downstream.update.side_effect = [JIRAError, "success", "success"]
 
         self.common_test_create_jira_issue(
-            mock_attach_link, mock_client, mockupdate_jira_issue
+            mock_attach_link, mock_client, mock_update_jira_issue
         )
 
         mock_client.add_comment.assert_called_with(
@@ -833,7 +833,7 @@ def test_create_jira_issue_failed_epic_link(
     @mock.patch(PATH + "attach_link")
     @mock.patch("jira.client.JIRA")
     def test_create_jira_issue_failed_exd_service(
-        self, mock_client, mock_attach_link, mockupdate_jira_issue
+        self, mock_client, mock_attach_link, mock_update_jira_issue
     ):
         """
         Tests '_create_jira_issue' function when we fail while updating the
@@ -843,7 +843,7 @@ def test_create_jira_issue_failed_exd_service(
         self.mock_downstream.update.side_effect = ["success", "success", JIRAError]
 
         self.common_test_create_jira_issue(
-            mock_attach_link, mock_client, mockupdate_jira_issue
+            mock_attach_link, mock_client, mock_update_jira_issue
         )
 
         mock_client.add_comment.assert_called_with(
@@ -862,7 +862,7 @@ def test_create_jira_issue_multiple_types(
         mock_client,
         mock_get_preferred_issue_types,
         mock_attach_link,
-        mockupdate_jira_issue,
+        mock_update_jira_issue,
     ):
         """
         Tests '_create_jira_issue' function when multiple possible issue types are found
@@ -872,7 +872,7 @@ def test_create_jira_issue_multiple_types(
         mock_get_preferred_issue_types.return_value = issue_types
 
         self.common_test_create_jira_issue(
-            mock_attach_link, mock_client, mockupdate_jira_issue
+            mock_attach_link, mock_client, mock_update_jira_issue
         )
 
         mock_client.add_comment.assert_called_with(
@@ -884,7 +884,7 @@ def test_create_jira_issue_multiple_types(
     @mock.patch(PATH + "attach_link")
     @mock.patch("jira.client.JIRA")
     def test_create_jira_issue_no_updates(
-        self, mock_client, mock_attach_link, mockupdate_jira_issue
+        self, mock_client, mock_attach_link, mock_update_jira_issue
     ):
         """
         Tests '_create_jira_issue' function where we have
@@ -918,7 +918,7 @@ def test_create_jira_issue_no_updates(
             self.mock_downstream,
             {"url": "mock_url", "title": "Upstream issue"},
         )
-        mockupdate_jira_issue.assert_called_with(
+        mock_update_jira_issue.assert_called_with(
             self.mock_downstream, self.mock_issue, mock_client, self.mock_config
         )
         self.assertEqual(response, self.mock_downstream)
@@ -1014,7 +1014,7 @@ def test_sync_with_jira_matching(
         mock_existing_jira_issue_legacy,
         mock_client,
         mock_create_jira_issue,
-        mockupdate_jira_issue,
+        mock_update_jira_issue,
         mock_existing_jira_issue,
         mock_get_jira_client,
     ):
@@ -1032,7 +1032,7 @@ def test_sync_with_jira_matching(
 
         # Assert all calls were made correctly
         mock_get_jira_client.assert_called_with(self.mock_issue, self.mock_config)
-        mockupdate_jira_issue.assert_called_with(
+        mock_update_jira_issue.assert_called_with(
             self.mock_downstream, self.mock_issue, mock_client, self.mock_config
         )
         mock_create_jira_issue.assert_not_called()
@@ -1051,7 +1051,7 @@ def test_sync_with_jira_down(
         mock_existing_jira_issue_legacy,
         mock_client,
         mock_create_jira_issue,
-        mockupdate_jira_issue,
+        mock_update_jira_issue,
         mock_existing_jira_issue,
         mock_get_jira_client,
     ):
@@ -1069,7 +1069,7 @@ def test_sync_with_jira_down(
 
         # Assert all calls were made correctly
         mock_get_jira_client.assert_called_with(self.mock_issue, self.mock_config)
-        mockupdate_jira_issue.assert_not_called()
+        mock_update_jira_issue.assert_not_called()
         mock_create_jira_issue.assert_not_called()
         mock_existing_jira_issue_legacy.assert_not_called()
 
@@ -1086,7 +1086,7 @@ def test_sync_with_jira_no_matching(
         mock_existing_jira_issue_legacy,
         mock_client,
         mock_create_jira_issue,
-        mockupdate_jira_issue,
+        mock_update_jira_issue,
         mock_existing_jira_issue,
         mock_get_jira_client,
     ):
@@ -1104,7 +1104,7 @@ def test_sync_with_jira_no_matching(
 
         # Assert all calls were made correctly
         mock_get_jira_client.assert_called_with(self.mock_issue, self.mock_config)
-        mockupdate_jira_issue.assert_not_called()
+        mock_update_jira_issue.assert_not_called()
         mock_create_jira_issue.assert_called_with(
             mock_client, self.mock_issue, self.mock_config
         )
@@ -1113,15 +1113,14 @@ def test_sync_with_jira_no_matching(
     @mock.patch(PATH + "convert_content")
     def test_maybe_convert_markdown(self, mock_convert):
         """maybe_convert_markdown: converts when opted-in, skips otherwise."""
-        mock_convert.return_value = "h1. Hello"
 
         # Converts when source=github, content non-empty, github_markdown in updates
+        mock_convert.return_value = "h1. Hello"
         issue = MagicMock()
         issue.downstream = {"issue_updates": ["description", "github_markdown"]}
         issue.source = "github"
         issue.content = "# Hello"
         d.maybe_convert_markdown(issue)
-        mock_convert.assert_called_once_with("# Hello")
         self.assertEqual(issue.content, "h1. Hello")
 
         # Works with pr_updates key
@@ -1130,23 +1129,28 @@ def test_maybe_convert_markdown(self, mock_convert):
         issue.downstream = {"pr_updates": ["github_markdown", "description"]}
         issue.content = "**bold**"
         d.maybe_convert_markdown(issue, "pr_updates")
-        mock_convert.assert_called_once_with("**bold**")
         self.assertEqual(issue.content, "*bold*")
 
         # Skips when github_markdown not in updates
         mock_convert.reset_mock()
         issue.downstream = {"issue_updates": ["description"]}
         issue.content = "# Hello"
         d.maybe_convert_markdown(issue)
-        mock_convert.assert_not_called()
         self.assertEqual(issue.content, "# Hello")
 
         # Skips when content is empty
         mock_convert.reset_mock()
         issue.downstream = {"issue_updates": ["github_markdown"]}
         issue.content = ""
         d.maybe_convert_markdown(issue)
-        mock_convert.assert_not_called()
+        self.assertEqual(issue.content, "")
+
+        # Skips when source is not github
+        issue.source = "pagure"
+        issue.downstream = {"issue_updates": ["github_markdown"]}
+        issue.content = "# Hello"
+        d.maybe_convert_markdown(issue)
+        self.assertEqual(issue.content, "# Hello")
 
     @mock.patch(PATH + "pypandoc")
     def test_convert_content(self, mock_pypandoc):
@@ -1200,7 +1204,7 @@ def test_convert_content(self, mock_pypandoc):
     @mock.patch(PATH + "_update_assignee")
     @mock.patch(PATH + "_update_on_close")
     @mock.patch("jira.client.JIRA")
-    def testupdate_jira_issue_closed(
+    def test_update_jira_issue_closed(
         self,
         mock_client,
         mock_update_on_close,
@@ -1261,7 +1265,7 @@ def testupdate_jira_issue_closed(
     @mock.patch(PATH + "_update_assignee")
     @mock.patch(PATH + "_update_on_close")
     @mock.patch("jira.client.JIRA")
-    def testupdate_jira_issue_open(
+    def test_update_jira_issue_open(
         self,
         mock_client,
         mock_update_on_close,
@@ -2377,7 +2381,7 @@ def test_get_field_id_by_name_exception(self):
     @mock.patch(PATH + "attach_link")
     @mock.patch("jira.client.JIRA")
     def test_create_jira_issue_epic_link_field_not_found(
-        self, mock_client, mock_attach_link, mockupdate_jira_issue
+        self, mock_client, mock_attach_link, mock_update_jira_issue
     ):
         """Test _create_jira_issue when Epic Link field cannot be resolved"""
         # Set up return values
@@ -2439,7 +2443,7 @@ def test_update_github_project_fields_storypoints_resolution_failure(
     @mock.patch(PATH + "change_status")
     @mock.patch("jira.client.JIRA")
     def test_create_jira_issue_with_component_and_labels(
-        self, mock_client, mock_change_status, mock_attach_link, mockupdate_jira_issue
+        self, mock_client, mock_change_status, mock_attach_link, mock_update_jira_issue
     ):
         """Test _create_jira_issue with component and labels"""
         # Clear cache first
@@ -2474,7 +2478,7 @@ def test_create_jira_issue_with_component_and_labels(
     @mock.patch(PATH + "change_status")
     @mock.patch("jira.client.JIRA")
     def test_create_jira_issue_with_default_status_and_upstream_id(
-        self, mock_client, mock_change_status, mock_attach_link, mockupdate_jira_issue
+        self, mock_client, mock_change_status, mock_attach_link, mock_update_jira_issue
     ):
         """Test _create_jira_issue with default_status and upstream_id comment"""
         # Clear cache first
@@ -2668,7 +2672,7 @@ def test_UrlCache(self):
     @mock.patch(PATH + "_update_assignee")
     @mock.patch(PATH + "_update_on_close")
     @mock.patch("jira.client.JIRA")
-    def testupdate_jira_issue_github_project_fields_early_exit(
+    def test_update_jira_issue_github_project_fields_early_exit(
         self,
         mock_client,
         mock_update_on_close,

tests/test_downstream_pr.py

@@ -632,6 +632,8 @@ def _setup_pr_for_issue_creation(self, **overrides):
         self.mock_pr.url = "https://github.com/test/repo/pull/1"
         self.mock_pr.upstream = "test/repo"
         self.mock_pr.comments = []
+        self.mock_pr.tags = ["bug", "enhancement"]
+        self.mock_pr.fixVersion = ["v1.0"]
         self.mock_pr.priority = None
         self.mock_pr.content = "PR description"
         self.mock_pr.reporter = "testuser"
@@ -657,6 +659,8 @@ def _assert_issue_created_with_pr_fields(self, mock_issue_class, **field_overrid
         self.assertEqual(kwargs["title"], self.mock_pr._title)
         self.assertEqual(kwargs["url"], self.mock_pr.url)
         self.assertEqual(kwargs["upstream"], self.mock_pr.upstream)
+        self.assertEqual(kwargs["tags"], self.mock_pr.tags)
+        self.assertEqual(kwargs["fixVersion"], self.mock_pr.fixVersion)
         self.assertEqual(kwargs["status"], self.mock_pr.status)
         self.assertEqual(kwargs["id_"], self.mock_pr.id)
 

tests/test_intermediary.py

@@ -243,6 +243,8 @@ def test_from_github_pr_reopen(self, mock_matcher):
 
         self.assertEqual(response.suffix, "reopened")
         self.assertEqual(response.status, None)
+        self.assertEqual(response.tags, "mock_tags")
+        self.assertEqual(response.fixVersion, ["mock_milestone"])
         self.assertEqual(response.downstream, {"mock_downstream": "mock_key"})
         self.assertEqual(response.jira_key, "JIRA-1234")
         self.mock_github_pr["comments"][0]["changed"] = None
@@ -278,6 +280,7 @@ def test_from_github_pr_flat_topic_normalizes_suffix(self, mock_matcher):
                     base_kw["action"] = action
                 response = i.PR.from_github(**base_kw)
                 self.assertEqual(response.suffix, expected)
+                self.assertEqual(response.status, None)
 
     def test_matcher(self):
         """This tests the matcher function"""