Skip to content

Commit

Permalink
S3 - remove deprecated S3_URL alias (#908)
Browse files Browse the repository at this point in the history
S3 - remove deprecated S3_URL alias

SUMMARY
Remove the deprecated alias, this has been causing problems with the docs
ISSUE TYPE

Feature Pull Request

COMPONENT NAME
s3_bucket
s3_object
ADDITIONAL INFORMATION

Reviewed-by: Alina Buzachis <None>
Reviewed-by: Joseph Torcasso <None>
  • Loading branch information
tremble authored Jun 30, 2022
1 parent f8a9443 commit d8dd88c
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 14 deletions.
3 changes: 3 additions & 0 deletions changelogs/fragments/908-s3_url.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
breaking_changes:
- s3_bucket - the previously deprecated alias ``S3_URL`` for the ``s3_url`` parameter has been removed. Playbooks shuold be updated to use ``s3_url`` (https://github.com/ansible-collections/amazon.aws/pull/908).
- s3_object - the previously deprecated alias ``S3_URL`` for the ``s3_url`` parameter has been removed. Playbooks should be updated to use ``s3_url`` (https://github.com/ansible-collections/amazon.aws/pull/908).
5 changes: 1 addition & 4 deletions plugins/modules/s3_bucket.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,6 @@
- S3 URL endpoint for usage with DigitalOcean, Ceph, Eucalyptus and FakeS3 etc.
- Assumes AWS if not specified.
- For Walrus, use FQDN of the endpoint without scheme nor path.
- The S3_URL alias for this option has been deprecated and will be removed
in release 5.0.0.
aliases: [ S3_URL ]
type: str
ceph:
description:
Expand Down Expand Up @@ -1001,7 +998,7 @@ def main():
policy=dict(type='json'),
name=dict(required=True),
requester_pays=dict(type='bool'),
s3_url=dict(aliases=['S3_URL'], deprecated_aliases=[dict(name='S3_URL', version='5.0.0', collection_name='amazon.aws')]),
s3_url=dict(),
state=dict(default='present', choices=['present', 'absent']),
tags=dict(type='dict', aliases=['resource_tags']),
purge_tags=dict(type='bool', default=True),
Expand Down
5 changes: 1 addition & 4 deletions plugins/modules/s3_object.py
Original file line number Diff line number Diff line change
Expand Up @@ -144,9 +144,6 @@
s3_url:
description:
- S3 URL endpoint for usage with Ceph, Eucalyptus and fakes3 etc. Otherwise assumes AWS.
- The S3_URL alias for this option has been deprecated and will be removed
in release 5.0.0.
aliases: [ S3_URL ]
type: str
dualstack:
description:
Expand Down Expand Up @@ -957,7 +954,7 @@ def main():
overwrite=dict(aliases=['force'], default='different'),
prefix=dict(default=""),
retries=dict(aliases=['retry'], type='int', default=0),
s3_url=dict(aliases=['S3_URL'], deprecated_aliases=[dict(name='S3_URL', version='5.0.0', collection_name='amazon.aws')]),
s3_url=dict(),
dualstack=dict(default='no', type='bool'),
rgw=dict(default='no', type='bool'),
src=dict(type='path'),
Expand Down
2 changes: 0 additions & 2 deletions tests/sanity/ignore-2.12.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,3 @@ plugins/modules/ec2_vpc_dhcp_option_info.py validate-modules:collection-deprecat
plugins/modules/ec2_vpc_endpoint.py pylint:collection-deprecated-version # Deprecation planned for 5.0.0
plugins/modules/ec2_vpc_net.py pylint:collection-deprecated-version # Deprecation planned for 5.0.0
plugins/modules/ec2_vpc_route_table.py pylint:collection-deprecated-version # Deprecation planned for 5.0.0
plugins/modules/s3_bucket.py validate-modules:collection-deprecated-version # Deprecation planned for 5.0.0
plugins/modules/s3_object.py validate-modules:collection-deprecated-version # Deprecation planned for 5.0.0
2 changes: 0 additions & 2 deletions tests/sanity/ignore-2.13.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,3 @@ plugins/modules/ec2_vpc_dhcp_option_info.py validate-modules:collection-deprecat
plugins/modules/ec2_vpc_endpoint.py pylint:collection-deprecated-version # Deprecation planned for 5.0.0
plugins/modules/ec2_vpc_net.py pylint:collection-deprecated-version # Deprecation planned for 5.0.0
plugins/modules/ec2_vpc_route_table.py pylint:collection-deprecated-version # Deprecation planned for 5.0.0
plugins/modules/s3_bucket.py validate-modules:collection-deprecated-version # Deprecation planned for 5.0.0
plugins/modules/s3_object.py validate-modules:collection-deprecated-version # Deprecation planned for 5.0.0
2 changes: 0 additions & 2 deletions tests/sanity/ignore-2.14.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,3 @@ plugins/modules/ec2_vpc_dhcp_option_info.py validate-modules:collection-deprecat
plugins/modules/ec2_vpc_endpoint.py pylint:collection-deprecated-version # Deprecation planned for 5.0.0
plugins/modules/ec2_vpc_net.py pylint:collection-deprecated-version # Deprecation planned for 5.0.0
plugins/modules/ec2_vpc_route_table.py pylint:collection-deprecated-version # Deprecation planned for 5.0.0
plugins/modules/s3_bucket.py validate-modules:collection-deprecated-version # Deprecation planned for 5.0.0
plugins/modules/s3_object.py validate-modules:collection-deprecated-version # Deprecation planned for 5.0.0

0 comments on commit d8dd88c

Please sign in to comment.