Skip to content
Open
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
12 changes: 8 additions & 4 deletions atlassian/bamboo.py
Original file line number Diff line number Diff line change
Expand Up @@ -786,14 +786,15 @@ def get_deployment_users(self, deployment_id, filter_name=None, start=0, limit=2
resource = "permissions/deployment/{}/users".format(deployment_id)
return self.get(self.resource_url(resource), params=params)

def revoke_user_from_deployment(self, deployment_id, user, permissions=["READ", "WRITE", "BUILD"]):
def revoke_user_from_deployment(self, deployment_id, user, permissions=None):
"""
Revokes deployment project permissions from a given user.
:param deployment_id:
:param user:
:param permissions:
:return:
"""
permissions = ["READ", "WRITE", "BUILD"] if permissions is None else permissions
resource = "permissions/deployment/{}/users/{}".format(deployment_id, user)
return self.delete(self.resource_url(resource), data=permissions)

Expand Down Expand Up @@ -825,14 +826,15 @@ def get_deployment_groups(self, deployment_id, filter_name=None, start=0, limit=
resource = "permissions/deployment/{}/groups".format(deployment_id)
return self.get(self.resource_url(resource), params=params)

def revoke_group_from_deployment(self, deployment_id, group, permissions=["READ", "WRITE", "BUILD"]):
def revoke_group_from_deployment(self, deployment_id, group, permissions=None):
"""
Revokes deployment project permissions from a given group.
:param deployment_id:
:param group:
:param permissions:
:return:
"""
permissions = ["READ", "WRITE", "BUILD"] if permissions is None else permissions
resource = "permissions/deployment/{}/groups/{}".format(deployment_id, group)
return self.delete(self.resource_url(resource), data=permissions)

Expand Down Expand Up @@ -864,14 +866,15 @@ def get_environment_users(self, environment_id, filter_name=None, start=0, limit
resource = "permissions/environment/{}/users".format(environment_id)
return self.get(self.resource_url(resource), params=params)

def revoke_user_from_environment(self, environment_id, user, permissions=["READ", "WRITE", "BUILD"]):
def revoke_user_from_environment(self, environment_id, user, permissions=None):
"""
Revokes deployment environment permissions from a given user.
:param environment_id:
:param user:
:param permissions:
:return:
"""
permissions = ["READ", "WRITE", "BUILD"] if permissions is None else permissions
resource = "permissions/environment/{}/users/{}".format(environment_id, user)
return self.delete(self.resource_url(resource), data=permissions)

Expand Down Expand Up @@ -903,14 +906,15 @@ def get_environment_groups(self, environment_id, filter_name=None, start=0, limi
resource = "permissions/environment/{}/groups".format(environment_id)
return self.get(self.resource_url(resource), params=params)

def revoke_group_from_environment(self, environment_id, group, permissions=["READ", "WRITE", "BUILD"]):
def revoke_group_from_environment(self, environment_id, group, permissions=None):
"""
Revokes deployment environment permissions from a given group.
:param environment_id:
:param group:
:param permissions:
:return:
"""
permissions = ["READ", "WRITE", "BUILD"] if permissions is None else permissions
resource = "permissions/environment/{}/groups/{}".format(environment_id, group)
return self.delete(self.resource_url(resource), data=permissions)

Expand Down
16 changes: 12 additions & 4 deletions atlassian/service_desk.py
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ def delete_organization(self, organization_id):

return self.delete(url, headers=self.experimental_headers)

def add_users_to_organization(self, organization_id, users_list=[], account_list=[]):
def add_users_to_organization(self, organization_id, users_list=None, account_list=None):
"""
Adds users to an organization
users_list is a list of strings
Expand All @@ -388,13 +388,15 @@ def add_users_to_organization(self, organization_id, users_list=[], account_list
:param users_list: list
:return:
"""
users_list = [] if users_list is None else users_list
account_list = [] if account_list is None else account_list
log.warning("Adding users...")
url = "rest/servicedeskapi/organization/{}/user".format(organization_id)
data = {"usernames": users_list, "accountIds": account_list}

return self.post(url, headers=self.experimental_headers, data=data)

def remove_users_from_organization(self, organization_id, users_list=[], account_list=[]):
def remove_users_from_organization(self, organization_id, users_list=None, account_list=None):
"""
Removes users from an organization
users_list is a list of strings
Expand All @@ -405,6 +407,8 @@ def remove_users_from_organization(self, organization_id, users_list=[], account
:param account_list: list
:return:
"""
users_list = [] if users_list is None else users_list
account_list = [] if account_list is None else account_list
log.warning("Removing users...")
url = "rest/servicedeskapi/organization/{}/user".format(organization_id)
data = {"usernames": users_list, "accountIds": account_list}
Expand Down Expand Up @@ -631,7 +635,7 @@ def get_customers(self, service_desk_id, query=None, start=0, limit=50):

return self.get(url, headers=self.experimental_headers, params=params)

def add_customers(self, service_desk_id, list_of_usernames=[], list_of_accountids=[]):
def add_customers(self, service_desk_id, list_of_usernames=None, list_of_accountids=None):
"""
Adds one or more existing customers to the given service desk.
If you need to create a customer, see Create customer method.
Expand All @@ -644,13 +648,15 @@ def add_customers(self, service_desk_id, list_of_usernames=[], list_of_accountid
:param list_of_accountids: list
:return: the customers added to the service desk
"""
list_of_usernames = [] if list_of_usernames is None else list_of_usernames
list_of_accountids = [] if list_of_accountids is None else list_of_accountids
url = "rest/servicedeskapi/servicedesk/{}/customer".format(service_desk_id)
data = {"usernames": list_of_usernames, "accountIds": list_of_accountids}

log.info("Adding customers...")
return self.post(url, headers=self.experimental_headers, data=data)

def remove_customers(self, service_desk_id, list_of_usernames=[], list_of_accountids=[]):
def remove_customers(self, service_desk_id, list_of_usernames=None, list_of_accountids=None):
"""
Removes one or more customers from a service desk. The service
desk must have closed access. If any of the passed customers are
Expand All @@ -662,6 +668,8 @@ def remove_customers(self, service_desk_id, list_of_usernames=[], list_of_accoun
:param list_of_accountids: list
:return: the customers added to the service desk
"""
list_of_usernames = [] if list_of_usernames is None else list_of_usernames
list_of_accountids = [] if list_of_accountids is None else list_of_accountids
url = "rest/servicedeskapi/servicedesk/{}/customer".format(service_desk_id)
data = {"usernames": list_of_usernames, "accountIds": list_of_accountids}

Expand Down