cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

parse yaml metadata and more info on fragment err

Browse source
This commit is contained in:
Brian Coca 2017-01-18 19:19:17 -05:00
parent cae682607c
commit 5a48c7ac7a
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/ansible/utils/module_docs.py
View file

@ -104,7 +104,7 @@ def get_docstring(filename, verbose=False):
doc['notes'].extend(notes) doc['notes'].extend(notes)
if 'options' not in fragment: if 'options' not in fragment:
raise Exception("missing options in fragment, possibly misformatted?") raise Exception("missing options in fragment (%s), possibly misformatted?: %s" % (fragment_name, filename))
for key, value in fragment.items(): for key, value in fragment.items():
if key not in doc: if key not in doc:
@ -117,7 +117,7 @@ def get_docstring(filename, verbose=False):
elif isinstance(doc[key], MutableSequence): elif isinstance(doc[key], MutableSequence):
doc[key] = sorted(frozenset(doc[key] + value)) doc[key] = sorted(frozenset(doc[key] + value))
else: else:
raise Exception("Attempt to extend a documentation fragement of unknown type") raise Exception("Attempt to extend a documentation fragement (%s) of unknown type: %s" (fragment_name, filename))
elif 'EXAMPLES' == theid: elif 'EXAMPLES' == theid:
plainexamples = child.value.s[1:] # Skip first empty line plainexamples = child.value.s[1:] # Skip first empty line
@ -130,8 +130,12 @@ def get_docstring(filename, verbose=False):
if type(metadata).__name__ == 'Dict': if type(metadata).__name__ == 'Dict':
metadata = ast.literal_eval(child.value) metadata = ast.literal_eval(child.value)
else: else:
display.warning("Non-dict metadata detected in %s, skipping" % filename) # try yaml loading
metadata = dict() metadata = AnsibleLoader(child.value.s, file_name=filename).get_single_data()
if not isinstance(metadata, dict):
display.warning("Invalid metadata detected in %s, using defaults" % filename)
metadata = {'status': ['preview'], 'supported_by': 'community', 'version': '1.0'}
except: except:
display.error("unable to parse %s" % filename) display.error("unable to parse %s" % filename)