a-c-m
/
community.crypto
mirror of https://github.com/ansible-collections/community.crypto.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix sanity failures (#263) 

* Fix sanity failures.

* Add changelog fragment.
pull/264/head
Felix Fontein 2021-08-12 11:23:11 +02:00 committed by GitHub
parent 38ce150f80
commit c9ec463893
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changelogs/fragments/263-sanity.yml Normal file
View File

@ -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)."

2
plugins/module_utils/openssh/backends/keypair_backend.py
View File

@ -451,7 +451,7 @@ class KeypairBackendCryptography(KeypairBackend):
def any_in(sequence, *elements): 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): def select_backend(module, backend):

8
plugins/modules/x509_crl.py
View File

@ -597,7 +597,7 @@ class CRL(OpenSSLObject):
entry['invalidity_date_critical'], 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.""" """Ensure the resource is in its desired state."""
state_and_perms = super(CRL, self).check(self.module, perms_required) state_and_perms = super(CRL, self).check(self.module, perms_required)
@ -689,9 +689,9 @@ class CRL(OpenSSLObject):
def generate(self): def generate(self):
result = None 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() 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': if self.format == 'pem':
result = self.crl.public_bytes(Encoding.PEM) result = self.crl.public_bytes(Encoding.PEM)
else: else:
@ -834,7 +834,7 @@ def main():
if module.params['state'] == 'present': if module.params['state'] == 'present':
if module.check_mode: if module.check_mode:
result = crl.dump(check_mode=True) 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) module.exit_json(**result)
crl.generate() crl.generate()