Fix for cedar-policy/cedar#827 (#302)

cedar-policy · May 1, 2024 · 83533fa · 83533fa
1 parent dc9854f
commit 83533fa
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/cedar-drt/fuzz/fuzz_targets/formatter.rs b/cedar-drt/fuzz/fuzz_targets/formatter.rs
@@ -179,11 +179,11 @@ fuzz_target!(|input: FuzzTargetInput| {
             );
             assert!(
                 roundtripped
-                    .non_head_constraints()
-                    .eq_shape(t.non_head_constraints()),
+                    .non_scope_constraints()
+                    .eq_shape(t.non_scope_constraints()),
                 "\nnew policy condition: {}\nold policy condition: {}\n",
-                roundtripped.non_head_constraints(),
-                t.non_head_constraints(),
+                roundtripped.non_scope_constraints(),
+                t.non_scope_constraints(),
             );
         }
         Err(err) => panic!(

diff --git a/cedar-drt/fuzz/fuzz_targets/roundtrip.rs b/cedar-drt/fuzz/fuzz_targets/roundtrip.rs
@@ -174,11 +174,11 @@ fn check_policy_equivalence(p1: &StaticPolicy, p2: &StaticPolicy) {
         t1.resource_constraint()
     );
     assert!(
-        p2.non_head_constraints()
-            .eq_shape(t1.non_head_constraints()),
+        p2.non_scope_constraints()
+            .eq_shape(t1.non_scope_constraints()),
         "\nnew policy condition: {}\nold policy condition: {}\n",
-        p2.non_head_constraints(),
-        t1.non_head_constraints()
+        p2.non_scope_constraints(),
+        t1.non_scope_constraints()
     );
 }
 

diff --git a/cedar-lean/DiffTest/Parser.lean b/cedar-lean/DiffTest/Parser.lean
@@ -346,7 +346,7 @@ def jsonToTemplate (json : Lean.Json) : ParseResult Template := do
   let principalConstraint ← getJsonField json "principal_constraint" >>= (getJsonField · "constraint") >>= jsonToScopeTemplate "?principal"
   let actionConstraint ← getJsonField json "action_constraint" >>= jsonToActionScope
   let resourceConstraint ← getJsonField json "resource_constraint" >>= (getJsonField · "constraint") >>= jsonToScopeTemplate "?resource"
-  let condition ← getJsonField json "non_head_constraints" >>= jsonToExpr
+  let condition ← getJsonField json "non_scope_constraints" >>= jsonToExpr
   .ok {
     effect := effect,
     principalScope := .principalScope principalConstraint,