From 92b209e6760027e9944bbe43be310f0395d14263 Mon Sep 17 00:00:00 2001 From: Mark Chappell Date: Fri, 24 Jun 2022 21:07:50 +0200 Subject: [PATCH] Bump various deprecations from 4.0.0 to 5.0.0 (#1258) Bump various deprecations from 4.0.0 to 5.0.0 SUMMARY Bump various deprecations from 4.0.0 to 5.0.0 we missed them prior to releasing 4.0.0 ISSUE TYPE Feature Pull Request COMPONENT NAME iam_server_certficate rds_instance_snapshot ADDITIONAL INFORMATION Reviewed-by: Markus Bergholz Reviewed-by: Alina Buzachis (cherry picked from commit 9a6f6515748c8159da35631e911af461b8425630) --- changelogs/fragments/1257-deprecations.yml | 4 ++++ meta/runtime.yml | 4 ++-- plugins/modules/iam_server_certificate.py | 16 ++++++++-------- 3 files changed, 14 insertions(+), 10 deletions(-) create mode 100644 changelogs/fragments/1257-deprecations.yml diff --git a/changelogs/fragments/1257-deprecations.yml b/changelogs/fragments/1257-deprecations.yml new file mode 100644 index 00000000000..60ac85b4cd3 --- /dev/null +++ b/changelogs/fragments/1257-deprecations.yml @@ -0,0 +1,4 @@ +minor_changes: +- iam_server_certificate - the deprecations for ``cert_chain``, ``cert``, ``key`` and ``dup_ok`` have been extended from release 4.0.0 to release 5.0.0 (https://github.com/ansible-collections/community.aws/pull/1256). +- iam_server_certificate - the deprecation for the ``iam_cert`` alias has been extended from release 4.0.0 to release 5.0.0 (https://github.com/ansible-collections/community.aws/pull/1257). +- rds_instance_snapshot - the deprecation for the ``rds_snapshot`` alias has been extended from release 4.0.0 to release 5.0.0 (https://github.com/ansible-collections/community.aws/pull/1257). diff --git a/meta/runtime.yml b/meta/runtime.yml index 5029007cca6..68ce831b7ac 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -215,14 +215,14 @@ plugin_routing: iam_cert: redirect: community.aws.iam_server_certificate deprecation: - removal_version: 4.0.0 + removal_version: 5.0.0 warning_text: >- iam_cert has been renamed to iam_server_certificate for consistency. Please update your tasks. rds_snapshot: redirect: community.aws.rds_instance_snapshot deprecation: - removal_version: 4.0.0 + removal_version: 5.0.0 warning_text: >- rds_snapshot has been renamed to rds_instance_snapshot. Please update your tasks. diff --git a/plugins/modules/iam_server_certificate.py b/plugins/modules/iam_server_certificate.py index b6cad710fb3..8985b98027e 100644 --- a/plugins/modules/iam_server_certificate.py +++ b/plugins/modules/iam_server_certificate.py @@ -58,28 +58,28 @@ - The path to, or content of, the CA certificate chain in PEM encoded format. - If the parameter is not a file, it is assumed to be content. - Passing a file name is deprecated, and support will be dropped in - version 4.0.0 of this collection. + version 5.0.0 of this collection. type: str cert: description: - The path to, or content of the certificate body in PEM encoded format. - If the parameter is not a file, it is assumed to be content. - Passing a file name is deprecated, and support will be dropped in - version 4.0.0 of this collection. + version 5.0.0 of this collection. type: str key: description: - The path to, or content of the private key in PEM encoded format. If the parameter is not a file, it is assumed to be content. - Passing a file name is deprecated, and support will be dropped in - version 4.0.0 of this collection. + version 5.0.0 of this collection. type: str dup_ok: description: - By default the module will not upload a certificate that is already uploaded into AWS. - If I(dup_ok=True), it will upload the certificate as long as the name is unique. - Currently defaults to C(false), this will default to C(true) in release - 4.0.0. + 5.0.0. type: bool author: Jonathan I. Davila (@defionscode) @@ -323,21 +323,21 @@ def load_data(): module.deprecate( 'Passing a file name as the cert argument has been deprecated. ' 'Please use a lookup instead, see the documentation for examples.', - version='4.0.0', collection_name='community.aws') + version='5.0.0', collection_name='community.aws') if key and os.path.isfile(key): with open(key, 'r') as key_fh: key = key_fh.read().rstrip() module.deprecate( 'Passing a file name as the key argument has been deprecated. ' 'Please use a lookup instead, see the documentation for examples.', - version='4.0.0', collection_name='community.aws') + version='5.0.0', collection_name='community.aws') if cert_chain and os.path.isfile(cert_chain): with open(cert_chain, 'r') as cert_chain_fh: cert_chain = cert_chain_fh.read() module.deprecate( 'Passing a file name as the cert_chain argument has been deprecated. ' 'Please use a lookup instead, see the documentation for examples.', - version='4.0.0', collection_name='community.aws') + version='5.0.0', collection_name='community.aws') return cert, key, cert_chain @@ -409,7 +409,7 @@ def main(): if dup_ok is None: module.deprecate( 'The dup_ok module currently defaults to false, this will change in ' - 'release 4.0.0 to true.', version='4.0.0', collection_name='community.aws') + 'release 5.0.0 to true.', version='5.0.0', collection_name='community.aws') current_cert = get_server_certificate(name)