fix cherry-pick errors

cedar-policy · Aug 15, 2023 · 2cb6357 · 2cb6357
1 parent 1eb7a74
commit 2cb6357
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/cedar-drt/Cargo.toml b/cedar-drt/Cargo.toml
@@ -9,8 +9,8 @@ env_logger = "0.10"
 log = "0.4"
 libfuzzer-sys = "0.4"
 cedar-policy = { path = "../cedar/cedar-policy", version = "2.3", features = ["integration_testing"] }
-cedar-policy-core = { path = "../cedar/cedar-policy-core", version = "2.3" }
-cedar-policy-validator = { path = "../cedar/cedar-policy-validator", version = "2.3" }
+cedar-policy-core = { path = "../cedar/cedar-policy-core", version = "2.3", features = ["arbitrary"] }
+cedar-policy-validator = { path = "../cedar/cedar-policy-validator", version = "2.3", features = ["arbitrary"] }
 cedar-policy-formatter = { path = "../cedar/cedar-policy-formatter", version = "2.3" }
 jni = { version = "0.19.0", features = ["invocation"] }
 serde = { version = "1.0", features = ["derive"] }

diff --git a/cedar-drt/fuzz/Cargo.toml b/cedar-drt/fuzz/Cargo.toml
@@ -14,8 +14,9 @@ libfuzzer-sys = "0.4"
 serde = { version = "1.0", feature = ["derive"] }
 serde_json = "1.0"
 cedar-drt = { version = "2.0.0", path = ".." }
-cedar-policy-core = { path = "../../cedar/cedar-policy-core", version = "2.3" }
-cedar-policy-validator = { path = "../../cedar/cedar-policy-validator", version = "2.3" }
+cedar-policy = { path = "../../cedar/cedar-policy", version = "2.3" }
+cedar-policy-core = { path = "../../cedar/cedar-policy-core", version = "2.3", features = ["arbitrary"] }
+cedar-policy-validator = { path = "../../cedar/cedar-policy-validator", version = "2.3", features = ["arbitrary"] }
 cedar-policy-formatter = { path = "../../cedar/cedar-policy-formatter", version = "2.3" }
 cedar-policy-generators = { path = "../../cedar-policy-generators", version = "2.*" }
 smol_str = { version = "0.2", features = ["serde"] }

diff --git a/cedar-drt/fuzz/fuzz_targets/formatter.rs b/cedar-drt/fuzz/fuzz_targets/formatter.rs
@@ -19,7 +19,7 @@
 use cedar_drt::initialize_log;
 use cedar_drt_inner::fuzz_target;
 use cedar_policy_core::ast::{EntityType, ExprKind, Literal, StaticPolicy, Template};
-use cedar_policy_core::parser::{self, parse_policy};
+use cedar_policy_core::parser::{err, parse_policy};
 use cedar_policy_formatter::{lexer, policies_str_to_pretty, Config};
 use cedar_policy_generators::abac::{ABACPolicy, ABACSettings};
 use cedar_policy_generators::schema::Schema;

diff --git a/cedar-drt/fuzz/fuzz_targets/pp.rs b/cedar-drt/fuzz/fuzz_targets/pp.rs
@@ -19,7 +19,7 @@
 use cedar_drt::initialize_log;
 use cedar_drt_inner::fuzz_target;
 use cedar_policy_core::ast::{EntityType, ExprKind, Literal, StaticPolicy, Template};
-use cedar_policy_core::parser::{self, parse_policy};
+use cedar_policy_core::parser::{err, parse_policy};
 use cedar_policy_generators::abac::{ABACPolicy, ABACSettings};
 use cedar_policy_generators::schema::Schema;
 use libfuzzer_sys::arbitrary::{self, Arbitrary, Unstructured};

diff --git a/cedar-drt/fuzz/fuzz_targets/validation-pbt.rs b/cedar-drt/fuzz/fuzz_targets/validation-pbt.rs
@@ -347,7 +347,7 @@ fuzz_target!(|input: FuzzTargetInput| {
                             .filter(|err| err.contains("type error"))
                             .collect::<Vec<String>>(),
                         Vec::<String>::new(),
-                        "validated policy produced a type error!\npolicies:\n{policyset}\nentities:\n{entities}\nschema:\n{schemafile_string}\nrequest:\n{q}\n",
+                        "validated policy produced a type error!\npolicies:\n{policyset}\nentities:\n{entities}\nschema:\nrequest:\n{q}\n",
                     );
                     // or wrong-number-of-arguments errors
                     assert_eq!(

diff --git a/cedar-policy-generators/src/schema.rs b/cedar-policy-generators/src/schema.rs
@@ -268,7 +268,7 @@ fn uid_for_action_name(namespace: Option<SmolStr>, action_name: &SmolStr) -> ast
     let namespace_prefix = namespace.map(|ns| format!("{ns}::")).unwrap_or_default();
     format!("{}Action::\"{}\"", namespace_prefix, action_name)
                 .parse()
-                unwrap_or_else(|e| panic!("schema actions should all be valid EntityUIDs in this context, but {action_name:?} led to an invalid one: {e}"))
+                .unwrap_or_else(|e| panic!("schema actions should all be valid EntityUIDs in this context, but {action_name:?} led to an invalid one: {e:?}"))
 }
 
 /// internal helper function, convert a SchemaType to a Type (loses some