From acb7a1652264ad735394c8f9b237e8381f535cca Mon Sep 17 00:00:00 2001 From: Georgina Kinge Date: Wed, 17 Aug 2022 15:38:36 +0100 Subject: [PATCH] runtime-rs: update LinuxCgroup type Update translation code to match CCv0 changes Co-authored-by: stevenhorsman Signed-off-by: Georgina Kinge --- src/libs/protocols/.gitignore | 2 ++ src/libs/protocols/src/trans.rs | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/libs/protocols/.gitignore b/src/libs/protocols/.gitignore index 0a83b1689a..a09070d859 100644 --- a/src/libs/protocols/.gitignore +++ b/src/libs/protocols/.gitignore @@ -7,5 +7,7 @@ src/empty.rs src/health.rs src/health_ttrpc.rs src/health_ttrpc_async.rs +src/image.rs +src/image_ttrpc.rs src/oci.rs src/types.rs diff --git a/src/libs/protocols/src/trans.rs b/src/libs/protocols/src/trans.rs index e9ecfe7859..83633e15b5 100644 --- a/src/libs/protocols/src/trans.rs +++ b/src/libs/protocols/src/trans.rs @@ -105,7 +105,7 @@ impl From for crate::oci::LinuxDeviceCgroup { fn from(from: oci::LinuxDeviceCgroup) -> Self { crate::oci::LinuxDeviceCgroup { Allow: from.allow, - Type: from.r#type, + Type: from.r#type.map_or("".to_string(), |t| t as String), Major: from.major.map_or(0, |t| t as i64), Minor: from.minor.map_or(0, |t| t as i64), Access: from.access, @@ -478,7 +478,7 @@ impl From for oci::LinuxDeviceCgroup { oci::LinuxDeviceCgroup { allow: from.get_Allow(), - r#type: from.take_Type(), + r#type: Some(from.take_Type()), major, minor, access: from.take_Access(),