Merge pull request #711 from tremble/botocore/1.18.0

Bump botocore/boto3 requirements prior to release of 2.0.0

SUMMARY
Follow up to ansible-collections/amazon.aws#502
We've bumped our minimum requirements in anticipation of release 2.0.0
ISSUE TYPE

Feature Pull Request

COMPONENT NAME
ADDITIONAL INFORMATION

Reviewed-by: Alina Buzachis <None>
Reviewed-by: None <None>

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.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-->

changelogs/fragments/675-boto3-minimums.yml

@@ -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:

plugins/modules/aws_msk_cluster.py

@@ -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": {

plugins/modules/aws_msk_config.py

@@ -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":

plugins/modules/dynamodb_table.py

@@ -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:

requirements.txt

@@ -1,3 +1,3 @@
 boto>=2.49.0
-botocore>=1.16.0
-boto3>=1.13.0
+botocore>=1.18.0
+boto3>=1.15.0

tests/integration/targets/aws_msk_cluster/tasks/main.yml

@@ -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: