Remove progress spinner

stackabletech · Nov 20, 2023 · 558affd · 558affd
1 parent 97f6874
commit 558affd
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 86 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -43,7 +43,6 @@ serde_json = "1.0"
 serde_yaml = "0.9"
 sha2 = "0.10"
 snafu = "0.7"
-spinoff = "0.8.0"
 stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.55.0" }
 tera = "1.18"
 tokio = { version = "1.29.0", features = ["rt-multi-thread", "macros", "fs", "process"] }

diff --git a/rust/stackable-cockpit/src/engine/kind/mod.rs b/rust/stackable-cockpit/src/engine/kind/mod.rs
@@ -86,8 +86,6 @@ impl Cluster {
             .args(["create", "cluster"])
             .args(["--name", self.name.as_str()])
             .args(["--config", "-"])
-            .stdout(Stdio::null())
-            .stderr(Stdio::null())
             .stdin(Stdio::piped())
             .spawn()
             .context(CommandFailedToStartSnafu)?;

diff --git a/rust/stackablectl/Cargo.toml b/rust/stackablectl/Cargo.toml
@@ -27,7 +27,6 @@ serde_json.workspace = true
 serde_yaml.workspace = true
 serde.workspace = true
 snafu.workspace = true
-spinoff.workspace = true
 tera.workspace = true
 tokio.workspace = true
 tracing-subscriber.workspace = true

diff --git a/rust/stackablectl/src/cmds/demo.rs b/rust/stackablectl/src/cmds/demo.rs
@@ -267,7 +267,6 @@ async fn install_cmd(
 
     // Init result output and progress output
     let mut output = cli.result();
-    output.enable_progress(format!("Installing demo '{}'", args.demo_name));
 
     let demo_spec = list.get(&args.demo_name).ok_or(CmdError::NoSuchDemo {
         name: args.demo_name.clone(),
@@ -286,7 +285,6 @@ async fn install_cmd(
         .context(ListSnafu)?;
 
     // Install local cluster if needed
-    output.set_progress_message("Creating local cluster");
     args.local_cluster
         .install_if_needed(None)
         .await
@@ -305,22 +303,19 @@ async fn install_cmd(
         .unwrap_or(DEFAULT_PRODUCT_NAMESPACE.into());
 
     if !args.skip_release {
-        output.set_progress_message("Creating operator namespace");
         namespace::create_if_needed(operator_namespace.clone())
             .await
             .context(NamespaceSnafu {
                 namespace: operator_namespace.clone(),
             })?;
     }
 
-    output.set_progress_message("Creating product namespace");
     namespace::create_if_needed(product_namespace.clone())
         .await
         .context(NamespaceSnafu {
             namespace: product_namespace.clone(),
         })?;
 
-    output.set_progress_message("Installing demo manifests");
     demo_spec
         .install(
             stack_list,
@@ -358,6 +353,5 @@ async fn install_cmd(
         .with_command_hint(stacklet_cmd, "display the installed stacklets")
         .with_output(format!("Installed demo '{}'", args.demo_name));
 
-    output.finish_progress("Done");
     Ok(output.render())
 }
diff --git a/rust/stackablectl/src/cmds/release.rs b/rust/stackablectl/src/cmds/release.rs
@@ -267,24 +267,20 @@ async fn install_cmd(
     match release_list.get(&args.release) {
         Some(release) => {
             let mut output = cli.result();
-            output.enable_progress(format!("Installing release '{}'", args.release));
 
             // Install local cluster if needed
-            output.set_progress_message("Installing local cluster");
             args.local_cluster
                 .install_if_needed(None)
                 .await
                 .context(CommonClusterArgsSnafu)?;
 
             // Create operator namespace if needed
-            output.set_progress_message("Creating operator namespace");
             namespace::create_if_needed(args.operator_namespace.clone())
                 .await
                 .context(NamespaceSnafu {
                     namespace: args.operator_namespace.clone(),
                 })?;
 
-            output.set_progress_message("Installing release manifests");
             release
                 .install(
                     &args.included_products,
@@ -300,7 +296,6 @@ async fn install_cmd(
                 )
                 .with_output(format!("Installed release '{}'", args.release));
 
-            output.finish_progress("Done");
             Ok(output.render())
         }
         None => Ok("No such release".into()),

diff --git a/rust/stackablectl/src/cmds/stack.rs b/rust/stackablectl/src/cmds/stack.rs
@@ -278,10 +278,8 @@ async fn install_cmd(
     match stack_list.get(&args.stack_name) {
         Some(stack_spec) => {
             let mut output = cli.result();
-            output.enable_progress(format!("Installing stack '{}'", args.stack_name));
 
             // Install local cluster if needed
-            output.set_progress_message("Creating local cluster");
             args.local_cluster
                 .install_if_needed(None)
                 .await
@@ -295,14 +293,12 @@ async fn install_cmd(
 
             // Install release if not opted out
             if !args.skip_release {
-                output.set_progress_message("Creating operator namespace");
                 namespace::create_if_needed(operator_namespace.clone())
                     .await
                     .context(NamespaceSnafu {
                         namespace: operator_namespace.clone(),
                     })?;
 
-                output.set_progress_message("Installing release manifests");
                 stack_spec
                     .install_release(release_list, &operator_namespace, &product_namespace)
                     .await
@@ -312,15 +308,13 @@ async fn install_cmd(
             }
 
             // Create product namespace if needed
-            output.set_progress_message("Creating product namespace");
             namespace::create_if_needed(product_namespace.clone())
                 .await
                 .context(NamespaceSnafu {
                     namespace: product_namespace.clone(),
                 })?;
 
             // Install stack
-            output.set_progress_message("Installing stack manifests");
             stack_spec
                 .install_stack_manifests(
                     &args.stack_parameters,
@@ -353,7 +347,6 @@ async fn install_cmd(
                 .with_command_hint(stacklet_cmd, "display the installed stacklets")
                 .with_output(format!("Installed stack '{}'", args.stack_name));
 
-            output.finish_progress("Done");
             Ok(output.render())
         }
         None => Ok("No such stack".into()),

diff --git a/rust/stackablectl/src/output/mod.rs b/rust/stackablectl/src/output/mod.rs
@@ -4,7 +4,6 @@ use std::{
 };
 
 use snafu::{ResultExt, Snafu};
-use spinoff::{spinners, Color, Spinner};
 use tera::Tera;
 
 mod error;
@@ -93,7 +92,6 @@ pub struct Output<C>
 where
     C: ContextExt,
 {
-    progress: Option<Spinner>,
     renderer: Tera,
     context: C,
 }
@@ -107,28 +105,7 @@ where
         let no_color = use_colored_output(!no_color);
         context.set_no_color(no_color);
 
-        Ok(Self {
-            progress: None,
-            renderer,
-            context,
-        })
-    }
-
-    pub fn enable_progress(&mut self, initial_message: String) {
-        self.progress
-            .get_or_insert(Spinner::new(spinners::Dots, initial_message, Color::Green));
-    }
-
-    pub fn set_progress_message(&mut self, message: impl Into<String>) {
-        if let Some(progress) = self.progress.as_mut() {
-            progress.update_text(message.into())
-        }
-    }
-
-    pub fn finish_progress(&mut self, message: impl AsRef<str>) {
-        if let Some(progress) = self.progress.as_mut() {
-            progress.success(message.as_ref())
-        }
+        Ok(Self { renderer, context })
     }
 
     pub fn render(self) -> String {