Skip to content

Commit

Permalink
Bump various deprecations from 4.0.0 to 5.0.0 (ansible-collections#1258)
Browse files Browse the repository at this point in the history
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 <[email protected]>
Reviewed-by: Alina Buzachis <None>
  • Loading branch information
tremble authored Jun 24, 2022
1 parent b1bd0d8 commit fa58b6a
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions iam_server_certificate.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -321,21 +321,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


Expand Down Expand Up @@ -407,7 +407,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)

Expand Down

0 comments on commit fa58b6a

Please sign in to comment.