Fix: review change requests

Author: cleissonbr

README.md

@@ -98,6 +98,9 @@ Cedar Agent configuration is available using environment variables and command l
 - Load data from json file. Defaults to `None`.  
   `DATA` environment variable.
   `--data`, `-d` command line argument.
+- Load policies from json file. Defaults to `None`.
+  `POLICIES` environment variable.
+  `--policies`, `-p` command line argument.
 
 **command line arguments take precedence over environment variables when configuring the Cedar Agent**
 

src/config.rs

@@ -22,7 +22,7 @@ pub struct Config {
     #[arg(short, long)]
     pub data: Option<PathBuf>,
     #[arg(long)]
-    pub policy: Option<PathBuf>,
+    pub policies: Option<PathBuf>,
 }
 
 impl Into<rocket::figment::Figment> for &Config {
@@ -42,8 +42,8 @@ impl Into<rocket::figment::Figment> for &Config {
         if let Some(data) = self.data.borrow() {
             config = config.merge(("data", data));
         }
-        if let Some(policy) = self.policy.borrow() {
-            config = config.merge(("policy", policy));
+        if let Some(policies) = self.policies.borrow() {
+            config = config.merge(("policies", policies));
         }
 
         config
@@ -58,7 +58,7 @@ impl Config {
             port: None,
             log_level: None,
             data: None,
-            policy: None,
+            policies: None,
         }
     }
 
@@ -70,7 +70,7 @@ impl Config {
             config.port = c.port.or(config.port);
             config.log_level = c.log_level.or(config.log_level);
             config.data = c.data.or(config.data);
-            config.policy = c.policy.or(config.policy);
+            config.policies = c.policies.or(config.policies);
         }
 
         config

src/services/policies/load_from_file.rs

@@ -17,11 +17,11 @@ pub struct InitPoliciesFairing;
 
 pub(crate) async fn init(conf: &config::Config, policy_store: &Box<dyn PolicyStore>) {
 
-    if conf.policy.is_none() {
+    if conf.policies.is_none() {
         return;
     }
 
-    let file_path = conf.policy.clone().unwrap();
+    let file_path = conf.policies.clone().unwrap();
     let policies_file_path = &file_path;
     let policies = match load_policies_from_file(policies_file_path.to_path_buf()).await {
         Ok(policies) => policies,

tests/services/data_tests.rs

@@ -1,6 +1,12 @@
+use std::sync::Arc;
+use std::path::PathBuf;
+use std::fs::File;
+use std::io::Write;
+
 use crate::services::utils;
-use cedar_agent::data::memory::MemoryDataStore;
 
+use cedar_agent::data::memory::MemoryDataStore;
+use cedar_agent::data::load_from_file::load_entities_from_file;
 use cedar_agent::DataStore;
 
 #[tokio::test]
@@ -18,3 +24,28 @@ async fn memory_tests() {
     let entities = store.get_entities().await;
     assert_eq!(entities.len(), 0);
 }
+
+#[tokio::test]
+async fn test_load_entities_from_file() {
+    let temp_file_path = Arc::new(PathBuf::from("test_entities.json"));
+    let test_data = r#"[{
+        "attrs": {},
+        "parents": [
+          {
+            "id": "Admin",
+            "type": "Role"
+          }
+        ],
+        "uid": {
+          "id": "admin.1@domain.com",
+          "type": "User"
+        }
+    }]"#;
+    let mut temp_file = File::create(&*temp_file_path.clone()).unwrap();
+    temp_file.write_all(test_data.as_bytes()).unwrap();
+
+    let entities = load_entities_from_file(temp_file_path.clone().to_path_buf()).await.unwrap();
+    assert_eq!(entities.len(), 1);
+
+    std::fs::remove_file(temp_file_path.clone().to_path_buf()).unwrap();
+}

tests/services/policies_tests.rs

@@ -1,11 +1,17 @@
 use std::str::FromStr;
+use std::sync::Arc;
+use std::path::PathBuf;
+use std::fs::File;
+use std::io::Write;
 
 use cedar_policy::PolicyId;
 
 use crate::services::utils::*;
+
 use cedar_agent::policies::memory::MemoryPolicyStore;
 use cedar_agent::schemas::policies::PolicyUpdate;
 use cedar_agent::PolicyStore;
+use cedar_agent::policies::load_from_file::load_policies_from_file;
 
 #[tokio::test]
 async fn memory_tests() {
@@ -82,3 +88,20 @@ async fn memory_tests() {
         .policy(&PolicyId::from_str("test").unwrap())
         .is_none());
 }
+
+#[tokio::test]
+async fn test_load_policies_from_file() {
+    let temp_file_path = Arc::new(PathBuf::from("test_policies.json"));
+    let test_data = r#"[{
+        "id": "test",
+        "content": "permit(principal in Role::\"Viewer\",action in [Action::\"get\",Action::\"list\"],resource == Document::\"cedar-agent.pdf\");"
+    }]"#;
+    let mut temp_file = File::create(&*temp_file_path.clone()).unwrap();
+    temp_file.write_all(test_data.as_bytes()).unwrap();
+
+    let policies = load_policies_from_file(temp_file_path.clone().to_path_buf()).await.unwrap();
+    assert_eq!(policies.len(), 1);
+    assert_eq!(policies[0].id, "test".to_string());
+
+    std::fs::remove_file(temp_file_path.clone().to_path_buf()).unwrap();
+}