mirror of
https://github.com/ansible/awx.git
synced 2026-03-20 18:37:39 -02:30
fix a few issues in credential type kind validation
- fix a typo from `network` to `net` - properly update OPTIONS for CredentialTypes to reflect allowed `kind` values for POST/PUT/ see: #6959
This commit is contained in:
@@ -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':
|
||||
|
||||
Reference in New Issue
Block a user