Fix metadump (#75668)

* ensure dump produces json

* clog and tests

* remove library additions since they are not usable

* avoid any/all dirs

* ensure we dont use local dir as playbookdir
pull/75704/head
Brian Coca 3 years ago committed by GitHub
parent 469b559ebe
commit 3d83c325dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -0,0 +1,2 @@
bugfixes:
- ansible-doc, fix output for internal metadata dump option

@ -647,7 +647,7 @@ class DocCLI(CLI, RoleMixin):
basedir = context.CLIARGS['basedir']
plugin_type = context.CLIARGS['type']
do_json = context.CLIARGS['json_format']
do_json = context.CLIARGS['json_format'] or context.CLIARGS['dump']
roles_path = context.CLIARGS['roles_path']
listing = context.CLIARGS['list_files'] or context.CLIARGS['list_dir'] or context.CLIARGS['dump']
docs = {}

@ -99,3 +99,6 @@ test "$current_out" == "$expected_out"
current_out="$(ansible-doc --json --playbook-dir ./ -t vars testns.testcol.noop_vars_plugin | sed 's/ *$//' | sed 's/ *"filename": "[^"]*",$//')"
expected_out="$(sed 's/ *"filename": "[^"]*",$//' noop_vars_plugin.output)"
test "$current_out" == "$expected_out"
# just ensure it runs
ANSIBLE_LIBRARY='./nolibrary' ansible-doc --metadata-dump --playbook-dir /dev/null

Loading…
Cancel
Save