Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

S3 - remove deprecated S3_URL alias #908

Merged
merged 3 commits into from
Jun 30, 2022
Merged

S3 - remove deprecated S3_URL alias #908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0bae8fe
S3 - remove deprecated S3_URL alias
tremble Jun 30, 2022
8f727d5
changelog
tremble Jun 30, 2022
44e4aaa
Remove deprecation
tremble Jun 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions changelogs/fragments/908-s3_url.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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