Skip to content

Commit 1ba9939

Browse files
chore: auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
1 parent c172944 commit 1ba9939

File tree

4 files changed

+98
-94
lines changed

4 files changed

+98
-94
lines changed

plugins/module_utils/controller.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818

1919
class Controller:
2020
IDENTITY_FIELDS = {
21-
"users": "username",
22-
"role_user_assignments": "role_definition",
23-
"role_team_assignments": "role_definition"
24-
}
21+
"users": "username",
22+
"role_user_assignments": "role_definition",
23+
"role_team_assignments": "role_definition",
24+
}
2525
ENCRYPTED_STRING = "$encrypted$"
2626

2727
def __init__(self, client: Client, module: AnsibleModule) -> None:

plugins/modules/role_team_assignment.py

Lines changed: 45 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,14 @@
88
__metaclass__ = type
99

1010

11-
ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['preview'], 'supported_by': 'community'}
11+
ANSIBLE_METADATA = {
12+
"metadata_version": "1.1",
13+
"status": ["preview"],
14+
"supported_by": "community",
15+
}
1216

1317

14-
DOCUMENTATION = '''
18+
DOCUMENTATION = """
1519
---
1620
module: role_team_assignment
1721
author: "Tom Page (@Tompage1994)"
@@ -53,36 +57,36 @@
5357
type: str
5458
extends_documentation_fragment:
5559
- ansible.platform.auth
56-
'''
60+
"""
5761

5862

59-
EXAMPLES = '''
63+
EXAMPLES = """
6064
- name: Give Administrators organization admin role for org 1
6165
ansible.platform.role_team_assignment:
6266
role_definition: Organization Admin
6367
object_id: 1
6468
team: Administrators
6569
state: present
6670
...
67-
'''
71+
"""
6872

6973
from ansible.module_utils.basic import AnsibleModule
7074

7175
from ..module_utils.arguments import AUTH_ARGSPEC
7276
from ..module_utils.client import Client
73-
from ..module_utils.common import lookup_resource_id
7477
from ..module_utils.controller import Controller
7578
from ..module_utils.errors import EDAError
7679

80+
7781
def main():
7882
# Any additional arguments that are not fields of the item can be added here
7983
argument_spec = dict(
80-
team=dict(required=False, type='str'),
81-
object_id=dict(required=False, type='int'),
82-
role_definition=dict(required=True, type='str'),
83-
object_ansible_id=dict(required=False, type='str'),
84-
team_ansible_id=dict(required=False, type='str'),
85-
state=dict(default='present', choices=['present', 'absent', 'exists']),
84+
team=dict(required=False, type="str"),
85+
object_id=dict(required=False, type="int"),
86+
role_definition=dict(required=True, type="str"),
87+
object_ansible_id=dict(required=False, type="str"),
88+
team_ansible_id=dict(required=False, type="str"),
89+
state=dict(default="present", choices=["present", "absent", "exists"]),
8690
)
8791

8892
argument_spec.update(AUTH_ARGSPEC)
@@ -91,8 +95,8 @@ def main():
9195
argument_spec=argument_spec,
9296
supports_check_mode=True,
9397
mutually_exclusive=[
94-
('team', 'team_ansible_id'),
95-
('object_id', 'object_ansible_id'),
98+
("team", "team_ansible_id"),
99+
("object_id", "object_ansible_id"),
96100
],
97101
)
98102

@@ -104,64 +108,62 @@ def main():
104108
validate_certs=module.params.get("validate_certs"),
105109
)
106110

107-
team_param = module.params.get('team')
108-
object_id = module.params.get('object_id')
109-
role_definition_str = module.params.get('role_definition')
110-
object_ansible_id = module.params.get('object_ansible_id')
111-
team_ansible_id = module.params.get('team_ansible_id')
112-
state = module.params.get('state')
111+
team_param = module.params.get("team")
112+
object_id = module.params.get("object_id")
113+
role_definition_str = module.params.get("role_definition")
114+
object_ansible_id = module.params.get("object_ansible_id")
115+
team_ansible_id = module.params.get("team_ansible_id")
116+
state = module.params.get("state")
113117

114118
controller = Controller(client, module)
115119

116-
role_definition = controller.get_exactly_one('role_definitions', allow_none=False, name=role_definition_str)
117-
team = controller.get_exactly_one('teams', allow_none=True, name=team_param)
120+
role_definition = controller.get_exactly_one(
121+
"role_definitions", allow_none=False, name=role_definition_str
122+
)
123+
team = controller.get_exactly_one("teams", allow_none=True, name=team_param)
118124

119-
new_item = {
120-
'role_definition': role_definition['id']
121-
}
125+
new_item = {"role_definition": role_definition["id"]}
122126

123127
if object_id is not None:
124-
new_item['object_id'] = object_id
128+
new_item["object_id"] = object_id
125129
if team is not None:
126-
new_item['team'] = team['id']
130+
new_item["team"] = team["id"]
127131
if object_ansible_id is not None:
128-
new_item['object_ansible_id'] = object_ansible_id
132+
new_item["object_ansible_id"] = object_ansible_id
129133
if team_ansible_id is not None:
130-
new_item['team_ansible_id'] = team_ansible_id
134+
new_item["team_ansible_id"] = team_ansible_id
131135

132136
try:
133137
assignment = controller.get_one_or_many(
134-
'role_team_assignments',
135-
**{'data': new_item}
136-
)
138+
"role_team_assignments", **{"data": new_item}
139+
)
137140
assignment = assignment[0] if len(assignment) == 1 else None
138141
except EDAError as eda_err:
139142
module.fail_json(msg=str(eda_err))
140143

141-
if state == 'absent':
144+
if state == "absent":
142145
try:
143146
ret = controller.delete_if_needed(
144-
assignment,
145-
endpoint='role_team_assignments'
146-
)
147+
assignment, endpoint="role_team_assignments"
148+
)
147149
except EDAError as eda_err:
148150
module.fail_json(msg=str(eda_err))
149151

150-
elif state == 'present' and assignment is None:
152+
elif state == "present" and assignment is None:
151153
try:
152154
ret = controller.create_if_needed(
153-
new_item=new_item,
154-
endpoint='role_team_assignments',
155-
item_type='role_team_assignment',
156-
)
155+
new_item=new_item,
156+
endpoint="role_team_assignments",
157+
item_type="role_team_assignment",
158+
)
157159
except EDAError as eda_err:
158160
module.fail_json(msg=str(eda_err))
159161

160162
else:
161-
ret = {'changed': False}
163+
ret = {"changed": False}
162164

163165
module.exit_json(**ret)
164166

165167

166-
if __name__ == '__main__':
168+
if __name__ == "__main__":
167169
main()

plugins/modules/role_user_assignment.py

Lines changed: 48 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,14 @@
88
__metaclass__ = type
99

1010

11-
ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['preview'], 'supported_by': 'community'}
11+
ANSIBLE_METADATA = {
12+
"metadata_version": "1.1",
13+
"status": ["preview"],
14+
"supported_by": "community",
15+
}
1216

1317

14-
DOCUMENTATION = '''
18+
DOCUMENTATION = """
1519
---
1620
module: role_user_assignment
1721
author: "Tom Page (@Tompage1994)"
@@ -53,36 +57,36 @@
5357
type: str
5458
extends_documentation_fragment:
5559
- ansible.platform.auth
56-
'''
60+
"""
5761

5862

59-
EXAMPLES = '''
63+
EXAMPLES = """
6064
- name: Give Administrators organization admin role for org 1
6165
ansible.platform.role_user_assignment:
6266
role_definition: Organization Admin
6367
object_id: 1
6468
user: Administrators
6569
state: present
6670
...
67-
'''
71+
"""
6872

6973
from ansible.module_utils.basic import AnsibleModule
7074

7175
from ..module_utils.arguments import AUTH_ARGSPEC
7276
from ..module_utils.client import Client
73-
from ..module_utils.common import lookup_resource_id
7477
from ..module_utils.controller import Controller
7578
from ..module_utils.errors import EDAError
7679

80+
7781
def main():
7882
# Any additional arguments that are not fields of the item can be added here
7983
argument_spec = dict(
80-
user=dict(required=False, type='str'),
81-
object_id=dict(required=False, type='int'),
82-
role_definition=dict(required=True, type='str'),
83-
object_ansible_id=dict(required=False, type='str'),
84-
user_ansible_id=dict(required=False, type='str'),
85-
state=dict(default='present', choices=['present', 'absent', 'exists']),
84+
user=dict(required=False, type="str"),
85+
object_id=dict(required=False, type="int"),
86+
role_definition=dict(required=True, type="str"),
87+
object_ansible_id=dict(required=False, type="str"),
88+
user_ansible_id=dict(required=False, type="str"),
89+
state=dict(default="present", choices=["present", "absent", "exists"]),
8690
)
8791

8892
argument_spec.update(AUTH_ARGSPEC)
@@ -91,13 +95,13 @@ def main():
9195
argument_spec=argument_spec,
9296
supports_check_mode=True,
9397
mutually_exclusive=[
94-
('user', 'user_ansible_id'),
95-
('object_id', 'object_ansible_id'),
98+
("user", "user_ansible_id"),
99+
("object_id", "object_ansible_id"),
96100
],
97101
required_one_of=[
98-
('user', 'user_ansible_id'),
99-
('object_id', 'object_ansible_id'),
100-
]
102+
("user", "user_ansible_id"),
103+
("object_id", "object_ansible_id"),
104+
],
101105
)
102106

103107
client = Client(
@@ -108,64 +112,62 @@ def main():
108112
validate_certs=module.params.get("validate_certs"),
109113
)
110114

111-
user_param = module.params.get('user')
112-
object_id = module.params.get('object_id')
113-
role_definition_str = module.params.get('role_definition')
114-
object_ansible_id = module.params.get('object_ansible_id')
115-
user_ansible_id = module.params.get('user_ansible_id')
116-
state = module.params.get('state')
115+
user_param = module.params.get("user")
116+
object_id = module.params.get("object_id")
117+
role_definition_str = module.params.get("role_definition")
118+
object_ansible_id = module.params.get("object_ansible_id")
119+
user_ansible_id = module.params.get("user_ansible_id")
120+
state = module.params.get("state")
117121

118122
controller = Controller(client, module)
119123

120-
role_definition = controller.get_exactly_one('role_definitions', name=role_definition_str)
121-
user = controller.get_exactly_one('users', name=user_param)
124+
role_definition = controller.get_exactly_one(
125+
"role_definitions", name=role_definition_str
126+
)
127+
user = controller.get_exactly_one("users", name=user_param)
122128

123-
new_item = {
124-
'role_definition': role_definition['id']
125-
}
129+
new_item = {"role_definition": role_definition["id"]}
126130

127131
if object_id is not None:
128-
new_item['object_id'] = object_id
132+
new_item["object_id"] = object_id
129133
if user is not None:
130-
new_item['user'] = user['id'] if user else None
134+
new_item["user"] = user["id"] if user else None
131135
if object_ansible_id is not None:
132-
new_item['object_ansible_id'] = object_ansible_id
136+
new_item["object_ansible_id"] = object_ansible_id
133137
if user_ansible_id is not None:
134-
new_item['user_ansible_id'] = user_ansible_id
138+
new_item["user_ansible_id"] = user_ansible_id
135139

136140
try:
137141
assignment = controller.get_one_or_many(
138-
'role_user_assignments',
139-
**{'data': new_item}
140-
)
142+
"role_user_assignments", **{"data": new_item}
143+
)
141144
assignment = assignment[0] if len(assignment) == 1 else None
142145
except EDAError as eda_err:
143146
module.fail_json(msg=str(eda_err))
144147

145-
if state == 'absent':
148+
if state == "absent":
146149
try:
147150
ret = controller.delete_if_needed(
148-
assignment,
149-
endpoint='role_user_assignments'
150-
)
151+
assignment, endpoint="role_user_assignments"
152+
)
151153
except EDAError as eda_err:
152154
module.fail_json(msg=str(eda_err))
153155

154-
elif state == 'present' and assignment is None:
156+
elif state == "present" and assignment is None:
155157
try:
156158
ret = controller.create_if_needed(
157-
new_item=new_item,
158-
endpoint='role_user_assignments',
159-
item_type='role_user_assignment',
160-
)
159+
new_item=new_item,
160+
endpoint="role_user_assignments",
161+
item_type="role_user_assignment",
162+
)
161163
except EDAError as eda_err:
162164
module.fail_json(msg=str(eda_err))
163165

164166
else:
165-
ret = {'changed': False}
167+
ret = {"changed": False}
166168

167169
module.exit_json(**ret)
168170

169171

170-
if __name__ == '__main__':
172+
if __name__ == "__main__":
171173
main()

tests/integration/targets/role_team_assignment/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
block:
1010
- name: Set the team to use for the test
1111
set_fact:
12-
team_name: "TBC" # A team will need to exist in the Platform instance for this to work.
12+
team_name: "TBC" # A team will need to exist in the Platform instance for this to work.
1313

1414
# CREATE
1515
- name: Create role_team_assignment in check mode

0 commit comments

Comments
 (0)