Add basic progress output

stackabletech · Oct 20, 2023 · 082bfaa · 082bfaa
1 parent fddf2f5
commit 082bfaa
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 15 deletions.
diff --git a/rust/stackable-cockpit/src/engine/kind/mod.rs b/rust/stackable-cockpit/src/engine/kind/mod.rs
@@ -75,6 +75,8 @@ impl KindCluster {
             .args(["create", "cluster"])
             .args(["--name", self.name.as_str()])
             .args(["--config", "-"])
+            .stdout(Stdio::null())
+            .stderr(Stdio::null())
             .stdin(Stdio::piped())
             .spawn()
             .context(IoSnafu)?;

diff --git a/rust/stackable-cockpit/src/platform/stack/spec.rs b/rust/stackable-cockpit/src/platform/stack/spec.rs
@@ -295,7 +295,7 @@ impl StackSpecV2 {
                         },
                         Some(&values_yaml),
                         product_namespace,
-                        false,
+                        true,
                     )
                     .context(HelmInstallReleaseSnafu {
                         release_name: helm_chart.release_name,

diff --git a/rust/stackablectl/src/cmds/demo.rs b/rust/stackablectl/src/cmds/demo.rs
@@ -272,6 +272,10 @@ async fn install_cmd(
 ) -> Result<String, CmdError> {
     info!("Installing demo {}", args.demo_name);
 
+    // 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(),
     })?;
@@ -289,6 +293,7 @@ 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
@@ -307,19 +312,22 @@ 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,
@@ -334,8 +342,6 @@ async fn install_cmd(
         .await
         .context(DemoSnafu)?;
 
-    let mut result = cli.result();
-
     let operator_cmd = format!(
         "stackablectl operator installed{}",
         if args.namespaces.operator_namespace.is_some() {
@@ -354,11 +360,12 @@ async fn install_cmd(
         }
     );
 
-    result
+    output
         .with_command_hint(operator_cmd, "display the installed operators")
         .with_command_hint(stacklet_cmd, "display the installed stacklets")
         .with_output(format!("Installed demo '{}'", args.demo_name));
 
+    output.finish_progress("Done");
     // TODO (Techassi): Remove unwrap
-    Ok(result.render().unwrap())
+    Ok(output.render().unwrap())
 }
diff --git a/rust/stackablectl/src/cmds/release.rs b/rust/stackablectl/src/cmds/release.rs
@@ -271,19 +271,25 @@ 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,
@@ -292,17 +298,16 @@ async fn install_cmd(
                 )
                 .context(ReleaseInstallSnafu)?;
 
-            let mut result = cli.result();
-
-            result
+            output
                 .with_command_hint(
                     "stackablectl operator installed",
                     "list installed operators",
                 )
                 .with_output(format!("Installed release '{}'", args.release));
 
+            output.finish_progress("Done");
             // TODO (Techassi): Remove unwrap
-            Ok(result.render().unwrap())
+            Ok(output.render().unwrap())
         }
         None => Ok("No such release".into()),
     }

diff --git a/rust/stackablectl/src/cmds/stack.rs b/rust/stackablectl/src/cmds/stack.rs
@@ -283,7 +283,11 @@ 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
@@ -297,12 +301,14 @@ 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,13 +318,15 @@ 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,
@@ -328,8 +336,6 @@ async fn install_cmd(
                 .await
                 .context(StackSnafu)?;
 
-            let mut result = cli.result();
-
             let operator_cmd = format!(
                 "stackablectl operator installed{}",
                 if args.namespaces.operator_namespace.is_some() {
@@ -348,13 +354,14 @@ async fn install_cmd(
                 }
             );
 
-            result
+            output
                 .with_command_hint(operator_cmd, "display the installed operators")
                 .with_command_hint(stacklet_cmd, "display the installed stacklets")
                 .with_output(format!("Installed stack '{}'", args.stack_name));
 
+            output.finish_progress("Done");
             // TODO (Techassi): Remove unwrap
-            Ok(result.render().unwrap())
+            Ok(output.render().unwrap())
         }
         None => Ok("No such stack".into()),
     }

diff --git a/rust/stackablectl/src/output/mod.rs b/rust/stackablectl/src/output/mod.rs
@@ -119,9 +119,15 @@ where
             .get_or_insert(Spinner::new(spinners::Dots, initial_message, Color::Green));
     }
 
-    pub fn set_progress_message(&mut self, message: String) {
+    pub fn set_progress_message(&mut self, message: impl Into<String>) {
         if let Some(progress) = self.progress.as_mut() {
-            progress.update_text(message)
+            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())
         }
     }