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

agent: Use CamelCase for NamespaceType values

Browse Source 
Currently these are in all-caps, to match typical capitalization of IPC,
UTS and PID in the world at large.  However, this violates Rust's
capitalization conventions and makes clippy complain.

fixes #1611

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
David Gibson 2021-04-21 14:16:11 +10:00
parent 75eca6d56f
commit 2377c0975c
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/agent/src/namespace.rs
View File

@ -45,18 +45,18 @@ impl Namespace {
logger: logger.clone(), logger: logger.clone(),
path: String::from(""), path: String::from(""),
persistent_ns_dir: String::from(PERSISTENT_NS_DIR), persistent_ns_dir: String::from(PERSISTENT_NS_DIR),
ns_type: NamespaceType::IPC, ns_type: NamespaceType::Ipc,
hostname: None, hostname: None,
} }
} }
pub fn get_ipc(mut self) -> Self { pub fn get_ipc(mut self) -> Self {
self.ns_type = NamespaceType::IPC; self.ns_type = NamespaceType::Ipc;
self self
} }
pub fn get_uts(mut self, hostname: &str) -> Self { pub fn get_uts(mut self, hostname: &str) -> Self {
self.ns_type = NamespaceType::UTS; self.ns_type = NamespaceType::Uts;
if !hostname.is_empty() { if !hostname.is_empty() {
self.hostname = Some(String::from(hostname)); self.hostname = Some(String::from(hostname));
} }
@ -64,7 +64,7 @@ impl Namespace {
} }
pub fn get_pid(mut self) -> Self { pub fn get_pid(mut self) -> Self {
self.ns_type = NamespaceType::PID; self.ns_type = NamespaceType::Pid;
self self
} }
@ -81,7 +81,7 @@ impl Namespace {
let ns_path = PathBuf::from(&self.persistent_ns_dir); let ns_path = PathBuf::from(&self.persistent_ns_dir);
let ns_type = self.ns_type; let ns_type = self.ns_type;
if ns_type == NamespaceType::PID { if ns_type == NamespaceType::Pid {
return Err(anyhow!("Cannot persist namespace of PID type")); return Err(anyhow!("Cannot persist namespace of PID type"));
} }
let logger = self.logger.clone(); let logger = self.logger.clone();
@ -104,7 +104,7 @@ impl Namespace {
unshare(cf)?; unshare(cf)?;
if ns_type == NamespaceType::UTS && hostname.is_some() { if ns_type == NamespaceType::Uts && hostname.is_some() {
nix::unistd::sethostname(hostname.unwrap())?; nix::unistd::sethostname(hostname.unwrap())?;
} }
// Bind mount the new namespace from the current thread onto the mount point to persist it. // Bind mount the new namespace from the current thread onto the mount point to persist it.
@ -147,27 +147,27 @@ impl Namespace {
/// Represents the Namespace type. /// Represents the Namespace type.
#[derive(Clone, Copy, PartialEq)] #[derive(Clone, Copy, PartialEq)]
enum NamespaceType { enum NamespaceType {
IPC, Ipc,
UTS, Uts,
PID, Pid,
} }
impl NamespaceType { impl NamespaceType {
/// Get the string representation of the namespace type. /// Get the string representation of the namespace type.
pub fn get(&self) -> &str { pub fn get(&self) -> &str {
match *self { match *self {
Self::IPC => "ipc", Self::Ipc => "ipc",
Self::UTS => "uts", Self::Uts => "uts",
Self::PID => "pid", Self::Pid => "pid",
} }
} }
/// Get the associate flags with the namespace type. /// Get the associate flags with the namespace type.
pub fn get_flags(&self) -> CloneFlags { pub fn get_flags(&self) -> CloneFlags {
match *self { match *self {
Self::IPC => CloneFlags::CLONE_NEWIPC, Self::Ipc => CloneFlags::CLONE_NEWIPC,
Self::UTS => CloneFlags::CLONE_NEWUTS, Self::Uts => CloneFlags::CLONE_NEWUTS,
Self::PID => CloneFlags::CLONE_NEWPID, Self::Pid => CloneFlags::CLONE_NEWPID,
} }
} }
} }
@ -180,7 +180,7 @@ impl fmt::Debug for NamespaceType {
impl Default for NamespaceType { impl Default for NamespaceType {
fn default() -> Self { fn default() -> Self {
NamespaceType::IPC NamespaceType::Ipc
} }
} }
@ -234,15 +234,15 @@ mod tests {
#[test] #[test]
fn test_namespace_type() { fn test_namespace_type() {
let ipc = NamespaceType::IPC; let ipc = NamespaceType::Ipc;
assert_eq!("ipc", ipc.get()); assert_eq!("ipc", ipc.get());
assert_eq!(CloneFlags::CLONE_NEWIPC, ipc.get_flags()); assert_eq!(CloneFlags::CLONE_NEWIPC, ipc.get_flags());
let uts = NamespaceType::UTS; let uts = NamespaceType::Uts;
assert_eq!("uts", uts.get()); assert_eq!("uts", uts.get());
assert_eq!(CloneFlags::CLONE_NEWUTS, uts.get_flags()); assert_eq!(CloneFlags::CLONE_NEWUTS, uts.get_flags());
let pid = NamespaceType::PID; let pid = NamespaceType::Pid;
assert_eq!("pid", pid.get()); assert_eq!("pid", pid.get());
assert_eq!(CloneFlags::CLONE_NEWPID, pid.get_flags()); assert_eq!(CloneFlags::CLONE_NEWPID, pid.get_flags());
} }