Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 20 additions & 4 deletions common/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,15 @@ impl From<stdng::Error> for FlameError {
impl From<FlameError> for Status {
fn from(value: FlameError) -> Self {
match value {
FlameError::NotFound(s) => Status::not_found(s),
FlameError::Internal(s) => Status::internal(s),
_ => Status::unknown(value.to_string()),
FlameError::NotFound(msg) => Status::not_found(msg),
FlameError::InvalidConfig(msg) | FlameError::InvalidState(msg) => {
Status::invalid_argument(msg)
}
FlameError::Internal(msg)
| FlameError::Network(msg)
| FlameError::Uninitialized(msg)
| FlameError::Storage(msg)
| FlameError::VersionMismatch(msg) => Status::internal(msg),
}
}
}
Expand Down Expand Up @@ -246,7 +252,17 @@ mod tests {

let error = FlameError::Network("test".to_string());
let status = Status::from(error);
assert_eq!(status.code(), Code::Unknown);
assert_eq!(status.code(), Code::Internal);
assert_eq!(status.message(), "test");

let error = FlameError::InvalidConfig("test".to_string());
let status = Status::from(error);
assert_eq!(status.code(), Code::InvalidArgument);
assert_eq!(status.message(), "test");

let error = FlameError::InvalidState("test".to_string());
let status = Status::from(error);
assert_eq!(status.code(), Code::InvalidArgument);
assert_eq!(status.message(), "test");
}
}
14 changes: 14 additions & 0 deletions cri/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,20 @@ limitations under the License.

fn main() -> Result<(), Box<dyn std::error::Error>> {
tonic_build::configure()
.type_attribute(".", "#[allow(clippy::doc_overindented_list_items)]")
.type_attribute(".", "#[allow(clippy::doc_lazy_continuation)]")
.type_attribute(
"runtime.v1.MountPropagation",
"#[allow(clippy::enum_variant_names)]",
)
.type_attribute(
"runtime.v1.ContainerState",
"#[allow(clippy::enum_variant_names)]",
)
.type_attribute(
"runtime.v1.ContainerEventType",
"#[allow(clippy::enum_variant_names)]",
)
.protoc_arg("--experimental_allow_proto3_optional")
.compile_protos(&["protos/cri.proto"], &["protos"])?;

Expand Down
Loading
Loading