refactor: move cedar code into a separate module

6 files changed, 17 insertions, 15 deletions

diff --git a/src/authorization/cedar/mod.rs b/src/authorization/cedar/mod.rs
index cf59ee55..8be10feb 100644
--- a/src/authorization/cedar/mod.rs
+++ b/src/authorization/cedar/mod.rs
@@ -1,6 +1,5 @@
 pub mod authorizer;
 pub mod entities;
 
-pub use authorizer::CedarAuthorizer;
-pub use entities::CedarEntity;
-pub use entities::EntitiesRepository;
+pub use authorizer::*;
+pub use entities::*;
diff --git a/src/authorization/mod.rs b/src/authorization/mod.rs
index 69d59d29..acf7e11f 100644
--- a/src/authorization/mod.rs
+++ b/src/authorization/mod.rs
@@ -4,7 +4,5 @@ pub mod check_service;
 pub mod server;
 
 pub use authorizer::Authorizer;
-pub use cedar::CedarAuthorizer;
-pub use cedar::{CedarEntity, EntitiesRepository};
 pub use check_service::CheckService;
 pub use server::Server;
diff --git a/src/bin/cli.rs b/src/bin/cli.rs
index 78aa1ba1..5bc118b7 100644
--- a/src/bin/cli.rs
+++ b/src/bin/cli.rs
@@ -84,9 +84,11 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
                 .init();
 
             tracing::info!(address = %addr, "Starting");
-            authzd::authorization::Server::new(authzd::authorization::CedarAuthorizer::default())?
-                .serve(addr.parse().unwrap())
-                .await?;
+            authzd::authorization::Server::new(
+                authzd::authorization::cedar::CedarAuthorizer::default(),
+            )?
+            .serve(addr.parse().unwrap())
+            .await?;
         }
     }
 
diff --git a/src/lib.rs b/src/lib.rs
index 3681a859..026d999c 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,6 +1,5 @@
 pub mod authorization;
 pub mod gitlab;
 
-pub use authorization::{
-    Authorizer, CedarAuthorizer, CedarEntity, CheckService, EntitiesRepository, Server,
-};
+pub use authorization::cedar::{CedarAuthorizer, CedarEntity, EntitiesRepository};
+pub use authorization::{Authorizer, CheckService, Server};
diff --git a/tests/authorization/cedar_authorizer_test.rs b/tests/authorization/cedar_authorizer_test.rs
index 58563832..b169be7d 100644
--- a/tests/authorization/cedar_authorizer_test.rs
+++ b/tests/authorization/cedar_authorizer_test.rs
@@ -6,12 +6,14 @@ mod tests {
     use envoy_types::pb::envoy::service::auth::v3::attribute_context::HttpRequest;
     use std::collections::HashMap;
 
-    fn subject() -> authzd::CedarAuthorizer {
+    fn subject() -> authzd::authorization::cedar::CedarAuthorizer {
         common::setup();
         subject_with(cedar_policy::Entities::empty())
     }
 
-    fn subject_with(entities: cedar_policy::Entities) -> authzd::CedarAuthorizer {
+    fn subject_with(
+        entities: cedar_policy::Entities,
+    ) -> authzd::authorization::cedar::CedarAuthorizer {
         build_cedar_authorizer(entities)
     }
 
diff --git a/tests/support/factory_bot.rs b/tests/support/factory_bot.rs
index ba0d9c38..c3ad781d 100644
--- a/tests/support/factory_bot.rs
+++ b/tests/support/factory_bot.rs
@@ -37,10 +37,12 @@ pub fn build_headers(headers: Vec<(String, String)>) -> HashMap<String, String>
     })
 }
 
-pub fn build_cedar_authorizer(entities: cedar_policy::Entities) -> authzd::CedarAuthorizer {
+pub fn build_cedar_authorizer(
+    entities: cedar_policy::Entities,
+) -> authzd::authorization::cedar::CedarAuthorizer {
     let realpath = std::fs::canonicalize("./etc/authzd").unwrap();
     let path = realpath.as_path();
-    authzd::CedarAuthorizer::new_from(path, entities)
+    authzd::authorization::cedar::CedarAuthorizer::new_from(path, entities)
 }
 
 pub async fn build_channel(addr: SocketAddr) -> Channel {