diff --git a/changelogs/fragments/891-deprecation.yml b/changelogs/fragments/891-deprecation.yml new file mode 100644 index 00000000..e4a8d08e --- /dev/null +++ b/changelogs/fragments/891-deprecation.yml @@ -0,0 +1,3 @@ +deprecated_features: + - "acme_certificate - deprecate the ``agreement`` option which has no more effect. It will be removed from community.crypto 4.0.0 (https://github.com/ansible-collections/community.crypto/pull/891)." + - "openssl_pkcs12 - deprecate the ``maciter_size`` option which has no more effect. It will be removed from community.crypto 4.0.0 (https://github.com/ansible-collections/community.crypto/pull/891)." diff --git a/plugins/modules/acme_certificate.py b/plugins/modules/acme_certificate.py index b646d1df..4e1bb050 100644 --- a/plugins/modules/acme_certificate.py +++ b/plugins/modules/acme_certificate.py @@ -97,8 +97,7 @@ options: description: - URI to a terms of service document you agree to when using the ACME v1 service at O(acme_directory). - Default is latest gathered from O(acme_directory) URL. - - This option has no longer any effect. - # TODO: deprecate! + - This option has no longer any effect. It is deprecated and will be removed from community.crypto 4.0.0. type: str terms_agreed: description: @@ -954,7 +953,11 @@ def main() -> t.NoReturn: argument_spec.update_argspec( modify_account=dict(type="bool", default=True), account_email=dict(type="str"), - agreement=dict(type="str"), + agreement=dict( + type="str", + removed_in_version="4.0.0", + removed_from_collection="community.crypto", + ), terms_agreed=dict(type="bool", default=False), challenge=dict( type="str", diff --git a/plugins/modules/openssl_pkcs12.py b/plugins/modules/openssl_pkcs12.py index c8501988..3c257b30 100644 --- a/plugins/modules/openssl_pkcs12.py +++ b/plugins/modules/openssl_pkcs12.py @@ -94,9 +94,8 @@ options: description: - Number of times to repeat the MAC step. - This is B(not considered during idempotency checks). - - This value is B(not used). + - This value is B(not used). It is deprecated and will be removed from community.crypto 4.0.0. type: int - # TODO: deprecate! encryption_level: description: - Determines the encryption level used. @@ -390,7 +389,6 @@ class Pkcs(OpenSSLObject): certificate_content: str | None = module.params["certificate_content"] self.friendly_name: str | None = module.params["friendly_name"] self.iter_size: int = module.params["iter_size"] or iter_size_default - self.maciter_size: int = module.params["maciter_size"] or 1 self.encryption_level: t.Literal["auto", "compatibility2022"] = module.params[ "encryption_level" ] @@ -776,7 +774,11 @@ def main() -> t.NoReturn: type="str", choices=["auto", "compatibility2022"], default="auto" ), iter_size=dict(type="int"), - maciter_size=dict(type="int"), + maciter_size=dict( + type="int", + removed_in_version="4.0.0", + removed_from_collection="community.crypto", + ), passphrase=dict(type="str", no_log=True), path=dict(type="path", required=True), privatekey_passphrase=dict(type="str", no_log=True),