Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/n0s1/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "1.0.28"
__version__ = "1.0.29"
11 changes: 6 additions & 5 deletions src/n0s1/controllers/jira_controller.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,8 @@ def _get_projects(self, limit=None):

def _get_issues(self, project_key, limit=None):
from jira.exceptions import JIRAError
start = 0
if not limit or limit < 0:
limit = 50
issue_start = start
issue_keys = []
if self._scan_scope:
issue_keys = self._scan_scope.get("projects", {}).get(project_key, {})
Expand All @@ -113,24 +111,27 @@ def _get_issues(self, project_key, limit=None):
else:
ql = f"project = '{project_key}'"
issues_finished = False
nextPageToken = None
while not issues_finished:
try:
self.connect()
issues = self._client.search_issues(ql, startAt=issue_start, maxResults=limit)
issues = self._client.enhanced_search_issues(ql, nextPageToken=nextPageToken, maxResults=limit)
except JIRAError as e:
self.log_message(f"Error while searching issues on Jira project: [{project_key}]. Skipping...",
logging.WARNING)
self.log_message(e)
issues = [{}]
break
except Exception as e:
message = str(e) + f" client.search_issues({ql}, startAt={issue_start}, maxResults={limit})"
message = str(e) + f" client.enhanced_search_issues({ql}, nextPageToken={nextPageToken}, maxResults={limit})"
self.log_message(message, logging.WARNING)
issues = [{}]
time.sleep(1)
continue
issue_start += limit
issues_finished = len(issues) <= 0
nextPageToken = issues.nextPageToken
if not nextPageToken:
issues_finished = True
yield issues

def get_mapping(self, levels=-1, limit=None):
Expand Down