From ee1d118752892a629d3a8cb376c1508091b78dde Mon Sep 17 00:00:00 2001 From: Jeff Bradberry Date: Thu, 5 Sep 2019 14:24:46 -0400 Subject: [PATCH] Add the webhook receiver url to the related urls in the serializers --- awx/api/serializers.py | 10 ++++++++++ .../api/serializers/test_job_template_serializers.py | 1 + 2 files changed, 11 insertions(+) diff --git a/awx/api/serializers.py b/awx/api/serializers.py index 3a54012d62..cd81f7107f 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -2873,6 +2873,11 @@ class JobTemplateSerializer(JobTemplateMixin, UnifiedJobTemplateSerializer, JobO activity_stream=self.reverse('api:job_template_activity_stream_list', kwargs={'pk': obj.pk}), launch=self.reverse('api:job_template_launch', kwargs={'pk': obj.pk}), webhook_key=self.reverse('api:webhook_key', kwargs={'model_kwarg': 'job_templates', 'pk': obj.pk}), + webhook_receiver=( + self.reverse('api:webhook_receiver_{}'.format(obj.webhook_service), + kwargs={'model_kwarg': 'job_templates', 'pk': obj.pk}) + if obj.webhook_service else '' + ), notification_templates_started=self.reverse('api:job_template_notification_templates_started_list', kwargs={'pk': obj.pk}), notification_templates_success=self.reverse('api:job_template_notification_templates_success_list', kwargs={'pk': obj.pk}), notification_templates_error=self.reverse('api:job_template_notification_templates_error_list', kwargs={'pk': obj.pk}), @@ -3355,6 +3360,11 @@ class WorkflowJobTemplateSerializer(JobTemplateMixin, LabelsListMixin, UnifiedJo schedules = self.reverse('api:workflow_job_template_schedules_list', kwargs={'pk': obj.pk}), launch = self.reverse('api:workflow_job_template_launch', kwargs={'pk': obj.pk}), webhook_key=self.reverse('api:webhook_key', kwargs={'model_kwarg': 'workflow_job_templates', 'pk': obj.pk}), + webhook_receiver=( + self.reverse('api:webhook_receiver_{}'.format(obj.webhook_service), + kwargs={'model_kwarg': 'job_templates', 'pk': obj.pk}) + if obj.webhook_service else '' + ), workflow_nodes = self.reverse('api:workflow_job_template_workflow_nodes_list', kwargs={'pk': obj.pk}), labels = self.reverse('api:workflow_job_template_label_list', kwargs={'pk': obj.pk}), activity_stream = self.reverse('api:workflow_job_template_activity_stream_list', kwargs={'pk': obj.pk}), diff --git a/awx/main/tests/unit/api/serializers/test_job_template_serializers.py b/awx/main/tests/unit/api/serializers/test_job_template_serializers.py index 730d74229b..4c0751ffbe 100644 --- a/awx/main/tests/unit/api/serializers/test_job_template_serializers.py +++ b/awx/main/tests/unit/api/serializers/test_job_template_serializers.py @@ -29,6 +29,7 @@ def job_template(mocker): mock_jt.pk = 5 mock_jt.host_config_key = '9283920492' mock_jt.validation_errors = mock_JT_resource_data + mock_jt.webhook_service = '' return mock_jt