From 4078f718f0e29c1195d38e136e00038d66d77f24 Mon Sep 17 00:00:00 2001
From: John Kastner <130772734+john-h-kastner-aws@users.noreply.github.com>
Date: Wed, 1 May 2024 09:46:09 -0400
Subject: [PATCH] Update `EntityUID` constructor for cedar-policy/cedar#802
 (#300)

Signed-off-by: John Kastner <jkastner@amazon.com>
---
 cedar-policy-generators/src/hierarchy.rs | 9 +++++++--
 cedar-policy-generators/src/schema.rs    | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/cedar-policy-generators/src/hierarchy.rs b/cedar-policy-generators/src/hierarchy.rs
index c59c78705..d9b2457c7 100644
--- a/cedar-policy-generators/src/hierarchy.rs
+++ b/cedar-policy-generators/src/hierarchy.rs
@@ -171,7 +171,11 @@ impl Hierarchy {
             )?;
             Ok(uid.clone())
         } else {
-            Ok(EntityUID::from_components(typename.clone(), u.arbitrary()?))
+            Ok(EntityUID::from_components(
+                typename.clone(),
+                u.arbitrary()?,
+                None,
+            ))
         }
     }
     /// size hint for arbitrary_uid_with_type()
@@ -418,6 +422,7 @@ pub(crate) fn arbitrary_specified_uid(u: &mut Unstructured<'_>) -> Result<ast::E
     Ok(ast::EntityUID::from_components(
         u.arbitrary::<ast::Name>()?,
         u.arbitrary::<ast::Eid>()?,
+        None,
     ))
 }
 
@@ -437,7 +442,7 @@ pub(crate) fn generate_uid_with_type(
             Eid::new(nanoid!(n))
         }
     };
-    Ok(ast::EntityUID::from_components(ty, eid))
+    Ok(ast::EntityUID::from_components(ty, eid, None))
 }
 
 impl<'a, 'u> HierarchyGenerator<'a, 'u> {
diff --git a/cedar-policy-generators/src/schema.rs b/cedar-policy-generators/src/schema.rs
index d847e69ce..9a50c0edb 100644
--- a/cedar-policy-generators/src/schema.rs
+++ b/cedar-policy-generators/src/schema.rs
@@ -274,7 +274,7 @@ fn arbitrary_schematype_size_hint(depth: usize) -> (usize, Option<usize>) {
 pub fn uid_for_action_name(namespace: Option<ast::Name>, action_name: ast::Eid) -> ast::EntityUID {
     let entity_type =
         build_qualified_entity_type_name(namespace, "Action".parse().expect("valid id"));
-    ast::EntityUID::from_components(entity_type, action_name)
+    ast::EntityUID::from_components(entity_type, action_name, None)
 }
 
 /// internal helper function, convert a SchemaType to a Type (loses some