[DO NOT MERGE] Test branch release/2.4.x

cedar-policy-cli/Cargo.toml

@@ -2,7 +2,7 @@
 name = "cedar-policy-cli"
 edition = "2021"
 
-version = "2.3.3"
+version = "2.4.0"
 license = "Apache-2.0"
 categories = ["compilers", "config"]
 description = "CLI interface for the Cedar Policy language."
@@ -11,15 +11,13 @@ homepage = "https://cedarpolicy.com"
 repository = "https://github.com/cedar-policy/cedar"
 
 [dependencies]
-cedar-policy = { version = "=2.3.3", path = "../cedar-policy" }
-cedar-policy-formatter = { version = "=2.3.3", path = "../cedar-policy-formatter" }
-clap = { version = "4", features = ["derive"] }
+cedar-policy = { version = "=2.4.0", path = "../cedar-policy" }
+cedar-policy-formatter = { version = "=2.4.0", path = "../cedar-policy-formatter" }
+clap = { version = "4", features = ["derive", "env"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-anyhow = "1.0"
-
-[features]
-default = []
+miette = { version = "5.9.0", features = ["fancy"] }
+thiserror = "1.0"
 
 [dev-dependencies]
 assert_cmd = "2.0"

cedar-policy-cli/src/err.rs

@@ -0,0 +1,39 @@
+/*
+ * Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+use std::error::Error;
+
+use miette::{Diagnostic, Report};
+use thiserror::Error;
+
+/// Internal adapter from Rust's standard [`Error`] to [`miette`]'s
+/// [`Diagnostic`], with an attached diagnostic code.
+#[derive(Debug, Diagnostic, Error)]
+#[error(transparent)]
+#[diagnostic(code(cedar_policy_cli::other_err))]
+struct DiagnosticError(Box<dyn Error + Send + Sync + 'static>);
+
+/// Alternative to [`miette::IntoDiagnostic`] which attaches diagnostic codes
+/// to adapted [`Error`]s for better-formatted output.
+pub trait IntoDiagnostic<T, E> {
+    fn into_diagnostic(self) -> Result<T, Report>;
+}
+
+impl<T, E: Error + Send + Sync + 'static> IntoDiagnostic<T, E> for Result<T, E> {
+    fn into_diagnostic(self) -> Result<T, Report> {
+        self.map_err(|err| DiagnosticError(Box::new(err)).into())
+    }
+}