External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-19 23:07:42 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8370 from ryanpetrello/fix-bad-extra-vars-warning

Browse Source 
fix a confusing error message when extra vars aren't valid JSON/YAML

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2020-10-12 20:17:15 +00:00
committed by GitHub
parent 49c0b77c60 0cdcbdfea6
commit bad064b577
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awxkit/awxkit/cli/options.py
View File

@@ -178,6 +178,9 @@ class ResourceOptionsParser(object):
except Exception: except Exception:
raise argparse.ArgumentTypeError("{} is not valid JSON or YAML".format(v)) raise argparse.ArgumentTypeError("{} is not valid JSON or YAML".format(v))
if not isinstance(parsed, dict):
raise argparse.ArgumentTypeError("{} is not valid JSON or YAML".format(v))
for k, v in parsed.items(): for k, v in parsed.items():
# add support for file reading at top-level JSON keys # add support for file reading at top-level JSON keys
# (to make things like SSH key data easier to work with) # (to make things like SSH key data easier to work with)