ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-23 05:10:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix inconsitencies between code assumptions and schema (#34901)

Browse source 
* Fix inconsitencies between code assumptions and schema

* Address a couple of RETURN issues, where the description was parsed as a dict
This commit is contained in:
Matt Martz 2018-01-15 18:29:20 -06:00 • committed by GitHub
commit 19ab882790
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/sanity/validate-modules/main.py
View file

@ -1065,7 +1065,7 @@ class ModuleValidator(Validator):
for option, details in options.items():
try:
names = [option] + details.get('aliases', [])
except AttributeError:
except (TypeError, AttributeError):
# Reporting of this syntax error will be handled by schema validation.
continue

6
test/sanity/validate-modules/schema.py
View file

@ -25,7 +25,7 @@ suboption_schema = Schema(
Required('description'): Any(list_string_types, *string_types),
'required': bool,
'choices': list,
'aliases': Any(list, *string_types),
'aliases': Any(list_string_types),
'version_added': Any(float, *string_types),
'default': Any(None, float, int, bool, list, dict, *string_types),
# Note: Types are strings, not literal bools, such as True or False
@ -43,7 +43,7 @@ option_schema = Schema(
Required('description'): Any(list_string_types, *string_types),
'required': bool,
'choices': list,
'aliases': Any(list, *string_types),
'aliases': Any(list_string_types),
'version_added': Any(float, *string_types),
'default': Any(None, float, int, bool, list, dict, *string_types),
'suboptions': Any(None, *list_dict_suboption_schema),
@ -61,7 +61,7 @@ list_dict_option_schema = [{str_type: option_schema} for str_type in string_type
def return_schema(data):
return_schema_dict = {
Required('description'): Any(list, *string_types),
Required('description'): Any(list_string_types, *string_types),
Required('returned'): Any(*string_types),
Required('type'): Any('string', 'list', 'boolean', 'dict', 'complex', 'bool', 'float', 'int', 'dictionary', 'str'),
'version_added': Any(float, *string_types),