Revert all non-bugfixes merged since the last release.

Revert "Fix documentation. (#751)" Revert "ACME modules: simplify code, refactor argspec handling code, move csr/csr_content to own docs fragment (#750)" Revert "Refactor and extend argument spec helper, use for ACME modules (#749)" Revert "Avoid exception if certificate has no AKI in acme_certificate. (#748)" Revert "ACME: improve acme_certificate docs, include cert_id in acme_certificate_renewal_info return value (#747)" Revert "Add acme_certificate_renewal_info module (#746)" Revert "Refactor time code, add tests, fix bug when parsing absolute timestamps that omit seconds (#745)" Revert "Add tests for acme_certificate_deactivate_authz module. (#744)" Revert "Create acme_certificate_deactivate_authz module (#741)" Revert "acme_certificate: allow to request renewal of a certificate according to ARI (#739)" Revert "Implement basic acme_ari_info module. (#732)" Revert "Add function for retrieval of ARI information. (#738)" Revert "acme module utils: add functions for parsing Retry-After header values and computation of ARI certificate IDs (#737)" Revert "Implement certificate information retrieval code in the ACME backends. (#736)" Revert "Split up the default acme docs fragment to allow modules ot not need account data. (#735)" This reverts commits 5e59c5261e, aa82575a78, f3c9cb7a8a, f82b335916, 553ab45f46, 59606d48ad, 0a15be1017, 9501a28a93, d906914737, 33d278ad8f, 6d4fc589ae, 9614b09f7a, af5f4b57f8, c6fbe58382, and afe7f7522c.
2026-05-06 21:33:00 +00:00 · 2024-05-11 16:06:52 +02:00
parent f43fa94549
commit 82251c2d80
66 changed files with 299 additions and 2908 deletions
--- a/plugins/module_utils/crypto/module_backends/certificate.py
+++ b/plugins/module_utils/crypto/module_backends/certificate.py
@@ -15,10 +15,10 @@ import traceback
 from ansible.module_utils import six
 from ansible.module_utils.basic import missing_required_lib

-from ansible_collections.community.crypto.plugins.module_utils.argspec import ArgumentSpec
-
 from ansible_collections.community.crypto.plugins.module_utils.version import LooseVersion

+from ansible_collections.community.crypto.plugins.module_utils.crypto.module_backends.common import ArgumentSpec
+
 from ansible_collections.community.crypto.plugins.module_utils.crypto.basic import (
    OpenSSLObjectError,
    OpenSSLBadPassphraseError,
--- a/plugins/module_utils/crypto/module_backends/certificate_entrust.py
+++ b/plugins/module_utils/crypto/module_backends/certificate_entrust.py
@@ -18,6 +18,8 @@ from ansible_collections.community.crypto.plugins.module_utils.ecs.api import EC

 from ansible_collections.community.crypto.plugins.module_utils.crypto.support import (
    load_certificate,
+    get_now_datetime,
+    get_relative_time_option,
 )

 from ansible_collections.community.crypto.plugins.module_utils.crypto.cryptography_support import (
@@ -32,11 +34,6 @@ from ansible_collections.community.crypto.plugins.module_utils.crypto.module_bac
    CertificateProvider,
 )

-from ansible_collections.community.crypto.plugins.module_utils.time import (
-    get_now_datetime,
-    get_relative_time_option,
-)
-
 try:
    from cryptography.x509.oid import NameOID
 except ImportError:
--- a/plugins/module_utils/crypto/module_backends/certificate_info.py
+++ b/plugins/module_utils/crypto/module_backends/certificate_info.py
@@ -23,6 +23,7 @@ from ansible_collections.community.crypto.plugins.module_utils.version import Lo
 from ansible_collections.community.crypto.plugins.module_utils.crypto.support import (
    load_certificate,
    get_fingerprint_of_bytes,
+    get_now_datetime,
 )

 from ansible_collections.community.crypto.plugins.module_utils.crypto.cryptography_support import (
@@ -39,10 +40,6 @@ from ansible_collections.community.crypto.plugins.module_utils.crypto.module_bac
    get_publickey_info,
 )

-from ansible_collections.community.crypto.plugins.module_utils.time import (
-    get_now_datetime,
-)
-
 MINIMAL_CRYPTOGRAPHY_VERSION = '1.6'

 CRYPTOGRAPHY_IMP_ERR = None
--- a/plugins/module_utils/crypto/module_backends/certificate_ownca.py
+++ b/plugins/module_utils/crypto/module_backends/certificate_ownca.py
@@ -22,6 +22,7 @@ from ansible_collections.community.crypto.plugins.module_utils.crypto.basic impo
 from ansible_collections.community.crypto.plugins.module_utils.crypto.support import (
    load_privatekey,
    load_certificate,
+    get_relative_time_option,
    select_message_digest,
 )

@@ -44,10 +45,6 @@ from ansible_collections.community.crypto.plugins.module_utils.crypto.module_bac
    CertificateProvider,
 )

-from ansible_collections.community.crypto.plugins.module_utils.time import (
-    get_relative_time_option,
-)
-
 try:
    import cryptography
    from cryptography import x509
--- a/plugins/module_utils/crypto/module_backends/certificate_selfsigned.py
+++ b/plugins/module_utils/crypto/module_backends/certificate_selfsigned.py
@@ -14,6 +14,7 @@ import os
 from random import randrange

 from ansible_collections.community.crypto.plugins.module_utils.crypto.support import (
+    get_relative_time_option,
    select_message_digest,
 )

@@ -34,10 +35,6 @@ from ansible_collections.community.crypto.plugins.module_utils.crypto.module_bac
    CertificateProvider,
 )

-from ansible_collections.community.crypto.plugins.module_utils.time import (
-    get_relative_time_option,
-)
-
 try:
    import cryptography
    from cryptography import x509
--- a/plugins/module_utils/crypto/module_backends/common.py
+++ b/plugins/module_utils/crypto/module_backends/common.py
@@ -10,19 +10,26 @@ __metaclass__ = type

 from ansible.module_utils.basic import AnsibleModule

-from ansible_collections.community.crypto.plugins.module_utils.argspec import ArgumentSpec as _ArgumentSpec

+class ArgumentSpec:
+    def __init__(self, argument_spec, mutually_exclusive=None, required_together=None, required_one_of=None, required_if=None, required_by=None):
+        self.argument_spec = argument_spec
+        self.mutually_exclusive = mutually_exclusive or []
+        self.required_together = required_together or []
+        self.required_one_of = required_one_of or []
+        self.required_if = required_if or []
+        self.required_by = required_by or {}

-class ArgumentSpec(_ArgumentSpec):
    def create_ansible_module_helper(self, clazz, args, **kwargs):
-        result = super(ArgumentSpec, self).create_ansible_module_helper(clazz, args, **kwargs)
-        result.deprecate(
-            "The crypto.module_backends.common module utils is deprecated and will be removed from community.crypto 3.0.0."
-            " Use the argspec module utils from community.crypto instead.",
-            version='3.0.0',
-            collection_name='community.crypto',
-        )
-        return result
+        return clazz(
+            *args,
+            argument_spec=self.argument_spec,
+            mutually_exclusive=self.mutually_exclusive,
+            required_together=self.required_together,
+            required_one_of=self.required_one_of,
+            required_if=self.required_if,
+            required_by=self.required_by,
+            **kwargs)

-
-__all__ = ('AnsibleModule', 'ArgumentSpec')
+    def create_ansible_module(self, **kwargs):
+        return self.create_ansible_module_helper(AnsibleModule, (), **kwargs)
--- a/plugins/module_utils/crypto/module_backends/csr.py
+++ b/plugins/module_utils/crypto/module_backends/csr.py
@@ -17,8 +17,6 @@ from ansible.module_utils import six
 from ansible.module_utils.basic import missing_required_lib
 from ansible.module_utils.common.text.converters import to_native, to_text

-from ansible_collections.community.crypto.plugins.module_utils.argspec import ArgumentSpec
-
 from ansible_collections.community.crypto.plugins.module_utils.version import LooseVersion

 from ansible_collections.community.crypto.plugins.module_utils.crypto.basic import (
@@ -51,6 +49,8 @@ from ansible_collections.community.crypto.plugins.module_utils.crypto.module_bac
    get_csr_info,
 )

+from ansible_collections.community.crypto.plugins.module_utils.crypto.module_backends.common import ArgumentSpec
+

 MINIMAL_CRYPTOGRAPHY_VERSION = '1.3'

--- a/plugins/module_utils/crypto/module_backends/privatekey.py
+++ b/plugins/module_utils/crypto/module_backends/privatekey.py
@@ -17,8 +17,6 @@ from ansible.module_utils import six
 from ansible.module_utils.basic import missing_required_lib
 from ansible.module_utils.common.text.converters import to_bytes

-from ansible_collections.community.crypto.plugins.module_utils.argspec import ArgumentSpec
-
 from ansible_collections.community.crypto.plugins.module_utils.version import LooseVersion

 from ansible_collections.community.crypto.plugins.module_utils.crypto.basic import (
@@ -44,6 +42,8 @@ from ansible_collections.community.crypto.plugins.module_utils.crypto.module_bac
    get_privatekey_info,
 )

+from ansible_collections.community.crypto.plugins.module_utils.crypto.module_backends.common import ArgumentSpec
+

 MINIMAL_CRYPTOGRAPHY_VERSION = '1.2.3'

--- a/plugins/module_utils/crypto/module_backends/privatekey_convert.py
+++ b/plugins/module_utils/crypto/module_backends/privatekey_convert.py
@@ -15,14 +15,12 @@ from ansible.module_utils import six
 from ansible.module_utils.basic import missing_required_lib
 from ansible.module_utils.common.text.converters import to_bytes

-from ansible_collections.community.crypto.plugins.module_utils.argspec import ArgumentSpec
+from ansible_collections.community.crypto.plugins.module_utils.version import LooseVersion

 from ansible_collections.community.crypto.plugins.module_utils.io import (
    load_file,
 )

-from ansible_collections.community.crypto.plugins.module_utils.version import LooseVersion
-
 from ansible_collections.community.crypto.plugins.module_utils.crypto.basic import (
    CRYPTOGRAPHY_HAS_X25519,
    CRYPTOGRAPHY_HAS_X448,
@@ -39,6 +37,8 @@ from ansible_collections.community.crypto.plugins.module_utils.crypto.pem import
    identify_private_key_format,
 )

+from ansible_collections.community.crypto.plugins.module_utils.crypto.module_backends.common import ArgumentSpec
+

 MINIMAL_CRYPTOGRAPHY_VERSION = '1.2.3'