From 85006d611fe55f554bf39a63a8a4e2a95be9eee1 Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Tue, 14 Dec 2021 17:17:17 +0100
Subject: [PATCH] Fix ansible-test reported pep8 errors
These are indent issues, one item per line for argument_specs items
containing options dicts and missing or overflow spaces for comments
and dict delimiters.
---
plugins/modules/ipaautomember.py | 14 +++++++++-----
plugins/modules/ipaconfig.py | 16 ++++++++--------
plugins/modules/ipadnsconfig.py | 29 ++++++++++++++---------------
plugins/modules/ipadnsrecord.py | 11 ++++++-----
plugins/modules/ipadnszone.py | 8 ++++----
plugins/modules/ipagroup.py | 14 +++++++-------
plugins/modules/iparole.py | 4 ++--
plugins/modules/ipaservice.py | 2 +-
plugins/modules/ipauser.py | 7 +++++--
plugins/modules/ipavault.py | 2 +-
utils/gen_module_docs.py | 10 +++++-----
11 files changed, 62 insertions(+), 55 deletions(-)
diff --git a/plugins/modules/ipaautomember.py b/plugins/modules/ipaautomember.py
index b99879af..c3b8e1a9 100644
--- a/plugins/modules/ipaautomember.py
+++ b/plugins/modules/ipaautomember.py
@@ -194,19 +194,23 @@ def main():
argument_spec=dict(
# general
inclusive=dict(type="list",
- aliases=["automemberinclusiveregex"], default=None,
+ aliases=["automemberinclusiveregex"],
+ default=None,
options=dict(
key=dict(type="str", required=True),
expression=dict(type="str", required=True)
),
- elements="dict", required=False),
- exclusive=dict(type="list", aliases=[
- "automemberexclusiveregex"], default=None,
+ elements="dict",
+ required=False),
+ exclusive=dict(type="list",
+ aliases=["automemberexclusiveregex"],
+ default=None,
options=dict(
key=dict(type="str", required=True),
expression=dict(type="str", required=True)
),
- elements="dict", required=False),
+ elements="dict",
+ required=False),
name=dict(type="list", aliases=["cn"],
default=None, required=True),
description=dict(type="str", default=None),
diff --git a/plugins/modules/ipaconfig.py b/plugins/modules/ipaconfig.py
index 4b2df6a5..2a155bdf 100644
--- a/plugins/modules/ipaconfig.py
+++ b/plugins/modules/ipaconfig.py
@@ -299,7 +299,7 @@ def main():
"KDC:Disable Last Success",
"KDC:Disable Lockout",
"KDC:Disable Default Preauth for SPNs",
- ""]), # noqa E128
+ ""]), # noqa E128
selinuxusermaporder=dict(type="list", required=False,
aliases=['ipaselinuxusermaporder']),
selinuxusermapdefault=dict(type="str", required=False,
@@ -365,15 +365,15 @@ def main():
if params.get("ipadomainresolutionorder", None):
params["ipadomainresolutionorder"] = \
- ":".join(params["ipadomainresolutionorder"])
+ ":".join(params["ipadomainresolutionorder"])
if params.get("ipausersearchfields", None):
params["ipausersearchfields"] = \
- ",".join(params["ipausersearchfields"])
+ ",".join(params["ipausersearchfields"])
if params.get("ipagroupsearchfields", None):
params["ipagroupsearchfields"] = \
- ",".join(params["ipagroupsearchfields"])
+ ",".join(params["ipagroupsearchfields"])
# verify limits on INT values.
args_with_limits = [
@@ -418,12 +418,12 @@ def main():
if ansible_module.argument_spec.get(k):
arg_type = ansible_module.argument_spec[k]['type']
if k in (
- 'ipaselinuxusermaporder', 'domain_resolution_order'
- ):
+ 'ipaselinuxusermaporder', 'domain_resolution_order'
+ ):
exit_args[k] = result.get(key)[0].split('$')
elif k in (
- 'usersearch', 'groupsearch'
- ):
+ 'usersearch', 'groupsearch'
+ ):
exit_args[k] = result.get(key)[0].split(',')
elif isinstance(value, str) and arg_type == "list":
exit_args[k] = [value]
diff --git a/plugins/modules/ipadnsconfig.py b/plugins/modules/ipadnsconfig.py
index f6d4c468..7b82a076 100644
--- a/plugins/modules/ipadnsconfig.py
+++ b/plugins/modules/ipadnsconfig.py
@@ -165,24 +165,23 @@ def gen_args(module, state, dnsconfig, forwarders, forward_policy,
def main():
forwarder_spec = dict(
- ip_address=dict(type=str, required=True),
- port=dict(type=int, required=False, default=None)
+ ip_address=dict(type=str, required=True),
+ port=dict(type=int, required=False, default=None)
)
ansible_module = IPAAnsibleModule(
- argument_spec=dict(
- # dnsconfig
- forwarders=dict(type='list', default=None, required=False,
- options=dict(**forwarder_spec)),
- forward_policy=dict(type='str', required=False, default=None,
- choices=['only', 'first', 'none']),
- allow_sync_ptr=dict(type='bool', required=False, default=None),
-
- # general
- state=dict(type="str", default="present",
- choices=["present", "absent"]),
-
- )
+ argument_spec=dict(
+ # dnsconfig
+ forwarders=dict(type='list', default=None, required=False,
+ options=dict(**forwarder_spec)),
+ forward_policy=dict(type='str', required=False, default=None,
+ choices=['only', 'first', 'none']),
+ allow_sync_ptr=dict(type='bool', required=False, default=None),
+
+ # general
+ state=dict(type="str", default="present",
+ choices=["present", "absent"]),
+ )
)
ansible_module._ansible_debug = True
diff --git a/plugins/modules/ipadnsrecord.py b/plugins/modules/ipadnsrecord.py
index dc728031..1f5e787e 100644
--- a/plugins/modules/ipadnsrecord.py
+++ b/plugins/modules/ipadnsrecord.py
@@ -1108,12 +1108,13 @@ def configure_module():
name=dict(type="list", aliases=["record_name"], default=None,
required=False),
- records=dict(type="list", default=None,
+ records=dict(type="list",
+ default=None,
options=dict(
- # Here name is a simple string
- name=dict(type='str', required=True,
- aliases=['record_name']),
- **record_spec),
+ # Here name is a simple string
+ name=dict(type='str', required=True,
+ aliases=['record_name']),
+ **record_spec),
),
# general
diff --git a/plugins/modules/ipadnszone.py b/plugins/modules/ipadnszone.py
index 38fdcefa..ae9b7516 100644
--- a/plugins/modules/ipadnszone.py
+++ b/plugins/modules/ipadnszone.py
@@ -550,10 +550,10 @@ def main():
ansible_module.check_ipa_params()
ansible_module.define_ipa_commands()
changed = ansible_module.execute_ipa_commands(
- ansible_module.commands,
- result_handler=DNSZoneModule.process_results,
- exit_args=exit_args
- )
+ ansible_module.commands,
+ result_handler=DNSZoneModule.process_results,
+ exit_args=exit_args
+ )
ansible_module.exit_json(changed=changed, **exit_args)
diff --git a/plugins/modules/ipagroup.py b/plugins/modules/ipagroup.py
index 979bf623..55855f44 100644
--- a/plugins/modules/ipagroup.py
+++ b/plugins/modules/ipagroup.py
@@ -393,13 +393,13 @@ def main():
# If yes: modify
# Also if it is a modification from nonposix to posix
# or nonposix to external.
- if not compare_args_ipa(ansible_module, args,
- res_find) or \
- (
- not is_posix_group(res_find) and
- not is_external_group(res_find) and
- (posix or external)
- ):
+ if not compare_args_ipa(
+ ansible_module, args, res_find
+ ) or (
+ not is_posix_group(res_find) and
+ not is_external_group(res_find) and
+ (posix or external)
+ ):
if posix:
args['posix'] = True
if external:
diff --git a/plugins/modules/iparole.py b/plugins/modules/iparole.py
index 912cfc1e..dc5b6922 100644
--- a/plugins/modules/iparole.py
+++ b/plugins/modules/iparole.py
@@ -199,7 +199,7 @@ def ensure_absent_state(module, name, action, res_find):
member_args = {}
for key in ['user', 'group', 'host', 'hostgroup']:
items = member_intersect(
- module, key, 'member_%s' % key, res_find)
+ module, key, 'member_%s' % key, res_find)
if items:
member_args[key] = items
@@ -298,7 +298,7 @@ def ensure_members_are_present(module, name, res_find):
member_args = {}
for key in ['user', 'group', 'host', 'hostgroup']:
items = member_difference(
- module, key, 'member_%s' % key, res_find)
+ module, key, 'member_%s' % key, res_find)
if items:
member_args[key] = items
diff --git a/plugins/modules/ipaservice.py b/plugins/modules/ipaservice.py
index 9eb87548..706f6436 100644
--- a/plugins/modules/ipaservice.py
+++ b/plugins/modules/ipaservice.py
@@ -577,7 +577,7 @@ def main():
args.get("krbprincipalauthind", [""]) ==
res_find.get("krbprincipalauthind", [""])
)
- ):
+ ):
del args["krbprincipalauthind"]
if not compare_args_ipa(ansible_module, args,
diff --git a/plugins/modules/ipauser.py b/plugins/modules/ipauser.py
index b737f749..a1146fb6 100644
--- a/plugins/modules/ipauser.py
+++ b/plugins/modules/ipauser.py
@@ -824,14 +824,17 @@ def main():
# general
name=dict(type="list", aliases=["login"], default=None,
required=False),
- users=dict(type="list", aliases=["login"], default=None,
+ users=dict(type="list",
+ aliases=["login"],
+ default=None,
options=dict(
# Here name is a simple string
name=dict(type="str", required=True),
# Add user specific parameters
**user_spec
),
- elements='dict', required=False),
+ elements='dict',
+ required=False),
# deleted
preserve=dict(required=False, type='bool', default=None),
diff --git a/plugins/modules/ipavault.py b/plugins/modules/ipavault.py
index 76d3ae2d..01574c7b 100644
--- a/plugins/modules/ipavault.py
+++ b/plugins/modules/ipavault.py
@@ -634,7 +634,7 @@ def main():
vault_password_file=dict(type="str", required=False, default=None,
no_log=False,
aliases=[
- 'password_file', "old_password_file"
+ 'password_file', "old_password_file"
]),
new_password=dict(type="str", required=False, default=None,
no_log=True),
diff --git a/utils/gen_module_docs.py b/utils/gen_module_docs.py
index 254a2734..e046f986 100644
--- a/utils/gen_module_docs.py
+++ b/utils/gen_module_docs.py
@@ -26,7 +26,7 @@ param_docs = {
"sssd": "The installer sssd setting",
"dnsok": "The installer dnsok setting",
- "dm_password": "Directory Manager password",
+ "dm_password": "Directory Manager password",
"password": "Admin user kerberos password",
"ip_addresses": "List of Master Server IP Addresses",
"domain": "Primary DNS domain of the IPA deployment",
@@ -56,8 +56,8 @@ param_docs = {
"no_ui_redirect": "Do not automatically redirect to the Web UI",
"external_ca": "External ca setting",
"external_cert_files": [
- "File containing the IPA CA certificate and the external CA certificate",
- "chain"
+ "File containing the IPA CA certificate and the external CA "
+ "certificate chain"
],
"reverse_zones": "The reverse DNS zones to use",
"no_reverse": "Do not create new reverse DNS zone",
@@ -131,8 +131,8 @@ param_docs = {
"debug": "Turn on extra debugging",
"basedn": "The basedn of the IPA server (of the form dc=example,dc=com)",
"allow_repair": [
- "Allow repair of already joined hosts. Contrary to ipaclient_force_join",
- "the host entry will not be changed on the server"
+ "Allow repair of already joined hosts. Contrary to "
+ "ipaclient_force_join the host entry will not be changed on the server"
],
"backup": "File to backup",
"fqdn": [
--
GitLab