mirror of https://github.com/ansible/ansible.git
backport ec2_vpc_subnet fix and custom waiters from PRs 37534/38473/39171/38960 (#39440)
* [cloud] Make ec2_vpc_route_table wait for the route to propagate (#35975) * Stabilize ec2_vpc_route_table Wait for route table to be present before attempting to use it Sleep before getting the final state of the route table in case modifications are incomplete * Conditionally wait if changes were made * Simplify logic (cherry picked from commit 8fb31ac2f01e7c75d5181510290c99aee22be7ef) * Route custom waiter (#36922) This creates a way for us to use boto3's data-driven waiter support to use custom waiters where Boto3 hasn't implemented them yet. The only waiter implemented so far is for VPC Route Tables to check that they exist, and this replaces some custom retry code. (cherry picked from commit a40bce2bcbd5a40aee0de2b6ab5f6197bb1c5237) * Use NormalizedOperationMethod to catch ClientErrors so the waiter can handle them properly (#37356) (cherry picked from commit c9e8aca26cfc7559e7e8c7970acf06cd30cc7629) * [cloud] Add custom waiters to stabilize ec2_vpc_subnet module - Fixes #36083 (#37534) * stabilize ec2_vpc_subnet module * Add waiters for ec2_vpc_subnet Clean up integration tests * Reenable CI for stabilized ec2_vpc_subnet tests * rename waiters * Use module_json_aws where applicable Handle WaiterError first if waiting failed * Fix traceback when tagging with keys/values that look like booleans * Fix check mode with tags * Add integration tests for tags that look like booleans and check mode * Add waiter for deleting subnet * Sleep a few seconds after using aws command line (cherry picked from commit ea943e454c783c6b0ffb91b78131f27cd9bce269) * Fix sporadic errors in ec2_vpc_subnet integration tests (#38473) (cherry picked from commit 46f13d343786fa3985cc16cc770762984c7884ac) * [aws] Skip ec2_vpc_subnet waiters for old botocore versions (#39171) Fix ec2_vpc_subnet for botocore versions that do not accept the WaiterConfig parameter (cherry picked from commit 6b91dae21c20006677e1e4adf2a9ff7ad55ca49c) * [aws] Increase possible wait time for nonmonotonic subnet attributes (#38960) (cherry picked from commit c4f010704890581a4974e83af03c2e81fb29e58e) * changelogpull/40192/head
Sloane Hertel
7 years ago
committed by
GitHub
parent
3115f31655
commit
bc73fba58f
@ -0,0 +1,6 @@
|
||||
---
|
||||
bugfixes:
|
||||
- Use custom waiters
|
||||
- Add integration tests for check mode
|
||||
- Fix non-monotonic AWS behavior by waiting until attributes are the correct value before returning the subnet
|
||||
- Don't use custom waiter configs for older versions of botocore
|
||||
@ -0,0 +1,178 @@
|
||||
# Copyright: (c) 2018, Ansible Project
|
||||
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
|
||||
try:
|
||||
import botocore.waiter as core_waiter
|
||||
except ImportError:
|
||||
pass # caught by HAS_BOTO3
|
||||
|
||||
|
||||
ec2_data = {
|
||||
"version": 2,
|
||||
"waiters": {
|
||||
"RouteTableExists": {
|
||||
"delay": 5,
|
||||
"maxAttempts": 40,
|
||||
"operation": "DescribeRouteTables",
|
||||
"acceptors": [
|
||||
{
|
||||
"matcher": "path",
|
||||
"expected": True,
|
||||
"argument": "length(RouteTables[]) > `0`",
|
||||
"state": "success"
|
||||
},
|
||||
{
|
||||
"matcher": "error",
|
||||
"expected": "InvalidRouteTableID.NotFound",
|
||||
"state": "retry"
|
||||
},
|
||||
]
|
||||
},
|
||||
"SubnetExists": {
|
||||
"delay": 5,
|
||||
"maxAttempts": 40,
|
||||
"operation": "DescribeSubnets",
|
||||
"acceptors": [
|
||||
{
|
||||
"matcher": "path",
|
||||
"expected": True,
|
||||
"argument": "length(Subnets[]) > `0`",
|
||||
"state": "success"
|
||||
},
|
||||
{
|
||||
"matcher": "error",
|
||||
"expected": "InvalidSubnetID.NotFound",
|
||||
"state": "retry"
|
||||
},
|
||||
]
|
||||
},
|
||||
"SubnetHasMapPublic": {
|
||||
"delay": 5,
|
||||
"maxAttempts": 40,
|
||||
"operation": "DescribeSubnets",
|
||||
"acceptors": [
|
||||
{
|
||||
"matcher": "pathAll",
|
||||
"expected": True,
|
||||
"argument": "Subnets[].MapPublicIpOnLaunch",
|
||||
"state": "success"
|
||||
},
|
||||
]
|
||||
},
|
||||
"SubnetNoMapPublic": {
|
||||
"delay": 5,
|
||||
"maxAttempts": 40,
|
||||
"operation": "DescribeSubnets",
|
||||
"acceptors": [
|
||||
{
|
||||
"matcher": "pathAll",
|
||||
"expected": False,
|
||||
"argument": "Subnets[].MapPublicIpOnLaunch",
|
||||
"state": "success"
|
||||
},
|
||||
]
|
||||
},
|
||||
"SubnetHasAssignIpv6": {
|
||||
"delay": 5,
|
||||
"maxAttempts": 40,
|
||||
"operation": "DescribeSubnets",
|
||||
"acceptors": [
|
||||
{
|
||||
"matcher": "pathAll",
|
||||
"expected": True,
|
||||
"argument": "Subnets[].AssignIpv6AddressOnCreation",
|
||||
"state": "success"
|
||||
},
|
||||
]
|
||||
},
|
||||
"SubnetNoAssignIpv6": {
|
||||
"delay": 5,
|
||||
"maxAttempts": 40,
|
||||
"operation": "DescribeSubnets",
|
||||
"acceptors": [
|
||||
{
|
||||
"matcher": "pathAll",
|
||||
"expected": False,
|
||||
"argument": "Subnets[].AssignIpv6AddressOnCreation",
|
||||
"state": "success"
|
||||
},
|
||||
]
|
||||
},
|
||||
"SubnetDeleted": {
|
||||
"delay": 5,
|
||||
"maxAttempts": 40,
|
||||
"operation": "DescribeSubnets",
|
||||
"acceptors": [
|
||||
{
|
||||
"matcher": "path",
|
||||
"expected": True,
|
||||
"argument": "length(Subnets[]) > `0`",
|
||||
"state": "retry"
|
||||
},
|
||||
{
|
||||
"matcher": "error",
|
||||
"expected": "InvalidSubnetID.NotFound",
|
||||
"state": "success"
|
||||
},
|
||||
]
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
def model_for(name):
|
||||
ec2_models = core_waiter.WaiterModel(waiter_config=ec2_data)
|
||||
return ec2_models.get_waiter(name)
|
||||
|
||||
|
||||
waiters_by_name = {
|
||||
('EC2', 'route_table_exists'): lambda ec2: core_waiter.Waiter(
|
||||
'route_table_exists',
|
||||
model_for('RouteTableExists'),
|
||||
core_waiter.NormalizedOperationMethod(
|
||||
ec2.describe_route_tables
|
||||
)),
|
||||
('EC2', 'subnet_exists'): lambda ec2: core_waiter.Waiter(
|
||||
'subnet_exists',
|
||||
model_for('SubnetExists'),
|
||||
core_waiter.NormalizedOperationMethod(
|
||||
ec2.describe_subnets
|
||||
)),
|
||||
('EC2', 'subnet_has_map_public'): lambda ec2: core_waiter.Waiter(
|
||||
'subnet_has_map_public',
|
||||
model_for('SubnetHasMapPublic'),
|
||||
core_waiter.NormalizedOperationMethod(
|
||||
ec2.describe_subnets
|
||||
)),
|
||||
('EC2', 'subnet_no_map_public'): lambda ec2: core_waiter.Waiter(
|
||||
'subnet_no_map_public',
|
||||
model_for('SubnetNoMapPublic'),
|
||||
core_waiter.NormalizedOperationMethod(
|
||||
ec2.describe_subnets
|
||||
)),
|
||||
('EC2', 'subnet_has_assign_ipv6'): lambda ec2: core_waiter.Waiter(
|
||||
'subnet_has_assign_ipv6',
|
||||
model_for('SubnetHasAssignIpv6'),
|
||||
core_waiter.NormalizedOperationMethod(
|
||||
ec2.describe_subnets
|
||||
)),
|
||||
('EC2', 'subnet_no_assign_ipv6'): lambda ec2: core_waiter.Waiter(
|
||||
'subnet_no_assign_ipv6',
|
||||
model_for('SubnetNoAssignIpv6'),
|
||||
core_waiter.NormalizedOperationMethod(
|
||||
ec2.describe_subnets
|
||||
)),
|
||||
('EC2', 'subnet_deleted'): lambda ec2: core_waiter.Waiter(
|
||||
'subnet_deleted',
|
||||
model_for('SubnetDeleted'),
|
||||
core_waiter.NormalizedOperationMethod(
|
||||
ec2.describe_subnets
|
||||
)),
|
||||
}
|
||||
|
||||
|
||||
def get_waiter(client, waiter_name):
|
||||
try:
|
||||
return waiters_by_name[(client.__class__.__name__, waiter_name)](client)
|
||||
except KeyError:
|
||||
raise NotImplementedError("Waiter {0} could not be found for client {1}. Available waiters: {2}".format(
|
||||
waiter_name, type(client), ', '.join(repr(k) for k in waiters_by_name.keys())))
|
||||
Loading…
Reference in New Issue