External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-04-11 13:09:21 -02:30
Code Issues Packages Projects Releases Wiki Activity

Make Inventory and Project required when initially launching.

Browse Source 
This prevents the scenario where an inactive-but-present project or
inventory on a job template would carry on even when we wouldn't want
it to
This commit is contained in:
Matthew Jones
2015-01-21 11:05:14 -05:00
parent bb5f3243e3
commit 873afd64d2
2 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/api/views.py
View File

@@ -1458,6 +1458,10 @@ class JobTemplateLaunch(GenericAPIView):
status=status.HTTP_400_BAD_REQUEST) status=status.HTTP_400_BAD_REQUEST)
if obj.credential is None and ('credential' not in request.DATA and 'credential_id' not in request.DATA): if obj.credential is None and ('credential' not in request.DATA and 'credential_id' not in request.DATA):
return Response(dict(errors="Credential not provided"), status=status.HTTP_400_BAD_REQUEST) return Response(dict(errors="Credential not provided"), status=status.HTTP_400_BAD_REQUEST)
if obj.project is None or not obj.project.active:
return Response(dict(errors="Job Template Project is missing or undefined"), status=status.HTTP_400_BAD_REQUEST)
if obj.inventory is None or not obj.inventory.active:
return Response(dict(errors="Job Template Inventory is missing or undefined"), status=status.HTTP_400_BAD_REQUEST)
new_job = obj.create_unified_job(**request.DATA) new_job = obj.create_unified_job(**request.DATA)
result = new_job.signal_start(**request.DATA) result = new_job.signal_start(**request.DATA)
if not result: if not result:

23
awx/main/tests/jobs.py
View File

@@ -1038,6 +1038,7 @@ class JobTemplateTest(BaseJobTestMixin, django.test.TestCase):
project = self.proj_dev.pk, project = self.proj_dev.pk,
playbook = self.proj_dev.playbooks[0], playbook = self.proj_dev.playbooks[0],
) )
with self.current_user(self.user_sue): with self.current_user(self.user_sue):
response = self.post(url, data, expect=201) response = self.post(url, data, expect=201)
detail_url = reverse('api:job_template_detail', detail_url = reverse('api:job_template_detail',
@@ -1073,6 +1074,28 @@ class JobTemplateTest(BaseJobTestMixin, django.test.TestCase):
with self.current_user(self.user_sue): with self.current_user(self.user_sue):
response = self.post(no_launch_url, {}, expect=400) response = self.post(no_launch_url, {}, expect=400)
# Job Templates without projects can not be launched
with self.current_user(self.user_sue):
data['name'] = "missing proj"
response = self.post(url, data, expect=201)
jt = JobTemplate.objects.get(pk=response['id'])
jt.project = None
jt.save()
launch_url = reverse('api:job_template_launch',
args=(response['id'],))
self.post(launch_url, {}, expect=400)
# Job Templates without inventory can not be launched
with self.current_user(self.user_sue):
data['name'] = "missing inv"
response = self.post(url, data, expect=201)
jt = JobTemplate.objects.get(pk=response['id'])
jt.inventory = None
jt.save()
launch_url = reverse('api:job_template_launch',
args=(response['id'],))
self.post(launch_url, {}, expect=400)
class JobTest(BaseJobTestMixin, django.test.TestCase): class JobTest(BaseJobTestMixin, django.test.TestCase):
def test_get_job_list(self): def test_get_job_list(self):