From 73813460b66119dd2491f286a01bf07e0b18d193 Mon Sep 17 00:00:00 2001
From: Adrian <40185566+adriank-convoy@users.noreply.github.com>
Date: Sat, 27 Jun 2020 01:42:32 -0700
Subject: [PATCH] Fix condition filtering bug in elbv2.create_rule() (#3092)

* Fix condition filtering bug

* Update test_handle_listener_rules unit test

* Run black
---
 moto/elbv2/responses.py        |  4 ++--
 tests/test_elbv2/test_elbv2.py | 21 +++++++++++++++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/moto/elbv2/responses.py b/moto/elbv2/responses.py
index 922de96d..68fbc881 100644
--- a/moto/elbv2/responses.py
+++ b/moto/elbv2/responses.py
@@ -158,7 +158,7 @@ class ELBV2Response(BaseResponse):
             condition = {}
             condition["field"] = _condition["field"]
             values = sorted(
-                [e for e in _condition.items() if e[0].startswith("values.member")],
+                [e for e in _condition.items() if "values.member" in e[0]],
                 key=lambda x: x[0],
             )
             condition["values"] = [e[1] for e in values]
@@ -356,7 +356,7 @@ class ELBV2Response(BaseResponse):
             condition = {}
             condition["field"] = _condition["field"]
             values = sorted(
-                [e for e in _condition.items() if e[0].startswith("values.member")],
+                [e for e in _condition.items() if "values.member" in e[0]],
                 key=lambda x: x[0],
             )
             condition["values"] = [e[1] for e in values]
diff --git a/tests/test_elbv2/test_elbv2.py b/tests/test_elbv2/test_elbv2.py
index af1b19f0..c155cba2 100644
--- a/tests/test_elbv2/test_elbv2.py
+++ b/tests/test_elbv2/test_elbv2.py
@@ -994,12 +994,17 @@ def test_handle_listener_rules():
     priority = 100
     host = "xxx.example.com"
     path_pattern = "foobar"
+    pathpatternconfig_pattern = "foobar2"
     created_rule = conn.create_rule(
         ListenerArn=http_listener_arn,
         Priority=priority,
         Conditions=[
             {"Field": "host-header", "Values": [host]},
             {"Field": "path-pattern", "Values": [path_pattern]},
+            {
+                "Field": "path-pattern",
+                "PathPatternConfig": {"Values": [pathpatternconfig_pattern]},
+            },
         ],
         Actions=[
             {"TargetGroupArn": target_group.get("TargetGroupArn"), "Type": "forward"}
@@ -1017,6 +1022,10 @@ def test_handle_listener_rules():
         Conditions=[
             {"Field": "host-header", "Values": [host]},
             {"Field": "path-pattern", "Values": [path_pattern]},
+            {
+                "Field": "path-pattern",
+                "PathPatternConfig": {"Values": [pathpatternconfig_pattern]},
+            },
         ],
         Actions=[
             {"TargetGroupArn": target_group.get("TargetGroupArn"), "Type": "forward"}
@@ -1031,6 +1040,10 @@ def test_handle_listener_rules():
             Conditions=[
                 {"Field": "host-header", "Values": [host]},
                 {"Field": "path-pattern", "Values": [path_pattern]},
+                {
+                    "Field": "path-pattern",
+                    "PathPatternConfig": {"Values": [pathpatternconfig_pattern]},
+                },
             ],
             Actions=[
                 {
@@ -1079,11 +1092,16 @@ def test_handle_listener_rules():
     # modify rule partially
     new_host = "new.example.com"
     new_path_pattern = "new_path"
+    new_pathpatternconfig_pattern = "new_path2"
     modified_rule = conn.modify_rule(
         RuleArn=first_rule["RuleArn"],
         Conditions=[
             {"Field": "host-header", "Values": [new_host]},
             {"Field": "path-pattern", "Values": [new_path_pattern]},
+            {
+                "Field": "path-pattern",
+                "PathPatternConfig": {"Values": [new_pathpatternconfig_pattern]},
+            },
         ],
     )["Rules"][0]
 
@@ -1092,6 +1110,9 @@ def test_handle_listener_rules():
     modified_rule.should.equal(obtained_rule)
     obtained_rule["Conditions"][0]["Values"][0].should.equal(new_host)
     obtained_rule["Conditions"][1]["Values"][0].should.equal(new_path_pattern)
+    obtained_rule["Conditions"][2]["Values"][0].should.equal(
+        new_pathpatternconfig_pattern
+    )
     obtained_rule["Actions"][0]["TargetGroupArn"].should.equal(
         target_group.get("TargetGroupArn")
     )