mirror of
https://github.com/ansible-collections/community.crypto.git
synced 2026-05-07 13:53:06 +00:00
Work on issues found by pylint (#896)
* Look at possibly-used-before-assignment. * Use latest beta releases of ansible-core 2.19 for mypy and pylint. * Look at unsupported-*. * Look at unknown-option-value. * Look at redefined-builtin. * Look at superfluous-parens. * Look at unspecified-encoding. * Adjust to new cryptography version and to ansible-core 2.17's pylint. * Look at super-with-arguments. * Look at no-else-*. * Look at try-except-raise. * Look at inconsistent-return-statements. * Look at redefined-outer-name. * Look at redefined-argument-from-local. * Look at attribute-defined-outside-init. * Look at unused-variable. * Look at protected-access. * Look at raise-missing-from. * Look at arguments-differ. * Look at useless-suppression and use-symbolic-message-instead. * Look at consider-using-dict-items. * Look at consider-using-in. * Look at consider-using-set-comprehension. * Look at consider-using-with. * Look at use-dict-literal.
This commit is contained in:
@@ -143,13 +143,13 @@ except ImportError:
|
||||
|
||||
|
||||
def parse_certificate(
|
||||
input: bytes, strict: bool = False
|
||||
certificate_content: bytes, strict: bool = False
|
||||
) -> tuple[bytes, t.Literal["pem", "der"], str | None]:
|
||||
input_format: t.Literal["pem", "der"] = (
|
||||
"pem" if identify_pem_format(input) else "der"
|
||||
"pem" if identify_pem_format(certificate_content) else "der"
|
||||
)
|
||||
if input_format == "pem":
|
||||
pems = split_pem_list(to_text(input))
|
||||
pems = split_pem_list(to_text(certificate_content))
|
||||
if len(pems) > 1 and strict:
|
||||
raise ValueError(
|
||||
f"The input contains {len(pems)} PEM objects, expecting only one since strict=true"
|
||||
@@ -159,15 +159,15 @@ def parse_certificate(
|
||||
raise ValueError(
|
||||
f"type is {pem_header_type!r}, expecting CERTIFICATE or X509 CERTIFICATE"
|
||||
)
|
||||
input = base64.b64decode(content)
|
||||
certificate_content = base64.b64decode(content)
|
||||
else:
|
||||
pem_header_type = None
|
||||
return input, input_format, pem_header_type
|
||||
return certificate_content, input_format, pem_header_type
|
||||
|
||||
|
||||
class X509CertificateConvertModule(OpenSSLObject):
|
||||
def __init__(self, module: AnsibleModule) -> None:
|
||||
super(X509CertificateConvertModule, self).__init__(
|
||||
super().__init__(
|
||||
path=module.params["dest_path"],
|
||||
state="present",
|
||||
force=False,
|
||||
@@ -287,16 +287,16 @@ class X509CertificateConvertModule(OpenSSLObject):
|
||||
|
||||
|
||||
def main() -> t.NoReturn:
|
||||
argument_spec = dict(
|
||||
src_path=dict(type="path"),
|
||||
src_content=dict(type="str"),
|
||||
src_content_base64=dict(type="bool", default=False),
|
||||
format=dict(type="str", required=True, choices=["pem", "der"]),
|
||||
strict=dict(type="bool", default=False),
|
||||
dest_path=dict(type="path", required=True),
|
||||
backup=dict(type="bool", default=False),
|
||||
verify_cert_parsable=dict(type="bool", default=False),
|
||||
)
|
||||
argument_spec = {
|
||||
"src_path": {"type": "path"},
|
||||
"src_content": {"type": "str"},
|
||||
"src_content_base64": {"type": "bool", "default": False},
|
||||
"format": {"type": "str", "required": True, "choices": ["pem", "der"]},
|
||||
"strict": {"type": "bool", "default": False},
|
||||
"dest_path": {"type": "path", "required": True},
|
||||
"backup": {"type": "bool", "default": False},
|
||||
"verify_cert_parsable": {"type": "bool", "default": False},
|
||||
}
|
||||
module = AnsibleModule(
|
||||
argument_spec,
|
||||
supports_check_mode=True,
|
||||
|
||||
Reference in New Issue
Block a user