internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-07 05:42:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Perform full RETURN schema validation in one step, don't try to loop (#46079)

Browse Source
This commit is contained in:
Matt Martz
2018-09-24 16:38:04 -05:00
committed by GitHub
parent c5a8a911b3
commit 86e8d21667
3 changed files with 44 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
test/sanity/validate-modules/main.py
View File

@@ -823,10 +823,15 @@ class ModuleValidator(Validator):
else:
error_message = error
if path:
combined_path = '%s.%s' % (name, '.'.join(path))
else:
combined_path = name
self.reporter.error(
path=self.object_path,
code=error_code,
msg='%s.%s: %s' % (name, '.'.join(path), error_message)
msg='%s: %s' % (combined_path, error_message)
)
def _validate_docs(self):
@@ -980,7 +985,6 @@ class ModuleValidator(Validator):
msg='No EXAMPLES provided'
)
else:
examples_exists = True
_, errors, traces = parse_yaml(doc_info['EXAMPLES']['value'],
doc_info['EXAMPLES']['lineno'],
self.name, 'EXAMPLES', load_all=True)
@@ -997,7 +1001,6 @@ class ModuleValidator(Validator):
)
if not bool(doc_info['RETURN']['value']):
returns_exists = True
if self._is_new_module():
self.reporter.error(
path=self.object_path,
@@ -1014,9 +1017,7 @@ class ModuleValidator(Validator):
data, errors, traces = parse_yaml(doc_info['RETURN']['value'],
doc_info['RETURN']['lineno'],
self.name, 'RETURN')
if data:
for ret_key in data:
self._validate_docs_schema(data[ret_key], return_schema(data[ret_key]), 'RETURN.%s' % ret_key, 319)
self._validate_docs_schema(data, return_schema, 'RETURN', 319)
for error in errors:
self.reporter.error(