External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-07 09:27:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

Remove json serialization for notify validation (#14847)

Browse Source 
* Remove json serialization for notify validation

* Update serializers.py
This commit is contained in:
Dave
2024-02-12 15:43:43 +00:00
committed by GitHub
parent 519fd22bec
commit 56b6a07f6e
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
awx/api/serializers.py
View File

@@ -5177,16 +5177,21 @@ class NotificationTemplateSerializer(BaseSerializer):
body = messages[event].get('body', {}) body = messages[event].get('body', {})
if body: if body:
try: try:
rendered_body = ( sandbox.ImmutableSandboxedEnvironment(undefined=DescriptiveUndefined).from_string(body).render(JobNotificationMixin.context_stub())
sandbox.ImmutableSandboxedEnvironment(undefined=DescriptiveUndefined).from_string(body).render(JobNotificationMixin.context_stub())
) # https://github.com/ansible/awx/issues/14410
potential_body = json.loads(rendered_body)
if not isinstance(potential_body, dict): # When rendering something such as "{{ job.id }}"
error_list.append( # the return type is not a dict, unlike "{{ job_metadata }}" which is a dict
_("Webhook body for '{}' should be a json dictionary. Found type '{}'.".format(event, type(potential_body).__name__))
) # potential_body = json.loads(rendered_body)
except json.JSONDecodeError as exc:
error_list.append(_("Webhook body for '{}' is not a valid json dictionary ({}).".format(event, exc))) # if not isinstance(potential_body, dict):
# error_list.append(
# _("Webhook body for '{}' should be a json dictionary. Found type '{}'.".format(event, type(potential_body).__name__))
# )
except Exception as exc:
error_list.append(_("Webhook body for '{}' is not valid. The following gave an error ({}).".format(event, exc)))
if error_list: if error_list:
raise serializers.ValidationError(error_list) raise serializers.ValidationError(error_list)