Skip to content

Commit 430ab42

Browse files
committed
Implement sonar cloud suggestions
1 parent 14d45ed commit 430ab42

File tree

1 file changed

+1
-11
lines changed

1 file changed

+1
-11
lines changed

ansible_base/rbac/api/serializers.py

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -132,15 +132,6 @@ def validate(self, attrs):
132132

133133
return super().validate(attrs)
134134

135-
def get_actor_from_data(self, validated_data, requesting_user):
136-
actor_aid_field = f'{self.actor_field}_ansible_id'
137-
if validated_data.get(self.actor_field):
138-
actor = validated_data[self.actor_field]
139-
else:
140-
# Actor is already resolved by ActorAnsibleIdField and validated
141-
actor = validated_data[self.actor_field]
142-
return actor
143-
144135
def get_object_from_data(self, validated_data, role_definition, requesting_user):
145136
obj = None
146137
if validated_data.get('object_id') and validated_data.get('object_ansible_id'):
@@ -175,7 +166,7 @@ def create(self, validated_data):
175166
requesting_user = self.context['view'].request.user
176167

177168
# Resolve actor - team or user
178-
actor = self.get_actor_from_data(validated_data, requesting_user)
169+
actor = validated_data[self.actor_field]
179170

180171
# Resolve object
181172
obj = self.get_object_from_data(validated_data, rd, requesting_user)
@@ -285,7 +276,6 @@ def _get_related(self, obj) -> dict[str, str]:
285276
except ObjectDoesNotExist:
286277
# Resource doesn't exist, stick with pk
287278
logger.error(f"Resource does not exist for {self.Meta.model} {obj.pk}")
288-
pass
289279

290280
related_fields['details'] = get_relative_url(
291281
f'role-{actor_cls._meta.model_name}-access-assignments',

0 commit comments

Comments
 (0)