github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-03 18:47:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #89 from jiangliu/oci_v1

Browse Source 
Minor improvement to agent/oci crate
This commit is contained in:
Fupan Li 2019-11-23 13:04:08 +08:00 committed by GitHub
commit f2e22eec4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 72 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

123
src/agent/oci/src/lib.rs
View File

@ -8,12 +8,11 @@ extern crate serde;
extern crate serde_derive; extern crate serde_derive;
extern crate serde_json; extern crate serde_json;
use std::collections::HashMap;
// use std::io::Write;
use libc::mode_t; use libc::mode_t;
// use std::any::Any; use std::collections::HashMap;
pub mod serialize; mod serialize;
pub use serialize::{to_string, to_writer, Error, Result};
#[allow(dead_code)] #[allow(dead_code)]
fn is_false(b: bool) -> bool { fn is_false(b: bool) -> bool {
@ -59,16 +58,15 @@ pub struct Spec {
} }
impl Spec { impl Spec {
pub fn load(path: &str) -> Result<Spec, serialize::SerializeError> { pub fn load(path: &str) -> Result<Spec> {
serialize::deserialize(path) serialize::deserialize(path)
} }
pub fn save(&self, path: &str) -> Result<(), serialize::SerializeError> { pub fn save(&self, path: &str) -> Result<()> {
serialize::serialize(self, path) serialize::serialize(self, path)
} }
} }
#[allow(dead_code)]
pub type LinuxRlimit = POSIXRlimit; pub type LinuxRlimit = POSIXRlimit;
#[derive(Serialize, Deserialize, Debug)] #[derive(Serialize, Deserialize, Debug)]
@ -250,20 +248,13 @@ pub struct LinuxNamespace {
pub type LinuxNamespaceType = String; pub type LinuxNamespaceType = String;
#[allow(dead_code)] pub const PIDNAMESPACE: &str = "pid";
pub const PIDNAMESPACE: &'static str = "pid"; pub const NETWORKNAMESPACE: &str = "network";
#[allow(dead_code)] pub const MOUNTNAMESPACE: &str = "mount";
pub const NETWORKNAMESPACE: &'static str = "network"; pub const IPCNAMESPACE: &str = "ipc";
#[allow(dead_code)] pub const USERNAMESPACE: &str = "user";
pub const MOUNTNAMESPACE: &'static str = "mount"; pub const UTSNAMESPACE: &str = "uts";
#[allow(dead_code)] pub const CGROUPNAMESPACE: &str = "cgroup";
pub const IPCNAMESPACE: &'static str = "ipc";
#[allow(dead_code)]
pub const USERNAMESPACE: &'static str = "user";
#[allow(dead_code)]
pub const UTSNAMESPACE: &'static str = "uts";
#[allow(dead_code)]
pub const CGROUPNAMESPACE: &'static str = "cgroup";
#[derive(Serialize, Deserialize, Debug)] #[derive(Serialize, Deserialize, Debug)]
pub struct LinuxIDMapping { pub struct LinuxIDMapping {
@ -722,72 +713,42 @@ pub struct LinuxSeccomp {
pub type Arch = String; pub type Arch = String;
#[allow(dead_code)] pub const ARCHX86: &str = "SCMP_ARCH_X86";
pub const ARCHX86: &'static str = "SCMP_ARCH_X86"; pub const ARCHX86_64: &str = "SCMP_ARCH_X86_64";
#[allow(dead_code)] pub const ARCHX32: &str = "SCMP_ARCH_X32";
pub const ARCHX86_64: &'static str = "SCMP_ARCH_X86_64"; pub const ARCHARM: &str = "SCMP_ARCH_ARM";
#[allow(dead_code)] pub const ARCHAARCH64: &str = "SCMP_ARCH_AARCH64";
pub const ARCHX32: &'static str = "SCMP_ARCH_X32"; pub const ARCHMIPS: &str = "SCMP_ARCH_MIPS";
#[allow(dead_code)] pub const ARCHMIPS64: &str = "SCMP_ARCH_MIPS64";
pub const ARCHARM: &'static str = "SCMP_ARCH_ARM"; pub const ARCHMIPS64N32: &str = "SCMP_ARCH_MIPS64N32";
#[allow(dead_code)] pub const ARCHMIPSEL: &str = "SCMP_ARCH_MIPSEL";
pub const ARCHAARCH64: &'static str = "SCMP_ARCH_AARCH64"; pub const ARCHMIPSEL64: &str = "SCMP_ARCH_MIPSEL64";
#[allow(dead_code)] pub const ARCHMIPSEL64N32: &str = "SCMP_ARCH_MIPSEL64N32";
pub const ARCHMIPS: &'static str = "SCMP_ARCH_MIPS"; pub const ARCHPPC: &str = "SCMP_ARCH_PPC";
#[allow(dead_code)] pub const ARCHPPC64: &str = "SCMP_ARCH_PPC64";
pub const ARCHMIPS64: &'static str = "SCMP_ARCH_MIPS64"; pub const ARCHPPC64LE: &str = "SCMP_ARCH_PPC64LE";
#[allow(dead_code)] pub const ARCHS390: &str = "SCMP_ARCH_S390";
pub const ARCHMIPS64N32: &'static str = "SCMP_ARCH_MIPS64N32"; pub const ARCHS390X: &str = "SCMP_ARCH_S390X";
#[allow(dead_code)] pub const ARCHPARISC: &str = "SCMP_ARCH_PARISC";
pub const ARCHMIPSEL: &'static str = "SCMP_ARCH_MIPSEL"; pub const ARCHPARISC64: &str = "SCMP_ARCH_PARISC64";
#[allow(dead_code)]
pub const ARCHMIPSEL64: &'static str = "SCMP_ARCH_MIPSEL64";
#[allow(dead_code)]
pub const ARCHMIPSEL64N32: &'static str = "SCMP_ARCH_MIPSEL64N32";
#[allow(dead_code)]
pub const ARCHPPC: &'static str = "SCMP_ARCH_PPC";
#[allow(dead_code)]
pub const ARCHPPC64: &'static str = "SCMP_ARCH_PPC64";
#[allow(dead_code)]
pub const ARCHPPC64LE: &'static str = "SCMP_ARCH_PPC64LE";
#[allow(dead_code)]
pub const ARCHS390: &'static str = "SCMP_ARCH_S390";
#[allow(dead_code)]
pub const ARCHS390X: &'static str = "SCMP_ARCH_S390X";
#[allow(dead_code)]
pub const ARCHPARISC: &'static str = "SCMP_ARCH_PARISC";
#[allow(dead_code)]
pub const ARCHPARISC64: &'static str = "SCMP_ARCH_PARISC64";
pub type LinuxSeccompAction = String; pub type LinuxSeccompAction = String;
#[allow(dead_code)] pub const ACTKILL: &str = "SCMP_ACT_KILL";
pub const ACTKILL: &'static str = "SCMP_ACT_KILL"; pub const ACTTRAP: &str = "SCMP_ACT_TRAP";
#[allow(dead_code)] pub const ACTERRNO: &str = "SCMP_ACT_ERRNO";
pub const ACTTRAP: &'static str = "SCMP_ACT_TRAP"; pub const ACTTRACE: &str = "SCMP_ACT_TRACE";
#[allow(dead_code)] pub const ACTALLOW: &str = "SCMP_ACT_ALLOW";
pub const ACTERRNO: &'static str = "SCMP_ACT_ERRNO";
#[allow(dead_code)]
pub const ACTTRACE: &'static str = "SCMP_ACT_TRACE";
#[allow(dead_code)]
pub const ACTALLOW: &'static str = "SCMP_ACT_ALLOW";
pub type LinuxSeccompOperator = String; pub type LinuxSeccompOperator = String;
#[allow(dead_code)] pub const OPNOTEQUAL: &str = "SCMP_CMP_NE";
pub const OPNOTEQUAL: &'static str = "SCMP_CMP_NE"; pub const OPLESSTHAN: &str = "SCMP_CMP_LT";
#[allow(dead_code)] pub const OPLESSEQUAL: &str = "SCMP_CMP_LE";
pub const OPLESSTHAN: &'static str = "SCMP_CMP_LT"; pub const OPEQUALTO: &str = "SCMP_CMP_EQ";
#[allow(dead_code)] pub const OPGREATEREQUAL: &str = "SCMP_CMP_GE";
pub const OPLESSEQUAL: &'static str = "SCMP_CMP_LE"; pub const OPGREATERTHAN: &str = "SCMP_CMP_GT";
#[allow(dead_code)] pub const OPMASKEDEQUAL: &str = "SCMP_CMP_MASKED_EQ";
pub const OPEQUALTO: &'static str = "SCMP_CMP_EQ";
#[allow(dead_code)]
pub const OPGREATEREQUAL: &'static str = "SCMP_CMP_GE";
#[allow(dead_code)]
pub const OPGREATERTHAN: &'static str = "SCMP_CMP_GT";
#[allow(dead_code)]
pub const OPMASKEDEQUAL: &'static str = "SCMP_CMP_MASKED_EQ";
#[derive(Serialize, Deserialize, Debug)] #[derive(Serialize, Deserialize, Debug)]
pub struct LinuxSeccompArg { pub struct LinuxSeccompArg {

59
src/agent/oci/src/serialize.rs
View File

@ -3,85 +3,86 @@
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
// //
use serde;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use serde_json; use serde_json;
use std::error::Error; use std::error;
use std::fmt::{self, Formatter}; use std::fmt::{Display, Formatter, Result as FmtResult};
use std::fs::File; use std::fs::File;
use std::io; use std::io;
pub type Result<T> = std::result::Result<T, Error>;
#[derive(Debug)] #[derive(Debug)]
pub enum SerializeError { pub enum Error {
Io(io::Error), Io(io::Error),
Json(serde_json::Error), Json(serde_json::Error),
} }
impl fmt::Display for SerializeError { impl Display for Error {
fn fmt(&self, f: &mut Formatter) -> fmt::Result { fn fmt(&self, f: &mut Formatter) -> FmtResult {
match *self { match *self {
SerializeError::Io(ref e) => e.fmt(f), Error::Io(ref e) => e.fmt(f),
SerializeError::Json(ref e) => e.fmt(f), Error::Json(ref e) => e.fmt(f),
} }
} }
} }
impl Error for SerializeError { impl error::Error for Error {
fn description(&self) -> &str { fn description(&self) -> &str {
match *self { match *self {
SerializeError::Io(ref e) => e.description(), Error::Io(ref e) => e.description(),
SerializeError::Json(ref e) => e.description(), Error::Json(ref e) => e.description(),
} }
} }
fn cause(&self) -> Option<&dyn Error> { fn cause(&self) -> Option<&dyn error::Error> {
match *self { match *self {
SerializeError::Io(ref e) => Some(e), Error::Io(ref e) => Some(e),
SerializeError::Json(ref e) => Some(e), Error::Json(ref e) => Some(e),
} }
} }
} }
impl From<io::Error> for SerializeError { impl From<io::Error> for Error {
fn from(e: io::Error) -> SerializeError { fn from(e: io::Error) -> Error {
SerializeError::Io(e) Error::Io(e)
} }
} }
impl From<serde_json::Error> for SerializeError { impl From<serde_json::Error> for Error {
fn from(e: serde_json::Error) -> SerializeError { fn from(e: serde_json::Error) -> Error {
SerializeError::Json(e) Error::Json(e)
} }
} }
pub fn to_writer<W, T>(o: &T, mut w: W) -> Result<(), SerializeError> pub fn to_writer<W, T>(o: &T, w: W) -> Result<()>
where where
W: io::Write, W: io::Write,
T: Serialize, T: Serialize,
{ {
Ok(serde_json::to_writer(&mut w, &o)?) Ok(serde_json::to_writer(w, o)?)
} }
pub fn serialize<T>(o: &T, path: &str) -> Result<(), SerializeError> pub fn serialize<T>(o: &T, path: &str) -> Result<()>
where where
T: Serialize, T: Serialize,
{ {
let mut f = File::create(path)?; let f = File::create(path)?;
Ok(serde_json::to_writer(&mut f, &o)?) Ok(serde_json::to_writer(f, o)?)
} }
pub fn to_string<T>(o: &T) -> Result<String, SerializeError> pub fn to_string<T>(o: &T) -> Result<String>
where where
T: Serialize, T: Serialize,
{ {
Ok(serde_json::to_string(&o)?) Ok(serde_json::to_string(o)?)
} }
pub fn deserialize<T>(path: &str) -> Result<T, SerializeError> pub fn deserialize<T>(path: &str) -> Result<T>
where where
for<'a> T: Deserialize<'a>, for<'a> T: Deserialize<'a>,
{ {
let f = File::open(path)?; let f = File::open(path)?;
Ok(serde_json::from_reader(&f)?) Ok(serde_json::from_reader(f)?)
} }