add more conversions for public proto types (#1484)

Signed-off-by: Craig Disselkoen <cdiss@amazon.com>

cedar-policy/src/proto/api.rs

@@ -41,6 +41,7 @@ macro_rules! standard_conversions {
 standard_conversions!(api::Entity, api::Entity, models::Entity);
 standard_conversions!(api::Entities, api::Entities, models::Entities);
 standard_conversions!(api::Schema, api::Schema, models::ValidatorSchema);
+standard_conversions!(api::EntityTypeName, api::EntityTypeName, models::Name);
 standard_conversions!(api::EntityNamespace, api::EntityNamespace, models::Name);
 standard_conversions!(api::Expression, api::Expression, models::Expr);
 standard_conversions!(api::Request, api::Request, models::Request);
@@ -111,6 +112,7 @@ macro_rules! standard_protobuf_impl {
 standard_protobuf_impl!(api::Entity, models::Entity);
 standard_protobuf_impl!(api::Entities, models::Entities);
 standard_protobuf_impl!(api::Schema, models::ValidatorSchema);
+standard_protobuf_impl!(api::EntityTypeName, models::Name);
 standard_protobuf_impl!(api::EntityNamespace, models::Name);
 standard_protobuf_impl!(api::Template, models::TemplateBody);
 standard_protobuf_impl!(api::Expression, models::Expr);

cedar-policy/src/proto/ast.rs

@@ -68,19 +68,36 @@ impl From<&models::Name> for ast::Name {
     }
 }
 
-impl From<&ast::Name> for models::Name {
-    fn from(v: &ast::Name) -> Self {
+impl From<&models::Name> for ast::EntityType {
+    fn from(v: &models::Name) -> Self {
+        ast::EntityType::from(ast::Name::from(v))
+    }
+}
+
+impl From<&ast::InternalName> for models::Name {
+    fn from(v: &ast::InternalName) -> Self {
         Self {
             id: v.basename().to_string(),
             path: v
-                .as_ref()
                 .namespace_components()
                 .map(|id| String::from(id.as_ref()))
                 .collect(),
         }
     }
 }
 
+impl From<&ast::Name> for models::Name {
+    fn from(v: &ast::Name) -> Self {
+        Self::from(v.as_ref())
+    }
+}
+
+impl From<&ast::EntityType> for models::Name {
+    fn from(v: &ast::EntityType) -> Self {
+        Self::from(v.as_ref())
+    }
+}
+
 impl From<&models::EntityType> for ast::Name {
     // PANIC SAFETY: experimental feature
     #[allow(clippy::expect_used, clippy::fallible_impl_from)]