update google issue query to handle field searches (#4373)

Author: pgrace-google

src/clusterfuzz/_internal/issue_management/google_issue_tracker/issue_tracker.py

@@ -1113,10 +1113,21 @@ def get_attachment(self, resource_name):
 
   def find_issues(self, keywords=None, only_open=None):
     """Finds issues."""
+    return self.find_issues_with_filters(keywords, only_open)
+
+  def find_issues_with_filters(self,
+                               keywords=None,
+                               query_filters=None,
+                               only_open=None):
+    """Finds issues with additional query filters."""
     page_token = None
     while True:
       issues = self._execute(self.client.issues().list(
-          query=_get_query(keywords, only_open), pageToken=page_token))
+          query=_get_query(
+              string_keywords=keywords,
+              query_filters=query_filters,
+              only_open=only_open),
+          pageToken=page_token))
       if "issues" not in issues:
         return
       for issue in issues['issues']:
@@ -1128,8 +1139,20 @@ def find_issues(self, keywords=None, only_open=None):
 
   def find_issues_url(self, keywords=None, only_open=None):
     """Finds issues (web URL)."""
+    return self.find_issues_url_with_filters(
+        keywords=keywords, only_open=only_open)
+
+  def find_issues_url_with_filters(self,
+                                   keywords=None,
+                                   query_filters=None,
+                                   only_open=None):
+    """Finds issues (web URL) with additional query filters."""
     return (self._url + '?' + urllib.parse.urlencode({
-        'q': _get_query(keywords, only_open),
+        'q':
+            _get_query(
+                string_keywords=keywords,
+                query_filters=query_filters,
+                only_open=only_open),
     }))
 
   def issue_url(self, issue_id):
@@ -1168,9 +1191,12 @@ def _parse_datetime(date_string):
   return datetime_obj
 
 
-def _get_query(keywords, only_open):
+def _get_query(string_keywords, only_open, query_filters):
   """Gets a search query."""
-  query = ' '.join('"{}"'.format(keyword) for keyword in keywords)
+  query = ' '.join('"{}"'.format(keyword) for keyword in string_keywords)
+  if query_filters:
+    query += ' '
+    query += ' '.join('{}'.format(keyword) for keyword in query_filters)
   if only_open:
     query += ' status:open'
   return query

src/clusterfuzz/_internal/issue_management/issue_tracker.py

@@ -313,10 +313,24 @@ def find_issues(self, keywords=None, only_open=None):
     """Find issues."""
     raise NotImplementedError
 
+  def find_issues_with_filters(self,
+                               keywords=None,
+                               query_filters=None,
+                               only_open=None):
+    """Find issues."""
+    raise NotImplementedError
+
   def find_issues_url(self, keywords=None, only_open=None):
     """Find issues (web URL)."""
     raise NotImplementedError
 
+  def find_issues_url_with_filters(self,
+                                   keywords=None,
+                                   query_filters=None,
+                                   only_open=None):
+    """Find issues."""
+    raise NotImplementedError
+
   def issue_url(self, issue_id):
     """Return the issue URL with the given ID."""
     raise NotImplementedError

src/clusterfuzz/_internal/issue_management/jira/__init__.py

@@ -187,6 +187,14 @@ def find_issues(self, keywords=None, only_open=False):
     issues = self._itm.get_issues(search_text)
     return [Issue(self._itm, issue) for issue in issues]
 
+  def find_issues_with_filters(self,
+                               keywords=None,
+                               query_filters=None,
+                               only_open=None):
+    """Find issues given query filters."""
+    # Jira treats keywords and query filters the same for queries.
+    return self.find_issues(keywords + query_filters, only_open)
+
   def issue_url(self, issue_id):
     """Return the issue URL with the given ID."""
     issue = self.get_issue(issue_id)
@@ -205,6 +213,14 @@ def find_issues_url(self, keywords=None, only_open=None):
     config = db_config.get()
     return urljoin(config.jira_url, f'/issues/?jql={search_text}')
 
+  def find_issues_url_with_filters(self,
+                                   keywords=None,
+                                   query_filters=None,
+                                   only_open=None):
+    """Return the issue URL with the given ID and additional query filters."""
+    # Jira treats keywords and query filters the same for queries.
+    return self.find_issues_url(keywords + query_filters, only_open)
+
 
 def _get_issue_tracker_manager_for_project(project_name):
   """Return jira issue tracker manager for the given project."""

src/clusterfuzz/_internal/issue_management/monorail/__init__.py

@@ -247,6 +247,14 @@ def find_issues(self, keywords=None, only_open=False):
     issues = self._itm.get_issues(search_text, can=can)
     return [Issue(issue) for issue in issues]
 
+  def find_issues_with_filters(self,
+                               keywords=None,
+                               query_filters=None,
+                               only_open=None):
+    """Find issues given additional filters."""
+    # Monorail treats keywords and query filters the same for queries.
+    return self.find_issues(keywords + query_filters, only_open)
+
   def find_issues_url(self, keywords=None, only_open=False):
     """Find issues (web URL)."""
     if not keywords:
@@ -266,6 +274,13 @@ def find_issues_url(self, keywords=None, only_open=False):
             'q': search_text,
         }))
 
+  def find_issues_url_with_filters(self,
+                                   keywords=None,
+                                   query_filters=None,
+                                   only_open=None):
+    # Monorail treats keywords and query filters the same for queries.
+    return self.find_issues_url(keywords + query_filters, only_open)
+
   def issue_url(self, issue_id):
     """Return the issue URL with the given ID."""
     return ISSUE_TRACKER_URL.format(project=self.project, id=issue_id)

src/clusterfuzz/_internal/tests/appengine/libs/issue_management/google_issue_tracker/google_issue_tracker_test.py

@@ -1154,6 +1154,24 @@ def test_find_issues_url(self):
     self.assertEqual('https://issues.chromium.org/issues?q=%22abc%22+%22def%22',
                      url)
 
+  def test_find_issues_url_with_filters(self):
+    """Test find_issues_url."""
+    url = self.issue_tracker.find_issues_url_with_filters(
+        keywords=['abc', 'def'],
+        query_filters=['id:123', 'hotlistid:(4801165|4072748)'],
+        only_open=True)
+    self.assertEqual(
+        'https://issues.chromium.org/issues?q=%22abc%22+%22def%22+id%3A123+hotlistid%3A%284801165%7C4072748%29+status%3Aopen',
+        url,
+    )
+    url = self.issue_tracker.find_issues_url_with_filters(
+        keywords=['abc', 'def'],
+        query_filters=['id:123', 'hotlistid:(4801165|4072748)'],
+        only_open=False)
+    self.assertEqual(
+        'https://issues.chromium.org/issues?q=%22abc%22+%22def%22+id%3A123+hotlistid%3A%284801165%7C4072748%29',
+        url)
+
   def test_issue_url(self):
     """Test issue_url."""
     url = self.issue_tracker.issue_url(123)