tweak Display impl for Core's SchemaType (#1175)

Signed-off-by: Craig Disselkoen <[email protected]>

Author: cdisselkoen

cedar-policy-core/src/entities.rs

@@ -2401,7 +2401,7 @@ mod schema_based_parsing_tests {
                 &entitiesjson,
                 &miette::Report::new(e),
                 &ExpectedErrorMessageBuilder::error("error during entity deserialization")
-                    .source(r#"in attribute `hr_contacts` on `Employee::"12UA45"`, type mismatch: value was expected to have type (set of `HR`), but actually has type record with attributes: {"id" => (optional) string, "type" => (optional) string}: `{"id": "aaaaa", "type": "HR"}`"#)
+                    .source(r#"in attribute `hr_contacts` on `Employee::"12UA45"`, type mismatch: value was expected to have type [`HR`], but actually has type { "id" => (optional) string, "type" => (optional) string }: `{"id": "aaaaa", "type": "HR"}`"#)
                     .build()
             );
         });
@@ -2589,7 +2589,7 @@ mod schema_based_parsing_tests {
                 &entitiesjson,
                 &miette::Report::new(e),
                 &ExpectedErrorMessageBuilder::error_starts_with("entity does not conform to the schema")
-                    .source(r#"in attribute `json_blob` on `Employee::"12UA45"`, type mismatch: value was expected to have type record with attributes: "#)
+                    .source(r#"in attribute `json_blob` on `Employee::"12UA45"`, type mismatch: value was expected to have type {"#)
                     .build()
             );
         });

cedar-policy-core/src/entities/json/schema_types.rs

@@ -220,38 +220,31 @@ impl std::fmt::Display for SchemaType {
             Self::Bool => write!(f, "bool"),
             Self::Long => write!(f, "long"),
             Self::String => write!(f, "string"),
-            Self::Set { element_ty } => write!(f, "(set of {})", &element_ty),
-            Self::EmptySet => write!(f, "empty-set"),
+            Self::Set { element_ty } => write!(f, "[{element_ty}]"),
+            Self::EmptySet => write!(f, "[]"),
             Self::Record { attrs, open_attrs } => {
-                if attrs.is_empty() && *open_attrs {
-                    write!(f, "any record")
-                } else if attrs.is_empty() {
-                    write!(f, "empty record")
-                } else {
-                    if *open_attrs {
-                        write!(f, "record with at least attributes: {{")?;
-                    } else {
-                        write!(f, "record with attributes: {{")?;
+                write!(f, "{{ ")?;
+                // sorting attributes ensures that there is a single, deterministic
+                // Display output for each `SchemaType`, which is important for
+                // tests that check equality of error messages
+                for (i, (k, v)) in attrs
+                    .iter()
+                    .sorted_unstable_by_key(|(k, _)| SmolStr::clone(k))
+                    .enumerate()
+                {
+                    write!(f, "{k:?} => {v}")?;
+                    if i < (attrs.len() - 1) {
+                        write!(f, ", ")?;
                     }
-                    // sorting attributes ensures that there is a single, deterministic
-                    // Display output for each `SchemaType`, which is important for
-                    // tests that check equality of error messages
-                    for (i, (k, v)) in attrs
-                        .iter()
-                        .sorted_unstable_by_key(|(k, _)| SmolStr::clone(k))
-                        .enumerate()
-                    {
-                        write!(f, "{k:?} => {v}")?;
-                        if i < (attrs.len() - 1) {
-                            write!(f, ", ")?;
-                        }
-                    }
-                    write!(f, "}}")?;
-                    Ok(())
                 }
+                if *open_attrs {
+                    write!(f, ", ...")?;
+                }
+                write!(f, " }}")?;
+                Ok(())
             }
             Self::Entity { ty } => write!(f, "`{ty}`"),
-            Self::Extension { name } => write!(f, "{}", name),
+            Self::Extension { name } => write!(f, "{name}"),
         }
     }
 }

cedar-policy/src/tests.rs

@@ -1998,7 +1998,7 @@ mod schema_based_parsing_tests {
             "",
             &Report::new(err),
             &ExpectedErrorMessageBuilder::error("error during entity deserialization")
-                .source(r#"in attribute `hr_contacts` on `Employee::"12UA45"`, type mismatch: value was expected to have type (set of `HR`), but actually has type record with attributes: {"id" => (optional) string, "type" => (optional) string}: `{"id": "aaaaa", "type": "HR"}`"#)
+                .source(r#"in attribute `hr_contacts` on `Employee::"12UA45"`, type mismatch: value was expected to have type [`HR`], but actually has type { "id" => (optional) string, "type" => (optional) string }: `{"id": "aaaaa", "type": "HR"}`"#)
                 .build()
         );
 
@@ -2142,7 +2142,7 @@ mod schema_based_parsing_tests {
             "",
             &Report::new(err),
             &ExpectedErrorMessageBuilder::error_starts_with("entity does not conform to the schema")
-                .source(r#"in attribute `json_blob` on `Employee::"12UA45"`, type mismatch: value was expected to have type record with attributes: "#)
+                .source(r#"in attribute `json_blob` on `Employee::"12UA45"`, type mismatch: value was expected to have type {"#)
                 .build()
         );
 
@@ -2487,7 +2487,7 @@ mod schema_based_parsing_tests {
             "",
             &Report::new(err),
             &ExpectedErrorMessageBuilder::error("error during entity deserialization")
-                .source(r#"in attribute `hr_contacts` on `Employee::"12UA45"`, type mismatch: value was expected to have type (set of `HR`), but actually has type record with attributes: {"id" => (optional) string, "type" => (optional) string}: `{"id": "aaaaa", "type": "HR"}`"#)
+                .source(r#"in attribute `hr_contacts` on `Employee::"12UA45"`, type mismatch: value was expected to have type [`HR`], but actually has type { "id" => (optional) string, "type" => (optional) string }: `{"id": "aaaaa", "type": "HR"}`"#)
                 .build()
         );
 
@@ -2638,8 +2638,8 @@ mod schema_based_parsing_tests {
         expect_err(
             "",
             &Report::new(err),
-            &ExpectedErrorMessageBuilder::error_starts_with("entity does not conform to the schema")
-                .source(r#"in attribute `json_blob` on `Employee::"12UA45"`, type mismatch: value was expected to have type record with attributes: "#)
+            &ExpectedErrorMessageBuilder::error("entity does not conform to the schema")
+                .source(r#"in attribute `json_blob` on `Employee::"12UA45"`, type mismatch: value was expected to have type { "inner1" => (required) bool, "inner2" => (required) string, "inner3" => (required) { "innerinner" => (required) `Employee` } }, but actually has type { "inner1" => (optional) long, "inner2" => (optional) string, "inner3" => (optional) { "innerinner" => (optional) `Employee` } }: `{"inner1": 33, "inner2": "-*/", "inner3": {"innerinner": Employee::"09AE76"}}`"#)
                 .build()
         );