Merge pull request #42 from ferrell-code/spec-to-crate

get oci_spec in seperate crate

Cargo.toml

@@ -21,3 +21,4 @@ chrono = "0.4"
 once_cell = "1.6.0"
 futures = { version = "0.3", features = ["thread-pool"] }
 regex = "1.5"
+oci_spec = { version = "0.1.0", path = "./oci_spec" }

oci_spec/Cargo.toml

@@ -0,0 +1,12 @@
+[package]
+name = "oci_spec"
+version = "0.1.0"
+edition = "2018"
+
+[dependencies]
+serde = { version = "1.0", features = ["derive"] }
+nix = "0.19.1"
+anyhow = "1.0"
+serde_json = "1.0"
+caps = "0.5.1"
+

src/spec.rs → oci_spec/src/lib.rs

@@ -323,6 +323,26 @@ pub struct LinuxDeviceCgroup {
     pub access: String,
 }
 
+impl ToString for LinuxDeviceCgroup {
+    fn to_string(&self) -> String {
+        let major = self
+            .major
+            .map(|mj| mj.to_string())
+            .unwrap_or_else(|| "*".to_string());
+        let minor = self
+            .minor
+            .map(|mi| mi.to_string())
+            .unwrap_or_else(|| "*".to_string());
+        format!(
+            "{} {}:{} {}",
+            self.typ.as_str(),
+            &major,
+            &minor,
+            &self.access
+        )
+    }
+}
+
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct LinuxMemory {
     pub limit: Option<i64>,
@@ -409,6 +429,12 @@ pub struct LinuxInterfacePriority {
     pub priority: u32,
 }
 
+impl ToString for LinuxInterfacePriority {
+    fn to_string(&self) -> String {
+        format!("{} {}\n", self.name, self.priority)
+    }
+}
+
 #[derive(Serialize, Deserialize, Debug, Clone)]
 #[serde(rename_all = "camelCase")]
 pub struct LinuxNetwork {

src/capabilities.rs

@@ -1,10 +1,10 @@
 use crate::{
     command::Command,
-    spec::{LinuxCapabilities, LinuxCapabilityType},
 };
 use caps::*;
 
 use anyhow::Result;
+use oci_spec::{LinuxCapabilities, LinuxCapabilityType};
 
 fn to_set(caps: &[LinuxCapabilityType]) -> CapsHashSet {
     let mut capabilities = CapsHashSet::new();

src/cgroups/blkio.rs

@@ -6,8 +6,8 @@ use std::{
 
 use crate::{
     cgroups::Controller,
-    spec::{LinuxBlockIo, LinuxResources},
 };
+use oci_spec::{LinuxBlockIo, LinuxResources};
 
 const CGROUP_BLKIO_THROTTLE_READ_BPS: &str = "blkio.throttle.read_bps_device";
 const CGROUP_BLKIO_THROTTLE_WRITE_BPS: &str = "blkio.throttle.write_bps_device";
@@ -91,7 +91,7 @@ mod tests {
     use std::path::PathBuf;
 
     use super::*;
-    use crate::spec::{LinuxBlockIo, LinuxThrottleDevice};
+    use oci_spec::{LinuxBlockIo, LinuxThrottleDevice};
 
     struct BlockIoBuilder {
         block_io: LinuxBlockIo,

src/cgroups/controller.rs

@@ -3,7 +3,7 @@ use std::path::Path;
 use anyhow::Result;
 use nix::unistd::Pid;
 
-use crate::spec::LinuxResources;
+use oci_spec::LinuxResources;
 
 pub trait Controller {
     fn apply(linux_resources: &LinuxResources, cgroup_root: &Path, pid: Pid) -> Result<()>;

src/cgroups/devices.rs

@@ -10,28 +10,8 @@ use nix::unistd::Pid;
 use crate::{
     cgroups::Controller,
     rootfs::default_devices,
-    spec::{LinuxDeviceCgroup, LinuxDeviceType, LinuxResources},
 };
-
-impl ToString for LinuxDeviceCgroup {
-    fn to_string(&self) -> String {
-        let major = self
-            .major
-            .map(|mj| mj.to_string())
-            .unwrap_or_else(|| "*".to_string());
-        let minor = self
-            .minor
-            .map(|mi| mi.to_string())
-            .unwrap_or_else(|| "*".to_string());
-        format!(
-            "{} {}:{} {}",
-            self.typ.as_str(),
-            &major,
-            &minor,
-            &self.access
-        )
-    }
-}
+use oci_spec::{LinuxDeviceCgroup, LinuxDeviceType, LinuxResources};
 
 pub struct Devices {}
 

src/cgroups/hugetlb.rs

@@ -9,8 +9,8 @@ use regex::Regex;
 
 use crate::{
     cgroups::Controller,
-    spec::{LinuxHugepageLimit, LinuxResources},
 };
+use oci_spec::{LinuxHugepageLimit, LinuxResources};
 
 pub struct Hugetlb {}
 
@@ -79,7 +79,7 @@ mod tests {
     use std::path::PathBuf;
 
     use super::*;
-    use crate::spec::LinuxHugepageLimit;
+    use oci_spec::LinuxHugepageLimit;
 
     fn set_fixture(temp_dir: &std::path::Path, filename: &str, val: &str) -> anyhow::Result<()> {
         std::fs::OpenOptions::new()