refactor: move cedar code into a separate module

4 files changed, 9 insertions, 11 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};