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.

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

Bump botocore/boto3 requirements prior to release of 2.0.0 #711

Merged
merged 1 commit into from
Sep 16, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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.13.0` and `botocore >= 1.16.0`
Version 2.0.0 of this collection supports `boto3 >= 1.15.0` and `botocore >= 1.18.0`

## Included content
<!--start collection content-->
Expand Down
2 changes: 1 addition & 1 deletion changelogs/fragments/675-boto3-minimums.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
major_changes:
- community.aws collection - The community.aws collection has dropped support for ``botocore<1.16.0`` and ``boto3<1.13.0`` (https://github.com/ansible-collections/community.aws/pull/675).
- community.aws collection - The community.aws collection has dropped support for ``botocore<1.18.0`` and ``boto3<1.15.0`` (https://github.com/ansible-collections/community.aws/pull/711).
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/amazon.aws/pull/442).
minor_changes:
Expand Down
1 change: 0 additions & 1 deletion plugins/modules/aws_msk_cluster.py
Original file line number Diff line number Diff line change
Expand Up @@ -544,7 +544,6 @@ def create_or_update_cluster(client, module):
}
},
"cluster_kafka_version": {
"botocore_version": "1.16.19",
"current_value": cluster["CurrentBrokerSoftwareInfo"]["KafkaVersion"],
"target_value": module.params.get("version"),
"update_params": {
Expand Down
3 changes: 0 additions & 3 deletions plugins/modules/aws_msk_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -279,9 +279,6 @@ def main():

module = AnsibleAWSModule(argument_spec=module_args, supports_check_mode=True)

# Support for update_configuration and delete_configuration added in 1.17.48
module.require_botocore_at_least('1.17.48')

client = module.client("kafka", retry_decorator=AWSRetry.jittered_backoff())

if module.params["state"] == "present":
Expand Down
4 changes: 2 additions & 2 deletions plugins/modules/dynamodb_table.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
requirements:
- python >= 3.6
- boto >= 2.49.0
- boto3 >= 1.13.0
- botocore >= 1.16.0
- boto3 >= 1.15.0
- botocore >= 1.18.0
options:
state:
description:
Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
boto>=2.49.0
botocore>=1.16.0
boto3>=1.13.0
botocore>=1.18.0
boto3>=1.15.0
72 changes: 25 additions & 47 deletions tests/integration/targets/aws_msk_cluster/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,60 +40,38 @@
- set_fact:
subnet_ids: '{{ subnets | community.general.json_query("results[].subnet.id") | list }}'

- pip:
name: virtualenv
- set_fact:
virtualenv: "{{ remote_tmp_dir }}/virtualenv"
virtualenv_command: "{{ ansible_python_interpreter }} -m virtualenv"
- set_fact:
virtualenv_interpreter: "{{ virtualenv }}/bin/python"
- pip:
name:
- 'boto3>=1.13.0'
- 'botocore==1.17.48'
- 'coverage<5'
virtualenv: '{{ virtualenv }}'
virtualenv_command: '{{ virtualenv_command }}'
virtualenv_site_packages: no

# ============================================================
- name: Wrap test in virtualenv
vars:
ansible_python_interpreter: "{{ virtualenv }}/bin/python"
block:
- name: create msk configuration
aws_msk_config:
name: "{{ msk_config_name }}"
state: "present"
kafka_versions:
- "{{ msk_version }}"
register: msk_config
- name: create msk configuration
aws_msk_config:
name: "{{ msk_config_name }}"
state: "present"
kafka_versions:
- "{{ msk_version }}"
register: msk_config

- name: create tests
include_tasks: test_create.yml
- name: create tests
include_tasks: test_create.yml

- name: update tests
include_tasks: test_update.yml
- name: update tests
include_tasks: test_update.yml

- name: delete tests
include_tasks: test_delete.yml
- name: delete tests
include_tasks: test_delete.yml

always:

- name: delete msk cluster
aws_msk_cluster:
name: "{{ msk_cluster_name }}"
state: absent
wait: true
ignore_errors: yes
always:

- name: remove msk configuration
aws_msk_config:
name: "{{ msk_config_name }}"
state: absent
ignore_errors: yes
- name: delete msk cluster
aws_msk_cluster:
name: "{{ msk_cluster_name }}"
state: absent
wait: true
ignore_errors: yes

always:
- name: remove msk configuration
aws_msk_config:
name: "{{ msk_config_name }}"
state: absent
ignore_errors: yes

- name: remove subnets
ec2_vpc_subnet:
Expand Down
Loading