tidy up

Author: queil

src/api/crypt.rs

@@ -6,9 +6,7 @@ use std::str::FromStr;
 
 impl SystemConfig {
     pub fn age_identity(&self) -> Result<Identity, AnyError> {
-        Ok(age::x25519::Identity::from_str(
-            self.age_key.as_deref().unwrap(),
-        )?)
+        Ok(Identity::from_str(self.age_key.as_deref().unwrap())?)
     }
 }
 

src/api/workspace/enter.rs

@@ -87,9 +87,6 @@ impl<'a> WorkspaceApi<'a> {
                 }
             };
 
-            //TODO: v2 chown is disabled for sidecars
-            // symlinking might be happening in wrapped entrypoints so maybe chowning could to
-            // Chowing as exec to work in non-root containers
             if !root && container_name == constants::DEFAULT_CONTAINER_NAME {
                 self.api.exec.ensure_user(container_id).await?;
 

src/config/config.rs

@@ -99,15 +99,6 @@ impl FileFormat {
     }
 }
 
-#[derive(Debug, Serialize, Deserialize, Clone)]
-#[serde(untagged)]
-pub enum SidecarMount {
-    Empty(String),
-    Files {
-        mount: String,
-        files: HashMap<String, String>,
-    },
-}
 #[derive(Debug, Serialize, Deserialize, Clone)]
 #[serde(deny_unknown_fields)]
 pub struct RoozSidecar {
@@ -121,8 +112,6 @@ pub struct RoozSidecar {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub mounts: Option<LinkedHashMap<String, MountSource>>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub legacy_mounts: Option<Vec<SidecarMount>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     pub ports: Option<Vec<String>>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub privileged: Option<bool>,

src/config/runtime.rs

@@ -1,4 +1,4 @@
-use super::config::{DataValue, MountSource, RoozCfg, RoozSidecar, SidecarMount};
+use super::config::{DataValue, MountSource, RoozCfg, RoozSidecar};
 use crate::AnyError;
 use crate::constants;
 use crate::model::types::{TargetDir, VolumeFilesSpec};
@@ -14,7 +14,6 @@ pub struct RoozSidecarRuntime {
     pub args: Vec<String>,
     pub mounts: HashMap<String, MountSource>,
     pub real_mounts: HashMap<TargetDir, VolumeFilesSpec>,
-    pub legacy_mounts: Vec<SidecarMount>,
     pub ports: Vec<String>,
     pub privileged: bool,
     pub init: bool,
@@ -42,7 +41,6 @@ impl<'a> From<&'a RoozSidecar> for RoozSidecarRuntime {
                 .iter()
                 .map(|(k, v)| (k.to_string(), v.clone()))
                 .collect(),
-            legacy_mounts: value.legacy_mounts.clone().unwrap_or_default(),
             real_mounts: HashMap::new(),
             ports: value.ports.clone().unwrap_or_default(),
             privileged: value.privileged.clone().unwrap_or_default(),

src/model/volume.rs

@@ -21,8 +21,6 @@ pub enum RoozVolumeSharing {
 
 #[derive(Debug, Clone)]
 pub enum RoozVolumeRole {
-    //TODO: remove in v2
-    //Home,
     Work,
     Cache,
     Data,
@@ -34,8 +32,6 @@ pub enum RoozVolumeRole {
 impl RoozVolumeRole {
     pub fn as_str(&self) -> &str {
         match self {
-            //TODO: remove in v2
-            //RoozVolumeRole::Home => HOME_ROLE,
             RoozVolumeRole::Work => WORK_ROLE,
             RoozVolumeRole::Cache => CACHE_ROLE,
             RoozVolumeRole::Data => DATA_ROLE,
@@ -123,20 +119,6 @@ impl RoozVolume {
         }
     }
 
-    //TODO: remove once v2 is up
-    // pub fn home(key: &str, path: &str) -> RoozVolume {
-    //     RoozVolume {
-    //         path: path.into(),
-    //         sharing: RoozVolumeSharing::Exclusive { key: key.into() },
-    //         role: RoozVolumeRole::Home,
-    //         files: None,
-    //         labels: Some(Labels::from(&[
-    //             Labels::workspace(key),
-    //             Labels::role(RoozVolumeRole::Home.as_str()),
-    //         ])),
-    //     }
-    // }
-
     pub fn cache(path: &str) -> RoozVolume {
         RoozVolume {
             path: path.into(),
@@ -185,7 +167,7 @@ impl RoozVolume {
             },
             None => RoozVolume {
                 path: path.into(),
-                role: role,
+                role,
                 sharing: RoozVolumeSharing::Exclusive {
                     key: workspace_key.into(),
                 },

src/util/labels.rs

@@ -11,8 +11,6 @@ const ROOZ: &'static str = "dev.rooz";
 pub const LABEL_KEY: &'static str = "label";
 const TRUE: &'static str = "true";
 
-//TODO: remove in v2
-//pub const HOME_ROLE: &'static str = "home";
 pub const WORK_ROLE: &'static str = "work";
 pub const DATA_ROLE: &'static str = "data";
 pub const SSH_KEY_ROLE: &'static str = "ssh-key";
@@ -21,10 +19,6 @@ pub const SYSTEM_CONFIG_ROLE: &'static str = "sys-config";
 pub const CACHE_ROLE: &'static str = "cache";
 pub const SIDECAR_ROLE: &'static str = "sidecar";
 
-// -- volume v2 roles
-
-//
-
 #[derive(Clone, Debug)]
 pub struct KeyValue {
     formatted: String,