changes to make it suitable for cloud (#375)

* Changes for issueFunction and API updation

* Lint fixes and version fix and other fixes

* fixes on the PR

* format fixed

* suggested fixes

* changes in test file

* changing to path variable

* sql injection fix

* fixes

* adding paramstyle

* updated the comment

Author: Bala-Sakabattula

constraints.txt

@@ -0,0 +1 @@
+snowflake_connector_python>=3.15

requirements.txt

@@ -1,12 +1,14 @@
-jira
+jira>=3.8.0
 requests
 requests_kerberos
 fedmsg
 fedora-messaging
 PyGithub
 pypandoc_binary
+dotenv
 urllib3
 jinja2
 flask
+snowflake
 webhook-to-fedora-messaging-messages
 ldap3>=2.9.0

sync2jira/downstream_issue.py

@@ -21,17 +21,21 @@
 import difflib
 import logging
 import operator
+import os
 import re
 from typing import Any, Optional, Union
 import unicodedata
 
+from dotenv import load_dotenv
 from jira import JIRAError
 import jira.client
 import pypandoc
+import snowflake.connector
 
 import Rover_Lookup
 from sync2jira.intermediary import Issue, PR
 
+load_dotenv()
 # The date the service was upgraded
 # This is used to ensure legacy comments are not touched
 UPDATE_DATE = datetime(2019, 7, 9, 18, 18, 36, 480291, tzinfo=timezone.utc)
@@ -42,6 +46,62 @@
 duplicate_issues_subject = "FYI: Duplicate Sync2jira Issues"
 
 jira_cache = {}
+SNOWFLAKE_QUERY = f"""
+SELECT
+    CONCAT(p.PKEY, '-', a.issue_key) AS issue_key,
+    remote_link_url,
+    updated
+FROM
+    (
+        SELECT
+            ji.PROJECT_ID AS project_id,
+            ji.ISSUENUM AS issue_key,
+            rl.URL AS remote_link_url,
+            ji.updated
+        FROM
+            JIRA_DB.MARTS.JIRA_REMOTELINK AS rl
+            INNER JOIN JIRA_DB.MARTS.JIRA_ISSUE AS ji ON ji.ID = rl.ISSUEID
+            AND rl.TITLE = '{remote_link_title}' AND rl.URL = ?
+    ) AS a
+    LEFT JOIN JIRA_DB.MARTS.JIRA_PROJECT AS p on a.project_id = p.ID
+"""
+
+
+GH_URL_PATTERN = re.compile(r"https://github\.com/[^/]+/[^/]+/(issues|pull)/\d+")
+
+
+def validate_github_url(url):
+    """URL validation"""
+    return bool(GH_URL_PATTERN.fullmatch(url))
+
+
+def get_snowflake_conn():
+    """Get Snowflake connection - lazy initialization"""
+
+    return snowflake.connector.connect(
+        account=os.getenv("SNOWFLAKE_ACCOUNT"),
+        user=os.getenv("SNOWFLAKE_USER"),
+        password=os.getenv("SNOWFLAKE_PAT"),
+        role=os.getenv("SNOWFLAKE_ROLE"),
+        warehouse=os.getenv("SNOWFLAKE_WAREHOUSE", "DEFAULT"),
+        database=os.getenv("SNOWFLAKE_DATABASE", "JIRA_DB"),
+        schema=os.getenv("SNOWFLAKE_SCHEMA", "PUBLIC"),
+        paramstyle="qmark",
+    )
+
+
+def execute_snowflake_query(issue):
+    if not validate_github_url(issue.url):
+        log.error(f"Invalid GitHub URL format: {issue.url}")
+        return []
+    conn = get_snowflake_conn()
+    # Execute the Snowflake query
+    with conn as c:
+        cursor = c.cursor()
+        cursor.execute(SNOWFLAKE_QUERY, (issue.url,))
+        results = cursor.fetchall()
+        cursor.close()
+    return results
 
 
 def check_jira_status(client):
@@ -54,11 +114,11 @@ def check_jira_status(client):
     :rtype: Bool
     """
     # Search for any issue remote title
-    ret = client.search_issues("issueFunction in linkedIssuesOfRemote('*')")
-    if len(ret) < 1:
-        # If we did not find anything return false
+    try:
+        client.server_info()
+        return True
+    except Exception:
         return False
-    return True
 
 
 def _comment_format(comment):
@@ -126,7 +186,7 @@ def get_jira_client(issue, config):
     return client
 
 
-def _matching_jira_issue_query(client, issue, config, free=False):
+def _matching_jira_issue_query(client, issue, config):
     """
     API calls that find matching JIRA tickets if any are present.
 
@@ -138,14 +198,14 @@ def _matching_jira_issue_query(client, issue, config, free=False):
     :rtype: List
     """
     # Searches for any remote link to the issue.url
-    query = (
-        f'issueFunction in linkedIssuesOfRemote("{remote_link_title}") and '
-        f'issueFunction in linkedIssuesOfRemote("{issue.url}")'
-    )
-    if free:
-        query += " and statusCategory != Done"
+
     # Query the JIRA client and store the results
-    results_of_query: jira.client.ResultList = client.search_issues(query)
+    results = execute_snowflake_query(issue)
+    results_of_query = []
+    if len(results) > 0:
+        issue_keys = (row[0] for row in results)
+        jql = f"key in ({','.join(issue_keys)})"
+        results_of_query = client.search_issues(jql)
     if len(results_of_query) > 1:
         final_results = []
         # TODO: there is pagure-specific code in here that handles the case where a dropped issue's URL is
@@ -194,7 +254,9 @@ def _matching_jira_issue_query(client, issue, config, free=False):
             final_results.append(results_of_query[0])
 
         # Return the final_results
-        log.debug("Found %i results for query %r", len(final_results), query)
+        log.debug(
+            "Found %i results for query with issue %r", len(final_results), issue.url
+        )
         return final_results
     else:
         return results_of_query

sync2jira/intermediary.py

@@ -278,7 +278,7 @@ def map_fixVersion(mapping, issue):
         issue["milestone"] = fixVersion_map.replace("XXX", issue["milestone"])
 
 
-JIRA_REFERENCE = re.compile(r"\bJIRA:\s*([A-Z]+-\d+)\b")
+JIRA_REFERENCE = re.compile(r"\bJIRA:\s*([A-Z][A-Z0-9]*-\d+)\b")
 
 
 def matcher(content: Optional[str], comments: list[dict[str, str]]) -> str:

tests/test_downstream_issue.py

@@ -183,8 +183,9 @@ class MockIssue(object):
             "(resolution is null OR resolution = Duplicate)",
         )
 
+    @mock.patch(PATH + "execute_snowflake_query")
     @mock.patch("jira.client.JIRA")
-    def test_get_existing_newstyle(self, client):
+    def test_get_existing_newstyle(self, client, mock_snowflake):
         config = self.mock_config
 
         issue = MagicMock()
@@ -195,13 +196,13 @@ def test_get_existing_newstyle(self, client):
         mock_results_of_query.fields.summary = "A title, a title..."
 
         client.return_value.search_issues.return_value = [mock_results_of_query]
+        mock_snowflake.return_value = [("SYNC2JIRA-123",)]
         result = d._get_existing_jira_issue(jira.client.JIRA(), issue, config)
         # Ensure that we get the mock_result_of_query as a result
         self.assertEqual(result, mock_results_of_query)
 
         client.return_value.search_issues.assert_called_once_with(
-            'issueFunction in linkedIssuesOfRemote("Upstream issue") and '
-            'issueFunction in linkedIssuesOfRemote("http://threebean.org")'
+            "key in (SYNC2JIRA-123)"
         )
 
     @mock.patch("jira.client.JIRA")
@@ -1390,8 +1391,10 @@ def test_verify_tags(self):
     @mock.patch(PATH + "find_username")
     @mock.patch(PATH + "check_comments_for_duplicate")
     @mock.patch("jira.client.JIRA")
+    @mock.patch(PATH + "execute_snowflake_query")
     def test_matching_jira_issue_query(
         self,
+        mock_snowflake,
         mock_client,
         mock_check_comments_for_duplicates,
         mock_find_username,
@@ -1412,6 +1415,7 @@ def test_matching_jira_issue_query(
         ]
         mock_check_comments_for_duplicates.return_value = True
         mock_find_username.return_value = "mock_username"
+        mock_snowflake.return_value = [("SYNC2JIRA-123",)]
 
         # Call the function
         response = d._matching_jira_issue_query(
@@ -1420,10 +1424,7 @@ def test_matching_jira_issue_query(
 
         # Assert everything was called correctly
         self.assertEqual(response, [mock_downstream_issue])
-        mock_client.search_issues.assert_called_with(
-            'issueFunction in linkedIssuesOfRemote("Upstream issue")'
-            ' and issueFunction in linkedIssuesOfRemote("mock_url")'
-        )
+        mock_client.search_issues.assert_called_with("key in (SYNC2JIRA-123)")
         mock_check_comments_for_duplicates.assert_called_with(
             mock_client, mock_downstream_issue, "mock_username"
         )
@@ -1567,35 +1568,29 @@ def test_check_jira_status_false(self):
         """
         This function tests 'check_jira_status' where we return false
         """
-        # Set up return values
+        # Set up mock jira client that raises an exception
         mock_jira_client = MagicMock()
-        mock_jira_client.search_issues.return_value = []
+        mock_jira_client.server_info.side_effect = Exception("Connection failed")
 
         # Call the function
         response = d.check_jira_status(mock_jira_client)
 
         # Assert everything was called correctly
         self.assertEqual(response, False)
-        mock_jira_client.search_issues.assert_called_with(
-            "issueFunction in linkedIssuesOfRemote('*')"
-        )
 
     def test_check_jira_status_true(self):
         """
-        This function tests 'check_jira_status' where we return false
+        This function tests 'check_jira_status' where we return true
         """
-        # Set up return values
+        # Set up mock jira client that works normally
         mock_jira_client = MagicMock()
-        mock_jira_client.search_issues.return_value = ["some", "values"]
+        mock_jira_client.server_info.return_value = {"version": "8.0.0"}
 
         # Call the function
         response = d.check_jira_status(mock_jira_client)
 
         # Assert everything was called correctly
         self.assertEqual(response, True)
-        mock_jira_client.search_issues.assert_called_with(
-            "issueFunction in linkedIssuesOfRemote('*')"
-        )
 
     def test_update_on_close_update(self):
         """
@@ -1761,3 +1756,22 @@ def test_remove_diacritics(self):
         for text, expected in scenarios:
             actual = remove_diacritics(text)
             self.assertEqual(actual, expected)
+
+    @mock.patch(PATH + "snowflake.connector.connect")
+    def test_execute_snowflake_query_real_connection(self, mock_snowflake_connect):
+        """Test execute_snowflake_query function."""
+        # Create a mock issue
+        mock_issue = MagicMock()
+        mock_issue.url = "https://github.com/test/repo/issues/1"
+        # Call the function
+        result = d.execute_snowflake_query(mock_issue)
+        mock_cursor = (
+            mock_snowflake_connect.return_value.__enter__.return_value.cursor.return_value
+        )
+        # Assert the function was called correctly
+        mock_snowflake_connect.assert_called_once()
+        mock_cursor.execute.assert_called_once()
+        mock_cursor.fetchall.assert_called_once()
+        mock_cursor.close.assert_called_once()
+        # Assert the result
+        self.assertEqual(result, mock_cursor.fetchall.return_value)

tox.ini

@@ -12,6 +12,7 @@ basepython =
 deps =
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/test-requirements.txt
+    -c{toxinidir}/constraints.txt
 sitepackages = True
 allowlist_externals = /usr/bin/flake8,/usr/bin/black
 commands =