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

Logic for nested HttpRequestMethodConfig Values #188

Merged
merged 6 commits into from
Feb 3, 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
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
bugfixes:
- module_utils/elbv2 - add logic to compare_rules to suit Values list nested within dicts unique to each field type.
Fixes issue (https://github.com/ansible-collections/amazon.aws/issues/187)
- module_utils/elbv2 - Requires 1.16.57 as minimum boto3 version.
42 changes: 40 additions & 2 deletions plugins/module_utils/elbv2.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ def __init__(self, connection, module):
else:
self.elb_attributes = None

if not self.module.boto3_at_least('1.16.57'):
self.module.fail_json(msg="elbv2 requires boto3 >= 1.16.57")

def wait_for_status(self, elb_arn):
"""
Wait for load balancer to reach 'active' status
Expand Down Expand Up @@ -719,11 +722,46 @@ def _compare_condition(self, current_conditions, condition):
condition_found = False

for current_condition in current_conditions:
if current_condition.get('SourceIpConfig'):
# host-header: current_condition includes both HostHeaderConfig AND Values while
# condition can be defined with either HostHeaderConfig OR Values. Only use
# HostHeaderConfig['Values'] comparison if both conditions includes HostHeaderConfig.
if current_condition.get('HostHeaderConfig') and condition.get('HostHeaderConfig'):
if (current_condition['Field'] == condition['Field'] and
sorted(current_condition['HostHeaderConfig']['Values']) == sorted(condition['HostHeaderConfig']['Values'])):
condition_found = True
break
elif current_condition.get('HttpHeaderConfig'):
if (current_condition['Field'] == condition['Field'] and
sorted(current_condition['HttpHeaderConfig']['Values']) == sorted(condition['HttpHeaderConfig']['Values']) and
current_condition['HttpHeaderConfig']['HttpHeaderName'] == condition['HttpHeaderConfig']['HttpHeaderName']):
condition_found = True
break
elif current_condition.get('HttpRequestMethodConfig'):
if (current_condition['Field'] == condition['Field'] and
sorted(current_condition['HttpRequestMethodConfig']['Values']) == sorted(condition['HttpRequestMethodConfig']['Values'])):
condition_found = True
break
# path-pattern: current_condition includes both PathPatternConfig AND Values while
# condition can be defined with either PathPatternConfig OR Values. Only use
# PathPatternConfig['Values'] comparison if both conditions includes PathPatternConfig.
elif current_condition.get('PathPatternConfig') and condition.get('PathPatternConfig'):
if (current_condition['Field'] == condition['Field'] and
sorted(current_condition['PathPatternConfig']['Values']) == sorted(condition['PathPatternConfig']['Values'])):
condition_found = True
break
elif current_condition.get('QueryStringConfig'):
# QueryString Values is not sorted as it is the only list of dicts (not strings).
if (current_condition['Field'] == condition['Field'] and
current_condition['QueryStringConfig']['Values'] == condition['QueryStringConfig']['Values']):
condition_found = True
break
elif current_condition.get('SourceIpConfig'):
if (current_condition['Field'] == condition['Field'] and
current_condition['SourceIpConfig']['Values'][0] == condition['SourceIpConfig']['Values'][0]):
sorted(current_condition['SourceIpConfig']['Values']) == sorted(condition['SourceIpConfig']['Values'])):
condition_found = True
break
# Not all fields are required to have Values list nested within a *Config dict
# e.g. fields host-header/path-pattern can directly list Values
elif current_condition['Field'] == condition['Field'] and sorted(current_condition['Values']) == sorted(condition['Values']):
condition_found = True
break
Expand Down