a-c-m
/
community.general
mirror of https://github.com/ansible-collections/community.general.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

kibana_plugin: fixed remove call + run_command with list instead of str (#2143) (#2154) 

* fixed remove call + run_command with list instead of str

* fixed the other calls to run_command()

* added changelog fragment

* adjustment on run_command params

* Update changelogs/fragments/2143-kibana_plugin-fixed-function-calls.yml

Co-authored-by: Felix Fontein <felix@fontein.de>

Co-authored-by: Felix Fontein <felix@fontein.de>
(cherry picked from commit 3312ae08af)

Co-authored-by: Alexei Znamensky <103110+russoz@users.noreply.github.com>
pull/2165/head
Felix Fontein 2021-04-03 22:56:17 +02:00 committed by GitHub
parent 3b6ceeba0d
commit 0d1f2fd513
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changelogs/fragments/2143-kibana_plugin-fixed-function-calls.yml Normal file
View File

@ -0,0 +1,2 @@
bugfixes:
- kibana_plugin - added missing parameter to ``remove_plugin`` when using ``state=present force=true``, and fix potential quoting errors when invoking ``kibana`` (https://github.com/ansible-collections/community.general/pull/2143).

26
plugins/modules/database/misc/kibana_plugin.py
View File

@ -164,22 +164,20 @@ def install_plugin(module, plugin_bin, plugin_name, url, timeout, kibana_version
cmd_args = [plugin_bin, "plugin", PACKAGE_STATE_MAP["present"], plugin_name] cmd_args = [plugin_bin, "plugin", PACKAGE_STATE_MAP["present"], plugin_name]
if url: if url:
cmd_args.append("--url %s" % url) cmd_args.extend(["--url", url])
if timeout: if timeout:
cmd_args.append("--timeout %s" % timeout) cmd_args.extend(["--timeout", timeout])
cmd = " ".join(cmd_args)
if module.check_mode: if module.check_mode:
return True, cmd, "check mode", "" return True, " ".join(cmd_args), "check mode", ""
rc, out, err = module.run_command(cmd) rc, out, err = module.run_command(cmd_args)
if rc != 0: if rc != 0:
reason = parse_error(out) reason = parse_error(out)
module.fail_json(msg=reason) module.fail_json(msg=reason)
return True, cmd, out, err return True, " ".join(cmd_args), out, err
def remove_plugin(module, plugin_bin, plugin_name, kibana_version='4.6'): def remove_plugin(module, plugin_bin, plugin_name, kibana_version='4.6'):
@ -189,23 +187,21 @@ def remove_plugin(module, plugin_bin, plugin_name, kibana_version='4.6'):
else: else:
cmd_args = [plugin_bin, "plugin", PACKAGE_STATE_MAP["absent"], plugin_name] cmd_args = [plugin_bin, "plugin", PACKAGE_STATE_MAP["absent"], plugin_name]
cmd = " ".join(cmd_args)
if module.check_mode: if module.check_mode:
return True, cmd, "check mode", "" return True, " ".join(cmd_args), "check mode", ""
rc, out, err = module.run_command(cmd) rc, out, err = module.run_command(cmd_args)
if rc != 0: if rc != 0:
reason = parse_error(out) reason = parse_error(out)
module.fail_json(msg=reason) module.fail_json(msg=reason)
return True, cmd, out, err return True, " ".join(cmd_args), out, err
def get_kibana_version(module, plugin_bin): def get_kibana_version(module, plugin_bin):
cmd_args = [plugin_bin, '--version'] cmd_args = [plugin_bin, '--version']
cmd = " ".join(cmd_args)
rc, out, err = module.run_command(cmd) rc, out, err = module.run_command(cmd_args)
if rc != 0: if rc != 0:
module.fail_json(msg="Failed to get Kibana version : %s" % err) module.fail_json(msg="Failed to get Kibana version : %s" % err)
@ -251,7 +247,7 @@ def main():
if state == "present": if state == "present":
if force: if force:
remove_plugin(module, plugin_bin, name) remove_plugin(module, plugin_bin, name, kibana_version)
changed, cmd, out, err = install_plugin(module, plugin_bin, name, url, timeout, kibana_version) changed, cmd, out, err = install_plugin(module, plugin_bin, name, url, timeout, kibana_version)
elif state == "absent": elif state == "absent":