From 299b0d78c833308b4d36cf852b1bd60935f61948 Mon Sep 17 00:00:00 2001 From: Chris Meyers Date: Fri, 24 Apr 2015 12:43:48 -0400 Subject: [PATCH] removed the need to access data in the serializer. It's now clear what params a job template launch takes --- awx/api/serializers.py | 10 ++-------- awx/api/views.py | 12 +++++++----- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/awx/api/serializers.py b/awx/api/serializers.py index b4ce8835d7..617bc48517 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -1695,7 +1695,6 @@ class JobLaunchSerializer(BaseSerializer): passwords_needed_to_start = serializers.Field(source='passwords_needed_to_start') can_start_without_user_input = serializers.Field(source='can_start_without_user_input') variables_needed_to_start = serializers.Field(source='variables_needed_to_start') - credential_id = serializers.IntegerField(write_only=True, required=False) credential_needed_to_start = serializers.SerializerMethodField('get_credential_needed_to_start') survey_enabled = serializers.SerializerMethodField('get_survey_enabled') @@ -1703,7 +1702,7 @@ class JobLaunchSerializer(BaseSerializer): model = JobTemplate fields = ('can_start_without_user_input', 'passwords_needed_to_start', 'extra_vars', 'ask_variables_on_launch', 'survey_enabled', 'variables_needed_to_start', - 'credential_id', 'credential', 'credential_needed_to_start',) + 'credential', 'credential_needed_to_start',) read_only_fields = ('ask_variables_on_launch',) write_only_fields = ('credential','extra_vars',) @@ -1746,8 +1745,7 @@ class JobLaunchSerializer(BaseSerializer): def validate(self, attrs): obj = self.context.get('obj') - data = self.context.get('data') - sanitary_fields = ('credential', 'credential_id', 'extra_vars') + if not self.cred_valid(obj) and (attrs.get('credential', None) is None and attrs.get('credential_id', None) is None): raise serializers.ValidationError(dict(errors=["Credential not provided"])) if obj.job_type != PERM_INVENTORY_SCAN and (obj.project is None or not obj.project.active): @@ -1755,10 +1753,6 @@ class JobLaunchSerializer(BaseSerializer): if obj.inventory is None or not obj.inventory.active: raise serializers.ValidationError(dict(errors=["Job Template Inventory is missing or undefined"])) - data.clear() - for field in sanitary_fields: - if field in attrs: - data[field] = attrs[field] return attrs class ScheduleSerializer(BaseSerializer): diff --git a/awx/api/views.py b/awx/api/views.py index 499ef8b2c7..a2b3cd699b 100644 --- a/awx/api/views.py +++ b/awx/api/views.py @@ -1445,14 +1445,16 @@ class JobTemplateLaunch(RetrieveAPIView, GenericAPIView): if not request.user.can_access(self.model, 'start', obj): raise PermissionDenied() - # Note: is_valid() may modify request.DATA - # It will remove any key/value pair who's key is not credential, credential_id, or extra_vars - serializer = self.serializer_class(data=request.DATA, context={'obj': obj, 'data': request.DATA}) + serializer = self.serializer_class(data=request.DATA, context={'obj': obj}) if not serializer.is_valid(): return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) - new_job = obj.create_unified_job(**request.DATA) - result = new_job.signal_start(**request.DATA) + kv = { + 'credential': serializer.object.credential, + 'extra_vars': serializer.object.extra_vars + } + new_job = obj.create_unified_job(**kv) + result = new_job.signal_start(**kv) if not result: data = dict(passwords_needed_to_start=new_job.passwords_needed_to_start) new_job.delete()