ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Fix the ability to run Composer "working_dir" dependent commands (#7405)

Browse source 
* pass the working_dir to all composer command invocations that are not global

* add changelog fragment

* Update changelog fragment

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

---------

Co-authored-by: Felix Fontein <felix@fontein.de>
This commit is contained in:
Xavier Lacot 2023-11-01 11:03:18 +04:00 committed by GitHub
parent b6e1d04c0c
commit f7267c7123
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/3787-pass-composer-working-dir.yml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- composer - fix impossible to run ``working_dir`` dependent commands. The module was throwing an error when trying to run a ``working_dir`` dependent command, because it tried to get the command help without passing the ``working_dir`` (https://github.com/ansible-collections/community.general/issues/3787).

13
plugins/modules/composer.py
View file

@ -170,10 +170,15 @@ def get_available_options(module, command='install'):
return command_help_json['definition']['options'] return command_help_json['definition']['options']
def composer_command(module, command, arguments="", options=None, global_command=False): def composer_command(module, command, arguments="", options=None):
if options is None: if options is None:
options = [] options = []
global_command = module.params['global_command']
if not global_command:
options.extend(['--working-dir', "'%s'" % module.params['working_dir']])
if module.params['executable'] is None: if module.params['executable'] is None:
php_path = module.get_bin_path("php", True, ["/usr/local/bin"]) php_path = module.get_bin_path("php", True, ["/usr/local/bin"])
else: else:
@ -217,7 +222,6 @@ def main():
module.fail_json(msg="Use the 'arguments' param for passing arguments with the 'command'") module.fail_json(msg="Use the 'arguments' param for passing arguments with the 'command'")
arguments = module.params['arguments'] arguments = module.params['arguments']
global_command = module.params['global_command']
available_options = get_available_options(module=module, command=command) available_options = get_available_options(module=module, command=command)
options = [] options = []
@ -234,9 +238,6 @@ def main():
option = "--%s" % option option = "--%s" % option
options.append(option) options.append(option)
if not global_command:
options.extend(['--working-dir', "'%s'" % module.params['working_dir']])
option_params = { option_params = {
'prefer_source': 'prefer-source', 'prefer_source': 'prefer-source',
'prefer_dist': 'prefer-dist', 'prefer_dist': 'prefer-dist',
@ -260,7 +261,7 @@ def main():
else: else:
module.exit_json(skipped=True, msg="command '%s' does not support check mode, skipping" % command) module.exit_json(skipped=True, msg="command '%s' does not support check mode, skipping" % command)
rc, out, err = composer_command(module, command, arguments, options, global_command) rc, out, err = composer_command(module, command, arguments, options)
if rc != 0: if rc != 0:
output = parse_out(err) output = parse_out(err)