Changed the become_method field into one that takes arbitrary input

related #2630

Signed-off-by: Jeff Bradberry <jeff.bradberry@gmail.com>
This commit is contained in:
Jeff Bradberry
2019-01-28 14:49:59 -05:00
parent 155c214df0
commit 0ecd6542bf
5 changed files with 10 additions and 22 deletions

View File

@@ -4,7 +4,6 @@
# Python
import copy
import json
import operator
import re
import urllib.parse
@@ -45,7 +44,7 @@ from awx.main.utils.filters import SmartFilter
from awx.main.utils.encryption import encrypt_value, decrypt_value, get_encryption_key
from awx.main.validators import validate_ssh_private_key
from awx.main.models.rbac import batch_role_ancestor_rebuilding, Role
from awx.main.constants import CHOICES_PRIVILEGE_ESCALATION_METHODS, ENV_BLACKLIST
from awx.main.constants import ENV_BLACKLIST
from awx.main import utils
@@ -512,8 +511,7 @@ class CredentialInputField(JSONSchemaField):
for field in model_instance.credential_type.inputs.get('fields', []):
field = field.copy()
if field['type'] == 'become_method':
field.pop('type')
field['choices'] = list(map(operator.itemgetter(0), CHOICES_PRIVILEGE_ESCALATION_METHODS))
field['type'] = 'string'
properties[field['id']] = field
if field.get('choices', []):
field['enum'] = list(field['choices'])[:]
@@ -725,9 +723,6 @@ class CredentialTypeInputField(JSONSchemaField):
code='invalid',
params={'value': value},
)
else:
field.pop('type')
field['choices'] = CHOICES_PRIVILEGE_ESCALATION_METHODS
for key in ('choices', 'multiline', 'format', 'secret',):
if key in field and field['type'] != 'string':