From c936895ed79526833bad509d40aa226764a9d412 Mon Sep 17 00:00:00 2001 From: Mark Chappell Date: Tue, 24 Jan 2023 13:14:56 +0100 Subject: [PATCH] Drop tests for botocore < 1.23.0 --- plugins/modules/ec2_instance.py | 11 ++--------- plugins/modules/ec2_key.py | 3 --- plugins/modules/lambda.py | 6 ------ plugins/modules/rds_instance.py | 6 +++--- .../meta/main.yml | 3 --- .../integration/targets/ec2_key/meta/main.yml | 3 --- .../integration/targets/ec2_key/tasks/main.yml | 18 ------------------ tests/integration/targets/lambda/meta/main.yml | 3 --- .../integration/targets/lambda/tasks/main.yml | 6 ------ .../targets/lambda_event/meta/main.yml | 3 --- .../targets/lambda_event/tasks/setup.yml | 2 -- 11 files changed, 5 insertions(+), 59 deletions(-) diff --git a/plugins/modules/ec2_instance.py b/plugins/modules/ec2_instance.py index 42800f6e215..63d54e24ac2 100644 --- a/plugins/modules/ec2_instance.py +++ b/plugins/modules/ec2_instance.py @@ -359,7 +359,6 @@ type: str description: - Wether the instance metadata endpoint is available via IPv6 (C(enabled)) or not (C(disabled)). - - Requires botocore >= 1.21.29 choices: [enabled, disabled] default: 'disabled' instance_metadata_tags: @@ -1293,6 +1292,8 @@ def build_top_level_options(params): 'metadata_options').get('http_tokens') spec['MetadataOptions']['HttpPutResponseHopLimit'] = params.get( 'metadata_options').get('http_put_response_hop_limit') + spec['MetadataOptions']['HttpProtocolIpv6'] = params.get( + 'metadata_options').get('http_protocol_ipv6') if not module.botocore_at_least('1.23.30'): # fail only if enabled is requested @@ -1302,14 +1303,6 @@ def build_top_level_options(params): spec['MetadataOptions']['InstanceMetadataTags'] = params.get( 'metadata_options').get('instance_metadata_tags') - if not module.botocore_at_least('1.21.29'): - # fail only if enabled is requested - if params.get('metadata_options').get('http_protocol_ipv6') == 'enabled': - module.require_botocore_at_least('1.21.29', reason='to set http_protocol_ipv6') - else: - spec['MetadataOptions']['HttpProtocolIpv6'] = params.get( - 'metadata_options').get('http_protocol_ipv6') - return spec diff --git a/plugins/modules/ec2_key.py b/plugins/modules/ec2_key.py index d1129fbaa1a..c411310d253 100644 --- a/plugins/modules/ec2_key.py +++ b/plugins/modules/ec2_key.py @@ -41,7 +41,6 @@ EC2 Instance Connect, and EC2 Serial Console. - By default Amazon will create an RSA key. - Mutually exclusive with parameter I(key_material). - - Requires at least botocore version 1.21.23. type: str choices: - rsa @@ -362,8 +361,6 @@ def main(): result = {} - if key_type: - module.require_botocore_at_least('1.21.23', reason='to set the key_type for a keypair') try: if state == 'absent': result = delete_key_pair(module.check_mode, ec2_client, name) diff --git a/plugins/modules/lambda.py b/plugins/modules/lambda.py index 82193a5290c..7104cb5ac9d 100644 --- a/plugins/modules/lambda.py +++ b/plugins/modules/lambda.py @@ -111,7 +111,6 @@ description: - The instruction set architecture that the function supports. - Requires one of I(s3_bucket) or I(zip_file). - - Requires botocore >= 1.21.51. type: str choices: ['x86_64', 'arm64'] aliases: ['architectures'] @@ -239,7 +238,6 @@ contains: architectures: description: The architectures supported by the function. - returned: successful run where botocore >= 1.21.51 type: list elements: str sample: ['arm64'] @@ -643,10 +641,6 @@ def main(): check_mode = module.check_mode changed = False - if architectures: - module.require_botocore_at_least( - '1.21.51', reason='to configure the architectures that the function supports.') - try: client = module.client('lambda', retry_decorator=AWSRetry.jittered_backoff()) except (ClientError, BotoCoreError) as e: diff --git a/plugins/modules/rds_instance.py b/plugins/modules/rds_instance.py index d6f0ae97bc0..e6fe36260d7 100644 --- a/plugins/modules/rds_instance.py +++ b/plugins/modules/rds_instance.py @@ -410,7 +410,7 @@ - The storage throughput when the I(storage_type) is C(gp3). - When the allocated storage is below 400 GB, the storage throughput will always be 125 mb/s. - When the allocated storage is large than or equal 400 GB, the througput starts at 500 mb/s. - - Requires boto3 >= 1.26.0. + - Requires botocore >= 1.29.0. type: int version_added: 5.2.0 tde_credential_arn: @@ -1010,7 +1010,7 @@ def get_options_with_changing_values(client, module, parameters): parameters['Iops'] = new_iops if instance.get('StorageType') == 'gp3': - if module.boto3_at_least('1.26.0'): + if module.botocore_at_least('1.29.0'): GP3_THROUGHPUT = True current_storage_throughput = instance.get('PendingModifiedValues', {}).get('StorageThroughput', instance['StorageThroughput']) new_storage_throughput = module.params.get('storage_throughput') or current_storage_throughput @@ -1018,7 +1018,7 @@ def get_options_with_changing_values(client, module, parameters): parameters['StorageThroughput'] = new_storage_throughput else: GP3_THROUGHPUT = False - module.warn('gp3 volumes require boto3 >= 1.26.0. storage_throughput will be ignored.') + module.warn('gp3 volumes require botocore >= 1.29.0. storage_throughput will be ignored.') current_iops = instance.get('PendingModifiedValues', {}).get('Iops', instance['Iops']) # when you just change from gp2 to gp3, you may not add the iops parameter diff --git a/tests/integration/targets/ec2_instance_hibernation_options/meta/main.yml b/tests/integration/targets/ec2_instance_hibernation_options/meta/main.yml index 80a82ca0bac..5e59121600e 100644 --- a/tests/integration/targets/ec2_instance_hibernation_options/meta/main.yml +++ b/tests/integration/targets/ec2_instance_hibernation_options/meta/main.yml @@ -4,6 +4,3 @@ dependencies: - role: setup_ec2_instance_env vars: ec2_instance_test_name: hibernation_options -- role: setup_botocore_pip - vars: - boto3_version: "1.20.30" diff --git a/tests/integration/targets/ec2_key/meta/main.yml b/tests/integration/targets/ec2_key/meta/main.yml index d9abc111089..7e4c5b7eb44 100644 --- a/tests/integration/targets/ec2_key/meta/main.yml +++ b/tests/integration/targets/ec2_key/meta/main.yml @@ -1,5 +1,2 @@ dependencies: - setup_sshkey - - role: setup_botocore_pip - vars: - botocore_version: '1.21.23' diff --git a/tests/integration/targets/ec2_key/tasks/main.yml b/tests/integration/targets/ec2_key/tasks/main.yml index 19d34fb1a1b..6eab3bab967 100644 --- a/tests/integration/targets/ec2_key/tasks/main.yml +++ b/tests/integration/targets/ec2_key/tasks/main.yml @@ -389,27 +389,11 @@ - 'result.key == None' # ============================================================ - - name: test create ED25519 key pair type with botocore <= 1.21.23 - ec2_key: - name: '{{ ec2_key_name }}' - key_type: ed25519 - ignore_errors: true - register: result - - - name: assert that task failed - assert: - that: - - 'result.failed' - - '"Failed to import the required Python library (botocore>=1.21.23)" in result.msg' - - '"This is required to set the key_type for a keypair" in result.msg' - - name: test create ED25519 key pair type ec2_key: name: '{{ ec2_key_name }}' key_type: ed25519 register: result - vars: - ansible_python_interpreter: "{{ botocore_virtualenv_interpreter }}" - name: assert that task succeed assert: @@ -422,8 +406,6 @@ name: '{{ ec2_key_name }}' key_type: rsa register: result - vars: - ansible_python_interpreter: "{{ botocore_virtualenv_interpreter }}" - name: assert that task succeed assert: diff --git a/tests/integration/targets/lambda/meta/main.yml b/tests/integration/targets/lambda/meta/main.yml index 409583a2c09..9286eddc849 100644 --- a/tests/integration/targets/lambda/meta/main.yml +++ b/tests/integration/targets/lambda/meta/main.yml @@ -1,5 +1,2 @@ dependencies: -- role: setup_botocore_pip - vars: - botocore_version: 1.21.51 - role: setup_remote_tmp_dir diff --git a/tests/integration/targets/lambda/tasks/main.yml b/tests/integration/targets/lambda/tasks/main.yml index 5ede8f75086..58a0d7d4ff4 100644 --- a/tests/integration/targets/lambda/tasks/main.yml +++ b/tests/integration/targets/lambda/tasks/main.yml @@ -157,8 +157,6 @@ role: '{{ lambda_role_name }}' zip_file: '{{ zip_res.dest }}' architecture: arm64 - vars: - ansible_python_interpreter: '{{ botocore_virtualenv_interpreter }}' register: result check_mode: yes - name: assert lambda upload succeeded @@ -174,8 +172,6 @@ role: '{{ lambda_role_name }}' zip_file: '{{ zip_res.dest }}' architecture: arm64 - vars: - ansible_python_interpreter: '{{ botocore_virtualenv_interpreter }}' register: result - name: assert lambda upload succeeded assert: @@ -329,8 +325,6 @@ query: all register: lambda_infos_all check_mode: yes - vars: - ansible_python_interpreter: '{{ botocore_virtualenv_interpreter }}' - name: lambda_info | Assert successfull retrieval of all information 1 vars: lambda_info: "{{ lambda_infos_all.functions | selectattr('function_name', 'eq', lambda_function_name) | first }}" diff --git a/tests/integration/targets/lambda_event/meta/main.yml b/tests/integration/targets/lambda_event/meta/main.yml index 463f90ed084..9286eddc849 100644 --- a/tests/integration/targets/lambda_event/meta/main.yml +++ b/tests/integration/targets/lambda_event/meta/main.yml @@ -1,5 +1,2 @@ dependencies: - role: setup_remote_tmp_dir -- role: setup_botocore_pip - vars: - botocore_version: 1.21.51 \ No newline at end of file diff --git a/tests/integration/targets/lambda_event/tasks/setup.yml b/tests/integration/targets/lambda_event/tasks/setup.yml index df9b4ce1de5..88c4b77128d 100644 --- a/tests/integration/targets/lambda_event/tasks/setup.yml +++ b/tests/integration/targets/lambda_event/tasks/setup.yml @@ -70,8 +70,6 @@ zip_file: '{{ zip_res.dest }}' architecture: x86_64 register: result - vars: - ansible_python_interpreter: '{{ botocore_virtualenv_interpreter }}' - name: assert lambda upload succeeded assert: