Skip to content

Commit

Permalink
[3.0.0] Bump minimal botocore version to 1.19.0 (#809)
Browse files Browse the repository at this point in the history
[3.0.0] Bump minimal botocore version to 1.19.0

SUMMARY
In preparation for release 3.0.0, bump the minimal botocore version
ISSUE TYPE

Feature Pull Request

COMPONENT NAME
README.md
plugins/modules/aws_s3_bucket_info.py
requirements.txt
tests/integration/constraints.txt
tests/integration/targets/setup_botocore_pip/defaults/main.yml
tests/unit/constraints.txt
ADDITIONAL INFORMATION
Depends-On: ansible-collections/amazon.aws#574

Reviewed-by: None <None>
  • Loading branch information
tremble authored Nov 26, 2021
1 parent 560169b commit 072195b
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 15 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ As the AWS SDK for Python (Boto3 and Botocore) has [ceased supporting Python 2.7

Starting with the 2.0.0 releases of amazon.aws and community.aws, it is generally the collection's policy to support the versions of `botocore` and `boto3` that were released 12 months prior to the most recent major collection release, following semantic versioning (for example, 2.0.0, 3.0.0).

Version 2.0.0 of this collection supports `boto3 >= 1.15.0` and `botocore >= 1.18.0`
Version 3.0.0 of this collection supports `boto3 >= 1.16.0` and `botocore >= 1.19.0`

## Included content
<!--start collection content-->
Expand Down
7 changes: 7 additions & 0 deletions changelogs/fragments/809-botocore-1-19-0.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
major_changes:
- community.aws collection - The community.aws collection has dropped support for
``botocore<1.19.0`` and ``boto3<1.16.0``. Most modules will continue to work
with older versions of the AWS SDK, however compatability with older versions
of the SDK is not guaranteed and will not be tested. When using older versions
of the SDK a warning will be emitted by Ansible
(https://github.com/ansible-collections/community.aws/pull/809).
4 changes: 0 additions & 4 deletions plugins/modules/aws_s3_bucket_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@
bucket_ownership_controls:
description:
- Retrive S3 ownership controls.
- Access to bucket ownership controls requires botocore>=1.18.11.
type: bool
default: False
bucket_website:
Expand Down Expand Up @@ -595,9 +594,6 @@ def main():
module.deprecate("The 'aws_s3_bucket_facts' module has been renamed to 'aws_s3_bucket_info', "
"and the renamed one no longer returns ansible_facts", date='2021-12-01', collection_name='community.aws')

if module.params.get("bucket_ownership_controls"):
module.require_botocore_at_least('1.18.11', reason='to retreive bucket ownership controls')

# Get parameters
name = module.params.get("name")
name_filter = module.params.get("name_filter")
Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# - tests/unit/constraints.txt
# - tests/integration/constraints.txt
# - tests/integration/targets/setup_botocore_pip
botocore>=1.18.0
boto3>=1.15.0
botocore>=1.19.0
boto3>=1.16.0
# Final released version
boto>=2.49.0
6 changes: 3 additions & 3 deletions tests/integration/constraints.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Specifically run tests against the oldest versions that we support
boto3==1.15.0
botocore==1.18.0
boto3==1.16.0
botocore==1.19.0

# AWS CLI has `botocore==` dependencies, provide the one that matches botocore
# to avoid needing to download over a years worth of awscli wheels.
awscli==1.18.141
awscli==1.18.160
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
default_botocore_version: '1.18.0'
default_boto3_version: '1.15.0'
default_botocore_version: '1.19.0'
default_boto3_version: '1.16.0'
6 changes: 3 additions & 3 deletions tests/unit/constraints.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Specifically run tests against the oldest versions that we support
boto3==1.15.0
botocore==1.18.0
boto3==1.16.0
botocore==1.19.0

# AWS CLI has `botocore==` dependencies, provide the one that matches botocore
# to avoid needing to download over a years worth of awscli wheels.
awscli==1.18.141
awscli==1.18.160

0 comments on commit 072195b

Please sign in to comment.