From 072195b401443dbf3fecbdfa77c9789849e8e70a Mon Sep 17 00:00:00 2001 From: Mark Chappell Date: Fri, 26 Nov 2021 22:04:57 +0100 Subject: [PATCH] [3.0.0] Bump minimal botocore version to 1.19.0 (#809) [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 --- README.md | 2 +- changelogs/fragments/809-botocore-1-19-0.yml | 7 +++++++ plugins/modules/aws_s3_bucket_info.py | 4 ---- requirements.txt | 4 ++-- tests/integration/constraints.txt | 6 +++--- .../targets/setup_botocore_pip/defaults/main.yml | 4 ++-- tests/unit/constraints.txt | 6 +++--- 7 files changed, 18 insertions(+), 15 deletions(-) create mode 100644 changelogs/fragments/809-botocore-1-19-0.yml diff --git a/README.md b/README.md index 82aec47a77d..3bfa13b4495 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/changelogs/fragments/809-botocore-1-19-0.yml b/changelogs/fragments/809-botocore-1-19-0.yml new file mode 100644 index 00000000000..5b30d98650a --- /dev/null +++ b/changelogs/fragments/809-botocore-1-19-0.yml @@ -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). diff --git a/plugins/modules/aws_s3_bucket_info.py b/plugins/modules/aws_s3_bucket_info.py index f5b9c44f04c..74b16271a8a 100644 --- a/plugins/modules/aws_s3_bucket_info.py +++ b/plugins/modules/aws_s3_bucket_info.py @@ -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: @@ -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") diff --git a/requirements.txt b/requirements.txt index 3685e404330..1ff3ca2feb4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -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 diff --git a/tests/integration/constraints.txt b/tests/integration/constraints.txt index bd95eb26733..e14f957c9c8 100644 --- a/tests/integration/constraints.txt +++ b/tests/integration/constraints.txt @@ -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 diff --git a/tests/integration/targets/setup_botocore_pip/defaults/main.yml b/tests/integration/targets/setup_botocore_pip/defaults/main.yml index 5a50b775907..2f3fefff35d 100644 --- a/tests/integration/targets/setup_botocore_pip/defaults/main.yml +++ b/tests/integration/targets/setup_botocore_pip/defaults/main.yml @@ -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' diff --git a/tests/unit/constraints.txt b/tests/unit/constraints.txt index bd95eb26733..e14f957c9c8 100644 --- a/tests/unit/constraints.txt +++ b/tests/unit/constraints.txt @@ -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