External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-18 11:40:05 -03:30
Code Issues Packages Projects Releases Wiki Activity

remove the global /api/v2/job_events/ endpoint

Browse Source
This commit is contained in:
Ryan Petrello
2021-03-01 13:37:09 -05:00
committed by Jim Ladd
parent 08b96a0bd7
commit b19bcdd882
3 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/api/urls/job_event.py
View File

@@ -3,11 +3,10 @@
from django.conf.urls import url from django.conf.urls import url
from awx.api.views import JobEventList, JobEventDetail, JobEventChildrenList, JobEventHostsList from awx.api.views import JobEventDetail, JobEventChildrenList, JobEventHostsList
urls = [ urls = [
url(r'^$', JobEventList.as_view(), name='job_event_list'),
url(r'^(?P<pk>[0-9]+)/$', JobEventDetail.as_view(), name='job_event_detail'), url(r'^(?P<pk>[0-9]+)/$', JobEventDetail.as_view(), name='job_event_detail'),
url(r'^(?P<pk>[0-9]+)/children/$', JobEventChildrenList.as_view(), name='job_event_children_list'), url(r'^(?P<pk>[0-9]+)/children/$', JobEventChildrenList.as_view(), name='job_event_children_list'),
url(r'^(?P<pk>[0-9]+)/hosts/$', JobEventHostsList.as_view(), name='job_event_hosts_list'), url(r'^(?P<pk>[0-9]+)/hosts/$', JobEventHostsList.as_view(), name='job_event_hosts_list'),

13
awx/api/views/__init__.py
View File

@@ -3738,13 +3738,6 @@ class JobHostSummaryDetail(RetrieveAPIView):
serializer_class = serializers.JobHostSummarySerializer serializer_class = serializers.JobHostSummarySerializer
class JobEventList(NoTruncateMixin, ListAPIView):
model = models.JobEvent
serializer_class = serializers.JobEventSerializer
search_fields = ('stdout',)
class JobEventDetail(RetrieveAPIView): class JobEventDetail(RetrieveAPIView):
model = models.JobEvent model = models.JobEvent
@@ -3768,7 +3761,11 @@ class JobEventChildrenList(NoTruncateMixin, SubListAPIView):
def get_queryset(self): def get_queryset(self):
parent_event = self.get_parent_object() parent_event = self.get_parent_object()
self.check_parent_access(parent_event) self.check_parent_access(parent_event)
qs = self.request.user.get_queryset(self.model).filter(parent_uuid=parent_event.uuid) qs = self.request.user.get_queryset(self.model).filter(
parent_uuid=parent_event.uuid
).filter(
job_created=parent_event.job.created_or_epoch
)
return qs return qs

1
awx/api/views/root.py
View File

@@ -106,7 +106,6 @@ class ApiVersionRootView(APIView):
data['hosts'] = reverse('api:host_list', request=request) data['hosts'] = reverse('api:host_list', request=request)
data['job_templates'] = reverse('api:job_template_list', request=request) data['job_templates'] = reverse('api:job_template_list', request=request)
data['jobs'] = reverse('api:job_list', request=request) data['jobs'] = reverse('api:job_list', request=request)
data['job_events'] = reverse('api:job_event_list', request=request)
data['ad_hoc_commands'] = reverse('api:ad_hoc_command_list', request=request) data['ad_hoc_commands'] = reverse('api:ad_hoc_command_list', request=request)
data['system_job_templates'] = reverse('api:system_job_template_list', request=request) data['system_job_templates'] = reverse('api:system_job_template_list', request=request)
data['system_jobs'] = reverse('api:system_job_list', request=request) data['system_jobs'] = reverse('api:system_job_list', request=request)