External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-08 09:57:35 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2343 from AlanCoding/credential_hell

Browse Source 
Copy JT credential logic to Job summary fields
This commit is contained in:
Alan Rominger
2018-06-28 19:27:33 -04:00
committed by GitHub
parent 1c194dbfbc a15527b54c
commit d5661a0434
1 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
awx/api/serializers.py
View File

@@ -3048,6 +3048,7 @@ class JobTemplateSerializer(JobTemplateMixin, UnifiedJobTemplateSerializer, JobO
summary_fields = super(JobTemplateSerializer, self).get_summary_fields(obj) summary_fields = super(JobTemplateSerializer, self).get_summary_fields(obj)
all_creds = [] all_creds = []
# Organize credential data into multitude of deprecated fields # Organize credential data into multitude of deprecated fields
# TODO: remove most of this as v1 is removed
vault_credential = None vault_credential = None
credential = None credential = None
extra_creds = [] extra_creds = []
@@ -3186,9 +3187,13 @@ class JobSerializer(UnifiedJobSerializer, JobOptionsSerializer):
def get_summary_fields(self, obj): def get_summary_fields(self, obj):
summary_fields = super(JobSerializer, self).get_summary_fields(obj) summary_fields = super(JobSerializer, self).get_summary_fields(obj)
if self.is_detail_view: # TODO: remove version check in 3.3 all_creds = []
all_creds = [] # Organize credential data into multitude of deprecated fields
extra_creds = [] # TODO: remove most of this as v1 is removed
vault_credential = None
credential = None
extra_creds = []
if obj.pk:
for cred in obj.credentials.all(): for cred in obj.credentials.all():
summarized_cred = { summarized_cred = {
'id': cred.pk, 'id': cred.pk,
@@ -3202,13 +3207,25 @@ class JobSerializer(UnifiedJobSerializer, JobOptionsSerializer):
all_creds.append(summarized_cred) all_creds.append(summarized_cred)
if cred.credential_type.kind in ('cloud', 'net'): if cred.credential_type.kind in ('cloud', 'net'):
extra_creds.append(summarized_cred) extra_creds.append(summarized_cred)
elif cred.credential_type.kind == 'ssh': elif summarized_cred['kind'] == 'ssh':
summary_fields['credential'] = summarized_cred credential = summarized_cred
elif cred.credential_type.kind == 'vault': elif summarized_cred['kind'] == 'vault':
summary_fields['vault_credential'] = summarized_cred vault_credential = summarized_cred
if self.version > 1: # Selectively apply those fields, depending on view deetails
if (self.is_detail_view or self.version == 1) and credential:
summary_fields['credential'] = credential
else:
# Credential could be an empty dictionary in this case
summary_fields.pop('credential', None)
if (self.is_detail_view or self.version == 1) and vault_credential:
summary_fields['vault_credential'] = vault_credential
else:
# vault credential could be empty dictionary
summary_fields.pop('vault_credential', None)
if self.version > 1:
if self.is_detail_view:
summary_fields['extra_credentials'] = extra_creds summary_fields['extra_credentials'] = extra_creds
summary_fields['credentials'] = all_creds summary_fields['credentials'] = all_creds
return summary_fields return summary_fields