Polish Bibtucket methods and search code method

Author: Gonchik Tsymzhitov

CONTRIBUTING.rst

@@ -56,6 +56,7 @@ References
 All methods based on docs from: https://developer.atlassian.com/docs/
 
 * `Jira Server`_
+* `Jira Cloud`_
 * Confluence_
 * `Jira Service Desk Server`_
 * `Jira Service Desk Cloud`_
@@ -79,6 +80,7 @@ All methods based on docs from: https://developer.atlassian.com/docs/
     - https://confluence.atlassian.com/cloud/api-tokens-938839638.html
 
 .. _`Jira Server`: https://docs.atlassian.com/software/jira/docs/api/REST/latest
+.. _Jira Cloud: https://developer.atlassian.com/cloud/jira/platform/rest/v3/
 .. _Confluence: https://developer.atlassian.com/server/confluence/confluence-server-rest-api/
 .. _`Jira Service Desk Cloud`: https://developer.atlassian.com/cloud/jira/service-desk/rest/
 .. _`Jira Service Desk Server`: https://docs.atlassian.com/jira-servicedesk/REST/server

atlassian/bitbucket.py

@@ -541,18 +541,7 @@ def repo_all_list(self, project_key):
         else:
             url = 'rest/api/2.0/projects/{projectKey}/repos'.format(projectKey=project_key)
         params = {}
-        start = 0
-        params['start'] = start
-        response = self.get(url, params=params)
-        if 'values' not in response:
-            return []
-        repo_list = (response or {}).get('values')
-        while not response.get('isLastPage'):
-            start = response.get('nextPageStart')
-            params['start'] = start
-            response = self.get(url, params=params)
-            repo_list += (response or {}).get('values')
-        return repo_list
+        return self._get_paged(url, params)
 
     def delete_repo(self, project_key, repository_slug):
         """
@@ -1090,7 +1079,7 @@ def update_pull_request_comment(self, project, repository, pull_request_id, comm
         }
         return self.put(url, data=payload)
 
-    def get_pullrequest(self, project, repository, pull_request_id):
+    def get_pull_request(self, project, repository, pull_request_id):
         """
         Retrieve a pull request.
         The authenticated user must have REPO_READ permission
@@ -1108,6 +1097,12 @@ def get_pullrequest(self, project, repository, pull_request_id):
                 project=project, repository=repository, pullRequestId=pull_request_id)
         return self.get(url)
 
+    def get_pullrequest(self, *args, **kwargs):
+        """
+        Deprecated name since 1.15.1. Let's use the get_pull_request()
+        """
+        return self.get_pull_request(*args, **kwargs)
+
     def change_reviewed_status(self, project_key, repository_slug, pull_request_id, status, user_slug):
         """
         Change the current user's status for a pull request.
@@ -1435,9 +1430,7 @@ def get_branches_permissions(self, project, repository=None, start=0, limit=25):
                 project=project,
                 repository=repository)
         else:
-            url = 'rest/branch-permissions/2.0/projects/{project}/restrictions'.format(
-                project=project)
-
+            url = 'rest/branch-permissions/2.0/projects/{project}/restrictions'.format(project=project)
         params = {}
         if limit:
             params['limit'] = limit
@@ -1900,6 +1893,18 @@ def create_code_insights_report(self, project_key, repository_slug, commit_id, r
         data.update(report_params)
         return self.put(url, data=data)
 
+    def search_code(self, team, search_query, page=1, limit=10):
+        """
+        Search repositories for matching code
+        :team: str
+        :search_query: str
+        """
+        endpoint = 'rest/api/1.0'
+        if self.cloud:
+            endpoint = 'rest/api/2.0'
+        url = "{endpoint}/teams/{team}/search/code".format(endpoint=endpoint, team=team)
+        return self.get(url, params={'search_query': search_query, 'page': page, 'pagelen': limit})
+
     def get_lfs_repo_status(self, project_key, repo):
         url = 'rest/git-lfs/git-lfs/admin/projects/{projectKey}/repos/{repositorySlug}/enabled'.format(
             projectKey=project_key,
@@ -1917,3 +1922,21 @@ def get_users(self, user_filter=None):
         if user_filter:
             params['filter'] = user_filter
         return self.get(url, params=params)
+
+    def _get_paged(self, url, params):
+        """
+        Use for get all methods
+        :param url:
+        :param params:
+        :return:
+        """
+        params['start'] = 0
+        response = self.get(url, params=params)
+        if 'values' not in response:
+            return []
+        values = response.get('values')
+        while not response.get('isLastPage'):
+            params['start'] = response.get('nextPageStart')
+            response = self.get(url, params=params)
+            values += response.get('values')
+        return values

atlassian/rest_client.py

@@ -178,7 +178,7 @@ def request(self, method='GET', path='/', data=None, flags=None, params=None, he
         elif response.status_code == 405:
             log.error('Received: {0}\n Method not allowed'.format(response.status_code))
         elif response.status_code == 409:
-            log.error('Received: {0}\n Conflict \n '.format(response.status_code, response_content))
+            log.error('Received: {0}\n Conflict \n {1}'.format(response.status_code, response_content))
         elif response.status_code == 413:
             log.error('Received: {0}\n Request entity too large'.format(response.status_code))
         else: