Skip to content

Commit

Permalink
Remove deprecation
Browse files Browse the repository at this point in the history
  • Loading branch information
tremble committed May 16, 2023
1 parent 228c43d commit e9892d7
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
4 changes: 2 additions & 2 deletions changelogs/fragments/1548-s3_object-leading-slash.yml
Original file line number Diff line number Diff line change
@@ -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).
15 changes: 8 additions & 7 deletions plugins/modules/s3_object.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit e9892d7

Please sign in to comment.