refactor: Update transfer client and cache related code

Author: Techassi

rust/stackable-cockpit/src/common/list.rs

@@ -49,7 +49,7 @@ where
 
         for file in files {
             let specs = transfer_client
-                .get(file, &Yaml::<L>::new())
+                .get(file, &Yaml::<L>::default())
                 .await
                 .context(FileTransferSnafu)?;
 

rust/stackable-cockpit/src/platform/manifests.rs

@@ -98,7 +98,10 @@ pub trait InstallManifestsExt {
                     })?;
 
                     let helm_chart: helm::Chart = transfer_client
-                        .get(&helm_file, &Template::new(&parameters).then(Yaml::new()))
+                        .get(
+                            &helm_file,
+                            &Template::new(&parameters).then(Yaml::default()),
+                        )
                         .await
                         .context(FileTransferSnafu)?;
 

rust/stackable-cockpit/src/xfer/processor.rs

@@ -78,8 +78,8 @@ where
     }
 }
 
-impl<T> Yaml<T> {
-    pub fn new() -> Self {
+impl<T> Default for Yaml<T> {
+    fn default() -> Self {
         Self(PhantomData)
     }
 }
@@ -99,8 +99,8 @@ where
     }
 }
 
-impl<T> Json<T> {
-    pub fn new() -> Self {
+impl<T> Default for Json<T> {
+    fn default() -> Self {
         Self(PhantomData)
     }
 }

rust/stackablectl/src/cmds/cache.rs

@@ -1,9 +1,9 @@
-use std::time::Duration;
+use std::{sync::Arc, time::Duration};
 
 use clap::{Args, Subcommand};
 use comfy_table::{ColumnConstraint, Table, Width, presets::UTF8_FULL};
 use snafu::{ResultExt, Snafu};
-use stackable_cockpit::xfer::cache::{self, Cache, DeleteFilter};
+use stackable_cockpit::xfer::{self, cache::DeleteFilter};
 use tracing::{info, instrument};
 
 use crate::cli::Cli;
@@ -35,26 +35,29 @@ pub struct CacheCleanArgs {
 #[derive(Debug, Snafu)]
 pub enum CmdError {
     #[snafu(display("failed to list cached files"))]
-    ListCachedFiles { source: cache::Error },
+    ListCachedFiles { source: xfer::Error },
 
     #[snafu(display("failed to purge cached files"))]
-    PurgeCachedFiles { source: cache::Error },
+    PurgeCachedFiles { source: xfer::Error },
 }
 
 impl CacheArgs {
-    pub async fn run(&self, cli: &Cli, cache: Cache) -> Result<String, CmdError> {
+    pub async fn run(&self, transfer_client: Arc<xfer::Client>) -> Result<String, CmdError> {
         match &self.subcommand {
-            CacheCommands::List => list_cmd(cache, cli).await,
-            CacheCommands::Clean(args) => clean_cmd(args, cache).await,
+            CacheCommands::List => list_cmd(transfer_client).await,
+            CacheCommands::Clean(args) => clean_cmd(args, transfer_client).await,
         }
     }
 }
 
 #[instrument(skip_all)]
-async fn list_cmd(cache: Cache, cli: &Cli) -> Result<String, CmdError> {
+async fn list_cmd(transfer_client: Arc<xfer::Client>) -> Result<String, CmdError> {
     info!("Listing cached files");
 
-    let files = cache.list().await.context(ListCachedFilesSnafu)?;
+    let files = transfer_client
+        .list_cached_files()
+        .await
+        .context(ListCachedFilesSnafu)?;
 
     if files.is_empty() {
         return Ok("No cached files".into());
@@ -77,7 +80,7 @@ async fn list_cmd(cache: Cache, cli: &Cli) -> Result<String, CmdError> {
         table.add_row(vec![file_path, format!("{modified} seconds ago")]);
     }
 
-    let mut result = cli.result();
+    let mut result = Cli::result();
 
     result
         .with_command_hint("stackablectl cache clean", "to clean all cached files")
@@ -87,7 +90,10 @@ async fn list_cmd(cache: Cache, cli: &Cli) -> Result<String, CmdError> {
 }
 
 #[instrument(skip_all)]
-async fn clean_cmd(args: &CacheCleanArgs, cache: Cache) -> Result<String, CmdError> {
+async fn clean_cmd(
+    args: &CacheCleanArgs,
+    transfer_client: Arc<xfer::Client>,
+) -> Result<String, CmdError> {
     info!("Cleaning cached files");
 
     let delete_filter = if args.only_remove_old_files {
@@ -96,8 +102,8 @@ async fn clean_cmd(args: &CacheCleanArgs, cache: Cache) -> Result<String, CmdErr
         DeleteFilter::All
     };
 
-    cache
-        .purge(delete_filter)
+    transfer_client
+        .purge_cached_files(delete_filter)
         .await
         .context(PurgeCachedFilesSnafu)?;
 

rust/stackablectl/src/cmds/debug.rs

@@ -27,8 +27,6 @@ use tokio::{
 };
 use tracing::{Instrument, error, info, info_span, warn};
 
-use crate::cli::Cli;
-
 #[derive(Debug, Snafu)]
 pub enum CmdError {
     #[snafu(display("failed to create Kubernetes client"))]
@@ -136,7 +134,7 @@ pub struct DebugArgs {
 }
 
 impl DebugArgs {
-    pub async fn run(&self, _cli: &Cli) -> Result<String, CmdError> {
+    pub async fn run(&self) -> Result<String, CmdError> {
         let kube = kube::Client::try_default()
             .await
             .context(KubeClientCreateSnafu)?;

rust/stackablectl/src/cmds/demo.rs

@@ -1,3 +1,5 @@
+use std::sync::Arc;
+
 use clap::{Args, Subcommand};
 use comfy_table::{
     ContentArrangement, Row, Table,
@@ -16,7 +18,7 @@ use stackable_cockpit::{
         k8s::{self, Client},
         path::PathOrUrlParseError,
     },
-    xfer::{self, cache::Cache},
+    xfer,
 };
 use stackable_operator::kvp::{LabelError, Labels};
 use tracing::{Span, debug, info, instrument};
@@ -161,11 +163,13 @@ pub enum CmdError {
 
 impl DemoArgs {
     #[instrument(skip_all, fields(with_cache = !cli.no_cache))]
-    pub async fn run(&self, cli: &Cli, cache: Cache) -> Result<String, CmdError> {
+    pub async fn run(
+        &self,
+        cli: &Cli,
+        transfer_client: Arc<xfer::Client>,
+    ) -> Result<String, CmdError> {
         debug!("Handle demo args");
 
-        let transfer_client = xfer::Client::new_with(cache);
-
         let release_files = cli.get_release_files().context(PathOrUrlParseSnafu)?;
         let release_list = release::ReleaseList::build(&release_files, &transfer_client)
             .await
@@ -201,8 +205,8 @@ impl DemoArgs {
             .context(BuildListSnafu)?;
 
         match &self.subcommand {
-            DemoCommands::List(args) => list_cmd(args, cli, list).await,
-            DemoCommands::Describe(args) => describe_cmd(args, cli, list).await,
+            DemoCommands::List(args) => list_cmd(args, list).await,
+            DemoCommands::Describe(args) => describe_cmd(args, list).await,
             DemoCommands::Install(args) => {
                 install_cmd(args, cli, list, &transfer_client, &release_branch).await
             }
@@ -212,7 +216,7 @@ impl DemoArgs {
 
 /// Print out a list of demos, either as a table (plain), JSON or YAML
 #[instrument(skip_all, fields(indicatif.pb_show = true))]
-async fn list_cmd(args: &DemoListArgs, cli: &Cli, list: demo::List) -> Result<String, CmdError> {
+async fn list_cmd(args: &DemoListArgs, list: demo::List) -> Result<String, CmdError> {
     info!("Listing demos");
     Span::current().pb_set_message("Fetching demo information");
 
@@ -239,7 +243,7 @@ async fn list_cmd(args: &DemoListArgs, cli: &Cli, list: demo::List) -> Result<St
                 table.add_row(row);
             }
 
-            let mut result = cli.result();
+            let mut result = Cli::result();
 
             result
                 .with_command_hint(
@@ -261,11 +265,7 @@ async fn list_cmd(args: &DemoListArgs, cli: &Cli, list: demo::List) -> Result<St
 
 /// Describe a specific demo by printing out a table (plain), JSON or YAML
 #[instrument(skip_all, fields(indicatif.pb_show = true))]
-async fn describe_cmd(
-    args: &DemoDescribeArgs,
-    cli: &Cli,
-    list: demo::List,
-) -> Result<String, CmdError> {
+async fn describe_cmd(args: &DemoDescribeArgs, list: demo::List) -> Result<String, CmdError> {
     info!(demo_name = %args.demo_name, "Describing demo");
     Span::current().pb_set_message("Fetching demo information");
 
@@ -299,7 +299,7 @@ async fn describe_cmd(
 
             // TODO (Techassi): Add parameter output
 
-            let mut result = cli.result();
+            let mut result = Cli::result();
 
             result
                 .with_command_hint(
@@ -337,7 +337,7 @@ async fn install_cmd(
     Span::current().pb_set_message("Installing demo");
 
     // Init result output and progress output
-    let mut output = cli.result();
+    let mut output = Cli::result();
 
     let demo = list.get(&args.demo_name).ok_or(CmdError::NoSuchDemo {
         name: args.demo_name.clone(),

rust/stackablectl/src/cmds/mod.rs

@@ -6,3 +6,4 @@ pub mod operator;
 pub mod release;
 pub mod stack;
 pub mod stacklet;
+pub mod version;

rust/stackablectl/src/cmds/operator.rs

@@ -183,8 +183,8 @@ impl OperatorArgs {
             OperatorCommands::List(args) => list_cmd(args, cli).await,
             OperatorCommands::Describe(args) => describe_cmd(args, cli).await,
             OperatorCommands::Install(args) => install_cmd(args, cli).await,
-            OperatorCommands::Uninstall(args) => uninstall_cmd(args, cli),
-            OperatorCommands::Installed(args) => installed_cmd(args, cli),
+            OperatorCommands::Uninstall(args) => uninstall_cmd(args),
+            OperatorCommands::Installed(args) => installed_cmd(args),
         }
     }
 }
@@ -227,7 +227,7 @@ async fn list_cmd(args: &OperatorListArgs, cli: &Cli) -> Result<String, CmdError
                 ]);
             }
 
-            let mut result = cli.result();
+            let mut result = Cli::result();
 
             result
                 .with_command_hint(
@@ -290,7 +290,7 @@ async fn describe_cmd(args: &OperatorDescribeArgs, cli: &Cli) -> Result<String,
                 .add_row(vec!["TEST VERSIONS", test_versions_string.as_str()])
                 .add_row(vec!["DEV VERSIONS", dev_versions_string.as_str()]);
 
-            let mut result = cli.result();
+            let mut result = Cli::result();
 
             result
                 .with_command_hint(
@@ -340,7 +340,7 @@ async fn install_cmd(args: &OperatorInstallArgs, cli: &Cli) -> Result<String, Cm
         indicatif_println!("Installed {operator} operator");
     }
 
-    let mut result = cli.result();
+    let mut result = Cli::result();
 
     result
         .with_command_hint(
@@ -361,7 +361,7 @@ async fn install_cmd(args: &OperatorInstallArgs, cli: &Cli) -> Result<String, Cm
 }
 
 #[instrument(skip_all, fields(indicatif.pb_show = true))]
-fn uninstall_cmd(args: &OperatorUninstallArgs, cli: &Cli) -> Result<String, CmdError> {
+fn uninstall_cmd(args: &OperatorUninstallArgs) -> Result<String, CmdError> {
     info!("Uninstalling operator(s)");
     Span::current().pb_set_message("Uninstalling operator(s)");
 
@@ -371,7 +371,7 @@ fn uninstall_cmd(args: &OperatorUninstallArgs, cli: &Cli) -> Result<String, CmdE
             .context(HelmSnafu)?;
     }
 
-    let mut result = cli.result();
+    let mut result = Cli::result();
 
     result
         .with_command_hint(
@@ -392,7 +392,7 @@ fn uninstall_cmd(args: &OperatorUninstallArgs, cli: &Cli) -> Result<String, CmdE
 }
 
 #[instrument(skip_all, fields(indicatif.pb_show = true))]
-fn installed_cmd(args: &OperatorInstalledArgs, cli: &Cli) -> Result<String, CmdError> {
+fn installed_cmd(args: &OperatorInstalledArgs) -> Result<String, CmdError> {
     info!("Listing installed operators");
     Span::current().pb_set_message("Fetching operator information");
 
@@ -443,7 +443,7 @@ fn installed_cmd(args: &OperatorInstalledArgs, cli: &Cli) -> Result<String, CmdE
                 ]);
             }
 
-            let mut result = cli.result();
+            let mut result = Cli::result();
 
             result
                 .with_command_hint(