Add new aws_waf_condition module (ansible#33110)

mgu · Feb 1, 2018 · b5a1643 · b5a1643
1 parent f8f2b6d
commit b5a1643
Show file tree

Hide file tree

Showing 6 changed files with 967 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -104,6 +104,7 @@ See [Porting Guide](http://docs.ansible.com/ansible/devel/porting_guides.html) f
   * aws_s3_cors
   * aws_ses_identity
   * aws_ssm_parameter_store
+  * aws_waf_condition
   * cloudfront_distribution
   * cloudfront_origin_access_identity
   * ec2_ami_facts

diff --git a/hacking/aws_config/testing_policies/security-policy.json b/hacking/aws_config/testing_policies/security-policy.json
@@ -17,6 +17,12 @@
             "Resource": "*",
             "Effect": "Allow",
             "Sid": "AllowReadOnlyIAMUse"
+        },
+        {
+            "Sid": "AllowWAFusage",
+            "Action": "waf:*",
+            "Effect": "Allow",
+            "Resource": "*"
         }
     ]
 }
diff --git a/lib/ansible/module_utils/ec2.py b/lib/ansible/module_utils/ec2.py
@@ -634,7 +634,7 @@ def _hashable_policy(policy, policy_list):
             if isinstance(tupleified, list):
                 tupleified = tuple(tupleified)
             policy_list.append(tupleified)
-    elif isinstance(policy, string_types):
+    elif isinstance(policy, string_types) or isinstance(policy, binary_type):
         return [(to_text(policy))]
     elif isinstance(policy, dict):
         sorted_keys = list(policy.keys())