From 83533faefbef1abce3214ebdf15373879d4d87b7 Mon Sep 17 00:00:00 2001
From: John Kastner <130772734+john-h-kastner-aws@users.noreply.github.com>
Date: Wed, 1 May 2024 14:23:58 -0400
Subject: [PATCH] Fix for cedar-policy/cedar#827 (#302)

---
 cedar-drt/fuzz/fuzz_targets/formatter.rs | 8 ++++----
 cedar-drt/fuzz/fuzz_targets/roundtrip.rs | 8 ++++----
 cedar-lean/DiffTest/Parser.lean          | 2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cedar-drt/fuzz/fuzz_targets/formatter.rs b/cedar-drt/fuzz/fuzz_targets/formatter.rs
index a99a9a4af..36ed5504f 100644
--- 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
index e1a1c1ff6..916258c0d 100644
--- 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
index 859e08820..7032b80b4 100644
--- 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,