zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-04-13 03:21:49 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6968 from ryanpetrello/fix-6959

Browse Source 
fix a few issues in credential type kind validation
This commit is contained in:
Ryan Petrello
2017-07-11 13:30:07 -04:00
committed by GitHub
parent 6d251babb5 09055f9c2f
commit bc869284f7
3 changed files with 35 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
awx/api/metadata.py
View File

@@ -17,7 +17,7 @@ from rest_framework.relations import RelatedField, ManyRelatedField
from rest_framework.request import clone_request
# Ansible Tower
from awx.main.models import InventorySource, NotificationTemplate
from awx.main.models import InventorySource, NotificationTemplate, CredentialType
class Metadata(metadata.SimpleMetadata):
@@ -149,6 +149,16 @@ class Metadata(metadata.SimpleMetadata):
if field == 'type' and hasattr(serializer, 'get_type_choices'):
meta['choices'] = serializer.get_type_choices()
# API-created/modified CredentialType kinds are limited to
# `cloud` and `network`
if method != 'GET' and \
hasattr(serializer, 'Meta') and \
getattr(serializer.Meta, 'model', None) is CredentialType:
actions[method]['kind']['choices'] = filter(
lambda choice: choice[0] in ('cloud', 'net'),
actions[method]['kind']['choices']
)
# For GET method, remove meta attributes that aren't relevant
# when reading a field and remove write-only fields.
if method == 'GET':

4
awx/api/serializers.py
View File

@@ -1904,9 +1904,9 @@ class CredentialTypeSerializer(BaseSerializer):
)
ret = super(CredentialTypeSerializer, self).validate(attrs)
if 'kind' in attrs and attrs['kind'] not in ('cloud', 'network'):
if 'kind' in attrs and attrs['kind'] not in ('cloud', 'net'):
raise serializers.ValidationError({
"kind": _("Must be 'cloud' or 'network', not %s") % attrs['kind']
"kind": _("Must be 'cloud' or 'net', not %s") % attrs['kind']
})
fields = attrs.get('inputs', {}).get('fields', [])