Skip to content

update for cedar#1406 #510

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cdisselkoen merged 3 commits into from
Jan 6, 2025
+358 −259
Merged

update for cedar#1406 #510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d738799
update for cedar#1406
cdisselkoen Jan 3, 2025
9ebf4a5
missed a few spots. have to fix Ord in the main repo
cdisselkoen Jan 3, 2025
fc89619
hopefully last fix
cdisselkoen Jan 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions cedar-drt/fuzz/src/schemas.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,8 +278,11 @@ impl Equiv for cedar_policy_validator::types::AttributeType {
impl<N: Clone + PartialEq + TypeName + Debug + Display> Equiv for json_schema::Type<N> {
fn equiv(lhs: &Self, rhs: &Self) -> Result<(), String> {
match (lhs, rhs) {
(Self::Type(lhs), Self::Type(rhs)) => Equiv::equiv(lhs, rhs),
(Self::CommonTypeRef { type_name: lhs }, Self::CommonTypeRef { type_name: rhs }) => {
(Self::Type { ty: lhs, .. }, Self::Type { ty: rhs, .. }) => Equiv::equiv(lhs, rhs),
(
Self::CommonTypeRef { type_name: lhs, .. },
Self::CommonTypeRef { type_name: rhs, .. },
) => {
if lhs == rhs {
Ok(())
} else {
Expand All @@ -288,17 +291,17 @@ impl<N: Clone + PartialEq + TypeName + Debug + Display> Equiv for json_schema::T
))
}
}
(Self::Type(tv), Self::CommonTypeRef { type_name })
| (Self::CommonTypeRef { type_name }, Self::Type(tv)) => {
match tv {
(Self::Type { ty, .. }, Self::CommonTypeRef { type_name, .. })
| (Self::CommonTypeRef { type_name, .. }, Self::Type { ty, .. }) => {
match ty {
json_schema::TypeVariant::EntityOrCommon {
type_name: tv_type_name,
} if type_name == tv_type_name => {
// Consider common-type equivalent to entity-or-common of the same name
Ok(())
}
_ => Err(format!(
"Common-type `{type_name}` is not equivalent to non-common-type {tv:?}"
"Common-type `{type_name}` is not equivalent to non-common-type {ty:?}"
)),
}
}
Expand Down
Loading