From 380f6c6d6f864997dff5c8889042dfb9d81a9c10 Mon Sep 17 00:00:00 2001 From: Matthew Jones Date: Fri, 31 Jan 2014 05:17:26 -0500 Subject: [PATCH] Fix AC-1001, hide BROKER_URL from the job_env section of task api data --- awx/api/serializers.py | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/awx/api/serializers.py b/awx/api/serializers.py index 91a8983cb4..ff17384875 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -189,6 +189,18 @@ class BaseSerializer(serializers.ModelSerializer): else: return obj.active + +class BaseTaskSerializer(BaseSerializer): + + job_env = serializers.SerializerMethodField('get_job_env') + + def get_job_env(self, obj): + job_env_d = obj.job_env + if 'BROKER_URL' in job_env_d: + job_env_d.pop('BROKER_URL') + return job_env_d + + class UserSerializer(BaseSerializer): password = serializers.WritableField(required=False, default='', @@ -364,7 +376,7 @@ class ProjectPlaybooksSerializer(ProjectSerializer): return ret.get('playbooks', []) -class ProjectUpdateSerializer(BaseSerializer): +class ProjectUpdateSerializer(BaseTaskSerializer): result_stdout = serializers.Field(source='result_stdout') @@ -697,7 +709,7 @@ class InventorySourceSerializer(BaseSerializer): return metadata -class InventoryUpdateSerializer(BaseSerializer): +class InventoryUpdateSerializer(BaseTaskSerializer): result_stdout = serializers.Field(source='result_stdout') @@ -858,7 +870,7 @@ class JobTemplateSerializer(BaseSerializer): return attrs -class JobSerializer(BaseSerializer): +class JobSerializer(BaseTaskSerializer): passwords_needed_to_start = serializers.Field(source='passwords_needed_to_start') result_stdout = serializers.Field(source='result_stdout')