Merge pull request #121 from Furisto/builder

Modularize container creation

.github/workflows/main.yml

@@ -31,6 +31,8 @@ jobs:
         run: ./build.sh
       - name: Run tests
         run: cargo test
+      - name: Run doc tests
+        run: cargo test --doc
   integration_tests:
     runs-on: ubuntu-latest
     steps:

oci_spec/src/lib.rs

@@ -1,9 +1,9 @@
 use nix::sys::stat::SFlag;
 use std::collections::HashMap;
 use std::fs::File;
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 
-use anyhow::{bail, Result};
+use anyhow::{Context, Result, bail};
 use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
@@ -607,13 +607,18 @@ pub struct Spec {
 }
 
 impl Spec {
-    pub fn load(path: &str) -> Result<Self> {
-        let file = File::open(path)?;
-        let mut spec: Spec = serde_json::from_reader(&file)?;
-        // FIME: It is fail if the caller isn't in the correct directory.
-        spec.root.path = std::fs::canonicalize(spec.root.path)?;
+    pub fn load<P: AsRef<Path>>(path: P) -> Result<Self> {
+        let path = path.as_ref();
+        let file = File::open(path).with_context(|| format!("failed to open {:?}", path))?;
+        let spec: Spec = serde_json::from_reader(&file)?;
         Ok(spec)
     }
+
+    pub fn canonicalize_rootfs(&mut self) -> Result<()> {
+        self.root.path = std::fs::canonicalize(&self.root.path)
+        .with_context(|| format!("failed to canonicalize {:?}", self.root.path))?;
+        Ok(())
+    }
 }
 
 #[cfg(feature = "proptests")]

src/capabilities.rs

@@ -1,4 +1,4 @@
-use crate::command::Command;
+use crate::command::Syscall;
 use caps::*;
 
 use anyhow::Result;
@@ -12,13 +12,13 @@ fn to_set(caps: &[LinuxCapabilityType]) -> CapsHashSet {
     capabilities
 }
 
-pub fn reset_effective(command: &impl Command) -> Result<()> {
+pub fn reset_effective(syscall: &impl Syscall) -> Result<()> {
     log::debug!("reset all caps");
-    command.set_capability(CapSet::Effective, &caps::all())?;
+    syscall.set_capability(CapSet::Effective, &caps::all())?;
     Ok(())
 }
 
-pub fn drop_privileges(cs: &LinuxCapabilities, command: &impl Command) -> Result<()> {
+pub fn drop_privileges(cs: &LinuxCapabilities, syscall: &impl Syscall) -> Result<()> {
     let all = caps::all();
     log::debug!("dropping bounding capabilities to {:?}", cs.bounding);
     for c in all.difference(&to_set(&cs.bounding)) {
@@ -31,11 +31,11 @@ pub fn drop_privileges(cs: &LinuxCapabilities, command: &impl Command) -> Result
         }
     }
 
-    command.set_capability(CapSet::Effective, &to_set(&cs.effective))?;
-    command.set_capability(CapSet::Permitted, &to_set(&cs.permitted))?;
-    command.set_capability(CapSet::Inheritable, &to_set(&cs.inheritable))?;
+    syscall.set_capability(CapSet::Effective, &to_set(&cs.effective))?;
+    syscall.set_capability(CapSet::Permitted, &to_set(&cs.permitted))?;
+    syscall.set_capability(CapSet::Inheritable, &to_set(&cs.inheritable))?;
 
-    if let Err(e) = command.set_capability(CapSet::Ambient, &to_set(&cs.ambient)) {
+    if let Err(e) = syscall.set_capability(CapSet::Ambient, &to_set(&cs.ambient)) {
         log::error!("failed to set ambient capabilities: {}", e);
     }
     Ok(())
@@ -44,11 +44,11 @@ pub fn drop_privileges(cs: &LinuxCapabilities, command: &impl Command) -> Result
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::command::test::TestHelperCommand;
+    use crate::command::test::TestHelperSyscall;
 
     #[test]
     fn test_reset_effective() {
-        let test_command = TestHelperCommand::default();
+        let test_command = TestHelperSyscall::default();
         assert!(reset_effective(&test_command).is_ok());
         let set_capability_args: Vec<_> = test_command
             .get_set_capability_args()

src/command/linux.rs

@@ -24,14 +24,14 @@ use nix::{sched::unshare, sys::stat::Mode};
 
 use oci_spec::LinuxRlimit;
 
-use super::Command;
+use super::Syscall;
 use crate::capabilities;
 
 /// Empty structure to implement Command trait for
 #[derive(Clone)]
-pub struct LinuxCommand;
+pub struct LinuxSyscall;
 
-impl LinuxCommand {
+impl LinuxSyscall {
     unsafe fn from_raw_buf<'a, T>(p: *const c_char) -> T
     where
         T: From<&'a OsStr>,
@@ -46,7 +46,7 @@ impl LinuxCommand {
     }
 }
 
-impl Command for LinuxCommand {
+impl Syscall for LinuxSyscall {
     /// To enable dynamic typing,
     /// see https://doc.rust-lang.org/std/any/index.html for more information
     fn as_any(&self) -> &dyn Any {

src/command/mod.rs

@@ -2,9 +2,9 @@
 //! This provides a uniform interface for rest of Youki
 //! to call syscalls required for container management
 
-#[allow(clippy::module_inception)]
-pub mod command;
 pub mod linux;
+#[allow(clippy::module_inception)]
+pub mod syscall;
 pub mod test;
 
-pub use command::Command;
+pub use syscall::Syscall;

src/command/command.rs → src/command/syscall.rs

@@ -12,11 +12,11 @@ use nix::{
 
 use oci_spec::LinuxRlimit;
 
-use crate::command::{linux::LinuxCommand, test::TestHelperCommand};
+use crate::command::{linux::LinuxSyscall, test::TestHelperSyscall};
 
 /// This specifies various kernel/other functionalities required for
 /// container management
-pub trait Command {
+pub trait Syscall {
     fn as_any(&self) -> &dyn Any;
     fn pivot_rootfs(&self, path: &Path) -> Result<()>;
     fn set_ns(&self, rawfd: i32, nstype: CloneFlags) -> Result<()>;
@@ -28,10 +28,10 @@ pub trait Command {
     fn get_pwuid(&self, uid: u32) -> Option<Arc<OsStr>>;
 }
 
-pub fn create_command() -> Box<dyn Command> {
+pub fn create_syscall() -> Box<dyn Syscall> {
     if cfg!(test) {
-        Box::new(TestHelperCommand::default())
+        Box::new(TestHelperSyscall::default())
     } else {
-        Box::new(LinuxCommand)
+        Box::new(LinuxSyscall)
     }
 }

src/command/test.rs

@@ -4,26 +4,26 @@ use caps::{errors::CapsError, CapSet, CapsHashSet};
 use nix::sched::CloneFlags;
 use oci_spec::LinuxRlimit;
 
-use super::Command;
+use super::Syscall;
 
 #[derive(Clone)]
-pub struct TestHelperCommand {
+pub struct TestHelperSyscall {
     set_ns_args: RefCell<Vec<(i32, CloneFlags)>>,
     unshare_args: RefCell<Vec<CloneFlags>>,
     set_capability_args: RefCell<Vec<(CapSet, CapsHashSet)>>,
 }
 
-impl Default for TestHelperCommand {
+impl Default for TestHelperSyscall {
     fn default() -> Self {
-        TestHelperCommand {
+        TestHelperSyscall {
             set_ns_args: RefCell::new(vec![]),
             unshare_args: RefCell::new(vec![]),
             set_capability_args: RefCell::new(vec![]),
         }
     }
 }
 
-impl Command for TestHelperCommand {
+impl Syscall for TestHelperSyscall {
     fn as_any(&self) -> &dyn Any {
         self
     }
@@ -66,7 +66,7 @@ impl Command for TestHelperCommand {
     }
 }
 
-impl TestHelperCommand {
+impl TestHelperSyscall {
     pub fn get_setns_args(&self) -> Vec<(i32, CloneFlags)> {
         self.set_ns_args.borrow_mut().clone()
     }

src/container/builder.rs

@@ -0,0 +1,130 @@
+use crate::command::linux::LinuxSyscall;
+use std::path::PathBuf;
+
+use super::{init_builder::InitContainerBuilder, tenant_builder::TenantContainerBuilder};
+pub struct ContainerBuilder {
+    pub(super) container_id: String,
+
+    pub(super) root_path: PathBuf,
+
+    pub(super) syscall: LinuxSyscall,
+
+    pub(super) pid_file: Option<PathBuf>,
+
+    pub(super) console_socket: Option<PathBuf>,
+}
+
+/// Builder that can be used to configure the common properties of
+/// either a init or a tenant container
+///
+/// # Example
+///
+/// ```no_run
+/// use youki::container::builder::ContainerBuilder;
+///
+/// ContainerBuilder::new("74f1a4cb3801".to_owned())
+/// .with_root_path("/run/containers/youki")
+/// .with_pid_file("/var/run/docker.pid")
+/// .with_console_socket("/var/run/docker/sock.tty")
+/// .as_init("/var/run/docker/bundle")
+/// .build();
+/// ```
+impl ContainerBuilder {
+    /// Generates the base configuration for a container which can be
+    /// transformed into either a init container or a tenant container
+    ///
+    /// # Example
+    ///
+    /// ```no_run
+    /// use youki::container::builder::ContainerBuilder;
+    ///
+    /// let builder = ContainerBuilder::new("74f1a4cb3801".to_owned());
+    /// ```
+    pub fn new(container_id: String) -> Self {
+        let root_path = PathBuf::from("/run/youki");
+
+        Self {
+            container_id,
+            root_path,
+            syscall: LinuxSyscall,
+            pid_file: None,
+            console_socket: None,
+        }
+    }
+
+    /// Transforms this builder into a tenant builder
+    /// # Example
+    ///
+    /// ```no_run
+    /// # use youki::container::builder::ContainerBuilder;
+    ///
+    /// ContainerBuilder::new("74f1a4cb3801".to_owned())
+    /// .as_tenant()
+    /// .with_container_command(vec!["sleep".to_owned(), "9001".to_owned()])
+    /// .build();
+    /// ```
+    #[allow(clippy::wrong_self_convention)]
+    pub fn as_tenant(self) -> TenantContainerBuilder {
+        TenantContainerBuilder::new(self)
+    }
+
+    /// Transforms this builder into an init builder
+    /// # Example
+    ///
+    /// ```no_run
+    /// # use youki::container::builder::ContainerBuilder;
+    ///
+    /// ContainerBuilder::new("74f1a4cb3801".to_owned())
+    /// .as_init("/var/run/docker/bundle")
+    /// .with_systemd(false)
+    /// .build();
+    /// ```
+    #[allow(clippy::wrong_self_convention)]
+    pub fn as_init<P: Into<PathBuf>>(self, bundle: P) -> InitContainerBuilder {
+        InitContainerBuilder::new(self, bundle.into())
+    }
+
+    /// Sets the root path which will be used to store the container state
+    /// # Example
+    ///
+    /// ```no_run
+    /// # use youki::container::builder::ContainerBuilder;
+    ///
+    /// ContainerBuilder::new("74f1a4cb3801".to_owned())
+    /// .with_root_path("/run/containers/youki");
+    /// ```
+    pub fn with_root_path<P: Into<PathBuf>>(mut self, path: P) -> Self {
+        self.root_path = path.into();
+        self
+    }
+
+    /// Sets the pid file which will be used to write the pid of the container
+    /// process
+    /// # Example
+    ///
+    /// ```no_run
+    /// # use youki::container::builder::ContainerBuilder;
+    ///
+    /// ContainerBuilder::new("74f1a4cb3801".to_owned())
+    /// .with_pid_file("/var/run/docker.pid");
+    /// ```
+    pub fn with_pid_file<P: Into<PathBuf>>(mut self, path: P) -> Self {
+        self.pid_file = Some(path.into());
+        self
+    }
+
+    /// Sets the console socket, which will be used to send the file descriptor
+    /// of the pseudoterminal
+    /// # Example
+    ///
+    /// ```no_run
+    /// # use youki::container::builder::ContainerBuilder;
+    ///
+    /// ContainerBuilder::new("74f1a4cb3801".to_owned())
+    /// .with_console_socket("/var/run/docker/sock.tty");
+    /// ```
+    pub fn with_console_socket<P: Into<PathBuf>>(mut self, path: P) -> Self {
+        self.console_socket = Some(path.into());
+        self
+    }
+}