diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 748bfcd3900b611c4c43adadd47fbb251a6038f2..5cc1b8a7308a6f53f8bd0e9768fe1f133bae93af 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -68,7 +68,7 @@ jobs: python-version: "3.x" - name: Run pylint run: | - pip install pylint==2.12.2 + pip install pylint==2.13.7 wrapt==1.14.0 pylint plugins roles --disable=import-error shellcheck: diff --git a/plugins/module_utils/ansible_freeipa_module.py b/plugins/module_utils/ansible_freeipa_module.py index d92dbc9aa572ad92367c3465099c19a8b0ce95e1..247f6e748b3a861ca1e75201dba5fd4144d1f67d 100644 --- a/plugins/module_utils/ansible_freeipa_module.py +++ b/plugins/module_utils/ansible_freeipa_module.py @@ -99,9 +99,10 @@ try: try: from ipalib.x509 import load_pem_x509_certificate + certificate_loader = load_pem_x509_certificate except ImportError: from ipalib.x509 import load_certificate - load_pem_x509_certificate = None + certificate_loader = load_certificate # Try to import is_ipa_configured or use a fallback implementation. try: @@ -147,7 +148,6 @@ except ImportError as _err: uuid = None netaddr = None is_ipa_configured = None - load_certificate = None kerberos = None ipaserver = None # pylint: disable=C0103 else: @@ -588,10 +588,7 @@ def load_cert_from_str(cert): if not cert.endswith("-----END CERTIFICATE-----"): cert += "\n-----END CERTIFICATE-----" - if load_pem_x509_certificate is not None: - cert = load_pem_x509_certificate(cert.encode('utf-8')) - else: - cert = load_certificate(cert.encode('utf-8')) + cert = certificate_loader(cert.encode('utf-8')) return cert diff --git a/requirements-dev.txt b/requirements-dev.txt index f224861f29ad45548aa40412d6cbb055be592959..0915965a4d3a2675e45c0ca95135fb9d3448c19f 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -2,11 +2,9 @@ ipdb==0.13.4 pre-commit flake8==4.0.1 -flake8-bugbear +flake8-bugbear==22.10.27 pylint==2.13.7 +wrapt >= 1.14.0 pydocstyle==6.0.0 yamllint==1.26.3 ansible-lint==5.3.2 -dnspython==2.2.0 -netaddr==0.8.0 -gssapi==1.7.2 diff --git a/roles/ipaserver/module_utils/ansible_ipa_server.py b/roles/ipaserver/module_utils/ansible_ipa_server.py index 8e7be0b0cba4c7618b5959cc785cea240c40e487..f1f4972b690b3fb44fd2f07a622a031088762916 100644 --- a/roles/ipaserver/module_utils/ansible_ipa_server.py +++ b/roles/ipaserver/module_utils/ansible_ipa_server.py @@ -196,9 +196,10 @@ else: try: from ipalib.x509 import load_pem_x509_certificate + certificate_loader = load_pem_x509_certificate except ImportError: from ipalib.x509 import load_certificate - load_pem_x509_certificate = None + certificate_loader = load_certificate try: from ipaserver.install.server.install import get_min_idstart @@ -426,10 +427,7 @@ else: if not cert.endswith("-----END CERTIFICATE-----"): cert += "\n-----END CERTIFICATE-----" - if load_pem_x509_certificate is not None: - cert = load_pem_x509_certificate(cert.encode('utf-8')) - else: - cert = load_certificate(cert.encode('utf-8')) + cert = certificate_loader(cert.encode('utf-8')) else: cert = base64.b64decode(cert) return cert diff --git a/setup.cfg b/setup.cfg index 10edc5023b37549a066e790e5afa682cda340bfc..a199be564b12fd95627f85a44f5f55df09851993 100644 --- a/setup.cfg +++ b/setup.cfg @@ -59,12 +59,18 @@ disable = [pylint.BASIC] good-names = - ex, i, j, k, Run, _, e, x, dn, cn, ip, os, unicode, __metaclass__, ds + ex, i, j, k, Run, _, e, x, dn, cn, ip, os, unicode, __metaclass__, ds, + # These are utils tools, and not part of the released collection. + galaxyfy-playbook, galaxyfy-README, galaxyfy-module-EXAMPLES, + module_EXAMPLES + [pylint.IMPORTS] ignored-modules = ansible.errors, ansible.plugins.action, ansible.module_utils, ansible.module_utils.ansible_freeipa_module, + dns, + gssapi, ipalib, ipalib.config, ipalib.constants, ipalib.krb_utils, ipalib.errors, ipapython.ipautil, ipapython.dn, ipapython.version, ipapython.dnsutil, ipapython.ipa_log_manager, ipapython, @@ -72,7 +78,10 @@ ignored-modules = ipaserver.install.installutils, ipaserver.install.server.install, ipaserver.install, ipaclient.install.ipachangeconf, ipaclient.install.client, - ipaserver.dcerpc + ipaserver.dcerpc, + jinja2, + os, + SSSDConfig [pylint.REFACTORING] max-nested-blocks = 9 diff --git a/utils/galaxyfy-module-EXAMPLES.py b/utils/galaxyfy-module-EXAMPLES.py index 31da3bb3b86359c85109aecc01844288505edc22..46a740bedb704763f6287b31a21437ce09d2522e 100644 --- a/utils/galaxyfy-module-EXAMPLES.py +++ b/utils/galaxyfy-module-EXAMPLES.py @@ -37,7 +37,7 @@ def module_EXAMPLES(module_in, project_prefix, collection_prefix): example = True out_lines.append(line) continue - elif example and stripped in ["'''", '"""']: + if example and stripped in ["'''", '"""']: _out_lines, _changed = \ galaxyfy_playbook(project_prefix, collection_prefix, example_lines)