test_s3: modify make_json_policy to support conditionals

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>

diff --git a/s3tests/functional/test_s3.py b/s3tests/functional/test_s3.py
index b839b4e04aa2d1b867f7a2fbaf8ed007805c4380..da147cb8ee58cea541f40674ccd94c9e1ac8a5f0 100644 (file)
--- a/s3tests/functional/test_s3.py
+++ b/s3tests/functional/test_s3.py
@@ -8754,8 +8754,11 @@ def make_json_policy(action, resource, principal={"AWS": "*"}, conditions=None):
         }]
     }
 
-    if conditions is not None:
-        policy["Statement"]["Condition"] = conditions
+    # Currently lets only support adding a common conditional to every
+    # statement in this function
+    for statement in policy["Statement"]:
+        if conditions is not None:
+            statement["Condition"] = conditions
 
     return json.dumps(policy)