From c9ec46389336b49d7b6fb715f9f18b85e820b90b Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Thu, 12 Aug 2021 11:23:11 +0200 Subject: [PATCH] Fix sanity failures (#263) * Fix sanity failures. * Add changelog fragment. --- changelogs/fragments/263-sanity.yml | 3 +++ plugins/module_utils/openssh/backends/keypair_backend.py | 2 +- plugins/modules/x509_crl.py | 8 ++++---- 3 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 changelogs/fragments/263-sanity.yml diff --git a/changelogs/fragments/263-sanity.yml b/changelogs/fragments/263-sanity.yml new file mode 100644 index 00000000..0ae4ccd5 --- /dev/null +++ b/changelogs/fragments/263-sanity.yml @@ -0,0 +1,3 @@ +bugfixes: +- "keypair_backend module utils - simplify code to pass sanity tests (https://github.com/ansible-collections/community.crypto/pull/263)." +- "x509_crl - restore inherited function signature to pass sanity tests (https://github.com/ansible-collections/community.crypto/pull/263)." diff --git a/plugins/module_utils/openssh/backends/keypair_backend.py b/plugins/module_utils/openssh/backends/keypair_backend.py index 6e605ae3..c46acb12 100644 --- a/plugins/module_utils/openssh/backends/keypair_backend.py +++ b/plugins/module_utils/openssh/backends/keypair_backend.py @@ -451,7 +451,7 @@ class KeypairBackendCryptography(KeypairBackend): def any_in(sequence, *elements): - return any([e in sequence for e in elements]) + return any(e in sequence for e in elements) def select_backend(module, backend): diff --git a/plugins/modules/x509_crl.py b/plugins/modules/x509_crl.py index b8d28a96..f9997d85 100644 --- a/plugins/modules/x509_crl.py +++ b/plugins/modules/x509_crl.py @@ -597,7 +597,7 @@ class CRL(OpenSSLObject): entry['invalidity_date_critical'], ) - def check(self, perms_required=True, ignore_conversion=True): + def check(self, module, perms_required=True, ignore_conversion=True): """Ensure the resource is in its desired state.""" state_and_perms = super(CRL, self).check(self.module, perms_required) @@ -689,9 +689,9 @@ class CRL(OpenSSLObject): def generate(self): result = None - if not self.check(perms_required=False, ignore_conversion=True) or self.force: + if not self.check(self.module, perms_required=False, ignore_conversion=True) or self.force: result = self._generate_crl() - elif not self.check(perms_required=False, ignore_conversion=False) and self.crl: + elif not self.check(self.module, perms_required=False, ignore_conversion=False) and self.crl: if self.format == 'pem': result = self.crl.public_bytes(Encoding.PEM) else: @@ -834,7 +834,7 @@ def main(): if module.params['state'] == 'present': if module.check_mode: result = crl.dump(check_mode=True) - result['changed'] = module.params['force'] or not crl.check() or not crl.check(ignore_conversion=False) + result['changed'] = module.params['force'] or not crl.check(module) or not crl.check(module, ignore_conversion=False) module.exit_json(**result) crl.generate()