add: decrypt and edit

Author: queil

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "rooz"
-version = "0.90.0"
+version = "0.91.0"
 edition = "2021"
 
 [dependencies]
@@ -11,6 +11,7 @@ clap = { version = "4.5.16", features = ["derive", "env"] }
 clap_complete = "4.5.24"
 colored = "2.1.0"
 ctrlc = "3.4.5"
+edit = "0.1.5"
 env_logger = "0.11.5"
 futures = "0.3.30"
 handlebars = "6.0.0"

Cargo.toml

@@ -5,14 +5,15 @@ use bollard::{
     service::{ContainerSummary, Volume},
     volume::ListVolumesOptions,
 };
+use linked_hash_map::LinkedHashMap;
 
 use crate::{
     age_utils,
     api::WorkspaceApi,
     constants,
     labels::{self, Labels, ROLE},
     model::{
-        config::FinalCfg,
+        config::{FileFormat, FinalCfg, RoozCfg},
         types::{AnyError, ContainerResult, RunSpec, WorkSpec, WorkspaceResult},
         volume::{RoozVolume, CACHE_ROLE, WORK_ROLE},
     },
@@ -210,14 +211,40 @@ impl<'a> WorkspaceApi<'a> {
         Ok(())
     }
 
+    pub async fn decrypt(
+        &self,
+        vars: Option<LinkedHashMap<String, String>>,
+    ) -> Result<LinkedHashMap<String, String>, AnyError> {
+        log::debug!("Checking if vars need decryption");
+        if let Some(vars) = age_utils::needs_decryption(vars.clone()) {
+            log::debug!("Decrypting vars");
+            let identity = self.read_age_identity().await?;
+            age_utils::decrypt(&identity, vars)
+        } else {
+            log::debug!("No encrypted vars found");
+            Ok(vars.unwrap_or_default())
+        }
+    }
+
     pub async fn edit(&self, workspace_key: &str) -> Result<(), AnyError> {
         let labels = Labels::new(Some(workspace_key), Some(WORK_ROLE));
         for c in self.api.container.get_all(&labels).await? {
             if let Some(labels) = c.labels {
-                //TODO: implement editing
+                let config_source = &labels[labels::CONFIG_SOURCE];
+                let format = FileFormat::from_path(config_source);
+                let config =
+                    RoozCfg::deserialize_config(&labels[labels::CONFIG_BODY], format)?.unwrap();
+                let decrypted_config = RoozCfg {
+                    vars: Some(self.decrypt(config.clone().vars).await?),
+                    ..config
+                };
+                let edited_config = edit::edit(decrypted_config.to_string(format)?)?;
+
+                println!("edited: {}", edited_config);
 
-                println!("{}", labels[labels::CONFIG_SOURCE]);
-                println!("{}", labels[labels::CONFIG_BODY]);
+                // encrypt
+                // save to label
+                // apply
             }
         }
         Ok(())

src/api/workspace.rs

@@ -1,7 +1,6 @@
 use std::fs;
 
 use crate::{
-    age_utils,
     api::WorkspaceApi,
     cli::{WorkParams, WorkspacePersistence},
     constants,
@@ -31,15 +30,7 @@ impl<'a> WorkspaceApi<'a> {
         }
         cfg_builder.from_cli(cli_params, None);
 
-        log::debug!("Checking if vars need decryption");
-        if let Some(vars) = age_utils::needs_decryption(cfg_builder.clone().vars) {
-            log::debug!("Decrypting vars");
-            let identity = self.read_age_identity().await?;
-            let decrypted_kv = age_utils::decrypt(&identity, vars)?;
-            cfg_builder.vars = Some(decrypted_kv);
-        } else {
-            log::debug!("No encrypted vars found");
-        }
+        cfg_builder.vars = Some(self.decrypt(cfg_builder.clone().vars).await?);
 
         cfg_builder.expand_vars()?;
 

src/cmd/new.rs

@@ -16,7 +16,10 @@ use crate::{
     api::{Api, ContainerApi, ExecApi, GitApi, ImageApi, VolumeApi, WorkspaceApi},
     backend::ContainerBackend,
     cli::{
-        Cli, Commands::{Describe, Edit, Encrypt, Enter, List, New, Remote, Remove, Stop, System, Tmp}, CompletionParams, DescribeParams, EditParams, EncryptParams, ListParams, NewParams, RemoveParams, StopParams, TmpParams
+        Cli,
+        Commands::{Describe, Edit, Encrypt, Enter, List, New, Remote, Remove, Stop, System, Tmp},
+        CompletionParams, DescribeParams, EditParams, EncryptParams, ListParams, NewParams,
+        RemoveParams, StopParams, TmpParams,
     },
     cmd::remote,
     model::{config::RoozCfg, types::AnyError},
@@ -184,7 +187,7 @@ async fn main() -> Result<(), AnyError> {
             command: Edit(EditParams { name, .. }),
             ..
         } => {
-           workspace.edit(&name).await?;
+            workspace.edit(&name).await?;
         }
 
         Cli {