1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-04-30 23:48:54 +00:00

Reformat everything.

This commit is contained in:
Felix Fontein 2025-11-01 12:08:41 +01:00
parent 3f2213791a
commit 340ff8586d
1008 changed files with 61301 additions and 58309 deletions

View file

@ -15,7 +15,7 @@ from ansible.utils import context_objects as co
@pytest.fixture
def parser():
parser = opt_help.create_base_parser('testparser')
parser = opt_help.create_base_parser("testparser")
opt_help.add_runas_options(parser)
opt_help.add_meta_options(parser)

View file

@ -1,4 +1,3 @@
# Copyright (c) 2012-2014, Michael DeHaan <michael.dehaan@gmail.com>
#
# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
@ -11,7 +10,7 @@ from ansible.plugins.loader import become_loader, get_shell_plugin
def call_become_plugin(task, var_options, cmd, executable=None):
"""Helper function to call become plugin similarly on how Ansible itself handles this."""
plugin = become_loader.get(task['become_method'])
plugin = become_loader.get(task["become_method"])
plugin.set_options(task_keys=task, var_options=var_options)
shell = get_shell_plugin(executable=executable)
return plugin.build_become_command(cmd, shell)

View file

@ -20,18 +20,18 @@ def test_doas_basic(mocker, parser, reset_cli_args):
default_cmd = "/bin/foo"
default_exe = "/bin/bash"
doas_exe = 'doas'
doas_flags = '-n'
doas_exe = "doas"
doas_flags = "-n"
success = 'BECOME-SUCCESS-.+?'
success = "BECOME-SUCCESS-.+?"
task = {
'become_method': 'community.general.doas',
"become_method": "community.general.doas",
}
var_options = {}
cmd = call_become_plugin(task, var_options, cmd=default_cmd, executable=default_exe)
print(cmd)
assert (re.match(f"""{doas_exe} {doas_flags} {default_exe} -c 'echo {success}; {default_cmd}'""", cmd) is not None)
assert re.match(f"""{doas_exe} {doas_flags} {default_exe} -c 'echo {success}; {default_cmd}'""", cmd) is not None
def test_doas(mocker, parser, reset_cli_args):
@ -40,20 +40,26 @@ def test_doas(mocker, parser, reset_cli_args):
default_cmd = "/bin/foo"
default_exe = "/bin/bash"
doas_exe = 'doas'
doas_flags = '-n'
doas_exe = "doas"
doas_flags = "-n"
success = 'BECOME-SUCCESS-.+?'
success = "BECOME-SUCCESS-.+?"
task = {
'become_user': 'foo',
'become_method': 'community.general.doas',
'become_flags': doas_flags,
"become_user": "foo",
"become_method": "community.general.doas",
"become_flags": doas_flags,
}
var_options = {}
cmd = call_become_plugin(task, var_options, cmd=default_cmd, executable=default_exe)
print(cmd)
assert (re.match(f"""{doas_exe} {doas_flags} -u {task['become_user']} {default_exe} -c 'echo {success}; {default_cmd}'""", cmd) is not None)
assert (
re.match(
f"""{doas_exe} {doas_flags} -u {task["become_user"]} {default_exe} -c 'echo {success}; {default_cmd}'""",
cmd,
)
is not None
)
def test_doas_varoptions(mocker, parser, reset_cli_args):
@ -62,20 +68,26 @@ def test_doas_varoptions(mocker, parser, reset_cli_args):
default_cmd = "/bin/foo"
default_exe = "/bin/bash"
doas_exe = 'doas'
doas_flags = '-n'
doas_exe = "doas"
doas_flags = "-n"
success = 'BECOME-SUCCESS-.+?'
success = "BECOME-SUCCESS-.+?"
task = {
'become_user': 'foo',
'become_method': 'community.general.doas',
'become_flags': 'xxx',
"become_user": "foo",
"become_method": "community.general.doas",
"become_flags": "xxx",
}
var_options = {
'ansible_become_user': 'bar',
'ansible_become_flags': doas_flags,
"ansible_become_user": "bar",
"ansible_become_flags": doas_flags,
}
cmd = call_become_plugin(task, var_options, cmd=default_cmd, executable=default_exe)
print(cmd)
assert (re.match(f"""{doas_exe} {doas_flags} -u {var_options['ansible_become_user']} {default_exe} -c 'echo {success}; {default_cmd}'""", cmd) is not None)
assert (
re.match(
f"""{doas_exe} {doas_flags} -u {var_options["ansible_become_user"]} {default_exe} -c 'echo {success}; {default_cmd}'""",
cmd,
)
is not None
)

View file

@ -20,13 +20,13 @@ def test_dzdo_basic(mocker, parser, reset_cli_args):
default_cmd = "/bin/foo"
default_exe = "/bin/bash"
dzdo_exe = 'dzdo'
dzdo_flags = '-H -S -n'
dzdo_exe = "dzdo"
dzdo_flags = "-H -S -n"
success = 'BECOME-SUCCESS-.+?'
success = "BECOME-SUCCESS-.+?"
task = {
'become_method': 'community.general.dzdo',
"become_method": "community.general.dzdo",
}
var_options = {}
cmd = call_become_plugin(task, var_options, cmd=default_cmd, executable=default_exe)
@ -40,25 +40,45 @@ def test_dzdo(mocker, parser, reset_cli_args):
default_cmd = "/bin/foo"
default_exe = "/bin/bash"
dzdo_exe = 'dzdo'
dzdo_flags = ''
dzdo_exe = "dzdo"
dzdo_flags = ""
success = 'BECOME-SUCCESS-.+?'
success = "BECOME-SUCCESS-.+?"
task = {
'become_user': 'foo',
'become_method': 'community.general.dzdo',
'become_flags': dzdo_flags,
"become_user": "foo",
"become_method": "community.general.dzdo",
"become_flags": dzdo_flags,
}
var_options = {}
cmd = call_become_plugin(task, var_options, cmd=default_cmd, executable=default_exe)
print(cmd)
assert re.match(f"""{dzdo_exe} {dzdo_flags} -u {task['become_user']} {default_exe} -c 'echo {success}; {default_cmd}'""", cmd) is not None
task['become_pass'] = 'testpass'
assert (
re.match(
f"""{dzdo_exe} {dzdo_flags} -u {task["become_user"]} {default_exe} -c 'echo {success}; {default_cmd}'""",
cmd,
)
is not None
)
task["become_pass"] = "testpass"
cmd = call_become_plugin(task, var_options, cmd=default_cmd, executable=default_exe)
print(cmd)
assert re.match("""%s %s -p %s -u %s %s -c 'echo %s; %s'""" % (dzdo_exe, dzdo_flags, r'\"\[dzdo via ansible, key=.+?\] password:\"',
task['become_user'], default_exe, success, default_cmd), cmd) is not None
assert (
re.match(
"""%s %s -p %s -u %s %s -c 'echo %s; %s'"""
% (
dzdo_exe,
dzdo_flags,
r"\"\[dzdo via ansible, key=.+?\] password:\"",
task["become_user"],
default_exe,
success,
default_cmd,
),
cmd,
)
is not None
)
def test_dzdo_varoptions(mocker, parser, reset_cli_args):
@ -67,25 +87,45 @@ def test_dzdo_varoptions(mocker, parser, reset_cli_args):
default_cmd = "/bin/foo"
default_exe = "/bin/bash"
dzdo_exe = 'dzdo'
dzdo_flags = ''
dzdo_exe = "dzdo"
dzdo_flags = ""
success = 'BECOME-SUCCESS-.+?'
success = "BECOME-SUCCESS-.+?"
task = {
'become_user': 'foo',
'become_method': 'community.general.dzdo',
'become_flags': 'xxx',
"become_user": "foo",
"become_method": "community.general.dzdo",
"become_flags": "xxx",
}
var_options = {
'ansible_become_user': 'bar',
'ansible_become_flags': dzdo_flags,
"ansible_become_user": "bar",
"ansible_become_flags": dzdo_flags,
}
cmd = call_become_plugin(task, var_options, cmd=default_cmd, executable=default_exe)
print(cmd)
assert re.match(f"""{dzdo_exe} {dzdo_flags} -u {var_options['ansible_become_user']} {default_exe} -c 'echo {success}; {default_cmd}'""", cmd) is not None
var_options['ansible_become_pass'] = 'testpass'
assert (
re.match(
f"""{dzdo_exe} {dzdo_flags} -u {var_options["ansible_become_user"]} {default_exe} -c 'echo {success}; {default_cmd}'""",
cmd,
)
is not None
)
var_options["ansible_become_pass"] = "testpass"
cmd = call_become_plugin(task, var_options, cmd=default_cmd, executable=default_exe)
print(cmd)
assert re.match("""%s %s -p %s -u %s %s -c 'echo %s; %s'""" % (dzdo_exe, dzdo_flags, r'\"\[dzdo via ansible, key=.+?\] password:\"',
var_options['ansible_become_user'], default_exe, success, default_cmd), cmd) is not None
assert (
re.match(
"""%s %s -p %s -u %s %s -c 'echo %s; %s'"""
% (
dzdo_exe,
dzdo_flags,
r"\"\[dzdo via ansible, key=.+?\] password:\"",
var_options["ansible_become_user"],
default_exe,
success,
default_cmd,
),
cmd,
)
is not None
)

View file

@ -20,19 +20,24 @@ def test_ksu_basic(mocker, parser, reset_cli_args):
default_cmd = "/bin/foo"
default_exe = "/bin/bash"
ksu_exe = 'ksu'
ksu_flags = ''
ksu_exe = "ksu"
ksu_flags = ""
success = 'BECOME-SUCCESS-.+?'
success = "BECOME-SUCCESS-.+?"
task = {
'become_user': 'foo',
'become_method': 'community.general.ksu',
"become_user": "foo",
"become_method": "community.general.ksu",
}
var_options = {}
cmd = call_become_plugin(task, var_options, cmd=default_cmd, executable=default_exe)
print(cmd)
assert (re.match(f"""{ksu_exe} {task['become_user']} {ksu_flags} -e {default_exe} -c 'echo {success}; {default_cmd}'""", cmd) is not None)
assert (
re.match(
f"""{ksu_exe} {task["become_user"]} {ksu_flags} -e {default_exe} -c 'echo {success}; {default_cmd}'""", cmd
)
is not None
)
def test_ksu(mocker, parser, reset_cli_args):
@ -41,20 +46,25 @@ def test_ksu(mocker, parser, reset_cli_args):
default_cmd = "/bin/foo"
default_exe = "/bin/bash"
ksu_exe = 'ksu'
ksu_flags = ''
ksu_exe = "ksu"
ksu_flags = ""
success = 'BECOME-SUCCESS-.+?'
success = "BECOME-SUCCESS-.+?"
task = {
'become_user': 'foo',
'become_method': 'community.general.ksu',
'become_flags': ksu_flags,
"become_user": "foo",
"become_method": "community.general.ksu",
"become_flags": ksu_flags,
}
var_options = {}
cmd = call_become_plugin(task, var_options, cmd=default_cmd, executable=default_exe)
print(cmd)
assert (re.match(f"""{ksu_exe} {task['become_user']} {ksu_flags} -e {default_exe} -c 'echo {success}; {default_cmd}'""", cmd) is not None)
assert (
re.match(
f"""{ksu_exe} {task["become_user"]} {ksu_flags} -e {default_exe} -c 'echo {success}; {default_cmd}'""", cmd
)
is not None
)
def test_ksu_varoptions(mocker, parser, reset_cli_args):
@ -63,20 +73,26 @@ def test_ksu_varoptions(mocker, parser, reset_cli_args):
default_cmd = "/bin/foo"
default_exe = "/bin/bash"
ksu_exe = 'ksu'
ksu_flags = ''
ksu_exe = "ksu"
ksu_flags = ""
success = 'BECOME-SUCCESS-.+?'
success = "BECOME-SUCCESS-.+?"
task = {
'become_user': 'foo',
'become_method': 'community.general.ksu',
'become_flags': 'xxx',
"become_user": "foo",
"become_method": "community.general.ksu",
"become_flags": "xxx",
}
var_options = {
'ansible_become_user': 'bar',
'ansible_become_flags': ksu_flags,
"ansible_become_user": "bar",
"ansible_become_flags": ksu_flags,
}
cmd = call_become_plugin(task, var_options, cmd=default_cmd, executable=default_exe)
print(cmd)
assert (re.match(f"""{ksu_exe} {var_options['ansible_become_user']} {ksu_flags} -e {default_exe} -c 'echo {success}; {default_cmd}'""", cmd) is not None)
assert (
re.match(
f"""{ksu_exe} {var_options["ansible_become_user"]} {ksu_flags} -e {default_exe} -c 'echo {success}; {default_cmd}'""",
cmd,
)
is not None
)

View file

@ -20,13 +20,13 @@ def test_pbrun_basic(mocker, parser, reset_cli_args):
default_cmd = "/bin/foo"
default_exe = "/bin/bash"
pbrun_exe = 'pbrun'
pbrun_flags = ''
pbrun_exe = "pbrun"
pbrun_flags = ""
success = 'BECOME-SUCCESS-.+?'
success = "BECOME-SUCCESS-.+?"
task = {
'become_method': 'community.general.pbrun',
"become_method": "community.general.pbrun",
}
var_options = {}
cmd = call_become_plugin(task, var_options, cmd=default_cmd, executable=default_exe)
@ -40,20 +40,23 @@ def test_pbrun(mocker, parser, reset_cli_args):
default_cmd = "/bin/foo"
default_exe = "/bin/bash"
pbrun_exe = 'pbrun'
pbrun_flags = ''
pbrun_exe = "pbrun"
pbrun_flags = ""
success = 'BECOME-SUCCESS-.+?'
success = "BECOME-SUCCESS-.+?"
task = {
'become_user': 'foo',
'become_method': 'community.general.pbrun',
'become_flags': pbrun_flags,
"become_user": "foo",
"become_method": "community.general.pbrun",
"become_flags": pbrun_flags,
}
var_options = {}
cmd = call_become_plugin(task, var_options, cmd=default_cmd, executable=default_exe)
print(cmd)
assert re.match(f"""{pbrun_exe} {pbrun_flags} -u {task['become_user']} 'echo {success}; {default_cmd}'""", cmd) is not None
assert (
re.match(f"""{pbrun_exe} {pbrun_flags} -u {task["become_user"]} 'echo {success}; {default_cmd}'""", cmd)
is not None
)
def test_pbrun_var_varoptions(mocker, parser, reset_cli_args):
@ -62,20 +65,26 @@ def test_pbrun_var_varoptions(mocker, parser, reset_cli_args):
default_cmd = "/bin/foo"
default_exe = "/bin/bash"
pbrun_exe = 'pbrun'
pbrun_flags = ''
pbrun_exe = "pbrun"
pbrun_flags = ""
success = 'BECOME-SUCCESS-.+?'
success = "BECOME-SUCCESS-.+?"
task = {
'become_user': 'foo',
'become_method': 'community.general.pbrun',
'become_flags': 'xxx',
"become_user": "foo",
"become_method": "community.general.pbrun",
"become_flags": "xxx",
}
var_options = {
'ansible_become_user': 'bar',
'ansible_become_flags': pbrun_flags,
"ansible_become_user": "bar",
"ansible_become_flags": pbrun_flags,
}
cmd = call_become_plugin(task, var_options, cmd=default_cmd, executable=default_exe)
print(cmd)
assert re.match(f"""{pbrun_exe} {pbrun_flags} -u {var_options['ansible_become_user']} 'echo {success}; {default_cmd}'""", cmd) is not None
assert (
re.match(
f"""{pbrun_exe} {pbrun_flags} -u {var_options["ansible_become_user"]} 'echo {success}; {default_cmd}'""",
cmd,
)
is not None
)

View file

@ -20,13 +20,13 @@ def test_pfexec_basic(mocker, parser, reset_cli_args):
default_cmd = "/bin/foo"
default_exe = "/bin/bash"
pfexec_exe = 'pfexec'
pfexec_flags = '-H -S -n'
pfexec_exe = "pfexec"
pfexec_flags = "-H -S -n"
success = 'BECOME-SUCCESS-.+?'
success = "BECOME-SUCCESS-.+?"
task = {
'become_method': 'community.general.pfexec',
"become_method": "community.general.pfexec",
}
var_options = {}
cmd = call_become_plugin(task, var_options, cmd=default_cmd, executable=default_exe)
@ -40,15 +40,15 @@ def test_pfexec(mocker, parser, reset_cli_args):
default_cmd = "/bin/foo"
default_exe = "/bin/bash"
pfexec_exe = 'pfexec'
pfexec_flags = ''
pfexec_exe = "pfexec"
pfexec_flags = ""
success = 'BECOME-SUCCESS-.+?'
success = "BECOME-SUCCESS-.+?"
task = {
'become_user': 'foo',
'become_method': 'community.general.pfexec',
'become_flags': pfexec_flags,
"become_user": "foo",
"become_method": "community.general.pfexec",
"become_flags": pfexec_flags,
}
var_options = {}
cmd = call_become_plugin(task, var_options, cmd=default_cmd, executable=default_exe)
@ -62,19 +62,19 @@ def test_pfexec_varoptions(mocker, parser, reset_cli_args):
default_cmd = "/bin/foo"
default_exe = "/bin/bash"
pfexec_exe = 'pfexec'
pfexec_flags = ''
pfexec_exe = "pfexec"
pfexec_flags = ""
success = 'BECOME-SUCCESS-.+?'
success = "BECOME-SUCCESS-.+?"
task = {
'become_user': 'foo',
'become_method': 'community.general.pfexec',
'become_flags': 'xxx',
"become_user": "foo",
"become_method": "community.general.pfexec",
"become_flags": "xxx",
}
var_options = {
'ansible_become_user': 'bar',
'ansible_become_flags': pfexec_flags,
"ansible_become_user": "bar",
"ansible_become_flags": pfexec_flags,
}
cmd = call_become_plugin(task, var_options, cmd=default_cmd, executable=default_exe)
print(cmd)

View file

@ -20,30 +20,49 @@ def test_sudosu(mocker, parser, reset_cli_args):
default_cmd = "/bin/foo"
default_exe = "/bin/bash"
sudo_exe = 'sudo'
sudo_flags = '-H -s -n'
sudo_exe = "sudo"
sudo_flags = "-H -s -n"
success = 'BECOME-SUCCESS-.+?'
success = "BECOME-SUCCESS-.+?"
task = {
'become_user': 'foo',
'become_method': 'community.general.sudosu',
'become_flags': sudo_flags,
"become_user": "foo",
"become_method": "community.general.sudosu",
"become_flags": sudo_flags,
}
var_options = {}
cmd = call_become_plugin(task, var_options, cmd=default_cmd, executable=default_exe)
print(cmd)
assert (re.match(f"""{sudo_exe} {sudo_flags} su -l {task['become_user']} {default_exe} -c 'echo {success}; {default_cmd}'""", cmd) is not None)
assert (
re.match(
f"""{sudo_exe} {sudo_flags} su -l {task["become_user"]} {default_exe} -c 'echo {success}; {default_cmd}'""",
cmd,
)
is not None
)
task = {
'become_user': 'foo',
'become_method': 'community.general.sudosu',
'become_flags': sudo_flags,
'become_pass': 'testpass',
"become_user": "foo",
"become_method": "community.general.sudosu",
"become_flags": sudo_flags,
"become_pass": "testpass",
}
var_options = {}
cmd = call_become_plugin(task, var_options, cmd=default_cmd, executable=default_exe)
print(cmd)
assert (re.match("""%s %s -p "%s" su -l %s %s -c 'echo %s; %s'""" % (sudo_exe, sudo_flags.replace('-n', ''),
r"\[sudo via ansible, key=.+?\] password:", task['become_user'],
default_exe, success, default_cmd), cmd) is not None)
assert (
re.match(
"""%s %s -p "%s" su -l %s %s -c 'echo %s; %s'"""
% (
sudo_exe,
sudo_flags.replace("-n", ""),
r"\[sudo via ansible, key=.+?\] password:",
task["become_user"],
default_exe,
success,
default_cmd,
),
cmd,
)
is not None
)