Merge pull request #1 from Kudbettin/Kudbettin-patch-1

Kudbettin patch 1

Author: Kudbettin

terraform_compliance/steps/then/it_must_contain_something.py

@@ -40,7 +40,7 @@ def it_must_contain_something(_step_obj, something, inherited_values=Null):
 
                     if isinstance(found_key, dict):
                         found_value = jsonify(found_key.get(something, found_key))
-                        found_value = found_value if found_value != [] and found_value != '' else found_key
+                        found_value = found_value if found_value not in ([], '') else found_key
                     else:
                         found_value = found_key
             elif isinstance(values, list):
@@ -138,7 +138,7 @@ def it_must_not_contain_something(_step_obj, something, inherited_values=Null):
 
                     if isinstance(found_key, dict):
                         found_value = jsonify(found_key.get(something, found_key))
-                        found_value = found_value if found_value != [] and found_value != '' else found_key
+                        found_value = found_value if found_value not in ([], '') else found_key
                     else:
                         found_value = found_key
             elif isinstance(values, list):

tests/functional/test_issue-249-has/test.feature

@@ -9,10 +9,11 @@ Feature: Resources should be properly tagged
   Scenario: Ensure that waf_policy for ALB/CF tag is defined
     Given I have aws_alb defined
     When it has tags
+    Then it must contain tags
     Then it must contain waf_policy
     And its value must match the "^(internal|external|custom)$" regex
 
   Scenario: Ensure that waf_custom for ALB/CF tag is defined
     Given I have aws_alb defined
     When it has tags
-    Then it must contain waf_custom
+    Then it must contain waf_custom