From 0f8a09e70edb2d1993f1170f822e1630b8224c47 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Fri, 10 Oct 2025 21:20:24 +0200 Subject: [PATCH] Reorganize imports due to https://github.com/ansible-community/antsibull-nox/pull/136. --- plugins/action/openssl_privatekey_pipe.py | 1 + plugins/filter/gpg_fingerprint.py | 1 + plugins/filter/openssl_csr_info.py | 1 + plugins/filter/openssl_privatekey_info.py | 1 + plugins/filter/openssl_publickey_info.py | 1 + plugins/filter/parse_serial.py | 1 + plugins/filter/split_pem.py | 1 + plugins/filter/to_serial.py | 1 + plugins/filter/x509_certificate_info.py | 1 + plugins/filter/x509_crl_info.py | 1 + plugins/lookup/gpg_fingerprint.py | 1 + plugins/module_utils/_acme/acme.py | 2 ++ plugins/module_utils/_acme/backend_cryptography.py | 2 ++ plugins/module_utils/_acme/backend_openssl_cli.py | 2 ++ plugins/module_utils/_acme/backends.py | 1 + plugins/module_utils/_acme/certificate.py | 1 + plugins/module_utils/_acme/challenges.py | 2 ++ plugins/module_utils/_crypto/cryptography_support.py | 2 ++ .../_crypto/module_backends/certificate.py | 7 ++++--- .../_crypto/module_backends/certificate_acme.py | 2 ++ .../_crypto/module_backends/certificate_info.py | 8 +++++--- .../_crypto/module_backends/certificate_ownca.py | 7 ++++--- .../_crypto/module_backends/certificate_selfsigned.py | 7 ++++--- .../module_utils/_crypto/module_backends/crl_info.py | 7 ++++--- plugins/module_utils/_crypto/module_backends/csr.py | 8 +++++--- .../module_utils/_crypto/module_backends/csr_info.py | 10 ++++++---- .../module_utils/_crypto/module_backends/privatekey.py | 8 +++++--- .../_crypto/module_backends/privatekey_convert.py | 1 + .../_crypto/module_backends/privatekey_info.py | 8 +++++--- .../_crypto/module_backends/publickey_info.py | 7 ++++--- plugins/module_utils/_crypto/support.py | 8 +++++--- plugins/module_utils/_cryptography_dep.py | 2 ++ plugins/module_utils/_openssh/backends/common.py | 7 ++++--- .../module_utils/_openssh/backends/keypair_backend.py | 1 + plugins/module_utils/_openssh/certificate.py | 1 + plugins/module_utils/_serial.py | 1 + plugins/module_utils/_time.py | 1 + plugins/modules/acme_certificate.py | 1 + plugins/modules/acme_challenge_cert_helper.py | 1 + plugins/modules/acme_inspect.py | 1 + plugins/modules/certificate_complete_chain.py | 1 + plugins/modules/get_certificate.py | 1 + plugins/modules/openssh_cert.py | 1 + plugins/modules/openssh_keypair.py | 1 + plugins/modules/openssl_csr.py | 1 + plugins/modules/openssl_csr_info.py | 1 + plugins/modules/openssl_csr_pipe.py | 1 + plugins/modules/openssl_dhparam.py | 1 + plugins/modules/openssl_pkcs12.py | 1 + plugins/modules/openssl_privatekey.py | 1 + plugins/modules/openssl_privatekey_convert.py | 1 + plugins/modules/openssl_privatekey_info.py | 1 + plugins/modules/openssl_publickey.py | 1 + plugins/modules/openssl_publickey_info.py | 1 + plugins/modules/openssl_signature.py | 1 + plugins/modules/openssl_signature_info.py | 1 + plugins/modules/x509_certificate.py | 1 + plugins/modules/x509_certificate_convert.py | 1 + plugins/modules/x509_certificate_info.py | 1 + plugins/modules/x509_certificate_pipe.py | 1 + plugins/modules/x509_crl.py | 1 + plugins/modules/x509_crl_info.py | 1 + plugins/plugin_utils/_gnupg.py | 1 + .../module_utils/_acme/test_backend_cryptography.py | 3 ++- .../module_utils/_acme/test_backend_openssl_cli.py | 3 ++- .../unit/plugins/module_utils/_acme/test_challenges.py | 1 + tests/unit/plugins/module_utils/_acme/test_errors.py | 1 + tests/unit/plugins/module_utils/_acme/test_orders.py | 1 + tests/unit/plugins/module_utils/_acme/test_utils.py | 1 + tests/unit/plugins/module_utils/_crypto/test_asn1.py | 1 + .../module_utils/_crypto/test_cryptography_support.py | 3 ++- tests/unit/plugins/module_utils/_crypto/test_math.py | 1 + tests/unit/plugins/module_utils/_crypto/test_pem.py | 1 + .../plugins/module_utils/_openssh/test_certificate.py | 1 + .../plugins/module_utils/_openssh/test_cryptography.py | 1 + tests/unit/plugins/module_utils/_openssh/test_utils.py | 1 + tests/unit/plugins/module_utils/test__time.py | 3 ++- tests/unit/plugins/modules/test_luks_device.py | 1 + 78 files changed, 132 insertions(+), 41 deletions(-) diff --git a/plugins/action/openssl_privatekey_pipe.py b/plugins/action/openssl_privatekey_pipe.py index b7c5634c..db187a5c 100644 --- a/plugins/action/openssl_privatekey_pipe.py +++ b/plugins/action/openssl_privatekey_pipe.py @@ -8,6 +8,7 @@ import base64 import typing as t from ansible.module_utils.common.text.converters import to_bytes + from ansible_collections.community.crypto.plugins.module_utils._crypto.basic import ( OpenSSLObjectError, ) diff --git a/plugins/filter/gpg_fingerprint.py b/plugins/filter/gpg_fingerprint.py index 7ab14d77..54ee300e 100644 --- a/plugins/filter/gpg_fingerprint.py +++ b/plugins/filter/gpg_fingerprint.py @@ -43,6 +43,7 @@ import typing as t from ansible.errors import AnsibleFilterError from ansible.module_utils.common.text.converters import to_bytes + from ansible_collections.community.crypto.plugins.module_utils._gnupg.cli import ( GPGError, get_fingerprint_from_bytes, diff --git a/plugins/filter/openssl_csr_info.py b/plugins/filter/openssl_csr_info.py index d71bea25..1f8388dd 100644 --- a/plugins/filter/openssl_csr_info.py +++ b/plugins/filter/openssl_csr_info.py @@ -278,6 +278,7 @@ import typing as t from ansible.errors import AnsibleFilterError from ansible.module_utils.common.text.converters import to_bytes, to_text + from ansible_collections.community.crypto.plugins.module_utils._crypto.basic import ( OpenSSLObjectError, ) diff --git a/plugins/filter/openssl_privatekey_info.py b/plugins/filter/openssl_privatekey_info.py index 72f13983..ad718267 100644 --- a/plugins/filter/openssl_privatekey_info.py +++ b/plugins/filter/openssl_privatekey_info.py @@ -150,6 +150,7 @@ import typing as t from ansible.errors import AnsibleFilterError from ansible.module_utils.common.text.converters import to_bytes, to_text + from ansible_collections.community.crypto.plugins.module_utils._crypto.basic import ( OpenSSLObjectError, ) diff --git a/plugins/filter/openssl_publickey_info.py b/plugins/filter/openssl_publickey_info.py index 964e23c2..bafbe23b 100644 --- a/plugins/filter/openssl_publickey_info.py +++ b/plugins/filter/openssl_publickey_info.py @@ -127,6 +127,7 @@ import typing as t from ansible.errors import AnsibleFilterError from ansible.module_utils.common.text.converters import to_bytes + from ansible_collections.community.crypto.plugins.module_utils._crypto.basic import ( OpenSSLObjectError, ) diff --git a/plugins/filter/parse_serial.py b/plugins/filter/parse_serial.py index 7ed577b8..87bbbdae 100644 --- a/plugins/filter/parse_serial.py +++ b/plugins/filter/parse_serial.py @@ -43,6 +43,7 @@ import typing as t from ansible.errors import AnsibleFilterError from ansible.module_utils.common.text.converters import to_text + from ansible_collections.community.crypto.plugins.module_utils._serial import ( parse_serial, ) diff --git a/plugins/filter/split_pem.py b/plugins/filter/split_pem.py index d37b6e04..3311140e 100644 --- a/plugins/filter/split_pem.py +++ b/plugins/filter/split_pem.py @@ -42,6 +42,7 @@ import typing as t from ansible.errors import AnsibleFilterError from ansible.module_utils.common.text.converters import to_text + from ansible_collections.community.crypto.plugins.module_utils._crypto.pem import ( split_pem_list, ) diff --git a/plugins/filter/to_serial.py b/plugins/filter/to_serial.py index 0f99d3aa..f790fc04 100644 --- a/plugins/filter/to_serial.py +++ b/plugins/filter/to_serial.py @@ -42,6 +42,7 @@ _value: import typing as t from ansible.errors import AnsibleFilterError + from ansible_collections.community.crypto.plugins.module_utils._serial import to_serial diff --git a/plugins/filter/x509_certificate_info.py b/plugins/filter/x509_certificate_info.py index e70957c5..8519e382 100644 --- a/plugins/filter/x509_certificate_info.py +++ b/plugins/filter/x509_certificate_info.py @@ -312,6 +312,7 @@ import typing as t from ansible.errors import AnsibleFilterError from ansible.module_utils.common.text.converters import to_bytes, to_text + from ansible_collections.community.crypto.plugins.module_utils._crypto.basic import ( OpenSSLObjectError, ) diff --git a/plugins/filter/x509_crl_info.py b/plugins/filter/x509_crl_info.py index a6901e5c..5b5430a2 100644 --- a/plugins/filter/x509_crl_info.py +++ b/plugins/filter/x509_crl_info.py @@ -159,6 +159,7 @@ import typing as t from ansible.errors import AnsibleFilterError from ansible.module_utils.common.text.converters import to_bytes, to_text + from ansible_collections.community.crypto.plugins.module_utils._crypto.basic import ( OpenSSLObjectError, ) diff --git a/plugins/lookup/gpg_fingerprint.py b/plugins/lookup/gpg_fingerprint.py index 5ac1050e..d4727923 100644 --- a/plugins/lookup/gpg_fingerprint.py +++ b/plugins/lookup/gpg_fingerprint.py @@ -48,6 +48,7 @@ import typing as t from ansible.errors import AnsibleLookupError from ansible.module_utils.common.text.converters import to_text from ansible.plugins.lookup import LookupBase + from ansible_collections.community.crypto.plugins.module_utils._gnupg.cli import ( GPGError, get_fingerprint_from_file, diff --git a/plugins/module_utils/_acme/acme.py b/plugins/module_utils/_acme/acme.py index fdc0c3e5..289a38fe 100644 --- a/plugins/module_utils/_acme/acme.py +++ b/plugins/module_utils/_acme/acme.py @@ -18,6 +18,7 @@ import typing as t from ansible.module_utils.basic import missing_required_lib from ansible.module_utils.common.text.converters import to_bytes from ansible.module_utils.urls import fetch_url + from ansible_collections.community.crypto.plugins.module_utils._acme.backend_cryptography import ( CRYPTOGRAPHY_ERROR, CRYPTOGRAPHY_MINIMAL_VERSION, @@ -54,6 +55,7 @@ if t.TYPE_CHECKING: import urllib.error # pragma: no cover from ansible.module_utils.basic import AnsibleModule # pragma: no cover + from ansible_collections.community.crypto.plugins.module_utils._acme.account import ( # pragma: no cover ACMEAccount, ) diff --git a/plugins/module_utils/_acme/backend_cryptography.py b/plugins/module_utils/_acme/backend_cryptography.py index 52639d40..a2b789c4 100644 --- a/plugins/module_utils/_acme/backend_cryptography.py +++ b/plugins/module_utils/_acme/backend_cryptography.py @@ -15,6 +15,7 @@ import traceback import typing as t from ansible.module_utils.common.text.converters import to_bytes, to_text + from ansible_collections.community.crypto.plugins.module_utils._acme.backends import ( CertificateInformation, CryptoBackend, @@ -83,6 +84,7 @@ if t.TYPE_CHECKING: import datetime # pragma: no cover from ansible.module_utils.basic import AnsibleModule # pragma: no cover + from ansible_collections.community.crypto.plugins.module_utils._acme.certificates import ( # pragma: no cover CertificateChain, Criterium, diff --git a/plugins/module_utils/_acme/backend_openssl_cli.py b/plugins/module_utils/_acme/backend_openssl_cli.py index f73b03c9..e7e0fb19 100644 --- a/plugins/module_utils/_acme/backend_openssl_cli.py +++ b/plugins/module_utils/_acme/backend_openssl_cli.py @@ -19,6 +19,7 @@ import traceback import typing as t from ansible.module_utils.common.text.converters import to_bytes, to_text + from ansible_collections.community.crypto.plugins.module_utils._acme.backends import ( CertificateInformation, CryptoBackend, @@ -40,6 +41,7 @@ from ansible_collections.community.crypto.plugins.module_utils._time import ( if t.TYPE_CHECKING: from ansible.module_utils.basic import AnsibleModule # pragma: no cover + from ansible_collections.community.crypto.plugins.module_utils._acme.certificates import ( # pragma: no cover Criterium, ) diff --git a/plugins/module_utils/_acme/backends.py b/plugins/module_utils/_acme/backends.py index d13423b5..4e3bdc90 100644 --- a/plugins/module_utils/_acme/backends.py +++ b/plugins/module_utils/_acme/backends.py @@ -34,6 +34,7 @@ if t.TYPE_CHECKING: import os # pragma: no cover from ansible.module_utils.basic import AnsibleModule # pragma: no cover + from ansible_collections.community.crypto.plugins.module_utils._acme.certificates import ( # pragma: no cover ChainMatcher, Criterium, diff --git a/plugins/module_utils/_acme/certificate.py b/plugins/module_utils/_acme/certificate.py index 06ff439f..8cfa0894 100644 --- a/plugins/module_utils/_acme/certificate.py +++ b/plugins/module_utils/_acme/certificate.py @@ -38,6 +38,7 @@ from ansible_collections.community.crypto.plugins.module_utils._acme.utils impor if t.TYPE_CHECKING: from ansible.module_utils.basic import AnsibleModule # pragma: no cover + from ansible_collections.community.crypto.plugins.module_utils._acme.backends import ( # pragma: no cover CryptoBackend, ) diff --git a/plugins/module_utils/_acme/challenges.py b/plugins/module_utils/_acme/challenges.py index ebeca50c..2b0f7c8b 100644 --- a/plugins/module_utils/_acme/challenges.py +++ b/plugins/module_utils/_acme/challenges.py @@ -17,6 +17,7 @@ import time import typing as t from ansible.module_utils.common.text.converters import to_bytes + from ansible_collections.community.crypto.plugins.module_utils._acme.errors import ( ACMEProtocolException, ModuleFailException, @@ -29,6 +30,7 @@ from ansible_collections.community.crypto.plugins.module_utils._acme.utils impor if t.TYPE_CHECKING: from ansible.module_utils.basic import AnsibleModule # pragma: no cover + from ansible_collections.community.crypto.plugins.module_utils._acme.acme import ( # pragma: no cover ACMEClient, ) diff --git a/plugins/module_utils/_crypto/cryptography_support.py b/plugins/module_utils/_crypto/cryptography_support.py index 2f2129dc..c65a20b9 100644 --- a/plugins/module_utils/_crypto/cryptography_support.py +++ b/plugins/module_utils/_crypto/cryptography_support.py @@ -20,6 +20,7 @@ from urllib.parse import ( ) from ansible.module_utils.common.text.converters import to_bytes, to_text + from ansible_collections.community.crypto.plugins.module_utils._crypto._asn1 import ( serialize_asn1_string_as_der, ) @@ -71,6 +72,7 @@ except ImportError: IDNA_IMP_ERROR = traceback.format_exc() from ansible.module_utils.basic import missing_required_lib + from ansible_collections.community.crypto.plugins.module_utils._crypto._obj2txt import ( obj2txt, ) diff --git a/plugins/module_utils/_crypto/module_backends/certificate.py b/plugins/module_utils/_crypto/module_backends/certificate.py index b3376ad8..1e8d9138 100644 --- a/plugins/module_utils/_crypto/module_backends/certificate.py +++ b/plugins/module_utils/_crypto/module_backends/certificate.py @@ -41,13 +41,14 @@ if t.TYPE_CHECKING: import datetime # pragma: no cover from ansible.module_utils.basic import AnsibleModule # pragma: no cover - from ansible_collections.community.crypto.plugins.module_utils._crypto.cryptography_support import ( # pragma: no cover - CertificatePrivateKeyTypes, - ) from cryptography.hazmat.primitives.asymmetric.types import ( # pragma: no cover CertificateIssuerPrivateKeyTypes, ) + from ansible_collections.community.crypto.plugins.module_utils._crypto.cryptography_support import ( # pragma: no cover + CertificatePrivateKeyTypes, + ) + MINIMAL_CRYPTOGRAPHY_VERSION = COLLECTION_MINIMUM_CRYPTOGRAPHY_VERSION diff --git a/plugins/module_utils/_crypto/module_backends/certificate_acme.py b/plugins/module_utils/_crypto/module_backends/certificate_acme.py index 3811984b..ab5d6f5e 100644 --- a/plugins/module_utils/_crypto/module_backends/certificate_acme.py +++ b/plugins/module_utils/_crypto/module_backends/certificate_acme.py @@ -14,6 +14,7 @@ import traceback import typing as t from ansible.module_utils.common.text.converters import to_bytes + from ansible_collections.community.crypto.plugins.module_utils._crypto.module_backends.certificate import ( CertificateBackend, CertificateError, @@ -23,6 +24,7 @@ from ansible_collections.community.crypto.plugins.module_utils._crypto.module_ba if t.TYPE_CHECKING: from ansible.module_utils.basic import AnsibleModule # pragma: no cover + from ansible_collections.community.crypto.plugins.module_utils._argspec import ( # pragma: no cover ArgumentSpec, ) diff --git a/plugins/module_utils/_crypto/module_backends/certificate_info.py b/plugins/module_utils/_crypto/module_backends/certificate_info.py index 4e038eb0..31bb082e 100644 --- a/plugins/module_utils/_crypto/module_backends/certificate_info.py +++ b/plugins/module_utils/_crypto/module_backends/certificate_info.py @@ -13,6 +13,7 @@ import binascii import typing as t from ansible.module_utils.common.text.converters import to_text + from ansible_collections.community.crypto.plugins.module_utils._crypto.cryptography_support import ( CRYPTOGRAPHY_TIMEZONE, cryptography_decode_name, @@ -41,6 +42,10 @@ if t.TYPE_CHECKING: import datetime # pragma: no cover from ansible.module_utils.basic import AnsibleModule # pragma: no cover + from cryptography.hazmat.primitives.asymmetric.types import ( + PublicKeyTypes, # pragma: no cover + ) + from ansible_collections.community.crypto.plugins.module_utils._argspec import ( # pragma: no cover ArgumentSpec, ) @@ -50,9 +55,6 @@ if t.TYPE_CHECKING: from ansible_collections.community.crypto.plugins.plugin_utils._filter_module import ( # pragma: no cover FilterModuleMock, ) - from cryptography.hazmat.primitives.asymmetric.types import ( - PublicKeyTypes, # pragma: no cover - ) GeneralAnsibleModule = t.Union[ AnsibleModule, AnsibleActionModule, FilterModuleMock diff --git a/plugins/module_utils/_crypto/module_backends/certificate_ownca.py b/plugins/module_utils/_crypto/module_backends/certificate_ownca.py index d3d5d0a1..89239fc2 100644 --- a/plugins/module_utils/_crypto/module_backends/certificate_ownca.py +++ b/plugins/module_utils/_crypto/module_backends/certificate_ownca.py @@ -45,13 +45,14 @@ if t.TYPE_CHECKING: import datetime # pragma: no cover from ansible.module_utils.basic import AnsibleModule # pragma: no cover - from ansible_collections.community.crypto.plugins.module_utils._argspec import ( # pragma: no cover - ArgumentSpec, - ) from cryptography.hazmat.primitives.asymmetric.types import ( # pragma: no cover CertificateIssuerPrivateKeyTypes, ) + from ansible_collections.community.crypto.plugins.module_utils._argspec import ( # pragma: no cover + ArgumentSpec, + ) + try: import cryptography diff --git a/plugins/module_utils/_crypto/module_backends/certificate_selfsigned.py b/plugins/module_utils/_crypto/module_backends/certificate_selfsigned.py index 4374d4a4..06b560c2 100644 --- a/plugins/module_utils/_crypto/module_backends/certificate_selfsigned.py +++ b/plugins/module_utils/_crypto/module_backends/certificate_selfsigned.py @@ -39,13 +39,14 @@ if t.TYPE_CHECKING: import datetime # pragma: no cover from ansible.module_utils.basic import AnsibleModule # pragma: no cover - from ansible_collections.community.crypto.plugins.module_utils._argspec import ( # pragma: no cover - ArgumentSpec, - ) from cryptography.hazmat.primitives.asymmetric.types import ( # pragma: no cover CertificateIssuerPrivateKeyTypes, ) + from ansible_collections.community.crypto.plugins.module_utils._argspec import ( # pragma: no cover + ArgumentSpec, + ) + try: import cryptography diff --git a/plugins/module_utils/_crypto/module_backends/crl_info.py b/plugins/module_utils/_crypto/module_backends/crl_info.py index a6afc3cc..d36576f8 100644 --- a/plugins/module_utils/_crypto/module_backends/crl_info.py +++ b/plugins/module_utils/_crypto/module_backends/crl_info.py @@ -29,15 +29,16 @@ from ansible_collections.community.crypto.plugins.module_utils._cryptography_dep if t.TYPE_CHECKING: from ansible.module_utils.basic import AnsibleModule # pragma: no cover + from cryptography.hazmat.primitives.asymmetric.types import ( # pragma: no cover + PrivateKeyTypes, + ) + from ansible_collections.community.crypto.plugins.plugin_utils._action_module import ( # pragma: no cover AnsibleActionModule, ) from ansible_collections.community.crypto.plugins.plugin_utils._filter_module import ( # pragma: no cover FilterModuleMock, ) - from cryptography.hazmat.primitives.asymmetric.types import ( # pragma: no cover - PrivateKeyTypes, - ) GeneralAnsibleModule = t.Union[ AnsibleModule, AnsibleActionModule, FilterModuleMock diff --git a/plugins/module_utils/_crypto/module_backends/csr.py b/plugins/module_utils/_crypto/module_backends/csr.py index 09256185..f9636a05 100644 --- a/plugins/module_utils/_crypto/module_backends/csr.py +++ b/plugins/module_utils/_crypto/module_backends/csr.py @@ -12,6 +12,7 @@ import binascii import typing as t from ansible.module_utils.common.text.converters import to_text + from ansible_collections.community.crypto.plugins.module_utils._argspec import ( ArgumentSpec, ) @@ -49,14 +50,15 @@ from ansible_collections.community.crypto.plugins.module_utils._cryptography_dep if t.TYPE_CHECKING: from ansible.module_utils.basic import AnsibleModule # pragma: no cover - from ansible_collections.community.crypto.plugins.module_utils._crypto.cryptography_support import ( # pragma: no cover - CertificatePrivateKeyTypes, - ) from cryptography.hazmat.primitives.asymmetric.types import ( # pragma: no cover CertificateIssuerPrivateKeyTypes, PrivateKeyTypes, ) + from ansible_collections.community.crypto.plugins.module_utils._crypto.cryptography_support import ( # pragma: no cover + CertificatePrivateKeyTypes, + ) + _ET = t.TypeVar("_ET", bound="cryptography.x509.ExtensionType") # pragma: no cover diff --git a/plugins/module_utils/_crypto/module_backends/csr_info.py b/plugins/module_utils/_crypto/module_backends/csr_info.py index a0726f2d..d7dd8948 100644 --- a/plugins/module_utils/_crypto/module_backends/csr_info.py +++ b/plugins/module_utils/_crypto/module_backends/csr_info.py @@ -13,6 +13,7 @@ import binascii import typing as t from ansible.module_utils.common.text.converters import to_text + from ansible_collections.community.crypto.plugins.module_utils._crypto.cryptography_support import ( cryptography_decode_name, cryptography_get_extensions_from_csr, @@ -32,16 +33,17 @@ from ansible_collections.community.crypto.plugins.module_utils._cryptography_dep if t.TYPE_CHECKING: from ansible.module_utils.basic import AnsibleModule # pragma: no cover + from cryptography.hazmat.primitives.asymmetric.types import ( # pragma: no cover + CertificatePublicKeyTypes, + PrivateKeyTypes, + ) + from ansible_collections.community.crypto.plugins.plugin_utils._action_module import ( # pragma: no cover AnsibleActionModule, ) from ansible_collections.community.crypto.plugins.plugin_utils._filter_module import ( # pragma: no cover FilterModuleMock, ) - from cryptography.hazmat.primitives.asymmetric.types import ( # pragma: no cover - CertificatePublicKeyTypes, - PrivateKeyTypes, - ) GeneralAnsibleModule = t.Union[ AnsibleModule, AnsibleActionModule, FilterModuleMock diff --git a/plugins/module_utils/_crypto/module_backends/privatekey.py b/plugins/module_utils/_crypto/module_backends/privatekey.py index c4cd5ecd..112baacc 100644 --- a/plugins/module_utils/_crypto/module_backends/privatekey.py +++ b/plugins/module_utils/_crypto/module_backends/privatekey.py @@ -13,6 +13,7 @@ import traceback import typing as t from ansible.module_utils.common.text.converters import to_bytes + from ansible_collections.community.crypto.plugins.module_utils._argspec import ( ArgumentSpec, ) @@ -38,13 +39,14 @@ from ansible_collections.community.crypto.plugins.module_utils._cryptography_dep if t.TYPE_CHECKING: from ansible.module_utils.basic import AnsibleModule # pragma: no cover - from ansible_collections.community.crypto.plugins.plugin_utils._action_module import ( # pragma: no cover - AnsibleActionModule, - ) from cryptography.hazmat.primitives.asymmetric.types import ( # pragma: no cover PrivateKeyTypes, ) + from ansible_collections.community.crypto.plugins.plugin_utils._action_module import ( # pragma: no cover + AnsibleActionModule, + ) + GeneralAnsibleModule = t.Union[ AnsibleModule, AnsibleActionModule ] # pragma: no cover diff --git a/plugins/module_utils/_crypto/module_backends/privatekey_convert.py b/plugins/module_utils/_crypto/module_backends/privatekey_convert.py index 3bd0f718..1a7f5b5b 100644 --- a/plugins/module_utils/_crypto/module_backends/privatekey_convert.py +++ b/plugins/module_utils/_crypto/module_backends/privatekey_convert.py @@ -11,6 +11,7 @@ import traceback import typing as t from ansible.module_utils.common.text.converters import to_bytes + from ansible_collections.community.crypto.plugins.module_utils._argspec import ( ArgumentSpec, ) diff --git a/plugins/module_utils/_crypto/module_backends/privatekey_info.py b/plugins/module_utils/_crypto/module_backends/privatekey_info.py index 85a36b49..a07e33bd 100644 --- a/plugins/module_utils/_crypto/module_backends/privatekey_info.py +++ b/plugins/module_utils/_crypto/module_backends/privatekey_info.py @@ -12,6 +12,7 @@ from __future__ import annotations import typing as t from ansible.module_utils.common.text.converters import to_bytes, to_text + from ansible_collections.community.crypto.plugins.module_utils._crypto.basic import ( OpenSSLObjectError, ) @@ -34,15 +35,16 @@ from ansible_collections.community.crypto.plugins.module_utils._cryptography_dep if t.TYPE_CHECKING: from ansible.module_utils.basic import AnsibleModule # pragma: no cover + from cryptography.hazmat.primitives.asymmetric.types import ( # pragma: no cover + PrivateKeyTypes, + ) + from ansible_collections.community.crypto.plugins.plugin_utils._action_module import ( # pragma: no cover AnsibleActionModule, ) from ansible_collections.community.crypto.plugins.plugin_utils._filter_module import ( # pragma: no cover FilterModuleMock, ) - from cryptography.hazmat.primitives.asymmetric.types import ( # pragma: no cover - PrivateKeyTypes, - ) GeneralAnsibleModule = t.Union[ AnsibleModule, AnsibleActionModule, FilterModuleMock diff --git a/plugins/module_utils/_crypto/module_backends/publickey_info.py b/plugins/module_utils/_crypto/module_backends/publickey_info.py index 38ca68b7..c9e48d33 100644 --- a/plugins/module_utils/_crypto/module_backends/publickey_info.py +++ b/plugins/module_utils/_crypto/module_backends/publickey_info.py @@ -24,15 +24,16 @@ from ansible_collections.community.crypto.plugins.module_utils._cryptography_dep if t.TYPE_CHECKING: from ansible.module_utils.basic import AnsibleModule # pragma: no cover + from cryptography.hazmat.primitives.asymmetric.types import ( # pragma: no cover + PublicKeyTypes, + ) + from ansible_collections.community.crypto.plugins.plugin_utils._action_module import ( # pragma: no cover AnsibleActionModule, ) from ansible_collections.community.crypto.plugins.plugin_utils._filter_module import ( # pragma: no cover FilterModuleMock, ) - from cryptography.hazmat.primitives.asymmetric.types import ( # pragma: no cover - PublicKeyTypes, - ) GeneralAnsibleModule = t.Union[ AnsibleModule, AnsibleActionModule, FilterModuleMock diff --git a/plugins/module_utils/_crypto/support.py b/plugins/module_utils/_crypto/support.py index 51c85881..890d1f8e 100644 --- a/plugins/module_utils/_crypto/support.py +++ b/plugins/module_utils/_crypto/support.py @@ -14,6 +14,7 @@ import os import typing as t from ansible.module_utils.common.text.converters import to_bytes + from ansible_collections.community.crypto.plugins.module_utils._crypto.cryptography_support import ( is_potential_certificate_issuer_private_key, is_potential_certificate_private_key, @@ -40,15 +41,16 @@ from ansible_collections.community.crypto.plugins.module_utils._crypto.basic imp if t.TYPE_CHECKING: from ansible.module_utils.basic import AnsibleModule # pragma: no cover - from ansible_collections.community.crypto.plugins.module_utils._crypto.cryptography_support import ( # pragma: no cover - CertificatePrivateKeyTypes, - ) from cryptography.hazmat.primitives.asymmetric.types import ( # pragma: no cover CertificateIssuerPrivateKeyTypes, PrivateKeyTypes, PublicKeyTypes, ) + from ansible_collections.community.crypto.plugins.module_utils._crypto.cryptography_support import ( # pragma: no cover + CertificatePrivateKeyTypes, + ) + # This list of preferred fingerprints is used when prefer_one=True is supplied to the # fingerprinting methods. diff --git a/plugins/module_utils/_cryptography_dep.py b/plugins/module_utils/_cryptography_dep.py index 5150c3bf..8905855e 100644 --- a/plugins/module_utils/_cryptography_dep.py +++ b/plugins/module_utils/_cryptography_dep.py @@ -17,6 +17,7 @@ import traceback import typing as t from ansible.module_utils.basic import missing_required_lib + from ansible_collections.community.crypto.plugins.module_utils._version import ( LooseVersion, ) @@ -24,6 +25,7 @@ from ansible_collections.community.crypto.plugins.module_utils._version import ( if t.TYPE_CHECKING: from ansible.module_utils.basic import AnsibleModule # pragma: no cover + from ansible_collections.community.crypto.plugins.plugin_utils._action_module import ( # pragma: no cover AnsibleActionModule, ) diff --git a/plugins/module_utils/_openssh/backends/common.py b/plugins/module_utils/_openssh/backends/common.py index 06b991bc..eb0f1141 100644 --- a/plugins/module_utils/_openssh/backends/common.py +++ b/plugins/module_utils/_openssh/backends/common.py @@ -20,14 +20,15 @@ from ansible_collections.community.crypto.plugins.module_utils._openssh.utils im if t.TYPE_CHECKING: from ansible.module_utils.basic import AnsibleModule # pragma: no cover - from ansible_collections.community.crypto.plugins.module_utils._openssh.certificate import ( # pragma: no cover - OpensshCertificateTimeParameters, - ) from cryptography.hazmat.primitives.asymmetric.types import ( # pragma: no cover CertificateIssuerPrivateKeyTypes, PrivateKeyTypes, ) + from ansible_collections.community.crypto.plugins.module_utils._openssh.certificate import ( # pragma: no cover + OpensshCertificateTimeParameters, + ) + Param = t.ParamSpec("Param") # pragma: no cover diff --git a/plugins/module_utils/_openssh/backends/keypair_backend.py b/plugins/module_utils/_openssh/backends/keypair_backend.py index 362139f8..f047f435 100644 --- a/plugins/module_utils/_openssh/backends/keypair_backend.py +++ b/plugins/module_utils/_openssh/backends/keypair_backend.py @@ -14,6 +14,7 @@ import typing as t from ansible.module_utils.basic import missing_required_lib from ansible.module_utils.common.text.converters import to_bytes, to_text + from ansible_collections.community.crypto.plugins.module_utils._cryptography_dep import ( COLLECTION_MINIMUM_CRYPTOGRAPHY_VERSION, ) diff --git a/plugins/module_utils/_openssh/certificate.py b/plugins/module_utils/_openssh/certificate.py index e5cfb17a..1024cb0f 100644 --- a/plugins/module_utils/_openssh/certificate.py +++ b/plugins/module_utils/_openssh/certificate.py @@ -17,6 +17,7 @@ from datetime import datetime from hashlib import sha256 from ansible.module_utils.common.text.converters import to_text + from ansible_collections.community.crypto.plugins.module_utils._openssh.utils import ( OpensshParser, _OpensshWriter, diff --git a/plugins/module_utils/_serial.py b/plugins/module_utils/_serial.py index 0b5c03a0..6f9a9ec0 100644 --- a/plugins/module_utils/_serial.py +++ b/plugins/module_utils/_serial.py @@ -8,6 +8,7 @@ from __future__ import annotations from ansible.module_utils.common.text.converters import to_text + from ansible_collections.community.crypto.plugins.module_utils._crypto.math import ( convert_int_to_hex, ) diff --git a/plugins/module_utils/_time.py b/plugins/module_utils/_time.py index 74af89bc..6cb2bff8 100644 --- a/plugins/module_utils/_time.py +++ b/plugins/module_utils/_time.py @@ -11,6 +11,7 @@ import datetime import re from ansible.module_utils.common.text.converters import to_text + from ansible_collections.community.crypto.plugins.module_utils._crypto.basic import ( OpenSSLObjectError, ) diff --git a/plugins/modules/acme_certificate.py b/plugins/modules/acme_certificate.py index 52856ef2..92129866 100644 --- a/plugins/modules/acme_certificate.py +++ b/plugins/modules/acme_certificate.py @@ -602,6 +602,7 @@ from ansible_collections.community.crypto.plugins.module_utils._acme.utils impor if t.TYPE_CHECKING: from ansible.module_utils.basic import AnsibleModule # pragma: no cover + from ansible_collections.community.crypto.plugins.module_utils._acme.backends import ( # pragma: no cover CertificateInformation, CryptoBackend, diff --git a/plugins/modules/acme_challenge_cert_helper.py b/plugins/modules/acme_challenge_cert_helper.py index 987ddab7..fac30b14 100644 --- a/plugins/modules/acme_challenge_cert_helper.py +++ b/plugins/modules/acme_challenge_cert_helper.py @@ -155,6 +155,7 @@ import typing as t from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_bytes, to_text + from ansible_collections.community.crypto.plugins.module_utils._acme.errors import ( ModuleFailException, ) diff --git a/plugins/modules/acme_inspect.py b/plugins/modules/acme_inspect.py index 54edef95..c8829c8d 100644 --- a/plugins/modules/acme_inspect.py +++ b/plugins/modules/acme_inspect.py @@ -227,6 +227,7 @@ output_json: import typing as t from ansible.module_utils.common.text.converters import to_bytes, to_text + from ansible_collections.community.crypto.plugins.module_utils._acme.acme import ( ACMEClient, create_backend, diff --git a/plugins/modules/certificate_complete_chain.py b/plugins/modules/certificate_complete_chain.py index 63eca227..ba37c5d1 100644 --- a/plugins/modules/certificate_complete_chain.py +++ b/plugins/modules/certificate_complete_chain.py @@ -125,6 +125,7 @@ import typing as t from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_bytes, to_text + from ansible_collections.community.crypto.plugins.module_utils._crypto.pem import ( split_pem_list, ) diff --git a/plugins/modules/get_certificate.py b/plugins/modules/get_certificate.py index 55ff7399..5087fd85 100644 --- a/plugins/modules/get_certificate.py +++ b/plugins/modules/get_certificate.py @@ -280,6 +280,7 @@ from ssl import ( from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_bytes, to_text + from ansible_collections.community.crypto.plugins.module_utils._crypto.cryptography_support import ( CRYPTOGRAPHY_TIMEZONE, cryptography_get_extensions_from_cert, diff --git a/plugins/modules/openssh_cert.py b/plugins/modules/openssh_cert.py index 5310fe22..7b7731e1 100644 --- a/plugins/modules/openssh_cert.py +++ b/plugins/modules/openssh_cert.py @@ -287,6 +287,7 @@ import os import typing as t from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.crypto.plugins.module_utils._openssh.backends.common import ( KeygenCommand, OpensshModule, diff --git a/plugins/modules/openssh_keypair.py b/plugins/modules/openssh_keypair.py index e14a3c23..b17d1ba5 100644 --- a/plugins/modules/openssh_keypair.py +++ b/plugins/modules/openssh_keypair.py @@ -208,6 +208,7 @@ comment: import typing as t from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.crypto.plugins.module_utils._openssh.backends.keypair_backend import ( select_backend, ) diff --git a/plugins/modules/openssl_csr.py b/plugins/modules/openssl_csr.py index 99a46243..7a74d6f2 100644 --- a/plugins/modules/openssl_csr.py +++ b/plugins/modules/openssl_csr.py @@ -259,6 +259,7 @@ from ansible_collections.community.crypto.plugins.module_utils._io import ( if t.TYPE_CHECKING: from ansible.module_utils.basic import AnsibleModule # pragma: no cover + from ansible_collections.community.crypto.plugins.module_utils._crypto.module_backends.csr import ( # pragma: no cover CertificateSigningRequestBackend, ) diff --git a/plugins/modules/openssl_csr_info.py b/plugins/modules/openssl_csr_info.py index 948232c0..8624b1b4 100644 --- a/plugins/modules/openssl_csr_info.py +++ b/plugins/modules/openssl_csr_info.py @@ -311,6 +311,7 @@ authority_cert_serial_number: import typing as t from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.crypto.plugins.module_utils._crypto.basic import ( OpenSSLObjectError, ) diff --git a/plugins/modules/openssl_csr_pipe.py b/plugins/modules/openssl_csr_pipe.py index 76c7fb07..950d09dd 100644 --- a/plugins/modules/openssl_csr_pipe.py +++ b/plugins/modules/openssl_csr_pipe.py @@ -140,6 +140,7 @@ from ansible_collections.community.crypto.plugins.module_utils._crypto.module_ba if t.TYPE_CHECKING: from ansible.module_utils.basic import AnsibleModule # pragma: no cover + from ansible_collections.community.crypto.plugins.module_utils._crypto.module_backends.csr import ( # pragma: no cover CertificateSigningRequestBackend, ) diff --git a/plugins/modules/openssl_dhparam.py b/plugins/modules/openssl_dhparam.py index 876be6ca..7f438f1a 100644 --- a/plugins/modules/openssl_dhparam.py +++ b/plugins/modules/openssl_dhparam.py @@ -136,6 +136,7 @@ import typing as t from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_text + from ansible_collections.community.crypto.plugins.module_utils._crypto.math import ( count_bits, ) diff --git a/plugins/modules/openssl_pkcs12.py b/plugins/modules/openssl_pkcs12.py index ada150bd..d71513ed 100644 --- a/plugins/modules/openssl_pkcs12.py +++ b/plugins/modules/openssl_pkcs12.py @@ -282,6 +282,7 @@ import typing as t from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_bytes, to_text + from ansible_collections.community.crypto.plugins.module_utils._crypto.basic import ( OpenSSLBadPassphraseError, OpenSSLObjectError, diff --git a/plugins/modules/openssl_privatekey.py b/plugins/modules/openssl_privatekey.py index 41dc5a7f..13f9c745 100644 --- a/plugins/modules/openssl_privatekey.py +++ b/plugins/modules/openssl_privatekey.py @@ -175,6 +175,7 @@ from ansible_collections.community.crypto.plugins.module_utils._io import ( if t.TYPE_CHECKING: from ansible.module_utils.basic import AnsibleModule # pragma: no cover + from ansible_collections.community.crypto.plugins.module_utils._crypto.module_backends.privatekey import ( # pragma: no cover PrivateKeyBackend, ) diff --git a/plugins/modules/openssl_privatekey_convert.py b/plugins/modules/openssl_privatekey_convert.py index f1070535..fa921c9b 100644 --- a/plugins/modules/openssl_privatekey_convert.py +++ b/plugins/modules/openssl_privatekey_convert.py @@ -80,6 +80,7 @@ from ansible_collections.community.crypto.plugins.module_utils._io import ( if t.TYPE_CHECKING: from ansible.module_utils.basic import AnsibleModule # pragma: no cover + from ansible_collections.community.crypto.plugins.module_utils._crypto.module_backends.privatekey_convert import ( # pragma: no cover PrivateKeyConvertBackend, ) diff --git a/plugins/modules/openssl_privatekey_info.py b/plugins/modules/openssl_privatekey_info.py index 242a7584..2f10e109 100644 --- a/plugins/modules/openssl_privatekey_info.py +++ b/plugins/modules/openssl_privatekey_info.py @@ -203,6 +203,7 @@ private_data: import typing as t from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.crypto.plugins.module_utils._crypto.basic import ( OpenSSLObjectError, ) diff --git a/plugins/modules/openssl_publickey.py b/plugins/modules/openssl_publickey.py index bd2a405d..faa8ad38 100644 --- a/plugins/modules/openssl_publickey.py +++ b/plugins/modules/openssl_publickey.py @@ -189,6 +189,7 @@ import os import typing as t from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.crypto.plugins.module_utils._crypto.basic import ( OpenSSLBadPassphraseError, OpenSSLObjectError, diff --git a/plugins/modules/openssl_publickey_info.py b/plugins/modules/openssl_publickey_info.py index d5a55f34..83505d52 100644 --- a/plugins/modules/openssl_publickey_info.py +++ b/plugins/modules/openssl_publickey_info.py @@ -155,6 +155,7 @@ public_data: import typing as t from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.crypto.plugins.module_utils._crypto.basic import ( OpenSSLObjectError, ) diff --git a/plugins/modules/openssl_signature.py b/plugins/modules/openssl_signature.py index 846e08ec..e5ba356d 100644 --- a/plugins/modules/openssl_signature.py +++ b/plugins/modules/openssl_signature.py @@ -122,6 +122,7 @@ except ImportError: CRYPTOGRAPHY_VERSION = LooseVersion("0.0") from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.crypto.plugins.module_utils._crypto.basic import ( OpenSSLObjectError, ) diff --git a/plugins/modules/openssl_signature_info.py b/plugins/modules/openssl_signature_info.py index 3322f022..3095eff7 100644 --- a/plugins/modules/openssl_signature_info.py +++ b/plugins/modules/openssl_signature_info.py @@ -111,6 +111,7 @@ except ImportError: CRYPTOGRAPHY_VERSION = LooseVersion("0.0") from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.crypto.plugins.module_utils._crypto.basic import ( OpenSSLObjectError, ) diff --git a/plugins/modules/x509_certificate.py b/plugins/modules/x509_certificate.py index 53f7acf7..46b050ca 100644 --- a/plugins/modules/x509_certificate.py +++ b/plugins/modules/x509_certificate.py @@ -239,6 +239,7 @@ from ansible_collections.community.crypto.plugins.module_utils._io import ( if t.TYPE_CHECKING: from ansible.module_utils.basic import AnsibleModule # pragma: no cover + from ansible_collections.community.crypto.plugins.module_utils._crypto.module_backends.certificate import ( # pragma: no cover CertificateBackend, ) diff --git a/plugins/modules/x509_certificate_convert.py b/plugins/modules/x509_certificate_convert.py index 7634a319..13034129 100644 --- a/plugins/modules/x509_certificate_convert.py +++ b/plugins/modules/x509_certificate_convert.py @@ -110,6 +110,7 @@ import typing as t from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_bytes, to_text + from ansible_collections.community.crypto.plugins.module_utils._crypto.basic import ( OpenSSLObjectError, ) diff --git a/plugins/modules/x509_certificate_info.py b/plugins/modules/x509_certificate_info.py index 76cf3136..b7efe319 100644 --- a/plugins/modules/x509_certificate_info.py +++ b/plugins/modules/x509_certificate_info.py @@ -394,6 +394,7 @@ import typing as t from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_text + from ansible_collections.community.crypto.plugins.module_utils._crypto.basic import ( OpenSSLObjectError, ) diff --git a/plugins/modules/x509_certificate_pipe.py b/plugins/modules/x509_certificate_pipe.py index 589f2c03..150843b4 100644 --- a/plugins/modules/x509_certificate_pipe.py +++ b/plugins/modules/x509_certificate_pipe.py @@ -137,6 +137,7 @@ from ansible_collections.community.crypto.plugins.module_utils._crypto.module_ba if t.TYPE_CHECKING: from ansible.module_utils.basic import AnsibleModule # pragma: no cover + from ansible_collections.community.crypto.plugins.module_utils._crypto.module_backends.certificate import ( # pragma: no cover CertificateBackend, ) diff --git a/plugins/modules/x509_crl.py b/plugins/modules/x509_crl.py index b6c1773f..2f3195ff 100644 --- a/plugins/modules/x509_crl.py +++ b/plugins/modules/x509_crl.py @@ -430,6 +430,7 @@ import typing as t from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_text from ansible.module_utils.common.validation import check_type_int, check_type_str + from ansible_collections.community.crypto.plugins.module_utils._crypto.basic import ( OpenSSLBadPassphraseError, OpenSSLObjectError, diff --git a/plugins/modules/x509_crl_info.py b/plugins/modules/x509_crl_info.py index f5abac02..14983117 100644 --- a/plugins/modules/x509_crl_info.py +++ b/plugins/modules/x509_crl_info.py @@ -177,6 +177,7 @@ import binascii import typing as t from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.crypto.plugins.module_utils._crypto.basic import ( OpenSSLObjectError, ) diff --git a/plugins/plugin_utils/_gnupg.py b/plugins/plugin_utils/_gnupg.py index d5da89aa..46b52485 100644 --- a/plugins/plugin_utils/_gnupg.py +++ b/plugins/plugin_utils/_gnupg.py @@ -12,6 +12,7 @@ from subprocess import PIPE, Popen from ansible.module_utils.common.process import get_bin_path from ansible.module_utils.common.text.converters import to_text + from ansible_collections.community.crypto.plugins.module_utils._gnupg.cli import ( GPGError, GPGRunner, diff --git a/tests/unit/plugins/module_utils/_acme/test_backend_cryptography.py b/tests/unit/plugins/module_utils/_acme/test_backend_cryptography.py index 0932f1be..3cd192c0 100644 --- a/tests/unit/plugins/module_utils/_acme/test_backend_cryptography.py +++ b/tests/unit/plugins/module_utils/_acme/test_backend_cryptography.py @@ -12,6 +12,8 @@ from unittest.mock import ( ) import pytest +from freezegun import freeze_time + from ansible_collections.community.crypto.plugins.module_utils._acme.backend_cryptography import ( HAS_CURRENT_CRYPTOGRAPHY, CryptographyBackend, @@ -23,7 +25,6 @@ from ansible_collections.community.crypto.plugins.module_utils._time import ( UTC, ensure_utc_timezone, ) -from freezegun import freeze_time from ..test__time import TIMEZONES from .backend_data import ( diff --git a/tests/unit/plugins/module_utils/_acme/test_backend_openssl_cli.py b/tests/unit/plugins/module_utils/_acme/test_backend_openssl_cli.py index 9804ebe8..f212bf56 100644 --- a/tests/unit/plugins/module_utils/_acme/test_backend_openssl_cli.py +++ b/tests/unit/plugins/module_utils/_acme/test_backend_openssl_cli.py @@ -12,6 +12,8 @@ from unittest.mock import ( ) import pytest +from freezegun import freeze_time + from ansible_collections.community.crypto.plugins.module_utils._acme.backend_openssl_cli import ( OpenSSLCLIBackend, ) @@ -19,7 +21,6 @@ from ansible_collections.community.crypto.plugins.module_utils._time import ( UTC, ensure_utc_timezone, ) -from freezegun import freeze_time from .backend_data import ( TEST_CERT, diff --git a/tests/unit/plugins/module_utils/_acme/test_challenges.py b/tests/unit/plugins/module_utils/_acme/test_challenges.py index 5ad41de4..5991f616 100644 --- a/tests/unit/plugins/module_utils/_acme/test_challenges.py +++ b/tests/unit/plugins/module_utils/_acme/test_challenges.py @@ -10,6 +10,7 @@ from unittest.mock import ( ) import pytest + from ansible_collections.community.crypto.plugins.module_utils._acme.challenges import ( Authorization, Challenge, diff --git a/tests/unit/plugins/module_utils/_acme/test_errors.py b/tests/unit/plugins/module_utils/_acme/test_errors.py index 435ca026..6138ef90 100644 --- a/tests/unit/plugins/module_utils/_acme/test_errors.py +++ b/tests/unit/plugins/module_utils/_acme/test_errors.py @@ -10,6 +10,7 @@ from unittest.mock import ( ) import pytest + from ansible_collections.community.crypto.plugins.module_utils._acme.errors import ( ACMEProtocolException, format_error_problem, diff --git a/tests/unit/plugins/module_utils/_acme/test_orders.py b/tests/unit/plugins/module_utils/_acme/test_orders.py index 4bdb5446..1eef64cf 100644 --- a/tests/unit/plugins/module_utils/_acme/test_orders.py +++ b/tests/unit/plugins/module_utils/_acme/test_orders.py @@ -9,6 +9,7 @@ from unittest.mock import ( ) import pytest + from ansible_collections.community.crypto.plugins.module_utils._acme.errors import ( ACMEProtocolException, ) diff --git a/tests/unit/plugins/module_utils/_acme/test_utils.py b/tests/unit/plugins/module_utils/_acme/test_utils.py index 79e376cc..04f525d8 100644 --- a/tests/unit/plugins/module_utils/_acme/test_utils.py +++ b/tests/unit/plugins/module_utils/_acme/test_utils.py @@ -9,6 +9,7 @@ import pathlib import typing as t import pytest + from ansible_collections.community.crypto.plugins.module_utils._acme.backends import ( CertificateInformation, CryptoBackend, diff --git a/tests/unit/plugins/module_utils/_crypto/test_asn1.py b/tests/unit/plugins/module_utils/_crypto/test_asn1.py index 811ec4f6..97c48102 100644 --- a/tests/unit/plugins/module_utils/_crypto/test_asn1.py +++ b/tests/unit/plugins/module_utils/_crypto/test_asn1.py @@ -10,6 +10,7 @@ import re import subprocess import pytest + from ansible_collections.community.crypto.plugins.module_utils._crypto._asn1 import ( serialize_asn1_string_as_der, ) diff --git a/tests/unit/plugins/module_utils/_crypto/test_cryptography_support.py b/tests/unit/plugins/module_utils/_crypto/test_cryptography_support.py index 9183c6ff..6609366c 100644 --- a/tests/unit/plugins/module_utils/_crypto/test_cryptography_support.py +++ b/tests/unit/plugins/module_utils/_crypto/test_cryptography_support.py @@ -9,6 +9,8 @@ import typing as t import cryptography import pytest +from cryptography.x509 import NameAttribute, OtherName, oid + from ansible_collections.community.crypto.plugins.module_utils._crypto.basic import ( OpenSSLObjectError, ) @@ -21,7 +23,6 @@ from ansible_collections.community.crypto.plugins.module_utils._crypto.cryptogra from ansible_collections.community.crypto.plugins.module_utils._version import ( LooseVersion, ) -from cryptography.x509 import NameAttribute, OtherName, oid @pytest.mark.parametrize( diff --git a/tests/unit/plugins/module_utils/_crypto/test_math.py b/tests/unit/plugins/module_utils/_crypto/test_math.py index cd0584f0..af54be49 100644 --- a/tests/unit/plugins/module_utils/_crypto/test_math.py +++ b/tests/unit/plugins/module_utils/_crypto/test_math.py @@ -5,6 +5,7 @@ from __future__ import annotations import pytest + from ansible_collections.community.crypto.plugins.module_utils._crypto.math import ( binary_exp_mod, convert_bytes_to_int, diff --git a/tests/unit/plugins/module_utils/_crypto/test_pem.py b/tests/unit/plugins/module_utils/_crypto/test_pem.py index 60872784..83c2d395 100644 --- a/tests/unit/plugins/module_utils/_crypto/test_pem.py +++ b/tests/unit/plugins/module_utils/_crypto/test_pem.py @@ -7,6 +7,7 @@ from __future__ import annotations import typing as t import pytest + from ansible_collections.community.crypto.plugins.module_utils._crypto.pem import ( extract_first_pem, identify_pem_format, diff --git a/tests/unit/plugins/module_utils/_openssh/test_certificate.py b/tests/unit/plugins/module_utils/_openssh/test_certificate.py index f3109a29..0d5b1d5c 100644 --- a/tests/unit/plugins/module_utils/_openssh/test_certificate.py +++ b/tests/unit/plugins/module_utils/_openssh/test_certificate.py @@ -7,6 +7,7 @@ from __future__ import annotations import pathlib import pytest + from ansible_collections.community.crypto.plugins.module_utils._openssh.certificate import ( OpensshCertificate, OpensshCertificateOption, diff --git a/tests/unit/plugins/module_utils/_openssh/test_cryptography.py b/tests/unit/plugins/module_utils/_openssh/test_cryptography.py index eb16b4f1..99ddf2b2 100644 --- a/tests/unit/plugins/module_utils/_openssh/test_cryptography.py +++ b/tests/unit/plugins/module_utils/_openssh/test_cryptography.py @@ -12,6 +12,7 @@ from socket import gethostname from tempfile import mkdtemp import pytest + from ansible_collections.community.crypto.plugins.module_utils._openssh.cryptography import ( HAS_OPENSSH_SUPPORT, InvalidCommentError, diff --git a/tests/unit/plugins/module_utils/_openssh/test_utils.py b/tests/unit/plugins/module_utils/_openssh/test_utils.py index ea35604a..f15ed7d9 100644 --- a/tests/unit/plugins/module_utils/_openssh/test_utils.py +++ b/tests/unit/plugins/module_utils/_openssh/test_utils.py @@ -7,6 +7,7 @@ from __future__ import annotations import typing as t import pytest + from ansible_collections.community.crypto.plugins.module_utils._openssh.utils import ( OpensshParser, _OpensshWriter, diff --git a/tests/unit/plugins/module_utils/test__time.py b/tests/unit/plugins/module_utils/test__time.py index 4cd77235..a12a1814 100644 --- a/tests/unit/plugins/module_utils/test__time.py +++ b/tests/unit/plugins/module_utils/test__time.py @@ -8,6 +8,8 @@ import datetime import typing as t import pytest +from freezegun import freeze_time + from ansible_collections.community.crypto.plugins.module_utils._time import ( UTC, add_or_remove_timezone, @@ -19,7 +21,6 @@ from ansible_collections.community.crypto.plugins.module_utils._time import ( get_relative_time_option, remove_timezone, ) -from freezegun import freeze_time TIMEZONES = [ diff --git a/tests/unit/plugins/modules/test_luks_device.py b/tests/unit/plugins/modules/test_luks_device.py index 7be2abb5..0f964c57 100644 --- a/tests/unit/plugins/modules/test_luks_device.py +++ b/tests/unit/plugins/modules/test_luks_device.py @@ -7,6 +7,7 @@ from __future__ import annotations import typing as t import pytest + from ansible_collections.community.crypto.plugins.modules import luks_device