Fix broken Bitbucket Cloud client (#611)

* Fix typo in function call

* Set resource_url default values

* Apply formatting

* Support alternative Bitbucket Cloud URL

* Fix more broken stuff

Missing function call arguments, typos, SonarLint errors etc.

* Normalize argument names

* Apply formatting

Author: mandrean

atlassian/bitbucket.py

@@ -120,7 +120,7 @@ def log_curl_debug(self, method, url, data=None, headers=None, level=logging.DEB
             url=url)
         log.log(level=level, msg=message)
 
-    def resource_url(self, resource, api_root, api_version):
+    def resource_url(self, resource, api_root=None, api_version=None):
         if api_root is None:
             api_root = self.api_root
         if api_version is None:

atlassian/rest_client.py

@@ -16,7 +16,7 @@
     matcher_type="branch",  # lowercase matcher type
     matcher_value="master",
     permission_type="no-deletes",
-    repository="repository_name",
+    repository_slug="repository_name",
     except_users=["user1", "user2"]
 )
 print(single_permission)
@@ -74,7 +74,7 @@
     matcher_type="branch",
     matcher_value="master",
     permission_type="no-deletes",
-    repository="repository_name",
+    repository_slug="repository_name",
     except_users=["user1", "user2"]
 )
 print(multiple_permissions)

examples/bitbucket/bitbucket-branch-restrictions.py

@@ -7,8 +7,8 @@
     password='admin')
 
 changelog = bitbucket.get_changelog(
-    project='DEMO',
-    repository='example-repository',
+    project_key='DEMO',
+    repository_slug='example-repository',
     ref_from='develop',
     ref_to='master')
 

examples/bitbucket/bitbucket-changes-between-branches.py

@@ -93,7 +93,7 @@ def is_can_removed_branch(branch_candidate):
                 last_date_commit = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(committer_time_stamp))
                 if is_can_removed_branch(branch):
                     if not DRY_RUN:
-                        stash.delete_branch(project=PROJECT_KEY, repository=repository, name=display_id,
+                        stash.delete_branch(project_key=PROJECT_KEY, repository_slug=repository, name=display_id,
                                             end_point=branch['latestCommit'])
                     log.write("{},{},{}\n".format(display_id, last_date_commit, True))
             step += 1

examples/bitbucket/bitbucket-clean-jira-branches.py

@@ -7,8 +7,8 @@
     password='admin')
 
 data = bitbucket.fork_repository(
-    project='DEMO',
-    repository='example-repository',
-    new_repository='forked-repository')
+    project_key='DEMO',
+    repository_slug='example-repository',
+    new_repository_slug='forked-repository')
 
 print(data)

examples/bitbucket/bitbucket-fork-repository.py

@@ -9,16 +9,16 @@
     password='admin')
 
 if __name__ == '__main__':
-    response = bitbucket.set_tag(project='gonchik.tsymzhitov',
-                                 repository='gonchik',
+    response = bitbucket.set_tag(project_key='gonchik.tsymzhitov',
+                                 repository_slug='gonchik',
                                  tag_name='test1',
                                  commit_revision='ebcf5fdffa0',
                                  description='Stable release')
     print("Response after set_tag method")
     print(response)
 
-    response = bitbucket.get_project_tags(project='INT', repository='jira-plugins', tag_name='test1')
+    response = bitbucket.get_project_tags(project_key='INT', repository_slug='jira-plugins', tag_name='test1')
     print("Retrieve tag")
     print(response)
     print("Remove tag")
-    bitbucket.delete_tag(project='INT', repository='jira-plugins', tag_name='test1')
+    bitbucket.delete_tag(project_key='INT', repository_slug='jira-plugins', tag_name='test1')