From db3dccb95c517a70ba65460740eb762f5fefdd90 Mon Sep 17 00:00:00 2001 From: Mark Chappell Date: Tue, 16 May 2023 16:45:10 +0200 Subject: [PATCH] Remove deprecation --- .../fragments/1548-s3_object-leading-slash.yml | 4 ++-- plugins/modules/s3_object.py | 15 ++++++++------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/changelogs/fragments/1548-s3_object-leading-slash.yml b/changelogs/fragments/1548-s3_object-leading-slash.yml index ffc4c1aa515..17219af7057 100644 --- a/changelogs/fragments/1548-s3_object-leading-slash.yml +++ b/changelogs/fragments/1548-s3_object-leading-slash.yml @@ -1,4 +1,4 @@ bugfixes: - s3_object - fixes regression related to objects with a leading ``/`` (https://github.com/ansible-collections/amazon.aws/issues/1548). -deprecated_features: -- s3_object - support for passing object keys with a leading ``/`` has been deprecated and will be removed in a release after 2025-12-01 (https://github.com/ansible-collections/amazon.aws/pull/1549). +# deprecated_features: +# - s3_object - support for passing object keys with a leading ``/`` has been deprecated and will be removed in a release after 2025-12-01 (https://github.com/ansible-collections/amazon.aws/pull/1549). diff --git a/plugins/modules/s3_object.py b/plugins/modules/s3_object.py index 872356c697b..77d694f0b4a 100644 --- a/plugins/modules/s3_object.py +++ b/plugins/modules/s3_object.py @@ -93,8 +93,9 @@ - Can be used to create "virtual directories", see examples. - Object key names should not include the leading C(/), see U(https://docs.aws.amazon.com/AmazonS3/latest/userguide/object-keys.html) for more - information. Support for passing the leading C(/) has been deprecated and will be removed - in a release after 2025-12-01. + information. +# - Support for passing the leading C(/) has been deprecated and will be removed +# in a release after 2025-12-01. type: str sig_v4: description: @@ -1378,11 +1379,11 @@ def populate_params(module): if obj.startswith("/"): obj = obj[1:] variable_dict["object"] = obj - module.deprecate( - "Support for passing object key names with a leading '/' has been deprecated.", - date="2025-12-01", - collection_name="amazon.aws", - ) + # module.deprecate( + # "Support for passing object key names with a leading '/' has been deprecated.", + # date="2025-12-01", + # collection_name="amazon.aws", + # ) variable_dict["validate"] = not variable_dict["ignore_nonexistent_bucket"] variable_dict["acl_disabled"] = False